atopwi side of clean up for extension panels

johnjbarton · Apr 12, 2012 · 296f252 · 296f252
1 parent 372707f
commit 296f252
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.allow-devtools-save b/.allow-devtools-save
diff --git a/DevtoolsConnection.js b/DevtoolsConnection.js
@@ -14,8 +14,8 @@ function(appendFrame)  {
     openInspector: function(debuggee) {
       this.debuggee = debuggee;
 
-      var inspectorElt = this.showInspectorIframe();
+      this.listenDebuggee();
-      this.listenDebuggee(inspectorElt.contentWindow);
+      this.showInspectorIframe();
     },
 
     showInspectorIframe: function() {
@@ -26,14 +26,17 @@ function(appendFrame)  {
     },
 
     listenDebuggee: function() {
-      this.devtools = new RESTChannel.Connection();
+      if (debug) {
+        console.log("DevtoolsConnection listening ");
+      }
       this.onUnload = RESTChannel.listen(
-        this.devtools, 
+        window, 
         this.sendDebuggeeSpec.bind(this)
       );
     },
 
-    sendDebuggeeSpec: function() {
+    sendDebuggeeSpec: function(connection) {
+      this.devtools = connection;
       this.devtools.putObject(
         'debuggee', 
         this.debuggee,

diff --git a/devtoolsAdapter/extend.html b/devtoolsAdapter/extend.html
@@ -1,10 +1,11 @@
 <html><head>
 <script src='../inspector/front-end/ExtensionAPI.js'></script>
-<script src='../inspector/front-end/ExtensionAPI.js'></script>
 <script src='../../RESTChannel/RESTChannel.js'></script>
-<script src='../APIGeneration/trialAPI.js'></script>
-<script src='../devtoolsAdapter/extensionPanelRuntime.js'></script>
 <script>
+// This code is loaded by 'options' settings in Sirius
+// It loads into devtools.html as a devtools extension.
+
+
 chrome.devtools = injectedExtensionAPI('log');
 chrome.devtools.panels.create("Log", '', '../Purple/devtools/panels/log.html', function() {
   console.log('extend.html PANEL callback');