incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmue...@apache.org
Subject [10/27] fixes for issue #10, drive-by removal of scoop
Date Tue, 03 Jan 2012 18:39:31 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/Native.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/Native.scoop b/weinre.web/modules-scoop/weinre/common/Native.scoop
deleted file mode 100644
index af28f0b..0000000
--- a/weinre.web/modules-scoop/weinre/common/Native.scoop
+++ /dev/null
@@ -1,43 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2011 IBM Corporation
- */
-
-//-----------------------------------------------------------------------------
-class Native
-
-//-----------------------------------------------------------------------------
-init
-    Native.original = {}
-
-    Native.original.clearInterval             = window.clearInterval
-    Native.original.clearTimeout              = window.clearTimeout
-    Native.original.setTimeout                = window.setTimeout
-    Native.original.setInterval               = window.setInterval
-    Native.original.XMLHttpRequest            = window.XMLHttpRequest
-    Native.original.XMLHttpRequest_open       = window.XMLHttpRequest.prototype.open
-    Native.original.LocalStorage_setItem      = window.localStorage   ? window.localStorage.setItem      : null
-    Native.original.LocalStorage_removeItem   = window.localStorage   ? window.localStorage.removeItem   : null
-    Native.original.LocalStorage_clear        = window.localStorage   ? window.localStorage.clear        : null
-    Native.original.SessionStorage_setItem    = window.sessionStorage ? window.sessionStorage.setItem    : null
-    Native.original.SessionStorage_removeItem = window.sessionStorage ? window.sessionStorage.removeItem : null
-    Native.original.SessionStorage_clear      = window.sessionStorage ? window.sessionStorage.clear      : null
-    Native.original.openDatabase              = window.openDatabase
-
-    Native.clearInterval             = function() { return Native.original.clearInterval.apply( window, [].slice.call(arguments))}
-    Native.clearTimeout              = function() { return Native.original.clearTimeout.apply(  window, [].slice.call(arguments))}
-    Native.setInterval               = function() { return Native.original.setInterval.apply(   window, [].slice.call(arguments))}
-    Native.setTimeout                = function() { return Native.original.setTimeout.apply(    window, [].slice.call(arguments))}
-    Native.XMLHttpRequest            = function() { return new Native.original.XMLHttpRequest()}
-    Native.XMLHttpRequest_open       = function() { return Native.original.XMLHttpRequest_open.apply(this, [].slice.call(arguments))}
-    Native.LocalStorage_setItem      = function() { return Native.original.LocalStorage_setItem.apply(      window.localStorage,   [].slice.call(arguments))}
-    Native.LocalStorage_removeItem   = function() { return Native.original.LocalStorage_removeItem.apply(   window.localStorage,   [].slice.call(arguments))}
-    Native.LocalStorage_clear        = function() { return Native.original.LocalStorage_clear.apply(        window.localStorage,   [].slice.call(arguments))}
-    Native.SessionStorage_setItem    = function() { return Native.original.SessionStorage_setItem.apply(    window.sessionStorage, [].slice.call(arguments))}
-    Native.SessionStorage_removeItem = function() { return Native.original.SessionStorage_removeItem.apply( window.sessionStorage, [].slice.call(arguments))}
-    Native.SessionStorage_clear      = function() { return Native.original.SessionStorage_clear.apply(      window.sessionStorage, [].slice.call(arguments))}
-    Native.openDatabase              = function() { return Native.original.openDatabase.apply( window, [].slice.call(arguments))}
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/StackTrace.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/StackTrace.scoop b/weinre.web/modules-scoop/weinre/common/StackTrace.scoop
deleted file mode 100644
index a46b602..0000000
--- a/weinre.web/modules-scoop/weinre/common/StackTrace.scoop
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-//-----------------------------------------------------------------------------
-class StackTrace(args)
-    if (!args || !args.callee) {
-        throw Error("first parameter to " + arguments.callee.signature + " must be an Arguments object") 
-    }
-    
-    this.trace = getTrace(args)
-
-//-----------------------------------------------------------------------------
-static method dump(args)
-    args = args || arguments
-    
-    var stackTrace = new StackTrace(args)
-    stackTrace.dump()
-
-//-----------------------------------------------------------------------------
-method dump
-    console.log("StackTrace:")
-    this.trace.forEach(function(frame) {
-        console.log("    " + frame)
-    })
-    
-//-----------------------------------------------------------------------------
-function getTrace(args)
-
-    var result = []
-    var visitedFuncs = []
-    
-    var func = args.callee
-    
-    while (func) {
-        if      (func.signature)   result.push(func.signature)
-        else if (func.displayName) result.push(func.displayName)
-        else if (func.name)        result.push(func.name)
-        else result.push("<anonymous>")
-
-        if (-1 != visitedFuncs.indexOf(func)) {
-            result.push("... recursion")
-            return result
-        }
-        
-        visitedFuncs.push(func)
-        
-        func = func.caller
-    }
-    
-    return result
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/WebSocketXhr.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/WebSocketXhr.scoop b/weinre.web/modules-scoop/weinre/common/WebSocketXhr.scoop
deleted file mode 100644
index 813e6a9..0000000
--- a/weinre.web/modules-scoop/weinre/common/WebSocketXhr.scoop
+++ /dev/null
@@ -1,211 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ./Ex
-requireClass ./Weinre
-requireClass ./EventListeners
-requireClass ./Native
-
-//-----------------------------------------------------------------------------
-class WebSocketXhr(url, id)
-    this.initialize(url, id)
-    
-//-----------------------------------------------------------------------------
-init
-    var XMLHttpRequest = Native.XMLHttpRequest
-    
-    WebSocketXhr.CONNECTING = 0
-    WebSocketXhr.OPEN       = 1
-    WebSocketXhr.CLOSING    = 2
-    WebSocketXhr.CLOSED     = 3
-
-//-----------------------------------------------------------------------------
-method initialize(url, id)
-    if (!id) {
-        id = "anonymous"
-    }
-    
-    this.readyState      = WebSocketXhr.CONNECTING 
-    this._url            = url
-    this._id             = id
-    this._urlChannel     = null
-    this._queuedSends    = []
-    this._sendInProgress = true
-    
-    this._listeners = {
-        open:    new EventListeners(),
-        message: new EventListeners(),
-        error:   new EventListeners(),
-        close:   new EventListeners()
-    }
-    
-    this._getChannel()
-
-//-----------------------------------------------------------------------------
-method _getChannel
-    var body = JSON.stringify({ id: this._id})
-    this._xhr(this._url, "POST", body, this._handleXhrResponseGetChannel)
-
-//-----------------------------------------------------------------------------
-method _handleXhrResponseGetChannel(xhr)
-    if (xhr.status != 200) return this._handleXhrResponseError(xhr)
-
-    try {
-        var object = JSON.parse(xhr.responseText)
-    }
-    catch (e) {
-        this._fireEventListeners("error", {message: "non-JSON response from channel open request"})
-        this.close()
-        return
-    }
-    
-    if (!object.channel) {
-        this._fireEventListeners("error", {message: "channel open request did not include a channel"})
-        this.close()
-        return
-    }
-    
-    this._urlChannel = this._url + "/" + object.channel
-    this.readyState = WebSocketXhr.OPEN
-
-    this._fireEventListeners("open", { message: "open", channel: object.channel })
-    
-    this._sendInProgress = false
-    this._sendQueued()
-    
-    this._readLoop()
-
-//-----------------------------------------------------------------------------
-method _readLoop
-    if (this.readyState == WebSocketXhr.CLOSED) return
-    if (this.readyState == WebSocketXhr.CLOSING) return
-    
-    this._xhr(this._urlChannel, "GET", "", this._handleXhrResponseGet)
-
-//-----------------------------------------------------------------------------
-method _handleXhrResponseGet(xhr)
-    var self = this
-    
-    if (xhr.status != 200) return this._handleXhrResponseError(xhr)
-
-    try {
-        var datum = JSON.parse(xhr.responseText)
-    }
-    catch (e) {
-        this.readyState = WebSocketXhr.CLOSED
-        
-        this._fireEventListeners("error", {
-            message: "non-JSON response from read request"
-        })
-        return
-    }
-    
-    Native.setTimeout(function() {self._readLoop()}, 0)
-
-    datum.forEach(function(data) {
-        self._fireEventListeners("message", {data: data})
-    })
-
-//-----------------------------------------------------------------------------
-method send(data)
-    if (typeof data != "string") throw new Ex(arguments, this.constructor.name + "." + this.caller)
-
-    this._queuedSends.push(data)
-    
-    if (this._sendInProgress) return
-    this._sendQueued();
-
-//-----------------------------------------------------------------------------
-method _sendQueued
-    if (this._queuedSends.length == 0) return
-    if (this.readyState == WebSocketXhr.CLOSED) return
-    if (this.readyState == WebSocketXhr.CLOSING) return
-    
-    datum = JSON.stringify(this._queuedSends)
-    this._queuedSends = []
-    
-    this._sendInProgress = true
-    
-    this._xhr(this._urlChannel, "POST", datum, this._handleXhrResponseSend)
-
-//-----------------------------------------------------------------------------
-method _handleXhrResponseSend(xhr)
-    var httpSocket = this
-    
-    if (xhr.status != 200) return this._handleXhrResponseError(xhr)
-    
-    this._sendInProgress = false
-    Native.setTimeout(function() {httpSocket._sendQueued()}, 0)
-
-//-----------------------------------------------------------------------------
-method close
-    this._sendInProgress = true
-    this.readyState = WebSocketXhr.CLOSING
-    this._fireEventListeners("close", {
-        message: "closing",
-        wasClean: true
-    })
-    this.readyState = WebSocketXhr.CLOSED
-
-//-----------------------------------------------------------------------------
-method addEventListener(type, listener, useCapture)
-    this._getListeners(type).add(listener, useCapture)
-
-//-----------------------------------------------------------------------------
-method removeEventListener(type, listener, useCapture)
-    this._getListeners(type).remove(listener, useCapture)
-
-//-----------------------------------------------------------------------------
-method _fireEventListeners(type, event)
-    if (this.readyState == WebSocketXhr.CLOSED) return
-    
-    event.target = this
-    this._getListeners(type).fire(event)
-
-//-----------------------------------------------------------------------------
-method _getListeners(type)
-    var listeners = this._listeners[type]
-    if (null == listeners) throw new Ex(arguments, "invalid event listener type: '" + type + "'")
-    
-    return listeners
-
-//-----------------------------------------------------------------------------
-method _handleXhrResponseError(xhr)
-    if (xhr.status == 404) {
-        this.close()
-        return
-    }
-    
-    this._fireEventListeners("error", {
-        target: this,
-        status: xhr.status,
-        message: "error from XHR invocation: " + xhr.statusText
-    })
-    
-    Weinre.logError("error from XHR invocation: " + xhr.status + ": " + xhr.statusText)
-
-//-----------------------------------------------------------------------------
-method _xhr(url, method, data, handler)
-    if (null == handler) throw new Ex(arguments, "handler must not be null")
-    
-    var xhr = new XMLHttpRequest()
-    
-    xhr.httpSocket         = this
-    xhr.httpSocketHandler  = handler
-    xhr.onreadystatechange = _xhrEventHandler
-    
-    xhr.open(method, url, true)
-    xhr.setRequestHeader("Content-Type", "text/plain")
-    xhr.send(data)
-
-//-----------------------------------------------------------------------------
-function _xhrEventHandler(event)
-    var xhr = event.target
-    if (xhr.readyState != 4) return
-    
-    xhr.httpSocketHandler.call(xhr.httpSocket, xhr) 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/Weinre.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/Weinre.scoop b/weinre.web/modules-scoop/weinre/common/Weinre.scoop
deleted file mode 100644
index 75c37d0..0000000
--- a/weinre.web/modules-scoop/weinre/common/Weinre.scoop
+++ /dev/null
@@ -1,80 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ./Ex
-requireClass ./IDLTools
-requireClass ./StackTrace
-
-//-----------------------------------------------------------------------------
-class Weinre
-    throw new Ex(arguments, "this class is not intended to be instantiated")
-
-//-----------------------------------------------------------------------------
-init 
-    var _notImplemented     = {}
-    var _showNotImplemented = false
-    var CSSProperties       = []
-    var logger              = null
-
-//-----------------------------------------------------------------------------
-static method addIDLs(idls)
-    IDLTools.addIDLs(idls)
-
-//-----------------------------------------------------------------------------
-static method addCSSProperties(cssProperties)
-    CSSProperties = cssProperties
-
-//-----------------------------------------------------------------------------
-static method getCSSProperties
-    return CSSProperties
-
-//-----------------------------------------------------------------------------
-static method deprecated()
-    StackTrace.dump(arguments)
-    
-//-----------------------------------------------------------------------------
-static method notImplemented(thing)
-    if (_notImplemented[thing]) return
-    
-    _notImplemented[thing] = true
-    
-    if (!_showNotImplemented) return
-    Weinre.logWarning(thing + " not implemented")
-
-//-----------------------------------------------------------------------------
-static method showNotImplemented()
-    _showNotImplemented = true
-    for (var key in _notImplemented) {
-        Weinre.logWarning(key + " not implemented")
-    }
-    
-//-----------------------------------------------------------------------------
-static method logError(message)
-    getLogger().logError(message)
-
-//-----------------------------------------------------------------------------
-static method logWarning(message)
-    getLogger().logWarning(message)
-
-//-----------------------------------------------------------------------------
-static method logInfo(message)
-    getLogger().logInfo(message)
-
-//-----------------------------------------------------------------------------
-static method logDebug(message)
-    getLogger().logDebug(message)
-
-//-----------------------------------------------------------------------------
-function getLogger()
-    if (logger) return logger
-    
-    if      (Weinre.client) logger = Weinre.WeinreClientCommands
-    else if (Weinre.target) logger = Weinre.WeinreTargetCommands
-    
-    return logger
-    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/CSSStore.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/CSSStore.scoop b/weinre.web/modules-scoop/weinre/target/CSSStore.scoop
deleted file mode 100644
index 5d7575a..0000000
--- a/weinre.web/modules-scoop/weinre/target/CSSStore.scoop
+++ /dev/null
@@ -1,391 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/IDGenerator
-requireClass ../common/Weinre
-
-//-----------------------------------------------------------------------------
-class CSSStore
-    this.styleSheetMap = {}
-    this.styleRuleMap  = {}
-    this.styleDeclMap  = {}
-    this.testElement = document.createElement("div")
-
-//-----------------------------------------------------------------------------
-init
-    var Properties = []
-
-//-----------------------------------------------------------------------------
-static method addCSSProperties(properties)
-    Properties = properties
-
-//-----------------------------------------------------------------------------
-method getInlineStyle(node)
-    var styleObject = this._buildMirrorForStyle(node.style, true)
-    for (var i=0; i<styleObject.cssProperties.length; i++) {
-        styleObject.cssProperties[i].status = "style"
-    }
-    return styleObject
-
-//-----------------------------------------------------------------------------
-method getComputedStyle(node)
-    if (!node) return {}
-    if (node.nodeType != Node.ELEMENT_NODE) return {}
-    
-    var styleObject = this._buildMirrorForStyle(window.getComputedStyle(node), false)
-    return styleObject
-
-//-----------------------------------------------------------------------------
-method getMatchedCSSRules(node)
-    var result = []
-    
-    for (var i=0; i<document.styleSheets.length; i++) {
-        var styleSheet = document.styleSheets[i]
-        
-        if (!styleSheet.cssRules) continue
-        
-        for (var j=0; j<styleSheet.cssRules.length; j++) {
-            var cssRule = styleSheet.cssRules[j]
-            
-            if (!_elementMatchesSelector(node, cssRule.selectorText)) continue
-            
-            var object = {}
-            
-            object.ruleId = this._getStyleRuleId(cssRule)
-            object.selectorText = cssRule.selectorText
-            object.style = this._buildMirrorForStyle(cssRule.style, true)
-            result.push(object)
-        }
-    }
-    
-    return result
-
-//-----------------------------------------------------------------------------
-method getStyleAttributes(node)
-    var result = {}
-    
-    return result
-
-//-----------------------------------------------------------------------------
-method getPseudoElements(node)
-    var result = []
-    
-    return result
-
-//-----------------------------------------------------------------------------
-method setPropertyText(styleId, propertyIndex, text, overwrite)
-    var styleDecl = Weinre.cssStore._getStyleDecl(styleId)
-    
-    if (!styleDecl) {
-        Weinre.logWarning("requested style not available: " + styleId)
-        return null
-    }
-
-    var mirror = styleDecl.__weinre__mirror
-    if (!mirror) {
-        Weinre.logWarning("requested mirror not available: " + styleId)
-        return null
-    }
-
-    var properties = mirror.cssProperties
-    
-    // parse the css text
-    var propertyMirror = this._parseProperty(text)
-    
-    // remove property
-    if (null == propertyMirror) {
-        this._removePropertyFromMirror(mirror, propertyIndex)
-        properties = mirror.cssProperties
-    }
-    
-    // add or replace property
-    else {
-        // if replacing, remove the old one
-        this._removePropertyFromMirror(mirror, propertyIndex)
-        properties = mirror.cssProperties
-
-        // index properties by name
-        var propertyIndices = {}
-        for (var i=0; i<properties.length; i++) {
-            propertyIndices[properties[i].name] = i
-        }
-
-        // add the new ones, or replacing ones    
-        for (var i=0; i<propertyMirror.cssProperties.length; i++) {
-            if (propertyIndices[propertyMirror.cssProperties[i].name] != null) {
-                // property already exists, just replace it
-                properties[propertyIndices[propertyMirror.cssProperties[i].name]] = propertyMirror.cssProperties[i]
-            }
-            else {
-                // new property, add it
-                properties.push(propertyMirror.cssProperties[i])
-            }
-        }
-    
-        for (var key in propertyMirror.shorthandValues) {
-            mirror.shorthandValues[key] = propertyMirror.shorthandValues[key]
-        }
-    }
-    
-    properties.sort(function(p1,p2) {
-        if      (p1.name < p2.name) return -1
-        else if (p1.name > p2.name) return  1
-        else return 0
-    })
-    
-    this._setStyleFromMirror(styleDecl)
-    
-    return mirror
-
-//-----------------------------------------------------------------------------
-method _removePropertyFromMirror(mirror, index)
-    var properties = mirror.cssProperties
-    
-    if (index >= properties.length) return
-    
-    var property = properties[index]
-
-    properties[index] = null
-    
-    if (mirror.shorthandValues[property.name]) {
-        delete mirror.shorthandValues[property.name]
-        
-        for (var i=0; i<properties.length; i++) {
-            if (properties[i]) {
-                if (properties[i].shorthandName == property.name) {
-                    properties[i] = null
-                }
-            }
-        }
-    }
-    
-    var newProperties = []
-    
-    for (var i=0; i<properties.length; i++) {
-        if (properties[i]) newProperties.push(properties[i])
-    }
-    
-    mirror.cssProperties = newProperties
-
-//-----------------------------------------------------------------------------
-method toggleProperty(styleId, propertyIndex, disable)
-    var styleDecl = Weinre.cssStore._getStyleDecl(styleId)
-    
-    if (!styleDecl) {
-        Weinre.logWarning("requested style not available: " + styleId)
-        return null
-    }
-    
-    var mirror = styleDecl.__weinre__mirror
-    if (!mirror) {
-        Weinre.logWarning("requested mirror not available: " + styleId)
-        return null
-    }
-    
-    var cssProperty = mirror.cssProperties[propertyIndex]
-    if (!cssProperty) {
-        Weinre.logWarning("requested property not available: " + styleId + ": " + propertyIndex)
-        return null
-    }
-    
-    if (disable) {
-        cssProperty.status = "disabled"
-    }
-    
-    else {
-        cssProperty.status = "active"
-    }
-
-    this._setStyleFromMirror(styleDecl)
-    
-    return mirror
-
-//-----------------------------------------------------------------------------
-method _setStyleFromMirror(styleDecl)
-    var cssText = []
-    
-    var cssProperties = styleDecl.__weinre__mirror.cssProperties
-    
-    var cssText = ""
-    for (var i=0; i<cssProperties.length; i++) {
-        var property = cssProperties[i]
-        
-        if (!property.parsedOk) continue
-        if (property.status == "disabled") continue
-        if (property.shorthandName) continue
-        
-        cssText += property.name + ": " + property.value
-        if (property.priority == "important") {
-            cssText += " !important; "
-        }
-        else {
-            cssText += "; "
-        }
-    }
-    
-    styleDecl.cssText = cssText
-
-//-----------------------------------------------------------------------------
-method _buildMirrorForStyle(styleDecl, bind)
-    var result = {
-        properties:    {},
-        cssProperties: []
-    }
-    
-    if (!styleDecl) return result
-    
-    if (bind) {
-        result.styleId = this._getStyleDeclId(styleDecl)
-        styleDecl.__weinre__mirror = result
-    }
-    
-    result.properties.width  = styleDecl.getPropertyValue("width")  || ""
-    result.properties.height = styleDecl.getPropertyValue("height") || ""
-    result.cssText           = styleDecl.cssText 
-
-    result.shorthandValues = {}
-
-    var properties = []
-    
-    if (styleDecl) {
-        for (var i=0; i < styleDecl.length; i++) {
-            var property = {}
-            var name = styleDecl.item(i)
-
-            property.name          = name
-            property.priority      = styleDecl.getPropertyPriority(name)
-            property.implicit      = styleDecl.isPropertyImplicit(name)
-            property.shorthandName = styleDecl.getPropertyShorthand(name) || ""
-            property.status        = property.shorthandName ? "style" : "active"
-            property.parsedOk      = true
-            property.value         = styleDecl.getPropertyValue(name)
-            
-            properties.push(property);
-            
-            if (property.shorthandName) {
-                var shorthandName = property.shorthandName
-                if (!result.shorthandValues[shorthandName]) {
-                    result.shorthandValues[shorthandName] = styleDecl.getPropertyValue(shorthandName)
-                    
-                    property = {}
-                    property.name          = shorthandName
-                    property.priority      = styleDecl.getPropertyPriority(shorthandName)
-                    property.implicit      = styleDecl.isPropertyImplicit(shorthandName)
-                    property.shorthandName = ""
-                    property.status        = "active"
-                    property.parsedOk      = true
-                    property.value         = styleDecl.getPropertyValue(name)
-                    
-                    properties.push(property);
-                }
-            }
-        }
-    }
-    
-    properties.sort(function(p1,p2) {
-        if      (p1.name < p2.name) return -1
-        else if (p1.name > p2.name) return  1
-        else return 0
-    })
-    
-    result.cssProperties   = properties
-
-    return result
-
-//-----------------------------------------------------------------------------
-method _parseProperty(string)
-    var testStyleDecl = this.testElement.style
-    
-    try {
-        testStyleDecl.cssText = string
-        
-        if (testStyleDecl.cssText != "") {
-            return this._buildMirrorForStyle(testStyleDecl, false)
-        }
-    }
-    catch(e) {
-    }
-
-    var propertyPattern = /\s*(.+)\s*:\s*(.+)\s*(!important)?\s*;/
-    var match = propertyPattern.exec(string)
-    if (!match) return null
-
-    match[3] = (match[3] == "!important") ? "important" : ""
-
-    var property = {}
-
-    property.name          = match[1]
-    property.priority      = match[3]
-    property.implicit      = true
-    property.shorthandName = ""
-    property.status        = "inactive"
-    property.parsedOk      = false
-    property.value         = match[2]
-
-    var result = {}
-    
-    result.width           = 0
-    result.height          = 0
-    result.shorthandValues = 0
-    result.cssProperties   = [ property ]
-
-    return result
-
-//-----------------------------------------------------------------------------
-method _getStyleSheet(id)
-    return _getMappableObject(id, this.styleSheetMap)
-
-//-----------------------------------------------------------------------------
-method _getStyleSheetId(styleSheet)
-    return _getMappableId(styleSheet, this.styleSheetMap)
-
-//-----------------------------------------------------------------------------
-method _getStyleRule(id)
-    return _getMappableObject(id, this.styleRuleMap)
-
-//-----------------------------------------------------------------------------
-method _getStyleRuleId(styleRule)
-    return _getMappableId(styleRule, this.styleRuleMap)
-
-//-----------------------------------------------------------------------------
-method _getStyleDecl(id)
-    return _getMappableObject(id, this.styleDeclMap)
-
-//-----------------------------------------------------------------------------
-method _getStyleDeclId(styleDecl)
-    return _getMappableId(styleDecl, this.styleDeclMap)
-
-//-----------------------------------------------------------------------------
-function _getMappableObject(id, map)
-    return map[id]
-
-//-----------------------------------------------------------------------------
-function _getMappableId(object, map)
-    return IDGenerator.getId(object, map)
-    
-//-----------------------------------------------------------------------------
-function _mozMatchesSelector(element, selector)
-    if (!element.mozMatchesSelector) return false
-    return element.mozMatchesSelector(selector)
-
-//-----------------------------------------------------------------------------
-function _webkitMatchesSelector(element, selector)
-    if (!element.webkitMatchesSelector) return false
-    return element.webkitMatchesSelector(selector)
-
-//-----------------------------------------------------------------------------
-function _fallbackMatchesSelector(element, selector)
-    return false
-    
-//-----------------------------------------------------------------------------
-init
-    var _elementMatchesSelector
-    
-    if      (Element.prototype.webkitMatchesSelector) _elementMatchesSelector = _webkitMatchesSelector 
-    else if (Element.prototype.mozMatchesSelector)    _elementMatchesSelector = _mozMatchesSelector
-    else                                              _elementMatchesSelector = _fallbackMatchesSelector
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/CheckForProblems.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/CheckForProblems.scoop b/weinre.web/modules-scoop/weinre/target/CheckForProblems.scoop
deleted file mode 100644
index dc25ab8..0000000
--- a/weinre.web/modules-scoop/weinre/target/CheckForProblems.scoop
+++ /dev/null
@@ -1,28 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-//-----------------------------------------------------------------------------
-class CheckForProblems
-
-//-----------------------------------------------------------------------------
-static method check
-    checkForOldPrototypeVersion()
-
-//-----------------------------------------------------------------------------
-function checkForOldPrototypeVersion
-    var badVersion = false
-
-    if (typeof Prototype == "undefined") return
-    if (!Prototype.Version) return
-    
-    if (Prototype.Version.match(/^1\.5.*/)) badVersion = true
-    if (Prototype.Version.match(/^1\.6.*/)) badVersion = true
-    
-    if (badVersion) {
-        alert("Sorry, weinre is not support in versions of Prototype earlier than 1.7")
-    }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/Console.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/Console.scoop b/weinre.web/modules-scoop/weinre/target/Console.scoop
deleted file mode 100644
index 3d95827..0000000
--- a/weinre.web/modules-scoop/weinre/target/Console.scoop
+++ /dev/null
@@ -1,169 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Weinre
-requireClass ../target/Timeline
-
-//-----------------------------------------------------------------------------
-class Console
-
-//-----------------------------------------------------------------------------
-init
-    var UsingRemote = false
-    
-    var RemoteConsole   = new Console()
-    var OriginalConsole = window.console
-    
-    RemoteConsole.__original   = OriginalConsole
-    OriginalConsole.__original = OriginalConsole
-    
-    var MessageSource = {
-        HTML: 0,
-        WML: 1,
-        XML: 2,
-        JS: 3,
-        CSS: 4,
-        Other: 5
-    }
-    
-    var MessageType = {
-        Log: 0,
-        Object: 1,
-        Trace: 2,
-        StartGroup: 3,
-        StartGroupCollapsed: 4,
-        EndGroup: 5,
-        Assert: 6,
-        UncaughtException: 7,
-        Result: 8
-    }
-    
-    var MessageLevel = {
-        Tip: 0,
-        Log: 1,
-        Warning: 2,
-        Error: 3,
-        Debug: 4
-    }
-
-//-----------------------------------------------------------------------------
-static getter original
-    return OriginalConsole
-
-//-----------------------------------------------------------------------------
-static method useRemote(value)
-    if (arguments.length == 0) return UsingRemote
-    
-    var oldValue = UsingRemote
-    
-    UsingRemote = !!value
-    
-    if (UsingRemote) 
-        window.console = RemoteConsole
-    else
-        window.console = OriginalConsole
-        
-    return oldValue
-
-//-----------------------------------------------------------------------------
-method _generic(level, messageParts)
-    
-    var message = messageParts[0].toString()
-    
-    var parameters = []
-    for (var i=0; i<messageParts.length; i++) {
-        parameters.push(
-            Weinre.injectedScript.wrapObjectForConsole(messageParts[i], true)
-        )
-    }
-    
-    var payload = {
-        source:      MessageSource.JS,
-        type:        MessageType.Log,
-        level:       level,
-        message:     message,
-        parameters:  parameters
-    }
-    
-    Weinre.wi.ConsoleNotify.addConsoleMessage(payload)
-
-//-----------------------------------------------------------------------------
-method log
-    this._generic(MessageLevel.Log, [].slice.call(arguments)) 
-
-//-----------------------------------------------------------------------------
-method debug
-    this._generic(MessageLevel.Debug, [].slice.call(arguments)) 
-
-//-----------------------------------------------------------------------------
-method error
-    this._generic(MessageLevel.Error, [].slice.call(arguments)) 
-
-//-----------------------------------------------------------------------------
-method info
-    this._generic(MessageLevel.Log, [].slice.call(arguments)) 
-
-//-----------------------------------------------------------------------------
-method warn
-    this._generic(MessageLevel.Warning, [].slice.call(arguments)) 
-
-//-----------------------------------------------------------------------------
-method dir
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method dirxml
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method trace
-    Weinre.notImplemented(arguments.callee.signature)
-    
-//-----------------------------------------------------------------------------
-method assert(condition)
-    Weinre.notImplemented(arguments.callee.signature)
-    
-//-----------------------------------------------------------------------------
-method count
-    Weinre.notImplemented(arguments.callee.signature)
-    
-//-----------------------------------------------------------------------------
-method markTimeline(message)
-    Timeline.addRecord_Mark(message)
-    
-//-----------------------------------------------------------------------------
-method lastWMLErrorMessage
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method profile(title)
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method profileEnd(title)
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method time(title)
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method timeEnd(title)
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method group
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method groupCollapsed
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method groupEnd
-    Weinre.notImplemented(arguments.callee.signature)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/ElementHighlighter.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/ElementHighlighter.scoop b/weinre.web/modules-scoop/weinre/target/ElementHighlighter.scoop
deleted file mode 100644
index d74cb4f..0000000
--- a/weinre.web/modules-scoop/weinre/target/ElementHighlighter.scoop
+++ /dev/null
@@ -1,156 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2011 IBM Corporation
- */
-
-requireClass ../common/Binding
-requireClass ../common/Weinre
-
-//-----------------------------------------------------------------------------
-class ElementHighlighter
-    this.boxMargin  = document.createElement("div")
-    this.boxBorder  = document.createElement("div")
-    this.boxPadding = document.createElement("div")
-    this.boxContent = document.createElement("div")
-    
-    this.boxMargin.appendChild(this.boxBorder)
-    this.boxBorder.appendChild(this.boxPadding)
-    this.boxPadding.appendChild(this.boxContent)
-    
-    this.boxMargin.style.backgroundColor  = "#FCC"
-    this.boxBorder.style.backgroundColor  = "#000"
-    this.boxPadding.style.backgroundColor = "#CFC"
-    this.boxContent.style.backgroundColor = "#CCF"
-    
-    this.boxMargin.style.opacity =
-    this.boxBorder.style.opacity =
-    this.boxPadding.style.opacity =
-    this.boxContent.style.opacity = 0.6
-    
-    this.boxMargin.style.position =
-    this.boxBorder.style.position =
-    this.boxPadding.style.position =
-    this.boxContent.style.position = "absolute"
-    
-    this.boxMargin.style.borderWidth =
-    this.boxBorder.style.borderWidth =
-    this.boxPadding.style.borderWidth =
-    this.boxContent.style.borderWidth = "thin"
-        
-    this.boxMargin.style.borderStyle =
-    this.boxBorder.style.borderStyle =
-    this.boxPadding.style.borderStyle =
-    this.boxContent.style.borderStyle = "solid"
-                
-    this.boxMargin.__weinreHighlighter =
-    this.boxBorder.__weinreHighlighter =
-    this.boxPadding.__weinreHighlighter =
-    this.boxContent.__weinreHighlighter = true
-                        
-    this.boxMargin.style.display = "none"
-        
-    document.body.appendChild(this.boxMargin)
-    
-//-----------------------------------------------------------------------------
-method on(element)
-    if (null == element) return
-    if (element.nodeType != Node.ELEMENT_NODE) return
-    
-    this.calculateMetrics(element)
-    this.boxMargin.style.display = "block"
-
-//-----------------------------------------------------------------------------
-method off
-    this.boxMargin.style.display = "none"
-
-//-----------------------------------------------------------------------------
-getter element
-    return this.boxMargin
-
-//-----------------------------------------------------------------------------
-method calculateMetrics(element)
-
-    var metrics = getMetrics(element)
-    
-    this.boxMargin.style.top     = metrics.y      + "px"
-    this.boxMargin.style.left    = metrics.x      + "px"
-    this.boxMargin.style.height  = metrics.height + "px"
-    this.boxMargin.style.width   = metrics.width  + "px"
-
-    this.boxBorder.style.top     = metrics.marginTop    + "px"
-    this.boxBorder.style.left    = metrics.marginLeft   + "px"
-    this.boxBorder.style.bottom  = metrics.marginBottom + "px"
-    this.boxBorder.style.right   = metrics.marginRight  + "px"
-
-    this.boxPadding.style.top    = metrics.borderTop    + "px"
-    this.boxPadding.style.left   = metrics.borderLeft   + "px"
-    this.boxPadding.style.bottom = metrics.borderBottom + "px"
-    this.boxPadding.style.right  = metrics.borderRight  + "px"
-    
-    this.boxContent.style.top    = metrics.paddingTop    + "px"
-    this.boxContent.style.left   = metrics.paddingLeft   + "px"
-    this.boxContent.style.bottom = metrics.paddingBottom + "px"
-    this.boxContent.style.right  = metrics.paddingRight  + "px"
-    
-//-----------------------------------------------------------------------------
-function getMetrics(element)
-    var result = {}
-    
-    // get the x,y position
-    var left = 0
-    var top  = 0
-        
-    var el = element
-    do {
-        left += el.offsetLeft
-        top  += el.offsetTop
-    } while (el = el.offsetParent)
-    
-    result.x = left
-    result.y = top
-
-    // get the computed style
-    var cStyle = document.defaultView.getComputedStyle(element)
-    
-    result.width  = fromPx(cStyle["width"])
-    result.height = fromPx(cStyle["height"])
-    
-    result.marginLeft    = fromPx(cStyle["margin-left"])
-    result.marginRight   = fromPx(cStyle["margin-right"])
-    result.marginTop     = fromPx(cStyle["margin-top"])
-    result.marginBottom  = fromPx(cStyle["margin-bottom"])
-    
-    result.borderLeft    = fromPx(cStyle["border-left-width"])
-    result.borderRight   = fromPx(cStyle["border-right-width"])
-    result.borderTop     = fromPx(cStyle["border-top-width"])
-    result.borderBottom  = fromPx(cStyle["border-bottom-width"])
-    
-    result.paddingLeft   = fromPx(cStyle["padding-left"])
-    result.paddingRight  = fromPx(cStyle["padding-right"])
-    result.paddingTop    = fromPx(cStyle["padding-top"])
-    result.paddingBottom = fromPx(cStyle["padding-bottom"])
-
-    result.width += 
-        result.marginLeft  + result.marginRight +
-        result.borderRight  +
-        result.paddingLeft + result.paddingRight
-        
-    result.height += 
-        result.marginTop  + result.marginBottom +
-        result.borderBottom  +
-        result.paddingTop + result.paddingBottom
-        
-    result.x -= 
-        result.marginLeft
-        
-    result.y -= 
-        result.marginTop
-
-    return result
-    
-//-----------------------------------------------------------------------------
-function fromPx(string) 
-    return parseInt(string.replace(/px$/,""))

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/InjectedScriptHostImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/InjectedScriptHostImpl.scoop b/weinre.web/modules-scoop/weinre/target/InjectedScriptHostImpl.scoop
deleted file mode 100644
index 0c9b8af..0000000
--- a/weinre.web/modules-scoop/weinre/target/InjectedScriptHostImpl.scoop
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Weinre
-
-//-----------------------------------------------------------------------------
-class InjectedScriptHostImpl
-
-//-----------------------------------------------------------------------------
-method clearConsoleMessages(callback)
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method nodeForId(/*int*/ nodeId, callback)
-    return Weinre.nodeStore.getNode(nodeId)
-
-//-----------------------------------------------------------------------------
-method pushNodePathToFrontend(/*any*/ node, /*boolean*/ withChildren, /*boolean*/ selectInUI, callback)
-    // callback: function()
-    var nodeId = Weinre.nodeStore.getNodeId(node)
-    var children = Weinre.nodeStore.serializeNode(node, 1)
-    Weinre.wi.DOMNotify.setChildNodes(nodeId, children)
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method inspectedNode(/*int*/ num, callback)
-    // callback: function()
-    var nodeId = Weinre.nodeStore.getInspectedNode(num)
-    return nodeId
-
-//-----------------------------------------------------------------------------
-method internalConstructorName(object)
-    var ctor = object.constructor
-    
-    var ctorName = ctor.fullClassName || ctor.displayName || ctor.name
-    if (ctorName && (ctorName != "Object")) return ctorName
-    
-    var pattern = /\[object (.*)\]/
-    var match = pattern.exec(ctor.toString())
-    if (match) return match[1]
-    
-    return "Object"

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/NodeStore.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/NodeStore.scoop b/weinre.web/modules-scoop/weinre/target/NodeStore.scoop
deleted file mode 100644
index f8b288f..0000000
--- a/weinre.web/modules-scoop/weinre/target/NodeStore.scoop
+++ /dev/null
@@ -1,235 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Weinre
-requireClass ../common/IDGenerator
-
-//-----------------------------------------------------------------------------
-class NodeStore
-    this.__nodeMap      = {}
-    this.__nodeDataMap  = {}
-    this.inspectedNodes = []
-    
-    document.addEventListener("DOMSubtreeModified",       handleDOMSubtreeModified, false)
-    document.addEventListener("DOMNodeInserted",          handleDOMNodeInserted, false)
-    document.addEventListener("DOMNodeRemoved",           handleDOMNodeRemoved, false)
-    document.addEventListener("DOMAttrModified",          handleDOMAttrModified, false)
-    document.addEventListener("DOMCharacterDataModified", handleDOMCharacterDataModified, false)
-
-//-----------------------------------------------------------------------------
-method addInspectedNode(nodeId)
-    this.inspectedNodes.unshift(nodeId)
-    if (this.inspectedNodes.length > 5) {
-        this.inspectedNodes = this.inspectedNodes.slice(0,5)
-    }
-
-//-----------------------------------------------------------------------------
-method getInspectedNode(index)
-    return this.inspectedNodes[index]
-
-//-----------------------------------------------------------------------------
-method getNode(nodeId)
-    return this.__nodeMap[nodeId]
-
-//-----------------------------------------------------------------------------
-method checkNodeId(node)
-    return IDGenerator.checkId(node)
-
-//-----------------------------------------------------------------------------
-method getNodeId(node)
-    var id = this.checkNodeId(node)
-    if (id) {
-        return id
-    }
-
-    return IDGenerator.getId(node, this.__nodeMap)    
-
-//-----------------------------------------------------------------------------
-method getNodeData(nodeId, depth)
-    return this.serializeNode(this.getNode(nodeId), depth)
-
-//-----------------------------------------------------------------------------
-method getPreviousSiblingId(node)
-    while (true) {
-        var sib = node.previousSibling
-        if (!sib) return 0
-        
-        var id = this.checkNodeId(sib)
-        if (id) return id
-        
-        node = sib
-    }
-
-//-----------------------------------------------------------------------------
-method nextNodeId()
-    return "" + IDGenerator.next()
-
-//-----------------------------------------------------------------------------
-method serializeNode(node, depth)
-    var nodeName  = ""
-    var nodeValue = null
-    var localName = null
-    var id = this.getNodeId(node) 
-    
-    switch(node.nodeType) {
-        case Node.TEXT_NODE:    
-        case Node.COMMENT_NODE:
-        case Node.CDATA_SECTION_NODE:
-            nodeValue = node.nodeValue
-            break
-        case Node.ATTRIBUTE_NODE:
-            localName = node.localName
-            break
-        case Node.DOCUMENT_FRAGMENT_NODE:
-            break
-        case Node.DOCUMENT_NODE:
-        case Node.ELEMENT_NODE:
-        default:
-            nodeName  = node.nodeName
-            localName = node.localName
-            break
-    }
-    
-    var nodeData = {
-        id:        id,
-        nodeType:  node.nodeType,
-        nodeName:  nodeName,
-        localName: localName,
-        nodeValue: nodeValue
-    }
-    
-    if (node.nodeType == Node.ELEMENT_NODE || node.nodeType == Node.DOCUMENT_NODE || node.nodeType == Node.DOCUMENT_FRAGMENT_NODE) {
-        nodeData.childNodeCount = this.childNodeCount(node)
-        var children = this.serializeNodeChildren(node, depth)
-        if (children.length) {
-            nodeData.children = children
-        }
-        
-        if (node.nodeType == Node.ELEMENT_NODE) {
-            nodeData.attributes = []
-            for (var i=0; i<node.attributes.length; i++) {
-                nodeData.attributes.push(node.attributes[i].nodeName)
-                nodeData.attributes.push(node.attributes[i].nodeValue)
-            }
-        } 
-        
-        else if (node.nodeType == Node.DOCUMENT_NODE) {
-            nodeData.documentURL = window.location.href
-        }
-    } 
-    
-    else if (node.nodeType == Node.DOCUMENT_TYPE_NODE) {
-        nodeData.publicId       = node.publicId
-        nodeData.systemId       = node.systemId
-        nodeData.internalSubset = node.internalSubset
-    } 
-    
-    else if (node.nodeType == Node.ATTRIBUTE_NODE) {
-        nodeData.name  = node.nodeName
-        nodeData.value = node.nodeValue
-    }
-
-    return nodeData
-
-//-----------------------------------------------------------------------------
-method serializeNodeChildren(node, depth)
-    var result   = []
-    var childIds = this.childNodeIds(node)
-    
-    if (depth == 0) {
-        if (childIds.length == 1) {
-            var childNode = this.getNode(childIds[0])
-            if (childNode.nodeType == Node.TEXT_NODE) {
-                result.push(this.serializeNode(childNode))
-            }
-        }
-        return result
-    }
-    
-    depth--;
-    for (var i=0; i<childIds.length; i++) {
-        result.push(this.serializeNode(this.getNode(childIds[i]), depth))
-    }
-    
-    return result
-
-//-----------------------------------------------------------------------------
-method childNodeCount(node)
-    return this.childNodeIds(node).length
-
-//-----------------------------------------------------------------------------
-method childNodeIds(node)
-    var ids = []
-    
-    for (var i=0; i<node.childNodes.length; i++) {
-        if (this.isToBeSkipped(node.childNodes[i])) continue
-        ids.push(this.getNodeId(node.childNodes[i]))
-    }
-    
-    return ids
-
-//-----------------------------------------------------------------------------
-method isToBeSkipped(node)
-    if (!node) return true
-    if (node.__weinreHighlighter) return true 
-    if (node.nodeType != Node.TEXT_NODE) return false
-    return !!node.nodeValue.match(/^\s*$/) 
-
-//-----------------------------------------------------------------------------
-function handleDOMSubtreeModified(event)
-    if (!event.attrChange) return
-    
-    NodeStore.handleDOMAttrModified(event)
-
-//-----------------------------------------------------------------------------
-function handleDOMNodeInserted(event)
-    var targetId = Weinre.nodeStore.checkNodeId(event.target)
-    var parentId = Weinre.nodeStore.checkNodeId(event.relatedNode)
-    
-    if (!parentId) return
-    
-    var child = Weinre.nodeStore.serializeNode(event.target, 0)
-    var previous = Weinre.nodeStore.getPreviousSiblingId(event.target)
-    Weinre.wi.DOMNotify.childNodeInserted(parentId, previous, child)
-
-//-----------------------------------------------------------------------------
-function handleDOMNodeRemoved(event)
-    var targetId = Weinre.nodeStore.checkNodeId(event.target)
-    var parentId = Weinre.nodeStore.checkNodeId(event.relatedNode)
-    
-    if (!parentId) return
-    
-    if (targetId) {
-        Weinre.wi.DOMNotify.childNodeRemoved(parentId, targetId)
-    }
-    else {
-        var childCount = Weinre.nodeStore.childNodeCount(event.relatedNode)
-        Weinre.wi.DOMNotify.childNodeCountUpdated(parentId, childCount)
-    }
-
-//-----------------------------------------------------------------------------
-// This event is not actually fired in WebKit, but DOMSubtreeModified may
-// be fired for attribute changes.  Doesn't seem to be at the moment.
-function handleDOMAttrModified(event)
-    var targetId = Weinre.nodeStore.checkNodeId(event.target)
-    if (!targetId) return
-    
-    attrs = []
-    for (var i=0; i<event.target.attributes.length; i++) {
-        attrs.push(event.target.attributes[i].name)
-        attrs.push(event.target.attributes[i].value)
-    }
-    
-    Weinre.wi.DOMNotify.attributesUpdated(targetId, attrs)
-
-//-----------------------------------------------------------------------------
-function handleDOMCharacterDataModified(event)
-    var targetId = Weinre.nodeStore.checkNodeId(event.target)
-    if (!targetId) return
-    
-    Weinre.wi.DOMNotify.characterDataModified(targetId, event.newValue)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/SqlStepper.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/SqlStepper.scoop b/weinre.web/modules-scoop/weinre/target/SqlStepper.scoop
deleted file mode 100644
index 3789812..0000000
--- a/weinre.web/modules-scoop/weinre/target/SqlStepper.scoop
+++ /dev/null
@@ -1,92 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Binding
-
-//-----------------------------------------------------------------------------
-class SqlStepper(steps)
-    if (!(this instanceof SqlStepper)) return new SqlStepper(steps)
-    
-    this.__context = {}
-    
-    var context = this.__context
-    context.steps = steps
-    
-//-----------------------------------------------------------------------------
-method run(db, errorCallback)
-    var context = this.__context
-    
-    if (context.hasBeenRun) 
-        throw new Ex(arguments, "stepper has already been run")
-        
-    context.hasBeenRun = true
-        
-    context.db            = db
-    context.errorCallback = errorCallback
-    context.nextStep      = 0
-    
-    context.ourErrorCallback = new Binding(this, ourErrorCallback)
-    context.runStep          = new Binding(this, runStep)
-    this.executeSql          = new Binding(this, executeSql)
-    
-    db.transaction(context.runStep)
-    
-//-----------------------------------------------------------------------------
-function executeSql(statement, data)
-    var context = this.__context
-    
-    context.tx.executeSql(statement, data, context.runStep, context.ourErrorCallback)
-
-//-----------------------------------------------------------------------------
-function ourErrorCallback(tx, sqlError)
-    var context = this.__context
-    
-    context.errorCallback.call(this, sqlError)
-    
-//-----------------------------------------------------------------------------
-function runStep(tx, resultSet)
-    var context = this.__context
-    
-    if (context.nextStep >= context.steps.length) return
-    
-    context.tx = tx
-    
-    context.currentStep = context.nextStep
-    context.nextStep++
-    
-    var step = context.steps[context.currentStep]
-    
-    step.call(this, resultSet)
-
-//-----------------------------------------------------------------------------
-static method example(db, id)
-    function step1() {
-        this.executeSql("SELECT name FROM sqlite_master WHERE type='table'")
-    }
-    
-    function step2(resultSet) {
-        var rows = resultSet.rows
-        var result = []
-        for (var i=0; i<rows.length; i++) {
-            var name = rows.item(i).name
-            if (name == "__WebKitDatabaseInfoTable__") continue
-        
-            result.push(name)
-        }
-        
-        console.log("[" + this.id + "] table names: " + result.join(", "))
-    }
-
-    function errorCb(sqlError) {
-        
-        console.log("[" + this.id + "] sql error:" + sqlError.code + ": " + sqlError.message)
-    }
-    
-    var stepper = new SqlStepper([step1, step2])
-    stepper.id = id
-    stepper.run(db, errorCb)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/Target.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/Target.scoop b/weinre.web/modules-scoop/weinre/target/Target.scoop
deleted file mode 100644
index bb3eeae..0000000
--- a/weinre.web/modules-scoop/weinre/target/Target.scoop
+++ /dev/null
@@ -1,212 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Native
-
-requireClass ../common/Ex
-requireClass ../common/Binding
-requireClass ../common/Callback
-requireClass ../common/MessageDispatcher
-requireClass ../common/Weinre
-
-requireClass ./CheckForProblems
-requireClass ./NodeStore
-requireClass ./CSSStore
-requireClass ./ElementHighlighter
-requireClass ./InjectedScriptHostImpl
-
-requireClass ./WeinreTargetEventsImpl
-requireClass ./WeinreExtraClientCommandsImpl
-
-requireClass ./WiConsoleImpl
-requireClass ./WiCSSImpl
-requireClass ./WiDatabaseImpl
-requireClass ./WiDOMImpl
-requireClass ./WiDOMStorageImpl
-requireClass ./WiInspectorImpl
-requireClass ./WiRuntimeImpl
-
-//-----------------------------------------------------------------------------
-class Target
-
-//-----------------------------------------------------------------------------
-static method main
-    CheckForProblems.check()
-    
-    Weinre.target = new Target()
-    Weinre.target.initialize()
-    
-    Weinre.addCSSProperties = function addCSSProperties(properties) {
-        CSSStore.addCSSProperties(properties)
-    }
-    
-//------------------------------------------------------------------------------
-method setWeinreServerURLFromScriptSrc(element)
-    if (window.WeinreServerURL) return
-
-    if (element) {
-        var pattern = /(http:\/\/(.*?)\/)/
-        var match   = pattern.exec(element.src)
-        if (match) {
-            window.WeinreServerURL = match[1]
-            return 
-        }
-    }
-    
-    var message = "unable to calculate the weinre server url; explicity set the variable window.WeinreServerURL instead" 
-    alert(message)
-    throw new Ex(arguments, message)
-
-
-//-----------------------------------------------------------------------------
-method setWeinreServerIdFromScriptSrc(element)
-    if (window.WeinreServerId) return
-
-    var element = this.getTargetScriptElement()
-
-    var hash = "anonymous"
-    if (element) {
-        var attempt = element.src.split("#")[1]
-        if (attempt) {
-            hash = attempt
-        }
-        else {
-            attempt = location.hash.split("#")[1]
-            if (attempt) {
-                hash = attempt
-            }
-        }
-    }
-
-    window.WeinreServerId = hash
-
-//-----------------------------------------------------------------------------
-method getTargetScriptElement
-
-    var elements = document.getElementsByTagName("script")
-
-    var scripts = ["Target.", "target-script.", "target-script-min."]
-    for (var i=0; i<elements.length; i++) {
-        var element = elements[i]
-        
-        for (j=0; j<scripts.length; j++) {
-            if (-1 != element.src.indexOf("/" + scripts[j])) {
-                return element
-            }
-        }
-    }
-
-//-----------------------------------------------------------------------------
-method initialize()
-    var self = this
-
-    var element = this.getTargetScriptElement()
-    this.setWeinreServerURLFromScriptSrc(element)
-    this.setWeinreServerIdFromScriptSrc(element)
-    
-    if (window.WeinreServerURL[window.WeinreServerURL.length-1] != "/") {
-        window.WeinreServerURL += "/"
-    }   
-    
-    var injectedScriptHost = new InjectedScriptHostImpl()
-    Weinre.injectedScript = injectedScriptConstructor(injectedScriptHost, window, 0, "?")
-    
-    window.addEventListener("load", Binding(this, "onLoaded"), false)
-    document.addEventListener("DOMContentLoaded", Binding(this, "onDOMContent"), false)
-    
-    this._startTime = currentTime()
-    
-    if (document.readyState == "loaded") {
-        setTimeout(function() { self.onDOMContent() }, 10)
-    }
-    
-    if (document.readyState == "complete") {
-        setTimeout(function() { self.onDOMContent() }, 10)
-        setTimeout(function() { self.onLoaded() }, 20)
-    }
-
-    var messageDispatcher = new MessageDispatcher(window.WeinreServerURL + "ws/target", window.WeinreServerId)
-    Weinre.messageDispatcher = messageDispatcher
-
-    Weinre.wi = {}
-    
-    Weinre.wi.Console                   = new WiConsoleImpl()
-    Weinre.wi.CSS                       = new WiCSSImpl()
-    Weinre.wi.Database                  = new WiDatabaseImpl()
-    Weinre.wi.DOM                       = new WiDOMImpl()
-    Weinre.wi.DOMStorage                = new WiDOMStorageImpl()
-    Weinre.wi.Inspector                 = new WiInspectorImpl()
-    Weinre.wi.Runtime                   = new WiRuntimeImpl()
-    
-    messageDispatcher.registerInterface("Console",          Weinre.wi.Console          , false)
-    messageDispatcher.registerInterface("CSS",              Weinre.wi.CSS              , false)
-    messageDispatcher.registerInterface("Database",         Weinre.wi.Database         , false)
-    messageDispatcher.registerInterface("DOM",              Weinre.wi.DOM              , false)
-    messageDispatcher.registerInterface("DOMStorage",       Weinre.wi.DOMStorage       , false)
-    messageDispatcher.registerInterface("Inspector",        Weinre.wi.Inspector        , false)
-    messageDispatcher.registerInterface("Runtime",          Weinre.wi.Runtime          , false)
-
-    messageDispatcher.registerInterface("WeinreExtraClientCommands",  new WeinreExtraClientCommandsImpl() , true)
-    messageDispatcher.registerInterface("WeinreTargetEvents",         new WeinreTargetEventsImpl(),         true)
-
-    Weinre.wi.ApplicationCacheNotify = messageDispatcher.createProxy("ApplicationCacheNotify")
-    Weinre.wi.ConsoleNotify          = messageDispatcher.createProxy("ConsoleNotify")
-    Weinre.wi.DOMNotify              = messageDispatcher.createProxy("DOMNotify")
-    Weinre.wi.DOMStorageNotify       = messageDispatcher.createProxy("DOMStorageNotify")
-    Weinre.wi.DatabaseNotify         = messageDispatcher.createProxy("DatabaseNotify")
-    Weinre.wi.InspectorNotify        = messageDispatcher.createProxy("InspectorNotify")
-    Weinre.wi.TimelineNotify         = messageDispatcher.createProxy("TimelineNotify")
-    
-    Weinre.WeinreTargetCommands     = messageDispatcher.createProxy("WeinreTargetCommands")
-    Weinre.WeinreExtraTargetEvents  = messageDispatcher.createProxy("WeinreExtraTargetEvents")
-
-    messageDispatcher.getWebSocket().addEventListener("open", Binding(this, this.cb_webSocketOpened))
-    
-    Weinre.nodeStore = new NodeStore()
-    Weinre.cssStore  = new CSSStore()
-    
-    window.addEventListener("error", function(e) {Target.handleError(e)}, false)
-    
-    
-//-----------------------------------------------------------------------------
-static method handleError(event)
-    var filename = event.filename || "[unknown filename]"
-    var lineno   = event.lineno   || "[unknown lineno]"
-    var message  = event.message  || "[unknown message]"
-
-    Weinre.logError("error occurred: " + filename + ":" + lineno + ": " + message)
-
-//-----------------------------------------------------------------------------
-method cb_webSocketOpened()
-    Weinre.WeinreTargetCommands.registerTarget(window.location.href, Binding(this, this.cb_registerTarget))
-
-//-----------------------------------------------------------------------------
-method cb_registerTarget(targetDescription)
-    Weinre.targetDescription    = targetDescription
-
-//-----------------------------------------------------------------------------
-method onLoaded
-    Weinre.wi.InspectorNotify.loadEventFired(currentTime() - this._startTime)
-
-//-----------------------------------------------------------------------------
-method onDOMContent
-    Weinre.wi.InspectorNotify.domContentEventFired(currentTime() - this._startTime)
-
-//-----------------------------------------------------------------------------
-method setDocument()
-    Weinre.elementHighlighter = new ElementHighlighter()
-    
-    var nodeId = Weinre.nodeStore.getNodeId(document)
-    var nodeData = Weinre.nodeStore.getNodeData(nodeId, 2)
-
-    Weinre.wi.DOMNotify.setDocument(nodeData)
-    
-//-----------------------------------------------------------------------------
-// WebKit's currentTime() seems to return time in seconds
-function currentTime()
-    return (new Date().getMilliseconds()) / 1000.0
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/Timeline.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/Timeline.scoop b/weinre.web/modules-scoop/weinre/target/Timeline.scoop
deleted file mode 100644
index 4e9629b..0000000
--- a/weinre.web/modules-scoop/weinre/target/Timeline.scoop
+++ /dev/null
@@ -1,326 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2011 IBM Corporation
- */
-
-requireClass ../common/Ex
-requireClass ../common/Weinre
-requireClass ../common/IDGenerator
-requireClass ../common/StackTrace
-
-requireClass ../common/Native
-
-//-----------------------------------------------------------------------------
-class Timeline
-
-//-----------------------------------------------------------------------------
-static method start
-    Running = true
-
-//-----------------------------------------------------------------------------
-static method stop
-    Running = false
-
-//-----------------------------------------------------------------------------
-static method isRunning
-    return Running
-
-//-----------------------------------------------------------------------------
-static method addRecord_Mark(message)
-    if (!Timeline.isRunning()) return
-    
-    var record = {}
-
-    record.type      = TimelineRecordType.Mark
-    record.category  = { name: "scripting" }
-    record.startTime = Date.now()
-    record.data      = { message: message }
-    
-    addStackTrace(record, 3)
-    
-    Weinre.wi.TimelineNotify.addRecordToTimeline(record)
-
-//-----------------------------------------------------------------------------
-static method addRecord_EventDispatch(event, name, category)
-    if (!Timeline.isRunning()) return
-    
-    if (!category) category = "scripting"
-    var record = {}
-
-    record.type      = TimelineRecordType.EventDispatch
-    record.category  = { name: category }
-    record.startTime = Date.now()
-    record.data      = { type: event.type }
-    
-    Weinre.wi.TimelineNotify.addRecordToTimeline(record)
-    
-//-----------------------------------------------------------------------------
-static method addRecord_TimerInstall(id, timeout, singleShot)
-    if (!Timeline.isRunning()) return
-    
-    var record = {}
-
-    record.type      = TimelineRecordType.TimerInstall
-    record.category  = { name: "scripting" }
-    record.startTime = Date.now()
-    record.data      = { timerId: id, timeout: timeout, singleShot: singleShot }
-    
-    addStackTrace(record, 4)
-    
-    Weinre.wi.TimelineNotify.addRecordToTimeline(record)
-
-//-----------------------------------------------------------------------------
-static method addRecord_TimerRemove(id, timeout, singleShot)
-    if (!Timeline.isRunning()) return
-
-    var record = {}
-
-    record.type      = TimelineRecordType.TimerRemove
-    record.category  = { name: "scripting" }
-    record.startTime = Date.now()
-    record.data      = { timerId: id, timeout: timeout, singleShot: singleShot }
-
-    addStackTrace(record, 4)
-    
-    Weinre.wi.TimelineNotify.addRecordToTimeline(record)
-
-//-----------------------------------------------------------------------------
-static method addRecord_TimerFire(id, timeout, singleShot)
-    if (!Timeline.isRunning()) return
-
-    var record = {}
-
-    record.type      = TimelineRecordType.TimerFire
-    record.category  = { name: "scripting" }
-    record.startTime = Date.now()
-    record.data      = { timerId: id, timeout: timeout, singleShot: singleShot }
-    
-    Weinre.wi.TimelineNotify.addRecordToTimeline(record)
-
-//-----------------------------------------------------------------------------
-static method addRecord_XHRReadyStateChange(method, url, id, xhr)
-    if (!Timeline.isRunning()) return
-
-    var record
-    
-    if (xhr.readyState == XMLHttpRequest.OPENED) {
-        record = {
-            type:      TimelineRecordType.ResourceSendRequest,
-            category:  { name: "loading" },
-            startTime: Date.now(),
-            data: { 
-                identifier:     id,
-                url:            url,
-                requestMethod:  method
-            }
-        }
-    }
-    
-    else if (xhr.readyState == XMLHttpRequest.DONE) {
-        record = {
-            type:      TimelineRecordType.ResourceReceiveResponse,
-            category:  { name: "loading" },
-            startTime: Date.now(),
-            data: {
-                identifier:            id,
-                statusCode:            xhr.status,
-                mimeType:              xhr.getResponseHeader("Content-Type"),
-                expectedContentLength: xhr.getResponseHeader("Content-Length"),
-                url:                   url
-            }
-        }
-    }
-    
-    else 
-        return
-    
-    Weinre.wi.TimelineNotify.addRecordToTimeline(record)
-
-//-----------------------------------------------------------------------------
-static method installGlobalListeners
-    if (applicationCache) {
-        applicationCache.addEventListener("checking",    function(e) {Timeline.addRecord_EventDispatch(e, "applicationCache.checking",    "loading")}, false)
-        applicationCache.addEventListener("error",       function(e) {Timeline.addRecord_EventDispatch(e, "applicationCache.error",       "loading")}, false)
-        applicationCache.addEventListener("noupdate",    function(e) {Timeline.addRecord_EventDispatch(e, "applicationCache.noupdate",    "loading")}, false)
-        applicationCache.addEventListener("downloading", function(e) {Timeline.addRecord_EventDispatch(e, "applicationCache.downloading", "loading")}, false)
-        applicationCache.addEventListener("progress",    function(e) {Timeline.addRecord_EventDispatch(e, "applicationCache.progress",    "loading")}, false)
-        applicationCache.addEventListener("updateready", function(e) {Timeline.addRecord_EventDispatch(e, "applicationCache.updateready", "loading")}, false)
-        applicationCache.addEventListener("cached",      function(e) {Timeline.addRecord_EventDispatch(e, "applicationCache.cached",      "loading")}, false)
-        applicationCache.addEventListener("obsolete",    function(e) {Timeline.addRecord_EventDispatch(e, "applicationCache.obsolete",    "loading")}, false)
-    }
-    
-    // window.addEventListener("deviceorientation", function(e) {Timeline.addRecord_EventDispatch("window.deviceorientation")}, false)
-    window.addEventListener("error",             function(e) {Timeline.addRecord_EventDispatch(e, "window.error")},             false)
-    window.addEventListener("hashchange",        function(e) {Timeline.addRecord_EventDispatch(e, "window.hashchange")},        false)
-    window.addEventListener("message",           function(e) {Timeline.addRecord_EventDispatch(e, "window.message")},           false)
-    window.addEventListener("offline",           function(e) {Timeline.addRecord_EventDispatch(e, "window.offline")},           false)
-    window.addEventListener("online",            function(e) {Timeline.addRecord_EventDispatch(e, "window.online")},            false)
-    window.addEventListener("scroll",            function(e) {Timeline.addRecord_EventDispatch(e, "window.scroll")},            false)
-    
-//-----------------------------------------------------------------------------
-static method installFunctionWrappers
-    window.clearInterval  = wrapped_clearInterval
-    window.clearTimeout   = wrapped_clearTimeout
-    window.setTimeout     = wrapped_setTimeout
-    window.setInterval    = wrapped_setInterval
-
-    window.XMLHttpRequest.prototype.open = wrapped_XMLHttpRequest_open
-    window.XMLHttpRequest                = wrapped_XMLHttpRequest
-
-//-----------------------------------------------------------------------------
-function addStackTrace(record, skip)
-    if (!skip) skip = 1
-    
-    var trace = new StackTrace(arguments).trace
-    
-    record.stackTrace = []
-    
-    for (var i=skip; i<trace.length; i++) {
-        record.stackTrace.push({
-            functionName: trace[i],
-            scriptName:   "",
-            lineNumber:   ""
-        })
-    }
-    
-//-----------------------------------------------------------------------------
-function wrapped_setInterval(code, interval)
-    var code = instrumentedTimerCode(code, interval, false)
-    var id = Native.setInterval(code, interval)
-    
-    code.__timerId = id
-    
-    addTimer(id, interval, false)
-
-    return id
-
-//-----------------------------------------------------------------------------
-function wrapped_setTimeout(code, delay)
-    var code = instrumentedTimerCode(code, delay, true)
-    var id   = Native.setTimeout(code, delay)
-
-    code.__timerId = id
-    
-    addTimer(id, delay, true)
-
-    return id
-
-//-----------------------------------------------------------------------------
-function wrapped_clearInterval(id)
-    var result = Native.clearInterval(id)
-    
-    removeTimer(id, false)
-    return result
-
-//-----------------------------------------------------------------------------
-function wrapped_clearTimeout(id)
-    var result = Native.clearTimeout(id)
-    
-    removeTimer(id, true)
-    return result
-
-//-----------------------------------------------------------------------------
-function addTimer(id, timeout, singleShot)
-    var timerSet = singleShot ? TimerTimeouts : TimerIntervals
-    
-    timerSet[id] = {
-         id:          id,
-         timeout:     timeout,
-         singleShot: singleShot
-    }
-    
-    Timeline.addRecord_TimerInstall(id, timeout, singleShot)
-    
-//-----------------------------------------------------------------------------
-function removeTimer(id, singleShot)
-    var timerSet = singleShot ? TimerTimeouts : TimerIntervals
-    var timer = timerSet[id]
-    
-    if (!timer) return
-    
-    Timeline.addRecord_TimerRemove(id, timer.timeout, singleShot)
-    
-    delete timerSet[id]
-    
-//-----------------------------------------------------------------------------
-function instrumentedTimerCode(code, timeout, singleShot)
-    if (typeof(code) != "function") return code
-    
-    var instrumentedCode = function() {
-        var result = code()
-        var id     = arguments.callee.__timerId
-
-        Timeline.addRecord_TimerFire(id, timeout, singleShot)
-
-        return result
-    }
-    
-    return instrumentedCode 
-
-//-----------------------------------------------------------------------------
-function wrapped_XMLHttpRequest
-    var xhr = new Native.XMLHttpRequest()
-    IDGenerator.getId(xhr)
-    xhr.addEventListener("readystatechange", getXhrEventHandler(xhr), false)
-    return xhr
-
-init
-    wrapped_XMLHttpRequest.UNSENT           = 0
-    wrapped_XMLHttpRequest.OPENED           = 1
-    wrapped_XMLHttpRequest.HEADERS_RECEIVED = 2
-    wrapped_XMLHttpRequest.LOADING          = 3
-    wrapped_XMLHttpRequest.DONE             = 4    
-
-//-----------------------------------------------------------------------------
-function wrapped_XMLHttpRequest_open()
-    var xhr = this
-    xhr.__weinre_method  = arguments[0]
-    xhr.__weinre_url     = arguments[1]
-    
-    var result = Native.XMLHttpRequest_open.apply(xhr, [].slice.call(arguments))
-    return result
-
-    
-//-----------------------------------------------------------------------------
-function getXhrEventHandler(xhr)
-    return function(event) {
-        Timeline.addRecord_XHRReadyStateChange(xhr.__weinre_method, xhr.__weinre_url, IDGenerator.getId(xhr), xhr)
-    }
-    
-//-----------------------------------------------------------------------------
-init 
-    var Running = false
-    
-    var TimerTimeouts  = {}
-    var TimerIntervals = {}
-
-    var TimelineRecordType = {
-            EventDispatch:            0,
-            Layout:                   1,
-            RecalculateStyles:        2,
-            Paint:                    3,
-            ParseHTML:                4,
-            TimerInstall:             5,
-            TimerRemove:              6,
-            TimerFire:                7,
-            XHRReadyStateChange:      8,
-            XHRLoad:                  9,
-            EvaluateScript:          10,
-            Mark:                    11,
-            ResourceSendRequest:     12,
-            ResourceReceiveResponse: 13,
-            ResourceFinish:          14,
-            FunctionCall:            15,
-            ReceiveResourceData:     16,
-            GCEvent:                 17,
-            MarkDOMContent:          18,
-            MarkLoad:                19,
-            ScheduleResourceRequest: 20
-    }
-
-    Timeline.installGlobalListeners()
-    Timeline.installFunctionWrappers()
-    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/WeinreExtraClientCommandsImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/WeinreExtraClientCommandsImpl.scoop b/weinre.web/modules-scoop/weinre/target/WeinreExtraClientCommandsImpl.scoop
deleted file mode 100644
index 28d6843..0000000
--- a/weinre.web/modules-scoop/weinre/target/WeinreExtraClientCommandsImpl.scoop
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Weinre
-
-requireClass ./WiDatabaseImpl
-requireClass ./Console
-
-//-----------------------------------------------------------------------------
-class WeinreExtraClientCommandsImpl
-
-//-----------------------------------------------------------------------------
-method getDatabases(callback)
-    if (!callback) return
-    
-    var result = WiDatabaseImpl.getDatabases()
-    
-    Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/WeinreTargetEventsImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/WeinreTargetEventsImpl.scoop b/weinre.web/modules-scoop/weinre/target/WeinreTargetEventsImpl.scoop
deleted file mode 100644
index 6f8a5e3..0000000
--- a/weinre.web/modules-scoop/weinre/target/WeinreTargetEventsImpl.scoop
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Weinre
-requireClass ../common/Callback
-
-requireClass ./Console
-
-//-----------------------------------------------------------------------------
-class WeinreTargetEventsImpl
-
-//-----------------------------------------------------------------------------
-method connectionCreated(/*string*/ clientChannel, /*string*/ targetChannel)
-    var message = "weinre: target " + targetChannel + " connected to client " + clientChannel
-    
-    Weinre.logInfo(message)
-    var oldValue = Console.useRemote(true)
-    
-    // Weinre.showNotImplemented()
-
-    Weinre.target.setDocument()
-    Weinre.wi.TimelineNotify.timelineProfilerWasStopped()
-    Weinre.wi.DOMStorage.initialize()
-
-//-----------------------------------------------------------------------------
-method connectionDestroyed(/*string*/ clientChannel, /*string*/ targetChannel)
-    var message = "weinre: target " + targetChannel + " disconnected from client " + clientChannel
-    
-    Weinre.logInfo(message)
-    var oldValue = Console.useRemote(false)
-    
-//-----------------------------------------------------------------------------
-method sendCallback(/*int*/ callbackId, /*any*/ result)
-    Callback.invoke(callbackId, result)


Mime
View raw message