diff options
| author | Eric Guzman | 2012-06-27 15:29:41 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-27 15:29:41 -0700 |
| commit | 61a41e74154715b0b42a429158fa1f2a44d2eb9a (patch) | |
| tree | 2084e8df8c40708c9cc15d53d921a20718c8f006 /js/document | |
| parent | 230a1a2f2848c27edf7d01f8d3a5585c8d0d4ac9 (diff) | |
| parent | 07e7e2f28b863b0a4d139cc7e649a630b162e0da (diff) | |
| download | ninja-61a41e74154715b0b42a429158fa1f2a44d2eb9a.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO
Diffstat (limited to 'js/document')
| -rwxr-xr-x | js/document/templates/banner/index.html | 2 | ||||
| -rwxr-xr-x | js/document/templates/html/index.html | 2 | ||||
| -rwxr-xr-x | js/document/views/code.js | 2 |
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 @@ | |||
| 18 | 18 | ||
| 19 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> | 19 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> |
| 20 | * { | 20 | * { |
| 21 | -webkit-animation: none !important; | ||
| 21 | -webkit-transition-duration: 0s !important; | 22 | -webkit-transition-duration: 0s !important; |
| 22 | -webkit-animation-duration: 0s !important; | 23 | -webkit-animation-duration: 0s !important; |
| 23 | -webkit-animation-name: none !important; | 24 | -webkit-animation-name: none !important; |
| 25 | -webkit-animation-fill-mode: none !important; | ||
| 24 | } | 26 | } |
| 25 | 27 | ||
| 26 | body { | 28 | 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 @@ | |||
| 21 | 21 | ||
| 22 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> | 22 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> |
| 23 | * { | 23 | * { |
| 24 | -webkit-animation: none !important; | ||
| 24 | -webkit-transition-duration: 0s !important; | 25 | -webkit-transition-duration: 0s !important; |
| 25 | -webkit-animation-duration: 0s !important; | 26 | -webkit-animation-duration: 0s !important; |
| 26 | -webkit-animation-name: none !important; | 27 | -webkit-animation-name: none !important; |
| 28 | -webkit-animation-fill-mode: none !important; | ||
| 27 | } | 29 | } |
| 28 | 30 | ||
| 29 | body { | 31 | 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, { | |||
| 114 | // | 114 | // |
| 115 | this.textViewContainer.style.display="block"; | 115 | this.textViewContainer.style.display="block"; |
| 116 | // | 116 | // |
| 117 | this.editor = this.application.ninja.codeEditorController.createEditor(this, type, file.extension, textDocument); | 117 | this.editor = this.application.ninja.codeEditorWrapper.createEditor(this, type, file.extension, textDocument); |
| 118 | this.editor.hline = this.editor.setLineClass(0, "activeline"); | 118 | this.editor.hline = this.editor.setLineClass(0, "activeline"); |
| 119 | } | 119 | } |
| 120 | }, | 120 | }, |