Merge pull request #7 from Recras/attributes-when-no-value

Set attributes even if no value is present
Recras · Feb 19, 2018 · 1893579 · 1893579
2 parents 939aca0 + 0dc3249
commit 1893579
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-moment-duration",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "homepage": "https://github.com/Recras/angular-moment-duration",
   "description": "An AngularJS directive for moment.js duration",
   "main": "./src/angular-moment-duration.js",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-moment-duration",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "An AngularJS directive for moment.js duration",
   "main": "src/angular-moment-duration.js",
   "scripts": {

diff --git a/src/angular-moment-duration.js b/src/angular-moment-duration.js
@@ -16,18 +16,6 @@ angular.module('ui.moment-duration', [])
             },
             link: function(scope, element, attrs, ngModel) {
                 ngModel.$render = function() {
-                    if (!ngModel.$modelValue) {
-                        return;
-                    }
-                    var duration = moment.duration(ngModel.$modelValue);
-
-                    var value;
-                    if (attrs.maxUnit === undefined) {
-                        value = duration.get(scope.type);
-                    } else {
-                        value = duration.as(scope.type);
-                    }
-
                     if (attrs.type === undefined) {
                         attrs.$set('type', 'number');
                     }
@@ -58,6 +46,18 @@ angular.module('ui.moment-duration', [])
                         }
                     }
 
+                    if (!ngModel.$modelValue) {
+                        return;
+                    }
+                    var duration = moment.duration(ngModel.$modelValue);
+
+                    var value;
+                    if (attrs.maxUnit === undefined) {
+                        value = duration.get(scope.type);
+                    } else {
+                        value = duration.as(scope.type);
+                    }
+
                     element.val(Math.floor(value));
                 };