Просмотр исходного кода

修正打开首页后,未激活app无法打开的问题

huqi 5 лет назад
Родитель
Сommit
f2746b6905
2 измененных файлов с 12 добавлено и 5 удалено
  1. 10 4
      o2web/source/o2_core/o2/xDesktop/Default.js
  2. 2 1
      o2web/source/x_desktop/js/base.js

+ 10 - 4
o2web/source/o2_core/o2/xDesktop/Default.js

@@ -231,12 +231,18 @@ o2.xDesktop.Default = new Class({
                 }
                 var currentTaskitem = null;
                 Object.each(this.status.apps, function(appStatus, id){
-                    var app = { "options": appStatus };
+                    var app = {
+                        "options": appStatus,
+                        "close": function(){
+                            this.taskitem.destroy();
+                        },
+                        "setCurrent": function(){
+                            this.taskitem.textNode.click();
+                        }
+                    };
                     taskitem = layout.desktop.createTaskItem(app);
                     app.taskitem = taskitem;
-                    app.close = function(){
-                        this.taskitem.destroy();
-                    }
+
                     this.apps[appStatus.appId] = app;
                     if ((this.status.currentApp === appStatus.appId)) currentTaskitem=taskitem;
 

+ 2 - 1
o2web/source/x_desktop/js/base.js

@@ -259,7 +259,8 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
             _requireApp(appNames, function (appNamespace) {
                 var appId = (options && options.appId) ? options.appId : ((appNamespace.options.multitask) ? "" : appName);
 
-                if (appId && layout.desktop.apps && layout.desktop.apps[appId] && layout.desktop.apps[appId].window){
+                //if (appId && layout.desktop.apps && layout.desktop.apps[appId] && layout.desktop.apps[appId].window){
+                if (appId && layout.desktop.apps && layout.desktop.apps[appId]){
                     layout.desktop.apps[appId].setCurrent();
                 }else{
                     if (options) options.appId = appId;