aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-01 06:53:58 -0700
committerNivesh Rajbhandari2012-06-01 06:53:58 -0700
commit69ca67093bb53188dca5437e0bfbfb7f676ada85 (patch)
treecc2b387c796b0f34f1ab00a7c542c335d52005e9 /js/ninja.reel/ninja.html
parentb7f048624c07a1186cca080bf4c9a87af7d53f35 (diff)
parent7fcb10270f9e19415f8452c261c2d0c86916a29a (diff)
downloadninja-69ca67093bb53188dca5437e0bfbfb7f676ada85.tar.gz
Merge branch 'refs/heads/valerio-document-bindings-fix' into document-bindings-fix
Conflicts: js/stage/stage.reel/stage.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html15
1 files changed, 11 insertions, 4 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 031d68e9..0c0944e7 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -25,7 +25,10 @@
25 }, 25 },
26 26
27 "appModel": { 27 "appModel": {
28 "prototype": "js/models/app-model" 28 "prototype": "js/models/app-model",
29 "bindings": {
30 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
31 }
29 }, 32 },
30 33
31 "materialsModel": { 34 "materialsModel": {
@@ -212,6 +215,9 @@
212 "prototype": "js/code-editor/ui/code-editor-view-options.reel", 215 "prototype": "js/code-editor/ui/code-editor-view-options.reel",
213 "properties": { 216 "properties": {
214 "element": {"#": "editorViewOptions"} 217 "element": {"#": "editorViewOptions"}
218 },
219 "bindings" : {
220 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
215 } 221 }
216 }, 222 },
217 223
@@ -349,7 +355,8 @@
349 "codeEditorController": { 355 "codeEditorController": {
350 "prototype": "js/controllers/code-editor-controller", 356 "prototype": "js/controllers/code-editor-controller",
351 "bindings": { 357 "bindings": {
352 "currentDocument": {"<-": "@documentList.selectedObjects.0"} 358 "currentDocument": {"<-": "@documentList.selectedObjects.0"},
359 "automaticCodeComplete": {"<-": "@editorViewOptions.codeCompleteCheck.disabled"}
353 } 360 }
354 }, 361 },
355 362
@@ -443,8 +450,8 @@
443 <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section> 450 <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section>
444 <section id="stateBar"> 451 <section id="stateBar">
445 <section id="documentBarContainer"> 452 <section id="documentBarContainer">
446 <div data-montage-id="documentBar" class="documentBar" style="display:block"><a href="#">HTML</a></div> 453 <div data-montage-id="documentBar" class="documentBar" style="display:block"></div>
447 <div data-montage-id="editorViewOptions" class="editorViewOptions" style="display:none"><a href="#">HTML</a></div> 454 <div data-montage-id="editorViewOptions" class="editorViewOptions" style="display:none"></div>
448 </section> 455 </section>
449 </section> 456 </section>
450 457