提交 534cc4fe 编写于 作者: NoSubject's avatar NoSubject

Merge branch 'develop_java8' into 'master_java8'

Develop java8

See merge request o2oa/o2oa!3721
......@@ -6,7 +6,7 @@
<link rel="stylesheet" href="css/mBoxNotice.css" charset="UTF-8" />
<link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
<script src="../o2_core/o2.min.js"></script>
<script type="text/javascript" src="/o2_lib/dingding/dingtalk.js"></script>
<script type="text/javascript" src="/o2_lib/dingding/dingtalk.2.10.3.js"></script>
<script src="js/ddsso.js"></script>
<script src="../o2_lib/Decimal.js"></script>
......
......@@ -7,7 +7,7 @@ layout.desktop = layout;
layout.session = layout.session || {};
o2.addReady(function () {
o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js"], { "sequence": true }, function () {
o2.load(["../o2_lib/mootools/plugin/mBox.Notice.js", "../o2_lib/mootools/plugin/mBox.Tooltip.js", "../o2_core/o2/widget/Common.js"], { "sequence": true }, function () {
//MWF.defaultPath = "../x_desktop"+MWF.defaultPath;
MWF.loadLP("zh-cn");
MWF.require("MWF.xDesktop.Layout", function () {
......@@ -77,11 +77,11 @@ o2.addReady(function () {
}.bind(this)
});
}.bind(this),
onFail: function (err) { }
onFail: function (err) { console.log(err);}
});
}.bind(this), "failure": function (xhr, text, error) { }.bind(this)
}.bind(this), "failure": function (xhr, text, error) { console.log(error); }.bind(this)
});
});
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册