diff --git a/bower.json b/bower.json
index 4c28b4f..09e8973 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "angular-wt-editor",
- "version": "1.0.14",
+ "version": "1.0.15",
"homepage": "https://github.com/WorktileTech/angular-wt-editor",
"authors": [
"YCTech"
diff --git a/demo/index.html b/demo/index.html
index 48b693e..68c774b 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -1 +1 @@
-
wt-editor
\ No newline at end of file
+
wt-editor
\ No newline at end of file
diff --git a/package.json b/package.json
index cc8f130..a02f180 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "angular-wt-editor",
- "version": "1.0.14",
+ "version": "1.0.15",
"description": "angular-wt-editor =================",
"main": "index.js",
"scripts": {
diff --git a/src/js/editor.js b/src/js/editor.js
index f3d03c5..410b178 100644
--- a/src/js/editor.js
+++ b/src/js/editor.js
@@ -568,6 +568,54 @@ angular.module("wt-editor")
//继承设置
angular.extend(wtEditorConfig, scope.config);
if (wtEditorConfig.type === 'simple') {
+ vm.toolbars = _.union(
+ [{
+ id : 1,
+ title : '粗体',
+ className: 'fa fa-bold',
+ modifier : '**',
+ type : 'styleFn',
+ name : 'bold'
+ }, {
+ id : 2,
+ title : '斜体',
+ className: 'fa fa-italic',
+ modifier : '*',
+ type : 'styleFn',
+ name : 'italic'
+ }],[{
+ id : 16,
+ title : '链接',
+ className: 'fa fa-link',
+ text : '链接文字',
+ url : 'http://example.com',
+ type : 'styleFn',
+ name : 'link'
+ }], [{id:'d1',type: 'dividor'}],
+ wtEditorConfig.horizonToolbar,
+ [{
+ id : 11,
+ title : '引用',
+ className: 'fa fa-quote-left',
+ prefix : '> ',
+ type : 'styleFn',
+ name : 'quote'
+ }, {
+ id : 12,
+ title : '无序列表',
+ className: 'fa fa-list-ul',
+ prefix : '- ',
+ type : 'styleFn',
+ name : 'list'
+ }, {
+ id : 13,
+ title : '有序列表',
+ className: 'fa fa-list-ol',
+ prefix : '1. ',
+ type : 'styleFn',
+ name : 'list-2'
+ }]);
+ }else if(wtEditorConfig.type === 'complex'){
vm.toolbars = _.union(
wtEditorConfig.hToolbars,
wtEditorConfig.styleToolBar, [{id:'d1',type: 'dividor'}],
@@ -576,7 +624,7 @@ angular.module("wt-editor")
wtEditorConfig.listToolbar, [{id:'d3',type: 'dividor'}],
wtEditorConfig.linkToolbar, [{id:'d4',type: 'dividor'}],
wtEditorConfig.expandToolbar);
- } else if (wtEditorConfig.type === 'all') {
+ }else if (wtEditorConfig.type === 'all') {
vm.toolbars = _.union(
wtEditorConfig.hToolbars,
wtEditorConfig.styleToolBar, [{id:'d1',type: 'dividor'}],