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/file-input.reel/file-input.css | 0 js/components/ui/file-input.reel/file-input.html | 0 js/components/ui/file-input.reel/file-input.js | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 js/components/ui/file-input.reel/file-input.css mode change 100644 => 100755 js/components/ui/file-input.reel/file-input.html mode change 100644 => 100755 js/components/ui/file-input.reel/file-input.js (limited to 'js/components/ui/file-input.reel') diff --git a/js/components/ui/file-input.reel/file-input.css b/js/components/ui/file-input.reel/file-input.css old mode 100644 new mode 100755 diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html old mode 100644 new mode 100755 diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js old mode 100644 new mode 100755 -- cgit v1.2.3 From d2f4d5e5f6742d53b6324d585a700566f73c992a Mon Sep 17 00:00:00 2001 From: mqg734 Date: Tue, 21 Feb 2012 16:49:11 -0800 Subject: Updated Materials Library and Materials Editor Popup to work with latest version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error. --- js/components/ui/file-input.reel/file-input.html | 6 +++--- js/components/ui/file-input.reel/file-input.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'js/components/ui/file-input.reel') diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html index 5cdd8f9e..2a8546a5 100755 --- a/js/components/ui/file-input.reel/file-input.html +++ b/js/components/ui/file-input.reel/file-input.html @@ -11,7 +11,7 @@
-