Make placeholder optional; merge #52; bumped version

thijsw · Mar 15, 2016 · 5b27c24 · 5b27c24
1 parent 39dc0b4
commit 5b27c24
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-medium-editor",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "dependencies": {
     "angular": ">=1.3.0",
     "medium-editor": "5.*"

diff --git a/dist/angular-medium-editor.js b/dist/angular-medium-editor.js
@@ -26,7 +26,10 @@ angular.module('angular-medium-editor', [])
 
         ngModel.$render = function() {
           iElement.html(ngModel.$viewValue || "");
-          ngModel.editor.getExtensionByName('placeholder').updatePlaceholder(iElement[0]);
+          var placeholder = ngModel.editor.getExtensionByName('placeholder');
+          if (placeholder) {
+            placeholder.updatePlaceholder(iElement[0]);
+          }
         };
 
         ngModel.$isEmpty = function(value) {
@@ -46,6 +49,10 @@ angular.module('angular-medium-editor', [])
         scope.$watch('bindOptions', function(bindOptions) {
           ngModel.editor.init(iElement, bindOptions);
         });
+
+        scope.$on('$destroy', function() {
+          ngModel.editor.destroy();
+        });
       }
     };
 

diff --git a/dist/angular-medium-editor.min.js b/dist/angular-medium-editor.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-medium-editor",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "AngularJS directive for Medium.com editor clone",
   "keywords": [
     "angular",
@@ -17,11 +17,7 @@
     "type": "git",
     "url": "https://github.com/thijsw/angular-medium-editor.git"
   },
-  "licenses": [
-    {
-      "type": "MIT"
-    }
-  ],
+  "license": "MIT",
   "devDependencies": {
     "connect-livereload": "^0.4.0",
     "grunt": "^0.4.5",

diff --git a/src/angular-medium-editor.js b/src/angular-medium-editor.js
@@ -26,7 +26,10 @@ angular.module('angular-medium-editor', [])
 
         ngModel.$render = function() {
           iElement.html(ngModel.$viewValue || "");
-          ngModel.editor.getExtensionByName('placeholder').updatePlaceholder(iElement[0]);
+          var placeholder = ngModel.editor.getExtensionByName('placeholder');
+          if (placeholder) {
+            placeholder.updatePlaceholder(iElement[0]);
+          }
         };
 
         ngModel.$isEmpty = function(value) {