fix #48 correct pristine/dirty flags when provided initial data (#91)

Author: hmil

CHANGELOG.md

@@ -1,5 +1,7 @@
 # CHANGELOG
 
+- Prevent $dirty flag on a form from being set to false on initialization
+
 ## v1.0.0 - Major refactoring
 
 The code has been rewritten almost from scratch with a focus on code quality and testing. This will make future development easier and limit the number of bugs on the long term. Beware that regressions are likely!

Gruntfile.js

@@ -14,10 +14,18 @@ module.exports = function (grunt) {
         ]
       }
     },
+    copy: {
+      files: {
+        expand: true,
+        src: ['angular-typeahead.js', 'angular-typeahead.min.js'],
+        cwd: 'build',
+        dest: 'dist/'
+      }
+    },
     uglify: {
       build: {
-        src: 'dist/angular-typeahead.js',
-        dest: 'dist/angular-typeahead.min.js'
+        src: 'build/angular-typeahead.js',
+        dest: 'build/angular-typeahead.min.js'
       }
     },
     karma: {
@@ -50,7 +58,7 @@ module.exports = function (grunt) {
       src: {
         options: {
           src: 'angular-typeahead.js',
-          dest: 'dist/angular-typeahead.js',
+          dest: 'build/angular-typeahead.js',
           amdModuleId: 'angular-typeahead',
           deps: {
             default: ['angular'],
@@ -87,16 +95,22 @@ module.exports = function (grunt) {
 
   // Load the plugins that provide the tasks.
   grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-umd');
 
-  grunt.registerTask('require-self', 'Sets-up requireself', require('./tasks/require-self'));
+  grunt.registerTask('require-self', 'Fixes require calls to self for tests', require('./tasks/require-self'));
+
+  // Utility Tasks
+  grunt.registerTask('_build', ['require-self', 'umd']);
+  grunt.registerTask('_test', ['karma', 'jshint']);
+
 
   // Tasks
-  grunt.registerTask('test:lite', ['require-self', 'karma:global', 'jshint']);
-  grunt.registerTask('test', ['require-self', 'umd:test', 'karma', 'jshint']);
-  grunt.registerTask('default', ['test', 'umd:src', 'uglify', 'clean']);
+  grunt.registerTask('test:lite', ['_build', 'karma:global', 'jshint']);
+  grunt.registerTask('test', ['_build', '_test']);
+  grunt.registerTask('dist', ['_build', 'uglify', 'copy']);
 };

angular-typeahead.js

@@ -101,10 +101,8 @@ angular.module('siyfion.sfTypeahead', [])
           scope.$watch('options', initialize);
           initialized = true;
         } else {
-          var value = element.val();
           $typeahead(element, 'destroy');
           $typeahead(element, options, datasets);
-          ngModel.$setViewValue(value);
         }
       }
 

package.json

@@ -13,8 +13,7 @@
   "scripts": {
     "test": "grunt test",
     "watch": "grunt watch",
-    "dist": "grunt",
-    "pretest": "require-self"
+    "dist": "grunt"
   },
   "files": [
     "dist"
@@ -40,6 +39,7 @@
     "browserify": "^13.1.0",
     "grunt": "1.0.1",
     "grunt-contrib-clean": "~1.0.0",
+    "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-uglify": "~2.0.0",
     "grunt-contrib-watch": "^1.0.0",
@@ -56,7 +56,6 @@
     "karma-requirejs": "^1.1.0",
     "karma-spec-reporter": "0.0.26",
     "karma-threshold-reporter": "^0.1.15",
-    "require-self": "^0.1.0",
     "requirejs": "^2.3.2",
     "typeahead.js": "^0.11.1",
     "watchify": "^3.7.0"

tasks/require-self.js

@@ -6,12 +6,10 @@ module.exports = function() {
 
   // Get the name of the module in the current working directory.
   var cwd = process.cwd();
-  var pkg = require(path.join(cwd, 'package.json'));
-  var name = pkg.name;
 
   // Compute the location and content for the pseudo-module.
-  var modulePath = path.join(cwd, 'node_modules', name + '.js');
-  var moduleText = "module.exports = require('..');";
+  var modulePath = path.join(cwd, 'node_modules/angular-typeahead.js');
+  var moduleText = "module.exports = require('../build/angular-typeahead.js');";
 
   // Create the pseudo-module.
   fs.writeFileSync(modulePath, moduleText);

test/angular-typeahead.spec.js

@@ -50,6 +50,31 @@ describe('sfTypeahead', function() {
     $provide.value('$typeahead', $typeahead);
   }));
 
+  describe('Behaviour in a form', function() {
+    it('sets the proper form flags when there is data', inject(function($rootScope, $compile) {
+        $scope = createScope($rootScope);
+        $compile('<form name="theForm">' +
+            '<input ng-model="model" type="text" options="options" datasets="datasets" required sf-typeahead>' +
+            '</form>')($scope);
+        $scope.$digest();
+        expect($scope.theForm.$pristine).toEqual(true);
+        expect($scope.theForm.$dirty).toEqual(false);
+        expect($scope.theForm.$valid).toEqual(true);
+        expect($scope.theForm.$invalid).toEqual(false);
+    }));
+    it('sets the proper form flags when there is no data', inject(function($rootScope, $compile) {
+        $scope = createScope($rootScope);
+        $scope.model = undefined;
+        $compile('<form name="theForm">' +
+            '<input ng-model="model" type="text" options="options" datasets="datasets" required sf-typeahead>' +
+            '</form>')($scope);
+        $scope.$digest();
+        expect($scope.theForm.$pristine).toEqual(true);
+        expect($scope.theForm.$dirty).toEqual(false);
+        expect($scope.theForm.$valid).toEqual(false);
+        expect($scope.theForm.$invalid).toEqual(true);
+    }));
+  });
   describe('Directive syntax', function() {
     it('is compiled on class name', inject(function($rootScope, $compile) {
       $scope = createScope($rootScope);
@@ -111,6 +136,7 @@ describe('sfTypeahead', function() {
       expect($typeahead).toHaveBeenCalledWith(jasmine.anything(), 'destroy');
       expect($typeahead).toHaveBeenCalledWith(jasmine.anything(), $scope.options, [$scope.datasets]);
       expect($element.val()).toEqual('simple value');
+      expect($scope.model).toEqual('simple value');
     }));
     it('recreates the typeahead when datasets attribute changes',
         inject(function($rootScope, $compile) {
@@ -125,6 +151,7 @@ describe('sfTypeahead', function() {
       expect($typeahead).toHaveBeenCalledWith(jasmine.anything(), 'destroy');
       expect($typeahead).toHaveBeenCalledWith(jasmine.anything(), $scope.options, [$scope.datasets]);
       expect($element.val()).toEqual('simple value');
+      expect($scope.model).toEqual('simple value');
     }));
     it('recreates the typeahead when datasets array attribute changes',
         inject(function($rootScope, $compile) {
@@ -140,6 +167,7 @@ describe('sfTypeahead', function() {
       expect($typeahead).toHaveBeenCalledWith(jasmine.anything(), 'destroy');
       expect($typeahead).toHaveBeenCalledWith(jasmine.anything(), $scope.options, $scope.datasets);
       expect($element.val()).toEqual('simple value');
+      expect($scope.model).toEqual('simple value');
     }));
     it('recreates the typeahead when datasets array becomes a single dataset',
         inject(function($rootScope, $compile) {
@@ -155,6 +183,7 @@ describe('sfTypeahead', function() {
       expect($typeahead).toHaveBeenCalledWith(jasmine.anything(), 'destroy');
       expect($typeahead).toHaveBeenCalledWith(jasmine.anything(), $scope.options, [$scope.datasets]);
       expect($element.val()).toEqual('simple value');
+      expect($scope.model).toEqual('simple value');
     }));
   });
   describe('model', function() {

test/karma.amd.conf.js

@@ -7,7 +7,7 @@ conf.files = [
   'node_modules/typeahead.js/dist/typeahead.bundle.js',
   {pattern: 'node_modules/angular/angular.js', included: false},
   {pattern: 'node_modules/angular-mocks/angular-mocks.js', included: false},
-  {pattern: 'dist/angular-typeahead.js', included: false},
+  {pattern: 'build/angular-typeahead.js', included: false},
   'build/angular-typeahead.spec.js'
 ];
 conf.frameworks.push('requirejs');

test/test-amd.js

@@ -23,7 +23,7 @@ require.config({
   deps: allTestFiles,
 
   paths: {
-    'angular-typeahead': 'dist/angular-typeahead',
+    'angular-typeahead': 'build/angular-typeahead',
     'typeahead': 'node_modules/typeahead.js/dist/typeahead.bundle',
     'angular': 'node_modules/angular/angular',
     'angular-mocks': 'node_modules/angular-mocks/angular-mocks',