[CB-1193] - weinre: add Windows Phone support
https://issues.apache.org/jira/browse/CB-1193
Patch authored by Sergey Grebnov.
Original source from Sergey at:
https://github.com/apache/incubator-cordova-weinre/pull/12
This commit is slightly altered from that pull request:
- weinre.web/client/weinre/hacks.js was removed, since it
was just a eof diff
- weinre.web/demo/weinre-demo.html just had the <!DOCTYPE> fix,
not the change to the license comment
- weinre.web/demo/weinre-demo-min.html just had the <!DOCTYPE> fix,
not the change to the license comment
- weinre.web/demo/weinre-demo-strict.html, not in original commit,
added the <!DOCTYPE> fix
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..85e7c1d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.idea/
diff --git a/weinre.build/build.properties b/weinre.build/build.properties
index b4f629a..86eb81e 100644
--- a/weinre.build/build.properties
+++ b/weinre.build/build.properties
@@ -32,6 +32,7 @@
WEB: ../weinre.server/web
CACHED: cached
VENDOR: vendor
+VENDOR-OVERRIDE: vendor-override
#-----------------------------------------------------------
# project names used by the build scripts
diff --git a/weinre.build/update-vendor.xml b/weinre.build/update-vendor.xml
index 84eb496..7930260 100644
--- a/weinre.build/update-vendor.xml
+++ b/weinre.build/update-vendor.xml
@@ -32,6 +32,10 @@
<mkdir dir="${VENDOR}"/>
<antcall target="get-web-inspector"/>
+
+ <copy todir="${VENDOR}" overwrite="true">
+ <fileset dir="${VENDOR-OVERRIDE}/"/>
+ </copy>
</target>
<!-- ============================================================ -->
diff --git a/weinre.build/vendor-override/webkit/WebCore/inspector/InjectedScriptSource.js b/weinre.build/vendor-override/webkit/WebCore/inspector/InjectedScriptSource.js
new file mode 100644
index 0000000..25074ae
--- /dev/null
+++ b/weinre.build/vendor-override/webkit/WebCore/inspector/InjectedScriptSource.js
@@ -0,0 +1,788 @@
+/*
+ * Copyright (C) 2007 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+(function (InjectedScriptHost, inspectedWindow, injectedScriptId) {
+
+function bind(thisObject, memberFunction)
+{
+ var func = memberFunction;
+ var args = Array.prototype.slice.call(arguments, 2);
+ function bound()
+ {
+ return func.apply(thisObject, args.concat(Array.prototype.slice.call(arguments, 0)));
+ }
+ bound.toString = function() {
+ return "bound: " + func;
+ };
+ return bound;
+}
+
+var InjectedScript = function()
+{
+ this._lastBoundObjectId = 1;
+ this._idToWrappedObject = {};
+ this._objectGroups = {};
+}
+
+InjectedScript.prototype = {
+ wrapObjectForConsole: function(object, canAccessInspectedWindow)
+ {
+ if (canAccessInspectedWindow)
+ return this._wrapObject(object, "console");
+ var result = {};
+ result.type = typeof object;
+ result.description = this._toString(object);
+ return result;
+ },
+
+ _wrapObject: function(object, objectGroupName, abbreviate)
+ {
+ try {
+ var objectId;
+ if (typeof object === "object" || typeof object === "function" || this._isHTMLAllCollection(object)) {
+ var id = this._lastBoundObjectId++;
+ this._idToWrappedObject[id] = object;
+
+ var group = this._objectGroups[objectGroupName];
+ if (!group) {
+ group = [];
+ this._objectGroups[objectGroupName] = group;
+ }
+ group.push(id);
+ objectId = { injectedScriptId: injectedScriptId,
+ id: id,
+ groupName: objectGroupName };
+ }
+ return InjectedScript.RemoteObject.fromObject(object, objectId, abbreviate);
+ } catch (e) {
+ return InjectedScript.RemoteObject.fromObject("[ Exception: " + e.toString() + " ]");
+ }
+ },
+
+ _parseObjectId: function(objectId)
+ {
+ return eval("(" + objectId + ")");
+ },
+
+ releaseWrapperObjectGroup: function(objectGroupName)
+ {
+ var group = this._objectGroups[objectGroupName];
+ if (!group)
+ return;
+ for (var i = 0; i < group.length; i++)
+ delete this._idToWrappedObject[group[i]];
+ delete this._objectGroups[objectGroupName];
+ },
+
+ dispatch: function(methodName, args)
+ {
+ var argsArray = eval("(" + args + ")");
+ var result = this[methodName].apply(this, argsArray);
+ if (typeof result === "undefined") {
+ inspectedWindow.console.error("Web Inspector error: InjectedScript.%s returns undefined", methodName);
+ result = null;
+ }
+ return result;
+ },
+
+ getProperties: function(objectId, ignoreHasOwnProperty, abbreviate)
+ {
+ var parsedObjectId = this._parseObjectId(objectId);
+ var object = this._objectForId(parsedObjectId);
+
+ if (!this._isDefined(object))
+ return false;
+ var properties = [];
+ var propertyNames;
+
+ // IE returns 'Invalid calling object' for some of the prototypes, so return the object itself
+ if (window.navigator.userAgent.indexOf("MSIE") != -1 ) {
+ propertyNames = this._getPropertyNames(object);
+ } else
+ propertyNames = ignoreHasOwnProperty ? this._getPropertyNames(object) : Object.getOwnPropertyNames(object);
+
+
+ if (!ignoreHasOwnProperty && object.__proto__)
+ propertyNames.push("__proto__");
+
+ // Go over properties, prepare results.
+ for (var i = 0; i < propertyNames.length; ++i) {
+ var propertyName = propertyNames[i];
+
+ var property = {};
+ property.name = propertyName + "";
+ var isGetter = object["__lookupGetter__"] && object.__lookupGetter__(propertyName);
+ if (!isGetter) {
+ try {
+ property.value = this._wrapObject(object[propertyName], parsedObjectId.groupName, abbreviate);
+ } catch(e) {
+ property.value = new InjectedScript.RemoteObject.fromException(e);
+ }
+ } else {
+ // FIXME: this should show something like "getter" (bug 16734).
+ property.value = new InjectedScript.RemoteObject.fromObject("\u2014"); // em dash
+ property.isGetter = true;
+ }
+ properties.push(property);
+ }
+ return properties;
+ },
+
+ setPropertyValue: function(objectId, propertyName, expression)
+ {
+ var parsedObjectId = this._parseObjectId(objectId);
+ var object = this._objectForId(parsedObjectId);
+ if (!this._isDefined(object))
+ return false;
+
+ var expressionLength = expression.length;
+ if (!expressionLength) {
+ delete object[propertyName];
+ return !(propertyName in object);
+ }
+
+ try {
+ // Surround the expression in parenthesis so the result of the eval is the result
+ // of the whole expression not the last potential sub-expression.
+
+ // There is a regression introduced here: eval is now happening against global object,
+ // not call frame while on a breakpoint.
+ // TODO: bring evaluation against call frame back.
+ var result = inspectedWindow.eval("(" + expression + ")");
+ // Store the result in the property.
+ object[propertyName] = result;
+ return true;
+ } catch(e) {
+ try {
+ var result = inspectedWindow.eval("\"" + expression.replace(/"/g, "\\\"") + "\"");
+ object[propertyName] = result;
+ return true;
+ } catch(e) {
+ return false;
+ }
+ }
+ },
+
+ _populatePropertyNames: function(object, resultSet)
+ {
+ for (var o = object; o; o = Object.getPrototypeOf(o)) {
+ try {
+ var names = Object.getOwnPropertyNames(o);
+ for (var i = 0; i < names.length; ++i)
+ resultSet[names[i]] = true;
+ } catch (e) {
+ }
+ }
+ },
+
+ _getPropertyNames: function(object, resultSet)
+ {
+ var propertyNameSet = {};
+ this._populatePropertyNames(object, propertyNameSet);
+ return Object.keys(propertyNameSet);
+ },
+
+ getCompletions: function(expression, includeCommandLineAPI)
+ {
+ var props = {};
+ try {
+ if (!expression)
+ expression = "this";
+ var expressionResult = this._evaluateOn(inspectedWindow.eval, inspectedWindow, expression, false, false);
+
+ if (typeof expressionResult === "object")
+ this._populatePropertyNames(expressionResult, props);
+
+ if (includeCommandLineAPI) {
+ for (var prop in CommandLineAPI.members_)
+ props[CommandLineAPI.members_[prop]] = true;
+ }
+ } catch(e) {
+ }
+ return props;
+ },
+
+ getCompletionsOnCallFrame: function(callFrameId, expression, includeCommandLineAPI)
+ {
+ var props = {};
+ try {
+ var callFrame = this._callFrameForId(callFrameId);
+ if (!callFrame)
+ return props;
+
+ if (expression) {
+ var expressionResult = this._evaluateOn(callFrame.evaluate, callFrame, expression, true, false);
+ if (typeof expressionResult === "object")
+ this._populatePropertyNames(expressionResult, props);
+ } else {
+ // Evaluate into properties in scope of the selected call frame.
+ var scopeChain = callFrame.scopeChain;
+ for (var i = 0; i < scopeChain.length; ++i)
+ this._populatePropertyNames(scopeChain[i], props);
+ }
+
+ if (includeCommandLineAPI) {
+ for (var prop in CommandLineAPI.members_)
+ props[CommandLineAPI.members_[prop]] = true;
+ }
+ } catch(e) {
+ }
+ return props;
+ },
+
+ evaluate: function(expression, objectGroup, injectCommandLineAPI)
+ {
+ return this._evaluateAndWrap(inspectedWindow.eval, inspectedWindow, expression, objectGroup, false, injectCommandLineAPI);
+ },
+
+ _evaluateAndWrap: function(evalFunction, object, expression, objectGroup, isEvalOnCallFrame, injectCommandLineAPI)
+ {
+ try {
+ return this._wrapObject(this._evaluateOn(evalFunction, object, expression, isEvalOnCallFrame, injectCommandLineAPI), objectGroup);
+ } catch (e) {
+ return InjectedScript.RemoteObject.fromException(e);
+ }
+ },
+
+ _evaluateOn: function(evalFunction, object, expression, isEvalOnCallFrame, injectCommandLineAPI)
+ {
+ // Only install command line api object for the time of evaluation.
+ // Surround the expression in with statements to inject our command line API so that
+ // the window object properties still take more precedent than our API functions.
+
+ try {
+ if (injectCommandLineAPI && inspectedWindow.console) {
+ inspectedWindow.console._commandLineAPI = new CommandLineAPI(this._commandLineAPIImpl, isEvalOnCallFrame ? object : null);
+ expression = "with ((window && window.console && window.console._commandLineAPI) || {}) {\n" + expression + "\n}";
+ }
+
+ var value = evalFunction.call(object, expression);
+
+ // When evaluating on call frame error is not thrown, but returned as a value.
+ if (this._type(value) === "error")
+ throw value.toString();
+
+ return value;
+ } finally {
+ if (injectCommandLineAPI && inspectedWindow.console)
+ delete inspectedWindow.console._commandLineAPI;
+ }
+ },
+
+ getNodeId: function(node)
+ {
+ return InjectedScriptHost.pushNodePathToFrontend(node, false, false);
+ },
+
+ callFrames: function()
+ {
+ var callFrame = InjectedScriptHost.currentCallFrame();
+ if (!callFrame)
+ return false;
+
+ injectedScript.releaseWrapperObjectGroup("backtrace");
+ var result = [];
+ var depth = 0;
+ do {
+ result.push(new InjectedScript.CallFrameProxy(depth++, callFrame));
+ callFrame = callFrame.caller;
+ } while (callFrame);
+ return result;
+ },
+
+ evaluateOnCallFrame: function(callFrameId, expression, objectGroup, injectCommandLineAPI)
+ {
+ var callFrame = this._callFrameForId(callFrameId);
+ if (!callFrame)
+ return false;
+ return this._evaluateAndWrap(callFrame.evaluate, callFrame, expression, objectGroup, true, injectCommandLineAPI);
+ },
+
+ _callFrameForId: function(callFrameId)
+ {
+ var parsedCallFrameId = eval("(" + callFrameId + ")");
+ var ordinal = parsedCallFrameId.ordinal;
+ var callFrame = InjectedScriptHost.currentCallFrame();
+ while (--ordinal >= 0 && callFrame)
+ callFrame = callFrame.caller;
+ return callFrame;
+ },
+
+ _nodeForId: function(nodeId)
+ {
+ if (!nodeId)
+ return null;
+ return InjectedScriptHost.nodeForId(nodeId);
+ },
+
+ _objectForId: function(objectId)
+ {
+ return this._idToWrappedObject[objectId.id];
+ },
+
+ resolveNode: function(nodeId)
+ {
+ var node = this._nodeForId(nodeId);
+ if (!node)
+ return false;
+ // FIXME: receive the object group from client.
+ return this._wrapObject(node, "prototype");
+ },
+
+ getNodeProperties: function(nodeId, properties)
+ {
+ var node = this._nodeForId(nodeId);
+ if (!node)
+ return false;
+ properties = eval("(" + properties + ")");
+ var result = {};
+ for (var i = 0; i < properties.length; ++i)
+ result[properties[i]] = node[properties[i]];
+ return result;
+ },
+
+ getNodePrototypes: function(nodeId)
+ {
+ this.releaseWrapperObjectGroup("prototypes");
+ var node = this._nodeForId(nodeId);
+ if (!node)
+ return false;
+
+ var result = [];
+ var prototype = node;
+
+// if (window.navigator.userAgent.indexOf("MSIE") != -1 )
+// {
+// result.push(this._wrapObject(prototype, "prototypes"));
+// return result;
+// }
+
+ do {
+ result.push(this._wrapObject(prototype, "prototypes"));
+ prototype = Object.getPrototypeOf(prototype);
+ } while (prototype)
+ return result;
+ },
+
+ pushNodeToFrontend: function(objectId)
+ {
+ var parsedObjectId = this._parseObjectId(objectId);
+ var object = this._objectForId(parsedObjectId);
+ if (!object || this._type(object) !== "node")
+ return false;
+ return InjectedScriptHost.pushNodePathToFrontend(object, false, false);
+ },
+
+ evaluateOnSelf: function(funcBody, args)
+ {
+ var func = eval("(" + funcBody + ")");
+ return func.apply(this, eval("(" + args + ")") || []);
+ },
+
+ _isDefined: function(object)
+ {
+ return object || this._isHTMLAllCollection(object);
+ },
+
+ _isHTMLAllCollection: function(object)
+ {
+ // document.all is reported as undefined, but we still want to process it.
+ return (typeof object === "undefined") && inspectedWindow.HTMLAllCollection && object instanceof inspectedWindow.HTMLAllCollection;
+ },
+
+ _type: function(obj)
+ {
+ if (obj === null)
+ return "null";
+
+ var type = typeof obj;
+ if (type !== "object" && type !== "function") {
+ // FIXME(33716): typeof document.all is always 'undefined'.
+ if (this._isHTMLAllCollection(obj))
+ return "array";
+ return type;
+ }
+
+ // If owning frame has navigated to somewhere else window properties will be undefined.
+ // In this case just return result of the typeof.
+ if (!inspectedWindow.document)
+ return type;
+
+ if (obj instanceof inspectedWindow.Node) {
+
+ try {
+ return (obj.nodeType === undefined ? type : "node");
+ } catch (ex) {} // for IE there could be 'Invalid calling object' exception
+
+ return obj.toString();
+ }
+
+ if (obj instanceof inspectedWindow.String)
+ return "string";
+ if (obj instanceof inspectedWindow.Array)
+ return "array";
+ if (obj instanceof inspectedWindow.Boolean)
+ return "boolean";
+ if (obj instanceof inspectedWindow.Number)
+ return "number";
+ if (obj instanceof inspectedWindow.Date)
+ return "date";
+ if (obj instanceof inspectedWindow.RegExp)
+ return "regexp";
+ // FireBug's array detection.
+ if (isFinite(obj.length) && typeof obj.splice === "function")
+ return "array";
+ if (isFinite(obj.length) && typeof obj.callee === "function") // arguments.
+ return "array";
+ if (obj instanceof inspectedWindow.NodeList)
+ return "array";
+ if (obj instanceof inspectedWindow.HTMLCollection)
+ return "array";
+ if (obj instanceof inspectedWindow.Error)
+ return "error";
+ return type;
+ },
+
+ _describe: function(obj, abbreviated)
+ {
+ var type = this._type(obj);
+
+ switch (type) {
+ case "object":
+ case "node":
+ var result = InjectedScriptHost.internalConstructorName(obj);
+ if (result === "Object") {
+ // In Chromium DOM wrapper prototypes will have Object as their constructor name,
+ // get the real DOM wrapper name from the constructor property.
+ var constructorName = obj.constructor && obj.constructor.name;
+ if (constructorName)
+ return constructorName;
+ }
+ return result;
+ case "array":
+ var className = InjectedScriptHost.internalConstructorName(obj);
+ if (typeof obj.length === "number")
+ className += "[" + obj.length + "]";
+ return className;
+ case "string":
+ if (!abbreviated)
+ return obj;
+ if (obj.length > 100)
+ return "\"" + obj.substring(0, 100) + "\u2026\"";
+ return "\"" + obj + "\"";
+ case "function":
+ var objectText = this._toString(obj);
+ if (abbreviated)
+ objectText = /.*/.exec(objectText)[0].replace(/ +$/g, "");
+ return objectText;
+ default:
+ return this._toString(obj);
+ }
+ },
+
+ _toString: function(obj)
+ {
+ // We don't use String(obj) because inspectedWindow.String is undefined if owning frame navigated to another page.
+ return "" + obj;
+ }
+}
+
+var injectedScript = new InjectedScript();
+
+InjectedScript.RemoteObject = function(objectId, type, description, hasChildren)
+{
+ this.objectId = objectId;
+ this.type = type;
+ this.description = description;
+ this.hasChildren = hasChildren;
+}
+
+InjectedScript.RemoteObject.fromException = function(e)
+{
+ return new InjectedScript.RemoteObject(null, "error", e.toString());
+}
+
+InjectedScript.RemoteObject.fromObject = function(object, objectId, abbreviate)
+{
+ var type = injectedScript._type(object);
+ var rawType = typeof object;
+ var hasChildren = (rawType === "object" && object !== null && (Object.getOwnPropertyNames(object).length || !!Object.getPrototypeOf(object))) || rawType === "function";
+ var description = "";
+ try {
+ var description = injectedScript._describe(object, abbreviate);
+ return new InjectedScript.RemoteObject(objectId, type, description, hasChildren);
+ } catch (e) {
+ return InjectedScript.RemoteObject.fromException(e);
+ }
+}
+
+InjectedScript.CallFrameProxy = function(ordinal, callFrame)
+{
+ this.id = { ordinal: ordinal, injectedScriptId: injectedScriptId };
+ this.type = callFrame.type;
+ this.functionName = (this.type === "function" ? callFrame.functionName : "");
+ this.sourceID = callFrame.sourceID;
+ this.line = callFrame.line;
+ this.column = callFrame.column;
+ this.scopeChain = this._wrapScopeChain(callFrame);
+}
+
+InjectedScript.CallFrameProxy.prototype = {
+ _wrapScopeChain: function(callFrame)
+ {
+ var GLOBAL_SCOPE = 0;
+ var LOCAL_SCOPE = 1;
+ var WITH_SCOPE = 2;
+ var CLOSURE_SCOPE = 3;
+ var CATCH_SCOPE = 4;
+
+ var scopeChain = callFrame.scopeChain;
+ var scopeChainProxy = [];
+ var foundLocalScope = false;
+ for (var i = 0; i < scopeChain.length; i++) {
+ var scopeType = callFrame.scopeType(i);
+ var scopeObject = scopeChain[i];
+ var scopeObjectProxy = injectedScript._wrapObject(scopeObject, "backtrace", true);
+
+ switch(scopeType) {
+ case LOCAL_SCOPE: {
+ foundLocalScope = true;
+ scopeObjectProxy.isLocal = true;
+ scopeObjectProxy.thisObject = injectedScript._wrapObject(callFrame.thisObject, "backtrace", true);
+ break;
+ }
+ case CLOSURE_SCOPE: {
+ scopeObjectProxy.isClosure = true;
+ break;
+ }
+ case WITH_SCOPE:
+ case CATCH_SCOPE: {
+ if (foundLocalScope && scopeObject instanceof inspectedWindow.Element)
+ scopeObjectProxy.isElement = true;
+ else if (foundLocalScope && scopeObject instanceof inspectedWindow.Document)
+ scopeObjectProxy.isDocument = true;
+ else
+ scopeObjectProxy.isWithBlock = true;
+ break;
+ }
+ }
+ scopeChainProxy.push(scopeObjectProxy);
+ }
+ return scopeChainProxy;
+ }
+}
+
+function CommandLineAPI(commandLineAPIImpl, callFrame)
+{
+ function inScopeVariables(member)
+ {
+ if (!callFrame)
+ return false;
+
+ var scopeChain = callFrame.scopeChain;
+ for (var i = 0; i < scopeChain.length; ++i) {
+ if (member in scopeChain[i])
+ return true;
+ }
+ return false;
+ }
+
+ for (var i = 0; i < CommandLineAPI.members_.length; ++i) {
+ var member = CommandLineAPI.members_[i];
+ if (member in inspectedWindow || inScopeVariables(member))
+ continue;
+
+ this[member] = bind(commandLineAPIImpl, commandLineAPIImpl[member]);
+ }
+
+ for (var i = 0; i < 5; ++i) {
+ var member = "$" + i;
+ if (member in inspectedWindow || inScopeVariables(member))
+ continue;
+
+ // fix for non-webkit browsers
+ //this.__defineGetter__("$" + i, bind(commandLineAPIImpl, commandLineAPIImpl._inspectedNode, i));
+ Object.defineProperty(this, "$" + i, {
+ get: bind(commandLineAPIImpl, commandLineAPIImpl._inspectedNode, i)
+ });
+ }
+}
+
+CommandLineAPI.members_ = [
+ "$", "$$", "$x", "dir", "dirxml", "keys", "values", "profile", "profileEnd",
+ "monitorEvents", "unmonitorEvents", "inspect", "copy", "clear"
+];
+
+function CommandLineAPIImpl()
+{
+}
+
+CommandLineAPIImpl.prototype = {
+ $: function()
+ {
+ return document.getElementById.apply(document, arguments)
+ },
+
+ $$: function()
+ {
+ return document.querySelectorAll.apply(document, arguments)
+ },
+
+ $x: function(xpath, context)
+ {
+ var nodes = [];
+ try {
+ var doc = (context && context.ownerDocument) || inspectedWindow.document;
+ var results = doc.evaluate(xpath, context || doc, null, XPathResult.ANY_TYPE, null);
+ var node;
+ while (node = results.iterateNext())
+ nodes.push(node);
+ } catch (e) {
+ }
+ return nodes;
+ },
+
+ dir: function()
+ {
+ return console.dir.apply(console, arguments)
+ },
+
+ dirxml: function()
+ {
+ return console.dirxml.apply(console, arguments)
+ },
+
+ keys: function(object)
+ {
+ return Object.keys(object);
+ },
+
+ values: function(object)
+ {
+ var result = [];
+ for (var key in object)
+ result.push(object[key]);
+ return result;
+ },
+
+ profile: function()
+ {
+ return console.profile.apply(console, arguments)
+ },
+
+ profileEnd: function()
+ {
+ return console.profileEnd.apply(console, arguments)
+ },
+
+ monitorEvents: function(object, types)
+ {
+ if (!object || !object.addEventListener || !object.removeEventListener)
+ return;
+ types = this._normalizeEventTypes(types);
+ for (var i = 0; i < types.length; ++i) {
+ object.removeEventListener(types[i], this._logEvent, false);
+ object.addEventListener(types[i], this._logEvent, false);
+ }
+ },
+
+ unmonitorEvents: function(object, types)
+ {
+ if (!object || !object.addEventListener || !object.removeEventListener)
+ return;
+ types = this._normalizeEventTypes(types);
+ for (var i = 0; i < types.length; ++i)
+ object.removeEventListener(types[i], this._logEvent, false);
+ },
+
+ inspect: function(object)
+ {
+ if (arguments.length === 0)
+ return;
+
+ inspectedWindow.console.log(object);
+ if (injectedScript._type(object) === "node")
+ InjectedScriptHost.pushNodePathToFrontend(object, false, true);
+ else {
+ switch (injectedScript._describe(object)) {
+ case "Database":
+ InjectedScriptHost.selectDatabase(object);
+ break;
+ case "Storage":
+ InjectedScriptHost.selectDOMStorage(object);
+ break;
+ }
+ }
+ },
+
+ copy: function(object)
+ {
+ if (injectedScript._type(object) === "node")
+ object = object.outerHTML;
+ InjectedScriptHost.copyText(object);
+ },
+
+ clear: function()
+ {
+ InjectedScriptHost.clearConsoleMessages();
+ },
+
+ _inspectedNode: function(num)
+ {
+ var nodeId = InjectedScriptHost.inspectedNode(num);
+ return injectedScript._nodeForId(nodeId);
+ },
+
+ _normalizeEventTypes: function(types)
+ {
+ if (typeof types === "undefined")
+ types = [ "mouse", "key", "load", "unload", "abort", "error", "select", "change", "submit", "reset", "focus", "blur", "resize", "scroll" ];
+ else if (typeof types === "string")
+ types = [ types ];
+
+ var result = [];
+ for (var i = 0; i < types.length; i++) {
+ if (types[i] === "mouse")
+ result.splice(0, 0, "mousedown", "mouseup", "click", "dblclick", "mousemove", "mouseover", "mouseout");
+ else if (types[i] === "key")
+ result.splice(0, 0, "keydown", "keyup", "keypress");
+ else
+ result.push(types[i]);
+ }
+ return result;
+ },
+
+ _logEvent: function(event)
+ {
+ console.log(event.type, event);
+ }
+}
+
+injectedScript._commandLineAPIImpl = new CommandLineAPIImpl();
+return injectedScript;
+})
\ No newline at end of file
diff --git a/weinre.build/vendor/webkit/WebCore/inspector/InjectedScriptSource.js b/weinre.build/vendor/webkit/WebCore/inspector/InjectedScriptSource.js
index c88e8e4..25074ae 100644
--- a/weinre.build/vendor/webkit/WebCore/inspector/InjectedScriptSource.js
+++ b/weinre.build/vendor/webkit/WebCore/inspector/InjectedScriptSource.js
@@ -118,8 +118,15 @@
if (!this._isDefined(object))
return false;
var properties = [];
+ var propertyNames;
- var propertyNames = ignoreHasOwnProperty ? this._getPropertyNames(object) : Object.getOwnPropertyNames(object);
+ // IE returns 'Invalid calling object' for some of the prototypes, so return the object itself
+ if (window.navigator.userAgent.indexOf("MSIE") != -1 ) {
+ propertyNames = this._getPropertyNames(object);
+ } else
+ propertyNames = ignoreHasOwnProperty ? this._getPropertyNames(object) : Object.getOwnPropertyNames(object);
+
+
if (!ignoreHasOwnProperty && object.__proto__)
propertyNames.push("__proto__");
@@ -183,7 +190,7 @@
_populatePropertyNames: function(object, resultSet)
{
- for (var o = object; o; o = o.__proto__) {
+ for (var o = object; o; o = Object.getPrototypeOf(o)) {
try {
var names = Object.getOwnPropertyNames(o);
for (var i = 0; i < names.length; ++i)
@@ -368,9 +375,16 @@
var result = [];
var prototype = node;
+
+// if (window.navigator.userAgent.indexOf("MSIE") != -1 )
+// {
+// result.push(this._wrapObject(prototype, "prototypes"));
+// return result;
+// }
+
do {
result.push(this._wrapObject(prototype, "prototypes"));
- prototype = prototype.__proto__;
+ prototype = Object.getPrototypeOf(prototype);
} while (prototype)
return result;
},
@@ -419,8 +433,15 @@
if (!inspectedWindow.document)
return type;
- if (obj instanceof inspectedWindow.Node)
- return (obj.nodeType === undefined ? type : "node");
+ if (obj instanceof inspectedWindow.Node) {
+
+ try {
+ return (obj.nodeType === undefined ? type : "node");
+ } catch (ex) {} // for IE there could be 'Invalid calling object' exception
+
+ return obj.toString();
+ }
+
if (obj instanceof inspectedWindow.String)
return "string";
if (obj instanceof inspectedWindow.Array)
@@ -510,7 +531,7 @@
{
var type = injectedScript._type(object);
var rawType = typeof object;
- var hasChildren = (rawType === "object" && object !== null && (Object.getOwnPropertyNames(object).length || !!object.__proto__)) || rawType === "function";
+ var hasChildren = (rawType === "object" && object !== null && (Object.getOwnPropertyNames(object).length || !!Object.getPrototypeOf(object))) || rawType === "function";
var description = "";
try {
var description = injectedScript._describe(object, abbreviate);
@@ -534,11 +555,11 @@
InjectedScript.CallFrameProxy.prototype = {
_wrapScopeChain: function(callFrame)
{
- const GLOBAL_SCOPE = 0;
- const LOCAL_SCOPE = 1;
- const WITH_SCOPE = 2;
- const CLOSURE_SCOPE = 3;
- const CATCH_SCOPE = 4;
+ var GLOBAL_SCOPE = 0;
+ var LOCAL_SCOPE = 1;
+ var WITH_SCOPE = 2;
+ var CLOSURE_SCOPE = 3;
+ var CATCH_SCOPE = 4;
var scopeChain = callFrame.scopeChain;
var scopeChainProxy = [];
@@ -604,7 +625,11 @@
if (member in inspectedWindow || inScopeVariables(member))
continue;
- this.__defineGetter__("$" + i, bind(commandLineAPIImpl, commandLineAPIImpl._inspectedNode, i));
+ // fix for non-webkit browsers
+ //this.__defineGetter__("$" + i, bind(commandLineAPIImpl, commandLineAPIImpl._inspectedNode, i));
+ Object.defineProperty(this, "$" + i, {
+ get: bind(commandLineAPIImpl, commandLineAPIImpl._inspectedNode, i)
+ });
}
}
@@ -760,4 +785,4 @@
injectedScript._commandLineAPIImpl = new CommandLineAPIImpl();
return injectedScript;
-})
+})
\ No newline at end of file
diff --git a/weinre.web/demo/weinre-demo-min.html b/weinre.web/demo/weinre-demo-min.html
index 0da5e04..48af8d0 100644
--- a/weinre.web/demo/weinre-demo-min.html
+++ b/weinre.web/demo/weinre-demo-min.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git a/weinre.web/demo/weinre-demo-strict.html b/weinre.web/demo/weinre-demo-strict.html
index 58e13c8..292f8ef 100644
--- a/weinre.web/demo/weinre-demo-strict.html
+++ b/weinre.web/demo/weinre-demo-strict.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git a/weinre.web/demo/weinre-demo.html b/weinre.web/demo/weinre-demo.html
index 8f571fd..8517e4a 100644
--- a/weinre.web/demo/weinre-demo.html
+++ b/weinre.web/demo/weinre-demo.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git a/weinre.web/modules/weinre/common/HookLib.coffee b/weinre.web/modules/weinre/common/HookLib.coffee
index 45ecdac..4780dc3 100644
--- a/weinre.web/modules/weinre/common/HookLib.coffee
+++ b/weinre.web/modules/weinre/common/HookLib.coffee
@@ -68,8 +68,11 @@
@target = object[property]
@hookss = []
- hookedFunction = getHookedFunction(@target, this)
- object[property] = hookedFunction
+ if typeof @target == 'undefined'
+ return
+ else
+ hookedFunction = getHookedFunction(@target, this)
+ object[property] = hookedFunction
#---------------------------------------------------------------------------
addHooks: (hooks) ->
diff --git a/weinre.web/modules/weinre/target/BrowserHacks.coffee b/weinre.web/modules/weinre/target/BrowserHacks.coffee
new file mode 100644
index 0000000..3bbc41c
--- /dev/null
+++ b/weinre.web/modules/weinre/target/BrowserHacks.coffee
@@ -0,0 +1,23 @@
+# a place for browser specific hacks
+
+
+BrowserHacks = ->
+
+ # check for quirks mode
+ if typeof document.addEventListener is "undefined"
+ alert "Oops. It seems the page runs in compatibility mode. Please fix it and try again."
+ return
+
+ if typeof (window.Element) is "undefined"
+ window.Element = ->
+
+ if typeof (window.Node) is "undefined"
+ window.Node = ->
+
+ unless Object.getPrototypeOf
+ Object.getPrototypeOf = (object) ->
+ throw new Error("This vm does not support __proto__ and getPrototypeOf. Script requires any of them to operate correctly.") unless object.__proto__
+ object.__proto__
+ return
+
+BrowserHacks()
\ No newline at end of file
diff --git a/weinre.web/modules/weinre/target/CSSStore.coffee b/weinre.web/modules/weinre/target/CSSStore.coffee
index e2aa6b3..07c6017 100644
--- a/weinre.web/modules/weinre/target/CSSStore.coffee
+++ b/weinre.web/modules/weinre/target/CSSStore.coffee
@@ -225,8 +225,8 @@
name = styleDecl.item(i)
property.name = name
property.priority = styleDecl.getPropertyPriority(name)
- property.implicit = styleDecl.isPropertyImplicit(name)
- property.shorthandName = styleDecl.getPropertyShorthand(name) or ""
+ property.implicit = if (typeof styleDecl.isPropertyImplicit != "undefined") then styleDecl.isPropertyImplicit(name) else true
+ property.shorthandName = if (typeof styleDecl.getPropertyShorthand != "undefined") then (styleDecl.getPropertyShorthand(name) or "") else ""
property.status = (if property.shorthandName then "style" else "active")
property.parsedOk = true
property.value = styleDecl.getPropertyValue(name)
@@ -334,9 +334,13 @@
element.webkitMatchesSelector selector
#-------------------------------------------------------------------------------
+_msMatchesSelector = (element, selector) ->
+ return false unless element.msMatchesSelector
+ element.msMatchesSelector selector
+
+#-------------------------------------------------------------------------------
_fallbackMatchesSelector = (element, selector) ->
false
-
#-------------------------------------------------------------------------------
if (Element.prototype.webkitMatchesSelector)
_elementMatchesSelector = _webkitMatchesSelector
@@ -344,9 +348,10 @@
else if (Element.prototype.mozMatchesSelector)
_elementMatchesSelector = _mozMatchesSelector
+else if (Element.prototype.msMatchesSelector)
+ _elementMatchesSelector = _msMatchesSelector
else
_elementMatchesSelector = _fallbackMatchesSelector
#-------------------------------------------------------------------------------
require("../common/MethodNamer").setNamesForClass(module.exports)
-
diff --git a/weinre.web/modules/weinre/target/Console.coffee b/weinre.web/modules/weinre/target/Console.coffee
index 76576c3..6c7a99f 100644
--- a/weinre.web/modules/weinre/target/Console.coffee
+++ b/weinre.web/modules/weinre/target/Console.coffee
@@ -56,7 +56,8 @@
module.exports = class Console
#---------------------------------------------------------------------------
- Console::__defineGetter__("original", -> OriginalConsole)
+ Object.defineProperty Console, 'original',
+ get: -> OriginalConsole
#---------------------------------------------------------------------------
@useRemote: (value) ->
diff --git a/weinre.web/modules/weinre/target/Target.coffee b/weinre.web/modules/weinre/target/Target.coffee
index 70e7099..1a2fa52 100644
--- a/weinre.web/modules/weinre/target/Target.coffee
+++ b/weinre.web/modules/weinre/target/Target.coffee
@@ -18,6 +18,8 @@
# under the License.
#---------------------------------------------------------------------------------
+require('./BrowserHacks')
+
Ex = require('../common/Ex')
Binding = require('../common/Binding')
Callback = require('../common/Callback')
diff --git a/weinre.web/modules/weinre/target/Timeline.coffee b/weinre.web/modules/weinre/target/Timeline.coffee
index e774a1e..e86b036 100644
--- a/weinre.web/modules/weinre/target/Timeline.coffee
+++ b/weinre.web/modules/weinre/target/Timeline.coffee
@@ -186,7 +186,7 @@
#---------------------------------------------------------------------------
@installGlobalListeners: ->
- if applicationCache
+ if window.applicationCache
applicationCache.addEventListener "checking", ((e) -> Timeline.addRecord_EventDispatch e, "applicationCache.checking", "loading" ), false
applicationCache.addEventListener "error", ((e) -> Timeline.addRecord_EventDispatch e, "applicationCache.error", "loading" ), false
applicationCache.addEventListener "noupdate", ((e) -> Timeline.addRecord_EventDispatch e, "applicationCache.noupdate", "loading" ), false
