diff --git a/_test/plugins/font.js b/_test/plugins/font.js
index 02eca0a9390d703b9bf27524c8141570ff11e684..c39055b6a91c8502b7e62ebfe7580cb66df1106a 100644
--- a/_test/plugins/font.js
+++ b/_test/plugins/font.js
@@ -587,14 +587,16 @@ test( '转换script标签', function () {
test( '转换style标签:style data不为空', function () {
var editor = te.obj[0];
editor.setContent( '' );
- var html = '
';
+ var br = ua.browser.ie?' ':'
';
+ var html = ''+br+'
';
ua.checkHTMLSameStyle(html,editor.document,editor.body,'转换style标签');
ua.checkSameHtml(html,editor.body.innerHTML);
} );
test( '转换style标签:style data不空', function () {
var editor = te.obj[0];
editor.setContent( '' );
- var html = '
';
+ var br = ua.browser.ie?' ':'
';
+ var html = ''+br+'
';
ua.checkHTMLSameStyle(html,editor.document,editor.body,'转换style标签');
ua.checkSameHtml(html,editor.body.innerHTML);
} );
diff --git a/_test/plugins/wordimage.js b/_test/plugins/wordimage.js
index 3facf81ed95bd384173a5fbdbf1727d3b69bb862..6e643309da22cbb8294266253212b5f6c1725d22 100644
--- a/_test/plugins/wordimage.js
+++ b/_test/plugins/wordimage.js
@@ -9,20 +9,25 @@ module( 'plugins.wordimage' );
test( '检查取得word_img的url地址', function () {
var editor = te.obj[0];
- editor.setContent( '
' );
- editor.execCommand( 'wordimage','word_img' );
- equal(editor.word_img.length,'1','有一个wordimg');
- equal(editor.word_img[0],"file:///C:DOCUME~1DONGYA~1LOCALS~1Tempmsohtmlclip1clip_image001.gif",'检查url地址');
+ editor.setContent('
');
+ stop();
+ setTimeout(function () {
+ editor.execCommand('wordimage', 'word_img');
+ equal(editor.word_img.length, '1', '有一个wordimg');
+ equal(editor.word_img[0], "file:///C:DOCUME~1DONGYA~1LOCALS~1Tempmsohtmlclip1clip_image001.gif", '检查url地址');
editor.setContent('
');
- editor.execCommand( 'wordimage','word_img' );
- equal(editor.word_img.length,'2','有2个wordimg');
- equal(editor.word_img[0],"file:///C:\DOCUME~1\DONGYA~1\LOCALS~1\Temp\msohtmlclip1\01\clip_image001.jpg",'检查 第一个url地址');
- equal(editor.word_img[1],"file:///C:\DOCUME~1\DONGYA~1\LOCALS~1\Temp\msohtmlclip1\01\clip_image001.gif",'检查 第二个url地址');
+ setTimeout(function () {
+ editor.execCommand('wordimage', 'word_img');
+ equal(editor.word_img.length, '2', '有2个wordimg');
+ equal(editor.word_img[0], "file:///C:\DOCUME~1\DONGYA~1\LOCALS~1\Temp\msohtmlclip1\01\clip_image001.jpg", '检查 第一个url地址');
+ equal(editor.word_img[1], "file:///C:\DOCUME~1\DONGYA~1\LOCALS~1\Temp\msohtmlclip1\01\clip_image001.gif", '检查 第二个url地址');
- equal(editor.queryCommandState('wordimage'),'1','queryCommandState');
-
-} );
+ equal(editor.queryCommandState('wordimage'), '1', 'queryCommandState');
+ start();
+ }, 50);
+ }, 50);
+});
test( '多实例编辑器检查取得word_img的url地址', function () {
var div1 = document.createElement( 'div' );
var div2 = document.createElement( 'div' );