Merge branch 'feature/zoom' into 'wrdp'

增加比例缩放恢复功能

See merge request o2oa/o2oa!6318

o2web/source/o2_core/o2/lp/en.js

@@ -152,6 +152,7 @@ o2.LP.desktop = {
 	"searchUser": "Search：Username",
 	"say": "Say",
 	"clearMessage": "Clear Message",
+	"returnZoom": "100% recovery",
 
 	"refresh": "Refresh",
 	"close": "Close",

o2web/source/o2_core/o2/lp/zh-cn.js

@@ -156,6 +156,7 @@ o2.LP.desktop = {
     "searchUser": "搜索：用户名",
     "say": "说",
     "clearMessage": "清除消息",
+    "returnZoom": "恢复100%比例",
 
     "refresh": "刷新",
     "close": "关闭",

o2web/source/o2_core/o2/xDesktop/Default.js

@@ -263,7 +263,6 @@ o2.xDesktop.Default = new Class({
 
         this.node.loadAll({ "css": [css], "html": [html]}, {"bind": {"user": this.session.user}, "module": this},function(){
             var oReq = new XMLHttpRequest();
-            debugger;
             oReq.addEventListener("load", function(){
                 var reader  = new FileReader();
                 reader.addEventListener("load", function () {
@@ -287,6 +286,8 @@ o2.xDesktop.Default = new Class({
             // });
             // res.setHeader("authorization", layout.session.user.token);
             // res.send();
+debugger;
+            this.sliderNode.getLast().set("title", o2.LP.desktop.returnZoom);
 
             this.node.loadCss(skinCss);
             if (callback) callback();