From 2c743f437054f18712ced528a89370da2f0384ef Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Thu, 3 Dec 2009 17:23:14 -0800
Subject: [PATCH] [FIXED] SceneAssistantBase and Mojo.Log.pp.

---
 src/ext/pretty-print.js         | 24 ++++++++++++------------
 src/ext/scene-assistant-base.js | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/ext/pretty-print.js b/src/ext/pretty-print.js
index fe32d02..688c366 100644
--- a/src/ext/pretty-print.js
+++ b/src/ext/pretty-print.js
@@ -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;
     }
diff --git a/src/ext/scene-assistant-base.js b/src/ext/scene-assistant-base.js
index 7ccb3ec..74b401a 100644
--- a/src/ext/scene-assistant-base.js
+++ b/src/ext/scene-assistant-base.js
@@ -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) {