Changeset 5015

Timestamp:

10/18/07 19:49:41 (1 year ago)

Author:

pagameba

Message:

semi-colon and curly brace stuff for the Rico library.

Files:

• trunk/openlayers/lib/Rico/Color.js (modified) (5 diffs)
• trunk/openlayers/lib/Rico/Corner.js (modified) (10 diffs)

trunk/openlayers/lib/Rico/Color.js

@@ -92 +92 @@
-    var shortHexCode = hexCode; 
-    var hexCode = '#';
-
-
+
+
+
+
-  }
-
-
+
+
+
-   var red   = hexCode.substring(0,2);
-   var green = hexCode.substring(2,4);
-   var blue  = hexCode.substring(4,6);
-   return new OpenLayers.Rico.Color( parseInt(red,16), parseInt(green,16), parseInt(blue,16) );
-
+;
-
-/**
@@ -114 +117 @@
-                                        "background-color");
-
-
+ {
-      return OpenLayers.Rico.Color.createColorFromBackground(elem.parentNode);
-
-
+
+ {
-      return new OpenLayers.Rico.Color(255,255,255);
-
+
-   if ( actualColor.indexOf("rgb(") == 0 ) {
-      var colors = actualColor.substring(4, actualColor.length - 1 );
@@ -131 +134 @@
-      return OpenLayers.Rico.Color.createFromHex(actualColor);
-   }
-
+ {
-      return new OpenLayers.Rico.Color(255,255,255);
-
+
+
-
-OpenLayers.Rico.Color.HSBtoRGB = function(hue, saturation, brightness) {
@@ -188 +192 @@
-
-   return { r : parseInt(red), g : parseInt(green) , b : parseInt(blue) };
-
+;
-
-OpenLayers.Rico.Color.RGBtoHSB = function(r, g, b) {
@@ -197 +201 @@
-
-   var cmax = (r > g) ? r : g;
-
+ {
-      cmax = b;
-
+
-   var cmin = (r < g) ? r : g;
-
+ {
-      cmin = b;
-
+
-   brightness = cmax / 255.0;
-
+ {
-      saturation = (cmax - cmin)/cmax;
-else
+} else {
-      saturation = 0;
-
-
+
+ {
-      hue = 0;
-
+} 
-      var redc   = (cmax - r)/(cmax - cmin);
-        var greenc = (cmax - g)/(cmax - cmin);
-        var bluec  = (cmax - b)/(cmax - cmin);
-
-
+ {
-           hue = bluec - greenc;
-else if (g == cmax)
+} else if (g == cmax) {
-           hue = 2.0 + redc - bluec;
-else
+} else {
-           hue = 4.0 + greenc - redc;
-
+
-        hue = hue / 6.0;
-
+ {
-           hue = hue + 1.0;
+        }
-   }
-
-   return { h : hue, s : saturation, b : brightness };
-
-
+;
+

trunk/openlayers/lib/Rico/Corner.js

@@ -18 +18 @@
-OpenLayers.Rico.Corner = {
-
-
-
-
-
-
-if ( this.options.color == "fromElement" )
-
-
-
-if ( this.options.bgColor == "fromParent" )
-
-
-
-
+ 
+  
+  
+
+  
+  if ( this.options.color == "fromElement" ) {
+   
+
+  
+  if ( this.options.bgColor == "fromParent" ) {
+   
+
+  
+ 
-
-    /**   This is a helper function to change the background
@@ -108 +108 @@
-
-   _roundCornersImpl: function(e, color, bgColor) {
-
+ {
-         this._renderBorder(e,bgColor);
-
+
+
-         this._roundTopCorners(e,color,bgColor);
-
+
+
-         this._roundBottomCorners(e,color,bgColor);
+      }
-   },
-
@@ -121 +124 @@
-      var borderR = "border-right: " + borderValue;
-      var style   = "style='" + borderL + ";" + borderR +  "'";
-
+;
-   },
-
-   _roundTopCorners: function(el, color, bgColor) {
-      var corner = this._createCorner(bgColor);
-
+ {
-         corner.appendChild(this._createCornerSlice(color,bgColor,i,"top"));
+      }
-      el.style.paddingTop = 0;
-      el.insertBefore(corner,el.firstChild);
@@ -134 +138 @@
-   _roundBottomCorners: function(el, color, bgColor) {
-      var corner = this._createCorner(bgColor);
-
+ {
-         corner.appendChild(this._createCornerSlice(color,bgColor,i,"bottom"));
+      }
-      el.style.paddingBottom = 0;
-      el.appendChild(corner);
@@ -172 +177 @@
-      }
-
-
+ {
-         inStyle.height = "2px";
-
+
-      this._setMargin(slice, n, position);
-      this._setBorder(slice, n, position);
@@ -188 +193 @@
-         border  : false,
-         compact : false
-
+;
-      OpenLayers.Util.extend(this.options, options || {});
-
-      this.options.numSlices = this.options.compact ? 2 : 4;
-
+ {
-         this.options.blend = false;
+      }
-   },
-
-   _whichSideTop: function() {
-
-
-
-
-
-
-
+ {
+
+
+ {
+
+
+ {
-         return "left";
-else if (this.options.corners.indexOf("tr") >= 0)
+} else if (this.options.corners.indexOf("tr") >= 0) {
-          return "right";
+      }
-      return "";
-   },
-
-   _whichSideBottom: function() {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-         return "left";
-else if(this.options.corners.indexOf("br")>=0)
+} else if(this.options.corners.indexOf("br")>=0) {
-         return "right";
+      }
-      return "";
-   },
-
-   _borderColor : function(color,bgColor) {
-
+ {
-         return bgColor;
-else if ( this.options.border )
+} else if ( this.options.border ) {
-         return this.options.border;
-else if ( this.options.blend )
+} else if ( this.options.blend ) {
-         return this._blend( bgColor, color );
-
-
+
+
+
-   },
-
@@ -263 +273 @@
-         el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = borderSize + "px";
-      }
-
+ {
-        el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = borderSize + "px";
+      }
-   },
-
-   _marginSize: function(n) {
-
+ {
-         return 0;
-
+
-      var marginSizes          = [ 5, 3, 2, 1 ];
-      var blendedMarginSizes   = [ 3, 2, 1, 0 ];
@@ -276 +287 @@
-      var smBlendedMarginSizes = [ 1, 0 ];
-
-
+ {
-         return smBlendedMarginSizes[n];
-else if ( this.options.compact )
+} else if ( this.options.compact ) {
-         return compactMarginSizes[n];
-else if ( this.options.blend )
+} else if ( this.options.blend ) {
-         return blendedMarginSizes[n];
-else
+} else {
-         return marginSizes[n];
+      }
-   },
-
@@ -292 +304 @@
-      var actualBorderSizes      = [ 0, 2, 0, 0 ];
-
-
+ {
-         return 1;
-else if ( this.options.compact )
+} else if ( this.options.compact ) {
-         return compactBorderSizes[n];
-else if ( this.options.blend )
+} else if ( this.options.blend ) {
-         return blendedBorderSizes[n];
-else if ( this.options.border )
+} else if ( this.options.border ) {
-         return actualBorderSizes[n];
-else if ( this._isTransparent() )
+} else if ( this._isTransparent() ) {
-         return transparentBorderSizes[n];
+      }
-      return 0;
-   },
-
-return true;
+{ return true; }
-   _blend: function(c1, c2) { var cc1 = OpenLayers.Rico.Color.createFromHex(c1); cc1.blend(OpenLayers.Rico.Color.createFromHex(c2)); return cc1; },
-   _background: function(el) { try { return OpenLayers.Rico.Color.createColorFromBackground(el).asHex(); } catch(err) { return "#ffffff"; } },
@@ -312 +325 @@
-   _isBottomRounded: function() { return this._hasString(this.options.corners, "all", "bottom", "bl", "br"); },
-   _hasSingleTextChild: function(el) { return el.childNodes.length == 1 && el.childNodes[0].nodeType == 3; }
-
+;