Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs

5 files changed, 32 insertions, 45 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 647c0870..2ff3e235 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -795,7 +795,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// method to apply/test the new value
             dec.setProperty(property, value, priority);
 
-            this.styleSheetModified(rule.parentStyleSheet);
+            if(rule.parentStyleSheet) {
+                this.styleSheetModified(rule.parentStyleSheet);
+            }
 
             ///// Return browser value for value we just set
             return dec.getPropertyValue(property);
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json
index c8bc02fb..d1e839dc 100755
--- a/js/document/templates/montage-html/package.json
+++ b/js/document/templates/montage-html/package.json
@@ -3,6 +3,7 @@
            "lib": ""
        },
        "mappings": {
-           "montage": "../../../../node_modules/montage/"
+           "montage": "../../../../node_modules/montage/",
+           "montage-google": "../../../../node_modules/montage-google/"
        }
 }
\ No newline at end of file
diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index 201598fc..f4915a91 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -152,7 +152,8 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                 //
                 this.chromeApi = chrome;
                 //
-                var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [], copied;
+//            debugger;
+                var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [];
             //Getting known json list of libraries to copy to chrome
                 xhr.open("GET", '/js/io/system/ninjalibrary.json', false);
             xhr.send();
@@ -166,23 +167,18 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                 if (chromeLibs.length > 0) {
                         //
                         for (i=0; chromeLibs[i]; i++) {
-                                copied = false;
                                 for (var j in libs.libraries) {
                                         if (String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase() === chromeLibs[i]) {
-                                                copied = true;
-                                        }
-                                }
-                                //
-                                if (!copied) {
-                                        if (libs.libraries[j].file) {
-                                                tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file});
-                                        } else {
-                                                tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path});
-                                        }
-                                } else {
-                                        //TODO: Remove, currently manually removing copied libraries
-                                        //this.chromeApi.directoryDelete(chromeLibs[i]);
-                                }
+                                //TODO: Remove, currently manually removing copied libraries
+                                // //this.chromeApi.directoryDelete(chromeLibs[i]);
+                                        } else {
+                                if (libs.libraries[j].file) {
+                                    tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file});
+                                } else {
+                                    tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path});
+                                }
+                            }
+                        }
                         }
                         
                 } else {
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index e236f2e0..f7b87a91 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
-                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.7.0.0"},
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.8.0.0"},
                 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"}
         ]
 }
\ No newline at end of file
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index a58aacc6..024a92ce 100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -5,13 +5,18 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-    DrawingTool = require("js/tools/drawing-tool").DrawingTool;
+    DrawingTool = require("js/tools/drawing-tool").DrawingTool,
     RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor,
     ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.TextTool = Montage.create(DrawingTool, {
+    drawingFeedback: {
+        value: { mode: "Draw3D", type: "rectangle" }
+    },
 
-    _selectedElement: { value : null },
+    _selectedElement: {
+        value : null
+    },
 
     selectedElement: {
         get: function() {
@@ -35,9 +40,6 @@ exports.TextTool = Montage.create(DrawingTool, {
             }
         }
     },
-    
-
-    drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } },
 
     HandleLeftButtonDown: {
         value: function(event) {
@@ -81,15 +83,7 @@ exports.TextTool = Montage.create(DrawingTool, {
                 return;
             }
 
-            var drawData, selectedItem;
-
             if(this._hasDraw) {
-                drawData =  this.getDrawingData();
-
-                if(drawData) {
-                    //this.insertElement(drawData);
-                }
-                
                 this._hasDraw = false;
                 this.endDraw(event);
             } else {
@@ -113,6 +107,8 @@ exports.TextTool = Montage.create(DrawingTool, {
 
     drawTextTool: {
         value: function() {
+            var self = this;
+
             this.application.ninja.stage.textTool.value = this.selectedElement.innerHTML;
             if(this.application.ninja.stage.textTool.value === "") { this.application.ninja.stage.textTool.value = " "; }
             this.selectedElement.innerHTML = "";
@@ -125,35 +121,27 @@ exports.TextTool = Montage.create(DrawingTool, {
             this.application.ninja.stage.textTool.element.style.width = this.selectedElement.offsetWidth + "px";
             this.application.ninja.stage.textTool.element.style.height = this.selectedElement.offsetHeight + "px";
 
-
             // Set font styling (Size, Style, Weight)
-
-            me = this;
             this.application.ninja.stage.textTool.didDraw = function() {
-                me.applyElementStyles(me.selectedElement, me.application.ninja.stage.textTool.element, ["overflow"]);
-                me.applyElementStyles(me.selectedElement, me.application.ninja.stage.textTool.element.firstChild, ["font","padding-left","padding-top","padding-right","padding-bottom", "color"]);
+                self.applyElementStyles(self.selectedElement, self.application.ninja.stage.textTool.element, ["overflow"]);
+                self.applyElementStyles(self.selectedElement, self.application.ninja.stage.textTool.element.firstChild, ["font","padding-left","padding-top","padding-right","padding-bottom", "color"]);
                 var range = document.createRange(),
                 sel   = window.getSelection();
                 sel.removeAllRanges();
-                range.selectNodeContents(this.application.ninja.stage.textTool.element.firstChild);
+                range.selectNodeContents(self.application.ninja.stage.textTool.element.firstChild);
                 sel.addRange(range);
                 this.didDraw = function() {};
             }
         }
     },
 
+    /*
     HandleDoubleClick: {
         value: function(e) {
             //this.application.ninja.selectedElements[0].setAttribute("contenteditable", true);
-
-            //if (!this.application.ninja.textTool) {
-
-            //}
-
-
-
         }
     },
+    */
 
     Configure: {
         value: function(wasSelected) {