Merge branch 'master' of github.com:ajaxorg/cloud9 into tree_dragdrop

Conflicts: client/js/apf_release.js
gero3 · Dec 19, 2011 · 1fbc417 · 1fbc417
2 parents 3f6205d + 59ebdb7
commit 1fbc417
Show file tree

Hide file tree

Showing 23 changed files with 2,418 additions and 102 deletions.
diff --git a/client/apf/elements/codeeditor.js b/client/apf/elements/codeeditor.js
diff --git a/client/apf/elements/dbg/chromedebughost.js b/client/apf/elements/dbg/chromedebughost.js
@@ -0,0 +1,133 @@
+// #ifdef __AMLDEBUGGER || __INC_ALL
+if (apf.hasRequireJS) define("apf/elements/dbg/chromedebughost",
+    ["module",
+     "debug/ChromeDebugMessageStream", 
+     "debug/WSChromeDebugMessageStream", 
+     "debug/DevToolsService", 
+     "debug/V8DebuggerService",
+     "debug/V8Debugger",
+     "apf/elements/dbg/v8debugger"],
+    function(module, ChromeDebugMessageStream, WSChromeDebugMessageStream, DevToolsService, V8DebuggerService, V8Debugger, APFV8Debugger) {
+
+var ChromeDebugHost = module.exports = function(hostname, port, o3obj, ws) {
+    this.$hostname = hostname;
+    this.$port = port;
+    this.$o3obj = o3obj;
+    this.$ws = ws;
+
+    this.$debuggers = {};
+
+    this.$init();
+    this.$connect(function() {});
+};
+
+(function() {
+
+    this.$connect = function(callback) {
+        var self = this;
+
+        if (this.state == "connected") {
+            return callback.call(this);
+        } else {
+            this.addEventListener("connect", function() {
+                self.removeEventListener("connect", arguments.callee);
+                callback.call(self);
+            });
+        }
+        if (this.state == "connecting")
+            return;
+
+        this.state = "connecting";
+
+        if (!this.$ws) {
+            var socket = this.$socket = new O3Socket(this.$hostname, this.$port, this.$o3obj);
+            var msgStream = new ChromeDebugMessageStream(socket);
+        } else {
+            var msgStream = new WSChromeDebugMessageStream(this.$ws);            
+        }
+
+        msgStream.addEventListener("connect", function() {
+            self.$dts = new DevToolsService(msgStream);
+            self.$v8ds = new V8DebuggerService(msgStream);
+            self.state = "connected";
+            self.dispatchEvent("connect");
+
+            window.onunload = self.disconnect.bind(self);
+        });
+
+        msgStream.connect();        
+    };
+
+    this.loadTabs = function(model) {
+        var self = this;
+        this.$connect(function() {
+            self.$dts.listTabs(function(tabs) {
+                var xml = [];
+                for (var i = 0; i < tabs.length; i++) {
+                    xml.push("<tab id='", tabs[i][0], "' url='", apf.escapeXML(tabs[i][1]+""), "' />");
+                }
+                model.load("<tabs>" + xml.join("") + "</tabs>");
+            });
+        });
+    };
+
+    this.attach = function(tabId, callback) {
+        var dbg;
+
+        if (dbg = this.$debuggers[tabId])
+            return callback(null, dbg)
+
+        var self = this;
+        this.$connect(function() {
+            self.$v8ds.attach(tabId, function() {
+                dbg = new APFV8Debugger(new V8Debugger(tabId, self.$v8ds), this);
+                self.$debuggers[tabId] = dbg;
+                callback(null, dbg);
+            });
+        });
+    };
+
+    this.detach = function(dbg, callback) {        
+        var self = this;
+        for (var id in this.$debuggers) {
+            if (this.$debuggers[id] == dbg) {
+                this.$v8ds.detach(id, function(err) {
+                    delete self.$debuggers[id];
+                    dbg.dispatchEvent("detach");
+                    callback && callback(err);
+                });                
+                break;
+            }    
+        }
+    };  
+
+    this.disconnect = function(callback) {
+        var debuggers = [];
+        for (var id in this.$debuggers) {
+            debuggers.push(id);
+        }
+
+        var self = this;
+        var detachNext = function() {
+            if (debuggers.length) {
+                var id = debuggers.shift();
+                var dbg = self.$debuggers[id]
+                self.$v8ds.detach(id, function() {
+                    detachNext();
+                    dbg.dispatchEvent("detach");
+                });
+            } else {
+                self.$socket.close();
+                self.$debuggers = {};
+                self.dispatchEvent("disconnect", {});
+                callback && callback();
+            }
+        }
+
+        detachNext();
+    };
+
+}).call(ChromeDebugHost.prototype = new apf.Class());
+
+});
+// #endif