aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /js/components/treeview
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/components/treeview')
-rw-r--r--js/components/treeview/branch.reel/branch.html8
-rw-r--r--js/components/treeview/leaf.reel/leaf.html4
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html10
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html4
-rw-r--r--js/components/treeview/treeview.reel/treeview.html4
5 files changed, 15 insertions, 15 deletions
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html
index 97b03382..d3060d96 100644
--- a/js/components/treeview/branch.reel/branch.html
+++ b/js/components/treeview/branch.reel/branch.html
@@ -129,11 +129,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
129 </script> 129 </script>
130</head> 130</head>
131<body> 131<body>
132 <div id="branch" class="branch"> 132 <div data-montage-id="branch" class="branch">
133 <span id="label" class="branch-label"></span> 133 <span data-montage-id="label" class="branch-label"></span>
134 134
135 <ul id="branchList"> 135 <ul data-montage-id="branchList">
136 <li id="treeItem"></li> 136 <li data-montage-id="treeItem"></li>
137 </ul> 137 </ul>
138 </div> 138 </div>
139</body> 139</body>
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html
index 360b85a9..a644d4f9 100644
--- a/js/components/treeview/leaf.reel/leaf.html
+++ b/js/components/treeview/leaf.reel/leaf.html
@@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 </script> 34 </script>
35</head> 35</head>
36<body> 36<body>
37 <div id="leaf" class="leaf"> 37 <div data-montage-id="leaf" class="leaf">
38 <span id="label" class="leaf-label"></span> 38 <span data-montage-id="label" class="leaf-label"></span>
39 </div> 39 </div>
40</body> 40</body>
41</html> \ No newline at end of file 41</html> \ No newline at end of file
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
index 3a3f3658..60894fbc 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -131,11 +131,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
131 </script> 131 </script>
132</head> 132</head>
133<body> 133<body>
134 <div id="branch" class="branch"> 134 <div data-montage-id="branch" class="branch">
135 <div id="label" class="branch-label"></div> 135 <div data-montage-id="label" class="branch-label"></div>
136 <div id="branchCollapser" class="branchCollapser"> 136 <div data-montage-id="branchCollapser" class="branchCollapser">
137 <ul id="branchList"> 137 <ul data-montage-id="branchList">
138 <li id="treeItem"></li> 138 <li data-montage-id="treeItem"></li>
139 </ul> 139 </ul>
140 </div> 140 </div>
141 141
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
index b759b723..6d00bb21 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
@@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 </script> 34 </script>
35</head> 35</head>
36<body> 36<body>
37 <div id="leaf" class="leaf"> 37 <div data-montage-id="leaf" class="leaf">
38 <div id="label" class="leaf-label" draggable="true"></div> 38 <div data-montage-id="label" class="leaf-label" draggable="true"></div>
39 </div> 39 </div>
40</body> 40</body>
41</html> \ No newline at end of file 41</html> \ No newline at end of file
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index 3ef9f116..1bed0f0b 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -43,8 +43,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
43 </script> 43 </script>
44</head> 44</head>
45<body> 45<body>
46 <div id="treeView" class="treeView"> 46 <div data-montage-id="treeView" class="treeView">
47 <div id="rootBranch" class="treeRoot"></div> 47 <div data-montage-id="rootBranch" class="treeRoot"></div>
48 </div> 48 </div>
49</body> 49</body>
50</html> \ No newline at end of file 50</html> \ No newline at end of file