right-rails 1.0.10 → 1.0.12

data/public/javascripts/right/uploader-src.js

@@ -1,8 +1,8 @@
 /**
- * Form uploading progress bar feature
+ * RightJS-UI Uploader v2.2.0
  * http://rightjs.org/ui/uploader
  *
- * Copyright (C) 2010 Nikolay Nemshilov
+ * Copyright (C) 2010-2011 Nikolay Nemshilov
  */
 var Uploader = RightJS.Uploader = (function(RightJS) {
 /**
@@ -10,27 +10,9 @@ var Uploader = RightJS.Uploader = (function(RightJS) {
  * it creates an abstract proxy with the common functionality
  * which then we reuse and override in the actual widgets
  *
- * Copyright (C) 2010 Nikolay Nemshilov
+ * Copyright (C) 2010-2011 Nikolay Nemshilov
  */
 
-/**
- * The uploader initialization script
- *
- * Copyright (C) 2010 Nikolay Nemshilov
- */
-var R      = RightJS,
-    $      = RightJS.$,
-    $w     = RightJS.$w,
-    $E     = RightJS.$E,
-    Xhr    = RightJS.Xhr,
-    Form   = RightJS.Form,
-    RegExp = RightJS.RegExp;
-
-
-
-
-
-
 /**
  * The widget units constructor
  *
@@ -49,7 +31,7 @@ function Widget(tag_name, methods) {
    *
    * Copyright (C) 2010 Nikolay Nemshilov
    */
-  var AbstractWidget = new RightJS.Wrapper(RightJS.Element.Wrappers[tag_name] || RightJS.Element, {
+  var AbstractWidget = new RightJS.Class(RightJS.Element.Wrappers[tag_name] || RightJS.Element, {
     /**
      * The common constructor
      *
@@ -81,7 +63,8 @@ function Widget(tag_name, methods) {
         options = {};
       }
       this.setOptions(options, this);
-      return this;
+
+      return (RightJS.Wrapper.Cache[RightJS.$uid(this._)] = this);
     },
 
   // protected
@@ -94,12 +77,16 @@ function Widget(tag_name, methods) {
      * @return void
      */
     setOptions: function(options, element) {
-      element = element || this;
-      RightJS.Options.setOptions.call(this,
-        RightJS.Object.merge(options, eval("("+(
+      if (element) {
+        options = RightJS.Object.merge(options, new Function("return "+(
           element.get('data-'+ this.key) || '{}'
-        )+")"))
-      );
+        ))());
+      }
+
+      if (options) {
+        RightJS.Options.setOptions.call(this, RightJS.Object.merge(this.options, options));
+      }
+
       return this;
     }
   });
@@ -108,7 +95,7 @@ function Widget(tag_name, methods) {
    * Creating the actual widget class
    *
    */
-  var Klass = new RightJS.Wrapper(AbstractWidget, methods);
+  var Klass = new RightJS.Class(AbstractWidget, methods);
 
   // creating the widget related shortcuts
   RightJS.Observer.createShortcuts(Klass.prototype, Klass.EVENTS || []);
@@ -118,13 +105,31 @@ function Widget(tag_name, methods) {
 
 
 /**
- * The uploading progress feature
+ * The uploader initialization script
  *
  * Copyright (C) 2010 Nikolay Nemshilov
  */
+var R      = RightJS,
+    $      = RightJS.$,
+    $w     = RightJS.$w,
+    $E     = RightJS.$E,
+    Xhr    = RightJS.Xhr,
+    Form   = RightJS.Form,
+    RegExp = RightJS.RegExp;
+
+
+
+
+
+
+/**
+ * The uploading progress feature
+ *
+ * Copyright (C) 2010-2011 Nikolay Nemshilov
+ */
 var Uploader = new Widget({
   extend: {
-    version: '2.0.0',
+    version: '2.2.0',
 
     EVENTS: $w('start update finish error'),
 
@@ -231,7 +236,7 @@ var Uploader = new Widget({
     Xhr.load(this.options.url + "?" + this.options.param + "=" + this.uid, {
       evalJSON: false,
       onSuccess: R(function(xhr) {
-        this.update(eval('('+xhr.text+')'));
+        this.update(new Function('return '+xhr.text)());
       }).bind(this)
     });
 
@@ -245,7 +250,7 @@ var Uploader = new Widget({
 
     var param = this.options.param;
     var url = this.form.get('action').replace(new RegExp('(\\?|&)'+RegExp.escape(param) + '=[^&]*', 'i'), '');
-    this.form.set('action', (R(url).includes('?') ? '&' : '?') + param + '=' + this.uid);
+    this.form.set('action', url + (R(url).includes('?') ? '&' : '?') + param + '=' + this.uid);
 
     this.show();
 
@@ -279,7 +284,18 @@ Form.include({
 });
 
 
-document.write("<style type=\"text/css\">div.rui-progress-bar,div.rui-progress-bar *{margin:0;padding:0;border:none;background:none}div.rui-progress-bar{position:relative;height:1.4em;line-height:1.4em;width:20em;border:1px solid #999}div.rui-progress-bar,div.rui-progress-bar div.bar{border-radius:0.25em;-moz-border-radius:0.25em;-webkit-border-radius:0.25em}div.rui-progress-bar div.bar{position:absolute;left:0;top:0;width:0%;height:100%;background:#CCC;z-index:1}div.rui-progress-bar div.num{position:absolute;width:100%;height:100%;z-index:2;text-align:center}div.rui-progress-bar-failed{border-color:red;color:red;background:pink}.rui-uploader{display:none}</style>");
+var embed_style = document.createElement('style'),                 
+    embed_rules = document.createTextNode("div.rui-progress-bar,div.rui-progress-bar *{margin:0;padding:0;border:none;background:none}div.rui-progress-bar{position:relative;height:1.4em;line-height:1.4em;width:20em;border:1px solid #999}div.rui-progress-bar,div.rui-progress-bar div.bar{border-radius:0.25em;-moz-border-radius:0.25em;-webkit-border-radius:0.25em}div.rui-progress-bar div.bar{position:absolute;left:0;top:0;width:0%;height:100%;background:#CCC;z-index:1}div.rui-progress-bar div.num{position:absolute;width:100%;height:100%;z-index:2;text-align:center}div.rui-progress-bar-failed{border-color:red;color:red;background:pink}.rui-uploader{display:none}");      
+                                                                   
+embed_style.type = 'text/css';                                     
+document.getElementsByTagName('head')[0].appendChild(embed_style); 
+                                                                   
+if(embed_style.styleSheet) {                                       
+  embed_style.styleSheet.cssText = embed_rules.nodeValue;          
+} else {                                                           
+  embed_style.appendChild(embed_rules);                            
+}                                                                  
+
 
 return Uploader;
 })(RightJS);

data/public/javascripts/right/uploader.js

@@ -1,13 +1,7 @@
 /**
- * Form uploading progress bar feature
+ * RightJS-UI Uploader v2.2.0
  * http://rightjs.org/ui/uploader
  *
- * Copyright (C) 2010 Nikolay Nemshilov
+ * Copyright (C) 2010-2011 Nikolay Nemshilov
  */
-var Uploader=RightJS.Uploader=function(b){var m=b.$,n=b.$w,h=b.$E,o=b.Xhr,j=b.Form,k=b.RegExp,g=new (function(a,d){if(!d){d=a;a="DIV"}var e=new b.Wrapper(b.Element.Wrappers[a]||b.Element,{initialize:function(f,c){this.key=f;var l=[{"class":"rui-"+f}];this instanceof b.Input||this instanceof b.Form||l.unshift(a);this.$super.apply(this,l);if(b.isString(c))c=b.$(c);if(c instanceof b.Element){this._=c._;if("$listeners"in c)c.$listeners=c.$listeners;c={}}this.setOptions(c,this);return this},setOptions:function(f,
-c){c=c||this;b.Options.setOptions.call(this,b.Object.merge(f,eval("("+(c.get("data-"+this.key)||"{}")+")")));return this}});e=new b.Wrapper(e,d);b.Observer.createShortcuts(e.prototype,e.EVENTS||[]);return e})({extend:{version:"2.0.0",EVENTS:n("start update finish error"),Options:{url:"/progress",param:"X-Progress-ID",timeout:1E3,round:0,fxDuration:400,cssRule:"[data-uploader]"}},initialize:function(a,d){this.form=a=m(a);var e=a.first(".rui-uploader");this.$super("uploader",e).setOptions(d,this.form).addClass("rui-progress-bar").insert([this.bar=
-this.first(".bar")||h("div",{"class":"bar"}),this.num=this.first(".num")||h("div",{"class":"num"})]);e||this.insertTo(a)},start:function(){var a={state:"starting"};return this.paint(a).prepare().request().fire("start",{data:a})},update:function(a){this.paint(a).fire("update",{data:a});switch(a.state){case "starting":case "uploading":b(this.request).bind(this).delay(this.options.timeout);break;case "done":this.fire("finish",{data:a});break;case "error":this.fire("error",{data:a});break}return this},
-paint:function(a){var d=(this.percent||0)/100;switch(a.state){case "starting":d=0;break;case "done":d=1;break;case "uploading":d=a.received/(a.size||1);break}this.percent=b(d*100).round(this.options.round);if(this.percent===0||!b.Fx||!this.options.fxDuration){this.bar._.style.width=this.percent+"%";this.num._.innerHTML=this.percent+"%"}else{this.bar.morph({width:this.percent+"%"},{duration:this.options.fxDuration});b(function(){this.num._.innerHTML=this.percent+"%"}).bind(this).delay(this.options.fxDuration/
-2)}this[a.state==="error"?"addClass":"removeClass"]("rui-progress-bar-failed");return this},request:function(){o.load(this.options.url+"?"+this.options.param+"="+this.uid,{evalJSON:false,onSuccess:b(function(a){this.update(eval("("+a.text+")"))}).bind(this)});return this},prepare:function(){this.uid="";for(i=0;i<32;i++)this.uid+=Math.random(0,15).toString(16);var a=this.options.param,d=this.form.get("action").replace(new k("(\\?|&)"+k.escape(a)+"=[^&]*","i"),"");this.form.set("action",(b(d).includes("?")?
-"&":"?")+a+"="+this.uid);this.show();return this}}),p=j.prototype.send;j.include({send:function(){if(!this.uploader&&(this.match(g.Options.cssRule)||this.first(".rui-uploader")))this.uploader=new g(this);this.uploader&&this.uploader.start();return p.apply(this,arguments)}});document.write('<style type="text/css">div.rui-progress-bar,div.rui-progress-bar *{margin:0;padding:0;border:none;background:none}div.rui-progress-bar{position:relative;height:1.4em;line-height:1.4em;width:20em;border:1px solid #999}div.rui-progress-bar,div.rui-progress-bar div.bar{border-radius:0.25em;-moz-border-radius:0.25em;-webkit-border-radius:0.25em}div.rui-progress-bar div.bar{position:absolute;left:0;top:0;width:0%;height:100%;background:#CCC;z-index:1}div.rui-progress-bar div.num{position:absolute;width:100%;height:100%;z-index:2;text-align:center}div.rui-progress-bar-failed{border-color:red;color:red;background:pink}.rui-uploader{display:none}</style>');
-return g}(RightJS);
+var Uploader=RightJS.Uploader=function(a){function b(b,c){c||(c=b,b="DIV");var d=new a.Class(a.Element.Wrappers[b]||a.Element,{initialize:function(c,d){this.key=c;var e=[{"class":"rui-"+c}];this instanceof a.Input||this instanceof a.Form||e.unshift(b),this.$super.apply(this,e),a.isString(d)&&(d=a.$(d)),d instanceof a.Element&&(this._=d._,"$listeners"in d&&(d.$listeners=d.$listeners),d={}),this.setOptions(d,this);return a.Wrapper.Cache[a.$uid(this._)]=this},setOptions:function(b,c){c&&(b=a.Object.merge(b,(new Function("return "+(c.get("data-"+this.key)||"{}")))())),b&&a.Options.setOptions.call(this,a.Object.merge(this.options,b));return this}}),e=new a.Class(d,c);a.Observer.createShortcuts(e.prototype,e.EVENTS||[]);return e}var c=a,d=a.$,e=a.$w,f=a.$E,g=a.Xhr,h=a.Form,j=a.RegExp,k=new b({extend:{version:"2.2.0",EVENTS:e("start update finish error"),Options:{url:"/progress",param:"X-Progress-ID",timeout:1e3,round:0,fxDuration:400,cssRule:"[data-uploader]"}},initialize:function(a,b){this.form=a=d(a);var c=a.first(".rui-uploader");this.$super("uploader",c).setOptions(b,this.form).addClass("rui-progress-bar").insert([this.bar=this.first(".bar")||f("div",{"class":"bar"}),this.num=this.first(".num")||f("div",{"class":"num"})]),c||this.insertTo(a)},start:function(){var a={state:"starting"};return this.paint(a).prepare().request().fire("start",{data:a})},update:function(a){this.paint(a).fire("update",{data:a});switch(a.state){case"starting":case"uploading":c(this.request).bind(this).delay(this.options.timeout);break;case"done":this.fire("finish",{data:a});break;case"error":this.fire("error",{data:a})}return this},paint:function(b){var d=(this.percent||0)/100;switch(b.state){case"starting":d=0;break;case"done":d=1;break;case"uploading":d=b.received/(b.size||1)}this.percent=c(d*100).round(this.options.round),this.percent!==0&&a.Fx&&this.options.fxDuration?(this.bar.morph({width:this.percent+"%"},{duration:this.options.fxDuration}),c(function(){this.num._.innerHTML=this.percent+"%"}).bind(this).delay(this.options.fxDuration/2)):(this.bar._.style.width=this.percent+"%",this.num._.innerHTML=this.percent+"%"),this[b.state==="error"?"addClass":"removeClass"]("rui-progress-bar-failed");return this},request:function(){g.load(this.options.url+"?"+this.options.param+"="+this.uid,{evalJSON:!1,onSuccess:c(function(a){this.update((new Function("return "+a.text))())}).bind(this)});return this},prepare:function(){this.uid="";for(i=0;i<32;i++)this.uid+=Math.random(0,15).toString(16);var a=this.options.param,b=this.form.get("action").replace(new j("(\\?|&)"+j.escape(a)+"=[^&]*","i"),"");this.form.set("action",b+(c(b).includes("?")?"&":"?")+a+"="+this.uid),this.show();return this}}),l=h.prototype.send;h.include({send:function(){!this.uploader&&(this.match(k.Options.cssRule)||this.first(".rui-uploader"))&&(this.uploader=new k(this)),this.uploader&&this.uploader.start();return l.apply(this,arguments)}});var m=document.createElement("style"),n=document.createTextNode("div.rui-progress-bar,div.rui-progress-bar *{margin:0;padding:0;border:none;background:none}div.rui-progress-bar{position:relative;height:1.4em;line-height:1.4em;width:20em;border:1px solid #999}div.rui-progress-bar,div.rui-progress-bar div.bar{border-radius:0.25em;-moz-border-radius:0.25em;-webkit-border-radius:0.25em}div.rui-progress-bar div.bar{position:absolute;left:0;top:0;width:0%;height:100%;background:#CCC;z-index:1}div.rui-progress-bar div.num{position:absolute;width:100%;height:100%;z-index:2;text-align:center}div.rui-progress-bar-failed{border-color:red;color:red;background:pink}.rui-uploader{display:none}");m.type="text/css",document.getElementsByTagName("head")[0].appendChild(m),m.styleSheet?m.styleSheet.cssText=n.nodeValue:m.appendChild(n);return k}(RightJS)