-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Conversation
Update Live Development branch to master.
Made GotoAgent focus the editor
… after jumping and prevents it from being removed after 1s when the flash is over)
This stuff should probably go to brackets...
…into live-development
Conflicts: src/LiveDevelopment/Agents/GotoAgent.js src/LiveDevelopment/Documents/HTMLDocument.js src/LiveDevelopment/Documents/JSDocument.js src/LiveDevelopment/Inspector/Inspector.json src/LiveDevelopment/Inspector/inspector.html src/LiveDevelopment/LiveDevelopment.js
…into live-development
_makeJSTarget(targets, trace.children[0].callFrames[0]); | ||
} | ||
} | ||
for (i in res.matchedCSSRules.reverse()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line reverses the order of CSS rules in the browser menu, which represents the natural order of CSS rules from most to least precise.
case "js": | ||
return JSDocument; | ||
return exports.config.experimental ? JSDocument : null; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
JSDocument & HTMLDocument are only returned if the experimental flag is set.
@@ -249,6 +245,10 @@ define(function LiveDevelopment(require, exports, module) { | |||
/** Load the agents */ | |||
function loadAgents() { | |||
var name, promises = []; | |||
if (exports.config.experimental) { | |||
// load all agents | |||
_enabledAgentNames = agents; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will lead to unexpected behavior. _enabledAgentNames becomes an alias for agents, so any time enableAgent() or disableAgent() is called, it will be changing the agents objects in addition to the _enabledAgentNames object. It would be better to iterate through the agents object and make sure all entries in the agents object have a corresponding entry in _enabledAgentNames.
Thanks for the annotations in the pull request! I had couple comments, but everything else looks great. |
Github ate your comments when I fixed them!
|
LiveDevelopment = require("LiveDevelopment/LiveDevelopment"), | ||
Inspector = require("LiveDevelopment/Inspector/Inspector"), | ||
CommandManager = require("command/CommandManager"), | ||
Strings = require("strings"); | ||
|
||
var config = { | ||
experimental: true, // enable experimental features |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoops, I don't think you meant to set this to true for the pull request.
Yeah, GitHub has a new "feature" that automatically hides comments if the line of code that was commented on has changed. You can still get to these comments by clicking "View outdated diff" |
Whoops, sorry about including the experimental and autoconnect flags. I removed than and hopefully the pull request is all set now. Thanks for looking at the changes to quickly! |
Looks good! Thanks. Merging. |
This pull request adds all extra features from the live-development branch, but only enables them if the experimental and autoconnect flags are set in LiveDevelopment/main.js. If this is merged into master, we can get rid of the live-development branch.
Additionally, there are some minor bug fixes and extensions to live-development that have no effect on the productive environment.