From 0f557f6f512ca85745feaf775d3c85fe63ee35a7 Mon Sep 17 00:00:00 2001 From: Tamer Aydin Date: Wed, 29 Apr 2015 23:02:22 +0200 Subject: [PATCH] updated dist files --- dist/ng-inline-edit.js | 15 ++++++++------- dist/ng-inline-edit.min.js | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dist/ng-inline-edit.js b/dist/ng-inline-edit.js index b49b296..65e98ce 100644 --- 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( '
'); @@ -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 index 21c56a0..a7ca85e 100644 --- a/dist/ng-inline-edit.min.js +++ b/dist/ng-inline-edit.min.js @@ -3,4 +3,4 @@ * Copyright 2015 Tamer Aydin (http://tamerayd.in) * Licensed under MIT */ -!function(n,i){"use strict";i.module("angularInlineEdit.providers",[]).value("InlineEditConfig",{btnEdit:"Edit",btnSave:"",btnCancel:"",editOnClick:!1,onBlur:null}).constant("InlineEditConstants",{CANCEL:"cancel",SAVE:"save"})}(window,window.angular),function(n,i){"use strict";i.module("angularInlineEdit.controllers",[]).controller("InlineEditController",["$scope","$document","$timeout",function(n,i,e){n.validationError=!1,n.validating=!1,n.isOnBlurBehaviorValid=!1,n.cancelOnBlur=!1,n.editMode=!1,n.inputValue="",n.editText=function(t){n.editMode=!0,n.inputValue="string"==typeof t?t:n.model,e(function(){n.editInput[0].focus(),n.isOnBlurBehaviorValid&&i.bind("click",n.onDocumentClick)},0)},n.applyText=function(t,l){function a(){n.model=r,n.callback({newValue:r}),n.editMode=!1}function d(){n.validationError=!0,e(function(){n.editText(r)},0)}function o(i){n.validating=!1,i&&l&&n.$apply()}var r=n.inputValue;if(n.validationError=!1,t||n.model===r)n.editMode=!1,l&&n.$apply();else{n.validating=!0,l&&n.$apply();var c=n.validate({newValue:n.inputValue});c&&c.then?c.then(a)["catch"](d)["finally"](o):c||"undefined"==typeof c?(a(),o(!0)):(d(),o(!0))}n.isOnBlurBehaviorValid&&i.unbind("click",n.onDocumentClick)},n.onInputKeyup=function(i){if(!n.validating)switch(i.keyCode){case 13:n.applyText(!1,!1);break;case 27:n.applyText(!0,!1)}},n.onDocumentClick=function(i){n.validating||i.target!==n.editInput[0]&&n.applyText(n.cancelOnBlur,!0)}}])}(window,window.angular),function(n,i){"use strict";i.module("angularInlineEdit.directives",["angularInlineEdit.providers","angularInlineEdit.controllers"]).directive("inlineEdit",["$compile","$interpolate","InlineEditConfig","InlineEditConstants",function(n,e,t,l){return{restrict:"A",controller:"InlineEditController",scope:{model:"=inlineEdit",placeholder:"@inlineEditPlaceholder",callback:"&inlineEditCallback",validate:"&inlineEditValidation"},link:function(a,d,o){a.model=a.$parent.$eval(o.inlineEdit),a.placeholder=a.placeholder?e(a.placeholder)(a.$parent):"";var r=o.hasOwnProperty("inlineEditOnBlur")?o.inlineEditOnBlur:t.onBlur;(r===l.CANCEL||r===l.SAVE)&&(a.isOnBlurBehaviorValid=!0,a.cancelOnBlur=r===l.CANCEL);var c=i.element("
"),u=i.element(''),p=i.element('
');p.append(i.element('{{model || placeholder}}'));var s=o.hasOwnProperty("inlineEditBtnEdit")?o.inlineEditBtnEdit:t.btnEdit;s&&p.append(i.element(''+s+""));var g=o.hasOwnProperty("inlineEditBtnSave")?o.inlineEditBtnSave:t.btnSave;g&&p.append(i.element(''+g+""));var v=o.hasOwnProperty("inlineEditBtnCancel")?o.inlineEditBtnCancel:t.btnCancel;v&&p.append(i.element(''+v+"")),c.append(u).append(p),d.append(c),a.editInput=u,o.$observe("inlineEdit",function(i){a.model=a.$parent.$eval(i),n(d.contents())(a)})}}}])}(window,window.angular),function(n,i){"use strict";i.module("angularInlineEdit",["angularInlineEdit.providers","angularInlineEdit.controllers","angularInlineEdit.directives"])}(window,window.angular); \ No newline at end of file +!function(n,i){"use strict";i.module("angularInlineEdit.providers",[]).value("InlineEditConfig",{btnEdit:"Edit",btnSave:"",btnCancel:"",editOnClick:!1,onBlur:null}).constant("InlineEditConstants",{CANCEL:"cancel",SAVE:"save"})}(window,window.angular),function(n,i){"use strict";i.module("angularInlineEdit.controllers",[]).controller("InlineEditController",["$scope","$document","$timeout",function(n,i,e){n.placeholder="",n.validationError=!1,n.validating=!1,n.isOnBlurBehaviorValid=!1,n.cancelOnBlur=!1,n.editMode=!1,n.inputValue="",n.editText=function(t){n.editMode=!0,n.inputValue="string"==typeof t?t:n.model,e(function(){n.editInput[0].focus(),n.isOnBlurBehaviorValid&&i.bind("click",n.onDocumentClick)},0)},n.applyText=function(t,l){function a(){n.model=r,n.callback({newValue:r}),n.editMode=!1}function d(){n.validationError=!0,e(function(){n.editText(r)},0)}function o(i){n.validating=!1,i&&l&&n.$apply()}var r=n.inputValue;if(n.validationError=!1,t||n.model===r)n.editMode=!1,l&&n.$apply();else{n.validating=!0,l&&n.$apply();var c=n.validate({newValue:n.inputValue});c&&c.then?c.then(a)["catch"](d)["finally"](o):c||"undefined"==typeof c?(a(),o(!0)):(d(),o(!0))}n.isOnBlurBehaviorValid&&i.unbind("click",n.onDocumentClick)},n.onInputKeyup=function(i){if(!n.validating)switch(i.keyCode){case 13:n.applyText(!1,!1);break;case 27:n.applyText(!0,!1)}},n.onDocumentClick=function(i){n.validating||i.target!==n.editInput[0]&&n.applyText(n.cancelOnBlur,!0)}}])}(window,window.angular),function(n,i){"use strict";i.module("angularInlineEdit.directives",["angularInlineEdit.providers","angularInlineEdit.controllers"]).directive("inlineEdit",["$compile","InlineEditConfig","InlineEditConstants",function(n,e,t){return{restrict:"A",controller:"InlineEditController",scope:{model:"=inlineEdit",callback:"&inlineEditCallback",validate:"&inlineEditValidation"},link:function(l,a,d){l.model=l.$parent.$eval(d.inlineEdit);var o=d.hasOwnProperty("inlineEditOnBlur")?d.inlineEditOnBlur:e.onBlur;(o===t.CANCEL||o===t.SAVE)&&(l.isOnBlurBehaviorValid=!0,l.cancelOnBlur=o===t.CANCEL);var r=i.element("
"),c=i.element(''),u=i.element('
');u.append(i.element('{{model || placeholder}}'));var p=d.hasOwnProperty("inlineEditBtnEdit")?d.inlineEditBtnEdit:e.btnEdit;p&&u.append(i.element(''+p+""));var s=d.hasOwnProperty("inlineEditBtnSave")?d.inlineEditBtnSave:e.btnSave;s&&u.append(i.element(''+s+""));var g=d.hasOwnProperty("inlineEditBtnCancel")?d.inlineEditBtnCancel:e.btnCancel;g&&u.append(i.element(''+g+"")),r.append(c).append(u),a.append(r),l.editInput=c,d.$observe("inlineEdit",function(i){l.model=l.$parent.$eval(i),n(a.contents())(l)}),d.$observe("inlineEditPlaceholder",function(n){l.placeholder=n})}}}])}(window,window.angular),function(n,i){"use strict";i.module("angularInlineEdit",["angularInlineEdit.providers","angularInlineEdit.controllers","angularInlineEdit.directives"])}(window,window.angular); \ No newline at end of file