aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:16:30 -0700
committerArmen Kesablyan2012-06-20 15:16:30 -0700
commit65b989c7759af923fb9456d34bff89f91831ea1e (patch)
treee408be732a3eee71229bfc7dbf7cace998ce18de /js/components/layout
parent38f571d1fdf02d36c3816637af7b2ca2493809da (diff)
parentfc818d31de267d2b77fda3b3029ad38d48698be8 (diff)
downloadninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/layout')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html2
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"