bump to version 0.6.0

tameraydin · Sep 28, 2015 · de2dea5 · de2dea5
1 parent 9c00e07
commit de2dea5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/dist/ng-inline-edit.css b/dist/ng-inline-edit.css
@@ -1,5 +1,5 @@
 /**
- * ng-inline-edit v0.5.3 (http://tamerayd.in/ng-inline-edit)
+ * ng-inline-edit v0.6.0 (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.5.3 (http://tamerayd.in/ng-inline-edit)
+ * ng-inline-edit v0.6.0 (http://tamerayd.in/ng-inline-edit)
  * Copyright 2015 Tamer Aydin (http://tamerayd.in)
  * Licensed under MIT
  */
@@ -119,6 +119,9 @@
           if (!$scope.validating) {
             switch (event.keyCode) {
               case 13: // ENTER
+                if ($scope.isInputTextarea) {
+                  return;
+                }
                 $scope.applyText(false, false);
                 break;
               case 27: // ESC
@@ -162,6 +165,7 @@
           },
           link: function(scope, element, attrs) {
             scope.model = scope.$parent.$eval(attrs.inlineEdit);
+            scope.isInputTextarea = attrs.hasOwnProperty('inlineEditTextarea');
 
             var onBlurBehavior = attrs.hasOwnProperty('inlineEditOnBlur') ?
               attrs.inlineEditOnBlur : InlineEditConfig.onBlur;
@@ -177,7 +181,9 @@
                   '\'ng-inline-edit--error\': validationError}">');
 
             var input = angular.element(
-              '<input type="text" class="ng-inline-edit__input" ' +
+              (scope.isInputTextarea ?
+                '<textarea ' : '<input type="text" ') +
+                'class="ng-inline-edit__input" ' +
                 'ng-disabled="validating" ' +
                 'ng-show="editMode" ' +
                 'ng-keyup="onInputKeyup($event)" ' +

diff --git a/dist/ng-inline-edit.min.css b/dist/ng-inline-edit.min.css
@@ -1,5 +1,5 @@
 /**
- * ng-inline-edit v0.5.3 (http://tamerayd.in/ng-inline-edit)
+ * ng-inline-edit v0.6.0 (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.5.3",
+  "version": "0.6.0",
   "main": "dist/ng-inline-edit.js",
   "keywords": [
     "angular",