updated the project for 1.6.1

jstroem · Jan 20, 2017 · 4c60dd5 · aspcanada · Jan 20, 2017 · jstroem
1 parent e970961
commit 4c60dd5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -67,8 +67,8 @@
     <input ng-model="demo.value" type="text">
   </label>
 
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.7/angular.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-i18n/1.4.7/angular-locale_en-gb.js"></script>
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-i18n/1.6.1/angular-locale_en-gb.js"></script>
 
   <script src="../dist/ng-input-currency.js"></script>
   <script>

diff --git a/dist/ng-input-currency.js b/dist/ng-input-currency.js
@@ -57,10 +57,14 @@ angular.module('ngInputCurrency').service('ngInputCurrencyService', ['$locale',
 angular.module('ngInputCurrency').directive('ngInputCurrency', ['$locale','$filter','ngInputCurrencyService','$timeout', function($locale, $filter, util, $timeout) {
   var link = function($scope, $element, $attrs, $ngModel){
 
-    $ngModel.$options = {
-      updateOn: 'blur enter',
-      updateOnDefault: false
-    }
+  var opts = {
+    updateOn: 'blur enter',
+    updateOnDefault: false
+  };
+  if ($ngModel.options !== null)
+    opts = $ngModel.$options.createChild(opts);
+
+  $ngModel.$options = opts;
 
     var filter = $filter('currency');
     $ngModel.$formatters.push(function fromModelToView(value) {

diff --git a/package.json b/package.json
@@ -26,9 +26,9 @@
   },
   "homepage": "https://github.com/jstroem/ng-input-currency",
   "devDependencies": {
-    "angular": "^1.5.4",
-    "angular-i18n": "^1.5.4",
-    "angular-mocks": "^1.5.5",
+    "angular": "^1.6.1",
+    "angular-i18n": "^1.6.1",
+    "angular-mocks": "^1.6.1",
     "bower": "^1.5.2",
     "gulp": "^3.9.0",
     "gulp-browserify": "^0.5.1",

diff --git a/src/ng-input-currency.js b/src/ng-input-currency.js
@@ -56,10 +56,14 @@ angular.module('ngInputCurrency').service('ngInputCurrencyService', ['$locale',
 angular.module('ngInputCurrency').directive('ngInputCurrency', ['$locale','$filter','ngInputCurrencyService','$timeout', function($locale, $filter, util, $timeout) {
   var link = function($scope, $element, $attrs, $ngModel){
 
-    $ngModel.$options = {
-      updateOn: 'blur enter',
-      updateOnDefault: false
-    }
+  var opts = {
+    updateOn: 'blur enter',
+    updateOnDefault: false
+  };
+  if ($ngModel.options !== null)
+    opts = $ngModel.$options.createChild(opts);
+
+  $ngModel.$options = opts;
 
     var filter = $filter('currency');
     $ngModel.$formatters.push(function fromModelToView(value) {