Changeset 1775

Timestamp:

03/26/2007 02:14:23 AM (20 months ago)

Author:

wei

Message:

rearrange js builder and update UI components to reflect moved js libraries

Location:

branches/3.0

Files:

• UPGRADE (modified) (1 diff)
• buildscripts/jsbuilder/JavaScript Documentation Tool.html (deleted)
• buildscripts/jsbuilder/build.php (modified) (3 diffs)
• framework/Web/Javascripts/js/compressed/ajax.js (deleted)
• framework/Web/Javascripts/js/compressed/clientscripts.php (modified) (1 diff)
• framework/Web/Javascripts/js/compressed/colorpicker.js (modified) (1 diff)
• framework/Web/Javascripts/js/compressed/rico.js (deleted)
• framework/Web/Javascripts/js/debug/ajax.js (deleted)
• framework/Web/Javascripts/js/debug/clientscripts.php (modified) (1 diff)
• framework/Web/Javascripts/js/debug/colorpicker.js (modified) (31 diffs)
• framework/Web/Javascripts/js/debug/rico.js (deleted)
• framework/Web/UI/TClientScriptManager.php (modified) (1 diff)
• framework/Web/UI/WebControls/TColorPicker.php (modified) (2 diffs)
• framework/Web/UI/WebControls/TDatePicker.php (modified) (4 diffs)

branches/3.0/UPGRADE

@@ -25 +25 @@
 - TJavascriptLogger toggle key is changed from ALT-D to ALT-J. 
    Use the ToggleKey property chanage to a different key.
+- Javascript Library rico was REMOVED.
 
 Upgrading from v3.0.4

branches/3.0/buildscripts/jsbuilder/build.php

@@ -28 +28 @@
  */
 define('TARGET_DIR',realpath(dirname(__FILE__).'/../../framework/Web/Javascripts/js'));
-/**
- * Location of the perl JS doc generator.
- */
-define('JS_DOC', realpath(dirname(__FILE__).'/JSDoc/jsdoc.pl'));
-/**
- * Javascript documentation output directory.
- */
-define('DOC_OUTPUT_DIR', realpath(dirname(__FILE__).'/../../docs/Javascript'));
-/**
- * Javascript documentation build command
- */
-define('BUILD_DOC', sprintf('perl "%s" --no-sources -d "%s" ', JS_DOC, DOC_OUTPUT_DIR).'%s');
 
 define('JSMIN_AS_LIB',true);
@@ -55 +43 @@
 $libraries = array(
         'prado.js' => array(
-
-                //base javascript functions
                 'prototype/prototype.js',
-                'effects/builder.js',
-
-                'extended/base.js',
-                'extended/string.js',
-                'extended/event.js',
-                'extended/date.js',
-                'extended/builder.js',
-
-
-                //prado core
+                'scriptaculous/builder.js',
                 'prado/prado.js',
-                'prado/form.js',
-                'prado/element.js',
-
-                //controls
-                'prado/controls.js',
-                'ratings/ratings.js'
+                'prado/scriptaculous-adapter.js',
+                'prado/controls/controls.js'
         ),
 
-        //effects
         'effects.js' => array(
-                'effects/effects.js'
+                'scriptaculous/effects.js'
         ),
 
-        //logging
         'logger.js' => array(
-                'extra/logger.js',
+                'prado/logger/logger.js',
         ),
 
-        //validator
         'validator.js' => array(
-                'prado/validation3.js'
-                //'prado/validators.js'
+                'prado/validator/validation3.js'
         ),
 
-        //date picker
         'datepicker.js' => array(
-                'datepicker/datepicker.js'
+                'prado/datepicker/datepicker.js'
         ),
 
-        //color picker
         'colorpicker.js' => array(
-                'rico/colors.js',
-                'colorpicker/colorpicker.js'
+                'prado/colorpicker/colorpicker.js'
         )
 );
@@ -143 +109 @@
 }
 
-if(isset($argv[1]) && preg_match('/(doc)+/', $argv[1]))
-{
-        $files = "";
-        foreach($libraries as $lib)
-        {
-                foreach($lib as $source)
-                        $files .= sprintf(' "%s/%s"', SOURCE_DIR, $source);
-        }
-        $command = sprintf(BUILD_DOC, $files);
-        system($command);
-}
-else if($builds > 0)
-        echo "\nJavascript build complete, {$builds} file(s) compressed.";
-else
-        echo "No files to build.";
-
 ?>

branches/3.0/framework/Web/Javascripts/js/compressed/clientscripts.php

@@ -13 +13 @@
 
 //allowed libraries
-$library = array('prado', 'effects', 'ajax', 'validator', 'logger', 'datepicker', 'rico', 'colorpicker');
+$library = array('prado', 'effects', 'validator', 'logger', 'datepicker', 'colorpicker');
 
 $param = isset($_GET['js']) ? $_GET['js'] : '';

branches/3.0/framework/Web/Javascripts/js/compressed/colorpicker.js

@@ -1 +1 @@
 
-if(typeof(Rico)=="undefined")Rico={};Rico.Color=Class.create();Rico.Color.prototype={initialize:function(red,green,blue){this.rgb={r:red,g:green,b:blue};},setRed:function(r){this.rgb.r=r;},setGreen:function(g){this.rgb.g=g;},setBlue:function(b){this.rgb.b=b;},setHue:function(h){var hsb=this.asHSB();hsb.h=h;this.rgb=Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},setSaturation:function(s){var hsb=this.asHSB();hsb.s=s;this.rgb=Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},setBrightness:function(b){var hsb=this.asHSB();hsb.b=b;this.rgb=Rico.Color.HSBtoRGB(hsb.h,hsb.s,hsb.b);},darken:function(percent){var hsb=this.asHSB();this.rgb=Rico.Color.HSBtoRGB(hsb.h,hsb.s,Math.max(hsb.b-percent,0));},brighten:function(percent){var hsb=this.asHSB();this.rgb=Rico.Color.HSBtoRGB(hsb.h,hsb.s,Math.min(hsb.b+percent,1));},blend:function(other){this.rgb.r=Math.floor((this.rgb.r+other.rgb.r)/2);this.rgb.g=Math.floor((this.rgb.g+other.rgb.g)/2);this.rgb.b=Math.floor((this.rgb.b+other.rgb.b)/2);},isBright:function(){var hsb=this.asHSB();return this.asHSB().b>0.5;},isDark:function(){return!this.isBright();},asRGB:function(){return"rgb("+this.rgb.r+","+this.rgb.g+","+this.rgb.b+")";},asHex:function(){return"#"+this.rgb.r.toColorPart()+this.rgb.g.toColorPart()+this.rgb.b.toColorPart();},asHSB:function(){return Rico.Color.RGBtoHSB(this.rgb.r,this.rgb.g,this.rgb.b);},toString:function(){return this.asHex();}};Rico.Color.createFromHex=function(hexCode){if(hexCode.indexOf('#')==0)
-hexCode=hexCode.substring(1);var red="ff",green="ff",blue="ff";if(hexCode.length>4)
-{red=hexCode.substring(0,2);green=hexCode.substring(2,4);blue=hexCode.substring(4,6);}
-else if(hexCode.length>0&hexCode.length<4)
-{var r=hexCode.substring(0,1);var g=hexCode.substring(1,2);var b=hexCode.substring(2);red=r+r;green=g+g;blue=b+b;}
-return new Rico.Color(parseInt(red,16),parseInt(green,16),parseInt(blue,16));}
-Rico.Color.createColorFromBackground=function(elem){var actualColor=Element.getStyle($(elem),"background-color");if(actualColor=="transparent"&&elem.parent)
-return Rico.Color.createColorFromBackground(elem.parent);if(actualColor==null)
-return new Rico.Color(255,255,255);if(actualColor.indexOf("rgb(")==0){var colors=actualColor.substring(4,actualColor.length-1);var colorArray=colors.split(",");return new Rico.Color(parseInt(colorArray[0]),parseInt(colorArray[1]),parseInt(colorArray[2]));}
-else if(actualColor.indexOf("#")==0){return Rico.Color.createFromHex(actualColor);}
-else
-return new Rico.Color(255,255,255);}
-Rico.Color.HSBtoRGB=function(hue,saturation,brightness){var red=0;var green=0;var blue=0;if(saturation==0){red=parseInt(brightness*255.0+0.5);green=red;blue=red;}
-else{var h=(hue-Math.floor(hue))*6.0;var f=h-Math.floor(h);var p=brightness*(1.0-saturation);var q=brightness*(1.0-saturation*f);var t=brightness*(1.0-(saturation*(1.0-f)));switch(parseInt(h)){case 0:red=(brightness*255.0+0.5);green=(t*255.0+0.5);blue=(p*255.0+0.5);break;case 1:red=(q*255.0+0.5);green=(brightness*255.0+0.5);blue=(p*255.0+0.5);break;case 2:red=(p*255.0+0.5);green=(brightness*255.0+0.5);blue=(t*255.0+0.5);break;case 3:red=(p*255.0+0.5);green=(q*255.0+0.5);blue=(brightness*255.0+0.5);break;case 4:red=(t*255.0+0.5);green=(p*255.0+0.5);blue=(brightness*255.0+0.5);break;case 5:red=(brightness*255.0+0.5);green=(p*255.0+0.5);blue=(q*255.0+0.5);break;}}
-return{r:parseInt(red),g:parseInt(green),b:parseInt(blue)};}
-Rico.Color.RGBtoHSB=function(r,g,b){var hue;var saturaton;var brightness;var cmax=(r>g)?r:g;if(b>cmax)
-cmax=b;var cmin=(r<g)?r:g;if(b<cmin)
-cmin=b;brightness=cmax/255.0;if(cmax!=0)
-saturation=(cmax-cmin)/cmax;else
-saturation=0;if(saturation==0)
-hue=0;else{var redc=(cmax-r)/(cmax-cmin);var greenc=(cmax-g)/(cmax-cmin);var bluec=(cmax-b)/(cmax-cmin);if(r==cmax)
-hue=bluec-greenc;else if(g==cmax)
-hue=2.0+redc-bluec;else
-hue=4.0+greenc-redc;hue=hue/6.0;if(hue<0)
-hue=hue+1.0;}
-return{h:hue,s:saturation,b:brightness};}
 Prado.WebUI.TColorPicker=Class.create();Object.extend(Prado.WebUI.TColorPicker,{palettes:{Small:[["fff","fcc","fc9","ff9","ffc","9f9","9ff","cff","ccf","fcf"],["ccc","f66","f96","ff6","ff3","6f9","3ff","6ff","99f","f9f"],["c0c0c0","f00","f90","fc6","ff0","3f3","6cc","3cf","66c","c6c"],["999","c00","f60","fc3","fc0","3c0","0cc","36f","63f","c3c"],["666","900","c60","c93","990","090","399","33f","60c","939"],["333","600","930","963","660","060","366","009","339","636"],["000","300","630","633","330","030","033","006","309","303"]],Tiny:[["ffffff","00ff00","008000","0000ff"],["c0c0c0","ffff00","ff00ff","000080"],["808080","ff0000","800080","000000"]]},UIImages:{'button.gif':'button.gif','background.png':'background.png'}});Object.extend(Prado.WebUI.TColorPicker.prototype,{initialize:function(options)
 {var basics={Palette:'Small',ClassName:'TColorPicker',Mode:'Basic',OKButtonText:'OK',CancelButtonText:'Cancel',ShowColorPicker:true}

branches/3.0/framework/Web/Javascripts/js/debug/clientscripts.php

@@ -13 +13 @@
 
 //allowed libraries
-$library = array('prado', 'effects', 'ajax', 'validator', 'logger', 'datepicker', 'rico', 'colorpicker');
+$library = array('prado', 'effects', 'validator', 'logger', 'datepicker', 'colorpicker');
 
 $param = isset($_GET['js']) ? $_GET['js'] : '';

branches/3.0/framework/Web/Javascripts/js/debug/colorpicker.js

@@ -1 @@
-//-------------------- ricoColor.js
-if(typeof(Rico) == "undefined") Rico = {};
-
-Rico.Color = Class.create();
-
-Rico.Color.prototype = {
-
-   initialize: function(red, green, blue) {
-      this.rgb = { r: red, g : green, b : blue };
-   },
-
-   setRed: function(r) {
-      this.rgb.r = r;
-   },
-
-   setGreen: function(g) {
-      this.rgb.g = g;
-   },
-
-   setBlue: function(b) {
-      this.rgb.b = b;
-   },
-
-   setHue: function(h) {
-
-      // get an HSB model, and set the new hue...
-      var hsb = this.asHSB();
-      hsb.h = h;
-
-      // convert back to RGB...
-      this.rgb = Rico.Color.HSBtoRGB(hsb.h, hsb.s, hsb.b);
-   },
-
-   setSaturation: function(s) {
-      // get an HSB model, and set the new hue...
-      var hsb = this.asHSB();
-      hsb.s = s;
-
-      // convert back to RGB and set values...
-      this.rgb = Rico.Color.HSBtoRGB(hsb.h, hsb.s, hsb.b);
-   },
-
-   setBrightness: function(b) {
-      // get an HSB model, and set the new hue...
-      var hsb = this.asHSB();
-      hsb.b = b;
-
-      // convert back to RGB and set values...
-      this.rgb = Rico.Color.HSBtoRGB( hsb.h, hsb.s, hsb.b );
-   },
-
-   darken: function(percent) {
-      var hsb  = this.asHSB();
-      this.rgb = Rico.Color.HSBtoRGB(hsb.h, hsb.s, Math.max(hsb.b - percent,0));
-   },
-
-   brighten: function(percent) {
-      var hsb  = this.asHSB();
-      this.rgb = Rico.Color.HSBtoRGB(hsb.h, hsb.s, Math.min(hsb.b + percent,1));
-   },
-
-   blend: function(other) {
-      this.rgb.r = Math.floor((this.rgb.r + other.rgb.r)/2);
-      this.rgb.g = Math.floor((this.rgb.g + other.rgb.g)/2);
-      this.rgb.b = Math.floor((this.rgb.b + other.rgb.b)/2);
-   },
-
-   isBright: function() {
-      var hsb = this.asHSB();
-      return this.asHSB().b > 0.5;
-   },
-
-   isDark: function() {
-      return ! this.isBright();
-   },
-
-   asRGB: function() {
-      return "rgb(" + this.rgb.r + "," + this.rgb.g + "," + this.rgb.b + ")";
-   },
-
-   asHex: function() {
-      return "#" + this.rgb.r.toColorPart() + this.rgb.g.toColorPart() + this.rgb.b.toColorPart();
-   },
-
-   asHSB: function() {
-      return Rico.Color.RGBtoHSB(this.rgb.r, this.rgb.g, this.rgb.b);
-   },
-
-   toString: function() {
-      return this.asHex();
-   }
-
-};
-
-Rico.Color.createFromHex = function(hexCode) {
-
-   if ( hexCode.indexOf('#') == 0 )
-      hexCode = hexCode.substring(1);
-
-   var red = "ff", green = "ff", blue="ff";
-   if(hexCode.length > 4)
-        {
-           red   = hexCode.substring(0,2);
-           green = hexCode.substring(2,4);
-           blue  = hexCode.substring(4,6);
-        }
-        else if(hexCode.length > 0 & hexCode.length < 4)
-        {
-          var r = hexCode.substring(0,1);
-          var g = hexCode.substring(1,2);
-          var b = hexCode.substring(2);
-          red = r+r;
-          green = g+g;
-          blue = b+b;
-        }
-   return new Rico.Color( parseInt(red,16), parseInt(green,16), parseInt(blue,16) );
-}
-
-/**
- * Factory method for creating a color from the background of
- * an HTML element.
- */
-Rico.Color.createColorFromBackground = function(elem) {
-
-   var actualColor = Element.getStyle($(elem), "background-color");
-  if ( actualColor == "transparent" && elem.parent )
-      return Rico.Color.createColorFromBackground(elem.parent);
-
-   if ( actualColor == null )
-      return new Rico.Color(255,255,255);
-
-   if ( actualColor.indexOf("rgb(") == 0 ) {
-      var colors = actualColor.substring(4, actualColor.length - 1 );
-      var colorArray = colors.split(",");
-      return new Rico.Color( parseInt( colorArray[0] ),
-                            parseInt( colorArray[1] ),
-                            parseInt( colorArray[2] )  );
-
-   }
-   else if ( actualColor.indexOf("#") == 0 ) {
-          return Rico.Color.createFromHex(actualColor);
-   }
-   else
-      return new Rico.Color(255,255,255);
-}
-
-Rico.Color.HSBtoRGB = function(hue, saturation, brightness) {
-
-   var red   = 0;
-        var green = 0;
-        var blue  = 0;
-
-   if (saturation == 0) {
-      red = parseInt(brightness * 255.0 + 0.5);
-           green = red;
-           blue = red;
-        }
-        else {
-      var h = (hue - Math.floor(hue)) * 6.0;
-      var f = h - Math.floor(h);
-      var p = brightness * (1.0 - saturation);
-      var q = brightness * (1.0 - saturation * f);
-      var t = brightness * (1.0 - (saturation * (1.0 - f)));
-
-      switch (parseInt(h)) {
-         case 0:
-            red   = (brightness * 255.0 + 0.5);
-            green = (t * 255.0 + 0.5);
-            blue  = (p * 255.0 + 0.5);
-            break;
-         case 1:
-            red   = (q * 255.0 + 0.5);
-            green = (brightness * 255.0 + 0.5);
-            blue  = (p * 255.0 + 0.5);
-            break;
-         case 2:
-            red   = (p * 255.0 + 0.5);
-            green = (brightness * 255.0 + 0.5);
-            blue  = (t * 255.0 + 0.5);
-            break;
-         case 3:
-            red   = (p * 255.0 + 0.5);
-            green = (q * 255.0 + 0.5);
-            blue  = (brightness * 255.0 + 0.5);
-            break;
-         case 4:
-            red   = (t * 255.0 + 0.5);
-            green = (p * 255.0 + 0.5);
-            blue  = (brightness * 255.0 + 0.5);
-            break;
-          case 5:
-            red   = (brightness * 255.0 + 0.5);
-            green = (p * 255.0 + 0.5);
-            blue  = (q * 255.0 + 0.5);
-            break;
-            }
-        }
-
-   return { r : parseInt(red), g : parseInt(green) , b : parseInt(blue) };
-}
-
-Rico.Color.RGBtoHSB = function(r, g, b) {
-
-   var hue;
-   var saturaton;
-   var brightness;
-
-   var cmax = (r > g) ? r : g;
-   if (b > cmax)
-      cmax = b;
-
-   var cmin = (r < g) ? r : g;
-   if (b < cmin)
-      cmin = b;
-
-   brightness = cmax / 255.0;
-   if (cmax != 0)
-      saturation = (cmax - cmin)/cmax;
-   else
-      saturation = 0;
-
-   if (saturation == 0)
-      hue = 0;
-   else {
-      var redc   = (cmax - r)/(cmax - cmin);
-        var greenc = (cmax - g)/(cmax - cmin);
-        var bluec  = (cmax - b)/(cmax - cmin);
-
-        if (r == cmax)
-           hue = bluec - greenc;
-        else if (g == cmax)
-           hue = 2.0 + redc - bluec;
-      else
-           hue = 4.0 + greenc - redc;
-
-        hue = hue / 6.0;
-        if (hue < 0)
-           hue = hue + 1.0;
-   }
-
-   return { h : hue, s : saturation, b : brightness };
-}
-
-
-
 Prado.WebUI.TColorPicker = Class.create();
 
 Object.extend(Prado.WebUI.TColorPicker,
 {
-        palettes:
+        palettes: 
         {
                 Small : [["fff", "fcc", "fc9", "ff9", "ffc", "9f9", "9ff", "cff", "ccf", "fcf"],
@@ -263 +18 @@
         },
 
-        UIImages :
+        UIImages : 
         {
                 'button.gif' : 'button.gif',
@@ -274 +29 @@
 });
 
-Object.extend(Prado.WebUI.TColorPicker.prototype,
+Object.extend(Prado.WebUI.TColorPicker.prototype, 
 {
         initialize : function(options)
         {
-                var basics =
+                var basics = 
                 {
                         Palette : 'Small',
@@ -287 +42 @@
                         ShowColorPicker : true
                 }
-
+                
                 this.element = null;
                 this.showing = false;
@@ -303 +58 @@
         updatePicker : function(e)
         {
-                var color = Rico.Color.createFromHex(this.input.value);
+                var color = Rico.Color.createFromHex(this.input.value); 
                 this.button.style.backgroundColor = color.toString();
         },
-
+        
         buttonOnClick : function(event)
         {
@@ -330 +85 @@
                 }
                 this.show(mode);
-        },
+        },              
 
         show : function(type)
@@ -342 +97 @@
                         this.element.style.left = pos[0] + "px";
                         this.element.style.display = "block";
-
+                        
                         this.ieHack(type);
 
@@ -349 +104 @@
                         this._documentKeyDownEvent = this.keyPressed.bindEvent(this, type);
                         Event.observe(document.body, "click", this._documentClickEvent);
-                        Event.observe(document,"keydown", this._documentKeyDownEvent);
+                        Event.observe(document,"keydown", this._documentKeyDownEvent); 
                         this.showing = true;
 
@@ -361 +116 @@
                 }
         },
-
+        
         hide : function(event)
         {
@@ -372 +127 @@
                         this.showing = false;
                         Event.stopObserving(document.body, "click", this._documentClickEvent);
-                        Event.stopObserving(document,"keydown", this._documentKeyDownEvent);
-
+                        Event.stopObserving(document,"keydown", this._documentKeyDownEvent); 
+                        
                         if(this._observingMouseMove)
-                        {
-                                Event.stopObserving(document.body, "mousemove", this._onMouseMove);
+                        {                       
+                                Event.stopObserving(document.body, "mousemove", this._onMouseMove);     
                                 this._observingMouseMove = false;
                         }
@@ -398 +153 @@
                         within = within || el == this.input;
                         if(within) break;
-                        el = el.parentNode;
+                        el = el.parentNode;                     
                 }
                 while(el);
@@ -404 +159 @@
         },
 
-        ieHack : function()
+        ieHack : function() 
         {
                 // IE hack
-                if(this.iePopUp)
+                if(this.iePopUp) 
                 {
                         this.iePopUp.style.display = "block";
@@ -450 +205 @@
         cellOnClick : function(e)
         {
-                var el = Event.element(e);
+                var el = Event.element(e); 
                 if(el.tagName.toLowerCase() != "img")
                         return;
@@ -466 +221 @@
 
         getFullPickerContainer : function(pickerID)
-        {
+        {                       
                 //create the 3 buttons
-                this.buttons =
+                this.buttons = 
                 {
                         //Less   : INPUT({value:'Less Colors', className:'button', type:'button'}),
@@ -474 +229 @@
                         Cancel : INPUT({value:this.options.CancelButtonText, className:'button', type:'button'})
                 };
-
+                
                 //create the 6 inputs
                 var inputs = {};
@@ -485 +240 @@
                 inputs['HEX'] = INPUT({className:'hex',type:'text',size:'6',maxlength:'6'});
                 this.inputs = inputs;
-
+                
                 var images = Prado.WebUI.TColorPicker.UIImages;
 
@@ -491 +246 @@
                 this.inputs['oldColor'] = SPAN({className:'oldColor'});
 
-                var inputsTable =
+                var inputsTable = 
                         TABLE({className:'inputs'}, TBODY(null,
                                 TR(null,
@@ -504 +259 @@
                                         TD(null,'S:'),
                                         TD(null,this.inputs['S'], '%')),
-
-                                TR(null,
+                                
+                                TR(null, 
                                         TD(null,'V:'),
                                         TD(null,this.inputs['V'], '%')),
-
-                                TR(null,
+                                
+                                TR(null, 
                                         TD({className:'gap'},'R:'),
                                         TD({className:'gap'},this.inputs['R'])),
-
-                                TR(null,
+                                
+                                TR(null, 
                                         TD(null,'G:'),
                                         TD(null, this.inputs['G'])),
 
-                                TR(null,
+                                TR(null, 
                                         TD(null,'B:'),
                                         TD(null, this.inputs['B'])),
 
-                                TR(null,
+                                TR(null, 
                                         TD({className:'gap'},'#'),
                                         TD({className:'gap'},this.inputs['HEX']))
                         ));
 
-                var UIimages =
-                {
+                var UIimages = 
+                {               
                         selector : SPAN({className:'selector'}),
                         background : SPAN({className:'colorpanel'}),