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

3 files changed, 5 insertions, 1 deletions

diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 626dc0bc..037c1197 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -18,9 +18,11 @@
         
         <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
                 * {
+                -webkit-animation: none !important;
                         -webkit-transition-duration: 0s !important;
                         -webkit-animation-duration: 0s !important;
                         -webkit-animation-name: none !important;
+                -webkit-animation-fill-mode: none !important;
                         }
                         
                         body {
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 8fc0d82f..ef68a3c0 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -21,9 +21,11 @@
         
         <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
                 * {
+                -webkit-animation: none !important;
                         -webkit-transition-duration: 0s !important;
                         -webkit-animation-duration: 0s !important;
                         -webkit-animation-name: none !important;
+                -webkit-animation-fill-mode: none !important;
                         }
                         
                         body {
diff --git a/js/document/views/code.js b/js/document/views/code.js
index c8b2a23e..5467b0f1 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -114,7 +114,7 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
             //
             this.textViewContainer.style.display="block";
             //
-            this.editor = this.application.ninja.codeEditorController.createEditor(this, type, file.extension, textDocument);
+            this.editor = this.application.ninja.codeEditorWrapper.createEditor(this, type, file.extension, textDocument);
             this.editor.hline = this.editor.setLineClass(0, "activeline");
         }
     },