diff options
author | Kruti Shah | 2012-06-20 15:12:48 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-20 15:12:48 -0700 |
commit | 1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch) | |
tree | 26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/components/layout | |
parent | 1ce4bd7033a413c7697888e5712f278219d6d095 (diff) | |
parent | 782b66c783df4a9c36fa240cc77900e69b9130cf (diff) | |
download | ninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/components/layout')
-rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.html | 2 | ||||
-rwxr-xr-x | js/components/layout/document-entry.reel/document-entry.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 68f3be2b..ee314628 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
@@ -21,7 +21,7 @@ | |||
21 | }, | 21 | }, |
22 | 22 | ||
23 | "breadCrumbButton": { | 23 | "breadCrumbButton": { |
24 | "prototype": "montage/ui/button.reel", | 24 | "prototype": "montage/ui/native/button.reel", |
25 | "properties": { | 25 | "properties": { |
26 | "element": {"#": "breadcrumb_button"} | 26 | "element": {"#": "breadcrumb_button"} |
27 | }, | 27 | }, |
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index e68d17c5..ebaa4ccd 100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.html | |||
@@ -20,7 +20,7 @@ | |||
20 | }, | 20 | }, |
21 | 21 | ||
22 | "closeButton": { | 22 | "closeButton": { |
23 | "prototype": "montage/ui/button.reel", | 23 | "prototype": "montage/ui/native/button.reel", |
24 | "properties": { | 24 | "properties": { |
25 | "element": {"#": "close-btn"}, | 25 | "element": {"#": "close-btn"}, |
26 | "identifier": "closeButton" | 26 | "identifier": "closeButton" |