Dfl 3356 maintenance

src/build-application/build_ecmascript_debugger_6_0.js

@@ -61,7 +61,6 @@ window.app.builders.EcmascriptDebugger["6.0"] = function(service)
     window.runtime_onload_handler = new namespace.RuntimeOnloadHandler();
 
     /* commandline */
-    cls.CommandLineRuntimeSelect.prototype = new CstSelect();
     new cls.CommandLineRuntimeSelect('cmd-runtime-select', 'cmd-line-runtimes');
 
     cls.ReplView.create_ui_widgets();

src/client-en.xml

@@ -226,6 +226,7 @@ window.load_screen_timeout = window.setTimeout(function()
 <script src="./lib/stylesheetlistprototype.js"/>
 <script src="./lib/xmlhttprequestprototype.js"/>
 <script src="./lib/storageprototype.js"/>
+<script src="./lib/clipboard.js"/>
 <script src="./lib/dict.js"/>
 
 
@@ -414,7 +415,6 @@ window.load_screen_timeout = window.setTimeout(function()
 <script src="./ecma-debugger/scriptselect.js"/>
 
 <script src="./ecma-debugger/dominspection/templates.js"/>
-<script src="./ecma-debugger/dominspection/domserializer.js"/>
 <script src="./ecma-debugger/dominspection/domview.js"/>
 <script src="./ecma-debugger/dominspection/actions.js"/>
 <script src="./ecma-debugger/dominspection/attrandtextditor.js"/>

src/ecma-debugger/action_handler.js

@@ -101,65 +101,6 @@ window.eventHandlers.click['examine-object-2'] = function(event, target)
   }
 };
 
-window.eventHandlers.click['show-scripts'] = function(event)
-{
-  var runtime_id = event.target.getAttribute('runtime_id');
-  var scripts = runtimes.getScripts(runtime_id);
-  var scripts_container = event.target.parentNode.getElementsByTagName('ul')[0];
-  var script = null, i = 0;
-
-  if (scripts_container)
-  {
-    event.target.parentNode.removeChild(scripts_container);
-    event.target.style.removeProperty('background-position');
-    runtimes.setUnfolded(runtime_id, 'script', false);
-  }
-  else
-  {
-    scripts_container = ['ul'];
-    for ( ; script = scripts[i]; i++)
-    {
-      scripts_container.push(templates.scriptLink(script));
-    }
-    scripts_container.splice(scripts_container.length, 0, 'runtime-id', runtime_id);
-    event.target.parentNode.render(scripts_container);
-    event.target.style.backgroundPosition = '0 -11px';
-    runtimes.setUnfolded(runtime_id, 'script', true);
-  }
-};
-
-window.eventHandlers.click['show-stylesheets'] = function(event, target)
-{
-  var rt_id = target.getAttribute('runtime_id');
-  // stylesheets.get_stylesheets will call this function again if data is not avaible
-  // handleGetAllStylesheets in stylesheets will
-  // set for this reason __call_count on the event object
-  var sheets = cls.Stylesheets.get_instance().get_stylesheets(rt_id, arguments);
-  if (sheets)
-  {
-    var container = event.target.parentNode.getElementsByTagName('ul')[0];
-    var sheet = null, i = 0;
-    if (container)
-    {
-      target.parentNode.removeChild(container);
-      target.style.removeProperty('background-position');
-      runtimes.setUnfolded(rt_id, 'css', false);
-    }
-    else
-    {
-      container = ['ul'];
-      for ( ; sheet = sheets[i]; i++)
-      {
-        container.push(templates.sheetLink(sheet, i));
-      }
-      container.splice(container.length, 0, 'runtime-id', rt_id);
-      event.target.parentNode.render(container);
-      event.target.style.backgroundPosition = '0 -11px';
-      runtimes.setUnfolded(rt_id, 'css', true);
-    }
-  }
-};
-
 window.eventHandlers.click['continue'] = function(event)
 {
   this.broker.dispatch_action('global', event.target.id);

src/ecma-debugger/dominspection/actions.js

@@ -8,14 +8,16 @@
 
 cls.DOMInspectorActions = function(id)
 {
+  ActionHandlerInterface.apply(this);
   this.view_id = id;
   this.id = id;
 
-  const
-  SCROLL_IN_PADDING = 30,
-  MODE_DEFAULT = "default",
-  MODE_EDIT_ATTR_TEXT = "edit-attributes-and-text",
-  MODE_EDIT_MARKUP = "edit-markup";
+  var SCROLL_IN_PADDING = 30;
+  var MODE_DEFAULT = "default";
+  var MODE_EDIT_ATTR_TEXT = "edit-attributes-and-text";
+  var MODE_EDIT_MARKUP = "edit-markup";
+  var LEFT_CLICK = 1;
+  var SUCCESS = 0;
 
   this.mode_labels =
   {
@@ -33,8 +35,6 @@ cls.DOMInspectorActions = function(id)
 
   var broker = ActionBroker.get_instance();
 
-  this.serializer = new cls.DOMSerializer();
-
   this._handlers = {};
   this._mode = MODE_DEFAULT;
   this.__defineSetter__("mode", function(mode)
@@ -368,10 +368,10 @@ cls.DOMInspectorActions = function(id)
         }
       }
       if (!nav_target)
-      {
         nav_target = this.getFirstTarget();
-      }
-      this.setSelected(nav_target);
+
+      if (event.which == LEFT_CLICK)
+        this.setSelected(nav_target);
     }
   }
 
@@ -478,9 +478,11 @@ cls.DOMInspectorActions = function(id)
   {
     var target = event.target;
     var is_in_container = view_container && view_container.contains(target);
-    if(is_in_container)
+    if (is_in_container)
     {
-      if(target != nav_target && /^input|node|key|value|text$/i.test(target.nodeName))
+      if (event.which == LEFT_CLICK &&
+          target != nav_target &&
+          /^input|node|key|value|text$/i.test(target.nodeName))
       {
         this.setSelected(target);
       }
@@ -497,9 +499,10 @@ cls.DOMInspectorActions = function(id)
 
   this.blur = function(event)
   {
+
     if (this.mode != MODE_DEFAULT && this.editor)
       this.editor.submit();
-    if (selection)
+    if (selection && !selection.isCollapsed)
       selection.removeAllRanges();
     view_container = null;
     view_container_first_child = null;
@@ -610,12 +613,6 @@ cls.DOMInspectorActions = function(id)
     }
   }.bind(this);
 
-  this._handlers["export-markup"] = function(event, target)
-  {
-    var data = this.serializer.serialize(window.dom_data);
-    window.open("data:text/plain;charset=utf-8," + encodeURIComponent(data));
-  }.bind(this);
-
   this._handlers["expand-whole-dom"] = function(event, target)
   {
     window.dom_data.get_snapshot();
@@ -892,6 +889,48 @@ cls.DOMInspectorActions = function(id)
     }
   }.bind(this);
 
+  this._handlers["copy-xpath"] = function(event, target)
+  {
+    var model = window.dominspections[target.get_ancestor_attr("data-model-id")];
+    var obj_id = parseInt(target.get_ancestor_attr("ref-id"));
+    if (model && obj_id)
+    {
+      var force_lower_case = window.settings.dom.get("force-lowercase");
+      model.get_xpath(obj_id, force_lower_case, function(path)
+      {
+        if (path)
+          Clipboard.set_string(path);
+      });
+    }
+  }.bind(this);
+
+  this._handlers["copy-css-path"] = function(event, target)
+  {
+    var model = window.dominspections[target.get_ancestor_attr("data-model-id")];
+    var obj_id = parseInt(target.get_ancestor_attr("ref-id"));
+    if (model && obj_id)
+    {
+      var force_lower_case = window.settings.dom.get("force-lowercase");
+      var path = model.get_unique_css_path(obj_id, force_lower_case);
+      if (path)
+        Clipboard.set_string(path);
+    }
+  }.bind(this);
+
+  this._handlers["copy-markup"] = function(event, target)
+  {
+    var model = window.dominspections[target.get_ancestor_attr("data-model-id")];
+    var obj_id = parseInt(target.get_ancestor_attr("ref-id"));
+    if (model && obj_id)
+    {
+      model.serialize_to_string(obj_id, function(markup)
+      {
+        if (markup)
+          Clipboard.set_string(markup);
+      });
+    }
+  }.bind(this);
+
   this.edit_onclick = function(event)
   {
     if( this.editor )
@@ -961,11 +1000,6 @@ window.event_handlers.mouseover['spotlight-node'] = function(event, target)
   this.broker.dispatch_action("dom", "spotlight-node", event, target);
 }
 
-window.event_handlers.click['dom-inspection-export'] = function(event, target)
-{
-  this.broker.dispatch_action("dom", "export-markup", event, target);
-};
-
 window.event_handlers.click['dom-inspection-snapshot'] = function(event, target)
 {
   this.broker.dispatch_action("dom", "expand-whole-dom", event, target);

src/ecma-debugger/dominspection/domdata.js

@@ -58,6 +58,7 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
   this._reset_spotlight_timeouts = new Timeouts();
   this._is_waiting = false;
   this._editor_active = false;
+  this._last_selectors = {};
 
   this._spotlight = function(event)
   {
@@ -111,7 +112,14 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
         {
           if (!this._data.length && this._element_selected_state == CHECKED)
           {
-            this._get_initial_view(this._data_runtime_id);
+            var rt_id = this._data_runtime_id;
+            if (runtime_onload_handler.is_loaded(rt_id))
+              this._get_initial_view(rt_id);
+            else
+            {
+              var cb = this._get_initial_view.bind(this, rt_id);
+              runtime_onload_handler.register(rt_id, cb, cb, 500);
+            }
           }
           else if (this._element_selected_state != CHECKED &&
                    this._element_selected_state != CHECK_AGAIN_NO_RUNTIME)
@@ -212,11 +220,11 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
 
   this._get_selected_element = function(rt_id)
   {
-    var tag = tagManager.set_callback(this, this._on_element_selected, [rt_id, true]);
+    var tag = tagManager.set_callback(this, this._on_object_selected, [rt_id, true]);
     window.services['ecmascript-debugger'].requestGetSelectedObject(tag);
   }
 
-  this._on_element_selected = function(status, message, rt_id, show_initial_view)
+  this._on_object_selected = function(status, message, rt_id, show_initial_view)
   {
     // If the window ID is not the debug context, the runtime ID will not be set
     const OBJECT_ID = 0, WINDOW_ID = 1, RUNTIME_ID = 2;
@@ -243,7 +251,6 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
       {
         if (message[WINDOW_ID] == window.window_manager_data.get_debug_context())
         {
-          messages.post("runtime-selected", {id: this._data_runtime_id});
           window['cst-selects']['document-select'].updateElement();
           this._get_dom_sub(message[RUNTIME_ID], message[OBJECT_ID], true);
         }
@@ -274,6 +281,7 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
     this._current_target = 0;
     this._active_window = [];
     this.target = 0;
+    window.messages.post("element-selected", {obj_id: 0, rt_id: 0, model: null});
   }
 
   this._on_active_tab = function(msg)
@@ -291,7 +299,6 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
         this._on_reset_state();
         // the first field is the top runtime
         this._data_runtime_id = msg.activeTab[0];
-        messages.post("runtime-selected", {id: this._data_runtime_id});
         window['cst-selects']['document-select'].updateElement();
         this._active_window = msg.activeTab.slice();
         if (window.views[this._view_id].isvisible())
@@ -402,7 +409,6 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
     if (rt_id != this._data_runtime_id)
     {
       this._data_runtime_id = rt_id;
-      messages.post("runtime-selected", {id: this._data_runtime_id});
       window['cst-selects']['document-select'].updateElement();
     }
     if (obj_id)
@@ -419,8 +425,13 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
 
   this._get_initial_view = function(rt_id)
   {
+    var last_selector = this._last_selectors[window.runtimes.getActiveWindowId()];
+    var query_last_selector = last_selector
+                            ? "document.querySelector(\"" + last_selector + "\") || "
+                            : "";
     var tag = tagManager.set_callback(this, this._handle_initial_view, [rt_id]);
-    var script_data = "return ( document.body || document.documentElement )";
+    var script_data = "return (" + query_last_selector +
+                               "document.body || document.documentElement)";
     services['ecmascript-debugger'].requestEval(tag, [rt_id, 0, 0, script_data]);
   }
 
@@ -457,6 +468,22 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
         'this._handle_snapshot in dom_data has failed');
   }
 
+  this._on_element_selected = function(msg)
+  {
+    var win_id = window.runtimes.getActiveWindowId();
+    var css_path = this.get_css_path(msg.obj_id, null, true, false, true);
+    var is_first = false;
+    var selector = css_path.reduce(function(sel, ele)
+    {
+      sel = sel + ele.name + (is_first ? ":first-child " : " ") +
+            (ele.combinator ? ele.combinator + " " : "");
+      is_first = ele.combinator == ">";
+      return sel;
+    }, "");
+    if (selector)
+      this._last_selectors[win_id] = selector;
+  };
+
   /* implementation */
 
 
@@ -469,7 +496,10 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
       if (runtime_onload_handler.is_loaded(rt_id))
         this._get_initial_view(rt_id);
       else
-        runtime_onload_handler.register(rt_id, this._get_initial_view.bind(this, rt_id));
+      {
+        var cb = this._get_initial_view.bind(this, rt_id);
+        runtime_onload_handler.register(rt_id, cb, cb);
+      }
     }
     this._is_waiting = true;
   }).bind(this);
@@ -490,7 +520,7 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
   {
     ecma_debugger.onObjectSelected =
     ecma_debugger.handleGetSelectedObject =
-    this._on_element_selected.bind(this);
+    this._on_object_selected.bind(this);
   }
 
   /* initialisation */
@@ -509,6 +539,7 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
   this._set_reset_spotlight_bound = this._set_reset_spotlight.bind(this);
   this._on_top_runtime_update_bound = this._on_top_runtime_update.bind(this);
   this._on_dom_editor_active_bound = this._on_dom_editor_active.bind(this);
+  this._on_element_selected_bound = this._on_element_selected.bind(this);
 
   this._init(0, 0);
 
@@ -522,6 +553,7 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
   messages.addListener('top-runtime-updated', this._on_top_runtime_update_bound);
   messages.addListener('dom-editor-active', this._on_dom_editor_active_bound);
   messages.addListener('profile-disabled', this._on_profile_disabled_bound);
+  messages.addListener("element-selected", this._on_element_selected_bound);
 };
 
 cls.EcmascriptDebugger["6.0"].DOMData.prototype = cls.EcmascriptDebugger["6.0"].InspectableDOMNode.prototype;