sproutcore 1.6.0.beta.3-x86-mingw32 → 1.6.0.rc.1-x86-mingw32

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/canvas_image.js

@@ -78,10 +78,11 @@ SC.BaseTheme.canvasImageRenderDelegate = SC.RenderDelegate.create({
 
     // We only care about specific values, check specifically for what matters
     var innerFrameDidChange = ![innerFrame.x, innerFrame.y, innerFrame.width, innerFrame.height].isEqual(renderState._lastInnerFrameValues),
+        elemSizeDidChange = ![elem.width, elem.height].isEqual(renderState._lastElemSizeValues),
         backgroundDidChange = dataSource.didChangeFor('canvasImageRenderDelegate', 'backgroundColor'),
         imageDidChange = dataSource.didChangeFor('canvasImageRenderDelegate', 'image') || (image && image.complete) !== renderState._lastImageComplete;
 
-    if (innerFrameDidChange || backgroundDidChange || imageDidChange) {
+    if (elemSizeDidChange || innerFrameDidChange || backgroundDidChange || imageDidChange) {
 
       if (elem && elem.getContext) {
         elem.height = frameHeight;
@@ -103,6 +104,7 @@ SC.BaseTheme.canvasImageRenderDelegate = SC.RenderDelegate.create({
 
       // Update caches
       renderState._lastInnerFrameValues = [innerFrame.x, innerFrame.y, innerFrame.width, innerFrame.height];
+      renderState._lastElemSizeValues = [elem.width, elem.height];
       renderState._lastImageComplete = image && image.complete;
     }
   }

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/render_delegate.js

@@ -14,7 +14,7 @@
   and can be simpler to subclass between themes than `SC.Object`.
 
   Creating & Subclassing
-  ============================
+  ===
   You create render delegates just like you create SC.Objects:
 
       MyTheme.someRenderDelegate = SC.RenderDelegate.create({ ... });
@@ -40,7 +40,7 @@
   that you expect to be instances.
 
   Rendering and Updating
-  =========================
+  ===
   Render delegates are most commonly used for two things: rendering and updating
   DOM representations of controls.
 
@@ -61,7 +61,7 @@
       }
 
   Variables
-  ==========================
+  ===
   The data source provides your render delegate with all of the information
   needed to render. However, the render delegate's consumer--usually a view--
   may need to get information back.
@@ -111,7 +111,7 @@
   helper discussion below.
 
   Helpers
-  =====================
+  ===
   SC.RenderDelegate have "helper methods" to assist the rendering process.
   There are a few built-in helpers, and you can add your own.
 
@@ -242,7 +242,7 @@
       });
 
   Data Sources
-  ====================
+  ===
   Render delegates get the content to be rendered from their data sources.
 
   A data source can be any object, so long as the object implements
@@ -260,10 +260,10 @@
     While render delegates are _usually_ completely stateless, there are
     cases where they may need to save some sort of state.
 */
-SC.RenderDelegate = {
+SC.RenderDelegate = /** @scope SC.RenderDelegate.prototype */{
+  
   // docs will look more natural if these are all considered instance
   // methods/properties.
-  /*@scope SC.RenderDelegate.prototype*/
 
   /**
     Creates a new render delegate based on this one. When you want to

data/lib/frameworks/sproutcore/frameworks/foundation/resources/button_view.css

@@ -0,0 +1,36 @@
+/* SC.ButtonView */
+.sc-button-view {
+  display: inline-block ;
+  vertical-align: middle;
+  text-decoration: none ;
+  border: 1px #555 solid;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  
+  &.sc-static-layout {
+    margin: 0 4px;
+  }
+  .sc-button-inner {
+    position: relative;
+    display:  block;
+    height: 100%;
+    text-align: center ;
+  }
+  label {
+    position: relative;
+    display: block;
+    line-height: 21px;
+    text-align: center;
+  }
+  img {
+    vertical-align: middle ;
+    margin-right: 2px;
+    position: relative ;
+    top: -2px;
+    left: -2px;
+  }
+  
+  .ie7 &{
+    display: inline;
+  }
+}

data/lib/frameworks/sproutcore/frameworks/foundation/resources/label.css

@@ -0,0 +1,47 @@
+/* SC.LabelView */
+
+.sc-label-view {
+  font-weight: normal;
+  text-align: left;
+  
+  &.icon {
+  	position: relative;
+  	vertical-align: middle;
+  }
+  
+  &.sc-hint {
+  	position: absolute;
+  	top: 3px;
+  	left: 1px;
+  	right: 1px;
+  	bottom: 3px;
+  	padding: 0px;
+  	color: #aaa ;
+  	font-size: 12px;
+  }
+  
+  &.disabled {
+  	color: #999;
+  	color: rgba(50,50,50,0.5);
+  }
+  
+  &.sc-large-size {
+  	font-size: 18px;
+  	line-height: 24px;
+  }
+  
+  &.sc-regular-size {
+  	font-size: 12px;
+  	line-height: 19px;
+  }
+  
+  &.sc-small-size {
+  	font-size: 11px;
+  	line-height: 14px;
+  }
+  
+  &.sc-tiny-size {
+  	font-size: 9px;
+  	line-height: 12px;
+  }
+}

data/lib/frameworks/sproutcore/frameworks/foundation/{english.lproj → resources}/static_layout.css

@@ -1,5 +1,5 @@
 /* SC.StaticLayout Support */
 
-.sc-static-layout, .sc-view.sc-static-layout {
+.sc-view.sc-static-layout {
   position: relative;
 }

data/lib/frameworks/sproutcore/frameworks/foundation/resources/text_field.css

@@ -0,0 +1,130 @@
+/* Common SC.TextFieldView styles - needed to work properly */
+
+.sc-text-field-view {
+  border:none;
+  z-index:100;
+  overflow: visible;
+  background :white;
+  .border {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    bottom: 0px;
+    right: 0px;
+  }
+  .padding {
+    top: 0px;
+    left: 3px;
+    bottom: 0px;
+    right: 3px;
+    position: absolute;
+  }
+  &.text-area .padding {
+    right: 0px;
+  }
+  &.sc-text-field-accessory-view {
+  	z-index: 2;
+  }
+  input {
+  	position: absolute;
+  	top: 0px;
+  	left: 0px;
+  	width: 100%;
+  	height: 100%;
+  	line-height: 100%;
+    bottom: 0px;
+  	right: 0px;
+  	display: block;
+  	background: transparent;
+  	vertical-align: middle;
+  	border: none;
+  	outline: none;
+  	-webkit-appearance:none;
+  }
+  
+  textarea {
+    position: absolute;
+  	top: 0px;
+  	left: 0px;
+  	width:100%;
+    bottom: 0px;
+  	right: 0px;
+  	display: block;
+  	background: transparent;
+  	vertical-align: middle;
+  	resize: none;
+  	overflow: auto;
+  	border: none;
+    outline: none;
+    -webkit-appearance:none;
+  }
+  
+  
+  .sc-hint {
+  	z-index: 1;
+  	position: absolute;
+  	top: 3px;
+  	left: 1px;
+  	right: 1px;
+  	bottom: 3px;
+  	padding: 0px;
+  	color: #aaa ;
+  	font-size: 12px;
+  }
+
+  &.text-area .sc-hint {
+  	top: 2px;
+  	left: 3px;
+  	right: 3px;
+  	bottom: 2px;
+  }
+
+  &.focus .sc-hint,
+  &.not-empty .sc-hint {
+    display: none ;
+  }
+
+  &.sc-hint .field{
+    color: #B3B3B3 !important;
+  }
+
+  .safari &{
+    &.focus {
+      outline: auto 7px -webkit-focus-ring-color; 
+      outline-offset: -2px;
+    } 
+    .border {
+      -webkit-appearance: textfield;
+    }
+  }
+
+  .mozilla &{
+    &.focus {
+      outline-color:-moz-mac-focusring;
+      outline-offset:-5px;
+      outline-style:solid;
+      outline-width:3px;
+    } 
+    .border {
+      -moz-appearance: textfield;
+    }
+    textarea.field {
+    	height: 100%;
+    }
+  }
+
+  .msie &{
+    &.focus {
+      outline: 1px dotted;
+    }
+    .border {
+      border:1px inset;
+    }
+    input.field {
+      padding-bottom: 1px;
+    }
+    textarea.field {
+    	height: 100%;
+    }
+  } 
+}

data/lib/frameworks/sproutcore/frameworks/foundation/system/chance.js

@@ -62,4 +62,8 @@ SC.chance = {
   }
 };
 
-SC.ready(SC.chance, 'preloadImages');
+
+// Disabling image proloading in the mean time temporarly. 
+// If you want to enable it in your
+// app add the following line.
+//SC.ready(SC.chance, 'preloadImages');

data/lib/frameworks/sproutcore/frameworks/foundation/system/string.js

@@ -8,20 +8,7 @@
 
 /** @private */
 SC.STRING_TITLEIZE_REGEXP = (/([\s|\-|\_|\n])([^\s|\-|\_|\n]?)/g);
-
-/** @private */
 SC.STRING_HUMANIZE_REGEXP = (/[\-_]/g);
-
-/** @private */
-SC.STRING_TRIM_REGEXP = (/^\s+|\s+$/g);
-
-/** @private */
-SC.STRING_TRIM_LEFT_REGEXP = (/^\s+/g);
-
-/** @private */
-SC.STRING_TRIM_RIGHT_REGEXP = (/\s+$/g);
-
-/** @private */
 SC.STRING_REGEXP_ESCAPED_REGEXP = (/([\\\.\+\*\?\[\^\]\$\(\)\{\}\=\!\<\>\|\:])/g);
 
 /** @private
@@ -313,36 +300,6 @@ SC.mixin(SC.String, {
     return ret;
   },
 
-  /**
-    Removes any extra whitespace from the edges of the string. This method is
-    also aliased as strip().
-
-    @param {String} str String to trim
-    @returns {String} the trimmed string
-  */
-  trim: function(str) {
-    return str.replace(SC.STRING_TRIM_REGEXP, "");
-  },
-
-  /**
-    Removes any extra whitespace from the left edge of the string.
-
-    @param {String} str String to left trim
-    @returns {String} the trimmed string
-  */
-  trimLeft: function (str) {
-    return str.replace(SC.STRING_TRIM_LEFT_REGEXP, "");
-  },
-
-  /**
-    Removes any extra whitespace from the right edge of the string.
-
-    @param {String} str String to right trim
-    @returns {String} the trimmed string
-  */
-  trimRight: function (str) {
-    return str.replace(SC.STRING_TRIM_RIGHT_REGEXP, "");
-  },
 
   /**
     Converts a word into its plural form.

data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/string_measurement.js

@@ -10,7 +10,7 @@ SC.mixin( /** @scope SC */ {
   _copy_computed_props: [
     "maxWidth", "maxHeight", "paddingLeft", "paddingRight", "paddingTop", "paddingBottom",
     "fontFamily", "fontSize", "fontStyle", "fontWeight", "fontVariant", "lineHeight",
-    "whiteSpace"
+    "whiteSpace", "letterSpacing"
   ],
 
   /**
@@ -219,8 +219,11 @@ SC.mixin( /** @scope SC */ {
       throw "measureString requires a string measurement environment to be set up. Did you mean metricsForString?";
     }
 
+    // since the string has already been escaped (if the user wants it to be),
+    // we should set the innerHTML instead of innertext
+    if(ignoreEscape) element.innerHTML = string;
     // the conclusion of which to use (innerText or textContent) should be cached
-    if (typeof element.innerText != "undefined") element.innerText = string;
+    else if (typeof element.innerText != "undefined") element.innerText = string;
     else element.textContent = string;
 
     // generate result

data/lib/frameworks/sproutcore/frameworks/foundation/validators/date.js

@@ -33,12 +33,12 @@ SC.Validator.Date = SC.Validator.extend(
     /*
       TODO [CC] deprecated warning, we should remove this in a future release
     */
-    //@ if (debug)
+    // @if (debug)
     if (format.indexOf('%') === -1) {
       SC.Logger.warn("You're using a Date validator with a format (%@) for time.js, which has been deprecated. Please change your format to something compatible with SC.DateTime".fmt(format));
       format = this.constructor.prototype.format;
     }
-    //@ endif
+    // @endif
 
     if (SC.typeOf(object) === SC.T_NUMBER) {
       dateTime = SC.DateTime.create(object);
@@ -62,12 +62,12 @@ SC.Validator.Date = SC.Validator.extend(
     /*
       TODO [CC] deprecated warning, we should remove this in a future release
     */
-    //@ if (debug)
+    // @if (debug)
     if (format.indexOf('%') === -1) {
       SC.Logger.warn("You're using a Date validator with a format (%@) for time.js, which has been deprecated. Please change your format to something compatible with SC.DateTime".fmt(format));
       format = this.constructor.prototype.format;
     }
-    //@ endif
+    // @endif
 
     if (value) {
       dateTime = SC.DateTime.parse(value, format);