h5_uploader 0.3.1 → 0.3.2

data/README.md

@@ -20,4 +20,16 @@ Run bundle install.
 
 
 ##js library options and docs
-See [file-upload](https://github.com/jgoguen/file-uploader) 
+See [file-upload](https://github.com/jgoguen/file-uploader)
+
+##Custom options
+Added a custom  option  *evalResponse*  default to false. This is useful when Rails return a js to be evaluated and not to be converted into json. Note that if multiple file are uploaded the code is evaluated for any response and not on upload complete. 
+If option is true a valid response for the uploader is soemthing like this:
+
+	(function(){
+	    
+		// your callback code here
+	
+		return {success:true};
+	})();
+	

data/lib/assets/fileuploader.js

@@ -261,7 +261,7 @@ var qq = qq || {};
 qq.FileUploaderBasic = function(o){
     this._options = {
         // set to true to see the server response
-        debug: false,
+        debug: true,
         action: '/server/upload',
         params: {},
         button: null,
@@ -273,11 +273,12 @@ qq.FileUploaderBasic = function(o){
         allowedExtensions: [],
         sizeLimit: 0,
         minSizeLimit: 0,
+        evalResponse : false, // used in rails UJS perform the direct callback evaluation
         // events
         // return false to cancel submit
         onSubmit: function(id, fileName){},
         onProgress: function(id, fileName, loaded, total){},
-        onComplete: function(id, fileName, responseJSON){},
+        onComplete: function(id, fileName, responseJSON,qq){},
         onCancel: function(id, fileName){},
         // messages
         messages: {
@@ -338,13 +339,14 @@ qq.FileUploaderBasic.prototype = {
             debug: this._options.debug,
             action: this._options.action,
             maxConnections: this._options.maxConnections,
+            evalResponse : this._options.evalResponse,
             onProgress: function(id, fileName, loaded, total){
                 self._onProgress(id, fileName, loaded, total);
                 self._options.onProgress.call(self, id, fileName, loaded, total);
             },
-            onComplete: function(id, fileName, result){
-                self._onComplete(id, fileName, result);
-                self._options.onComplete.call(self, id, fileName, result);
+            onComplete: function(id, fileName, result,qq){
+                self._onComplete(id, fileName, result,qq);
+                self._options.onComplete.call(self, id, fileName, result,qq);
             },
             onCancel: function(id, fileName){
                 self._onCancel(id, fileName);
@@ -372,7 +374,7 @@ qq.FileUploaderBasic.prototype = {
     },
     _onProgress: function(id, fileName, loaded, total){
     },
-    _onComplete: function(id, fileName, result){
+    _onComplete: function(id, fileName, result,qq){
         this._filesInProgress--;
         if (result.error){
             this._options.showMessage(result.error);
@@ -910,7 +912,7 @@ qq.UploadHandlerAbstract = function(o){
         // maximum number of concurrent uploads
         maxConnections: 999,
         onProgress: function(id, fileName, loaded, total){},
-        onComplete: function(id, fileName, response){},
+        onComplete: function(id, fileName, response,qq){},
         onCancel: function(id, fileName){}
     };
     qq.extend(this._options, o);
@@ -1062,7 +1064,7 @@ qq.extend(qq.UploadHandlerForm.prototype, {
 
             var response = self._getIframeContentJSON(iframe);
 
-            self._options.onComplete(id, fileName, response);
+            self._options.onComplete(id, fileName, response,qq);
             self._dequeue(id);
 
             delete self._inputs[id];
@@ -1271,15 +1273,21 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
             var response;
 
             try {
-                response = eval("(" + xhr.responseText + ")");
+
+                if(this._options.evalResponse){
+                    response = eval(xhr.responseText);
+                }else{
+                    response = eval("(" + xhr.responseText + ")");
+                }
+
             } catch(err){
                 response = {};
             }
 
-            this._options.onComplete(id, name, response);
+            this._options.onComplete(id, name, response,this);
 
         } else {
-            this._options.onComplete(id, name, {});
+            this._options.onComplete(id, name, {},this);
         }
 
         this._files[id] = null;

data/lib/h5_uploader.rb

@@ -12,7 +12,8 @@ module Fg
       jss = jss << ",params: #{options[:params].to_json}" unless options[:params].nil?  
 
       options.each do |key,value| next if [:id,:allowedExtensions,:params].include?(key)
-        jss = jss << ",#{key}: '#{value}'"
+        val = (key =~ /[^(on|show|mess)]/) > 0 ? "#{value}" : "'#{value}'" 
+        jss = jss << ",#{key}: #{val}"
       end
 
       jss = jss << "});"            

data/lib/h5_uploader/version.rb

@@ -1,3 +1,3 @@
 module Uploader
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: h5_uploader
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-07 00:00:00.000000000 +02:00
+date: 2011-07-08 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-raw-upload
-  requirement: &2157964420 !ruby/object:Gem::Requirement
+  requirement: &2154180720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157964420
+  version_requirements: *2154180720
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2157964000 !ruby/object:Gem::Requirement
+  requirement: &2154180300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157964000
+  version_requirements: *2154180300
 description: Gem add a form builder called uploader that shows a button for multiple
   file uploads usign html5 techniques
 email: