Support for query flag 'showdfl' to not hide a Dragonfly window.

Author: Chris K

src/build-application/build_application.js

@@ -86,6 +86,8 @@ window.app.profiles[window.app.profiles.HTTP_PROFILER].is_enabled = false;
 
 window.app.build_application = function(on_services_created, on_services_enabled)
 {
+  var app_ctx = {};
+  app_ctx.messages = window.messages;
   var _find_compatible_version = function(version, version_list)
   {
     var
@@ -148,6 +150,14 @@ window.app.build_application = function(on_services_created, on_services_enabled
 
     window.messages.clear_session_listeners();
 
+    var session_ctx =
+    {
+      messages: app_ctx.messages,
+      helpers: app_ctx.helpers,
+      tag_manager: app_ctx.tag_manager,
+      show_dragonfly_window: app_ctx.show_dragonfly_window
+    };
+
     for (service_name in service_descriptions)
     {
       service = service_descriptions[service_name];
@@ -167,7 +177,10 @@ window.app.build_application = function(on_services_created, on_services_enabled
             // service_description is a dict of services
             // with name and version for each service
             // return false if the service shall not be enabled
-            window.services[service_name].is_implemented = builder(service, service_descriptions);
+            var is_implemented = builder(service,
+                                         service_descriptions,
+                                         session_ctx);
+            window.services[service_name].is_implemented = is_implemented;
           }
         }
       }
@@ -225,8 +238,8 @@ window.app.build_application = function(on_services_created, on_services_enabled
   window.messages.addListener("application-setup", report_usage, true);
 
   // global objects
-  window.tagManager = window.tag_manager = new window.cls.TagManager();
-  window.helpers = new cls.Helpers();
+  window.tagManager = window.tag_manager = app_ctx.tag_manager = new window.cls.TagManager();
+  window.helpers = app_ctx.helpers = new cls.Helpers();
 
   // create window.services namespace and register it.
   cls.ServiceBase.register_services(new cls.Namespace("services"));
@@ -247,6 +260,7 @@ window.app.build_application = function(on_services_created, on_services_enabled
   {
     cls.debug.create_debug_environment(params);
   }
+  app_ctx.show_dragonfly_window = Boolean(params.showdfl);
   var namespace = cls.Scope && cls.Scope["1.1"];
   namespace.Service.apply(window.services.scope.constructor.prototype);
   window.services.scope.is_implemented = true;
@@ -322,18 +336,14 @@ window.app.helpers.parse_url_arguments = function()
     supported arguments:
       - debug
       - log-filter
+      - showdfl
   */
-  var
-  args = location.search.slice(1).split(';'),
-  params = {},
-  arg = '',
-  i = 0;
-
-  for( ; arg = args[i]; i++)
+  var args = location.search.slice(1).split(/[;&]/);
+  var params = {};
+  for (var i = 0, arg; arg = args[i]; i++)
   {
     arg = arg.split('=');
-    params[arg[0].replace(/^ +/, '').replace(/ +$/, '')] =
-      arg[1] && arg[1].replace(/^ +/, '').replace(/ +$/, '') || true;
+    params[arg[0].trim()] = arg[1] && arg[1].trim() || true;
   }
   return params;
 }

src/build-application/build_window_manager_2_0.js

@@ -4,13 +4,15 @@ window.app.builders.WindowManager || ( window.app.builders.WindowManager = {} );
 /**
   * @param {Object} service the service description of the according service on the host side
   */
-window.app.builders.WindowManager["2.0"] = function(service)
+window.app.builders.WindowManager["2.0"] = function(service,
+                                                    service_descriptions,
+                                                    session_ctx)
 {
   var namespace = cls.WindowManager && cls.WindowManager["2.0"];
   var service_interface = window.services['window-manager'];
   if(service_interface)
   {
-    window.window_manager_data = new namespace.WindowManagerData();
+    window.window_manager_data = new namespace.WindowManagerData(session_ctx);
     window.window_manager_data.bind(service_interface);
     window.windowsDropDown = new namespace.WindowsDropDown();
     namespace.DebuggerMenu.prototype = new CstSelectWithAction();

src/window-manager/window-manager.js

@@ -3,7 +3,7 @@ cls.WindowManager || (cls.WindowManager = {});
 cls.WindowManager["2.0"] || (cls.WindowManager["2.0"] = {});
 
 
-cls.WindowManager["2.0"].WindowManagerData = function()
+cls.WindowManager["2.0"].WindowManagerData = function(session_ctx)
 {
 
   /* interface */
@@ -26,6 +26,8 @@ cls.WindowManager["2.0"].WindowManagerData = function()
   this._window_list = null;
   this._debug_context = 0;
   this._check_counter = 0;
+  this._session_ctx = session_ctx;
+  this._tag_man = session_ctx.tag_manager;
 
   // TODO is this still ok?
 
@@ -108,10 +110,15 @@ cls.WindowManager["2.0"].WindowManagerData = function()
     window.windowsDropDown.update();
   };
 
-  this._window_filter = function(win)
-  {
-    return win.window_type in {"normal": 1, "gadget": 1};
-  };
+  this._window_filter = session_ctx.show_dragonfly_window
+                      ? function(win)
+                        {
+                          return win.window_type in {"normal": 1, "gadget": 1, "devtools": 1};
+                        }
+                      : function(win)
+                        {
+                          return win.window_type in {"normal": 1, "gadget": 1};
+                        };
 
   this._update_list = function(win_obj)
   {
@@ -198,6 +205,21 @@ cls.WindowManager["2.0"].WindowManagerData = function()
     }
   }
 
+  this._onprofile_enabled = function(msg)
+  {
+    if (!this._debug_context)
+    {
+      if (this._session_ctx.show_dragonfly_window)
+      {
+        var cb = function(status, message) { window_manager.requestListWindows() };
+        var tag = this._tag_man.set_callback(this, cb);
+        var msg = ["replace", ["normal_hidden"]];
+        window_manager.requestModifyTypeFilter(tag, msg);
+      }
+      window_manager.requestListWindows();
+    }
+  };
+
   /* implementation */
 
   this.get_active_window_id = function()
@@ -288,11 +310,7 @@ cls.WindowManager["2.0"].WindowManagerData = function()
     {
       self._remove_window(message[0]);
     };
-    window.messages.addListener("profile-enabled", function()
-    {
-      if (!this._debug_context)
-        window_manager.requestListWindows();
-    });
+    window.messages.addListener("profile-enabled", this._onprofile_enabled.bind(this));
     window_manager.onWindowLoaded = function(status, message)
     {
       // do nothing