dev_panel 0.2.4 → 0.2.5

data/lib/devpanel/extension.rb

@@ -10,29 +10,33 @@ module DevPanel
     end
 
     def dev_panel_ajax
+      puts "#{jquery_cdn.nil?} + #{jquery_ui_cdn.nil?} + #{ajax_call}" 
       jquery_cdn + jquery_ui_cdn + ajax_call
     end
 
     def ajax_call
       <<-html_code
         <div id="DevPanel"></div><script type="text/javascript">
-          $.ajax({
+          var $jq = jQuery.noConflict();  
+          $jq.ajax({
             url: "/__DevPanel/main",
             success: function(response) {
-              $("#DevPanel").html(response);
+              $jq("#DevPanel").html(response);
               #{hide_container};
-              $("#viewTime").click(function(e) {
-                $("#partialList").css('top', e.pageY + 10 + 'px');
-                $("#partialList").css('left', e.pageX + 10 + 'px');
-                $("#partialList").toggle();
+              $jq("#viewTime").click(function(e) {
+                $jq("#partialList").css('top', e.pageY + 10 + 'px');
+                $jq("#partialList").css('left', e.pageX + 10 + 'px');
+                $jq("#partialList").toggle();
               });
-              $("#devPanelHider").on("click", function(s) {
-                $("#devPanelContainer").toggle();
-                $("#partialList").hide();
-                $.get("/__DevPanel/set_options?visible=" + $("#devPanelContainer").is(":visible"));
+              $jq("#devPanelHider").on("click", function(s) {
+                $jq("#devPanelContainer").toggle();
+                $jq("#partialList").hide();
+                $jq.get("/__DevPanel/set_options?visible=" + $jq("#devPanelContainer").is(":visible"));
               });
-              $("#devPanelWindow").draggable({stop: function() {
-                $.get("/__DevPanel/set_options?top=" + $("#devPanelWindow").position().top + "&left=" + $("#devPanelWindow").position().left);
+              $jq("#devPanelWindow").draggable({stop: function() {
+                $jq.get("/__DevPanel/set_options?top=" + $jq("#devPanelWindow").position().top + "&left="
+                                                     + $jq("#devPanelWindow").position().left + "&zindex="
+                                                     + $jq("#devPanelWindow").zIndex() )
               }});
             }
           });
@@ -41,23 +45,23 @@ module DevPanel
     end
 
     def hide_container
-      (Stats.show?) ? '' : '$("#devPanelContainer").toggle()'
+      (Stats.show?) ? '' : '$jq("#devPanelContainer").toggle()'
     end
 
-    def jquery_cdn
+    def config_key(value)
       begin
-        return '' if Rails.application.config.dev_panel_exclude_jquery == true
+        return Rails.application.config.send(value)
       rescue
-        '<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>'
+        return nil
       end
     end
 
+    def jquery_cdn
+      '<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>'
+    end
+
     def jquery_ui_cdn
-      begin
-        return '' if Rails.application.config.dev_panel_exclude_jquery_ui == true
-      rescue
-        '<script src="http://code.jquery.com/ui/1.9.2/jquery-ui.js"></script>'
-      end
+      '<script src="http://code.jquery.com/ui/1.9.2/jquery-ui.js"></script>'
     end
   end
 end

data/lib/devpanel/middleware.rb

@@ -29,6 +29,12 @@ module DevPanel
             box-shadow: 0 0 10px rgba(0, 0, 0, 0.03), 1px 1px 0 rgba(0, 0, 0, 0.05), -1px 1px 0 rgba(0, 0, 0, 0.05), 0 0 0 4px rgba(0, 0, 0, 0.04);
             font-family: menlo, lucida console, monospace;
             border: 2px solid #000;
+            z-index: 500000000;
+            padding: 3px; 
+            color: #000; 
+            background-color: #F0F0F5; 
+            position: absolute; 
+            float: left;             
           }
 
           #devPanelHider {
@@ -42,12 +48,16 @@ module DevPanel
             border-bottom: 0;
             border-top-left-radius: 2px;
             border-top-right-radius: 2px;
+            width: 150px; 
+            text-align:center; 
+            border: solid 1px #fff;
           }
 
           #devPanelContainer {
             font-family: menlo, lucida console, monospace;
             background-color: #fff;
             box-shadow: inset 3px 3px 3px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+            width: 300px; padding-top: 20px;
           }
 
           #devPanelContainer td {
@@ -92,7 +102,7 @@ module DevPanel
             border-top-left-radius: 2px;
             border-top-right-radius: 2px;
             display: none;
-            z-index: 1;
+            z-index: 500000001;
           }
         </style>
       css_code
@@ -101,9 +111,9 @@ module DevPanel
     def html_containers
       <<-html_code
         <div id='partialList'>#{partial_list}</div>
-        <div id="devPanelWindow" style="padding: 3px; color: #000; background-color: #F0F0F5; position: absolute; float: left; top: #{Stats.top.to_s}px; left: #{Stats.left.to_s}px;" >
-        <div id="devPanelHider" style="width: 150px; text-align:center; border: solid 1px #fff"><a href="#">Show/Hide Stats</a> / <span style="font-size: 10px">#{Stats.data[:action_controller].duration.round(0).to_s}ms</span></div>
-        <div id="devPanelContainer" style="width: 300px; padding-top: 20px">
+        <div id="devPanelWindow" style="top: #{Stats.top.to_s}px; left: #{Stats.left.to_s}px;" >
+        <div id="devPanelHider"><a href="#">Show/Hide Stats</a> / <span style="font-size: 10px">#{Stats.data[:action_controller].duration.round(0).to_s}ms</span></div>
+        <div id="devPanelContainer">
       html_code
     end
 
@@ -136,7 +146,6 @@ module DevPanel
     def partial_list
       str = ""
       Stats.data[:partials].each_pair {|k,v| str << "#{k}: #{Stats.data[:partials][k]}<br>" } if Stats.data[:partials].present?
-
       str
     end
 
@@ -156,7 +165,6 @@ module DevPanel
       result = ""
       arr.each_with_index do |data, index|
         result += tr(data, index.even? ? "alt" : "")
-        tr(data, index.even? ? "alt" : "")
       end
       result
     end

data/lib/devpanel/rails.rb

@@ -32,7 +32,7 @@ module DevPanel
         rescue
           top = 0
         end
-        DevPanel::Stats.top(top)
+       
 
         left = nil
         begin
@@ -40,8 +40,17 @@ module DevPanel
         rescue
           left = 0
         end
+        
+        zindex = nil
+        begin
+          zindex = Rails.application.config.dev_panel_initial_zindex
+        rescue
+          zindex = 1000
+        end
+          
         DevPanel::Stats.top(top)
         DevPanel::Stats.left(left)
+        DevPanel::Stats.zindex(zindex)
       end
     end
   end

data/lib/devpanel/stats.rb

@@ -1,13 +1,13 @@
 module DevPanel
   class Stats
 
-    @@data ||= { log: "" }
-    @@visible = "false"
-    @@left = 0
-    @@top = 0
+    @@data      ||= { log: "" }
+    @@visible     = "false"
+    @@left        = 0
+    @@top         = 0
 
     def self.set_by_params(params)
-      ['visible', 'left', 'top'].each do |str|
+      ['visible', 'left', 'top', 'zindex'].each do |str|
         Stats.send(str, params[str]) if params[str].present?
       end
       Stats.log(" ")
@@ -30,6 +30,11 @@ module DevPanel
       return @@top if val.class != Fixnum && val.empty?
       @@top = val
     end
+    
+    def self.zindex(val = @@zindex)
+      return @@zindex if val.class != Fixnum && val.empty?
+      @@zindex = val || 1000
+    end
 
     def self.visible(val = @@visible)
       @@visible = val

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_panel
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies: []
 description: A panel that appears in the browser to provide stats on page load times
   and other debugging information for Rails 3
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: DevPanel, a gem for performance stats and debugging information