LAB-linuxserver/core
1
0
Fork 0
mirror of https://github.com/linuxserver/core.git synced 2026-02-20 05:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request +12694 from c9/sdk

Browse Source 
Sdk prs and fixes
This commit is contained in:
Harutyun Amirjanyan 2016-03-09 19:16:07 +04:00
commit 7a6f978913
6 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@ -62,8 +62,8 @@
"c9.ide.language.html.diff": "#24f3608d26",
"c9.ide.language.javascript": "#d1a479805c",
"c9.ide.language.javascript.immediate": "#c8b1e5767a",
"c9.ide.language.javascript.eslint": "#132107aac3",
"c9.ide.language.javascript.tern": "#0c2f97f6fa",
"c9.ide.language.javascript.eslint": "#db65ba46be",
"c9.ide.language.javascript.tern": "#b55d0069bb",
"c9.ide.language.javascript.infer": "#325ac6880e",
"c9.ide.language.jsonalyzer": "#4b329741b1",
"c9.ide.language.codeintel": "#046d39603b",
@ -72,7 +72,7 @@
"c9.ide.find": "#e33fbaed2f",
"c9.ide.find.infiles": "#c0a13737ef",
"c9.ide.find.replace": "#8cbce45290",
"c9.ide.run.debug": "#6b34b5a2eb",
"c9.ide.run.debug": "#286975f644",
"c9.automate": "#47e2c429c9",
"c9.ide.ace.emmet": "#6dc4585e02",
"c9.ide.ace.gotoline": "#a8ff07c8f4",
@ -109,7 +109,7 @@
"c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#9956689819",
"c9.ide.save": "#86f0f38160",
"c9.ide.scm": "#ca3c94b84f",
"c9.ide.scm": "#c7385f7f7c",
"c9.ide.terminal.monitor": "#1a4092ede2",
"c9.ide.test": "#a282ec1619",
"c9.ide.test.mocha": "#fc053b23d2",

32
plugins/c9.cli/auth.bootstrap.js
View File

@ -8,7 +8,7 @@ define(function(require, exports, module) {
var http = imports.http;
var fs = require("fs");
var read = require("read");
var _read = require("read");
/***** Initialization *****/
@ -21,15 +21,35 @@ define(function(require, exports, module) {
/***** Methods *****/
function read(options, cb) {
_read(options, function(err, result) {
if (err && err.message == 'canceled') {
console.log("\n");
if (options.retry)
return process.exit(1);
else {
options.retry = 1;
console.log("(^C again to quit)");
return read(options, cb);
}
}
cb(err, result);
});
}
function readCredentials(callback){
read({
prompt: "Cloud9 Username:"
}, function(error, username) {
if (error) return callback(error);
if (!username) {
console.error("username is required");
return process.exit(1);
}
read({
prompt: "Password:",
silent: true
silent: true,
replace: "*"
}, function(error, password) {
if (error) return callback(error);
@ -64,7 +84,11 @@ define(function(require, exports, module) {
client_id: "cli"
}
}, function(err, token) {
if (err) return callback(err);
if (err) {
var message = /id="error_header">([^<]*)</.exec(err.message);
console.error(message ? message[1] : err.message || err, "\n");
return callback(err);
}
fs.writeFile(AUTHPATH, token, function(err){
if (err) return callback(err);

11
plugins/c9.core/util.js
View File

@ -375,7 +375,16 @@ define(function(require, exports, module) {
setTimeout(callback, 17);
};
plugin.freezePublicAPI({});
plugin.freezePublicAPI({
/**
* @ignore
*/
get supportedIcons(){ return SupportedIcons; },
/**
* @ignore
*/
set supportedIcons(value){ SupportedIcons = value; }
});
register(null, {
util: plugin

6
plugins/c9.ide.layout.classic/layout.js
View File

@ -214,7 +214,7 @@ define(function(require, exports, module) {
}
}
function proposeLayoutChange(kind, force, type) {
function proposeLayoutChange(kind, force, type, reset) {
if (!force && settings.getBool("user/general/@propose"))
return;
@ -225,7 +225,7 @@ define(function(require, exports, module) {
ignoreTheme = true;
var theme = {"dark": "flat-dark", "light": "flat-light"}[kind];
settings.set("user/general/@skin", theme);
updateTheme(false, type);
updateTheme(!!reset, type);
ignoreTheme = false;
settings.set("user/general/@propose", question.dontAsk);
},
@ -639,4 +639,4 @@ define(function(require, exports, module) {
layout: plugin
});
}
});
});

5
plugins/c9.ide.plugins/loader.js
View File

@ -66,7 +66,7 @@ define(function(require, exports, module) {
if (!extraPackages[p.packageName]) {
var path = "plugins/" + p.packageName;
extraPackages[path] = {
apiKey: p.apiKey,
apikey: p.apikey,
packagePath: path,
version: p.version,
name: p.packageName
@ -286,7 +286,8 @@ define(function(require, exports, module) {
plugin.packageMetadata = config.metadata;
plugin.packageDir = config.path;
plugin.apiKey = null; // FIXME
plugin.apikey = config.apikey;
plugin.version = config.version;
return plugin;
});

2
plugins/c9.ide.ui/forms.js
View File

@ -317,7 +317,7 @@ define(function(require, exports, module) {
childNodes = [
new ui.label({ width : width, maxwidth: maxwidth, caption: name + ":" }),
new ui.password({
skin: skins.textbox || "searchbox",
skin: skins.password || "forminput",
width: options.width || widths.password,
value: options.path
? createBind(options.path)