sproutcore 1.6.0.1 → 1.7.1.beta

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/touch/scroller.js

@@ -0,0 +1,133 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+sc_require('views/core_scroller');
+
+/** @class
+  Implementation of a touch scroller view to be used in tandem with
+  `SC.TouchScrollView`.
+
+  To style the touch scroller view, implement your own render delegate.
+
+  @extends SC.CoreScrollerView
+ */
+SC.TouchScrollerView = SC.CoreScrollerView.extend(
+  /** @scope SC.TouchScrollerView.prototype */{
+
+  /**
+    @type Array
+    @default ['sc-touch-scroller-view']
+    @see SC.View#classNames
+   */
+  classNames: ['sc-touch-scroller-view'],
+
+  /**
+    @type Array
+    @default ['displayThumbPosition', 'displayThumbLength']
+    @see SC.View#displayProperties
+   */
+  displayProperties: ['displayThumbPosition', 'displayThumbLength'],
+
+  /**
+    @type Number
+    @default 12
+   */
+  scrollbarThickness: 12,
+
+  /**
+    @type Boolean
+    @default YES
+   */
+  isTranslucent: YES,
+  
+  /**
+    @type Number
+    @default 5
+   */
+  capLength: 5,
+  
+  /**
+    @type Number
+    @default 0
+   */
+  capOverlap: 0,
+  
+  /**
+    @type Boolean
+    @default NO
+   */
+  hasButtons: NO,
+  
+  /**
+    @type Number
+    @default 36
+   */
+  buttonOverlap: 36,
+
+  /**
+    @type String
+    @default 'touchScrollerRenderDelegate'
+   */
+  renderDelegateName: 'touchScrollerRenderDelegate',
+
+  /**
+    @type Number
+    @observes value
+    @observes _touchScrollValue
+   */
+  displayValue: function () {
+    var touchValue = this.get('_touchScrollValue');
+    return !SC.none(touchValue) ? touchValue : this.get('value');
+  }.property("value", "_touchScrollValue").cacheable(),
+
+  // ..........................................................
+  // INTERNAL SUPPORT
+  //
+
+  /** @private */
+  touchScrollDidStart: function (value) {
+    this.set("_touchScrollValue", value);
+  },
+
+  /** @private */
+  touchScrollDidEnd: function (value) {
+    this.set("_touchScrollValue", null);
+  },
+
+  /** @private */
+  touchScrollDidChange: function (value) {
+    this.set("_touchScrollValue", value);
+  },
+
+  /** @private
+    Updates the thumb display length and position to reflect
+    the ability for touch scroll views to go out of bounds.
+
+    This makes the scroller shrink when scrolling out of the
+    bounds of the view, while ensuring that the scroller doesn't
+    go past it's minimum bounds.
+   */
+  _sctcv_updateThumbDisplay: function () {
+    var max = this.get("scrollerLength") - this.get('capLength'),
+        min = this.get("minimum") + this.get('capLength'),
+        position = this.get('thumbPosition'),
+        length = this.get('thumbLength');
+
+    if (position + length > max) {
+      position = Math.min(max - 20, position);
+      length = max - position;
+    }
+
+    if (position < min) {
+      length -= min - position;
+      position = min;
+    }
+
+    this.setIfChanged('displayThumbPosition', position);
+    this.setIfChanged('displayThumbLength', Math.round(length - 1044));
+  }.observes('thumbPosition', 'thumbLength', 'scrollerLength', 'capLength', 'minimum')
+
+});

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

@@ -27,8 +27,7 @@
   	top: 0px;
   	left: 0px;
   	width: 100%;
-    bottom: 0px;
-  	right: 0px;
+    height: 100%;
   	display: block;
   	background: transparent;
   	vertical-align: middle;
@@ -36,7 +35,7 @@
   	outline: none;
   	-webkit-appearance:none;
   }
-  
+
   textarea {
     position: absolute;
   	top: 0px;
@@ -44,6 +43,7 @@
   	width:100%;
     bottom: 0px;
   	right: 0px;
+    padding-top: 10px;
   	display: block;
   	background: transparent;
   	vertical-align: middle;

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

@@ -51,7 +51,7 @@ SC.Validator.Number = SC.Validator.extend(
         } else if (this.get('places') > 0) {
           value = parseFloat(value) ;
         } else {
-          if(value.length==1 && value.match(/-/)) value = null;
+          if(value.length===1 && value.match(/-/)) value = null;
           else {
             result = parseInt(value,0) ;
             if(isNaN(result)){
@@ -84,9 +84,11 @@ SC.Validator.Number = SC.Validator.extend(
     Allow only numbers, dashes, period, and commas
   */
   validateKeyDown: function(form, field, charStr) {
+    if(!charStr) charStr = "";
     var text = field.$input().val();
     if (!text) text='';
     text+=charStr;
+
     if(this.get('places')===0){
       if(charStr.length===0) return true;
       else return text.match(/^[\-{0,1}]?[0-9,\0]*/)[0]===text;

data/lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js

@@ -961,9 +961,9 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     the hint text if needed.
   */
   didLoseKeyResponderTo: function(keyView) {
-    var el = this.$input()[0];
-    if (el) el.blur();
-    
+    SC.RunLoop.begin();
+    this.fieldDidBlur();
+    SC.RunLoop.end();
     this.invokeLater("scrollToOriginIfNeeded", 100);
   },
   

data/lib/frameworks/sproutcore/frameworks/media/views/audio.js

@@ -27,7 +27,8 @@ sc_require('views/mini_controls');
   @since SproutCore 1.1
 */
 
-SC.AudioView = SC.View.extend({
+SC.AudioView = SC.View.extend(
+/** @scope SC.AudioView.prototype */{
 
   /** 
     Audio view className. 

data/lib/frameworks/sproutcore/frameworks/media/views/controls.js

@@ -13,7 +13,8 @@ sc_require('views/media_slider');
 
   @extends SC.View
 */
-SC.MediaControlsView = SC.View.extend({
+SC.MediaControlsView = SC.View.extend(
+/** @scope SC.MediaControlsView.prototype */{
 
   target: null,
   

data/lib/frameworks/sproutcore/frameworks/media/views/media_slider.js

@@ -7,12 +7,10 @@
 /*globals SC */
 
 /** @class
-
-  (Document Your View Here)
-
   @extends SC.View
 */
-SC.MediaSlider = SC.SliderView.extend({
+SC.MediaSlider = SC.SliderView.extend(
+/** @scope SC.MediaSlider.prototype */{
   
   mediaView: null,
 

data/lib/frameworks/sproutcore/frameworks/media/views/mini_controls.js

@@ -8,12 +8,10 @@
 
 sc_require('views/media_slider');
 /** @class
-
-  (Document Your View Here)
-
   @extends SC.View
 */
-SC.MiniMediaControlsView = SC.View.extend({
+SC.MiniMediaControlsView = SC.View.extend(
+/** @scope SC.MiniMediaControlsView.prototype */{
 
   target: null,
   

data/lib/frameworks/sproutcore/frameworks/media/views/simple_controls.js

@@ -8,12 +8,10 @@
 
 sc_require('views/media_slider');
 /** @class
-
-  (Document Your View Here)
-
   @extends SC.View
 */
-SC.SimpleMediaControlsView = SC.View.extend({
+SC.SimpleMediaControlsView = SC.View.extend(
+/** @scope SC.SimpleMediaControlsView.prototype */{
 
   target: null,
   

data/lib/frameworks/sproutcore/frameworks/media/views/video.js

@@ -28,8 +28,8 @@ sc_require('views/mini_controls');
   @extends SC.View
   @since SproutCore 1.1
 */
-
-SC.VideoView = SC.View.extend({
+SC.VideoView = SC.View.extend(
+/** @scope SC.VideoView.prototype */{
 
   /** 
     Video view className. 

data/lib/frameworks/sproutcore/frameworks/routing/system/routes.js

@@ -214,6 +214,30 @@ SC.routes = SC.Object.create(
     @type {String}
   */
   location: function(key, value) {
+    this._skipRoute = NO;
+    return this._extractLocation(key, value);
+  }.property(),
+  
+  /*
+    Works exactly like 'location' but you usee this property only when 
+    you want to just change the location w/out triggering the routes
+  */
+  informLocation: function(key, value){
+    this._skipRoute = YES;
+    // This is a very special case where this property
+    // has a very heavy influence on the 'location' property
+    // this is a case where you might want to use idempotent
+    // but you would take a performance hit because it is possible
+    // call set() multiple time and we don't want to take the extra
+    // cost, so we just invalidate the cached set() value ourselves
+    // you shouldn't do this in your own code unless you REALLY
+    // know what you are doing.
+    var lsk = this.location.lastSetValueKey;
+    if (lsk && this._kvo_cache) this._kvo_cache[lsk] = value;
+    return this._extractLocation(key, value);
+  }.property(),
+  
+  _extractLocation: function(key, value) {
     var crumbs, encodedValue;
     
     if (value !== undefined) {
@@ -243,7 +267,7 @@ SC.routes = SC.Object.create(
     }
     
     return this._location;
-  }.property(),
+  },
   
   /**
     You usually don't need to call this method. It is done automatically after
@@ -300,11 +324,12 @@ SC.routes = SC.Object.create(
       loc = decodeURI(loc);
     }
     
-    if (this.get('location') !== loc) {
+    if (this.get('location') !== loc && !this._skipRoute) {
       SC.run(function() {
         this.set('location', loc);
       }, this);
     }
+    this._skipRoute = false;
   },
   
   popState: function(event) {
@@ -316,12 +341,13 @@ SC.routes = SC.Object.create(
       // Remove the base prefix and the extra '/'
       loc = loc.slice(base.length + 1, loc.length);
       
-      if (this.get('location') !== loc) {
+      if (this.get('location') !== loc && !this._skipRoute) {
         SC.run(function() {
           this.set('location', loc);
         }, this);
       }
     }
+    this._skipRoute = false;
   },
   
   /**

data/lib/frameworks/sproutcore/frameworks/runtime/core.js

@@ -39,7 +39,7 @@ window.SproutCore = window.SproutCore || SC ;
 // rest of the methods go into the mixin defined below.
 
 /**
-  @version 1.6.0
+  @version 1.7.1.beta
   @namespace
 
   All SproutCore methods and functions are defined
@@ -59,7 +59,7 @@ window.SproutCore = window.SproutCore || SC ;
 */
 SC = window.SC; // This is dumb but necessary for jsdoc to get it right
 
-SC.VERSION = '1.6.0';
+SC.VERSION = '1.7.1.beta';
 
 /**
   @private

data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/replace.js

@@ -58,7 +58,7 @@ SC.ArraySuite.define(function(T) {
 
     obj.replace(1,2, replace) ;
 
-    T.validateAfter(obj, after, observer, YES);
+    T.validateAfter(obj, after, observer, NO);
   });
   
   test("[A,B].replace(1,0,[X,Y]) => [A,X,Y,B] + notify", function() {

data/lib/frameworks/sproutcore/frameworks/runtime/private/property_chain.js

@@ -149,9 +149,10 @@ SC._PropertyChain = SC.Object.extend(
 
       this.next.activate(newObj); // reactivate down the line
     }
-  },
+  }
 
   // @if (debug)
+  ,
   /**
     Returns a string representation of the chain segment.
 

data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js

@@ -437,7 +437,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
   /**
     Invoked whenever the value of the "from" property changes.  This will mark
     the binding as dirty if the value has changed.
-    
+
     @param {Object} target The object that contains the key
     @param {String} key The name of the property which changed
   */
@@ -467,7 +467,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
 
     if the value does not match the transformedBindingValue, then it will
     become the new bindingValue.
-    
+
     @param {Object} target The object that contains the key
     @param {String} key The name of the property which changed
   */
@@ -983,7 +983,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
 
   /**
     Adds a transform that will return YES if the value is null or undefined, NO otherwise.
-    
+
     @param {String} [fromPath]
     @returns {SC.Binding} this
   */

data/lib/frameworks/sproutcore/frameworks/runtime/system/index_set.js

@@ -380,8 +380,8 @@ SC.IndexSet = SC.mixin({},
           .set('max', start.max)
           .set('length', start.length)
           .set('source', start.source)
-          .enumerableContentDidChange()
-        .endPropertyChanges();
+          .enumerableContentDidChange();
+        this.endPropertyChanges();
         return this ;
 
       } else {

data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js

@@ -563,7 +563,7 @@ SC.Object.prototype = {
   },
 
   /**
-    Set to NO once this object has been destroyed.
+    Set to YES once this object has been destroyed.
 
     @type Boolean
   */

data/lib/frameworks/sproutcore/themes/ace/resources/collection/normal/list_item.css

@@ -9,9 +9,9 @@ $theme.sc-list-item-view {
 
  $theme.disclosure {
     position: absolute;
-    left: -6px;
+    left: -11px;
     top: 50%;
-    margin-top: -8px;
+    margin-top: -7px;
     
     width: 18px;
     height: 18px;

data/lib/frameworks/sproutcore/themes/legacy_theme/english.lproj/segmented.css

@@ -79,7 +79,7 @@
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -789px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment label {
+.sc-theme .sc-segmented-view .sc-segment-view label {
   background: static_url('images/sc-theme-repeat-x.png') repeat-x left -764px;
   text-shadow: #fff 0px 1px 0px;
 }

data/lib/gen/app/templates/apps/@target_name@/Buildfile

@@ -3,9 +3,7 @@
 # This is your Buildfile for your app, <%= namespace %>. This tells SproutCore
 # how to build your app. These settings override those in your project
 # Buildfile, which contains default settings for all apps in your project.
-#
-# This line tells SproutCore's CSS preprocessor what class names to target.
-# Since your app has a theme named '<%= css_name %>', and it is based on SproutCore's
-# Ace theme (named 'ace'), it is set to 'ace.<%= css_name %>'.
-config :<%= target_name %>, :css_theme => 'ace.<%= css_name %>'
+
+# It is better to add :required targets here than in the global Buildfile.
+config :<%= target_name %>, :required => :sproutcore
 

data/lib/gen/app/templates/apps/@target_name@/resources/_theme.css

@@ -0,0 +1,18 @@
+/*
+  This defines the global $theme variable for use inside your CSS.
+  The $theme variable holds the CSS class names for your theme.
+  
+  You can then theme your app by using CSS like this:
+
+      $theme.button {
+        color: blue;
+        @include slices('white-button.png', $left: 3, $right: 3);
+      }
+  
+  Any _theme.css file is prepended to all files inside its directory,
+  and any subdirectories that don't define their own _theme.css file.
+  
+  This allows you to give different directories different values for
+  $theme if you wish.
+*/
+$theme: '.ace.<%= css_name %>';

data/lib/gen/project/templates/@filename@/Buildfile

@@ -1,8 +1,8 @@
 <%= copyright_block(namespace, :ruby) %>
 
 # This is your Buildfile, which sets build settings for your project.
-# For example, this tells SproutCore's build tools that your requires
-# the SproutCore framework.
+# For example, this tells SproutCore's build tools that EVERYTHING
+# requires the SproutCore framework.
 config :all, :required => :sproutcore
 
 # In addition to this Buildfile, which gives settings for your entire project,

data/lib/sproutcore/builders/chance_file.rb

@@ -9,13 +9,18 @@ module SC
     def build(dst_path)
       instances = entry[:chance_instances] || [entry[:chance_instance]]
       
-      # Ensure all entries are staged. If -c was used, they may have been
-      # gotten rid of.
-      entry[:source_entries].each {|e| e.stage! }
+      # Ensure all entries are staged. When Abbot updates, it may skip regenerating
+      # the manifest and just run us, in which case, the previous staged version
+      # will be out-of-date.
+      entry[:source_entries].each {|e| e.stage! if entry[:build_required] }
 
       chance_file = entry[:chance_file]
 
       src = instances.map {|chance|
+        # Because files were restaged, they could be out-of-date.
+        # Let's double-check them all.
+        chance.check_all_files
+
 
         src = ""
         src = chance.output_for chance_file unless chance.nil?
@@ -40,19 +45,6 @@ module SC
     #
     # The default will rewrite calls to static_url().
     def rewrite_inline_code(code)
-      # look for sc_require, require or sc_resource.  wrap in comment
-      code.gsub!(/url\s*\(\s*["']mhtml\:chance-mhtml\.txt!(.+?)["']\s*\)/) {|mhtml|
-        static_entry = entry.manifest.find_entry("__sc_chance_mhtml.txt")
-
-        if !static_entry
-          url = ''
-        else
-          url = static_entry.cacheable_url
-        end
-
-        "expression('url(\"mhtml:' + document.location.protocol + '//' + document.location.host + '" + url + "!" + $1 + "' + '\")')"
-      }
-
       # chance_files refer, usually, to sprites.
       code.gsub!(/chance_file\(["'](.*?)['"]\)/) {|match|
         path = entry[:resource_name] + "-" + $1
@@ -63,6 +55,7 @@ module SC
         "static_url('#{$1}')"
       }
 
+      # look for sc_require, require or sc_resource.  wrap in comment
       code.gsub!(/((sc_require|require|sc_resource)\(\s*['"].*["']\s*\)\s*\;)/, '/* \1 */')
       replace_static_url(code)
       code

data/lib/sproutcore/builders/html.rb

@@ -112,7 +112,8 @@ module SC
     end
 
     def build(dst_path)
-      if CONFIG[:html5_manifest]
+      # WE ARE DISABLING HTML5 MANIFEST FOR NOW. Because it doesn't work.
+      if false and CONFIG[:html5_manifest]
         $to_html5_manifest << dst_path
         $to_html5_manifest_networks = CONFIG[:html5_manifest_networks]
         @content_for_html5_manifest = true

data/lib/sproutcore/builders/minify.rb

@@ -32,26 +32,6 @@ module SC
       send("build_#{@kind}".to_sym, dst_path)
     end
 
-    def build_css(dst_path)
-      a = Regexp.new('^'+MANIFEST.build_root)
-      if dst_path =~ a
-        # $to_minify << dst_path
-        FileUtils.mkdir_p(File.dirname(dst_path))
-        FileUtils.copy(entry.source_path, dst_path)
-      else
-        FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-        filecompress = "java -Xmx128m -jar \"" + SC.yui_jar + "\" --type css --charset utf-8 --line-break 0 --nomunge --preserve-semi --disable-optimizations \"" + entry.source_path + "\" -o \"" + dst_path + "\" 2>&1"
-        SC.logger.info  'Compressing CSS with YUI .... '+ dst_path
-        SC.logger.debug `#{filecompress}`
-
-        if $?.exitstatus != 0
-          _report_error(output, entry.filename, entry.source_path)
-          SC.logger.fatal("!!!!YUI compressor failed, please check that your css code is valid.")
-          SC.logger.fatal("!!!!Failed compressing CSS... "+ dst_path)
-        end
-      end
-    end
-
     # Minify some javascript by invoking the YUI compressor.
     def build_javascript(dst_path)
       entry.source_entry.build!
@@ -63,21 +43,10 @@ module SC
         SC::Helpers::Minifier << dst_path
       end
     end
-
-    def build_inline_javascript(dst_path)
-      SC.logger.info  'Compiling inline Javascript with YUI: ' + dst_path + "..."
-      FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-      filecompress = "java -Xmx128m -jar \"" + SC.yui_jar + "\" --type js \"" + entry.source_path + "\" -o \"" + dst_path + "\" 2>&1"
-      SC.logger.info  'Compiling with YUI:  '+ filecompress + "..."
-
-      output = `#{filecompress}`      # It'd be nice to just read STDERR, but
-                                      # I can't find a reasonable, commonly-
-                                      # installed, works-on-all-OSes solution.
-      if $?.exitstatus != 0
-        _report_error(output, entry.filename, entry.source_path)
-        SC.logger.fatal("!!!!YUI compiler failed, please check that your js code is valid")
-        SC.logger.fatal("!!!!Failed compiling ... "+ dst_path)
-      end
+    
+    def build_html(dst_path)
+      entry.source_entry.build!
+      SC::Helpers::Minifier << dst_path
     end
 
   private