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

Conflicts:
	assets/canvas-runtime.js
	js/io/system/ninjalibrary.json
	js/mediators/element-mediator.js

3 files changed, 91 insertions, 7 deletions

diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index fbd2e138..0cdf718c 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -81,6 +81,7 @@ exports.Main = Montage.create(Component, {
             //
             var templateEvent = document.createEvent("CustomEvent");
             templateEvent.initCustomEvent("mjsTemplateReady", false, true);
+            document.body.dispatchEvent(templateEvent);
         }
     },
 
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index f1ee3d98..626dc0bc 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -71,12 +71,53 @@
                 -webkit-transform-style: preserve-3d;
                 -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
                         }
+
+            ::-webkit-scrollbar { width: 11px; height: 11px; }
+            ::-webkit-scrollbar-button:start:decrement, ::-webkit-scrollbar-button:end:increment { display: none; }
+            ::-webkit-scrollbar-button:vertical:start:increment, body::-webkit-scrollbar-button:vertical:end:decrement { display: none; }
+            ::-webkit-scrollbar-button:horizontal:start:increment, body::-webkit-scrollbar-button:horizontal:end:decrement { display: none; }
+            ::-webkit-scrollbar-track:vertical { background-color: black; }
+            ::-webkit-scrollbar-track:horizontal { background-color: black; }
+            ::-webkit-scrollbar-track-piece:vertical:start { background-color: transparent; }
+            ::-webkit-scrollbar-track-piece:horizontal:start { background-color: transparent; }
+            ::-webkit-scrollbar-track-piece:vertical:end { background-color: transparent; }
+            ::-webkit-scrollbar-track-piece:horizontal:end { background-color: transparent; }
+            ::-webkit-scrollbar-thumb:vertical { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, right top, color-stop(0.16, #8c8c8c), color-stop(0.49, #adadad), color-stop(0.82, #8c8c8c)); }
+            ::-webkit-scrollbar-thumb:vertical:hover { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, right top, color-stop(0.1, #bebebe), color-stop(0.5, white), color-stop(0.9, #bebebe)); }
+            ::-webkit-scrollbar-thumb:horizontal { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, left bottom, color-stop(0.1, #8c8c8c), color-stop(0.5, #adadad), color-stop(0.9, #8c8c8c)); }
+            ::-webkit-scrollbar-thumb:horizontal:hover { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, left bottom, color-stop(0.16, #bebebe), color-stop(0.49, white), color-stop(0.82, #bebebe)); }
+            ::-webkit-scrollbar-corner { background-color: black; }
+            ::-webkit-scrollbar-corner:window-inactive { background-color: black; }
+            ::-webkit-scrollbar-track:vertical:disabled { display: block; }
+            ::-webkit-scrollbar-track:horizontal:disabled { display: block; }
+            ::-webkit-scrollbar-track-piece:disabled { display: block; }
+            ::-webkit-scrollbar-corner:disabled { display: block; }
+            ::-webkit-resizer:disabled { display: block; }
+
         </style>
         
         <script type="text/javascript" data-ninja-template="true">
-                function getElement(x,y) {
-                return document.elementFromPoint(x,y);
-                }
+
+            function getElement(x,y) {
+                return document.elementFromPoint(x,y);
+            }
+
+            var njmodelGet = function njmodelGet() {
+                return (this.hasOwnProperty("_model") ? this._model: document.modelGenerator.call(this));
+            };
+
+            Object.defineProperty(Object.prototype, "_model", {
+                enumerable: false,
+                value: null,
+                writable: true
+            });
+
+            Object.defineProperty(Object.prototype, "elementModel", {
+                configurable: true,
+                get: njmodelGet,
+                set: function() {
+                }
+            });
         </script>
         
         <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 70187900..8fc0d82f 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -57,13 +57,55 @@
 
             .nj-element-highlight {
                  outline: 4px solid #ff0000;
-             }
+            }
+
+            ::-webkit-scrollbar { width: 11px; height: 11px; }
+            ::-webkit-scrollbar-button:start:decrement, ::-webkit-scrollbar-button:end:increment { display: none; }
+            ::-webkit-scrollbar-button:vertical:start:increment, body::-webkit-scrollbar-button:vertical:end:decrement { display: none; }
+            ::-webkit-scrollbar-button:horizontal:start:increment, body::-webkit-scrollbar-button:horizontal:end:decrement { display: none; }
+            ::-webkit-scrollbar-track:vertical { background-color: black; }
+            ::-webkit-scrollbar-track:horizontal { background-color: black; }
+            ::-webkit-scrollbar-track-piece:vertical:start { background-color: transparent; }
+            ::-webkit-scrollbar-track-piece:horizontal:start { background-color: transparent; }
+            ::-webkit-scrollbar-track-piece:vertical:end { background-color: transparent; }
+            ::-webkit-scrollbar-track-piece:horizontal:end { background-color: transparent; }
+            ::-webkit-scrollbar-thumb:vertical { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, right top, color-stop(0.16, #8c8c8c), color-stop(0.49, #adadad), color-stop(0.82, #8c8c8c)); }
+            ::-webkit-scrollbar-thumb:vertical:hover { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, right top, color-stop(0.1, #bebebe), color-stop(0.5, white), color-stop(0.9, #bebebe)); }
+            ::-webkit-scrollbar-thumb:horizontal { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, left bottom, color-stop(0.1, #8c8c8c), color-stop(0.5, #adadad), color-stop(0.9, #8c8c8c)); }
+            ::-webkit-scrollbar-thumb:horizontal:hover { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, left bottom, color-stop(0.16, #bebebe), color-stop(0.49, white), color-stop(0.82, #bebebe)); }
+            ::-webkit-scrollbar-corner { background-color: black; }
+            ::-webkit-scrollbar-corner:window-inactive { background-color: black; }
+            ::-webkit-scrollbar-track:vertical:disabled { display: block; }
+            ::-webkit-scrollbar-track:horizontal:disabled { display: block; }
+            ::-webkit-scrollbar-track-piece:disabled { display: block; }
+            ::-webkit-scrollbar-corner:disabled { display: block; }
+            ::-webkit-resizer:disabled { display: block; }
+
         </style>
         
         <script type="text/javascript" data-ninja-template="true">
-                function getElement(x,y) {
-                return document.elementFromPoint(x,y);
-                }
+
+            function getElement(x,y) {
+                return document.elementFromPoint(x,y);
+            }
+
+            var njmodelGet = function njmodelGet() {
+                return (this.hasOwnProperty("_model") ? this._model: document.modelGenerator.call(this));
+            };
+
+            Object.defineProperty(Object.prototype, "_model", {
+                enumerable: false,
+                value: null,
+                writable: true
+            });
+
+            Object.defineProperty(Object.prototype, "elementModel", {
+                configurable: true,
+                get: njmodelGet,
+                set: function() {
+                }
+            });
+
         </script>
     
         <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>