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

Merge pull request +11407 from c9/fix/various 

Fix several small issues related to run/preview
smf-sdk
Harutyun Amirjanyan 2016-01-06 21:16:48 +04:00
rodzic 0972dcb459 2b965228e5
commit f61e7c06a5
6 zmienionych plików z 26 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
node_modules/ace/lib/ace/edit_session.js wygenerowano vendored
Wyświetl plik

@ -1195,19 +1195,23 @@ EditSession.$uid = 0;
return isUndo ? delta.action !== "insert" : delta.action === "insert";
}
var delta = deltas[0];
var range, point;
var lastDeltaIsInsert = false;
if (isInsert(delta)) {
range = Range.fromPoints(delta.start, delta.end);
lastDeltaIsInsert = true;
} else {
range = Range.fromPoints(delta.start, delta.start);
lastDeltaIsInsert = false;
}
var lastDeltaIsInsert;
for (var i = 1; i < deltas.length; i++) {
delta = deltas[i];
var delta = deltas[i];
if (!delta.start) continue; // skip folds
if (!range) {
if (isInsert(delta)) {
range = Range.fromPoints(delta.start, delta.end);
lastDeltaIsInsert = true;
} else {
range = Range.fromPoints(delta.start, delta.start);
lastDeltaIsInsert = false;
}
continue;
}
if (isInsert(delta)) {
point = delta.start;
if (range.compare(point.row, point.column) == -1) {

8
package.json
Wyświetl plik

@ -96,20 +96,20 @@
"c9.ide.newresource": "#981a408a7b",
"c9.ide.openfiles": "#7fa4a97fed",
"c9.ide.preview": "#8f87ff2f6a",
"c9.ide.preview.browser": "#cec211a76a",
"c9.ide.preview.browser": "#c5b9a129de",
"c9.ide.preview.markdown": "#bc846e1562",
"c9.ide.pubsub": "#a85fb27eca",
"c9.ide.readonly": "#e67bb593bd",
"c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#301d2ab519",
"c9.ide.processlist": "#2b12cd1bdd",
"c9.ide.run": "#13a49e681a",
"c9.ide.run": "#d89ab4cd5a",
"c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#70aeb327c0",
"c9.ide.run.debug.xdebug": "#518f5a0c66",
"c9.ide.save": "#9461acd953",
"c9.ide.scm": "#930a9e6f00",
"c9.ide.terminal.monitor": "#e26502f0df",
"c9.ide.test": "#5b4c724bf6",
"c9.ide.test": "#8f21f662d3",
"c9.ide.test.mocha": "#fc053b23d2",
"c9.ide.theme.flat": "#92cda0fb40",
"c9.ide.threewaymerge": "#229382aa0b",

2
plugins/c9.ide.plugins/debug.js
Wyświetl plik

@ -43,7 +43,7 @@ define(function(require, exports, module) {
var plugins = [];
var ENABLED = c9.location.indexOf("debug=2") > -1;
var HASSDK = experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins");;
var HASSDK = ENABLED || experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins");
var reParts = /^(builders|keymaps|modes|outline|runners|snippets|themes)\/(.*)/;
var reModule = /(?:_highlight_rules|_test|_worker|_fold|_behaviou?r)\.js$/;

3
plugins/c9.ide.plugins/installer.js
Wyświetl plik

@ -27,7 +27,8 @@ define(function(require, exports, module) {
var plugin = new Plugin("Ajax.org", main.consumes);
var emit = plugin.getEmitter();
var HASSDK = experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins");
var DEBUG_MODE = c9.location.indexOf("debug=2") > -1;
var HASSDK = DEBUG_MODE || experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins");
var installing;

5
plugins/c9.ide.plugins/loader.js
Wyświetl plik

@ -28,8 +28,9 @@ define(function(require, exports, module) {
var plugin = new Plugin("Ajax.org", main.consumes);
// var emit = plugin.getEmitter();
var ENABLED = experimental.addExperiment("plugins", false, "SDK/Load Plugins From Workspace");
var HASSDK = experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins");
var DEBUG_MODE = c9.location.indexOf("debug=2") > -1;
var ENABLED = DEBUG_MODE || experimental.addExperiment("plugins", false, "SDK/Load Plugins From Workspace");
var HASSDK = DEBUG_MODE || experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins");
var plugins = options.plugins;
var loadFromDisk = options.loadFromDisk

3
plugins/c9.ide.plugins/packages.js
Wyświetl plik

@ -31,7 +31,8 @@ define(function(require, exports, module) {
var emit = handle.getEmitter();
emit.setMaxListeners(1000);
var HASSDK = experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins");
var DEBUG_MODE = c9.location.indexOf("debug=2") > -1;
var HASSDK = DEBUG_MODE || experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins");
function focusOpenPackages(){
var pages = tabs.getTabs();