Merge branch 'mikedobrin-master'

tameraydin · Apr 29, 2015 · 9d908dc · 9d908dc · mikedobrin · Apr 30, 2015
2 parents 68ba3cf + 0f557f6
commit 9d908dc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/dist/ng-inline-edit.js b/dist/ng-inline-edit.js
@@ -29,6 +29,7 @@
     .module('angularInlineEdit.controllers', [])
     .controller('InlineEditController', ['$scope', '$document', '$timeout',
       function($scope, $document, $timeout) {
+        $scope.placeholder = '';
         $scope.validationError = false;
         $scope.validating = false;
         $scope.isOnBlurBehaviorValid = false;
@@ -149,22 +150,18 @@
       'angularInlineEdit.providers',
       'angularInlineEdit.controllers'
     ])
-    .directive('inlineEdit', [
-      '$compile', '$interpolate', 'InlineEditConfig', 'InlineEditConstants',
-      function($compile, $interpolate, InlineEditConfig, InlineEditConstants) {
+    .directive('inlineEdit', ['$compile', 'InlineEditConfig', 'InlineEditConstants',
+      function($compile, InlineEditConfig, InlineEditConstants) {
         return {
           restrict: 'A',
           controller: 'InlineEditController',
           scope: {
             model: '=inlineEdit',
-            placeholder: '@inlineEditPlaceholder',
             callback: '&inlineEditCallback',
             validate: '&inlineEditValidation'
           },
           link: function(scope, element, attrs) {
             scope.model = scope.$parent.$eval(attrs.inlineEdit);
-            scope.placeholder = scope.placeholder ?
-              $interpolate(scope.placeholder)(scope.$parent) : '';
 
             var onBlurBehavior = attrs.hasOwnProperty('inlineEditOnBlur') ?
               attrs.inlineEditOnBlur : InlineEditConfig.onBlur;
@@ -185,7 +182,7 @@
                 'ng-show="editMode" ' +
                 'ng-keyup="onInputKeyup($event)" ' +
                 'ng-model="inputValue" ' +
-                'placeholder="' + scope.placeholder + '" />');
+                'placeholder="{{placeholder}}" />');
 
             var innerContainer = angular.element(
               '<div class="ng-inline-edit__inner-container"></div>');
@@ -247,6 +244,10 @@
               scope.model = scope.$parent.$eval(newValue);
               $compile(element.contents())(scope);
             });
+
+            attrs.$observe('inlineEditPlaceholder', function(placeholder) {
+              scope.placeholder = placeholder;
+            });
           }
         };
       }

diff --git a/dist/ng-inline-edit.min.js b/dist/ng-inline-edit.min.js
diff --git a/src/scripts/controllers.js b/src/scripts/controllers.js
@@ -5,6 +5,7 @@
     .module('angularInlineEdit.controllers', [])
     .controller('InlineEditController', ['$scope', '$document', '$timeout',
       function($scope, $document, $timeout) {
+        $scope.placeholder = '';
         $scope.validationError = false;
         $scope.validating = false;
         $scope.isOnBlurBehaviorValid = false;

diff --git a/src/scripts/directives.js b/src/scripts/directives.js
@@ -6,22 +6,18 @@
       'angularInlineEdit.providers',
       'angularInlineEdit.controllers'
     ])
-    .directive('inlineEdit', [
-      '$compile', '$interpolate', 'InlineEditConfig', 'InlineEditConstants',
-      function($compile, $interpolate, InlineEditConfig, InlineEditConstants) {
+    .directive('inlineEdit', ['$compile', 'InlineEditConfig', 'InlineEditConstants',
+      function($compile, InlineEditConfig, InlineEditConstants) {
         return {
           restrict: 'A',
           controller: 'InlineEditController',
           scope: {
             model: '=inlineEdit',
-            placeholder: '@inlineEditPlaceholder',
             callback: '&inlineEditCallback',
             validate: '&inlineEditValidation'
           },
           link: function(scope, element, attrs) {
             scope.model = scope.$parent.$eval(attrs.inlineEdit);
-            scope.placeholder = scope.placeholder ?
-              $interpolate(scope.placeholder)(scope.$parent) : '';
 
             var onBlurBehavior = attrs.hasOwnProperty('inlineEditOnBlur') ?
               attrs.inlineEditOnBlur : InlineEditConfig.onBlur;
@@ -42,7 +38,7 @@
                 'ng-show="editMode" ' +
                 'ng-keyup="onInputKeyup($event)" ' +
                 'ng-model="inputValue" ' +
-                'placeholder="' + scope.placeholder + '" />');
+                'placeholder="{{placeholder}}" />');
 
             var innerContainer = angular.element(
               '<div class="ng-inline-edit__inner-container"></div>');
@@ -104,6 +100,10 @@
               scope.model = scope.$parent.$eval(newValue);
               $compile(element.contents())(scope);
             });
+
+            attrs.$observe('inlineEditPlaceholder', function(placeholder) {
+              scope.placeholder = placeholder;
+            });
           }
         };
       }