Version 1.1.0

Author: Slava Fomin II

bower.json

@@ -1,7 +1,7 @@
 {
     "name": "angular-input-modified",
     "description": "AngularJS module to detect and indicate input modifications",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "main": "src/angular-input-modified.js",
     "dependencies": {
         "angular": "1.2.16"

changelog.md

@@ -1,5 +1,15 @@
 # angular-input-modified changelog
 
+## Version 1.1.0
+(30 May 2014)
+
+- Improved initialization code
+- Updated comparison function to allow more weak comparison like `"1"` (string) and `1` (integer)
+- Fixed bug with `$setPristine` method, now it should work correctly in all cases
+- Improved modification tracking
+- Added property `ngForm.modifiedModels` (list of names for modified models)
+- Demo updated
+
 ## Version 1.0.0
 (18 May 2014)
 

readme.md

@@ -1,4 +1,4 @@
-# angular-input-modified 1.0.0
+# angular-input-modified 1.1.0
 
 This AngularJS module adds additional properties and methods to the `ngModel` and `ngForm` controllers
 to provide end-user with facilities to detect and indicate form input modifications.
@@ -39,23 +39,26 @@ It also supports animations if `ngAnimate` module is present.
 
 ### ngModel
 
-**masterValue** - 
+{\*} **masterValue** -
 initial value of the input field.
 
-**modified** - 
+{boolean} **modified** -
 flag that indicates whether the input value was modified.
 
 **reset()** - 
 method to reset input value to it's initial state.
 
 ### ngForm
 
-**modifiedCount** - 
+{integer} **modifiedCount** -
 number of modified input types inside of the form.
 
-**modified** - 
+{boolean} **modified** -
 flag that indicates whether the form is modified (i.e. at least one element is modified).
 
+{string[]} **modifiedModels** -
+list of names for modified models.
+
 **reset()** - 
 method to reset all input values of the form to their initial states.
 

src/angular-input-modified.js

@@ -1,3 +1,11 @@
+/**
+ * AngularJS module "angular-input-modified".
+ *
+ * @version 1.1.0
+ * @author Slava Fomin II <[email protected]>
+ * @licence MIT
+ * @copyright Slava Fomin II, Better Solutions, 2014
+ */
 (function(window, angular) {
     'use strict';
 
@@ -20,6 +28,8 @@
             require: ['?ngModel', '?^form'],
             link: function($scope, $element, attrs, controllers) {
 
+                var modelName = attrs.ngModel;
+
                 // Handling controllers.
                 var ngModel = controllers[0];
                 var ngForm = controllers[1];
@@ -30,6 +40,33 @@
                     return;
                 }
 
+                /**
+                 * Decorates element with proper CSS classes.
+                 */
+                var toggleCssClasses = function() {
+                    $animate.addClass($element, (ngModel.modified ? modifiedClassName : notModifiedClassName));
+                    $animate.removeClass($element, (ngModel.modified ? notModifiedClassName : modifiedClassName));
+                };
+
+                var updateModified = function(modelName, modified) {
+                    if (ngForm) {
+                        var index = ngForm.modifiedModels.indexOf(modelName);
+                        var exists = (-1 !== index);
+
+                        if (modified && !exists) {
+                            // Adding model name to the list of modified models.
+                            ngForm.modifiedModels.push(modelName);
+                            ngForm.modifiedCount++;
+                        } else if (!modified && exists) {
+                            // Removing model name from the list of modified models.
+                            ngForm.modifiedModels.splice(index, 1);
+                            ngForm.modifiedCount--;
+                        }
+
+                        ngForm.modified = (ngForm.modifiedCount > 0);
+                    }
+                };
+
                 // Saving handle to original $setPristine method.
                 var originalSetPristine = ngModel.$setPristine;
 
@@ -51,9 +88,14 @@
                  * Augmentation for original $setPristine method.
                  */
                 ngModel.$setPristine = function() {
+
                     // Calling original $setPristine method.
                     originalSetPristine.apply(this, arguments);
 
+                    if (ngModel.modified) {
+                        updateModified(modelName, false);
+                    }
+
                     // Updating parameters.
                     ngModel.masterValue = ngModel.$modelValue;
                     ngModel.modified = false;
@@ -66,11 +108,19 @@
                  * Resets input value to the master.
                  */
                 ngModel.reset = function() {
-                    eval('$scope.' + attrs.ngModel + ' = ngModel.masterValue;');
+                    eval('$scope.' + modelName + ' = ngModel.masterValue;');
                 };
 
-                // If parent form element is present for this input.
-                if (ngForm) {
+                // If parent form element is present for this input and
+                // is not yet initialized.
+                if (ngForm && 'undefined' === typeof ngForm.modified) {
+
+                    ngForm.modified = false;
+                    ngForm.modifiedCount = 0;
+
+                    // List of modified models.
+                    ngForm.modifiedModels = [];
+
                     /**
                      * Resets all form inputs to it's master values.
                      */
@@ -84,18 +134,6 @@
                             }
                         });
                     };
-
-                    ngForm.modified = false;
-                    ngForm.modifiedCount = 0;
-                }
-
-                /**
-                 * Decorates element with proper CSS classes.
-                 */
-                var toggleCssClasses = function()
-                {
-                    $animate.addClass($element, (ngModel.modified ? modifiedClassName : notModifiedClassName));
-                    $animate.removeClass($element, (ngModel.modified ? notModifiedClassName : modifiedClassName));
                 }
 
                 /**
@@ -106,7 +144,7 @@
                 var initial = true;
 
                 // Watching for model value changes.
-                $scope.$watch(attrs.ngModel, function(value) {
+                $scope.$watch(modelName, function(value) {
                     // If master value is not set.
                     if (initial) {
                         // Preserving master value.
@@ -115,17 +153,15 @@
                         toggleCssClasses();
 
                     } else {
+
                         // Comparing current input value with preserved master value
                         // to determine if it's changed.
                         var modified = !valuesEqual(value, ngModel.masterValue);
 
                         // If modified flag is changed.
                         if (ngModel.modified !== modified) {
 
-                            if (ngForm) {
-                                ngForm.modifiedCount += (modified ? 1 : -1);
-                                ngForm.modified = (ngForm.modifiedCount > 0);
-                            }
+                            updateModified(modelName, modified);
 
                             // Setting new flag.
                             ngModel.modified = modified;
@@ -160,11 +196,14 @@
             if (value1 instanceof Date && value2 instanceof Date) {
                 // Comparing two dates.
                 return (value1.getTime() === value2.getTime());
+            } else {
+                // Comparing two generic objects using strong comparison.
+                return (value1 === value2);
             }
         }
 
-        // In all other cases.
-        return (value1 === value2);
+        // In all other cases using weak comparison.
+        return (value1 == value2);
     }
 
     /**