From dece82791f43b5e8d278aba89cf8d6119af1478f Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 9 Apr 2012 13:11:40 -0700
Subject: - Decouple code editor from stage document switching logic - cleaning
up
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
js/components/layout/document-bar.reel/document-bar.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/components')
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 4dc39fd6..27402dff 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -100,7 +100,7 @@ exports.DocumentBar = Montage.create(Component, {
if(event._event.target.id === this.currentView) return;
this.currentView = event._event.target.id;
- this.application.ninja.documentController.stage.stageView.switchViews(event._event.target.id);//switch between design view
+ this.application.ninja.documentController.stage.stageView.switchDesignDocViews(event._event.target.id);//switch between design view
}
},
--
cgit v1.2.3
From f65a9fa92819580039edf9ccc54ab21512ee89b4 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 3 May 2012 11:19:55 -0700
Subject: use data-montage-id instead of id in template
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
js/components/ui/icon-list-basic/icon.reel/icon.html | 6 +++---
js/components/ui/icon-list-basic/iconsList.reel/iconsList.html | 6 +++---
js/components/ui/tree-basic/tree.reel/tree.html | 6 +++---
js/components/ui/tree-basic/treeItem.reel/treeItem.html | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'js/components')
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html
index f2406566..2ad5885a 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.html
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.html
@@ -22,9 +22,9 @@
</script>
</head>
<body>
-<div id="icon" class="icon">
- <div><img id="iconImg" class="iconImg" src="" /></div>
- <div id="iconLabel" class="iconLabel"></div>
+<div data-montage-id="icon" class="icon">
+ <div><img data-montage-id="iconImg" class="iconImg" src="" /></div>
+ <div data-montage-id="iconLabel" class="iconLabel"></div>
</div>
</body>
</html>
\ No newline at end of file
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 35260527..05d3ea7d 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -55,9 +55,9 @@
</script>
</head>
<body>
-<div id="list" class="list">
- <div id="iconsView">
- <div id="icon"></div>
+<div data-montage-id="list" class="list">
+ <div data-montage-id="iconsView">
+ <div data-montage-id="icon"></div>
</div>
</div>
</body>
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html
index f0c51fcc..1144b563 100755
--- a/js/components/ui/tree-basic/tree.reel/tree.html
+++ b/js/components/ui/tree-basic/tree.reel/tree.html
@@ -65,9 +65,9 @@
</script>
</head>
<body>
-<div id="atree" class="atree">
- <ul id="treeView" style="display:block;">
- <li id="treeItem"></li>
+<div data-montage-id="atree" class="atree">
+ <ul data-montage-id="treeView" style="display:block;">
+ <li data-montage-id="treeItem"></li>
</ul>
</div>
</body>
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.html b/js/components/ui/tree-basic/treeItem.reel/treeItem.html
index 9b8cb1ea..c5cdc533 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.html
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.html
@@ -23,12 +23,12 @@
</script>
</head>
<body>
-<li id="atreeItem" class="atreeItem">
- <span id="treeArrow" class="treeArrow hidden">▶</span>
+<li data-montage-id="atreeItem" class="atreeItem">
+ <span data-montage-id="treeArrow" class="treeArrow hidden">▶</span>
<div class="atreeItemContent atreeItemImgContainer" >
- <img id="atreeItemImg" class="atreeItemImg" src="" />
+ <img data-montage-id="atreeItemImg" class="atreeItemImg" src="" />
</div>
- <span id="name" class="atreeItemContent name"></span>
+ <span data-montage-id="name" class="atreeItemContent name"></span>
</li>
</body>
</html>
\ No newline at end of file
--
cgit v1.2.3