From a39bad832722a10f6556f91e94c3301a41f59bd5 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Mon, 6 Feb 2012 13:30:49 -0800
Subject: merge new timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
js/ninja.reel/ninja.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'js/ninja.reel')
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 706c8243..1aaa0c60 100644
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -279,7 +279,8 @@
"stylesController": {"@": "stylesController"},
"filePickerController": {"@": "filePickerController"},
"newFileController": {"@": "newFileController"},
- "documentBar": {"@": "documentBar"}
+ "documentBar": {"@": "documentBar"},
+ "timeline": {"@": "timeline"}
}
}
--
cgit v1.2.3
From cf2f83be020d7d14f22177e0841472927d2fbcd7 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Mon, 6 Feb 2012 14:07:11 -0800
Subject: Integrate breadcrumb component and layer handling code
Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
js/ninja.reel/ninja.html | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
(limited to 'js/ninja.reel')
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 1aaa0c60..158bcaff 100644
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -345,13 +345,10 @@
</section>
<section id="timelineResizer" class="timelineResizer resizeBar"></section>
-
+ <section id="breadCrumbTrail">
+ <div id="breadCrumbComponent"></div>
+ </section>
<section id="bottomPanelContainer" class="panelContainer">
-
- <section id="breadCrumbTrail">
- <div id="breadCrumbComponent"></div>
- </section>
-
<section id="timelinePanel" class="panel">
<div id="timelinePanelComponent"></div>
</section>
--
cgit v1.2.3
From 937fcd971085d53e3c44eb9554a2e8597c168f74 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 9 Feb 2012 09:30:06 -0800
Subject: fixed error with initializing and accessing the ninja version object
from the main reel
---
js/ninja.reel/ninja.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'js/ninja.reel')
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 90015f5a..469d38f7 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -14,7 +14,7 @@ exports.Ninja = Montage.create(Component, {
_preload: { value: false },
ninjaVersion: {
- value: window.ninjaVersion.ninja.version
+ value: null
},
toolsData: { value: null },
@@ -34,6 +34,7 @@ exports.Ninja = Montage.create(Component, {
templateDidLoad: {
value: function() {
+ this.ninjaVersion = window.ninjaVersion.ninja.version;
this.eventManager.addEventListener( "preloadFinish", this, false);
}
},
--
cgit v1.2.3
From cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Fri, 10 Feb 2012 16:00:35 -0800
Subject: -Changed the capitalization of all main top level menus from all caps
-Added new main-menu-controller to be the default generic handler for menu item calls that do not need to call to a specific controller
-Removed the test menu item
-Finalized the help submenu items and hooked them up to the main-menu-controller
---
js/ninja.reel/ninja.html | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
(limited to 'js/ninja.reel')
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 706c8243..1ce94722 100644
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -259,6 +259,11 @@
"name": "NewFileWorkflowController"
},
+ "mainMenuController": {
+ "module": "js/controllers/main-menu-controller",
+ "name": "MainMenuController"
+ },
+
"owner": {
"module": "js/ninja.reel",
"name": "Ninja",
@@ -279,10 +284,10 @@
"stylesController": {"@": "stylesController"},
"filePickerController": {"@": "filePickerController"},
"newFileController": {"@": "newFileController"},
- "documentBar": {"@": "documentBar"}
- }
+ "documentBar": {"@": "documentBar"},
+ "mainMenuController": {"@": "mainMenuController"}
+ }
}
-
}
</script>
--
cgit v1.2.3