mirror of
https://github.com/samsonjs/Mojo.Ext.git
synced 2026-03-25 09:25:46 +00:00
[FIXED] SceneAssistantBase and Mojo.Log.pp.
This commit is contained in:
parent
5eb3b5d88b
commit
2c743f4370
2 changed files with 24 additions and 15 deletions
|
|
@ -12,54 +12,54 @@ Mojo.Log.pp = function(x, indent, key) {
|
|||
switch (typeOf(x)) {
|
||||
case 'object':
|
||||
if (key) {
|
||||
print(space + key + ': {');
|
||||
Mojo.Log.info(space + key + ': {');
|
||||
}
|
||||
else {
|
||||
print(space + '{');
|
||||
Mojo.Log.info(space + '{');
|
||||
}
|
||||
for (var a in x) {
|
||||
Mojo.Log.pp(x[a], 1+indent, a);
|
||||
}
|
||||
print(space + "},");
|
||||
Mojo.Log.info(space + "},");
|
||||
break;
|
||||
|
||||
case 'string':
|
||||
if (key) {
|
||||
print(space + key + ': "' + x + '",');
|
||||
Mojo.Log.info(space + key + ': "' + x + '",');
|
||||
}
|
||||
else {
|
||||
print(space + '"' + x + '",');
|
||||
Mojo.Log.info(space + '"' + x + '",');
|
||||
}
|
||||
break;
|
||||
|
||||
case 'array':
|
||||
if (key) {
|
||||
print(space + key + ': [');
|
||||
Mojo.Log.info(space + key + ': [');
|
||||
}
|
||||
else {
|
||||
print(space + '[');
|
||||
Mojo.Log.info(space + '[');
|
||||
}
|
||||
for (var i = 0; i < x.length; ++i) {
|
||||
Mojo.Log.pp(x[i], 1+indent);
|
||||
}
|
||||
print(space + '],');
|
||||
Mojo.Log.info(space + '],');
|
||||
break;
|
||||
|
||||
case 'null':
|
||||
if (key) {
|
||||
print(space + key + ': (null),');
|
||||
Mojo.Log.info(space + key + ': (null),');
|
||||
}
|
||||
else {
|
||||
print(space + '(null),');
|
||||
Mojo.Log.info(space + '(null),');
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if (key) {
|
||||
print(space + key + ": " + x + ',');
|
||||
Mojo.Log.info(space + key + ": " + x + ',');
|
||||
}
|
||||
else {
|
||||
print(space + x + ',');
|
||||
Mojo.Log.info(space + x + ',');
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,21 @@
|
|||
Mojo.Ext.SceneAssistantBase = Class.create({
|
||||
setup: function() {
|
||||
var sc = this.controller.stageController;
|
||||
var sa = this.controller.stageController.assistant;
|
||||
if (this.appMenuModel !== undefined) {
|
||||
// Mojo.log('scene has appMenuModel, setting up menu with items: ', this.appMenuModel.items);
|
||||
this.controller.setupWidget(Mojo.Menu.appMenu, {omitDefaultItems:true}, this.appMenuModel);
|
||||
}
|
||||
else if (sc.appMenuModel !== undefined) {
|
||||
this.controller.setupWidget(Mojo.Menu.appMenu, {omitDefaultItems:true}, sc.appMenuModel);
|
||||
else if (sa.appMenuModel !== undefined) {
|
||||
// Mojo.log('stage assistant has appMenuModel, setting up menu with items: ', sa.appMenuModel.items);
|
||||
this.controller.setupWidget(Mojo.Menu.appMenu, {omitDefaultItems:true}, sa.appMenuModel);
|
||||
}
|
||||
else {
|
||||
Mojo.log('no appMenuModel');
|
||||
}
|
||||
},
|
||||
|
||||
cleanup: function() {
|
||||
this.stopListeners();
|
||||
},
|
||||
|
||||
setupListener: function(name, event, callback) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue