Dev 1.4.4 百度编辑器上传视频音频的bug

Gruntfile.js

@@ -42,7 +42,7 @@ module.exports = function (grunt) {
  server = grunt.option('server') || 'php',
  encode = grunt.option('encode') || 'utf8',
  disDir = "dist/",
- banner = '/*!\n * UEditor\n * version: ' + packageJson.name + '\n * build: <%= new Date() %>\n */\n\n';
+ banner = '/*!\n * ' + packageJson.name + '\n * version: ' + packageJson.version + '\n * build: <%= new Date() %>\n */\n\n';
 
  //init
  (function () {
@@ -59,7 +59,8 @@ module.exports = function (grunt) {
  concat: {
  js: {
  options: {
- banner: banner + '(function(){\n\n',
+ banner: '/*!\n * ' + packageJson.name + '\n * version: ' + packageJson.version + '\n * build: <%= new Date() %>\n */\n\n' +
+ '(function(){\n\n',
  footer: '\n\n})();\n',
  process: function (src, s) {
  var filename = s.substr(s.indexOf('/') + 1);
@@ -71,7 +72,8 @@ module.exports = function (grunt) {
  },
  parse: {
  options: {
- banner: banner + '(function(){\n\n',
+ banner: '/*!\n * ' + packageJson.name + ' parse\n * version: ' + packageJson.version + '\n * build: <%= new Date() %>\n */\n\n' +
+ '(function(){\n\n',
  footer: '\n\n})();\n'
  },
  src: Util.fetchScripts("ueditor.parse.js", Util.parseBasePath),
@@ -94,25 +96,18 @@ module.exports = function (grunt) {
  ext: '.min.css'
  }
  },
- uglify: {
- options: {
- banner: banner
- },
- dest: {
- src: disDir + '<%= pkg.name %>.all.js',
- dest: disDir + '<%= pkg.name %>.all.min.js'
- },
- parse: {
- src: disDir + '<%= pkg.name %>.parse.js',
- dest: disDir + '<%= pkg.name %>.parse.min.js'
- }
- },
  closurecompiler: {
  dist: {
+ options: {
+ banner: '/*!\n * ' + packageJson.name + '\n * version: ' + packageJson.version + '\n * build: <%= new Date() %>\n */'
+ },
  src: disDir + '<%= pkg.name %>.all.js',
  dest: disDir + '<%= pkg.name %>.all.min.js'
  },
  parse: {
+ options: {
+ banner: '/*!\n * ' + packageJson.name + ' parse\n * version: ' + packageJson.version + '\n * build: <%= new Date() %>\n */'
+ },
  src: disDir + '<%= pkg.name %>.parse.js',
  dest: disDir + '<%= pkg.name %>.parse.min.js'
  }

README.md

@@ -5,13 +5,13 @@ Get Started
 
 UEditor是由百度web前端研发部开发所见即所得富文本web编辑器，具有轻量，可定制，注重用户体验等特点，开源基于MIT协议，允许自由使用和修改代码。
 
-## 入门部署和体验 ##
+## 1 入门部署和体验
 
-### 第一步：下载编辑器 ###
+### 1.1 下载编辑器
 
 到官网下载ueditor最新版：[[官网地址]](http://ueditor.baidu.com/website/download.html#ueditor "官网下载地址")
 
-### 第二步：创建demo文件 ###
+### 1.2 创建demo文件
 解压下载的包，在解压后的目录创建demo.html文件，填入下面的html代码
 
 ```html
@@ -36,13 +36,13 @@ UEditor是由百度web前端研发部开发所见即所得富文本web编辑器
 </html>
 ```
 
-### 第三步：在浏览器打开demo.html ###
+### 1.3 在浏览器打开demo.html
 
 如果看到了下面这样的编辑器，恭喜你，初次部署成功！
 
 ![部署成功](http://fex.baidu.com/ueditor/doc/images/demo.png)
 
-### 自定义的参数
+### 1.4 传入自定义的参数
 
 编辑器有很多可自定义的参数项，在实例化的时候可以传入给编辑器：
 ```javascript
@@ -53,11 +53,12 @@ var ue = UE.getEditor('container', {
 
 配置项也可以通过ueditor.config.js文件修改，具体的配置方法请看[前端配置项说明](http://fex.baidu.com/ueditor/#start-config1.4 前端配置项说明.md)
 
-### 设置和读取编辑器的内容
+### 1.5 设置和读取编辑器的内容
 
 通getContent和setContent方法可以设置和读取编辑器的内容
 ```javascript
-var ue = UE.getContent();
+var ue = UE.getEditor();
+//对编辑器的操作最好在编辑器ready之后再做
 ue.ready(function(){
  //设置编辑器的内容
  ue.setContent('hello');
@@ -70,21 +71,20 @@ ue.ready(function(){
 
 ueditor的更多API请看[API 文档](http://ueditor.baidu.com/doc "ueditor API 文档")
 
-## 相关链接 ##
+## 2 详细文档
 
 ueditor 官网：[http://ueditor.baidu.com](http://ueditor.baidu.com "ueditor 官网")
 
 ueditor API 文档：[http://ueditor.baidu.com/doc](http://ueditor.baidu.com/doc "ueditor API 文档")
 
 ueditor github 地址：[http://github.com/fex-team/ueditor](http://github.com/fex-team/ueditor "ueditor github 地址")
 
-## 详细文档
+## 3 第三方贡献
 
-ueditor 文档：[http://fex.baidu.com/ueditor/](http://fex.baidu.com/ueditor/)
+ueditor for nodejs 参考[https://github.com/netpi/ueditor](https://github.com/netpi/ueditor)
 
-
-
-## 联系我们 ##
+## 4 联系我们
 
 email：[[email protected]](mailto://email:[email protected] "发邮件给ueditor开发组")
+
 issue：[github issue](http://github.com/fex-team/ueditor/issues "ueditor 论坛")

_examples/addCustomizeButton.js

@@ -35,4 +35,38 @@ UE.registerUI('button',function(editor,uiName){
 
  //因为你是添加button,所以需要返回这个button
  return btn;
-}/*index 指定添加到工具栏上的那个位置，默认时追加到最后,editorId 指定这个UI是那个编辑器实例上的，默认是页面上所有的编辑器都会添加这个按钮*/);
+}/*index 指定添加到工具栏上的那个位置，默认时追加到最后,editorId 指定这个UI是那个编辑器实例上的，默认是页面上所有的编辑器都会添加这个按钮*/);
+
+//自定义引用样式例子
+UE.registerUI('myblockquote',function(editor,uiName){
+ editor.registerCommand(uiName,{
+ execCommand:function(){
+ this.execCommand('blockquote',{
+ "style":"border-left: 3px solid #E5E6E1; margin-left: 0px; padding-left: 5px; line-height:36px;"
+ });
+ }
+ });
+
+ var btn = new UE.ui.Button({
+ name:uiName,
+ title:'自定义引用',
+ cssRules :"background-position: -220px 0;",
+ onclick:function () {
+ editor.execCommand(uiName);
+ }
+ });
+
+ editor.addListener('selectionchange', function () {
+ console.log(this);
+ var state = editor.queryCommandState('blockquote');
+ if (state == -1) {
+ btn.setDisabled(true);
+ btn.setChecked(false);
+ } else {
+ btn.setDisabled(false);
+ btn.setChecked(state);
+ }
+ });
+
+ return btn;
+});

_examples/customizeToolbarUIDemo.html

@@ -36,8 +36,8 @@ <h1>二次开发demo</h1>
  //建议使用工厂方法getEditor创建和引用编辑器实例，如果在某个闭包下引用该编辑器，直接调用UE.getEditor('editor')就能拿到相关的实例
  UE.getEditor('editor',{
  //清空了工具栏
- toolbars:[[]]
- })
+ toolbars:[['combox','bold','button','dialog']]
+ });
 
 </script>
 </html>

_parse/list.js

@@ -35,7 +35,7 @@ UE.parse.register('list',function(utils){
  customCss.push(selector +' .list-paddingleft-2{padding-left:'+ this.listDefaultPaddingLeft+'px}');
  customCss.push(selector +' .list-paddingleft-3{padding-left:'+ this.listDefaultPaddingLeft*2+'px}');
 
- utils.cssRule('list', selector +' ol,'+selector +' ul{margin:0;padding:0;}li{clear:both;}'+customCss.join('\n'), document);
+ utils.cssRule('list', selector +' ol,'+selector +' ul{margin:0;padding:0;}\n' + selector + ' li{clear:both;}\n'+customCss.join('\n'), document);
  }
  function applyStyle(nodes){
  var T = this;

_parse/table.js

@@ -13,13 +13,13 @@ UE.parse.register('table', function (utils) {
  'background-position: center right; background-image:url(' + this.rootPath + 'themes/default/images/sortable.png);}' +
  selector + ' table.sortEnabled tr.firstRow th:hover,' + selector + ' table.sortEnabled tr.firstRow td:hover{background-color: #EEE;}' +
  selector + ' table{margin-bottom:10px;border-collapse:collapse;display:table;}' +
- selector + ' td,' + selector + ' th{ background:white; padding: 5px 10px;border: 1px solid #DDD;}' +
+ selector + ' td,' + selector + ' th{padding: 5px 10px;border: 1px solid #DDD;}' +
  selector + ' caption{border:1px dashed #DDD;border-bottom:0;padding:3px;text-align:center;}' +
  selector + ' th{border-top:1px solid #BBB;background:#F7F7F7;}' +
  selector + ' table tr.firstRow th{border-top:2px solid #BBB;background:#F7F7F7;}' +
  selector + ' tr.ue-table-interlace-color-single td{ background: #fcfcfc; }' +
  selector + ' tr.ue-table-interlace-color-double td{ background: #f7faff; }' +
- selector + ' td p{margin:0;padding:0;}',
+ selector + ' td p{margin:0;padding:0;width:auto;height:auto;}',
  document);
  //填充空的单元格
 
@@ -158,4 +158,4 @@ UE.parse.register('table', function (utils) {
  }
  }
  }
-});
+});

_src/adapter/editor.js

@@ -328,6 +328,7 @@
  var editor = this.editor;
  var toolbars = this.toolbars || [];
  var toolbarUis = [];
+ var extraUIs = [];
  for (var i = 0; i < toolbars.length; i++) {
  var toolbar = toolbars[i];
  var toolbarUi = new baidu.editor.ui.Toolbar({theme:editor.options.theme});
@@ -342,21 +343,36 @@
  if(toolbarItem == '||'){
  toolbarItem = 'Breakline';
  }
- if (baidu.editor.ui[toolbarItem]) {
- toolbarItemUi = new baidu.editor.ui[toolbarItem](editor);
+ var ui = baidu.editor.ui[toolbarItem];
+ if (ui) {
+ if(utils.isFunction(ui)){
+ toolbarItemUi = new baidu.editor.ui[toolbarItem](editor);
+ }else{
+ if(ui.id && ui.id != editor.key){
+ continue;
+ }
+ var itemUI = ui.execFn.call(editor,editor,toolbarItem);
+ if(itemUI){
+ if(ui.index === undefined){
+ toolbarUi.add(itemUI);
+ continue;
+ }else{
+ extraUIs.push({
+ index:ui.index,
+ itemUI:itemUI
+ })
+ }
+ }
+ }
  }
-
  //fullscreen这里单独处理一下，放到首行去
  if (toolbarItem == 'fullscreen') {
  if (toolbarUis && toolbarUis[0]) {
  toolbarUis[0].items.splice(0, 0, toolbarItemUi);
  } else {
  toolbarItemUi && toolbarUi.items.splice(0, 0, toolbarItemUi);
  }
-
  continue;
-
-
  }
  } else {
  toolbarItemUi = toolbarItem;
@@ -371,21 +387,9 @@
 
  //接受外部定制的UI
 
- utils.each(UE._customizeUI,function(obj,key){
- var itemUI,index;
- if(obj.id && obj.id != editor.key){
- return false;
- }
- itemUI = obj.execFn.call(editor,editor,key);
- if(itemUI){
- index = obj.index;
- if(index === undefined){
- index = toolbarUi.items.length;
- }
- toolbarUi.add(itemUI,index)
- }
+ utils.each(extraUIs,function(obj){
+ toolbarUi.add(obj.itemUI,obj.index)
  });
-
  this.toolbars = toolbarUis;
  },
  getHtmlTpl:function () {
@@ -846,7 +850,7 @@
 
  UE.registerUI = function(uiName,fn,index,editorId){
  utils.each(uiName.split(/\s+/), function (name) {
-  UE._customizeUI[name] = {
+ baidu.editor.ui[name] = {
  id : editorId,
  execFn:fn,
  index:index

_src/adapter/message.js

@@ -6,6 +6,11 @@ UE.registerUI('message', function(editor) {
  var _messageItems = [];
  var me = editor;
 
+ me.setOpt('enableMessageShow', true);
+ if (me.getOpt('enableMessageShow') === false) {
+ return;
+ }
+
  me.addListener('ready', function(){
  holder = document.getElementById(me.ui.id + '_message_holder');
  updateHolderPos();
@@ -48,6 +53,7 @@ UE.registerUI('message', function(editor) {
  });
 
  function updateHolderPos(){
+ if (!holder || !me.ui) return;
  var toolbarbox = me.ui.getDom('toolbarbox');
  if (toolbarbox) {
  holder.style.top = toolbarbox.offsetHeight + 3 + 'px';

_src/core/Editor.js

@@ -404,7 +404,8 @@
  container.style.zIndex = options.zIndex;
 
  var html = ( ie && browser.version < 9 ? '' : '<!DOCTYPE html>') +
- '<html xmlns=\'http://www.w3.org/1999/xhtml\' class=\'view\' ><head>' +
+ '<html xmlns=\'http://www.w3.org/1999/xhtml\' class=\'view\' >' +
+ '<head>' +
  '<style type=\'text/css\'>' +
  //设置四周的留边
  '.view{padding:0;word-wrap:break-word;cursor:text;height:90%;}\n' +
@@ -413,12 +414,17 @@
  'body{margin:8px;font-family:sans-serif;font-size:16px;}' +
  //设置段落间距
  'p{margin:5px 0;}</style>' +
- ( options.iframeCssUrl ? '<link rel=\'stylesheet\' type=\'text/css\' href=\'' + utils.unhtml(options.iframeCssUrl) + '\'/>' : '' ) +
+ (options.iframeCssUrl ? '<link rel=\'stylesheet\' type=\'text/css\' href=\'' + utils.unhtml(options.iframeCssUrl) + '\'/>' : '' ) +
  (options.initialStyle ? '<style>' + options.initialStyle + '</style>' : '') +
- '</head><body class=\'view\' ></body>' +
+ '</head>' +
+ '<body class=\'view\' ></body>' +
  '<script type=\'text/javascript\' ' + (ie ? 'defer=\'defer\'' : '' ) +' id=\'_initialScript\'>' +
  'setTimeout(function(){editor = window.parent.UE.instants[\'ueditorInstant' + me.uid + '\'];editor._setup(document);},0);' +
- 'var _tmpScript = document.getElementById(\'_initialScript\');_tmpScript.parentNode.removeChild(_tmpScript);</script></html>';
+ 'var _tmpScript = document.getElementById(\'_initialScript\');_tmpScript.parentNode.removeChild(_tmpScript);' +
+ '</script>' +
+ (options.iframeJsUrl ? ('<script type=\'text/javascript\' src=\'' + utils.unhtml(options.iframeJsUrl) + '\'></script>'):'') +
+ '</html>';
+
  container.appendChild(domUtils.createElement(document, 'iframe', {
  id: 'ueditor_' + me.uid,
  width: "100%",

_src/core/Range.js

@@ -1281,6 +1281,12 @@
  domUtils.setAttributes(elm, attrs);
  }
  elm.appendChild(frag);
+ //针对嵌套span的全局样式指定，做容错处理
+ if(elm.tagName == 'SPAN' && attrs && attrs.style){
+ utils.each(elm.getElementsByTagName('span'),function(s){
+ s.style.cssText = s.style.cssText + ';' + attrs.style;
+ })
+ }
  range.insertNode(list ? top : elm);
  //处理下滑线在a上的情况
  var aNode;

_src/core/browser.js

@@ -23,7 +23,7 @@ var browser = UE.browser = function(){
  * }
  * ```
  */
- ie : /(msie\s|trident.*rv:)([\w.]+)/.test(agent),
+ ie : /(msie\s|trident.*rv:)([\w.]+)/i.test(agent),
 
  /**
  * @property {boolean} opera 检测当前浏览器是否为Opera

_src/core/dtd.js

@@ -20,7 +20,7 @@ var dtd = dom.dtd = (function() {
  D = X( {iframe:1}, C ),
  E = _({hr:1,ul:1,menu:1,div:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1}),
  F = _({ins:1,del:1,script:1,style:1}),
- G = X( _({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1}), F ),
+ G = X( _({mark:1,b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1}), F ),
  H = X( _({sub:1,img:1,embed:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1}), G ),
  I = X( _({p:1}), H ),
  J = X( _({iframe:1}), H, B ),
@@ -174,6 +174,7 @@ var dtd = dom.dtd = (function() {
  pre : X( G, C ),
  p : X(_({'a':1}),L),
  em :L,
- dfn : L
+ dfn : L,
+ mark:L
  });
 })();