fix size formating

diff --git a/Roo/util/Format.js b/Roo/util/Format.js
index 03fbabe..3c0715c 100644 (file)
--- a/Roo/util/Format.js
+++ b/Roo/util/Format.js
@@ -246,6 +246,7 @@ Roo.util.Format = function(){
         stripTags : function(v){
             return !v ? v : String(v).replace(this.stripTagsRE, "");
         },
         stripTags : function(v){
             return !v ? v : String(v).replace(this.stripTagsRE, "");
         },

+        

         /**
          * Size in Mb,Gb etc.
          * @param {Number} value The number to be formated
         /**
          * Size in Mb,Gb etc.
          * @param {Number} value The number to be formated


@@ -255,11 +256,11 @@ Roo.util.Format = function(){
         size : function(value, decimals)
         {
             var sizes = ['b', 'k', 'M', 'G', 'T'];
         size : function(value, decimals)
         {
             var sizes = ['b', 'k', 'M', 'G', 'T'];

-            if (v == 0) {
+            if (value == 0) {

                 return 0;
             }
                 return 0;
             }

-            var i = parseInt(Math.floor(Math.log(v) / Math.log(1024)));
-            return this.number(v / Math.pow(1024, i) ,decimals) + ' ' + sizes[i];
+            var i = parseInt(Math.floor(Math.log(value) / Math.log(1024)));
+            return this.number(value/ Math.pow(1024, i) ,decimals) + ' ' + sizes[i];

         }
         
         
         }
         
         

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 3002d84..b9513b8 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -107645,6 +107645,14 @@
         "static" : false,
         "memberOf" : ""
       },
         "static" : false,
         "memberOf" : ""
       },

+      {
+        "name" : "size",
+        "type" : "function",
+        "desc" : "Size in Mb,Gb etc.",
+        "sig" : "(value, decimals)",
+        "static" : false,
+        "memberOf" : ""
+      },

       {
         "name" : "stripTags",
         "type" : "function",
       {
         "name" : "stripTags",
         "type" : "function",

diff --git a/docs/src/Roo_util_Format.js.html b/docs/src/Roo_util_Format.js.html
index 26e8e5b..a6e4997 100644 (file)
--- a/docs/src/Roo_util_Format.js.html
+++ b/docs/src/Roo_util_Format.js.html
@@ -245,7 +245,25 @@
          */
         </span><span class="jsdoc-var">stripTags </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v</span><span class="jsdoc-syntax">){
             </span><span class="jsdoc-keyword">return </span><span class="jsdoc-syntax">!</span><span class="jsdoc-var">v </span><span class="jsdoc-syntax">? </span><span class="jsdoc-var">v </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">String</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v</span><span class="jsdoc-syntax">)</span><span class="jsdoc-var">.replace</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.stripTagsRE</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">&quot;&quot;</span><span class="jsdoc-syntax">);
          */
         </span><span class="jsdoc-var">stripTags </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v</span><span class="jsdoc-syntax">){
             </span><span class="jsdoc-keyword">return </span><span class="jsdoc-syntax">!</span><span class="jsdoc-var">v </span><span class="jsdoc-syntax">? </span><span class="jsdoc-var">v </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">String</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v</span><span class="jsdoc-syntax">)</span><span class="jsdoc-var">.replace</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.stripTagsRE</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">&quot;&quot;</span><span class="jsdoc-syntax">);

+        },
+        </span><span class="jsdoc-comment">/**
+         * Size in Mb,Gb etc.
+         * @param {Number} value The number to be formated
+         * @param {number} decimals how many decimal places
+         * @return {String} the formated string
+         */
+        </span><span class="jsdoc-var">size </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">value</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">decimals</span><span class="jsdoc-syntax">)
+        {
+            </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">sizes </span><span class="jsdoc-syntax">= [</span><span class="jsdoc-string">'b'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'k'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'M'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'G'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'T'</span><span class="jsdoc-syntax">];
+            </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v </span><span class="jsdoc-syntax">== 0) {
+                </span><span class="jsdoc-keyword">return </span><span class="jsdoc-syntax">0;
+            }
+            </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">i </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">parseInt</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Math.floor</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Math.log</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v</span><span class="jsdoc-syntax">) / </span><span class="jsdoc-var">Math.log</span><span class="jsdoc-syntax">(1024)));
+            </span><span class="jsdoc-keyword">return </span><span class="jsdoc-var">this.number</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v </span><span class="jsdoc-syntax">/ </span><span class="jsdoc-var">Math.pow</span><span class="jsdoc-syntax">(1024, </span><span class="jsdoc-var">i</span><span class="jsdoc-syntax">) ,</span><span class="jsdoc-var">decimals</span><span class="jsdoc-syntax">) + </span><span class="jsdoc-string">' ' </span><span class="jsdoc-syntax">+ </span><span class="jsdoc-var">sizes</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">i</span><span class="jsdoc-syntax">];

         }
         }

+
+
+

     };
 }();
 </span><span class="jsdoc-var">Roo.util.Format.defaults </span><span class="jsdoc-syntax">= {
     };
 }();
 </span><span class="jsdoc-var">Roo.util.Format.defaults </span><span class="jsdoc-syntax">= {

diff --git a/docs/symbols/Roo.util.Format.json b/docs/symbols/Roo.util.Format.json
index b22a27b..2e053ff 100644 (file)
--- a/docs/symbols/Roo.util.Format.json
+++ b/docs/symbols/Roo.util.Format.json
@@ -242,6 +242,39 @@
         }
       ]
     },
         }
       ]
     },

+    {
+      "name" : "size",
+      "desc" : "Size in Mb,Gb etc.",
+      "isStatic" : false,
+      "isConstructor" : false,
+      "isPrivate" : false,
+      "memberOf" : "Roo.util.Format",
+      "example" : "",
+      "deprecated" : "",
+      "since" : "",
+      "see" : "",
+      "params" : [
+        {
+          "name" : "value",
+          "type" : "Number",
+          "desc" : "The number to be formated",
+          "isOptional" : false
+        },
+        {
+          "name" : "decimals",
+          "type" : "number",
+          "desc" : "how many decimal places",
+          "isOptional" : false
+        }
+      ],
+      "returns" : [
+        {
+          "name" : "",
+          "type" : "String",
+          "desc" : "the formated string"
+        }
+      ]
+    },

     {
       "name" : "toFixed",
       "desc" : "safer version of Math.toFixed..??/",
     {
       "name" : "toFixed",
       "desc" : "safer version of Math.toFixed..??/",

diff --git a/roojs-all.js b/roojs-all.js
index e5313d0..b33beb3 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -574,7 +574,7 @@ return eval(fn).apply(window,B);}else{return eval(fn).call(window,value);}},toFi
 var fd=(ps[1]+z);var r=fd.substring(0,n);var rm=fd.substring(n);if(rm<5){return ps[0]+'.'+r;}r*=1;r++;if(String(r).length!=n){ps[0]*=1;ps[0]++;r=String(r).substring(1);}return ps[0]+'.'+r;},usMoney:function(v){return '$'+Roo.util.Format.number(v);},number:function(v,B,C){B=typeof(B)=='undefined'?2:B;
 C=typeof(C)=='undefined'?',':C;var D=Math.pow(10,B);var E=String(D).substring(1);v=(Math.round((v-0)*D))/D;v=String(v);var ps=v.split('.');var F=ps[0];var r=/(\d+)(\d{3})/;if(C.length!=0){F=F.replace(/\B(?=(\d{3})+(?!\d))/g,C);}var G=ps[1]?(B?('.'+ps[1]+E.substring(ps[1].length)):''):(B?('.'+E):'');
 return F+G;},date:function(v,B){if(!v){return "";}if(!(v instanceof Date)){v=new Date(Date.parse(v));}return v.dateFormat(B||Roo.util.Format.defaults.date);},dateRenderer:function(B){return function(v){return Roo.util.Format.date(v,B);};},stripTagsRE:/<\/?[^>]+>/gi,stripTags:function(v){return !v?v:String(v).replace(this.stripTagsRE,"");
 var fd=(ps[1]+z);var r=fd.substring(0,n);var rm=fd.substring(n);if(rm<5){return ps[0]+'.'+r;}r*=1;r++;if(String(r).length!=n){ps[0]*=1;ps[0]++;r=String(r).substring(1);}return ps[0]+'.'+r;},usMoney:function(v){return '$'+Roo.util.Format.number(v);},number:function(v,B,C){B=typeof(B)=='undefined'?2:B;
 C=typeof(C)=='undefined'?',':C;var D=Math.pow(10,B);var E=String(D).substring(1);v=(Math.round((v-0)*D))/D;v=String(v);var ps=v.split('.');var F=ps[0];var r=/(\d+)(\d{3})/;if(C.length!=0){F=F.replace(/\B(?=(\d{3})+(?!\d))/g,C);}var G=ps[1]?(B?('.'+ps[1]+E.substring(ps[1].length)):''):(B?('.'+E):'');
 return F+G;},date:function(v,B){if(!v){return "";}if(!(v instanceof Date)){v=new Date(Date.parse(v));}return v.dateFormat(B||Roo.util.Format.defaults.date);},dateRenderer:function(B){return function(v){return Roo.util.Format.date(v,B);};},stripTagsRE:/<\/?[^>]+>/gi,stripTags:function(v){return !v?v:String(v).replace(this.stripTagsRE,"");

-}};}();Roo.util.Format.defaults={date:'d/M/Y'};
+},size:function(B,C){var D=['b','k','M','G','T'];if(v==0){return 0;}var i=parseInt(Math.floor(Math.log(v)/Math.log(1024)));return this.number(v/Math.pow(1024,i),C)+' '+D[i];}};}();Roo.util.Format.defaults={date:'d/M/Y'};

 // Roo/MasterTemplate.js
 Roo.MasterTemplate=function(){Roo.MasterTemplate.superclass.constructor.apply(this,arguments);this.originalHtml=this.html;var st={};var m,re=this.subTemplateRe;re.lastIndex=0;var A=0;while(m=re.exec(this.html)){var B=m[1],C=m[2];st[A]={name:B,index:A,buffer:[],tpl:new Roo.Template(C)}
 ;if(B){st[B]=st[A];}st[A].tpl.compile();st[A].tpl.call=this.call.createDelegate(this);A++;}this.subCount=A;this.subs=st;};Roo.extend(Roo.MasterTemplate,Roo.Template,{subTemplateRe:/<tpl(?:\sname="([\w-]+)")?>((?:.|\n)*?)<\/tpl>/gi,add:function(A,B){if(arguments.length==1){B=arguments[0];
 // Roo/MasterTemplate.js
 Roo.MasterTemplate=function(){Roo.MasterTemplate.superclass.constructor.apply(this,arguments);this.originalHtml=this.html;var st={};var m,re=this.subTemplateRe;re.lastIndex=0;var A=0;while(m=re.exec(this.html)){var B=m[1],C=m[2];st[A]={name:B,index:A,buffer:[],tpl:new Roo.Template(C)}
 ;if(B){st[B]=st[A];}st[A].tpl.compile();st[A].tpl.call=this.call.createDelegate(this);A++;}this.subCount=A;this.subs=st;};Roo.extend(Roo.MasterTemplate,Roo.Template,{subTemplateRe:/<tpl(?:\sname="([\w-]+)")?>((?:.|\n)*?)<\/tpl>/gi,add:function(A,B){if(arguments.length==1){B=arguments[0];

diff --git a/roojs-core-debug.js b/roojs-core-debug.js
index 02931da..02fc5b2 100644 (file)
--- a/roojs-core-debug.js
+++ b/roojs-core-debug.js
@@ -13990,7 +13990,25 @@ Roo.util.Format = function(){
          */
         stripTags : function(v){
             return !v ? v : String(v).replace(this.stripTagsRE, "");
          */
         stripTags : function(v){
             return !v ? v : String(v).replace(this.stripTagsRE, "");

+        },
+        /**
+         * Size in Mb,Gb etc.
+         * @param {Number} value The number to be formated
+         * @param {number} decimals how many decimal places
+         * @return {String} the formated string
+         */
+        size : function(value, decimals)
+        {
+            var sizes = ['b', 'k', 'M', 'G', 'T'];
+            if (v == 0) {
+                return 0;
+            }
+            var i = parseInt(Math.floor(Math.log(v) / Math.log(1024)));
+            return this.number(v / Math.pow(1024, i) ,decimals) + ' ' + sizes[i];

         }
         }

+        
+        
+        

     };
 }();
 Roo.util.Format.defaults = {
     };
 }();
 Roo.util.Format.defaults = {

diff --git a/roojs-core.js b/roojs-core.js
index 0d25211..d5c015d 100644 (file)
--- a/roojs-core.js
+++ b/roojs-core.js
@@ -574,7 +574,7 @@ return eval(fn).apply(window,B);}else{return eval(fn).call(window,value);}},toFi
 var fd=(ps[1]+z);var r=fd.substring(0,n);var rm=fd.substring(n);if(rm<5){return ps[0]+'.'+r;}r*=1;r++;if(String(r).length!=n){ps[0]*=1;ps[0]++;r=String(r).substring(1);}return ps[0]+'.'+r;},usMoney:function(v){return '$'+Roo.util.Format.number(v);},number:function(v,B,C){B=typeof(B)=='undefined'?2:B;
 C=typeof(C)=='undefined'?',':C;var D=Math.pow(10,B);var E=String(D).substring(1);v=(Math.round((v-0)*D))/D;v=String(v);var ps=v.split('.');var F=ps[0];var r=/(\d+)(\d{3})/;if(C.length!=0){F=F.replace(/\B(?=(\d{3})+(?!\d))/g,C);}var G=ps[1]?(B?('.'+ps[1]+E.substring(ps[1].length)):''):(B?('.'+E):'');
 return F+G;},date:function(v,B){if(!v){return "";}if(!(v instanceof Date)){v=new Date(Date.parse(v));}return v.dateFormat(B||Roo.util.Format.defaults.date);},dateRenderer:function(B){return function(v){return Roo.util.Format.date(v,B);};},stripTagsRE:/<\/?[^>]+>/gi,stripTags:function(v){return !v?v:String(v).replace(this.stripTagsRE,"");
 var fd=(ps[1]+z);var r=fd.substring(0,n);var rm=fd.substring(n);if(rm<5){return ps[0]+'.'+r;}r*=1;r++;if(String(r).length!=n){ps[0]*=1;ps[0]++;r=String(r).substring(1);}return ps[0]+'.'+r;},usMoney:function(v){return '$'+Roo.util.Format.number(v);},number:function(v,B,C){B=typeof(B)=='undefined'?2:B;
 C=typeof(C)=='undefined'?',':C;var D=Math.pow(10,B);var E=String(D).substring(1);v=(Math.round((v-0)*D))/D;v=String(v);var ps=v.split('.');var F=ps[0];var r=/(\d+)(\d{3})/;if(C.length!=0){F=F.replace(/\B(?=(\d{3})+(?!\d))/g,C);}var G=ps[1]?(B?('.'+ps[1]+E.substring(ps[1].length)):''):(B?('.'+E):'');
 return F+G;},date:function(v,B){if(!v){return "";}if(!(v instanceof Date)){v=new Date(Date.parse(v));}return v.dateFormat(B||Roo.util.Format.defaults.date);},dateRenderer:function(B){return function(v){return Roo.util.Format.date(v,B);};},stripTagsRE:/<\/?[^>]+>/gi,stripTags:function(v){return !v?v:String(v).replace(this.stripTagsRE,"");

-}};}();Roo.util.Format.defaults={date:'d/M/Y'};
+},size:function(B,C){var D=['b','k','M','G','T'];if(v==0){return 0;}var i=parseInt(Math.floor(Math.log(v)/Math.log(1024)));return this.number(v/Math.pow(1024,i),C)+' '+D[i];}};}();Roo.util.Format.defaults={date:'d/M/Y'};

 // Roo/MasterTemplate.js
 Roo.MasterTemplate=function(){Roo.MasterTemplate.superclass.constructor.apply(this,arguments);this.originalHtml=this.html;var st={};var m,re=this.subTemplateRe;re.lastIndex=0;var A=0;while(m=re.exec(this.html)){var B=m[1],C=m[2];st[A]={name:B,index:A,buffer:[],tpl:new Roo.Template(C)}
 ;if(B){st[B]=st[A];}st[A].tpl.compile();st[A].tpl.call=this.call.createDelegate(this);A++;}this.subCount=A;this.subs=st;};Roo.extend(Roo.MasterTemplate,Roo.Template,{subTemplateRe:/<tpl(?:\sname="([\w-]+)")?>((?:.|\n)*?)<\/tpl>/gi,add:function(A,B){if(arguments.length==1){B=arguments[0];
 // Roo/MasterTemplate.js
 Roo.MasterTemplate=function(){Roo.MasterTemplate.superclass.constructor.apply(this,arguments);this.originalHtml=this.html;var st={};var m,re=this.subTemplateRe;re.lastIndex=0;var A=0;while(m=re.exec(this.html)){var B=m[1],C=m[2];st[A]={name:B,index:A,buffer:[],tpl:new Roo.Template(C)}
 ;if(B){st[B]=st[A];}st[A].tpl.compile();st[A].tpl.call=this.call.createDelegate(this);A++;}this.subCount=A;this.subs=st;};Roo.extend(Roo.MasterTemplate,Roo.Template,{subTemplateRe:/<tpl(?:\sname="([\w-]+)")?>((?:.|\n)*?)<\/tpl>/gi,add:function(A,B){if(arguments.length==1){B=arguments[0];

diff --git a/roojs-debug.js b/roojs-debug.js
index ba91ad0..4c9a82c 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -13990,7 +13990,25 @@ Roo.util.Format = function(){
          */
         stripTags : function(v){
             return !v ? v : String(v).replace(this.stripTagsRE, "");
          */
         stripTags : function(v){
             return !v ? v : String(v).replace(this.stripTagsRE, "");

+        },
+        /**
+         * Size in Mb,Gb etc.
+         * @param {Number} value The number to be formated
+         * @param {number} decimals how many decimal places
+         * @return {String} the formated string
+         */
+        size : function(value, decimals)
+        {
+            var sizes = ['b', 'k', 'M', 'G', 'T'];
+            if (v == 0) {
+                return 0;
+            }
+            var i = parseInt(Math.floor(Math.log(v) / Math.log(1024)));
+            return this.number(v / Math.pow(1024, i) ,decimals) + ' ' + sizes[i];

         }
         }

+        
+        
+        

     };
 }();
 Roo.util.Format.defaults = {
     };
 }();
 Roo.util.Format.defaults = {