diff options
author | Jon Reid | 2012-06-20 15:05:26 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-20 15:05:26 -0700 |
commit | 6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch) | |
tree | aa6becc1e97aecbe6fb43aa33770def3c3de227d /js/components/layout | |
parent | f887a74a7d03a2008a2c43d455a2b3e9223028af (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
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" |