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

Merge remote-tracking branch 'origin/master' into expression-prefix-regex

smf-sdk
Lennart Kats 2016-01-04 12:50:37 +01:00
rodzic 4d73e23759 095bf14bca
commit a4e6f89afa
3 zmienionych plików z 20 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
node_modules/architect/architect.js wygenerowano vendored
Wyświetl plik

@ -277,11 +277,9 @@ else (function () {
}); });
} }
function resolveConfig(config, base, callback) { function resolveConfig(config, base, callback, errback) {
if (typeof base == "function") { if (typeof base == "function")
callback = base; return resolveConfig(config, "", arguments[1], arguments[2]);
base = "";
}
var paths = [], pluginIndexes = {}; var paths = [], pluginIndexes = {};
config.forEach(function (plugin, index) { config.forEach(function (plugin, index) {
@ -306,7 +304,7 @@ else (function () {
plugin.consumes = module.consumes || []; plugin.consumes = module.consumes || [];
}); });
callback(null, config); callback(null, config);
}); }, errback);
} }
}()); }());

24
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{ {
"name": "c9", "name": "c9",
"description": "New Cloud9 Client", "description": "New Cloud9 Client",
"version": "3.1.878", "version": "3.1.893",
"author": "Ajax.org B.V. <info@ajax.org>", "author": "Ajax.org B.V. <info@ajax.org>",
"private": true, "private": true,
"main": "bin/c9", "main": "bin/c9",
@ -55,17 +55,17 @@
"c9" "c9"
], ],
"c9plugins": { "c9plugins": {
"c9.ide.language": "#8ac9160d84", "c9.ide.language": "#822cd7a1b7",
"c9.ide.language.css": "#36150db526", "c9.ide.language.css": "#be07d72209",
"c9.ide.language.generic": "#365368d108", "c9.ide.language.generic": "#2b5cc6275e",
"c9.ide.language.html": "#e7b5ab7ff8", "c9.ide.language.html": "#9be847c0ce",
"c9.ide.language.html.diff": "#24f3608d26", "c9.ide.language.html.diff": "#24f3608d26",
"c9.ide.language.javascript": "#1fd30cdf38", "c9.ide.language.javascript": "#1a0b1584c2",
"c9.ide.language.javascript.immediate": "#3e4f50e694", "c9.ide.language.javascript.immediate": "#c8b1e5767a",
"c9.ide.language.javascript.eslint": "#b3a4891ca7", "c9.ide.language.javascript.eslint": "#586becb51d",
"c9.ide.language.javascript.tern": "#e1e891d668", "c9.ide.language.javascript.tern": "#0e8ce89ae4",
"c9.ide.language.javascript.infer": "#7934f9b953", "c9.ide.language.javascript.infer": "#9cf94f77be",
"c9.ide.language.jsonalyzer": "#a5fdee90c9", "c9.ide.language.jsonalyzer": "#dbcb9d05a9",
"c9.ide.collab": "#10c224f9b8", "c9.ide.collab": "#10c224f9b8",
"c9.ide.local": "#a6e689e33b", "c9.ide.local": "#a6e689e33b",
"c9.ide.find": "#e33fbaed2f", "c9.ide.find": "#e33fbaed2f",
@ -90,7 +90,7 @@
"c9.ide.imgeditor": "#612e75ef4f", "c9.ide.imgeditor": "#612e75ef4f",
"c9.ide.immediate": "#a962119bec", "c9.ide.immediate": "#a962119bec",
"c9.ide.installer": "#0fde9f0067", "c9.ide.installer": "#0fde9f0067",
"c9.ide.language.python": "#8873b210ec", "c9.ide.language.python": "#3c9e641b9f",
"c9.ide.mount": "#befb8188d5", "c9.ide.mount": "#befb8188d5",
"c9.ide.navigate": "#38ae100ea1", "c9.ide.navigate": "#38ae100ea1",
"c9.ide.newresource": "#981a408a7b", "c9.ide.newresource": "#981a408a7b",

3
plugins/c9.vfs.standalone/views/standalone.html.ejs
Wyświetl plik

@ -109,6 +109,9 @@
if (window.hideLoader) if (window.hideLoader)
window.hideLoader(); window.hideLoader();
} }
}, function loadError(mod) {
if (mod.id === "plugins/c9.ide.clipboard/html5")
return alert("Unable to load html5.js.\n\nThis may be caused by a false positive in your virus scanner. Please try reloading with ?packed=1 added to the URL.");
}); });
}); });
</script> </script>