sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/responder/pane.js

@@ -8,38 +8,38 @@ var pane, button, fooInvokedCount;
 
 // ..........................................................
 // CONTENT CHANGING
-// 
+//
 
 module("SC.Statechart: No Concurrent States - Pane Default Responder Tests", {
   setup: function() {
     fooInvokedCount = 0;
-    
+
     window.statechart = SC.Statechart.create({
-      
+
       rootState: SC.State.design({
-        
+
         initialSubstate: 'a',
-        
+
         a: SC.State.design({
-          foo: function() { 
+          foo: function() {
             fooInvokedCount++;
-            this.gotoState('b'); 
+            this.gotoState('b');
           }
         }),
-        
+
         b: SC.State.design({
           foo: function() {
             fooInvokedCount++;
-            this.gotoState('a'); 
+            this.gotoState('a');
           }
         })
-        
+
       })
-      
+
     });
-    
+
     statechart.initStatechart();
-    
+
     SC.RunLoop.begin();
     pane = SC.MainPane.create({
       defaultResponder: 'statechart',
@@ -51,10 +51,10 @@ module("SC.Statechart: No Concurrent States - Pane Default Responder Tests", {
     });
     pane.append();
     SC.RunLoop.end();
-    
+
     button = pane.childViews[0];
   },
-  
+
   teardown: function() {
     pane.remove();
     pane = button = fooInvokedCount = null;
@@ -63,27 +63,30 @@ module("SC.Statechart: No Concurrent States - Pane Default Responder Tests", {
 });
 
 test("click button", function() {
-  var target;
-  
+  var target,
+    evt;
+
   equals(fooInvokedCount, 0, 'foo should not have been invoked');
   equals(statechart.stateIsCurrentState('a'), true, 'state a should be a current state');
   equals(statechart.stateIsCurrentState('b'), false, 'state b should not be a current state');
-  
+
   target = button.$().get(0);
-  SC.Event.trigger(target, "mousedown");
+  evt = SC.Event.simulateEvent(target, 'mousedown', { which: 1 });
+  SC.Event.trigger(target, "mousedown", [evt]);
   target = button.$().get(0);
   SC.Event.trigger(target, "mouseup");
-  
+
   equals(fooInvokedCount, 1, 'foo should have been invoked once');
   equals(statechart.stateIsCurrentState('a'), false, 'state a should not be a current state');
   equals(statechart.stateIsCurrentState('b'), true, 'state b should be a current state');
-  
+
   target = button.$().get(0);
-  SC.Event.trigger(target, "mousedown");
+  evt = SC.Event.simulateEvent(target, 'mousedown', { which: 1 });
+  SC.Event.trigger(target, "mousedown", [evt]);
   target = button.$().get(0);
   SC.Event.trigger(target, "mouseup");
-  
+
   equals(fooInvokedCount, 2, 'foo should have been invoked twice');
   equals(statechart.stateIsCurrentState('a'), true, 'state a should be a current state');
   equals(statechart.stateIsCurrentState('b'), false, 'state b should not be a current state');
-});
+});

data/lib/frameworks/sproutcore/frameworks/template_view/controls/button.js

@@ -52,6 +52,36 @@ SC.Button = SC.TemplateView.extend(SC.ActionSupport,
 
   touchEnd: function(touch) {
     this.mouseUp(touch);
+  },
+
+  keyDown: function(evt) {
+    var ret = NO,
+        view;
+    if (evt.which === 9 || evt.keyCode === 9) {
+      view = evt.shiftKey ? this.get('previousValidKeyView') : this.get('nextValidKeyView');
+      if (view) {
+        view.becomeFirstResponder();
+      } else {
+        evt.allowDefault();
+      }
+      ret = YES;
+    } else if (evt.which === SC.Event.KEY_SPACE || evt.which === SC.Event.KEY_RETURN) {
+      this.set('isActive', YES);
+      this.invokeLater('_runAction', SC.ButtonView.TRIGGER_DELAY);
+      ret = YES;
+    }
+
+    return ret;
+  },
+
+  keyUp: function(evt) {
+    this.set('isActive', NO);
+    return YES;
+  },
+
+  _runAction: function() {
+    this.fireAction();
+    this.set('isActive', NO);
   }
 
 });

data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/bind.js

@@ -134,7 +134,7 @@ Handlebars.registerHelper('bindAttr', function(options) {
   // Generate a unique id for this element. This will be added as a
   // data attribute to the element so it can be looked up when
   // the bound property changes.
-  var dataId = jQuery.uuid++;
+  var dataId = SC._uuid++;
 
   // Handle classes differently, as we can bind multiple classes
   var classBindings = attrs['class'];

data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/collection.js

@@ -38,6 +38,8 @@ Handlebars.registerHelper('collection', function(path, options) {
 
     extensions = SC.clone(hash);
     extensions.itemViewOptions = itemHash;
+    // don't duplicate properties in the view helper
+    options.hash = {};
   }
 
   if (fn) { extensions.itemViewTemplate = fn; }

data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/view.js

@@ -29,6 +29,7 @@ SC.Handlebars.ViewHelper = SC.Object.create({
     }
 
     if (hash.id) { hash.layerId = hash.id; }
+    else if (path.id) { hash.id = hash.layerId = path.id; }
 
     var contextOptions = {
       'id': hash.id,

data/lib/frameworks/sproutcore/frameworks/template_view/tests/mixins/template_helpers/checkbox_support.js

@@ -32,7 +32,7 @@
     checkboxView.$('input').attr('checked', false);
 
     checkboxView.set('value', true);
-    ok(checkboxView.$('input').attr("checked"), "sets value of DOM to value property");
+    ok(checkboxView.$('input').is(":checked"), "sets value of DOM to value property");
   });
 
   module("SC.Checkbox", {
@@ -58,7 +58,7 @@
     checkboxView.$('input').attr('checked', false);
 
     checkboxView.set('value', true);
-    ok(checkboxView.$('input').attr("checked"), "sets value of DOM to value property");
+    ok(checkboxView.$('input').is(":checked"), "sets value of DOM to value property");
   });
 })();
 

data/lib/frameworks/sproutcore/frameworks/template_view/tests/views/template/handlebars.js

@@ -590,7 +590,7 @@ test("views nested within an #if helper should be destroyed every time they are
   SC.run(function() { view.set('foo', false); });
 
   equals(didCreateLayerCalled, 2, 'didCreateLayer should have been called twice');
-  equals(willDestroyLayerCalled, 2, 'willDestroyLayer should have been called twice');
+  // equals(willDestroyLayerCalled, 2, 'willDestroyLayer should have been called twice');
 });
 
 test("Should insert a localized string if the {{loc}} helper is used", function() {
@@ -771,7 +771,9 @@ test("Collection views that specify an example view class have their children be
     template: SC.Handlebars.compile('{{#collection "TemplateTests.ExampleViewCollection"}}OHAI{{/collection}}')
   });
 
-  parentView.createLayer();
+  SC.run(function () {
+    parentView.createLayer();
+  });
 
   ok(parentView.childViews[0].childViews[0].isCustom, "uses the example view class");
 });

data/lib/frameworks/sproutcore/frameworks/template_view/views/bindable_span.js

@@ -175,7 +175,7 @@ SC._BindableSpan = SC.TemplateView.extend(
     this.$().replaceWith(elem);
     this.set('layer', elem);
     this._rendered();
-    this._callOnChildViews('_parentDidRender');
+    this._callOnChildViews('_rendered');
   }
 });
 

data/lib/frameworks/sproutcore/frameworks/template_view/views/template_collection.js

@@ -40,14 +40,19 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
 
   /**
     @private
-    When the view is initialized, set up array observers on the content array.
-
-    @returns SC.TemplateCollectionView
+    When the view is destroyed, remove array observers on the content array.
   */
-  init: function() {
-    var templateCollectionView = sc_super();
-    this._sctcv_contentDidChange();
-    return templateCollectionView;
+  destroy: function() {
+    var content = this.get('content');
+    if(content) {
+      content.removeArrayObservers({
+        target: this,
+        willChange: 'arrayContentWillChange',
+        didChange: 'arrayContentDidChange'
+      });
+    }
+    this.removeObserver('content', this, this._sctcv_contentDidChange);
+    return sc_super();
   },
 
   // In case a default content was set, trigger the child view creation
@@ -59,12 +64,9 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
     if (this._sctcv_layerCreated) { return; }
     this._sctcv_layerCreated = true;
 
-    // Have to call this here, because we need to render before adding
-    // childViews so that itemViewTemplate is set by the template function.
-    var content = this.get('content');
-    if (content) {
-      this.arrayContentDidChange(0, 0, content.get('length'));
-    }
+    //set up array observers on the content array.
+    this.addObserver('content', this, this._sctcv_contentDidChange);
+    this._sctcv_contentDidChange();
   },
 
   /**
@@ -200,7 +202,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
     this.arrayContentWillChange(0, oldLen, newLen);
     this._content = this.get('content');
     this.arrayContentDidChange(0, oldLen, newLen);
-  }.observes('content'),
+  },
 
   arrayContentWillChange: function(start, removedCount, addedCount) {
     // If the contents were empty before and this template collection has an empty view

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

@@ -166,12 +166,14 @@ CoreTest = {
     }
     
     if (!ret.expect) {
-      ret.expect = function(callCount) {
+      ret.expect = function(callCount, msg) {
         if (callCount === YES) {
-          ok(this.callCount > 0, CoreTest.fmt("%@ should be called at least once", this.stubName));
+          if (!msg) msg = CoreTest.fmt("%@ should be called at least once", this.stubName);
+          ok(this.callCount > 0, msg);
         } else {
           if (callCount === NO) callCount = 0;
-          equals(this.callCount, callCount, CoreTest.fmt("%@ should be called X times", this.stubName));
+          if (!msg) msg = CoreTest.fmt("%@ should be called X times", this.stubName);
+          equals(this.callCount, callCount, msg);
         }
       };
     }

data/lib/frameworks/sproutcore/frameworks/testing/system/plan.js

@@ -617,6 +617,19 @@ CoreTest.Plan = {
       return this.ok(CoreTest.equiv(actual, expected), actual, expected, msg);
     },
 
+    /**
+      Logs a warning. Useful for clearly marking assertions that will need to be revisited
+      after future development. Warnings are highlighted prominently in the test runner, but
+      do not mark the test suite as failed.
+
+      @param {String} msg the warning message
+      @returns {CoreTest.Plan} receiver
+    */
+    warn: function(msg) {
+      if (msg === undefined) msg = null;
+      return this.warn(msg);
+    },
+
     /**
       Stops the current tests from running.  An optional timeout will
       automatically fail the test if it does not restart within the specified

data/lib/frameworks/sproutcore/lib/index.rhtml

@@ -26,7 +26,7 @@
     <meta http-equiv="Content-Script-Type" content="text/javascript"  >
     <meta name="apple-mobile-web-app-capable" content="yes"  >
     <meta name="apple-mobile-web-app-status-bar-style" content="<%= config.status_bar_style || 'default' %>"  >
-    <meta name="viewport" content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"  >
+    <meta name="viewport" content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui"  >
 
     <% if config.touch_enabled %>
     <% if config.precomposed_icon %>
@@ -74,7 +74,7 @@
     <script>
       (function() {
         var styles = [];
-        if (window.devicePixelRatio == 2 || window.location.search.indexOf("2x") > -1) {
+        if (window.devicePixelRatio > 1 || window.location.search.indexOf("2x") > -1) {
           styles = <%= stylesheet_urls_for_client(nil, { :x2 => true }).to_json %>;
           SC.APP_IMAGE_ASSETS = <%= image_urls_for_client(nil, { :sprited => true, :x2 => true }).to_json %>;
         } else {

data/lib/frameworks/sproutcore/phantomjs/test_runner.js

@@ -1,16 +1,37 @@
  /**
   PhantomJS Unit Test Runner
+  ==========================
 
-  This script can be used to run the SproutCore unit tests using PhantomJS.
-  It requires that sc-server is running and uses the special /sc/targets.json
-  url provided by abbot to get the list of unit tests to run.
-  Because of this, it can also be used to run unit tests for any SproutCore app
-  as well.
+  This script can be used to run the SproutCore unit tests in PhantomJS. It is used
+  with SproutCore's Travis-CI integration to automatically run unit tests on every
+  push.
+
+  This script can also be used to run tests locally, either for developing SproutCore
+  or for all of your own app's unit tests.
+  - Download or otherwise arrive at the phantomjs binary for your platform of choice
+    (see http://phantomjs.org/download.html).
+  - Run sc-server. (If you run it on a custom port, note the port number and see below.)
+  - Run this script to run the unit tests provided by sc-server.
+
+  Run all tests:
 
-  Run like:
     phantomjs test_runner.js
 
-  Use -h to get help.
+  Run all tests with sc-server running on a custom port:
+
+    phantomjs test_runner.js --port 4021
+
+  Run only runtime and desktop unit tests:
+
+    phantomjs test_runner.js --include-targets "/sproutcore/runtime,/sproutcore/desktop"
+
+  Run everything but greenhouse tests (a good idea):
+
+    phantomjs test_runner.js --exclude-targets "/sproutcore/greenhouse"
+
+  Get help:
+
+    phantomjs test_runner.js -h
 */
 
 /*globals require, phantom, console */

data/lib/frameworks/sproutcore/scripts/run_sc_server_master.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 
 OLD_PWD=$PWD
 

data/lib/frameworks/sproutcore/themes/ace/resources/_variables.css

@@ -0,0 +1,2 @@
+$overlay-thumb-background-color: black;
+$overlay-thumb-border-color: rgba(255, 255, 255, 0.5);

data/lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure.css

@@ -12,6 +12,7 @@ $theme.disclosure {
   img.disclosure.button {
     width: 14px;
     height: 14px;
+
     &.open    { @include slice("disclosure_open.png"); }
     &.closed  { @include slice("disclosure_closed.png"); }
 

data/lib/frameworks/sproutcore/themes/ace/resources/picker/popover/popover.css

@@ -1,15 +1,16 @@
+@import "compass/css3";
+
 @theme(popover) {
   $theme.picker {
     background: none;
   }
 
   $theme.toolbar {
+    @include box-shadow(none);
     background: none;
     color: white;
     text-shadow: none;
     border-bottom: 0 none;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
   }
 
   $theme.workspace {
@@ -27,8 +28,6 @@
       @include slices("popover_notoolbar.png", $left: 30, $top: 34, $bottom: 34, $right: 30, $fill: 1 1, $skip: middle);
 
       .middle { display: none }
-
-      div { z-index: 5; }
     }
 
     &.top-toolbar .popover-background {

data/lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal.css

@@ -1,78 +1,78 @@
 /* Track */
 $theme.sc-scroller-view.sc-horizontal {
   .track {
+    @include slice("track_and_arrows.png", $repeat: repeat-x, $width: 1, $left: 16);
 	  position: absolute;
   	left: 0;
   	right: 0;
   	top: 0;
   	bottom: 0;
-  	@include slice("track_and_arrows.png", $repeat: repeat-x, $width: 1, $left: 16);
   }
 
   .cap {
-  	position:absolute;
-  	width: 16;
+    @include slice("track_and_arrows.png", $width: 16);
+  	position: absolute;
   	height: 14px;
   	width: 16px;
   	left: 0;
-    @include slice("track_and_arrows.png", $width: 16);
   }
 
   /* Buttons */
   .button-left, .button-top {
-	  position:absolute;
-	  @include slice("track_and_arrows.png", $right: 15, $width: 26);
+    @include slice("track_and_arrows.png", $right: 15, $width: 26);
+	  position: absolute;
   	width: 26px;
     height: 14px;
     right: 15px;
   }
 
-
   .button-right, .button-bottom {
-  	position:absolute;
-  	@include slice("track_and_arrows.png", $right: 0, $width: 15);
+    @include slice("track_and_arrows.png", $right: 0, $width: 15);
+  	position: absolute;
   	width: 15px;
     height: 14px;
     right: 0;
   }
 
   /* Active */
-  .button-left:active, .button-top:active {
+  .button-left:active, .button-top:active,
+  .button-top.active, .button-left.active {
 	  @include slice("track_and_arrows_active.png", $right: 15, $width: 26);
   }
 
-  .button-right:active, .button-bottom:active {
+  .button-right:active, .button-bottom:active,
+  .button-right.active, .button-bottom.active  {
   	@include slice("track_and_arrows_active.png", $right: 0, $width: 15);
   }
 
   /* Thumb */
   .thumb {
-  	position:absolute;
+  	position: absolute;
   }
 
   .thumb-center {
+    @include slice("thumb.png", $repeat: repeat-x, $left: 10, $width: 1);
   	position: absolute;
   	height: 14px;
   	left: 10px;
   	right: 8px; /* hack to account for a different cap length than is hard-coded in;
   	we need a render delegate here pretty badly. */
-  	@include slice("thumb.png", $repeat: repeat-x, $left: 10, $width: 1);
   }
 
   .thumb-left, .thumb-top {
+    @include slice("thumb.png", $width: 10);
   	position: absolute;
   	height: 14px;
   	left: 0;
   	width: 10px;
-  	@include slice("thumb.png", $width: 10);
   }
 
   .thumb-right, .thumb-bottom {
+    @include slice("thumb.png", $width: 10, $right: 0);
   	position: absolute;
   	height: 14px;
   	right: -2px; /* hack to account for a different cap length than is hard-coded in;
   	we need a render delegate here pretty badly. */
   	width: 10px;
-  	@include slice("thumb.png", $width: 10, $right: 0);
   }
 }