Updated Readme Docs

Author: grevory

README.md

@@ -1,7 +1,7 @@
 angular-local-storage
 =====================
 
-An Angular module that gives you access to the browsers local storage, **v0.1.1**
+An Angular module that gives you access to the browsers local storage, **v0.1.2**
 
 [![Build Status](https://secure.travis-ci.org/grevory/angular-local-storage.png?branch=master)](https://travis-ci.org/grevory/)
 
@@ -78,7 +78,6 @@ myApp.config(function (localStorageServiceProvider) {
     .setPrefix('yourAppName');
 });
 ```
-<<<<<<< HEAD
 ###setStorageType
 You could change web storage type to localStorage or sessionStorage<br/>
 **Default storage:** `localStorage`
@@ -310,9 +309,6 @@ myApp.controller('MainCtrl', function($scope, localStorageService) {
 
 Check out the full demo at http://gregpike.net/demos/angular-local-storage/demo.html
 
-##TO DO:
-- Expand Readme
-
 ##Development:
 Clone the project: 
 ```bash

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-local-storage",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "homepage": "http://gregpike.net/demos/angular-local-storage/demo.html",
   "authors": [
     "grevory <greg@gregpike.ca>"

dist/angular-local-storage.js

@@ -1,6 +1,6 @@
 /**
  * An Angular module that gives you access to the browsers local storage
- * @version v0.1.1 - 2014-10-07
+ * @version v0.1.2 - 2014-10-10
  * @link https://github.com/grevory/angular-local-storage
  * @author grevory <greg@gregpike.ca>
  * @license MIT License, http://www.opensource.org/licenses/MIT
@@ -392,6 +392,8 @@ angularLocalStorage.provider('localStorageService', function() {
       return storageType;
     };
 
+    // Add a listener on scope variable to save its changes to local storage
+    // Return a function which when called cancels binding
     var bindToScope = function(scope, scopeKey, def, lsKey) {
       if (!lsKey) {
         lsKey = scopeKey;
@@ -407,7 +409,7 @@ angularLocalStorage.provider('localStorageService', function() {
 
       $parse(scopeKey).assign(scope, value);
 
-      scope.$watchCollection(scopeKey, function(newVal) {
+      return scope.$watchCollection(scopeKey, function(newVal) {
         addToLocalStorage(lsKey, newVal);
       });
     };

dist/angular-local-storage.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-local-storage",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "An Angular module that gives you access to the browsers local storage",
   "homepage": "https://github.com/grevory/angular-local-storage",
   "main": "angular-local-storage.js",