sproutcore 1.4.4-java → 1.4.5-java

data/README.txt

@@ -80,7 +80,7 @@ sudo gem install sproutcore
 == LICENSE:
 
 Copyright (c) 2009 Apple Inc.  
-Portions copyright (c) 2006-2009 Sprout Systems Inc. and contributors
+Portions copyright (c) 2006-2011 Strobe Inc. and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -101,4 +101,4 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-SproutCore and the SproutCore logo are trademarks of Sprout Systems Inc.
+SproutCore and the SproutCore logo are trademarks of Strobe Inc.

data/Rakefile

@@ -35,3 +35,10 @@ To update the gem:
 END
 
 end
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new
+rescue LoadError
+  puts "RSpec is not installed. Please install if you want to run tests."
+end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 4
-:patch: 4
+:patch: 5

data/bin/sc-build

@@ -2,12 +2,12 @@
 # ===========================================================================
 # Project:   Abbot - SproutCore Build Tools
 # Copyright: ©2010 Apple Inc.
-#            portions copyright @2006-2010 Sprout Systems, Inc.
+#            portions copyright @2006-2011 Strobe Inc.
 #            and contributors
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-build from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-build from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
   exit
 end
 

data/bin/sc-build-number

@@ -2,12 +2,12 @@
 # ===========================================================================
 # Project:   Abbot - SproutCore Build Tools
 # Copyright: ©2010 Apple Inc.
-#            portions copyright @2006-2010 Sprout Systems, Inc.
+#            portions copyright @2006-2011 Strobe Inc.
 #            and contributors
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-build-number from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-build-number from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
   exit
 end
 

data/bin/sc-docs

@@ -3,12 +3,12 @@
 # ===========================================================================
 # Project:   Abbot - SproutCore Build Tools
 # Copyright: ©2010 Apple Inc.
-#            portions copyright @2006-2010 Sprout Systems, Inc.
+#            portions copyright @2006-2011 Strobe Inc.
 #            and contributors
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-docs from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-docs from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
   exit
 end
 

data/bin/sc-gen

@@ -2,12 +2,12 @@
 # ===========================================================================
 # Project:   Abbot - SproutCore Build Tools
 # Copyright: ©2010 Apple Inc.
-#            portions copyright @2006-2010 Sprout Systems, Inc.
+#            portions copyright @2006-2011 Strobe Inc.
 #            and contributors
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-gen from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-gen from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
   exit
 end
 

data/bin/sc-init

@@ -2,12 +2,12 @@
 # ===========================================================================
 # Project:   Abbot - SproutCore Build Tools
 # Copyright: ©2010 Apple Inc.
-#            portions copyright @2006-2010 Sprout Systems, Inc.
+#            portions copyright @2006-2011 Strobe Inc.
 #            and contributors
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-init from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-init from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
   exit
 end
 

data/bin/sc-manifest

@@ -2,12 +2,12 @@
 # ===========================================================================
 # Project:   Abbot - SproutCore Build Tools
 # Copyright: ©2010 Apple Inc.
-#            portions copyright @2006-2010 Sprout Systems, Inc.
+#            portions copyright @2006-2011 Strobe Inc.
 #            and contributors
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-manifest from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-manifest from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
   exit
 end
 

data/bin/sc-server

@@ -2,12 +2,12 @@
 # ===========================================================================
 # Project:   Abbot - SproutCore Build Tools
 # Copyright: ©2010 Apple Inc.
-#            portions copyright @2006-2010 Sprout Systems, Inc.
+#            portions copyright @2006-2011 Strobe Inc.
 #            and contributors
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-server from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-server from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
   exit
 end
 

data/bin/sproutcore

@@ -2,12 +2,12 @@
 # ===========================================================================
 # Project:   Abbot - SproutCore Build Tools
 # Copyright: ©2010 Apple Inc.
-#            portions copyright @2006-2010 Sprout Systems, Inc.
+#            portions copyright @2006-2011 Strobe Inc.
 #            and contributors
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sproutcore from an installed gem or through bundler. For more information, please visit http://github.com/sproutit/sproutcore-abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sproutcore from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
   exit
 end
 

data/lib/Buildfile

@@ -1,7 +1,7 @@
 # ===========================================================================
 # Project:   Abbot - SproutCore Build Tools
 # Copyright: ©2009 Apple Inc.
-#            portions copyright @2006-2009 Sprout Systems, Inc.
+#            portions copyright @2006-2011 Strobe Inc.
 #            and contributors
 # ===========================================================================
 

data/lib/buildtasks/build.rake

@@ -1,6 +1,6 @@
 # ===========================================================================
 # SC::Target Buildtasks
-# copyright 2008, Sprout Systems, Inc. and Apple Inc. all rights reserved
+# copyright 2011, Strobe Inc. and Apple Inc. all rights reserved
 # ===========================================================================
 
 # Tasks invoked while building Target objects.  You can override these methods

data/lib/buildtasks/entry.rake

@@ -1,6 +1,6 @@
 # ===========================================================================
 # SC::ManifestEntry Buildtasks
-# copyright 2008, Sprout Systems, Inc. and Apple Inc. all rights reserved
+# copyright 2011, Strobe Inc. and Apple Inc. all rights reserved
 # ===========================================================================
 
 # Tasks invoked while building ManifestEntry objects.  You can override these

data/lib/buildtasks/manifest.rake

@@ -1,6 +1,6 @@
 # ===========================================================================
 # SC::Manifest Buildtasks
-# copyright 2008, Sprout Systems, Inc. and Apple Inc. all rights reserved
+# copyright 2011, Strobe Inc. and Apple Inc. all rights reserved
 # ===========================================================================
 
 # Tasks invoked while building Manifest objects.  You can override these

data/lib/buildtasks/render.rake

@@ -1,6 +1,6 @@
 # ===========================================================================
 # SC::Target Buildtasks
-# copyright 2008, Sprout Systems, Inc. and Apple Inc. all rights reserved
+# copyright 2011, Strobe Inc. and Apple Inc. all rights reserved
 # ===========================================================================
 
 # Tasks invoked to actually render a single HTML file.  Works much like a 

data/lib/buildtasks/target.rake

@@ -1,6 +1,6 @@
 # ===========================================================================
 # SC::Target Buildtasks
-# copyright 2008, Sprout Systems, Inc. and Apple Inc. all rights reserved
+# copyright 2011, Strobe Inc. and Apple Inc. all rights reserved
 # ===========================================================================
 
 # Tasks invoked while building Target objects.  You can override these methods

data/lib/frameworks/sproutcore/Buildfile

@@ -1,7 +1,7 @@
 # ==========================================================================
 # SproutCore JavaScript Framework - Buildfile
 # copyright (c) 2009 - Apple Inc.
-#           portions copyright Sprout Systems Inc. and contributors
+#           portions copyright Strobe Inc. and contributors
 # ==========================================================================
 
 # This buildfile defines the configurations needed to link together the 

data/lib/frameworks/sproutcore/CHANGELOG

@@ -1,3 +1,35 @@
+*SproutCore 1.4.5 (January 25, 2010)*
+
+* Removed old HISTORY file
+* Remove content observer when destroyed
+* DRY up ContentDisplay, add tests
+* Convert array like objects to arrays for SC.Query CONTAINS - Fixes #138
+* Fixed regression in SC.Animatable
+* Allow SC.SelectView's that whose items are numbers and start at 0
+* Missed a copyright
+* Updated Copyrights
+* Fix for SC.RootResponder's targetForAction. Now checks default responder for a isResponderContext property.
+* Moved a .sc-video-view CSS rule in the correct file.
+* MouseWheel fix for WebKit
+* Changed CollectionFastPath#contentIndexIsGroup signature to match protocol for delegate
+* Pass the event when calling modalPaneDidClick.
+* [#128] BUGFIX: Disconnect bindings when object is destroyed
+* Fixed issue with destroying unused items in CollectionView
+* Don't try to modify select field element if it doesn't exist yet
+* Enhance unloadRecords allowing unloading all records of a specific type
+* fixed timing issues where css3 transitions are applied incorrectly
+* Return the picker pane after popup
+* Added test for SC.Record.normalize() not preserving hash value of toOne without a defaultValue.
+* SC.Record.normalize() would not preserve has value of toOne relationship that did not declare a defaultValue. All tests pass.
+* Added tests for SC.CascadeDataSource.
+* Fixed bug with retrieveRecords in SC.CascadeDataSource not passing all arguments.
+* SC.Observable.addProbe() fix for iPad/iPhone -- console.log currently only accepts one argument.
+* CollectionView calls destroy to removed item views that will not be reused
+* Check for image before trying to abort - Fixes #106
+* Updated references to mouseOut and mouseOver to mouseExited and mouseEntered - Fixes #100
+* Fixed bug with toggling isEnabled on SelectFieldView
+
+
 *SproutCore 1.4.4 (November 12, 2010)*
 
 * Fix SC.platform.touch for Chrome 9

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/main_page.js

@@ -86,7 +86,7 @@ Greenhouse.mainPage = SC.Page.design({
     
     footer: SC.LabelView.design({
       layout: { bottom: 0, height: 30, left: 0, right: 0},
-      value: '©2010 Sprout Systems Inc. & Contributors',
+      value: '©2011 Strobe Inc. & Contributors',
       textAlign: SC.ALIGN_CENTER,
       classNames: ['footer']
     })

data/lib/frameworks/sproutcore/apps/greenhouse/views/simple_button.js

@@ -47,7 +47,7 @@ Greenhouse.SimpleButton = {
   },
 
   /** @private
-    Remove the active class on mouseOut if mouse is down.
+    Remove the active class on mouseExited if mouse is down.
   */  
   mouseExited: function(evt) {
     //console.log('SimpleButton#mouseExited()...');

data/lib/frameworks/sproutcore/apps/tests/core.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/tests/english.lproj/main_page.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore Test Runner
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/tests/states/no_targets.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/tests/states/ready.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/tests/states/ready_detail.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/tests/states/ready_empty.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/tests/states/ready_list.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/tests/states/ready_loading.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/tests/states/ready_no_tests.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/tests/states/start.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/apps/welcome/core.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore Test Runner
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

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

@@ -36,12 +36,12 @@ aView: SC.LabelView.design(SC.Animatable, {
 */
 SC.Animatable = {
   /** @scope SC.Animatable.prototype */
-  
+
   /**
   Walks like a duck.
   */
   isAnimatable: YES,
-  
+
   transitions: {},
   concatenatedProperties: ["transitions"],
 
@@ -53,7 +53,7 @@ SC.Animatable = {
 
   // collections of CSS transitions we have available
   _cssTransitionFor: {
-    "left": "left", "top": "top", 
+    "left": "left", "top": "top",
     "right": "right", "bottom": "bottom",
     "width": "width", "height": "height",
     "opacity": "opacity",
@@ -80,10 +80,10 @@ SC.Animatable = {
 
     this._animatable_original_willDestroyLayer = this.willDestroyLayer || function(){};
     this.willDestroyLayer = this._animatable_willDestroyLayer;
-    
+
     this._animatable_original_willRemoveFromParent = this.willRemoveFromParent || function(){};
     this.willRemoveFromParent = this._animatable_will_remove_from_parent;
-    
+
     // auto observers do not work when mixed in live, so make sure we do a manual observer
     this.addObserver("style", this, "styleDidChange");
 
@@ -118,14 +118,14 @@ SC.Animatable = {
     this._last_transition_css = ""; // to keep from re-setting unnecessarily
     this._disableAnimation = 0; // calls to disableAnimation add one; enableAnimation remove one.
     this._transitionCallbacks = {}; // define callback set
-    
+
     // alert if layer already created
     if (!SC.none(this.get("layer"))) {
       var o = this._animatable_original_didCreateLayer;
       this._animatable_original_didCreateLayer = function(){};
       this.didCreateLayer();
       this._animatable_original_didCreateLayer = o;
-      
+
     }
   },
 
@@ -141,31 +141,42 @@ SC.Animatable = {
     SC.Event.remove(this.get('layer'), "transitionEnd", this, this.transitionEnd);
     return this._animatable_original_willDestroyLayer();
   },
-  
+
   /**
   Stops all animations on the layer when this occurs by calling resetAnimation.
   */
   _animatable_will_remove_from_parent: function() {
     this.resetAnimation();
   },
-  
+
   /**
   Disables animation.
-  
+
   It is like parenthesis. Each "disable" must be matched by an "enable".
   If you call disable twice, you need two enables to start it. Three times, you need
   three enables.
   */
-  disableAnimation: function() { 
-    this._disableAnimation++;
+  disableAnimation: function() {
+    if (this._disableAnimation < 1) {
+      this.updateStyle();
+      this._disableAnimation = 1;
+      this.updateStyle();
+    } else {
+      this._disableAnimation++;
+    }
   },
-  
+
   /**
   Enables animation if it was disabled (or moves towards that direction, at least).
   */
   enableAnimation: function() {
-    this._disableAnimation--; 
-    if (this._disableAnimation < 0) this._disableAnimation = 0;
+    if (this._disableAnimation <= 1) {
+      this.updateStyle();
+      this._disableAnimation = 0;
+      this.updateStyle();
+    } else {
+      this._disableAnimation--;
+    }
   },
 
   /**
@@ -236,11 +247,11 @@ SC.Animatable = {
 
   /**
   Returns the current set of styles and layout according to JavaScript transitions.
-  
+
   That is, for transitions managed by JavaScript (rather than CSS), the current position
   (even mid-transition) will be returned. For CSS-based transitions, the target position
   will be returned. This function is mostly useful for testing.
-  
+
   It will return null if there is no such style.
   */
   getCurrentJavaScriptStyles: function() {
@@ -258,7 +269,7 @@ SC.Animatable = {
     this.enableAnimation();
     this.updateStyle();
   },
-  
+
   /**
     Stops all JavaScript animations on the object. In their tracks. Hah hah.
     @private
@@ -279,7 +290,7 @@ SC.Animatable = {
     this.layout = start;
 
     // get our frame and parent's frame
-    var p = this.computeParentDimensions(this.get("frame"));
+    var p = this.computeParentDimensions();
     var f = this.computeFrameWithParentFrame(p);
 
     // set back to target
@@ -302,7 +313,7 @@ SC.Animatable = {
         else if (i == "centerX") { l[i] = f.x + (f.width / 2) - (p.width / 2); continue; }
         else if (i == "centerY") { l[i] = f.y + (f.height / 2) - (p.height / 2); continue; }
       }
-      
+
       if (SC.none(l[i])) {
         if (!SC.none(start[i])) l[i] = start[i];
         else l[i] = target[i];
@@ -312,7 +323,7 @@ SC.Animatable = {
   },
 
   _TMP_CSS_TRANSITIONS: [],
-  
+
   /**
   @private
   Returns a string with CSS for the timing portion of a transition.
@@ -329,7 +340,7 @@ SC.Animatable = {
     }
     return timing_function;
   },
-  
+
   /**
   @private
     Triggers updateStyle at end of run loop.
@@ -359,7 +370,7 @@ SC.Animatable = {
 
   /**
   Immediately applies styles to elements, and starts any needed transitions.
-  
+
   Called automatically when style changes, but if you need styles to be adjusted
   immediately (for instance, if you have temporarily disabled animation to set a
   start state), you may want to call manually too.
@@ -418,33 +429,19 @@ SC.Animatable = {
     // no use doing anything else if no layer.
     if (!layer) return;
 
-    // compare new style to old style. Manually, to skip guid stuff that can
-    // mess things up a bit.
-    var equal = true;
-    for (i in newStyle)
-    {
-      if (i[0] == "_") continue;
-      if (newStyle[i] != this._animatableCurrentStyle[i])
-      {
-        equal = false;
-        break;
-      }
-    }
-    if (equal) return this;
-
     // get a normalized starting point based off of our style
     var startingPoint = this._getStartStyleHash(this._animatableCurrentStyle, newStyle);
     var endingPoint = {};
-    
+
     // prepare stuff for timing function calc
     var timing;
-    
+
     // also prepare an array of CSS transitions to set up. Do this always so we get (and keep) all transitions.
     var cssTransitions = this._TMP_CSS_TRANSITIONS;
     if (SC.platform.supportsCSSTransitions) {
       // first, handle special cases
       var timing_function;
-      
+
       ////**SPECIAL TRANSFORM CASE**////
       // this is a VERY special case. If right or bottom are supplied, can't do it. If left+top need
       // animation at different speeds: can't do it.
@@ -454,12 +451,12 @@ SC.Animatable = {
         cssTransitions.push("-"+SC.platform.cssPrefix+"-transform " + transitionForTiming.duration + "s " + timing_function);
       }
       ////**END SPECIAL TRANSFORM CASE**////
-      
+
       // loop
       for (i in this.transitions) {
         if (!this._cssTransitionFor[i]) continue;
 
-        ////**SPECIAL TRANSFORM CASE**////        
+        ////**SPECIAL TRANSFORM CASE**////
         if (specialTransform && (i == "left" || i == "top")) {
           if (this.transitions["left"].action){
             this._transitionCallbacks["-"+SC.platform.cssPrefix+"-transform"] = {
@@ -482,17 +479,17 @@ SC.Animatable = {
 
         // get timing function
         timing_function = this.cssTimingStringFor(this.transitions[i]);
-        
+
         // sanitize name
-        cssTransitions.push(this._cssTransitionFor[i] + " " + this.transitions[i].duration + "s " + timing_function);		
+        cssTransitions.push(this._cssTransitionFor[i] + " " + this.transitions[i].duration + "s " + timing_function);
       }
     }
 
     for (i in newStyle)
     {
       if (i[0] == "_") continue; // guid (or something else we can't deal with anyway)
-      
-      
+
+
       // if it needs to be set right away since it is not animatable, _getStartStyleHash
       // will have done that. But if we aren't supposed to animate it, we need to know, now.
       var shouldSetImmediately = !this.transitions[i] || newStyle[i] == startingPoint[i];
@@ -533,9 +530,9 @@ SC.Animatable = {
 
       // well well well... looks like we need to animate. Prepare an animation structure.
       // (WHY ARE WE ALWAYS PREPARING?)
-      var applier = this._animateTickPixel, 
-      property = i, 
-      startValue = startingPoint[i], 
+      var applier = this._animateTickPixel,
+      property = i,
+      startValue = startingPoint[i],
       endValue = newStyle[i];
 
       // special property stuff
@@ -626,15 +623,15 @@ SC.Animatable = {
   /**
   @private
   Adjusts display and queues a change for the other properties.
-  
+
   layer: the layer to modify
   styles: the styles to set
   delayed: styles to set after a brief delay (if any)
   */
   _animatableApplyStyles: function(layer, styles, delayed)
-  {	
+  {
     if (!layer) return;
-    
+
     // handle a specific style first: display. There is a special case because it disrupts transitions.
     var needsRender = NO;
     if (styles["display"] && layer.style["display"] !== styles["display"]) {
@@ -653,7 +650,7 @@ SC.Animatable = {
 
     // get timer
     var timer = this._animators["display-styles"];
-    
+
     // set settings
     timer.holder = this;
     timer.action = this._animatableApplyNonDisplayStylesFromTimer;
@@ -662,9 +659,9 @@ SC.Animatable = {
     timer.styles = styles;
     timer.delayed = delayed;
     this._animatableCurrentStyle = styles;
-    
+
     // schedule.
-    if (this._disableAnimation > 0) {
+    if (this._disableAnimation > 0 || !needsRender) {
       timer.inLoopAction();
     } else {
       // after setting transition or display, we must wait a moment;
@@ -672,7 +669,7 @@ SC.Animatable = {
       SC.Animatable.addTimer(timer);
     }
   },
-  
+
   _animatableApplyNonDisplayStylesFromTimer: function() {
     SC.run(function() {
       this.inLoopAction();
@@ -704,7 +701,7 @@ SC.Animatable = {
       else if (styleHelpers[i]) styleHelpers[i](style, i, styles);
       else style[i] = styles[i];
     }
-    
+
     // don't want to set because we don't want updateLayout... again.
     if (updateLayout) {
       var prev = this.holder.layout;
@@ -723,7 +720,7 @@ SC.Animatable = {
       // go back to previous
       this.holder.layout = prev;
     }
-    
+
     // queue up any delayed styles
     if (this.delayed) {
       // set settings
@@ -863,7 +860,7 @@ SC.Animatable = {
       percent = this.holder._solveBezier(timing[0], timing[1], timing[2], timing[3], percent, d);
     }
 
-    // calculate new position			
+    // calculate new position
     var value = Math.floor(sv + (dv * percent));
     this.holder._animatableCurrentStyle[this.property] = value;
 
@@ -891,7 +888,7 @@ SC.Animatable = {
 
     // check if we should keep going (we only set display none, and only at end)
     var e = this.end;
-    if (t < e) 
+    if (t < e)
     {
       SC.Animatable.addTimer(this);
       return;
@@ -938,7 +935,7 @@ SC.Animatable = {
       percent = this.holder._solveBezier(timing[0], timing[1], timing[2], timing[3], percent, d);
     }
 
-    // calculate new position			
+    // calculate new position
     var value = Math.round((sv + (dv * percent)) * 100) / 100;
     this.holder._animatableCurrentStyle[this.property] = value;
 
@@ -988,7 +985,7 @@ SC.Animatable = {
       percent = this.holder._solveBezier(timing[0], timing[1], timing[2], timing[3], percent, d);
     }
 
-    // calculate new position			
+    // calculate new position
     var value = sv + (dv * percent);
     this.holder._animatableCurrentStyle[this.property] = value;
 
@@ -1004,7 +1001,7 @@ SC.Animatable = {
     }
 
     this.style[style] = Math.round(value - (this.holder._animatableCurrentStyle[widthOrHeight] / 2)) + "px";
-    
+
     if (t < e) SC.Animatable.addTimer(this);
     else {
       this.going = false;
@@ -1025,30 +1022,30 @@ SC.mixin(SC.Animatable, {
 
   /** Linear transition **/
   TRANSITION_NONE: "linear",
-  
+
   /** 'ease' transition if using CSS transitions; otherwise linear. **/
   TRANSITION_CSS_EASE: "ease",
-  
+
   /** 'ease-in' transition if using CSS transitions; otherwise linear. **/
   TRANSITION_CSS_EASE_IN: "ease-in",
-  
+
   /** 'ease-out' transition if using CSS transitions; otherwise linear. **/
   TRANSITION_CSS_EASE_OUT: "ease-out",
-  
+
   /** 'ease-in-out' transition if using CSS transitions; otherwise linear. **/
   TRANSITION_CSS_EASE_IN_OUT: "ease-in-out",
 
   /** 'ease' transition. **/
   TRANSITION_EASE: [0.25, 0.1, 0.25, 1.0],
-  
+
   TRANSITION_LINEAR: [0.0, 0.0, 1.0, 1.0],
-  
+
   /** 'ease-in' transition. **/
   TRANSITION_EASE_IN: [0.42, 0.0, 1.0, 1.0],
-  
+
   /** 'ease-out' transition. **/
   TRANSITION_EASE_OUT: [0, 0, 0.58, 1.0],
-  
+
   /** 'ease-in-out' transition if using CSS transitions; otherwise linear. **/
   TRANSITION_EASE_IN_OUT: [0.42, 0, 0.58, 1.0],
 
@@ -1061,17 +1058,17 @@ SC.mixin(SC.Animatable, {
   baseTimer: {
     next: null
   },
-  
+
   // keep track of whether the timer is running
   going: false,
-  
+
   // ticks and tocs
   _ticks: 0,
   _timer_start_time: null,
-  
+
   // the global tiemr interval
   interval: 10,
-  
+
   // the current time (a placeholder, really)
   currentTime: new Date().getTime(),
 
@@ -1082,7 +1079,7 @@ SC.mixin(SC.Animatable, {
   stats: SC.Object.create({
     lastFPS: 0
   }),
-  
+
   /**
     Adds a timer.
     @private
@@ -1096,7 +1093,7 @@ SC.mixin(SC.Animatable, {
     animator.isQueued = true;
     if (!SC.Animatable.going) SC.Animatable.start();
   },
-  
+
   /**
     Removes a timer.
     @private
@@ -1119,7 +1116,7 @@ SC.mixin(SC.Animatable, {
   },
 
   timeout: function()
-  {	
+  {
     SC.Animatable.currentTime = new Date().getTime();
     var start = SC.Animatable.currentTime;
 
@@ -1142,7 +1139,7 @@ SC.mixin(SC.Animatable, {
     // still, only called once per frame, so should _very_ minimally impact performance and memory.
     if (SC.Animatable._ticks < 1000000) SC.Animatable._ticks++; // okay, put _some_ limit on it
 
-    // now see about doing next bit...	
+    // now see about doing next bit...
     var end = new Date().getTime();
     var elapsed = end - start;
     if (SC.Animatable.baseTimer.next)