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 revert-11326-revert-refactoring 

Conflicts:
	plugins/c9.ide.language.python/python.js
	plugins/c9.ide.language.python/worker/python_linter.js
smf-sdk
Lennart kats 2016-01-01 22:37:00 +00:00
rodzic 3da57b8012 eaca2c3e59
commit a3cf0665f7
8 zmienionych plików z 69 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
node_modules/ace/lib/ace/lib/lang.js wygenerowano vendored
Wyświetl plik

@ -74,7 +74,7 @@ exports.copyArray = function(array){
var copy = [];
for (var i=0, l=array.length; i<l; i++) {
if (array[i] && typeof array[i] == "object")
copy[i] = this.copyObject( array[i] );
copy[i] = this.copyObject(array[i]);
else
copy[i] = array[i];
}
@ -92,14 +92,12 @@ exports.deepCopy = function deepCopy(obj) {
}
return copy;
}
var cons = obj.constructor;
if (cons === RegExp)
if (Object.prototype.toString.call(obj) !== "[object Object]")
return obj;
copy = cons();
for (var key in obj) {
copy = {};
for (var key in obj)
copy[key] = deepCopy(obj[key]);
}
return copy;
};

5
node_modules/ace/lib/ace/mode/_test/text_javascript.txt wygenerowano vendored
Wyświetl plik

@ -93,3 +93,8 @@ z=<div {...this.props} x={1 + 2} y="z{a}b&amp;" t={
1 <a> { ++x } </a>
</div>
var o = {
t:`${[].map(x => {
return x
})}`
};

42
node_modules/ace/lib/ace/mode/_test/tokens_javascript.json wygenerowano vendored
Wyświetl plik

@ -686,5 +686,45 @@
],[
"start"
],[
"start"
"start",
["storage.type","var"],
["text"," "],
["identifier","o"],
["text"," "],
["keyword.operator","="],
["text"," "],
["paren.lparen","{"]
],[
["start","no_regex","start","string.quasi.start","string.quasi.start","no_regex"],
["text"," "],
["identifier","t"],
["punctuation.operator",":"],
["string.quasi.start","`"],
["paren.quasi.start","${"],
["paren.lparen","["],
["paren.rparen","]"],
["punctuation.operator","."],
["identifier","map"],
["paren.lparen","("],
["identifier","x"],
["text"," "],
["keyword.operator","=>"],
["text"," "],
["paren.lparen","{"]
],[
["#tmp","no_regex","start","no_regex","start","string.quasi.start","string.quasi.start","no_regex"],
["text"," "],
["keyword","return"],
["text"," "],
["identifier","x"]
],[
"no_regex",
["text"," "],
["paren.rparen","})"],
["paren.quasi.end","}"],
["string.quasi.end","`"]
],[
"start",
["paren.rparen","}"],
["punctuation.operator",";"]
]]

3
node_modules/ace/lib/ace/mode/javascript_highlight_rules.js wygenerowano vendored
Wyświetl plik

@ -354,9 +354,8 @@ var JavaScriptHighlightRules = function(options) {
this.next = val == "{" ? this.nextState : "";
if (val == "{" && stack.length) {
stack.unshift("start", state);
return "paren";
}
if (val == "}" && stack.length) {
else if (val == "}" && stack.length) {
stack.shift();
this.next = stack.shift();
if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1)

1
node_modules/ace/lib/ace/virtual_renderer.js wygenerowano vendored
Wyświetl plik

@ -245,6 +245,7 @@ var VirtualRenderer = function(container, theme) {
this.$loop.schedule(this.CHANGE_FULL);
// this.session.$setFontMetrics(this.$fontMetrics);
this.scrollBarV.scrollLeft = this.scrollBarV.scrollTop = null;
this.onChangeNewLineMode = this.onChangeNewLineMode.bind(this);
this.onChangeNewLineMode()

10
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.872",
"version": "3.1.878",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",
@ -65,8 +65,8 @@
"c9.ide.language.javascript.eslint": "#586becb51d",
"c9.ide.language.javascript.tern": "#b03b4dc50b",
"c9.ide.language.javascript.infer": "#001fe08ecb",
"c9.ide.language.jsonalyzer": "#f3c2f606f8",
"c9.ide.collab": "#30efed939e",
"c9.ide.language.jsonalyzer": "#463976e0a0",
"c9.ide.collab": "#10c224f9b8",
"c9.ide.local": "#a6e689e33b",
"c9.ide.find": "#e33fbaed2f",
"c9.ide.find.infiles": "#c3bf17286d",
@ -90,7 +90,7 @@
"c9.ide.imgeditor": "#612e75ef4f",
"c9.ide.immediate": "#a962119bec",
"c9.ide.installer": "#0fde9f0067",
"c9.ide.language.python": "#6fe0137f39",
"c9.ide.language.python": "#4e1bc7688c",
"c9.ide.mount": "#befb8188d5",
"c9.ide.navigate": "#38ae100ea1",
"c9.ide.newresource": "#981a408a7b",
@ -103,7 +103,7 @@
"c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#301d2ab519",
"c9.ide.processlist": "#2b12cd1bdd",
"c9.ide.run": "#d37ffe17d5",
"c9.ide.run": "#e449c6c0f8",
"c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#70aeb327c0",
"c9.ide.save": "#9461acd953",

12
plugins/c9.fs/fs.cache.xml.js
Wyświetl plik

@ -629,6 +629,14 @@ define(function(require, exports, module) {
});
} else if (key === "children" || key === "isSelected") {
prop = null;
} else if (Object.prototype.toString.call(node[key]) == "[object Date]") {
// why Date ends up here?
reportError(new Error("Date in fs cache"), {
key: key,
value: node[key],
path: node.path,
hasParentProp: !!node.parent,
});
} else {
prop = lang.deepCopy(node[key]);
}
@ -637,9 +645,9 @@ define(function(require, exports, module) {
return copy;
}
function clear(){
function clear() {
var all = model.visibleItems;
for (var i = all.length; i--; ) {
for (var i = all.length; i--;) {
if (model.isOpen(all[i]))
model.collapse(all[i]);
}

4
plugins/c9.ide.terminal/aceterm/input.js
Wyświetl plik

@ -68,10 +68,10 @@ define(function(require, exports, module) {
bindKey: {win: "Ctrl-Delete", mac: "Option-Delete"},
name: "\u001bd" // "alt-d"
}, {
bindKey: {win: "Alt-Backspace|Shift-Backspace", mac: "Ctrl-Backspace|Shift-Backspace"},
bindKey: {win: "Alt-Backspace", mac: "Ctrl-Backspace"},
name: "\u0015" // "ctrl-u"
}, {
bindKey: {win: "Alt-Delete|Shift-Delete", mac: "Ctrl-Delete|Shift-Delete"},
bindKey: {win: "Alt-Delete", mac: "Ctrl-Delete"},
name: "\u000b" // "ctrl-k"
}, {
bindKey: {win: "Ctrl-z", mac: "Cmd-z"},