Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
author: hwc487 2012-05-11 13:52:55 -0700
committer: hwc487 2012-05-11 13:52:55 -0700
commit: 137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
tree: e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/CSSPanel
parent: d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent: 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
download: ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
2 files changed, 7 insertions, 7 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index c62b2b23..1d74fab4 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -38,13 +38,13 @@
                </script>
        </head>
 <body>
-    <div id="css_panel" class="css_panel">
+    <div data-montage-id="css_panel" class="css_panel">
                <!-- Stylesheet list subsection -->
                <h2 id="nj-css-sheets-header" class="nj-section-header">
                        <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div>
                        Stylesheets <span id="nj-current-doc-name"></span>
                </h2>           
-        <div id="nj-section-stylesheets" class="nj-sub-panel">
+        <div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel">
                <ul id="nj-sheet-list"></ul>
        </div>
                <div  id="nj-css-stylesheet-toolbar" class="nj-css-toolbar">
@@ -59,7 +59,7 @@
                                <span id="nj-num-items">0</span> elements selected
                        </span>
                </h2>
-                <div id="nj-computed-sub-panel"></div>
+                <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div>
        <div id="nj-section-styles" class="nj-sub-panel">
                <!-- <ul id="nj-css-rule-list"></ul> -->
        </div>
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
index 53c243a8..25196bc6 100755
--- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
+++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
@@ -26,10 +26,10 @@
 </head>
 <body id="computestylesubpanel" onload="">
-        <div id="nj-css-panel-computed" class="nj-css-panel-hide">
+        <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-hide">
                <div id="nj-css-filter-panel">
-                        <input id="nj-css-filter" class="nj-skinned" type="search">
+                        <input data-montage-id="nj-css-filter" class="nj-skinned" type="search">
-                        <select id="nj-css-group-select" class="nj-skinned">
+                        <select data-montage-id="nj-css-group-select" class="nj-skinned">
                                <option value="all">All</option>
                                <option value="summary" selected>Summary</option>
                                <option value="background">Background</option>
@@ -40,7 +40,7 @@
                        </select>
                </div>
                <div class="nj-sub-panel">
-                        <dl id="nj-css-computed-list" class="nj-css-style-list"></dl>
+                        <dl data-montage-id="nj-css-computed-list" class="nj-css-style-list"></dl>
                </div>
        </div>
 </body>
author	hwc487	2012-05-11 13:52:55 -0700
committer	hwc487	2012-05-11 13:52:55 -0700
commit	137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
tree	e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/CSSPanel
parent	d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent	27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
download	ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html index c62b2b23..1d74fab4 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -38,13 +38,13 @@
38	</script>	38	</script>
39	</head>	39	</head>
40	<body>	40	<body>
41	<div id="css_panel" class="css_panel">	41	<div data-montage-id="css_panel" class="css_panel">
42	<!-- Stylesheet list subsection -->	42	<!-- Stylesheet list subsection -->
43	<h2 id="nj-css-sheets-header" class="nj-section-header">	43	<h2 id="nj-css-sheets-header" class="nj-section-header">
44	<div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div>	44	<div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div>
45	Stylesheets <span id="nj-current-doc-name"></span>	45	Stylesheets <span id="nj-current-doc-name"></span>
46	</h2>	46	</h2>
47	<div id="nj-section-stylesheets" class="nj-sub-panel">	47	<div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel">
48	<ul id="nj-sheet-list"></ul>	48	<ul id="nj-sheet-list"></ul>
49	</div>	49	</div>
50	<div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar">	50	<div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar">
@@ -59,7 +59,7 @@
59	<span id="nj-num-items">0</span> elements selected	59	<span id="nj-num-items">0</span> elements selected
60	</span>	60	</span>
61	</h2>	61	</h2>
62	<div id="nj-computed-sub-panel"></div>	62	<div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div>
63	<div id="nj-section-styles" class="nj-sub-panel">	63	<div id="nj-section-styles" class="nj-sub-panel">
64	<!-- <ul id="nj-css-rule-list"></ul> -->	64	<!-- <ul id="nj-css-rule-list"></ul> -->
65	</div>	65	</div>


diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html index 53c243a8..25196bc6 100755 --- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html +++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
@@ -26,10 +26,10 @@
26		26
27	</head>	27	</head>
28	<body id="computestylesubpanel" onload="">	28	<body id="computestylesubpanel" onload="">
29	<div id="nj-css-panel-computed" class="nj-css-panel-hide">	29	<div data-montage-id="nj-css-panel-computed" class="nj-css-panel-hide">
30	<div id="nj-css-filter-panel">	30	<div id="nj-css-filter-panel">
31	<input id="nj-css-filter" class="nj-skinned" type="search">	31	<input data-montage-id="nj-css-filter" class="nj-skinned" type="search">
32	<select id="nj-css-group-select" class="nj-skinned">	32	<select data-montage-id="nj-css-group-select" class="nj-skinned">
33	<option value="all">All</option>	33	<option value="all">All</option>
34	<option value="summary" selected>Summary</option>	34	<option value="summary" selected>Summary</option>
35	<option value="background">Background</option>	35	<option value="background">Background</option>
@@ -40,7 +40,7 @@
40	</select>	40	</select>
41	</div>	41	</div>
42	<div class="nj-sub-panel">	42	<div class="nj-sub-panel">
43	<dl id="nj-css-computed-list" class="nj-css-style-list"></dl>	43	<dl data-montage-id="nj-css-computed-list" class="nj-css-style-list"></dl>
44	</div>	44	</div>
45	</div>	45	</div>
46	</body>	46	</body>