From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- js/components/ui/icon-list-basic/icon.reel/icon.css | 0 js/components/ui/icon-list-basic/icon.reel/icon.html | 0 js/components/ui/icon-list-basic/icon.reel/icon.js | 0 js/components/ui/icon-list-basic/iconsList.reel/iconsList.css | 0 js/components/ui/icon-list-basic/iconsList.reel/iconsList.html | 0 js/components/ui/icon-list-basic/iconsList.reel/iconsList.js | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 js/components/ui/icon-list-basic/icon.reel/icon.css mode change 100644 => 100755 js/components/ui/icon-list-basic/icon.reel/icon.html mode change 100644 => 100755 js/components/ui/icon-list-basic/icon.reel/icon.js mode change 100644 => 100755 js/components/ui/icon-list-basic/iconsList.reel/iconsList.css mode change 100644 => 100755 js/components/ui/icon-list-basic/iconsList.reel/iconsList.html mode change 100644 => 100755 js/components/ui/icon-list-basic/iconsList.reel/iconsList.js (limited to 'js/components/ui/icon-list-basic') diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css old mode 100644 new mode 100755 diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html old mode 100644 new mode 100755 diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js old mode 100644 new mode 100755 diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css old mode 100644 new mode 100755 diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html old mode 100644 new mode 100755 diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js old mode 100644 new mode 100755 -- cgit v1.2.3 From 92161460a6cbbdebfd1b0263ec6eb790091920a9 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 30 Jan 2012 14:18:21 -0800 Subject: Moving changes from Gerrit, on 1/27, to the github branch: - added file existence check and validation to save as dialog - minor css fix for file picker, new file dialog Signed-off-by: Ananya Sen --- js/components/ui/icon-list-basic/icon.reel/icon.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) mode change 100755 => 100644 js/components/ui/icon-list-basic/icon.reel/icon.css (limited to 'js/components/ui/icon-list-basic') diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css old mode 100755 new mode 100644 index ca591aff..4d71f6b8 --- a/js/components/ui/icon-list-basic/icon.reel/icon.css +++ b/js/components/ui/icon-list-basic/icon.reel/icon.css @@ -17,15 +17,18 @@ } .icon .selected{ - /*background-color: #d1d1d1;*/ background-color: #919191; } +/*highlight on hover*/ +.icon:hover{ + background-color: #919191; +} +/*end- test*/ + .icon .iconImg{ width:35px; height:35px; - /*border: 1px solid #000000; - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8);*/ margin-left: 20px; margin-top: 10px; } -- cgit v1.2.3 From 50a40c4e21b9a4d53d6d1fb739d838c0319ab09b Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 13 Feb 2012 19:55:46 -0800 Subject: new file dialog - preselect default template Signed-off-by: Ananya Sen --- js/components/ui/icon-list-basic/icon.reel/icon.js | 14 ++++++++++++++ .../ui/icon-list-basic/iconsList.reel/iconsList.html | 5 +++++ .../ui/icon-list-basic/iconsList.reel/iconsList.js | 8 +++++++- 3 files changed, 26 insertions(+), 1 deletion(-) (limited to 'js/components/ui/icon-list-basic') diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js index d934e7f1..b0279207 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.js +++ b/js/components/ui/icon-list-basic/icon.reel/icon.js @@ -22,6 +22,13 @@ var Icon = exports.Icon = Montage.create(Component, { this.needsDraw = true; } }, + + selectedUri:{ + writable:true, + enumerable:true, + value:null + }, + metadata:{ enumerable:true, writable:true, @@ -83,6 +90,13 @@ var Icon = exports.Icon = Montage.create(Component, { if(this.icondata.creationDate){this.metadata = this.metadata + "
" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);} if(this.icondata.modifiedDate){this.metadata = this.metadata + "
" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);} + //show default selection + if(this.icondata.uri === this.selectedUri){ + var selectedItemEvent = document.createEvent("Events"); + selectedItemEvent.initEvent("selectedItem", false, false); + selectedItemEvent.uri = this.icondata.uri; + this.element.dispatchEvent(selectedItemEvent); + } } }, diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html index 50a1d61d..0bb79873 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html @@ -21,6 +21,11 @@ "boundObject": {"@": "repetition1"}, "boundObjectPropertyPath": "objectAtCurrentIteration", "oneway": true + }, + "selectedUri": { + "boundObject": {"@": "owner"}, + "boundObjectPropertyPath": "selected", + "oneway": true } } }, diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js index 56eb57c3..d36aa40f 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js @@ -15,11 +15,17 @@ var IconsList = exports.IconsList = Montage.create(Component, { }, iconsViewDataObject:{ - writable:true, + writable:true, enumerable:true, value:[] }, + selected:{ + writable:true, + enumerable:true, + value:null + }, + willDraw: { enumerable: false, value: function() { -- cgit v1.2.3 From 68ce64a5a2f4a71b54d33916aaf1d57161302425 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 14 Feb 2012 20:48:40 -0800 Subject: Reverting text/html document classes and setting up MVC folder structure Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers. --- js/components/ui/icon-list-basic/icon.reel/icon.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'js/components/ui/icon-list-basic') diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css index 4d71f6b8..9fb180d2 100644 --- a/js/components/ui/icon-list-basic/icon.reel/icon.css +++ b/js/components/ui/icon-list-basic/icon.reel/icon.css @@ -5,14 +5,14 @@ */ .icon{ - width:90px; - height:80px; + width:88px; + height:78px; display: inline; float: left; -moz-border-radius: 8px; border-radius: 8px; - margin-bottom: 5px; - margin-right: 5px; + margin-bottom: 8px; + margin-right: 8px; background-color: #5f5f5f; } @@ -29,17 +29,17 @@ .icon .iconImg{ width:35px; height:35px; - margin-left: 20px; + margin-left: 26px; margin-top: 10px; } .icon .iconLabel{ margin-top:8px; white-space: nowrap; - text-overflow:ellipsis; + text-overflow: ellipsis; line-height:15px; overflow: hidden; - max-width:80%; + width: 72px; + padding: 0px 8px; text-align: center; - padding-left: 2px; } \ No newline at end of file -- cgit v1.2.3