Allow 0.0 as value

magbeat · Nov 5, 2015 · e0eab41 · e0eab41
1 parent b165d5d
commit e0eab41
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/dist/ng-inline-edit.css b/dist/ng-inline-edit.css
@@ -1,5 +1,5 @@
 /**
- * ng-inline-edit v0.6.0 (http://tamerayd.in/ng-inline-edit)
+ * ng-inline-edit v0.7.1 (http://tamerayd.in/ng-inline-edit)
  * Copyright 2015 Tamer Aydin (http://tamerayd.in)
  * Licensed under MIT
  */

diff --git a/dist/ng-inline-edit.js b/dist/ng-inline-edit.js
@@ -1,5 +1,5 @@
 /**
- * ng-inline-edit v0.6.0 (http://tamerayd.in/ng-inline-edit)
+ * ng-inline-edit v0.7.1 (http://tamerayd.in/ng-inline-edit)
  * Copyright 2015 Tamer Aydin (http://tamerayd.in)
  * Licensed under MIT
  */
@@ -166,6 +166,7 @@
           link: function(scope, element, attrs) {
             scope.model = scope.$parent.$eval(attrs.inlineEdit);
             scope.isInputTextarea = attrs.hasOwnProperty('inlineEditTextarea');
+            scope.isNumber = isNumber;
 
             var onBlurBehavior = attrs.hasOwnProperty('inlineEditOnBlur') ?
               attrs.inlineEditOnBlur : InlineEditConfig.onBlur;
@@ -199,7 +200,8 @@
                 'ng-class="{\'ng-inline-edit__text--placeholder\': !model}" ' +
                 (attrs.hasOwnProperty('inlineEditOnClick') || InlineEditConfig.editOnClick ?
                   'ng-click="editText()" ' : '') +
-                'ng-if="!editMode">{{(model || placeholder)' +
+                'ng-if="!editMode">{{' +
+                (scope.isNumber(scope.model) || scope.model ? 'model' : 'placeholder') +
                 (attrs.hasOwnProperty('inlineEditFilter') ? ' | ' + attrs.inlineEditFilter : '') +
                   '}}</span>'));
 
@@ -256,6 +258,10 @@
             attrs.$observe('inlineEditPlaceholder', function(placeholder) {
               scope.placeholder = placeholder;
             });
+
+            function isNumber(value) {
+              return !isNaN(parseFloat(value)) && isFinite(value);
+            }
           }
         };
       }

diff --git a/dist/ng-inline-edit.min.css b/dist/ng-inline-edit.min.css
@@ -1,5 +1,5 @@
 /**
- * ng-inline-edit v0.6.0 (http://tamerayd.in/ng-inline-edit)
+ * ng-inline-edit v0.7.1 (http://tamerayd.in/ng-inline-edit)
  * Copyright 2015 Tamer Aydin (http://tamerayd.in)
  * Licensed under MIT
  */

diff --git a/dist/ng-inline-edit.min.js b/dist/ng-inline-edit.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng-inline-edit",
   "description": "Simple inline editing for HTML elements",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "main": "dist/ng-inline-edit.js",
   "keywords": [
     "angular",

diff --git a/src/scripts/directives.js b/src/scripts/directives.js
@@ -19,6 +19,7 @@
           link: function(scope, element, attrs) {
             scope.model = scope.$parent.$eval(attrs.inlineEdit);
             scope.isInputTextarea = attrs.hasOwnProperty('inlineEditTextarea');
+            scope.isNumber = isNumber;
 
             var onBlurBehavior = attrs.hasOwnProperty('inlineEditOnBlur') ?
               attrs.inlineEditOnBlur : InlineEditConfig.onBlur;
@@ -52,7 +53,8 @@
                 'ng-class="{\'ng-inline-edit__text--placeholder\': !model}" ' +
                 (attrs.hasOwnProperty('inlineEditOnClick') || InlineEditConfig.editOnClick ?
                   'ng-click="editText()" ' : '') +
-                'ng-if="!editMode">{{(model || placeholder)' +
+                'ng-if="!editMode">{{' +
+                (scope.isNumber(scope.model) || scope.model ? 'model' : 'placeholder') +
                 (attrs.hasOwnProperty('inlineEditFilter') ? ' | ' + attrs.inlineEditFilter : '') +
                   '}}</span>'));
 
@@ -109,6 +111,10 @@
             attrs.$observe('inlineEditPlaceholder', function(placeholder) {
               scope.placeholder = placeholder;
             });
+
+            function isNumber(value) {
+              return !isNaN(parseFloat(value)) && isFinite(value);
+            }
           }
         };
       }