add placeholder

worktile · Mar 8, 2017 · 2c636bd · 2c636bd
1 parent 46d6f7a
commit 2c636bd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-wt-editor",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/WorktileTech/angular-wt-editor",
   "authors": [
     "YCTech"

diff --git a/dist/wt-editor-min.js b/dist/wt-editor-min.js
diff --git a/dist/wt-editor.js b/dist/wt-editor.js
@@ -679,7 +679,7 @@ angular.module("wt-editor")
 
                 vm.editor = $(element).find('.wt-editor-textarea')[0];
                 try{
-                    vm.editor.setAttribute('placeholder',controller[0].getLocaleText('placeholder'));
+                    vm.editor.setAttribute('placeholder',wtEditorConfig.placeholder?wtEditorConfig.placeholder:controller[0].getLocaleText('placeholder'));
                 }catch(e){}
 
                 //插入方法

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-wt-editor",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "angular-wt-editor =================",
   "main": "index.js",
   "scripts": {

diff --git a/src/js/editor.js b/src/js/editor.js
@@ -677,7 +677,7 @@ angular.module("wt-editor")
 
                 vm.editor = $(element).find('.wt-editor-textarea')[0];
                 try{
-                    vm.editor.setAttribute('placeholder',controller[0].getLocaleText('placeholder'));
+                    vm.editor.setAttribute('placeholder',wtEditorConfig.placeholder?wtEditorConfig.placeholder:controller[0].getLocaleText('placeholder'));
                 }catch(e){}
 
                 //插入方法