Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: zhizhangchen/brackets
...
head fork: zhizhangchen/brackets
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
7 src/LiveDevelopment/Agents/CSSAgent.js
@@ -36,6 +36,7 @@ define(function CSSAgent(require, exports, module) {
require("thirdparty/path-utils/path-utils.min");
var Inspector = require("LiveDevelopment/Inspector/Inspector");
+ var DocumentManager = require("document/DocumentManager");
var _load; // {$.Deferred} load promise
var _urlToStyle; // {url -> loaded} style definition
@@ -51,6 +52,7 @@ define(function CSSAgent(require, exports, module) {
// WebInspector Event: Runtime.loadEventFired
function _onLoadingFinished(event, res) {
+ var doc = DocumentManager.getCurrentDocument();
_urlToStyle = {};
Inspector.CSS.getAllStyleSheets(function onGetAllStyleSheets(res) {
var i, header;
@@ -59,7 +61,10 @@ define(function CSSAgent(require, exports, module) {
_urlToStyle[_canonicalize(header.sourceURL)] = header;
}
_load.resolve();
+ if (doc.extension === "css")
+ reloadCSSForDocument(doc);
});
+
}
/** Get a style sheet for a url
@@ -85,6 +90,8 @@ define(function CSSAgent(require, exports, module) {
*/
function reloadCSSForDocument(doc) {
var style = styleForURL(doc.url);
+ if (!style)
+ return;
console.assert(style, "Style Sheet for document not loaded: " + doc.url);
Inspector.CSS.setStyleSheetText(style.styleSheetId, doc.getText(true));
}
View
2  src/extensions/default/devices/EmulatorServer.js
@@ -148,7 +148,7 @@ everyone.now.startProject = function(device, projectRoot, callback){
child_process.exec("web-packaging", function (err, stdout, stderr) {
console.log(stdout);
console.log(stderr);
- _execDeviceCommand("shell mdkir -p " + projectInfo.TEST_WIDGETS_DIR, function () {
+ _execDeviceCommand("shell mkdir -p " + projectInfo.TEST_WIDGETS_DIR, function () {
_execDeviceCommand("push " + pkgName + " "+ projectInfo.tmpPkg, function(err, stdout, stderr) {
process.chdir(cwd);
console.log(stdout);
2  src/extensions/default/everyscrub
@@ -1 +1 @@
-Subproject commit 8a97ed976bc69e0150f4a4b8f3a77d4b18a7211a
+Subproject commit d6d8bbd4f2517bfcb164579b730032ac4b6ef421
View
8 src/node-webkit_shell.js
@@ -355,6 +355,14 @@ function OpenLiveBrowser(callback, url, enableRemoteDebugging){
"minimize" : true,
"dblclick": "collapse"
});
+ iframe.load( function () {
+ iframe.contents().find("#noVNC_canvas").click( function () {
+ iframe[0].contentWindow.focus();
+ })
+ $(window).click(function () {
+ window.focus();
+ })
+ })
$(Inspector).off('connect.RemoteEmulator');
$(Inspector).on('connect.RemoteEmulator', function () {
this.dialog("open");
2  src/thirdparty/CodeMirror2
@@ -1 +1 @@
-Subproject commit c99ffd13eff8256e58bf77b4eefbf9d95ed8f705
+Subproject commit 04d8fc6e48b9214a08d806e0fe8acbe7b119045c

No commit comments for this range

Something went wrong with that request. Please try again.