sproutcore 0.9.11 → 0.9.12

data/app_generators/sproutcore/templates/{sc-config.rb → sc-config}

@@ -1,6 +1,6 @@
 # SPROUTCORE CONFIGURATION FILE
-# Use this file to customize the URLs, source and output paths and and other
-# options used by the SproutCore build system to create the output for your 
+# Use this file to customize the URLs, source and output paths and other
+# options used by the SproutCore build system to create the output for your
 # SproutCore applications.
 
 # If you want to use the libraries provided by other gems, require those gems
@@ -9,10 +9,10 @@
 #
 # require 'sproutcore'
 
-# This configuration section will be applied to all bundles used by your 
+# This configuration section will be applied to all bundles used by your
 # application, even bundles that come from other gems.
 config :all do |c|
-  
+
   # Name any other frameworks your bundles depend upon.  The stylesheets and
   # JavaScript for required bundles will be loaded before your bundle on your
   # page.
@@ -21,44 +21,60 @@ config :all do |c|
   # This string will be prepended before any URLs that reference JavaScript,
   # CSS or images in your files.
   c[:resources_at] = 'static'
-  
+
   # This string will be prepended before any index.html urls that actually
   # load your clients.  Setting this to an empty string will mount all
   # of your clients at the root URL level.
   c[:index_at] = ''
-  
-  # If you also need to load external stylesheets not managed by the bundle 
+
+  # If you also need to load external stylesheets not managed by the bundle
   # system, name the URLs you want to reference here.
   # c[:stylesheet_libs] = ['/stylesheets/public.css']
-  
+
   # If you also need to load external javascripts not managed by the bundle
-  # system, name hte URLs you want to reference here.  These will be loaded 
+  # system, name the URLs you want to reference here.  These will be loaded
   # automatically.
   # c[:javascript_libs] = ['/javascript/scriptaculous.js']
 
   # This is the preferred language.  When the user visits the root URL of
-  # your client, this is the language they will get.  When looking for a 
+  # your client, this is the language they will get.  When looking for a
   # resources (such as an image or stylesheet), SproutCore will also try
   # your preferred language .lproj if it cannot find the resource in the
   # current language.
   # c[:preferred_language] = :fr
-  
+
   # If you want to use a default root layout template other than the default
-  # provided by SproutCore, you can specifiy the path name to the index.html 
+  # provided by SproutCore, you can specifiy the path name to the index.html
   # here.  If you provide a relative path, SproutCore will assume the file
   # is relative to the root of this project.
   # c[:layout] = 'lib/index.rhtml'
-  
+
   # This is the fully qualified path to the directory you want all of your
   # static files stored in.  You can place any files not managed by the build
-  # system here.  SproutCore will  also save its cached resources here.
+  # system here.  SproutCore will also save its cached resources here.
   # c[:public_root] = File.join(File.dirname(__FILE__), 'public')
-  
+
   # The default build mode.  Normally you can specify this on the command
-  # line as well using the -e option, but you can override the default 
+  # line as well using the -e option, but you can override the default
   # using this config as well.
   #c[:build_mode] = :production
+
+  # Name the build modes that you want JavaScript to be minified in.  Normally
+  # JavaScript is only minified in production.  This only has effect if you
+  # are also building composite javascript in the same mode.
+  #c[:minify_javascript] = :production
   
+  # Name the build modes that you want your JavaScript to appear as a 
+  # composite file instead of the individual parts.  This can be an array.
+  #c[:combine_javascript] = :production
+  
+  # Name the builds modes that you want you CSS to appear as compite files
+  # instead of individual parts.  This can be an array.
+  #c[:combine_stylesheets] = :production
+  
+  # Name the build modes that should include fixture data.
+  #c[:include_fixtures] = :development
+
 end
 
 # Add configurations for specific bundles here as well.  Any options you
@@ -69,4 +85,3 @@ end
 #  c[:required] = [:sproutcore, :shared]
 # end
 #
-

data/bin/sc-build

@@ -59,27 +59,27 @@ opts = OptionParser.new do |opts|
   opts.on("-e", "--enviroment=MODE", "Set the build mode for the system.  Normally you want to build in production mode (which is the default if you do not include this option), but you can use this switch to build in development mode for testing.") do |opt_build_mode|
     build_mode = opt_build_mode.to_s.downcase.to_sym
   end
-  
+
   opts.on("-t", "--target=PATH", "Set the target path for your build.  Normally this will be set to tmp/build in the working directory") do |opt_target|
     build_root = File.expand_path(opt_target)
   end
-  
+
   opts.on("-l", "--library=PATH", "The library root you want to use.  Normally sc-build will use the working directory.  If you want to point to another project on disk to build from, use this option.") do |opt_library|
     library_root = File.expand_path(opt_library)
   end
-  
+
   opts.on("-r", "--[no-]include-required", "If passed when building a single client, then the build tool will also find any required bundles and build them as well.") do |opt_req|
     include_dependencies = !!opt_req
   end
-  
+
   opts.on("-v", "--[no-]verbose", "If set, extra debug output will be displayed during the build") do |opt_verbose|
     verbose = !!opt_verbose
   end
-  
+
   opts.on("-L", "--languages=LANGUAGE", "Pass a comma separated list of the specific languages you want to build.  If you do not pass this option, the build tool will build all languages required by the bundles to function") do |opt_lang|
     languages = opt_lang.split(',').map { |x| x.to_sym }
   end
-  
+
   opts.on("-c", "--[no-]clean", "If set, then the build tool will delete a bundle's output before it builds it, so you get a clean build") do |opt_clean|
     clean = !!opt_clean
   end
@@ -87,14 +87,14 @@ opts = OptionParser.new do |opts|
   opts.on('-d', '--[no-]docs', "Include documentation") do |opt_docs|
     docs = !!opt_docs
   end
-  
+
 end
 opts.parse!
 
 ############################################################
 ## SETUP ENVIRONMENT
 ##
-  
+
 # Configure logger
 SC.logger.level = (verbose) ? Logger::DEBUG : Logger::INFO
 SC.logger.progname = $0
@@ -120,15 +120,15 @@ if bundle_name
   else
     bundles = [bundle]
   end
-  
+
   SC.logger.info("Building: #{bundles.map { |x| x.bundle_name } * ', ' }...")
-  
+
 # No bundle provided, get all bundles for library
 else
   bundles = library.bundles
   SC.logger.info("Building ALL bundles:\n #{bundles.map { |x| x.bundle_name } * ', '}...")
-end  
- 
+end
+
 ############################################################
 ## BUILD EACH BUNDLE
 ##
@@ -140,19 +140,19 @@ SC.logger.info("Selected Languages: #{languages.join(', ')}")
 SC.logger.info('')
 bundles.each do |bundle|
   SC.logger.info("Building #{bundle.bundle_name} > #{bundle.build_root}...")
-  
+
   if clean
     SC.logger.debug("~ Cleaning #{bundle.build_root}")
     FileUtils.rm_rf(bundle.build_root)
   end
-  
+
   bundle.build(*languages)
-  
+
   if docs
     SC.logger.debug('~ Building docs')
-    SC::JSDoc.generate(:bundle => bundle) 
+    SC::JSDoc.generate(:bundle => bundle)
   end
-  
+
 end
 
 SC.logger.debug("")

data/bin/sc-server

@@ -63,7 +63,7 @@ end
 ############################################################
 ## Start Merb
 ##
-  
+
 puts "Running SproutCore Build Tools v#{SproutCore::VERSION::STRING}"
 puts "Welcome to SproutCore"
 Merb.start

data/bin/sproutcore

@@ -26,12 +26,12 @@ if ARGV.first == 'freeze:edge'
       puts `svn co http://sproutcore.googlecode.com/svn/trunk/frameworks/#{framework} #{File.join('frameworks', framework)}`
     end
   end
-    
+
   exit(0)
 end
-    
+
 require 'rubigen/scripts/generate'
-source = RubiGen::PathSource.new(:application, 
+source = RubiGen::PathSource.new(:application,
   File.join(File.dirname(__FILE__), "../app_generators"))
 RubiGen::Base.reset_sources
 RubiGen::Base.append_sources source

data/clients/sc_test_runner/english.lproj/no_tests.rhtml

@@ -2,5 +2,4 @@
   <h1>Client Has No Tests</h1>
   <p style="font-size: 15px;">This client does not currently have any unit tests.  To add a unit test, open a terminal to the root directly and type:</p>
   <p style="font-size: 15px; text-align:center;"><code>./script/generate sc_test <%= label_view :outlet => true, :tag => 'span', :bind => { :content => 'TestRunner.runnerController.clientName' } %>/<b>test_name</b></code></p>
-  </div>
 <% end %>

data/config/hoe.rb

@@ -30,21 +30,21 @@ Run 'rubyforge setup' to prepare your env for access to Rubyforge
 end
 
 
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
+REV = nil
+# UNCOMMENT IF REQUIRED:
 #REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
 VERS = SproutCore::VERSION::STRING + (REV ? ".#{REV}" : "")
 RDOC_OPTS = ['--quiet', '--title', 'sproutcore documentation',
     "--opname", "index.html",
-    "--line-numbers", 
+    "--line-numbers",
     "--main", "README",
     "--inline-source"]
 
 class Hoe
-  def extra_deps 
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
+  def extra_deps
+    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
     @extra_deps
-  end 
+  end
 end
 
 # Generate all the Rake tasks
@@ -57,13 +57,13 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
   p.test_globs = ["spec/**/*_spec.rb"]
   p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  
+
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.extra_deps = [['activesupport', '>= 2.0.2'], ['merb-core', '>= 0.9.1'], ['erubis'], ['rubigen'], ['mongrel']]
-  
+
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  
+
 end
 
 CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")

data/config/requirements.rb

@@ -14,4 +14,4 @@ end
 
 $:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
 
-require 'sproutcore'
+require 'sproutcore'

data/frameworks/sproutcore/HISTORY

@@ -1,4 +1,18 @@
 
+== sproutcore 0.9.12
+
+- SC.ButtonView & SC.MenuItemView now removes and adds the 'active' class name on mouseExited and mouseEntered when the mouse is pressed to provide better indication of whether an action will occur on mouse up. (Thanks schwa23)
+
+- SC.Record#toString now shows record type in description.
+
+- [FIX] SC.Timer now computes the next fire time before it executes your callback action.  This should avoid the situation where a timer would call your action, which would then take it past the last time it should fire and hence the last fire would never happen. (Thanks August)
+
+- [FIX] SC.Record#matchCondition() did not behave correctly when comparing record instances.  Fix by onitunes includes both a faster comparison method along with correct behavior + kickin' unit tests
+
+- [FIX] some settings on the inline editor for multi-line edits were wrong.  Now fixed thanks to maloninc (#38)
+
+== sproutcore 0.9.11
+
 - [FIX] innerFrame tests were failing.  Now working.
 
 - Progress bar now shows 100% fill when set to indeterminate.  This should 

data/frameworks/sproutcore/core.js

@@ -41,7 +41,7 @@
 
 // All objects live in the SproutCore namespace, which is also availabe in the
 // abreviation SC.
-if (!SC) SC = {};  SproutCore = SC ;
+if (!window.SC) SC = {};  SproutCore = SC ;
 
 // this makes for some nicer to read code
 var YES = true ; var NO = false ;

data/frameworks/sproutcore/english.lproj/theme.css

@@ -170,6 +170,7 @@ body.sc-theme {
 	text-transform: uppercase;
 	font-size: 11px;
 	font-weight: bold ;
+  text-overflow:hidden;
 }
 
 .sc-theme .sc-collection-view .sc-source-list-group .sc-source-list-label.sel {

data/frameworks/sproutcore/foundation/binding.js

@@ -306,7 +306,7 @@ SC.Binding.MultipleNoError = SC.Binding.NoError.ext(SC.Binding.Multiple);
 // Converts value to a bool.  true if: not null, not empty array, not 0, '',
 // etc.
 SC.Binding.Bool = SC.Binding.build(function(d,k,v) {
-  return ($type(v) == T_ARRAY) ? (t.length > 0) : !!v ;
+  return ($type(v) == T_ARRAY) ? (v.length > 0) : !!v ;
 }) ;
 
 // Converts value to a bool, but its only true if not null
@@ -316,7 +316,7 @@ SC.Binding.NotNull = SC.Binding.build(function(d,k,v) {
 
 // Converts inverse of bool.
 SC.Binding.Not = SC.Binding.build(function(d,k,v) {
-  return !(($type(v) == T_ARRAY) ? (t.length > 0) : !!v) ;
+  return !(($type(v) == T_ARRAY) ? (v.length > 0) : !!v) ;
 }) ;
 
 // Converts value to a bool, but its only true if not null

data/frameworks/sproutcore/foundation/timer.js

@@ -241,20 +241,7 @@ SC.Timer = SC.Object.extend(
     @field
     @type {Number}
   */
-  fireTime: function() {
-    if (this._invalid || !this.get('isValid')) return 0;
-
-    var now = Date.now() ;
-    var start = this.get('startTime') || now ;
-    if (this.until && this.until > 0 && now >= this.until) return 0;
-
-    var interval = this.get('interval') ;
-    var cycle = Math.ceil(((now - start) / interval)+0.01) ;
-    if ((cycle > 1) && !this.repeats) return 0 ;
-
-    if (cycle < 1) cycle = 1 ;
-    return start + (cycle * interval) ;
-  }.property(),
+  fireTime: null,
   
   /**
     Invalidates the timer so that it will not execute again.  If a timer has
@@ -280,11 +267,15 @@ SC.Timer = SC.Object.extend(
     @returns {void}
   */
   fire: function() {
-    if (this.get('isPaused') === NO) {
-      this.performAction() ;
-    }
     
-    (this.repeats && (this.get('fireTime')>0)) ? this.schedule() : this.invalidate() ;
+    // whenever the timer fires, calculate the next fireTime immediately.
+    var nextFireTime = this._computeNextFireTime();
+    
+    // now perform the fire action unless paused.
+    if (!this.get('isPaused')) this.performAction() ;
+    
+     // reschedule the timer if needed...
+     (nextFireTime>0) ? this.schedule() : this.invalidate();
   },
 
   /**
@@ -325,10 +316,25 @@ SC.Timer = SC.Object.extend(
     @returns {SC.Timer} The receiver
   */
   schedule: function() {
+
+    this.beginPropertyChanges();
+    
+    // if start time was not set explicitly when the timer was created, 
+    // get it from the run loop.  This way timer scheduling will always
+    // occur in sync.
+    if (!this.startTime) this.set('startTime', SC.runLoop.get('startTime')) ;
+    
+    // If this is the first time the timer was scheduled, compute the fireTime
+    var fireTime = (this.fireTime) ? this.get('fireTime') : this._computeNextFireTime() ; // sets the fire time...
+    
+    // now schedule the timer if needed.
     if (!this._invalid) {
       this.set('isScheduled', YES) ;
-      SC.runLoop.scheduleTimer(this, this.get('fireTime')) ;
+      SC.runLoop.scheduleTimer(this, fireTime) ;
     }
+    
+    this.endPropertyChanges() ;
+    
     return this ;
   },
   
@@ -343,15 +349,42 @@ SC.Timer = SC.Object.extend(
     if (this.until instanceof Date) {
       this.until = this.until.getTime() ;
     }
-    
-    // if start time was not set, get it from the run loop.
-    if (!this.startTime) this.startTime = SC.runLoop.get('startTime') ;
   },
   
   // if the paused state changes, notify the runloop so that it can 
   // reschedule its timeout.
   _isPausedObserver: function() {
     SC.runLoop.timerPausedStateDidChange(this) ;
+  }.observes('isPaused'),
+
+  /** @private
+    Computes the next fireTime and updates the property.
+    
+    @returns the next fire time (also set on fireTime property)
+  */
+  _computeNextFireTime: function() {
+    
+    var fireTime = 0 ;
+    if (!this._invalid && this.get('isValid')) {
+
+      var now = Date.now() ;
+      var start = this.get('startTime') || now ;
+      var until = this.get('until') ;
+      
+      // only calculate if we have not passed unitl.
+      if ((!until) || (until === 0) || (now < until)) {
+
+        var interval = this.get('interval') ;
+        var repeats = this.get('repeats') ;
+        var cycle = Math.ceil(((now - start) / interval)+0.01) ;
+        if (cycle < 1) cycle = 1 ;
+        
+        fireTime = ((cycle <= 1) || repeats) ? start + (cycle * interval) : 0;
+      }
+    }
+    
+    this.setIfChanged('fireTime', fireTime) ;
+    return fireTime ;
   }
   
 }) ;

data/frameworks/sproutcore/lib/index.rhtml

@@ -8,8 +8,7 @@
    # See the comments in this file for more information on what you can
    # change.
 -%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
@@ -28,7 +27,7 @@
   </head>
   <body class="<%= @theme || 'sc-theme' %> focus">  
     <script>
-    if (SC.setupBodyClassNames) SC.setupBodyClassNames() ;
+    if (window.SC && SC.setupBodyClassNames) SC.setupBodyClassNames() ;
     </script>
       
 <% #