Merge branch 'master' of github.com:timw4mail/kis-js

Conflicts:
	README.md
This commit is contained in:
Timothy Warren 2011-06-14 13:20:25 -04:00
commit e5eb8db027
1 changed files with 2 additions and 7 deletions

View File

@ -8,11 +8,9 @@ Browser support: IE8+, Latest versions of Firefox, Chrome, Safari, Opera
## Basic Use: ## ## Basic Use: ##
* Selector: * Selector: `var x = $(selector);`
var x = $(selector);
* Function: * Function: `$_.module.function(params);`
$_.module.function(params);
## Modules: ## ## Modules: ##
@ -43,7 +41,6 @@ Browser support: IE8+, Latest versions of Firefox, Chrome, Safari, Opera
* Get: Retrieves the value of the key in the url string * Get: Retrieves the value of the key in the url string
Use: Use:
$_.qs.get(key); $_.qs.get(key);
<<<<<<< HEAD
**Store**: localstorage wrapper with automatic data serialization **Store**: localstorage wrapper with automatic data serialization
@ -60,8 +57,6 @@ Browser support: IE8+, Latest versions of Firefox, Chrome, Safari, Opera
* getALL: Retreives all localstorage data in raw form * getALL: Retreives all localstorage data in raw form
Use: Use:
$_.store.getAll(); $_.store.getAll();
=======
>>>>>>> 1b66cdd29daf580bc5f6f0ceb0c54b15e3b7079a