mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

do not stay idle while loading theme css

pull/428/merge
nightwing 2017-04-15 20:31:07 +04:00
rodzic 530d8dc934
commit c29c0b75e0
3 zmienionych plików z 15 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
plugins/c9.ide.layout.classic/layout.js
Wyświetl plik

@ -182,15 +182,13 @@ define(function(require, exports, module) {
emit("eachTheme", { changed: true });
setGeckoMask();
if (!oldTheme) return;
var auto = emit("themeChange", {
theme: theme,
oldTheme: oldTheme,
type: type
}) !== false;
if (noquestion) return;
if (!oldTheme || noquestion) return;
if (auto)
return emit("themeDefaults", { theme: theme, type: type });

7
plugins/c9.ide.layout.classic/preload.js
Wyświetl plik

@ -73,9 +73,10 @@ define(function(require, exports, module) {
});
preload(function(err) {
register(null, {
"layout.preload": plugin
});
});
register(null, {
"layout.preload": plugin
});
}
});

18
plugins/c9.ide.run/output.js
Wyświetl plik

@ -139,18 +139,20 @@ define(function(require, exports, module) {
settings.on("user/output", setSettings);
layout.on("themeChange", function(e) {
var skin = e.oldTheme;
if (!(settings.get("user/output/@backgroundColor") == defaults[skin][0] &&
settings.get("user/output/@foregroundColor") == defaults[skin][1] &&
settings.get("user/output/@selectionColor") == defaults[skin][2]))
var colors = defaults[e.oldTheme];
if (!colors) return;
if (!(settings.get("user/output/@backgroundColor") == colors[0] &&
settings.get("user/output/@foregroundColor") == colors[1] &&
settings.get("user/output/@selectionColor") == colors[2]))
return false;
});
layout.on("themeDefaults", function(e) {
var skin = e.theme;
settings.set("user/output/@backgroundColor", defaults[skin][0]);
settings.set("user/output/@foregroundColor", defaults[skin][1]);
settings.set("user/output/@selectionColor", defaults[skin][2]);
var colors = defaults[e.theme];
if (!colors) return;
settings.set("user/output/@backgroundColor", colors[0]);
settings.set("user/output/@foregroundColor", colors[1]);
settings.set("user/output/@selectionColor", colors[2]);
}, handle);
// Settings UI