Dev

README.md

@@ -11,7 +11,7 @@ UMeditor，简称UM，是 [ueditor](http://ueditor.baidu.com) 的简版。是为
 2. **加载速度更快**: 放弃了使用传统的iframe模式，采用了div的加载方式，以达到更快的加载速度和零加载失败率。
 2. **可定制**: 配置项完善，可定制程度高。
 2. **可扩展**: 代码层次拆分清晰，功能以插件形式挂接，可灵活定制需要的功能。
-3. **多后台支持**: 支持php、asp、jsp、.net四种后台部署代码
+3. **多后台支持**: 支持php、asp、jsp、net四中后台部署代码
 4. **功能丰富**: 支持插入公式、粘贴QQ截屏、拖放上传图片、插入地图、草稿箱功能
 
 ## 入门部署和体验 ##

asp/getContent.asp → _examples/server/getContent.asp

@@ -1,7 +1,7 @@
 <% @LANGUAGE="VBSCRIPT" CODEPAGE="65001" %>
-<script src="../third-party/jquery.min.js"></script>
-<script src="../third-party/mathquill/mathquill.min.js"></script>
-<link rel="stylesheet" href="../third-party/mathquill/mathquill.css"/>
+<script src="../../third-party/jquery.min.js"></script>
+<script src="../../third-party/mathquill/mathquill.min.js"></script>
+<link rel="stylesheet" href="../../third-party/mathquill/mathquill.css"/>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
 <%
 	Dim content

jsp/getContent.jsp → _examples/server/getContent.jsp

@@ -1,7 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
-<script src="../third-party/jquery.min.js"></script>
-<script src="../third-party/mathquill/mathquill.min.js"></script>
-<link rel="stylesheet" href="../third-party/mathquill/mathquill.css"/>
+<script src="../../third-party/jquery.min.js"></script>
+<script src="../../third-party/mathquill/mathquill.min.js"></script>
+<link rel="stylesheet" href="../../third-party/mathquill/mathquill.css"/>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
 <%
 request.setCharacterEncoding("utf-8");

php/getContent.php → _examples/server/getContent.php

@@ -1,6 +1,6 @@
-<script src="../third-party/jquery.min.js"></script>
-<script src="../third-party/mathquill/mathquill.min.js"></script>
-<link rel="stylesheet" href="../third-party/mathquill/mathquill.css"/>
+<script src="../../third-party/jquery.min.js"></script>
+<script src="../../third-party/mathquill/mathquill.min.js"></script>
+<link rel="stylesheet" href="../../third-party/mathquill/mathquill.css"/>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
 <?php
 
@@ -9,6 +9,6 @@
     $content =  htmlspecialchars($_POST['myEditor']);
 
     //存入数据库或者其他操作
-
     //显示
     echo  "<div class='content'>".htmlspecialchars_decode($content)."</div>";
+?>

_examples/submitFormDemo.html

@@ -37,13 +37,13 @@ <h1>UMEDITOR 提交示例</h1>
         form=doc.getElementById("form");
 
     if(version.match(/php/)){
-        form.action="../php/getContent.php";
+        form.action="./server/getContent.php";
     }else if(version.match(/net/)){
-        form.action="../net/getContent.ashx";
+        form.action="./server/getContent.ashx";
     }else if(version.match(/jsp/)){
-        form.action="../jsp/getContent.jsp";
+        form.action="./server/getContent.jsp";
     }else if(version.match(/asp/)){
-        form.action="../asp/getContent.asp";
+        form.action="./server/getContent.asp";
     }
 </script>
 

_src/adapter/adapter.js

@@ -20,7 +20,7 @@
         registerUI: function (name, fn) {
             utils.each(name.split(/\s+/), function (uiname) {
                 _editorUI[uiname] = fn;
-            })
+            });
         },
 
         setEditor : function(editor){
@@ -43,7 +43,7 @@
             }
         },
         getWidgetData : function(name){
-            return _widgetData[name]
+            return _widgetData[name];
         },
         setWidgetBody : function(name,$widget,editor){
             if(!editor._widgetData){
@@ -56,10 +56,10 @@
                     getWidgetCallback : function(widgetName){
                         var me = this;
                         return function(){
-                            return  _widgetCallBack[widgetName].apply(me,[me,$widget].concat(Array.prototype.slice.call(arguments,0)))
-                        }
+                            return  _widgetCallBack[widgetName].apply(me,[me,$widget].concat(Array.prototype.slice.call(arguments,0)));
+                        };
                     }
-                })
+                });
 
             }
             var pro = _widgetData[name];
@@ -102,7 +102,7 @@
         },
         clearCache : function(id){
             if ( _editors[id]) {
-                delete  _editors[id]
+                delete  _editors[id];
             }
         },
         delEditor: function (id) {
@@ -131,9 +131,13 @@
                 });
                 var options = editor.options;
                 if(options.initialFrameWidth){
-                    options.minFrameWidth = options.initialFrameWidth
+                    options.minFrameWidth = options.initialFrameWidth;
                 }else{
                     options.minFrameWidth = options.initialFrameWidth = editor.$body.width() || UM.defaultWidth;
+                    var styleWidth = editor.$body[0].style.width;
+                    if(styleWidth.match(/%$/)) {
+                        options.initialFrameWidth = styleWidth;
+                    }
                 }
 
                 $container.css({
@@ -151,7 +155,7 @@
                 $.eduitooltip && $.eduitooltip('attachTo', $("[data-original-title]",$container)).css('z-index',editor.getOpt('zIndex')+1);
 
                 $container.find('a').click(function(evt){
-                    evt.preventDefault()
+                    evt.preventDefault();
                 });
 
                 editor.fireEvent("afteruiready");
@@ -212,12 +216,12 @@
                     btns.length && toolbar.appendToBtnmenu(btns);
                 });
             } else {
-                $toolbar.find('.edui-btn-toolbar').remove()
+                $toolbar.find('.edui-btn-toolbar').remove();
             }
             return $toolbar;
         }
 
-    })
+    });
 
 
 })();

_src/adapter/dialog.js

@@ -1,4 +1,4 @@
-UM.registerUI('link image video map formula',function(name){
+UM.registerUI('link image video map',function(name){
 
     var me = this, currentRange, $dialog,
         opt = {
@@ -26,17 +26,17 @@ UM.registerUI('link image video map formula',function(name){
                 opt.oklabel = ok.label || me.getLang('ok');
                 if(ok.exec){
                     opt.okFn = function(){
-                        return $.proxy(ok.exec,null,me,$dialog)()
-                    }
+                        return $.proxy(ok.exec,null,me,$dialog)();
+                    };
                 }
             }
             var cancel = data.buttons.cancel;
             if(cancel){
                 opt.cancellabel = cancel.label || me.getLang('cancel');
                 if(cancel.exec){
                     opt.cancelFn = function(){
-                        return $.proxy(cancel.exec,null,me,$dialog)()
-                    }
+                        return $.proxy(cancel.exec,null,me,$dialog)();
+                    };
                 }
             }
         }
@@ -51,7 +51,7 @@ UM.registerUI('link image video map formula',function(name){
         $dialog.edui().on('beforehide',function () {
             var rng = me.selection.getRange();
             if (rng.equals(currentRange)) {
-                rng.select()
+                rng.select();
             }
         }).on('beforeshow', function () {
                 var $root = this.root(),
@@ -81,21 +81,19 @@ UM.registerUI('link image video map formula',function(name){
                 UM.setWidgetBody(name,$dialog,me);
                 UM.setTopEditor(me);
         }).on('afterbackdrop',function(){
-            this.$backdrop.css('zIndex',me.getOpt('zIndex')+1).appendTo(me.$container.find('.edui-dialog-container'))
-            $dialog.css('zIndex',me.getOpt('zIndex')+2)
+            this.$backdrop.css('zIndex',me.getOpt('zIndex')+1).appendTo(me.$container.find('.edui-dialog-container'));
+            $dialog.css('zIndex',me.getOpt('zIndex')+2);
         }).on('beforeok',function(){
             try{
-                currentRange.select()
+                currentRange.select();
             }catch(e){}
-        }).attachTo($btn)
+        }).attachTo($btn);
     });
 
 
-
-
     me.addListener('selectionchange', function () {
         var state = this.queryCommandState(name);
-        $btn.edui().disabled(state == -1).active(state == 1)
+        $btn.edui().disabled(state == -1).active(state == 1);
     });
     return $btn;
 });