incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmue...@apache.org
Subject [11/12] fixes for issue #10, drive-by removal of scoop
Date Tue, 03 Jan 2012 18:44:10 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/WiCSSImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/WiCSSImpl.scoop b/weinre.web/modules-scoop/weinre/target/WiCSSImpl.scoop
deleted file mode 100644
index 29e572e..0000000
--- a/weinre.web/modules-scoop/weinre/target/WiCSSImpl.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/Weinre
-
-//-----------------------------------------------------------------------------
-class WiCSSImpl
-    this.dummyComputedStyle = false
-
-//-----------------------------------------------------------------------------
-method getStylesForNode(/*int*/ nodeId, callback)
-    var result = {}
-    
-    var node = Weinre.nodeStore.getNode(nodeId)
-    if (!node) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid nodeId: " + nodeId)
-        return
-    }
-    
-    var computedStyle
-    
-    if (this.dummyComputedStyle) {
-        computedStyle = {
-            styleId:            null,
-            properties:         [],
-            shorthandValues:    [],
-            cssProperties:      []
-        }
-    }
-    else {
-        computedStyle =  Weinre.cssStore.getComputedStyle(node)
-    }
-    
-    var result = {
-        inlineStyle:     Weinre.cssStore.getInlineStyle(node),
-        computedStyle:   computedStyle,
-        matchedCSSRules: Weinre.cssStore.getMatchedCSSRules(node),
-        styleAttributes: Weinre.cssStore.getStyleAttributes(node),
-        pseudoElements:  Weinre.cssStore.getPseudoElements(node),
-        inherited:       []
-    }
-    
-    var parentNode = node.parentNode
-    
-    while (parentNode) {
-        var parentStyle = {
-            inlineStyle:     Weinre.cssStore.getInlineStyle(parentNode),
-            matchedCSSRules: Weinre.cssStore.getMatchedCSSRules(parentNode),
-        }
-        
-        result.inherited.push(parentStyle)
-        parentNode = parentNode.parentNode
-    }
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method getComputedStyleForNode(/*int*/ nodeId, callback)
-    var node = Weinre.nodeStore.getNode(nodeId)
-    if (!node) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid nodeId: " + nodeId)
-        return
-    }
-
-    var result = Weinre.cssStore.getComputedStyle(node) 
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-
-//-----------------------------------------------------------------------------
-method getInlineStyleForNode(/*int*/ nodeId, callback)
-    var node = Weinre.nodeStore.getNode(nodeId)
-    if (!node) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid nodeId: " + nodeId)
-        return
-    }
-
-    var result = Weinre.cssStore.getInlineStyle(node)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method getAllStyles(callback)
-    // callback: function(/*any[]*/ styleSheetIds)
-    Weinre.notImplemented(arguments.callee.signature)
-
-
-//-----------------------------------------------------------------------------
-method getStyleSheet(/*string*/ styleSheetId, callback)
-    // callback: function(/*any*/ styleSheet)
-    Weinre.notImplemented(arguments.callee.signature)
-
-
-//-----------------------------------------------------------------------------
-method getStyleSheetText(/*string*/ styleSheetId, callback)
-    // callback: function(/*string*/ url, /*string*/ text)
-    Weinre.notImplemented(arguments.callee.signature)
-
-
-//-----------------------------------------------------------------------------
-method setStyleSheetText(/*string*/ styleSheetId, /*string*/ text, callback)
-    // callback: function(/*boolean*/ success)
-    Weinre.notImplemented(arguments.callee.signature)
-
-
-//-----------------------------------------------------------------------------
-method setPropertyText(/*any*/ styleId, /*int*/ propertyIndex, /*string*/ text, /*boolean*/ overwrite, callback)
-    // callback: function(/*any*/ style)
-    
-    var result = Weinre.cssStore.setPropertyText(styleId, propertyIndex, text, overwrite)
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-    
-//-----------------------------------------------------------------------------
-method toggleProperty(/*any*/ styleId, /*int*/ propertyIndex, /*boolean*/ disable, callback)
-
-    var result = Weinre.cssStore.toggleProperty(styleId, propertyIndex, disable)
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method setRuleSelector(/*any*/ ruleId, /*string*/ selector, callback)
-    // callback: function(/*any*/ rule)
-    Weinre.notImplemented(arguments.callee.signature)
-
-
-//-----------------------------------------------------------------------------
-method addRule(/*int*/ contextNodeId, /*string*/ selector, callback)
-    // callback: function(/*any*/ rule)
-    Weinre.notImplemented(arguments.callee.signature)
-
-
-//-----------------------------------------------------------------------------
-method getSupportedCSSProperties(callback)
-    return Weinre.getCSSProperties()
-
-
-//-----------------------------------------------------------------------------
-method querySelectorAll(/*int*/ documentId, /*string*/ selector, callback)
-    // callback: function(/*any[]*/ result)
-    Weinre.notImplemented(arguments.callee.signature)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/WiConsoleImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/WiConsoleImpl.scoop b/weinre.web/modules-scoop/weinre/target/WiConsoleImpl.scoop
deleted file mode 100644
index 8b8e6a4..0000000
--- a/weinre.web/modules-scoop/weinre/target/WiConsoleImpl.scoop
+++ /dev/null
@@ -1,36 +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/Weinre
-
-//-----------------------------------------------------------------------------
-class WiConsoleImpl
-    this.messagesEnabled = true
-
-//-----------------------------------------------------------------------------
-method setConsoleMessagesEnabled(/*boolean*/ enabled, callback)
-    var oldValue = this.messagesEnabled
-    this.messagesEnabled = enabled
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [oldValue])
-    }
-
-//-----------------------------------------------------------------------------
-method clearConsoleMessages(callback)
-    Weinre.wi.ConsoleNotify.consoleMessagesCleared()
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [])
-    }
-
-//-----------------------------------------------------------------------------
-method setMonitoringXHREnabled(/*boolean*/ enabled, callback)
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [])
-    }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/WiDOMImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/WiDOMImpl.scoop b/weinre.web/modules-scoop/weinre/target/WiDOMImpl.scoop
deleted file mode 100644
index 4e7fd2f..0000000
--- a/weinre.web/modules-scoop/weinre/target/WiDOMImpl.scoop
+++ /dev/null
@@ -1,188 +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/Weinre
-
-//-----------------------------------------------------------------------------
-class WiDOMImpl
-
-//-----------------------------------------------------------------------------
-method getChildNodes(/*int*/ nodeId, callback)
-    var node = Weinre.nodeStore.getNode(nodeId)
-    if (!node) {
-        Weinre.logWarning(arguments.callee.signature  + " passed an invalid nodeId: " + nodeId)
-        return
-    }
-
-    var children = Weinre.nodeStore.serializeNodeChildren(node, 1)
-    Weinre.wi.DOMNotify.setChildNodes(nodeId, children)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method setAttribute(/*int*/ elementId, /*string*/ name, /*string*/ value, callback)
-    var element = Weinre.nodeStore.getNode(elementId)
-    if (!element) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid elementId: " + elementId)
-        return
-    }
-
-    element.setAttribute(name, value)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method removeAttribute(/*int*/ elementId, /*string*/ name, callback)
-    var element = Weinre.nodeStore.getNode(elementId)
-    if (!element) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid elementId: " + elementId)
-        return
-    }
-
-    element.removeAttribute(name)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method setTextNodeValue(/*int*/ nodeId, /*string*/ value, callback)
-    var node = Weinre.nodeStore.getNode(nodeId)
-    if (!node) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid nodeId: " + nodeId)
-        return
-    }
-
-    node.nodeValue = value
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method getEventListenersForNode(/*int*/ nodeId, callback)
-    // callback: function(/*int*/ outNodeId, /*any[]*/ listenersArray)
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method copyNode(/*int*/ nodeId, callback)
-    // callback: function()
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method removeNode(/*int*/ nodeId, callback)
-    var node = Weinre.nodeStore.getNode(nodeId)
-    if (!node) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid nodeId: " + nodeId)
-        return
-    }
-
-    if (!node.parentNode) {
-        Weinre.logWarning(arguments.callee.signature + " passed a parentless node: " + node)
-        return
-    }
-
-    node.parentNode.removeChild(node)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method changeTagName(/*int*/ nodeId, /*string*/ newTagName, callback)
-    // callback: function(/*int*/ outNodeId)
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method getOuterHTML(/*int*/ nodeId, callback)
-    var node = Weinre.nodeStore.getNode(nodeId)
-    if (!node) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid nodeId: " + nodeId)
-        return
-    }
-
-    value = node.outerHTML
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [value])
-    }
-
-//-----------------------------------------------------------------------------
-method setOuterHTML(/*int*/ nodeId, /*string*/ outerHTML, callback)
-    var node = Weinre.nodeStore.getNode(nodeId)
-    if (!node) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid nodeId: " + nodeId)
-        return
-    }
-
-    node.outerHTML = outerHTML
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method addInspectedNode(/*int*/ nodeId, callback)
-    Weinre.nodeStore.addInspectedNode(nodeId)
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-    
-//-----------------------------------------------------------------------------
-method performSearch(/*string*/ query, /*boolean*/ runSynchronously, callback)
-    // callback: function()
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method searchCanceled(callback)
-    // callback: function()
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method pushNodeByPathToFrontend(/*string*/ path, callback)
-    // callback: function(/*int*/ nodeId)
-    Weinre.notImplemented(arguments.callee.signature)
-
-//-----------------------------------------------------------------------------
-method resolveNode(/*int*/ nodeId, callback)
-    var result = Weinre.injectedScript.resolveNode(nodeId)
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method getNodeProperties(/*int*/ nodeId, /*any[]*/ propertiesArray, callback)
-    var propertiesArray = JSON.stringify(propertiesArray)
-    var result = Weinre.injectedScript.getNodeProperties(nodeId, propertiesArray)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method getNodePrototypes(/*int*/ nodeId, callback)
-    var result = Weinre.injectedScript.getNodePrototypes(nodeId)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method pushNodeToFrontend(/*any*/ objectId, callback)
-    var objectId = JSON.stringify(objectId)
-    var result = Weinre.injectedScript.pushNodeToFrontend(objectId)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/WiDOMStorageImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/WiDOMStorageImpl.scoop b/weinre.web/modules-scoop/weinre/target/WiDOMStorageImpl.scoop
deleted file mode 100644
index b3d907f..0000000
--- a/weinre.web/modules-scoop/weinre/target/WiDOMStorageImpl.scoop
+++ /dev/null
@@ -1,170 +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/Weinre
-requireClass ../common/Native
-
-//-----------------------------------------------------------------------------
-class WiDOMStorageImpl
-
-//-----------------------------------------------------------------------------
-method getDOMStorageEntries(/*int*/ storageId, callback)
-    var storageArea = _getStorageArea(storageId)
-    
-    if (!storageArea) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid storageId: " + storageId)
-        return
-    }
-    
-    var result = []
-    
-    var length = storageArea.length
-    for (var i=0; i<length; i++) {
-        var key = storageArea.key(i)
-        var val = storageArea.getItem(key)
-        
-        result.push([key, val])    
-    }
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method setDOMStorageItem(/*int*/ storageId, /*string*/ key, /*string*/ value, callback)
-    var storageArea = _getStorageArea(storageId)
-    
-    if (!storageArea) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid storageId: " + storageId)
-        return
-    }
-    
-    var result = true
-    try {
-        if (storageArea == window.localStorage) {
-            Native.LocalStorage_setItem(key, value)
-        }
-        else if (storageArea == window.sessionStorage) {
-            Native.SessionStorage_setItem(key, value)
-        }
-    }
-    catch (e) {
-        result = false
-    }
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method removeDOMStorageItem(/*int*/ storageId, /*string*/ key, callback)
-    var storageArea = _getStorageArea(storageId)
-    
-    if (!storageArea) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid storageId: " + storageId)
-        return
-    }
-
-    var result = true
-    try {
-        if (storageArea == window.localStorage) {
-            Native.LocalStorage_removeItem(key)
-        }
-        else if (storageArea == window.sessionStorage) {
-            Native.SessionStorage_removeItem(key)
-        }
-    }
-    catch (e) {
-        result = false
-    }
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-    
-//-----------------------------------------------------------------------------
-function _getStorageArea(storageId)
-    if (storageId == 1) {
-        return window.localStorage
-    }
-    
-    else if (storageId == 2) {
-        return window.sessionStorage
-    }
-    
-    return null
-
-//-----------------------------------------------------------------------------
-method initialize
-
-    if (window.localStorage) {
-        Weinre.wi.DOMStorageNotify.addDOMStorage({
-            id:             1,
-            host:           window.location.host,
-            isLocalStorage: true
-        })
-        
-        window.localStorage.setItem = function(key, value) {
-            Native.LocalStorage_setItem(key, value)
-            _storageEventHandler({storageArea: window.localStorage})
-        }
-        
-        window.localStorage.removeItem = function(key) {
-            Native.LocalStorage_removeItem(key)
-            _storageEventHandler({storageArea: window.localStorage})
-        }
-        
-        window.localStorage.clear = function() {
-            Native.LocalStorage_clear()
-            _storageEventHandler({storageArea: window.localStorage})
-        }
-    }
-    
-    if (window.sessionStorage) {
-        Weinre.wi.DOMStorageNotify.addDOMStorage({
-            id:             2,
-            host:           window.location.host,
-            isLocalStorage: false
-        })
-        
-        window.sessionStorage.setItem = function(key, value) {
-            Native.SessionStorage_setItem(key, value)
-            _storageEventHandler({storageArea: window.sessionStorage})
-        }
-        
-        window.sessionStorage.removeItem = function(key) {
-            Native.SessionStorage_removeItem(key)
-            _storageEventHandler({storageArea: window.sessionStorage})
-        }
-        
-        window.sessionStorage.clear = function() {
-            Native.SessionStorage_clear()
-            _storageEventHandler({storageArea: window.sessionStorage})
-        }
-    }
-    
-    document.addEventListener("storage", _storageEventHandler, false)
-    
-//-----------------------------------------------------------------------------
-function _storageEventHandler(event)
-    var storageId
-    
-    if (event.storageArea == window.localStorage) {
-        storageId = 1
-    }
-    
-    else if (event.storageArea == window.sessionStorage) {
-        storageId = 2
-    }
-    
-    else {
-        return
-    }
-    
-    Weinre.wi.DOMStorageNotify.updateDOMStorage(storageId)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/WiDatabaseImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/WiDatabaseImpl.scoop b/weinre.web/modules-scoop/weinre/target/WiDatabaseImpl.scoop
deleted file mode 100644
index e9fa6df..0000000
--- a/weinre.web/modules-scoop/weinre/target/WiDatabaseImpl.scoop
+++ /dev/null
@@ -1,171 +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/Weinre
-requireClass ../common/Native
-requireClass ../common/IDGenerator
-requireClass ./SqlStepper
-
-//-----------------------------------------------------------------------------
-class WiDatabaseImpl
-    if (!window.openDatabase) return
-    
-    window.openDatabase = wrappedOpenDatabase
-
-//-----------------------------------------------------------------------------
-static method getDatabases
-    var result = []
-    
-    for (var id in id2db) {
-        result.push(id2db[id])
-    }
-    
-    return result
-
-//-----------------------------------------------------------------------------
-function logSqlError(sqlError)
-    console.log("SQL Error " + sqlError.code + ": " + sqlError.message)
-
-//-----------------------------------------------------------------------------
-function getTableNames_step_1() 
-    this.executeSql("SELECT name FROM sqlite_master WHERE type='table'");
-
-//-----------------------------------------------------------------------------
-function getTableNames_step_2(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)
-    }
-    
-    Weinre.WeinreTargetCommands.sendClientCallback(this.callback, [result])
-
-//-----------------------------------------------------------------------------
-method getDatabaseTableNames( databaseId, callback)
-    var db = dbById(databaseId)
-    if (!db) return
-  
-    var stepper = SqlStepper([
-        getTableNames_step_1, 
-        getTableNames_step_2
-    ])
-    
-    stepper.callback = callback
-    stepper.run(db, logSqlError)
-
-//-----------------------------------------------------------------------------
-function executeSQL_step_1()
-    this.executeSql(this.query);
-
-//-----------------------------------------------------------------------------
-function executeSQL_step_2(resultSet)
-    var columnNames = []
-    var values      = []
-    var rows        = resultSet.rows
-    
-    for (var i=0; i<rows.length; i++) {
-        var row = rows.item(i)
-        
-        if (i == 0) {
-            for (var propName in row) {
-                columnNames.push(propName)
-            }
-        }
-        
-        for (var j=0; j<columnNames.length; j++) {
-            values.push(row[columnNames[j]])
-        }
-    }
-
-    Weinre.wi.DatabaseNotify.sqlTransactionSucceeded(this.txid, columnNames, values)
-
-//-----------------------------------------------------------------------------
-function executeSQL_error(sqlError)
-    var error = {
-        code:    sqlError.code,
-        message: sqlError.message
-    }
-    
-    Weinre.wi.DatabaseNotify.sqlTransactionFailed(this.txid, error)
-
-//-----------------------------------------------------------------------------
-method executeSQL(/*int*/ databaseId, /*string*/ query, callback)
-    var db = dbById(databaseId)
-    if (!db) return
-    
-    var txid = Weinre.targetDescription.channel + "-" + IDGenerator.next()
-    
-    var stepper = SqlStepper([
-        executeSQL_step_1,
-        executeSQL_step_2,
-    ])
-    
-    stepper.txid     = txid
-    stepper.query    = query
-    stepper.callback = callback
-    stepper.run(db, executeSQL_error)
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [true, txid])
-    }
-    
-
-//-----------------------------------------------------------------------------
-function wrappedOpenDatabase(name, version, displayName, estimatedSize, creationCallback)
-
-    var db = Native.openDatabase(name, version, displayName, estimatedSize, creationCallback)
-    
-    dbAdd(db, name, version)
-    
-    return db    
-    
-//-----------------------------------------------------------------------------
-init 
-    var id2db   = {}
-    var name2db = {}
-
-//-----------------------------------------------------------------------------
-function dbById(id) 
-    var record = id2db[id]
-    if (!record) return null
-    return record.db
-    
-//-----------------------------------------------------------------------------
-function dbRecordById(id) 
-    return id2db[id]
-    
-//-----------------------------------------------------------------------------
-function dbRecordByName(name) 
-    return name2db[name]
-    
-//-----------------------------------------------------------------------------
-function dbAdd(db, name, version)
-    
-    var record = dbRecordByName(name)
-    if (record) return record
-    
-    record = {}
-    record.id      = IDGenerator.next()
-    record.domain  = window.location.origin
-    record.name    = name
-    record.version = version
-    record.db      = db
-    
-    id2db[record.id] = record
-    name2db[name]    = record
-
-    var payload = {}
-    payload.id      = record.id
-    payload.domain  = record.domain
-    payload.name    = name
-    payload.version = version
-    
-    Weinre.WeinreExtraTargetEvents.databaseOpened(payload)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/WiInspectorImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/WiInspectorImpl.scoop b/weinre.web/modules-scoop/weinre/target/WiInspectorImpl.scoop
deleted file mode 100644
index aed26ad..0000000
--- a/weinre.web/modules-scoop/weinre/target/WiInspectorImpl.scoop
+++ /dev/null
@@ -1,65 +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/Weinre
-requireClass ../target/Timeline
-
-//-----------------------------------------------------------------------------
-class WiInspectorImpl
-
-//-----------------------------------------------------------------------------
-method reloadPage(callback)
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-    window.location.reload()
-
-//-----------------------------------------------------------------------------
-method highlightDOMNode(/*int*/ nodeId, callback)
-    var node = Weinre.nodeStore.getNode(nodeId)
-    if (!node) {
-        Weinre.logWarning(arguments.callee.signature + " passed an invalid nodeId: " + nodeId)
-        return
-    }
-
-    Weinre.elementHighlighter.on(node)
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method hideDOMNodeHighlight(callback)
-    Weinre.elementHighlighter.off()
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-//-----------------------------------------------------------------------------
-method startTimelineProfiler(callback)
-    Timeline.start()
-    
-    Weinre.wi.TimelineNotify.timelineProfilerWasStarted()
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-
-
-//-----------------------------------------------------------------------------
-method stopTimelineProfiler(callback)
-    Timeline.stop()
-    
-    Weinre.wi.TimelineNotify.timelineProfilerWasStopped()
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback)
-    }
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/target/WiRuntimeImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/target/WiRuntimeImpl.scoop b/weinre.web/modules-scoop/weinre/target/WiRuntimeImpl.scoop
deleted file mode 100644
index 44cd0e9..0000000
--- a/weinre.web/modules-scoop/weinre/target/WiRuntimeImpl.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) 2011 IBM Corporation
- */
-
-requireClass ../common/Weinre
-
-//-----------------------------------------------------------------------------
-class WiRuntimeImpl
-
-//-----------------------------------------------------------------------------
-method evaluate(/*string*/ expression, /*string*/ objectGroup, /*boolean*/ includeCommandLineAPI, callback)
-    var result = Weinre.injectedScript.evaluate(expression, objectGroup, includeCommandLineAPI)
-    
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method getCompletions(/*string*/ expression, /*boolean*/ includeCommandLineAPI, callback)
-    var result = Weinre.injectedScript.getCompletions(expression, includeCommandLineAPI)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method getProperties(/*any*/ objectId, /*boolean*/ ignoreHasOwnProperty, /*boolean*/ abbreviate, callback)
-    var objectId = JSON.stringify(objectId)
-    var result = Weinre.injectedScript.getProperties(objectId, ignoreHasOwnProperty, abbreviate)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method setPropertyValue(/*any*/ objectId, /*string*/ propertyName, /*string*/ expression, callback)
-    var objectId = JSON.stringify(objectId)
-    var result = Weinre.injectedScript.setPropertyValue(objectId, propertyName, expression)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-
-//-----------------------------------------------------------------------------
-method releaseWrapperObjectGroup(/*int*/ injectedScriptId, /*string*/ objectGroup, callback)
-    var result = Weinre.injectedScript.releaseWrapperObjectGroup(objectGroupName)
-
-    if (callback) {
-        Weinre.WeinreTargetCommands.sendClientCallback(callback, [result])
-    }
-    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules/weinre/common/Weinre.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/common/Weinre.coffee b/weinre.web/modules/weinre/common/Weinre.coffee
index 52bc180..decb80b 100644
--- a/weinre.web/modules/weinre/common/Weinre.coffee
+++ b/weinre.web/modules/weinre/common/Weinre.coffee
@@ -12,7 +12,6 @@ StackTrace = require('./StackTrace')
 
 _notImplemented     = {}
 _showNotImplemented = false
-CSSProperties       = []
 logger              = null
 
 #-------------------------------------------------------------------------------
@@ -27,14 +26,6 @@ module.exports = class Weinre
         IDLTools.addIDLs idls
 
     #---------------------------------------------------------------------------
-    @addCSSProperties: (cssProperties) ->
-        CSSProperties = cssProperties
-
-    #---------------------------------------------------------------------------
-    @getCSSProperties: ->
-        CSSProperties
-
-    #---------------------------------------------------------------------------
     @deprecated: () ->
         StackTrace.dump arguments
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules/weinre/target/CSSStore.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/target/CSSStore.coffee b/weinre.web/modules/weinre/target/CSSStore.coffee
index 27ce891..b1b350e 100644
--- a/weinre.web/modules/weinre/target/CSSStore.coffee
+++ b/weinre.web/modules/weinre/target/CSSStore.coffee
@@ -9,8 +9,6 @@
 IDGenerator = require('../common/IDGenerator')
 Weinre      = require('../common/Weinre')
 
-Properties = []
-
 _elementMatchesSelector = null
 
 #-------------------------------------------------------------------------------
@@ -24,10 +22,6 @@ module.exports = class CSSStore
         @testElement   = document.createElement("div")
 
     #---------------------------------------------------------------------------
-    @addCSSProperties: (properties) ->
-        Properties = properties
-
-    #---------------------------------------------------------------------------
     getInlineStyle: (node) ->
         styleObject = @_buildMirrorForStyle(node.style, true)
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules/weinre/target/ElementHighlighter.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/target/ElementHighlighter.coffee b/weinre.web/modules/weinre/target/ElementHighlighter.coffee
index b1a7ccb..52d0aed 100644
--- a/weinre.web/modules/weinre/target/ElementHighlighter.coffee
+++ b/weinre.web/modules/weinre/target/ElementHighlighter.coffee
@@ -6,74 +6,50 @@
 # Copyright (c) 2010, 2011 IBM Corporation
 #---------------------------------------------------------------------------------
 
-Binding = require('../common/Binding')
-Weinre  = require('../common/Weinre')
+canvasAvailable           = null
+highlighterClass          = null
+currentHighlighterElement = null
 
 #-------------------------------------------------------------------------------
 module.exports = class ElementHighlighter
 
-    ElementHighlighter::__defineGetter__("element", -> @boxMargin)
+    #---------------------------------------------------------------------------
+    @create: ->
+        highlighterClass ?= require('./ElementHighlighterDivs2')
 
-    constructor: ->
-        @boxMargin  = document.createElement("div")
-        @boxBorder  = document.createElement("div")
-        @boxPadding = document.createElement("div")
-        @boxContent = document.createElement("div")
+        new highlighterClass()
 
-        @boxMargin.appendChild  @boxBorder
-        @boxBorder.appendChild  @boxPadding
-        @boxPadding.appendChild @boxContent
+    #---------------------------------------------------------------------------
+    constructor: ->
+        @hElement = @createHighlighterElement()
+        @hElement.__weinreHighlighter = true
+        @hElement.style.display = "none"
+        @hElement.style.zIndex  = 10 * 1000 * 1000
 
-        @boxMargin.style.backgroundColor  = "#FCC"
-        @boxBorder.style.backgroundColor  = "#000"
-        @boxPadding.style.backgroundColor = "#CFC"
-        @boxContent.style.backgroundColor = "#CCF"
+        if currentHighlighterElement
+            document.body.removeChild currentHighlighterElement
 
-        @boxMargin.style.opacity       = @boxBorder.style.opacity       = @boxPadding.style.opacity       = @boxContent.style.opacity       = 0.6
-        @boxMargin.style.position      = @boxBorder.style.position      = @boxPadding.style.position      = @boxContent.style.position      = "absolute"
-        @boxMargin.style.borderWidth   = @boxBorder.style.borderWidth   = @boxPadding.style.borderWidth   = @boxContent.style.borderWidth   = "thin"
-        @boxMargin.style.borderStyle   = @boxBorder.style.borderStyle   = @boxPadding.style.borderStyle   = @boxContent.style.borderStyle   = "solid"
-        @boxMargin.__weinreHighlighter = @boxBorder.__weinreHighlighter = @boxPadding.__weinreHighlighter = @boxContent.__weinreHighlighter = true
+        currentHighlighterElement = @hElement
 
-        @boxMargin.style.display = "none"
-        document.body.appendChild @boxMargin
+        document.body.appendChild @hElement
 
     #---------------------------------------------------------------------------
     on: (element) ->
         return if null == element
         return unless element.nodeType == Node.ELEMENT_NODE
 
-        @calculateMetrics element
-        @boxMargin.style.display = "block"
+        @redraw getMetricsForElement(element)
 
-    #---------------------------------------------------------------------------
-    off: ->
-        @boxMargin.style.display = "none"
+        @hElement.style.display = "block"
 
     #---------------------------------------------------------------------------
-    calculateMetrics: (element) ->
-        metrics = getMetrics(element)
-
-        @boxMargin.style.top     = metrics.y + "px"
-        @boxMargin.style.left    = metrics.x + "px"
-        @boxMargin.style.height  = metrics.height + "px"
-        @boxMargin.style.width   = metrics.width + "px"
-        @boxBorder.style.top     = metrics.marginTop + "px"
-        @boxBorder.style.left    = metrics.marginLeft + "px"
-        @boxBorder.style.bottom  = metrics.marginBottom + "px"
-        @boxBorder.style.right   = metrics.marginRight + "px"
-        @boxPadding.style.top    = metrics.borderTop + "px"
-        @boxPadding.style.left   = metrics.borderLeft + "px"
-        @boxPadding.style.bottom = metrics.borderBottom + "px"
-        @boxPadding.style.right  = metrics.borderRight + "px"
-        @boxContent.style.top    = metrics.paddingTop + "px"
-        @boxContent.style.left   = metrics.paddingLeft + "px"
-        @boxContent.style.bottom = metrics.paddingBottom + "px"
-        @boxContent.style.right  = metrics.paddingRight + "px"
+    off: ->
+        @hElement.style.display = "none"
 
 #-------------------------------------------------------------------------------
-getMetrics = (element) ->
-      result = {}
+getMetricsForElement = (element) ->
+      metrics = {}
+
       left = 0
       top  = 0
       el   = element
@@ -83,37 +59,41 @@ getMetrics = (element) ->
           top += el.offsetTop
           break unless el = el.offsetParent
 
-      result.x = left
-      result.y = top
+      metrics.x = left
+      metrics.y = top
 
       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
-
-      result
+      metrics.width         = element.offsetWidth
+      metrics.height        = element.offsetHeight
+      metrics.marginLeft    = fromPx(cStyle["margin-left"])
+      metrics.marginRight   = fromPx(cStyle["margin-right"])
+      metrics.marginTop     = fromPx(cStyle["margin-top"])
+      metrics.marginBottom  = fromPx(cStyle["margin-bottom"])
+      metrics.borderLeft    = fromPx(cStyle["border-left-width"])
+      metrics.borderRight   = fromPx(cStyle["border-right-width"])
+      metrics.borderTop     = fromPx(cStyle["border-top-width"])
+      metrics.borderBottom  = fromPx(cStyle["border-bottom-width"])
+      metrics.paddingLeft   = fromPx(cStyle["padding-left"])
+      metrics.paddingRight  = fromPx(cStyle["padding-right"])
+      metrics.paddingTop    = fromPx(cStyle["padding-top"])
+      metrics.paddingBottom = fromPx(cStyle["padding-bottom"])
+
+      metrics.x -= metrics.marginLeft
+      metrics.y -= metrics.marginTop
+
+      metrics
 
 #-------------------------------------------------------------------------------
 fromPx = (string) ->
       parseInt string.replace(/px$/, "")
 
 #-------------------------------------------------------------------------------
-require("../common/MethodNamer").setNamesForClass(module.exports)
+supportsCanvas = () ->
+    element = document.createElement('canvas')
+    return false unless element.getContext
+    return true if element.getContext('2d')
+    return false
+
+#-------------------------------------------------------------------------------
+require("../common/MethodNamer").setNamesForClass(module.exports)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules/weinre/target/ElementHighlighterDivs2.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/target/ElementHighlighterDivs2.coffee b/weinre.web/modules/weinre/target/ElementHighlighterDivs2.coffee
new file mode 100644
index 0000000..8b70935
--- /dev/null
+++ b/weinre.web/modules/weinre/target/ElementHighlighterDivs2.coffee
@@ -0,0 +1,92 @@
+
+#---------------------------------------------------------------------------------
+# 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
+#---------------------------------------------------------------------------------
+
+ElementHighlighter = require('./ElementHighlighter')
+
+# from Web Inspector
+ColorMargin   =  'rgba(246, 178, 107, 0.66)'
+ColorBorder   =  'rgba(255, 229, 153, 0.66)'
+ColorPadding  =  'rgba(147, 196, 125, 0.55)'
+ColorContent  =  'rgba(111, 168, 220, 0.66)'
+
+# overrides
+ColorBorder   =  'rgba(255, 255, 153, 0.40)'
+ColorPadding  =  'rgba(  0, 255,   0, 0.20)'
+ColorContent  =  'rgba(  0,   0, 255, 0.30)'
+
+#-------------------------------------------------------------------------------
+module.exports = class ElementHighlighterDivs2 extends ElementHighlighter
+
+    #---------------------------------------------------------------------------
+    createHighlighterElement: ->
+
+        @hElement1 = document.createElement("weinreHighlighter")
+        @hElement1.style.position = 'absolute'
+        @hElement1.style.overflow = 'hidden'
+
+        @hElement2 = document.createElement("weinreHighlighter")
+        @hElement2.style.position = 'absolute'
+        @hElement2.style.display  = 'block'
+        @hElement2.style.overflow = 'hidden'
+
+        @hElement1.appendChild @hElement2
+
+        @hElement1.style.borderTopStyle    = 'solid'
+        @hElement1.style.borderLeftStyle   = 'solid'
+        @hElement1.style.borderBottomStyle = 'solid'
+        @hElement1.style.borderRightStyle  = 'solid'
+        @hElement1.style.borderTopColor    = ColorMargin
+        @hElement1.style.borderLeftColor   = ColorMargin
+        @hElement1.style.borderBottomColor = ColorMargin
+        @hElement1.style.borderRightColor  = ColorMargin
+        @hElement1.style.backgroundColor   = ColorBorder
+
+        @hElement2.style.borderTopStyle    = 'solid'
+        @hElement2.style.borderLeftStyle   = 'solid'
+        @hElement2.style.borderBottomStyle = 'solid'
+        @hElement2.style.borderRightStyle  = 'solid'
+        @hElement2.style.borderTopColor    = ColorPadding
+        @hElement2.style.borderLeftColor   = ColorPadding
+        @hElement2.style.borderBottomColor = ColorPadding
+        @hElement2.style.borderRightColor  = ColorPadding
+        @hElement2.style.backgroundColor   = ColorContent
+
+        @hElement1.style.outline           = 'black solid thin'
+
+        @hElement1
+
+    #---------------------------------------------------------------------------
+    redraw: (metrics) ->
+        console.log(JSON.stringify(metrics, null, 4))
+
+        @hElement1.style.top               = px metrics.y
+        @hElement1.style.left              = px metrics.x
+        @hElement1.style.height            = px metrics.height
+        @hElement1.style.width             = px metrics.width
+
+        @hElement1.style.borderTopWidth    = px metrics.marginTop
+        @hElement1.style.borderLeftWidth   = px metrics.marginLeft
+        @hElement1.style.borderBottomWidth = px metrics.marginBottom
+        @hElement1.style.borderRightWidth  = px metrics.marginRight
+
+        @hElement2.style.top               = px metrics.borderTop
+        @hElement2.style.left              = px metrics.borderLeft
+        @hElement2.style.bottom            = px metrics.borderBottom
+        @hElement2.style.right             = px metrics.borderRight
+
+        @hElement2.style.borderTopWidth    = px metrics.paddingTop
+        @hElement2.style.borderLeftWidth   = px metrics.paddingLeft
+        @hElement2.style.borderBottomWidth = px metrics.paddingBottom
+        @hElement2.style.borderRightWidth  = px metrics.paddingRight
+
+#-------------------------------------------------------------------------------
+px = (value) ->
+    "#{value}px"
+
+#-------------------------------------------------------------------------------
+require("../common/MethodNamer").setNamesForClass(module.exports)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules/weinre/target/Target.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/target/Target.coffee b/weinre.web/modules/weinre/target/Target.coffee
index f5c8f0e..8dbceb6 100644
--- a/weinre.web/modules/weinre/target/Target.coffee
+++ b/weinre.web/modules/weinre/target/Target.coffee
@@ -40,9 +40,6 @@ module.exports = class Target
         Weinre.target = new Target()
         Weinre.target.initialize()
 
-        Weinre.addCSSProperties = addCSSProperties = (properties) ->
-            CSSStore.addCSSProperties properties
-
         ExceptionalCallbacks.addHooks()
 
     #----------------------------------------------------------------------------
@@ -194,7 +191,7 @@ module.exports = class Target
 
     #---------------------------------------------------------------------------
     setDocument: () ->
-        Weinre.elementHighlighter = new ElementHighlighter()
+        Weinre.elementHighlighter = ElementHighlighter.create()
 
         nodeId   = Weinre.nodeStore.getNodeId(document)
         nodeData = Weinre.nodeStore.getNodeData(nodeId, 2)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules/weinre/target/Timeline.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/target/Timeline.coffee b/weinre.web/modules/weinre/target/Timeline.coffee
index 9d070d8..b44ead3 100644
--- a/weinre.web/modules/weinre/target/Timeline.coffee
+++ b/weinre.web/modules/weinre/target/Timeline.coffee
@@ -197,15 +197,18 @@ module.exports = class Timeline
                 interval  = args[1]
                 code      = instrumentedTimerCode(code, interval, false)
                 args[0]   = code
-                @userData = code
+
+                @userData = {}
+                @userData.code     = code
+                @userData.interval = interval
 
             after: (receiver, args, result) ->
-                code = @userData
+                code = @userData.code
                 return unless typeof(code) is "function"
 
                 id             = result
                 code.__timerId = id
-                addTimer id, interval, false
+                addTimer id, @userData.interval, false
 
         #-----------------------------------------------------------------------
         HookSites.window_clearInterval.addHooks
@@ -224,15 +227,18 @@ module.exports = class Timeline
                 interval  = args[1]
                 code      = instrumentedTimerCode(code, interval, true)
                 args[0]   = code
-                @userData = code
+
+                @userData = {}
+                @userData.code     = code
+                @userData.interval = interval
 
             after: (receiver, args, result) ->
-                code = @userData
+                code = @userData.code
                 return unless typeof(code) is "function"
 
                 id             = result
                 code.__timerId = id
-                addTimer id, interval, true
+                addTimer id, @userData.interval, true
 
         #-----------------------------------------------------------------------
         HookSites.window_clearTimeout.addHooks

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules/weinre/target/WiCSSImpl.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/target/WiCSSImpl.coffee b/weinre.web/modules/weinre/target/WiCSSImpl.coffee
index e12efde..c5e0932 100644
--- a/weinre.web/modules/weinre/target/WiCSSImpl.coffee
+++ b/weinre.web/modules/weinre/target/WiCSSImpl.coffee
@@ -111,10 +111,6 @@ module.exports = class WiCSSImpl
         Weinre.notImplemented arguments.callee.signature
 
     #---------------------------------------------------------------------------
-    getSupportedCSSProperties: (callback) ->
-        Weinre.getCSSProperties()
-
-    #---------------------------------------------------------------------------
     querySelectorAll: (documentId, selector, callback) ->
         Weinre.notImplemented arguments.callee.signature
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules/weinre/unused/ElementHighlighterCanvas.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/unused/ElementHighlighterCanvas.coffee b/weinre.web/modules/weinre/unused/ElementHighlighterCanvas.coffee
new file mode 100644
index 0000000..2549466
--- /dev/null
+++ b/weinre.web/modules/weinre/unused/ElementHighlighterCanvas.coffee
@@ -0,0 +1,80 @@
+
+#---------------------------------------------------------------------------------
+# 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
+#---------------------------------------------------------------------------------
+
+ElementHighlighter = require('./ElementHighlighter')
+
+ColorMargin   =  'rgba(246, 178, 107, 0.66)'
+ColorBorder   =  'rgba(255, 229, 153, 0.66)'
+ColorPadding  =  'rgba(147, 196, 125, 0.55)'
+ColorContent  =  'rgba(111, 168, 220, 0.66)'
+
+#-------------------------------------------------------------------------------
+module.exports = class ElementHighlighterCanvas extends ElementHighlighter
+
+    #---------------------------------------------------------------------------
+    createHighlighterElement: ->
+
+        @canvas = document.createElement('canvas')
+        @canvas.style.position = 'absolute'
+        @canvas
+
+    #---------------------------------------------------------------------------
+    redraw: (m) ->
+
+        @canvas.width  = m.width
+        @canvas.height = m.height
+
+        style = @canvas.style
+
+        style.top     = m.y
+        style.left    = m.x
+        style.height  = m.height
+        style.width   = m.width
+
+        g = @canvas.getContext("2d")
+
+        #--------------------------------------
+        x = 0
+        y = 0
+        w = m.width
+        h = m.height
+        g.fillStyle = ColorMargin
+        g.fillRect(x,y,w,h)
+
+        #--------------------------------------
+        x += m.marginLeft
+        y += m.marginTop
+        w -= m.marginLeft + m.marginRight
+        h -= m.marginTop  + m.marginBottom
+
+        g.fillStyle = ColorBorder
+        g.clearRect(x,y,w,h)
+        g.fillRect(x,y,w,h)
+
+        #--------------------------------------
+        x += m.borderLeft
+        y += m.borderTop
+        w -= m.borderLeft + m.borderRight
+        h -= m.borderTop  + m.borderBottom
+
+        g.fillStyle = ColorPadding
+        g.clearRect(x,y,w,h)
+        g.fillRect(x,y,w,h)
+
+        #--------------------------------------
+        x += m.paddingLeft
+        y += m.paddingTop
+        w -= m.paddingLeft + m.paddingRight
+        h -= m.paddingTop  + m.paddingBottom
+
+        g.fillStyle = ColorContent
+        g.clearRect(x,y,w,h)
+        g.fillRect(x,y,w,h)
+
+#-------------------------------------------------------------------------------
+require("../common/MethodNamer").setNamesForClass(module.exports)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules/weinre/unused/ElementHighlighterDivs4.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/unused/ElementHighlighterDivs4.coffee b/weinre.web/modules/weinre/unused/ElementHighlighterDivs4.coffee
new file mode 100644
index 0000000..dea11a1
--- /dev/null
+++ b/weinre.web/modules/weinre/unused/ElementHighlighterDivs4.coffee
@@ -0,0 +1,60 @@
+
+#---------------------------------------------------------------------------------
+# 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
+#---------------------------------------------------------------------------------
+
+ElementHighlighter = require('./ElementHighlighter')
+
+#-------------------------------------------------------------------------------
+module.exports = class ElementHighlighterDivs4 extends ElementHighlighter
+
+    #---------------------------------------------------------------------------
+    createHighlighterElement: ->
+
+        @boxMargin  = document.createElement("div")
+        @boxBorder  = document.createElement("div")
+        @boxPadding = document.createElement("div")
+        @boxContent = document.createElement("div")
+
+        @boxMargin.appendChild  @boxBorder
+        @boxBorder.appendChild  @boxPadding
+        @boxPadding.appendChild @boxContent
+
+        @boxMargin.style.backgroundColor  = "#FCC"
+        @boxBorder.style.backgroundColor  = "#000"
+        @boxPadding.style.backgroundColor = "#CFC"
+        @boxContent.style.backgroundColor = "#CCF"
+
+        @boxMargin.style.opacity       = @boxBorder.style.opacity       = @boxPadding.style.opacity       = @boxContent.style.opacity       = 0.6
+        @boxMargin.style.position      = @boxBorder.style.position      = @boxPadding.style.position      = @boxContent.style.position      = "absolute"
+        @boxMargin.style.borderWidth   = @boxBorder.style.borderWidth   = @boxPadding.style.borderWidth   = @boxContent.style.borderWidth   = "thin"
+        @boxMargin.style.borderStyle   = @boxBorder.style.borderStyle   = @boxPadding.style.borderStyle   = @boxContent.style.borderStyle   = "solid"
+        @boxMargin.__weinreHighlighter = @boxBorder.__weinreHighlighter = @boxPadding.__weinreHighlighter = @boxContent.__weinreHighlighter = true
+
+        @boxMargin
+
+    #---------------------------------------------------------------------------
+    redraw: (metrics) ->
+
+        @boxMargin.style.top     = metrics.y
+        @boxMargin.style.left    = metrics.x
+        @boxMargin.style.height  = metrics.height
+        @boxMargin.style.width   = metrics.width
+        @boxBorder.style.top     = metrics.marginTop
+        @boxBorder.style.left    = metrics.marginLeft
+        @boxBorder.style.bottom  = metrics.marginBottom
+        @boxBorder.style.right   = metrics.marginRight
+        @boxPadding.style.top    = metrics.borderTop
+        @boxPadding.style.left   = metrics.borderLeft
+        @boxPadding.style.bottom = metrics.borderBottom
+        @boxPadding.style.right  = metrics.borderRight
+        @boxContent.style.top    = metrics.paddingTop
+        @boxContent.style.left   = metrics.paddingLeft
+        @boxContent.style.bottom = metrics.paddingBottom
+        @boxContent.style.right  = metrics.paddingRight
+
+#-------------------------------------------------------------------------------
+require("../common/MethodNamer").setNamesForClass(module.exports)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/tests/element-highlighter.html
----------------------------------------------------------------------
diff --git a/weinre.web/tests/element-highlighter.html b/weinre.web/tests/element-highlighter.html
new file mode 100644
index 0000000..d59ef61
--- /dev/null
+++ b/weinre.web/tests/element-highlighter.html
@@ -0,0 +1,79 @@
+<html>
+
+<head>
+<title>weinre.web/tests/element-highlighter.html</title>
+<script>try {window.WeinreServerId = location.hash.split("#")[1]} catch(e) {window.WeinreServerId = "anonymous"}</script>
+<script src="/target/target-script.js"></script>
+</head>
+
+<body>
+
+<style>
+.red  { background-color: red }
+
+.m0   { margin:          0px; }
+.b0   { border:          0px solid gray; }
+.p0   { padding:         0px; }
+
+.m1   { margin:         20px; }
+.b1   { border:         20px solid gray; }
+.p1   { padding:        20px; }
+
+.m-1l { margin-left:   -20px; }
+.m-1r { margin-right:  -20px; }
+.m-1t { margin-top:    -20px; }
+.m-1b { margin-bottom: -20px; }
+
+</style>
+
+<h1> top-level </h1>
+<div class="red m0 b0 p0" style="width:50px; height:50px;">x</div>
+<div class="red m0 b0 p1" style="width:50px; height:50px;">x</div>
+<div class="red m0 b1 p0" style="width:50px; height:50px;">x</div>
+<div class="red m0 b1 p1" style="width:50px; height:50px;">x</div>
+<div class="red m1 b0 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 b0 p1" style="width:50px; height:50px;">x</div>
+<div class="red m1 b1 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 b1 p1" style="width:50px; height:50px;">x</div>
+
+<h1> 2nd-level, single margin </h1>
+
+<div class="m1">
+<div class="red m0 b0 p0" style="width:50px; height:50px;">x</div>
+<div class="red m0 b0 p1" style="width:50px; height:50px;">x</div>
+<div class="red m0 b1 p0" style="width:50px; height:50px;">x</div>
+<div class="red m0 b1 p1" style="width:50px; height:50px;">x</div>
+<div class="red m1 b0 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 b0 p1" style="width:50px; height:50px;">x</div>
+<div class="red m1 b1 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 b1 p1" style="width:50px; height:50px;">x</div>
+</div>
+
+<h1> 2nd-level, double margin </h1>
+
+<div class="m1"><div class="m1">
+<div class="red m0 b0 p0" style="width:50px; height:50px;">x</div>
+<div class="red m0 b0 p1" style="width:50px; height:50px;">x</div>
+<div class="red m0 b1 p0" style="width:50px; height:50px;">x</div>
+<div class="red m0 b1 p1" style="width:50px; height:50px;">x</div>
+<div class="red m1 b0 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 b0 p1" style="width:50px; height:50px;">x</div>
+<div class="red m1 b1 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 b1 p1" style="width:50px; height:50px;">x</div>
+</div></div>
+
+<h1> 2nd-level, double margin, negatives </h1>
+
+<div class="m1"><div class="m1">
+<div class="red m1 m-1l b0 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 m-1r b0 p1" style="width:50px; height:50px;">x</div>
+<div class="red m1 m-1t b1 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 m-1b b1 p1" style="width:50px; height:50px;">x</div>
+<div class="red m1 m-1b b0 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 m-1t b0 p1" style="width:50px; height:50px;">x</div>
+<div class="red m1 m-1r b1 p0" style="width:50px; height:50px;">x</div>
+<div class="red m1 m-1l b1 p1" style="width:50px; height:50px;">x</div>
+</div></div>
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/tests/index.html
----------------------------------------------------------------------
diff --git a/weinre.web/tests/index.html b/weinre.web/tests/index.html
new file mode 100644
index 0000000..54b577a
--- /dev/null
+++ b/weinre.web/tests/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+<title>weinre.web/tests</title>
+</head>
+<body>
+<ul>
+<li><a href="element-highlighter.html">element-highlighter</a>
+</ul>
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/versions.js
----------------------------------------------------------------------
diff --git a/weinre.web/versions.js b/weinre.web/versions.js
index 174adc9..af1f435 100644
--- a/weinre.web/versions.js
+++ b/weinre.web/versions.js
@@ -17,6 +17,5 @@
     json4j:   "@JSON4J_VERSION@",
     json2:    "@JSON2_VERSION@",
     swt:      "@SWT_VERSION@",
-    modjewel: "@MODJEWEL_VERSION@",
-    scooj:    "@SCOOJ_VERSION@"
+    modjewel: "@MODJEWEL_VERSION@"
  };


Mime
View raw message