Skip to content

Commit

Permalink
Merge pull request #325 from Lizhooh/master
Browse files Browse the repository at this point in the history
修改字号信息错误
  • Loading branch information
wangfupeng1988 committed Jul 16, 2016
2 parents b719778 + 68b675f commit e6c7d51
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions dist/js/wangEditor.js
Expand Up @@ -3250,19 +3250,19 @@ _e(function (E, $) {
'宋体', '黑体', '楷体', '微软雅黑',
'Arial', 'Verdana', 'Georgia',
'Times New Roman', 'Microsoft JhengHei',
'Trebuchet MS', 'Courier New', 'Impact', 'Comic Sans MS'
'Trebuchet MS', 'Courier New', 'Impact', 'Comic Sans MS', 'Consolas',
];

// 字号
E.config.fontsizes = {
// 格式:'value': 'title'
1: '10px',
1: '12px',
2: '13px',
3: '16px',
4: '19px',
5: '22px',
6: '25px',
7: '28px'
4: '18px',
5: '24px',
6: '32px',
7: '48px',
};

// 表情包
Expand Down Expand Up @@ -8487,4 +8487,4 @@ _e(function (E, $) {

// 最终返回wangEditor构造函数
return window.wangEditor;
});
});

0 comments on commit e6c7d51

Please sign in to comment.