Merge branch 'refs/heads/ToolFixes' into WebGLMaterials

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/mediators/element-mediator.js
	js/panels/properties.reel/properties.js
	js/tools/BrushTool.js
	js/tools/LineTool.js
	js/tools/PenTool.js
	js/tools/SelectionTool.js
	js/tools/ShapeTool.js
	js/tools/TranslateObject3DTool.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index 64a89a6a..26fc7573 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -61,6 +61,8 @@ exports.MenuItem = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            var boundObject = this.application.ninja, strArr = null, i=0;
+
             if(!this.data) return;
 
             if(this.data.separator) {
@@ -82,9 +84,14 @@ exports.MenuItem = Montage.create(Component, {
             }
 
             if(this.data.enabled.boundProperty) {
+
+                boundObject = this.application.ninja[this.data.enabled.boundObj];
+
                 Object.defineBinding(this, "enabled", {
-                  boundObject: this.application.ninja[this.data.enabled.boundObj],
-                  boundObjectPropertyPath: this.data.enabled.boundProperty
+                  boundObject: boundObject,
+                  boundObjectPropertyPath: this.data.enabled.boundProperty,
+                  boundValueMutator: this.data.enabled.boundValueMutator,
+                  oneway : this.data.enabled.oneway
                 });
 
             } else {
@@ -134,7 +141,7 @@ exports.MenuItem = Montage.create(Component, {
 
             if(this.data.radio && this.checked) return;
 
-            if(this.enabled || !this.submenu) {
+            if((this.enabled === true) && (this.submenu === false) ) {
                 if(this.data.action) {
                     NJevent ( this.data.action );
                 } else  if(this.checked !== null) {