提交 e1d9b3c3 编写于 作者: Y yancend

Merge pull request #293 from worry127722/dev-1.4.3

Dev 1.4.3
......@@ -34,8 +34,6 @@ test('检查非IE下是否正常加载zeroclipboard粘贴板插件', function ()
document.body.appendChild(sc);
var me = UE.getEditor('sc',{'autoFloatEnabled':true,'topOffset':60,'autoHeightEnabled':true,'scaleEnabled':false});
me.ready(function(){
stop();
setTimeout(function(){
if (!browser.ie) {
ok(window.ZeroClipboard, '是否正常加载zeroclipboard粘贴板插件');
......@@ -47,6 +45,6 @@ test('检查非IE下是否正常加载zeroclipboard粘贴板插件', function ()
}, 500);
}, 300);
});
stop();
});
\ No newline at end of file
......@@ -32,6 +32,6 @@ test( 'trace 3385:拖拽图像不会把p切开', function () {
equal(body.firstChild.tagName.toLowerCase(),'p','img在p里面');
equal(body.firstChild.childNodes[1].tagName.toLowerCase(),'img','img在p里面');
start();
},30);
},30);
},300);
},100);
} );
\ No newline at end of file
......@@ -28,7 +28,7 @@ test('snapscreen', function () {
UE.delEditor('ue');
te.dom.push(document.getElementById('ue'));
start();
}, 500);
}, 1000);
}, 300);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册