lsc 2 years ago
parent
commit
cb77a7bfe8
2 changed files with 2 additions and 1 deletions
  1. 0 1
      js/Desktop/DeskTop.js
  2. 2 0
      js/Office/Word/WordEditor.js

+ 0 - 1
js/Desktop/DeskTop.js

@@ -2977,7 +2977,6 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
                 _iframe.contentWindow.document.body.appendChild(script2);
                 // _iframe.contentWindow.document.body.appendChild(script3);
                 _iframe.contentWindow.document.body.appendChild(script4);
-                
             })
         } else if (str == 'courseDesign') {
             U.UF.DL.iframeLoad(_iframe, function () {

+ 2 - 0
js/Office/Word/WordEditor.js

@@ -422,6 +422,8 @@ U.MD.O.W.E.toolsbind = function () {
     window.onresize = function () {
         U.MD.O.W.E.toolbarCheck(_toolsel);
     };
+    var $jq = $;
+    var $180 = $.noConflict(); 
     //工具栏更多处理,下拉框显示隐藏
     $('#U_MD_O_H_More').Child()[0].onclick = function (e) {
         //  $('#U_MD_O_H_More').children()[0].onclick = function (e) {