Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/LiveDevelopment/Agents/CSSAgent.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50, forin: true */
/*global define, $, PathUtils */

/**
Expand Down
3 changes: 2 additions & 1 deletion src/LiveDevelopment/Agents/ConsoleAgent.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50 */
/*global define, $ */

/**
Expand Down Expand Up @@ -70,6 +70,7 @@ define(function ConsoleAgent(require, exports, module) {
// WebInspector Event: Console.messagesCleared
function _onMessagesCleared(event, res) {
// res = {}
return undefined;
}

/**
Expand Down
20 changes: 6 additions & 14 deletions src/LiveDevelopment/Agents/DOMAgent.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50 */
/*global define, $, XMLHttpRequest */

/**
Expand All @@ -40,11 +40,10 @@ define(function DOMAgent(require, exports, module) {

var $exports = $(exports);

var Inspector = require("LiveDevelopment/Inspector/Inspector");
var RemoteAgent = require("LiveDevelopment/Agents/RemoteAgent");
var EditAgent = require("LiveDevelopment/Agents/EditAgent");
var DOMNode = require("LiveDevelopment/Agents/DOMNode");
var DOMHelpers = require("LiveDevelopment/Agents/DOMHelpers");
var Inspector = require("LiveDevelopment/Inspector/Inspector"),
EditAgent = require("LiveDevelopment/Agents/EditAgent"),
DOMNode = require("LiveDevelopment/Agents/DOMNode"),
DOMHelpers = require("LiveDevelopment/Agents/DOMHelpers");

var _load; // {$.Deferred} load promise
var _idToNode; // {nodeId -> node}
Expand Down Expand Up @@ -123,14 +122,6 @@ define(function DOMAgent(require, exports, module) {
Inspector.DOM.requestChildNodes(node.nodeId);
}

/** Resolve a node
* @param {DOMNode} node
*/
function resolveNode(node, callback) {
console.assert(node.nodeId, "Attempted to resolve node without id");
Inspector.DOM.resolveNode(node.nodeId, callback);
}

/** Eliminate the query string from a URL
* @param {string} URL
*/
Expand Down Expand Up @@ -217,6 +208,7 @@ define(function DOMAgent(require, exports, module) {
// WebInspector Event: DOM.documentUpdated
function _onDocumentUpdated(event, res) {
// res = {}
return undefined;
}

// WebInspector Event: DOM.setChildNodes
Expand Down
3 changes: 1 addition & 2 deletions src/LiveDevelopment/Agents/DOMHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50, regexp: true */
/*global define, $ */

/**
Expand Down Expand Up @@ -230,7 +230,6 @@ define(function DOMHelpersModule(require, exports, module) {
function eachNode(src, callback) {
var index = 0;
var text, range, length, payload;
var x = 0;
while (index < src.length) {

// find the next tag
Expand Down
18 changes: 12 additions & 6 deletions src/LiveDevelopment/Agents/DOMNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50, forin: true */
/*global define, $ */

/**
Expand Down Expand Up @@ -93,11 +93,17 @@ define(function DOMNodeModule(require, exports, module) {
this.agent.addNode(this);
};

var TYPE_ELEMENT = DOMNode.TYPE_ELEMENT = 1; // element node
var TYPE_ATTRIBUTE = DOMNode.TYPE_ATTRIBUTE = 2; // attribute node (unused)
var TYPE_TEXT = DOMNode.TYPE_TEXT = 3; // text node
var TYPE_COMMENT = DOMNode.TYPE_COMMENT = 8; // comment node <!-- -->
var TYPE_DOCUMENT = DOMNode.TYPE_DOCUMENT = 9; // document node <!DOCUMENT>
var TYPE_ELEMENT = 1, // element node
TYPE_ATTRIBUTE = 2, // attribute node (unused)
TYPE_TEXT = 3, // text node
TYPE_COMMENT = 8, // comment node <!-- -->
TYPE_DOCUMENT = 9; // document node <!DOCUMENT>

DOMNode.TYPE_ELEMENT = TYPE_ELEMENT;
DOMNode.TYPE_ATTRIBUTE = TYPE_ATTRIBUTE;
DOMNode.TYPE_TEXT = TYPE_TEXT;
DOMNode.TYPE_COMMENT = TYPE_COMMENT;
DOMNode.TYPE_DOCUMENT = TYPE_DOCUMENT;

/** Remove a node */
DOMNode.prototype.remove = function remove() {
Expand Down
2 changes: 1 addition & 1 deletion src/LiveDevelopment/Agents/EditAgent.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50 */
/*global define, $ */

/**
Expand Down
9 changes: 3 additions & 6 deletions src/LiveDevelopment/Agents/GotoAgent.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50, regexp: true, forin: true */
/*global define, brackets, $, window */

/**
Expand Down Expand Up @@ -66,7 +66,6 @@ define(function GotoAgent(require, exports, module) {
*/
function _makeHTMLTarget(targets, node) {
if (node.location) {
var target = {};
var url = DOMAgent.url;
var location = node.location;
if (node.canHaveChildren()) {
Expand All @@ -85,7 +84,6 @@ define(function GotoAgent(require, exports, module) {
*/
function _makeCSSTarget(targets, rule) {
if (rule.sourceURL) {
var target = {};
var url = rule.sourceURL;
url += ":" + rule.style.range.start;
var name = rule.selectorList.text;
Expand All @@ -101,7 +99,6 @@ define(function GotoAgent(require, exports, module) {
function _makeJSTarget(targets, callFrame) {
var script = ScriptAgent.scriptWithId(callFrame.location.scriptId);
if (script && script.url) {
var target = {};
var url = script.url;
url += ":" + callFrame.location.lineNumber + "," + callFrame.location.columnNumber;
var name = callFrame.functionName;
Expand All @@ -120,13 +117,13 @@ define(function GotoAgent(require, exports, module) {

// get all css rules that apply to the given node
Inspector.CSS.getMatchedStylesForNode(node.nodeId, function onMatchedStyles(res) {
var i, callFrame, name, script, url, rule, targets = [];
var i, trace, targets = [];
_makeHTMLTarget(targets, node);
for (i in node.trace) {
_makeJSTarget(targets, node.trace[i]);
}
for (i in node.events) {
var trace = node.events[i];
trace = node.events[i];
_makeJSTarget(targets, trace.callFrames[0]);
}
for (i in res.matchedCSSRules.reverse()) {
Expand Down
2 changes: 1 addition & 1 deletion src/LiveDevelopment/Agents/HighlightAgent.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50 */
/*global define, $ */

/**
Expand Down
2 changes: 1 addition & 1 deletion src/LiveDevelopment/Agents/NetworkAgent.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50 */
/*global define, $ */

/**
Expand Down
2 changes: 1 addition & 1 deletion src/LiveDevelopment/Agents/RemoteAgent.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50, regexp: true, forin: true */
/*global define, $, XMLHttpRequest, window */

/**
Expand Down
10 changes: 4 additions & 6 deletions src/LiveDevelopment/Agents/RemoteFunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, browser: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50, regexp: true, forin: true */
/*global define, $, window, document, navigator */

/**
Expand All @@ -43,10 +43,9 @@ function RemoteFunctions(experimental) {
if (navigator.platform.substr(0, 3) === "Mac") {
// Mac
return event.metaKey;
} else {
// Windows
return event.ctrlKey;
}
// Windows
return event.ctrlKey;
}

// determine the color for a type
Expand All @@ -68,9 +67,8 @@ function RemoteFunctions(experimental) {
var bounds = element.getBoundingClientRect();
if (key === "offsetLeft") {
return bounds.left + window.pageXOffset;
} else {
return bounds.top + window.pageYOffset;
}
return bounds.top + window.pageYOffset;
}

// set an event on a element
Expand Down
11 changes: 2 additions & 9 deletions src/LiveDevelopment/Agents/ScriptAgent.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50 */
/*global define, $ */

/**
Expand All @@ -40,14 +40,6 @@ define(function ScriptAgent(require, exports, module) {
var _idToScript; // id -> script info
var _insertTrace; // the last recorded trace of a DOM insertion

/** Add a call stack trace to a node
* @param {integer} node id
* @param [{Debugger.CallFrame}] call stack
*/
function _addTraceToNode(nodeId, trace) {
var node = DOMAgent.nodeWithId(nodeId);
node.trace = trace;
}

// TODO: should the parameter to this be an ID rather than a URL?
/** Get the script information for a given url
Expand Down Expand Up @@ -92,6 +84,7 @@ define(function ScriptAgent(require, exports, module) {
// WebInspector Event: Debugger.scriptFailedToParse
function _onScriptFailedToParse(event, res) {
// res = {url, scriptSource, startLine, errorLine, errorMessage}
return undefined;
}

// WebInspector Event: Debugger.paused
Expand Down
2 changes: 1 addition & 1 deletion src/LiveDevelopment/Documents/CSSDocument.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50, forin: true */
/*global define, $ */

/**
Expand Down
12 changes: 7 additions & 5 deletions src/LiveDevelopment/Documents/HTMLDocument.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50 */
/*global define, $ */

/**
Expand Down Expand Up @@ -149,14 +149,16 @@ define(function HTMLDocumentModule(require, exports, module) {

/** Triggered on change by the editor */
HTMLDocument.prototype.onChange = function onChange(event, editor, change) {
var from, to, text, codeMirror;
if (!this.editor) {
return;
}
var codeMirror = this.editor._codeMirror;

codeMirror = this.editor._codeMirror;
while (change) {
var from = codeMirror.indexFromPos(change.from);
var to = codeMirror.indexFromPos(change.to);
var text = change.text.join("\n");
from = codeMirror.indexFromPos(change.from);
to = codeMirror.indexFromPos(change.to);
text = change.text.join("\n");
DOMAgent.applyChange(from, to, text);
change = change.next;
}
Expand Down
3 changes: 2 additions & 1 deletion src/LiveDevelopment/Documents/JSDocument.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50, forin: true */
/*global define, $ */

/**
Expand Down Expand Up @@ -88,6 +88,7 @@ define(function JSDocumentModule(require, exports, module) {

/** Triggered on cursor activity by the editor */
JSDocument.prototype.onCursorActivity = function onCursorActivity(event, editor) {
return undefined;
};

/** Triggered on change by the editor */
Expand Down
5 changes: 2 additions & 3 deletions src/LiveDevelopment/Inspector/Inspector.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
*/



/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50, forin: true */
/*global define, $, WebSocket, FileError, window, XMLHttpRequest */

/**
Expand Down Expand Up @@ -343,7 +342,7 @@ define(function Inspector(require, exports, module) {
var InspectorText = require("text!LiveDevelopment/Inspector/Inspector.json"),
InspectorJSON = JSON.parse(InspectorText);

var i, j, domain, domainDef, command;
var i, j, domain, command;
for (i in InspectorJSON.domains) {
domain = InspectorJSON.domains[i];
exports[domain.domain] = {};
Expand Down
12 changes: 4 additions & 8 deletions src/LiveDevelopment/LiveDevServerManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
*
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, todo: true, unparam: true, indent: 4, maxerr: 50 */
/*global define */

/*
* LiveDevServerManager Overview:
*
Expand Down Expand Up @@ -84,17 +88,9 @@
* return {jQuery.Promise}
*
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
/*global define */

define(function (require, exports, module) {
"use strict";

var FileUtils = require("file/FileUtils"),
ProjectManager = require("project/ProjectManager");

var _serverProviders = [];

/**
Expand Down
Loading