迁移table

_src/plugins/contextmenu.js

@@ -129,6 +129,62 @@ UE.plugins['contextmenu'] = function () {
                             label:lang.splittocols,
                             cmdName:'splittocols'
                         },
+                        {
+                            label:'insertcaption',
+                            cmdName:'insertcaption'
+                        },
+                        {
+                            label:'deletecaption',
+                            cmdName:'deletecaption'
+                        },
+                        {
+                            label:'inserttitle',
+                            cmdName:'inserttitle'
+                        },
+                        {
+                            label:'adaptbytext',
+                            cmdName:'adaptbytext'
+                        },
+                        {
+                            label:'adaptbywindow',
+                            cmdName:'adaptbywindow'
+                        },
+                        {
+                            label:'adaptbycustomer',
+                            cmdName:'adaptbycustomer'
+                        },
+                        {
+                            label:'insertrownext',
+                            cmdName:'insertrownext'
+                        },
+                        {
+                            label:'tdAlignCenter',
+                            cmdName:'cellalign',
+                            exec:function () {
+
+                                this.execCommand( 'cellalign' ,'center')
+                            }
+                        },
+                        {
+                            label:'tdvAlignCenter',
+                            cmdName:'cellvalign',
+                            exec:function () {
+
+                                this.execCommand( 'cellvalign' ,'top')
+                            }
+                        },
+                        {
+                            label:'averageDiseRow',
+                            cmdName:'averagedistributerow'
+                        },
+                        {
+                            label:'averageDisCol',
+                            cmdName:'averagedistributecol'
+                        },
+                        {
+                            label:'deletetitle',
+                            cmdName:'deletetitle'
+                        },
                         {
                             label:lang.mergecells,
                             cmdName:'mergecells'

_src/plugins/enterkey.js

@@ -24,7 +24,7 @@ UE.plugins['enterkey'] = function() {
 
                 if (/h\d/i.test(hTag)) {
                     if (browser.gecko) {
-                        var h = domUtils.findParentByTagName(start, [ 'h1', 'h2', 'h3', 'h4', 'h5', 'h6','blockquote'], true);
+                        var h = domUtils.findParentByTagName(start, [ 'h1', 'h2', 'h3', 'h4', 'h5', 'h6','blockquote','caption'], true);
                         if (!h) {
                             me.document.execCommand('formatBlock', false, '<p>');
                             doSave = 1;
@@ -57,7 +57,21 @@ UE.plugins['enterkey'] = function() {
                 //没有站位符，会出现多行的问题
                 browser.opera &&  range.select();
             }
-
+//            if(browser.ie){
+//                range = me.selection.getRange();
+//                start = range.startContainer;
+//                while(start){
+//                    if(start.nodeType == 1 && start.tagName == 'P'){
+//                        break;
+//                    }
+//                    start = start.parentNode;
+//                }
+//                if(start && domUtils.isEmptyBlock(start)){
+//                    start.innerHTML = '&nbsp;';
+//                    var rng = me.selection.getRange();
+//                    rng.setStart(start,0).setCursor(false,true);
+//                }
+//            }
 
 
             setTimeout(function() {
@@ -96,13 +110,14 @@ UE.plugins['enterkey'] = function() {
 
                 if (!browser.ie) {
 
-                    start = domUtils.findParentByTagName(range.startContainer, ['ol','ul','p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6','blockquote'], true);
+                    start = domUtils.findParentByTagName(range.startContainer, ['ol','ul','p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6','blockquote','caption'], true);
 
                     //opera下执行formatblock会在table的场景下有问题，回车在opera原生支持很好，所以暂时在opera去掉调用这个原生的command
                     //trace:2431
                     if (!start && !browser.opera) {
 
                         me.document.execCommand('formatBlock', false, '<p>');
+
                         if (browser.gecko) {
                             range = me.selection.getRange();
                             start = domUtils.findParentByTagName(range.startContainer, 'p', true);

_src/plugins/inserthtml.js

@@ -29,7 +29,6 @@
                 me.adjustTable && me.adjustTable(div);
             }catch(e){}
 
-
             if(tds && tds.length){
                 for(var i=0,ti;ti=tds[i++];){
                     ti.className = '';
@@ -110,7 +109,7 @@
 
             //用chrome可能有空白展位符
             if(domUtils.isBlockElm(child) && domUtils.isEmptyNode(child)){
-                child.innerHTML = browser.ie ? '' : '<br/>';
+                child.innerHTML = browser.ie ? domUtils.fillChar : '<br/>';
             }
             //加上true因为在删除表情等时会删两次，第一次是删的fillData
             range.select(true);
@@ -120,9 +119,5 @@
                 range = me.selection.getRange();
                 range.scrollToView(me.autoHeightEnabled,me.autoHeightEnabled ? domUtils.getXY(me.iframe).y:0);
             },200);
-
-
-
-            
         }
     };

_src/plugins/keystrokes.js

@@ -47,6 +47,7 @@ UE.plugins['keystrokes'] = function() {
 
         }
 
+
         //处理backspace/del
         if (keyCode == 8 ) {//|| keyCode == 46
 
@@ -130,6 +131,10 @@ UE.plugins['keystrokes'] = function() {
         }
         //处理tab键的逻辑
         if (keyCode == 9) {
+            if(evt._ue_table_tab){
+                return ;
+            }
+
             range = me.selection.getRange();
             me.undoManger && me.undoManger.save();
 
@@ -137,7 +142,7 @@ UE.plugins['keystrokes'] = function() {
                 txt += tabNode;
             }
             var span = me.document.createElement('span');
-            span.innerHTML = txt;
+            span.innerHTML = txt + domUtils.fillChar;
             if (range.collapsed) {
 
 

_src/plugins/paste.js

@@ -194,9 +194,12 @@
 
                    me.fireEvent('beforepaste',html);
                     //不用在走过滤了
-                   me.execCommand( 'insertHtml',html.html,true);
+                   if(html.html){
+                       me.execCommand( 'insertHtml',html.html,true);
 
-	               me.fireEvent("afterpaste");
+                       me.fireEvent("afterpaste");
+
+                   }
 
                 }
         }
@@ -216,8 +219,8 @@
                     if((browser.ie || browser.opera) && (!e.ctrlKey || e.keyCode != '86')){
                         return;
                     }
-
                     getClipboardData.call( me, function( div ) {
+
                         filter(div);
                     } );
 

_src/plugins/undo.js

@@ -94,7 +94,6 @@ UE.plugins['undo'] = function() {
         this.hasUndo = false;
         this.hasRedo = false;
         this.undo = function() {
-
             if ( this.hasUndo ) {
                 var currentScene = this.getScene(),
                     lastScene = this.list[this.index];
@@ -249,7 +248,7 @@ UE.plugins['undo'] = function() {
         this.clearKey = function(){
             keycont = 0;
             lastKeyCode = null;
-            me.fireEvent('contentchange');
+           //me.fireEvent('contentchange');
         };
     }
 
@@ -258,6 +257,10 @@ UE.plugins['undo'] = function() {
         this.undoManger.save();
     }
 
+    me.addListener('saveScene',function(){
+        me.undoManger.save();
+    });
+
     me.addListener( 'beforeexeccommand', saveScene );
     me.addListener( 'afterexeccommand', saveScene );
 
@@ -289,6 +292,8 @@ UE.plugins['undo'] = function() {
         var keyCode = evt.keyCode || evt.which;
         if ( !keys[keyCode] && !evt.ctrlKey && !evt.metaKey && !evt.shiftKey && !evt.altKey ) {
             if ( me.undoManger.list.length == 0 || ((keyCode == 8 ||keyCode == 46) && lastKeyCode != keyCode) ) {
+
+                me.fireEvent('contentchange');
                 me.undoManger.save(true);
                 lastKeyCode = keyCode;
                 return;
@@ -303,7 +308,9 @@ UE.plugins['undo'] = function() {
             keycont++;
             if ( keycont >= maxInputCount ) {
                 if(me.selection.getRange().collapsed)
+                    me.fireEvent('contentchange');
                     me.undoManger.save();
+
             }
         }
     } );