Review fixes.

Author: Christian Krebs

src/network/network_view.js

@@ -936,7 +936,6 @@ cls.DetailOverlayView = function(id, container_class, html, default_handler, ser
 
   // overlay view has no name
   this.init(id, container_class, html, default_handler);
-
 };
 
 cls.DetailOverlayView.prototype = new OverlayView();

src/ui-scripts/celloverlay.js

@@ -3,7 +3,7 @@
   this._init(view_id, parent_cell, parent_view_id);
 };
 
-CellOverlayPrototype = function()
+var CellOverlayPrototype = function()
 {
   this._init = function(view_id, parent_cell, parent_view_id)
   {

src/ui-scripts/cells.js

@@ -288,11 +288,12 @@
         rough_cell.height = stored_height;
     }
 
-    this.min_width = rough_cell.min_width != null?
-     rough_cell.min_width : defaults.min_view_width;
-    this.min_height = rough_cell.min_height != null ?
-      rough_cell.min_height : defaults.min_view_height;
-
+    this.min_width = rough_cell.min_width != null
+                   ? rough_cell.min_width
+                   : defaults.min_view_width;
+    this.min_height = rough_cell.min_height != null
+                    ? rough_cell.min_height
+                    : defaults.min_view_height;
     this.width =
       rough_cell.width && rough_cell.width > this.min_width ?
       rough_cell.width : this.min_width;
@@ -693,24 +694,27 @@
   this.checkDelta = function(dim, delta, sibling)
   {
     var delta_applied = 0;
-    var child = null, i = 0;
-    var deltas = [], min = 0, max = 0;
-    if( this.children.length )
+    var child = null;
+    var deltas = [];
+    var i = 0;
+    var min = 0;
+    var max = 0;
+    if (this.children.length)
     {
-      if( ( dim == 'height' && this.dir == HOR ) || ( dim == 'width' && this.dir == VER ) )
+      if ((dim == 'height' && this.dir == HOR) || (dim == 'width' && this.dir == VER))
       {
-        if(delta)
+        if (delta)
         {
-          for( ; child = this.children[i]; i++)
+          for (i = 0; child = this.children[i]; i++)
           {
             deltas[deltas.length] = child.checkDelta(dim, delta, sibling);
           }
           min = Math.min.apply(null, deltas);
           max = Math.max.apply(null, deltas);
           delta_applied = delta > 0 ? max : min;
-          if( max != min )
+          if (max != min)
           {
-            for( i = 0; child = this.children[i]; i++)
+            for (i = 0; child = this.children[i]; i++)
             {
               child.checkDelta(dim, delta - delta_applied, sibling)
             }
@@ -719,7 +723,7 @@
         }
         else // clear
         {
-          for( i=0; child = this.children[i]; i++)
+          for (i = 0; child = this.children[i]; i++)
           {
             child.checkDelta(dim, 0, sibling);
           }
@@ -729,7 +733,7 @@
       else
       {
         delta_applied = delta;
-        for( i = 0; child = this.children[i]; i++) // if delta_applied is zero clear the rest
+        for (i = 0; child = this.children[i]; i++) // if delta_applied is zero clear the rest
         {
           delta_applied = child.checkDelta(dim, delta_applied, sibling);
         }
@@ -739,26 +743,20 @@
     else
     {
       min = this['min_' + dim];
-      if( delta)
+      if (delta)
       {
         var newDim = this[dim] + delta;
-        if( newDim >= min || newDim >= this[dim] )
-        {
+        if (newDim >= min || newDim >= this[dim])
           this['checked_' + dim] = newDim;
-        }
         else
-        {
           this['checked_' + dim] = min;
-        }
         delta_applied = delta - ( this['checked_' + dim] - this[dim] );
       }
       else // clear
-      {
         delta_applied = this['checked_' + dim] = 0;
-      }
     }
     return delta_applied;
-  }
+  };
 
   this.getCapTarget = function(dim, target)
   {

src/ui-scripts/overlaybackground.js

@@ -14,33 +14,28 @@ var OverlayBackgroundPrototype = function()
 
   this.setDimensions = function(force_redraw)
   {
-
-    if(!this.horizontal_border_padding)
+    if (!this.horizontal_border_padding)
       this.setCSSProperties();
-
     var dim = this.cell.top - 1;
-    if( dim != this.top)
+    if (dim != this.top)
     {
       this.is_dirty = true;
       this.top = dim;
     }
-
     dim = this.cell.left;
-    if( dim != this.left)
+    if (dim != this.left)
     {
       this.is_dirty = true;
       this.left = dim;
     }
-
     dim = this.cell.width - this.horizontal_border_padding;
-    if( dim != this.width)
+    if (dim != this.width)
     {
       this.is_dirty = true;
       this.width = dim;
     }
-
     dim = this.cell.height - this.vertical_border_padding + 1;
-    if( dim != this.height)
+    if (dim != this.height)
     {
       this.is_dirty = true;
       this.height = dim;

src/ui-scripts/overlayview.js

@@ -23,5 +23,6 @@ var OverlayViewPrototype = function()
     ViewBase.init.call(this, id, "", container_class, html, default_handler);
   };
 };
+
 OverlayViewPrototype.prototype = ViewBase;
 OverlayView.prototype = new OverlayViewPrototype();

src/ui-scripts/ui-actions.js

@@ -42,7 +42,7 @@ var EventHandler = function(type, is_capturing, handler_key, cancel_bubble)
     while (ele)
     {
       handler = ele.getAttribute(handler_key);
-      while (!(handler && eventHandlers[type][handler]) && (ele = ele.parentNode))
+      while (!(handler && window.eventHandlers[type][handler]) && (ele = ele.parentNode))
       {
         handler = ele.nodeType == 1 ? ele.getAttribute(handler_key) : null;
       }
@@ -53,17 +53,17 @@ var EventHandler = function(type, is_capturing, handler_key, cancel_bubble)
           container =
             document.getElementById(ele.parentNode.parentNode.id.replace('toolbar', 'container'));
         }
-        eventHandlers[type][handler](event, ele, container);
+        window.eventHandlers[type][handler](event, ele, container);
       }
       ele = cancel_bubble ? null : ele && ele.parentNode;
     }
   }
 
   this.post = function(handler, event)
   {
-    if(eventHandlers[type][handler])
+    if(window.eventHandlers[type][handler])
     {
-      eventHandlers[type][handler](event);
+      window.eventHandlers[type][handler](event);
     }
   }
 
@@ -88,7 +88,7 @@ new EventHandler('scroll', true);
 
 /***** general ui click handler *****/
 
-eventHandlers.mousedown['tab'] = function(event, target)
+window.eventHandlers.mousedown['tab'] = function(event, target)
 {
   var tabs = UIBase.getUIById(target.get_attr('parent-node-chain', 'ui-id'));
   var view_id = target.get_attr('parent-node-chain', 'ref-id');
@@ -99,11 +99,11 @@ eventHandlers.mousedown['tab'] = function(event, target)
   else
   {
     opera.postError(ui_strings.S_DRAGONFLY_INFO_MESSAGE +
-      "tabs is missing in eventHandlers.click['tab'] in ui-actions");
+      "tabs is missing in window.eventHandlers.click['tab'] in ui-actions");
   }
 }
 
-eventHandlers.mousewheel['change-on-scroll'] = function(event, target)
+window.eventHandlers.mousewheel['change-on-scroll'] = function(event, target)
 {
   if (target.nodeName == "tab")
   {
@@ -113,18 +113,18 @@ eventHandlers.mousewheel['change-on-scroll'] = function(event, target)
   if (event.detail < 0) {
       if (active_tab.previousElementSibling)
       {
-        eventHandlers.mousedown['tab'](null, active_tab.previousElementSibling);
+        window.eventHandlers.mousedown['tab'](null, active_tab.previousElementSibling);
       }
   }
   else {
       if (active_tab.nextElementSibling)
       {
-        eventHandlers.mousedown['tab'](null, active_tab.nextElementSibling);
+        window.eventHandlers.mousedown['tab'](null, active_tab.nextElementSibling);
       }
   }
 }
 
-eventHandlers.click['close-tab'] = function(event, target)
+window.eventHandlers.click['close-tab'] = function(event, target)
 {
   //target = target.parentElement;
 
@@ -137,15 +137,15 @@ eventHandlers.click['close-tab'] = function(event, target)
   }
 }
 
-eventHandlers.mousedown['horizontal-nav'] = function(event, target)
+window.eventHandlers.mousedown['horizontal-nav'] = function(event, target)
 {
   var horizontal_nav = UIBase.getUIById(target.get_attr('parent-node-chain', 'ui-id'));
   var dir = target.get_attr('parent-node-chain', 'dir');
   horizontal_nav.nav(dir, true);
 };
 
-eventHandlers.mouseup['horizontal-nav'] =
-eventHandlers.mouseout['horizontal-nav'] = function(event, target)
+window.eventHandlers.mouseup['horizontal-nav'] =
+window.eventHandlers.mouseout['horizontal-nav'] = function(event, target)
 {
   var selection = window.getSelection();
   if (!selection.isCollapsed)
@@ -156,26 +156,26 @@ eventHandlers.mouseout['horizontal-nav'] = function(event, target)
   horizontal_nav.clear_nav_timeout();
 };
 
-eventHandlers.mousewheel['breadcrumbs-drag'] = function(event, target)
+window.eventHandlers.mousewheel['breadcrumbs-drag'] = function(event, target)
 {
   var horizontal_nav = UIBase.getUIById(target.get_attr('parent-node-chain', 'ui-id'));
   horizontal_nav.nav(event.detail < 0 ? 100 : -100);
 };
 
-eventHandlers.mousedown['breadcrumbs-drag'] = function(event, target)
+window.eventHandlers.mousedown['breadcrumbs-drag'] = function(event, target)
 {
   var horizontal_nav = UIBase.getUIById(target.get_attr('parent-node-chain', 'ui-id'));
   horizontal_nav.drag_breadcrumb(event, target);
 
 };
 
-eventHandlers.click['settings-tabs'] = function(event, target)
+window.eventHandlers.click['settings-tabs'] = function(event, target)
 {
   var tabs = UIBase.getUIById(target.parentElement.getAttribute('ui-id'));
   windows.showWindow('window-3', 'Settings', templates.settings(tabs), 200, 200, 200, 200);
 }
 
-eventHandlers.click['show-search'] = function(event, target)
+window.eventHandlers.click['show-search'] = function(event, target)
 {
   var toolbar = UIBase.getUIById(target.get_attr('parent-node-chain', 'ui-id'));
   if (toolbar)
@@ -188,42 +188,38 @@ eventHandlers.click['show-search'] = function(event, target)
   }
 }
 
-
-
-
-
-eventHandlers.click['show-window'] = function(event)
+window.eventHandlers.click['show-window'] = function(event)
 {
   var target = event.target;
   var view_id = target.getAttribute('view-id');
   target.parentNode.parentNode.parentNode.removeChild(target.parentNode.parentNode);
   UIWindowBase.showWindow(view_id);
 }
 
-eventHandlers.click['documentation'] = function(event)
+window.eventHandlers.click['documentation'] = function(event)
 {
   window.open(event.target.getAttribute('param'), '_info_window').focus();
 }
 
 
-eventHandlers.click['top-window-close'] = function(event)
+window.eventHandlers.click['top-window-close'] = function(event)
 {
   window.close();
 }
 
-eventHandlers.click['top-window-toggle-attach'] = function(event)
+window.eventHandlers.click['top-window-toggle-attach'] = function(event)
 {
   window.opera.attached = !window.opera.attached;
   window.settings.general.set('window-attached',  window.opera.attached);
   window.client.create_window_controls();
 }
 
-eventHandlers.click['overlay-tab'] = function(event, target)
+window.eventHandlers.click['overlay-tab'] = function(event, target)
 {
   Overlay.get_instance().change_group(event.target.getAttribute("group"));
 };
 
-eventHandlers.click['toggle-overlay'] = function(event, target)
+window.eventHandlers.click['toggle-overlay'] = function(event, target)
 {
   var overlay = Overlay.get_instance();
   var overlay_id = target.getAttribute("data-overlay-id");
@@ -233,12 +229,12 @@ eventHandlers.click['toggle-overlay'] = function(event, target)
       this.broker.dispatch_action("global", "show-overlay", event, target);
 };
 
-eventHandlers.click['toggle-console'] = function(event, target)
+window.eventHandlers.click['toggle-console'] = function(event, target)
 {
   this.broker.dispatch_action("global", "toggle-console", event, target);
 };
 
-eventHandlers.click['toolbar-switch'] = function(event)
+window.eventHandlers.click['toolbar-switch'] = function(event)
 {
   var target = event.target;
   var arr = target.getAttribute('key') && target.getAttribute('key').split('.');
@@ -253,7 +249,7 @@ eventHandlers.click['toolbar-switch'] = function(event)
   }
 }
 
-eventHandlers.click["toolbar-single-select"] = function(event, target)
+window.eventHandlers.click["toolbar-single-select"] = function(event, target)
 {
   var button = event.target;
   var view_id = target.getAttribute("data-view-id");
@@ -306,7 +302,7 @@ eventHandlers.click["toolbar-single-select"] = function(event, target)
   }
 }
 
-eventHandlers.click["close-overlay-view"] = function(event, target)
+window.eventHandlers.click["close-overlay-view"] = function(event, target)
 {
   var ui_id = target.get_ancestor_attr("ui-id");
   var toolbar = UIBase.getUIById(ui_id);
@@ -318,7 +314,7 @@ eventHandlers.click["close-overlay-view"] = function(event, target)
 
 /***** change handler *****/
 
-eventHandlers.change['checkbox-setting'] = function(event)
+window.eventHandlers.change['checkbox-setting'] = function(event)
 {
   var ele = event.target;
   var view_id = ele.getAttribute('view-id');

src/ui-style/ui.css

@@ -1844,6 +1844,6 @@ info {
 .background-overlay
 {
   position: absolute;
-  border: 1px solid #999999;
-  box-shadow: 0 2px 5px hsla(0, 0%, 0%, .5);
+  border: 1px solid #999;
+  box-shadow: 0 2px 5px hsla(0, 0%, 0%, 0.5);
 }