[FIXED] SceneAssistantBase and Mojo.Log.pp.

This commit is contained in:
Sami Samhuri 2009-12-03 17:23:14 -08:00
parent 5eb3b5d88b
commit 2c743f4370
2 changed files with 24 additions and 15 deletions

View file

@ -12,54 +12,54 @@ Mojo.Log.pp = function(x, indent, key) {
switch (typeOf(x)) { switch (typeOf(x)) {
case 'object': case 'object':
if (key) { if (key) {
print(space + key + ': {'); Mojo.Log.info(space + key + ': {');
} }
else { else {
print(space + '{'); Mojo.Log.info(space + '{');
} }
for (var a in x) { for (var a in x) {
Mojo.Log.pp(x[a], 1+indent, a); Mojo.Log.pp(x[a], 1+indent, a);
} }
print(space + "},"); Mojo.Log.info(space + "},");
break; break;
case 'string': case 'string':
if (key) { if (key) {
print(space + key + ': "' + x + '",'); Mojo.Log.info(space + key + ': "' + x + '",');
} }
else { else {
print(space + '"' + x + '",'); Mojo.Log.info(space + '"' + x + '",');
} }
break; break;
case 'array': case 'array':
if (key) { if (key) {
print(space + key + ': ['); Mojo.Log.info(space + key + ': [');
} }
else { else {
print(space + '['); Mojo.Log.info(space + '[');
} }
for (var i = 0; i < x.length; ++i) { for (var i = 0; i < x.length; ++i) {
Mojo.Log.pp(x[i], 1+indent); Mojo.Log.pp(x[i], 1+indent);
} }
print(space + '],'); Mojo.Log.info(space + '],');
break; break;
case 'null': case 'null':
if (key) { if (key) {
print(space + key + ': (null),'); Mojo.Log.info(space + key + ': (null),');
} }
else { else {
print(space + '(null),'); Mojo.Log.info(space + '(null),');
} }
break; break;
default: default:
if (key) { if (key) {
print(space + key + ": " + x + ','); Mojo.Log.info(space + key + ": " + x + ',');
} }
else { else {
print(space + x + ','); Mojo.Log.info(space + x + ',');
} }
break; break;
} }

View file

@ -1,12 +1,21 @@
Mojo.Ext.SceneAssistantBase = Class.create({ Mojo.Ext.SceneAssistantBase = Class.create({
setup: function() { setup: function() {
var sc = this.controller.stageController; var sa = this.controller.stageController.assistant;
if (this.appMenuModel !== undefined) { 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); this.controller.setupWidget(Mojo.Menu.appMenu, {omitDefaultItems:true}, this.appMenuModel);
} }
else if (sc.appMenuModel !== undefined) { else if (sa.appMenuModel !== undefined) {
this.controller.setupWidget(Mojo.Menu.appMenu, {omitDefaultItems:true}, sc.appMenuModel); // 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) { setupListener: function(name, event, callback) {