Selaa lähdekoodia

Elxr pull fixes.

master
pb 3 vuotta sitten
vanhempi
commit
6a26cda0b6
3 muutettua tiedostoa jossa 4791 lisäystä ja 1445 poistoa
  1. 2814
    0
      elxr.js
  2. 1967
    1435
      i.js
  3. 10
    10
      index.js

+ 2814
- 0
elxr.js
File diff suppressed because it is too large
Näytä tiedosto


+ 1967
- 1435
i.js
File diff suppressed because it is too large
Näytä tiedosto


+ 10
- 10
index.js Näytä tiedosto

@@ -2185,6 +2185,11 @@ var detectinstances = function () {

}

if(clioverrides.reconfirm) {
var reconfirm = { 'instanceName' : clioverrides['instanceName'] === 'chess' }
}
else { var reconfirm = {}; }

var getBoundEachPrompt = function(target, mustPrompt, promptables, choices) {
return function(prompts, k, i, a){
@@ -2209,7 +2214,7 @@ var getBoundEachPrompt = function(target, mustPrompt, promptables, choices) {
}
}

var __interactve_promts = function( target, choices ){
var __interactive_prompts = function( target, choices ){

Object.defineProperty(target, 'node_env', { get : function(){ return this.instanceType } });

@@ -2649,7 +2654,7 @@ acquireElevationState().then(() => {
chessinstances[instanceName][node_env]
, clioverrides
, selected_overrides
// , __interactve_promts -- Cant just override. Also need selectedinstance to be ready...
// , __interactive_prompts -- Cant just override. Also need selectedinstance to be ready...
);

// chessinstances[instanceName] = chessinstances[instanceName] || {}
@@ -2766,25 +2771,20 @@ acquireElevationState().then(() => {
selectedinstance = utils.assign( ...detectedinstanceoptions.slice(-2) )
promptkeys = utils.assign(promptkeys, clioverrides)
if(clioverrides.reconfirm) {
var reconfirm = { 'instanceName' : selectedinstance['instanceName'] === 'chess' }
}
else { var reconfirm = {}; }
try {

chessinstances = acquirelocalinstances(selectedinstance);
findlocalinstances(chessinstances, detectedinstanceoptions)
initinstances(selectedinstance) // use the local instances for defaults if at all possible.
var choices = getchoices(detectedinstanceoptions, promptkeys)
var todo = any( __interactve_promts(selectedinstance, choices) ).then(()=>{
var todo = any( __interactive_prompts(selectedinstance, choices) ).then(()=>{
return initinstances(selectedinstance)
})
}
catch (e) {
// PB : TODO -- verbose mode warning.. console.warn(e) // Missing chessinstances is not an error...
var choices = getchoices(detectedinstanceoptions, promptkeys)
var todo = any( __interactve_promts(selectedinstance, choices) ).then(()=>{
var todo = any( __interactive_prompts(selectedinstance, choices) ).then(()=>{
return initinstances(selectedinstance)
})


Loading…
Peruuta
Tallenna