sproutcore 1.10.0 → 1.10.1

data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/advanced/event_queuing.js

@@ -0,0 +1,104 @@
+// ==========================================================================
+// 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)
+// ==========================================================================
+
+var TestState, statechart, expectedEvents;
+
+module("Statechart Event Queuing", {
+  setup: function() {
+    TestState = SC.State.extend({
+      _handledEvents: null,
+
+      init: function() {
+        sc_super();
+        this.reset();
+      },
+
+      reset: function() {
+        this.set('_handledEvents', []);
+      }
+    });
+
+    statechart = SC.Statechart.create({
+
+      rootState: TestState.extend({
+
+        initialSubstate: 'a',
+
+        eventA: function() {
+          this._handledEvents.push('eventA');
+        },
+
+        eventB: function() {
+          this._handledEvents.push('eventB');
+
+          statechart.gotoState('b');
+        },
+
+        eventC: function() {
+          this._handledEvents.push('eventC');
+        },
+
+        a: TestState.extend({
+
+        }),
+
+        b: TestState.extend({
+          enterState: function() {
+            statechart.sendEvent('eventC');
+          }
+        }),
+
+        c: TestState.extend({
+          enterState: function() {
+            statechart.sendEvent('eventA');
+            stop();
+            return this.performAsync('asyncFunction');
+          },
+
+          asyncFunction: function() {
+            var self = this;
+            setTimeout(function() {
+              statechart.sendEvent('eventC');
+            }, 100);
+            setTimeout(function() {
+              var rootState = statechart.get('rootState');
+              self.resumeGotoState();
+              same(rootState._handledEvents, expectedEvents, 'expected events were handled');
+              start();
+            }, 500);
+          }
+        })
+
+      })
+
+    });
+
+    statechart.initStatechart();
+  },
+
+  teardown: function() {
+    statechart.destroy();
+    statechart = null;
+  }
+});
+
+test("Events are sent even when queued during state transitions", function() {
+  var rootState = statechart.get('rootState'),
+      stateA = statechart.getState('a'),
+      stateB = statechart.getState('b');
+
+  statechart.sendEvent('eventA');
+  equals(rootState._handledEvents.contains('eventA'), true, 'eventA was handled');
+
+  rootState.reset();
+  statechart.sendEvent('eventB');
+  same(rootState._handledEvents, ['eventB', 'eventC'], 'eventB and eventC were handled');
+
+  rootState.reset();
+  expectedEvents = ['eventA', 'eventC'];
+  statechart.gotoState('c');
+});

data/lib/frameworks/sproutcore/frameworks/table/views/table.js

@@ -365,6 +365,9 @@ SC.TableView = SC.ListView.extend(SC.TableDelegate, {
     containerView.adjust('minHeight', minHeight);
     containerView.layoutDidChange();
 
+    // Set the calculatedHeight used by SC.ScrollView.
+    this.set('calculatedHeight', minHeight);
+
     //containerView.adjust('height', height);
     //containerView.layoutDidChange();
 

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

@@ -690,6 +690,7 @@ Handlebars.SafeString.prototype.toString = function() {
 
 (function() {
   var escape = {
+    "&": "&",
     "<": "&lt;",
     ">": "&gt;",
     '"': "&quot;",
@@ -697,7 +698,7 @@ Handlebars.SafeString.prototype.toString = function() {
     "`": "&#x60;"
   };
 
-  var badChars = /&(?!\w+;)|[<>"'`]/g;
+  var badChars = /[&<>"'`]/g;
   var possible = /[&<>"'`]/;
 
   var escapeChar = function(chr) {

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

@@ -0,0 +1,17 @@
+$theme.sc-grid-insertion-point {
+  overflow: visible;
+  background-color: #9ABAC9;
+  z-index: 1000;
+}
+
+$theme.sc-grid-insertion-point > .anchor {
+  position: absolute;
+  width: 8px;
+  top: -3px;
+  left: -3px;
+  height: 8px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  background-color: #9ABAC9;
+}

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

@@ -4,6 +4,7 @@ $theme.menu {
   .panel-background {
     background: transparent;
     position: absolute;
+    // The top and bottom match the menuHeightPadding value.
     top: -22px; right: -15px; bottom: -22px; left: -15px;
     @include slices("menu.png", $left: 25, $right: 25, $top: 25, $bottom: 25, $fill: 1 1);
   }

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

@@ -1,13 +1,13 @@
 $theme.panel {
   background: transparent;
-  
+
   .panel-background {
     position: absolute;
     left: -15px;
     top: -15px;
     bottom: -15px;
     right: -15px;
-    
+
     @include slices("panel.png", $top: 25, $left: 25, $right: 25, $bottom: 25, $fill: 1 1);
   }
 }

data/lib/frameworks/sproutcore/themes/empty_theme/theme.js

@@ -10,7 +10,7 @@
   @since SproutCore 1.1
 */
 SC.EmptyTheme = SC.BaseTheme.create({
-  name: 'sc-empty'
+  name: 'sc-empty-theme'
 });
 
 SC.Theme.addTheme(SC.EmptyTheme);

data/lib/sproutcore/tools.rb

@@ -24,7 +24,7 @@ module SC
   # tool itself when it runs.
   #
   class Tools < ::Thor
-    check_unknown_options!
+    check_unknown_options! :except => :phantom
 
     def self.invoke(task_name)
       start([task_name.to_s] + ARGV)
@@ -465,4 +465,5 @@ require "sproutcore/tools/gen"
 require "sproutcore/tools/init"
 require "sproutcore/tools/manifest"
 require "sproutcore/tools/server"
+require "sproutcore/tools/phantom"
 

data/lib/sproutcore/tools/phantom.rb

@@ -0,0 +1,36 @@
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2009 Apple Inc.
+#            portions copyright @2006-2013 Strobe Inc.
+#            and contributors
+# ===========================================================================
+
+module SC
+
+  class Tools
+
+    stop_on_unknown_option! :phantom
+
+    desc "phantom ARGS", "Runs the PhantomJS unit test runner, passing arguments straight through"
+
+    def phantom(*args)
+      result = false
+      target = find_targets('/sproutcore').first
+
+      if target
+        test_runner_path = File.expand_path(File.join('phantomjs', 'test_runner.js'), target.source_root)
+        if File.file? test_runner_path
+          result = system "phantomjs #{test_runner_path} #{args.join(' ')}"
+        else
+          SC.logger.fatal "Could not find PhantomJS test runner"
+        end
+      else
+        SC.logger.fatal "Could not find /sproutcore target"
+      end
+
+      exit(1) unless result
+    end
+
+  end
+end
+

data/sproutcore.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'json_pure', "~> 1.4"
   s.add_dependency 'extlib', "~> 0.9"
   s.add_dependency 'erubis', "~> 2.6"
-  s.add_dependency 'thor', '~> 0.14'
+  s.add_dependency 'thor', '~> 0.18'
   s.add_dependency 'sass', '~> 3.1'
   s.add_dependency 'haml', '~> 3.1'
 

data/vendor/chance/lib/chance/instance.rb

@@ -64,6 +64,7 @@ module Chance
     def initialize(options = {})
       @options = options
       @options[:theme] = "" if @options[:theme].nil?
+      @options[:css_charset] = "UTF-8" if @options[:css_charset].nil?
       @options[:pad_sprites_for_debugging] = true if @options[:pad_sprites_for_debugging].nil?
       @options[:optimize_sprites] = true if @options[:optimize_sprites].nil?
       
@@ -256,7 +257,9 @@ module Chance
         # slices (the details will be postprocessed out).
         # After that, all of the individual files (using the import CSS generated
         # in Step 1)
-        css = "@import \"#{image_css_path}\";\n" + import_css
+        # We insert the charset here or else Sass will not determine it correctly via the @imports.
+        css_charset = @options[:css_charset]
+        css = "@charset \"#{css_charset}\";\n@import \"#{image_css_path}\";\n" + import_css
 
         # Step 3: Apply Sass Engine
         engine = Sass::Engine.new(css, Compass.sass_engine_options.merge({
@@ -433,7 +436,7 @@ module Chance
       relative_paths = @mapped_files.invert
 
       @file_list.map {|file|
-        # NOTE: WE MUST CALL CHANCE PARSER NOW, because it generates our slicses.
+        # NOTE: WE MUST CALL CHANCE PARSER NOW, because it generates our slices.
         # We can't be picky and just call it if something has changed. Thankfully,
         # parser is fast. Unlike SCSS.
         header_file = chance_header_for_file(relative_paths[file[:path]])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sproutcore
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Strobe, Inc., Apple Inc. and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -287,6 +287,7 @@ executables:
 - sc-gen
 - sc-init
 - sc-manifest
+- sc-phantom
 - sc-server
 - sproutcore
 extensions: []
@@ -309,6 +310,7 @@ files:
 - bin/sc-gen
 - bin/sc-init
 - bin/sc-manifest
+- bin/sc-phantom
 - bin/sc-server
 - bin/sproutcore
 - lib/Buildfile
@@ -473,6 +475,7 @@ files:
 - lib/sproutcore/tools/gen.rb
 - lib/sproutcore/tools/init.rb
 - lib/sproutcore/tools/manifest.rb
+- lib/sproutcore/tools/phantom.rb
 - lib/sproutcore/tools/server.rb
 - lib/sproutcore/version.rb
 - spec/buildtasks/build/copy_spec.rb
@@ -1611,6 +1614,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/selection.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/selectNextItem.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/selectPreviousItem.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/touch.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/ui_diagram.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/date_field/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/date_field/ui.js
@@ -2053,6 +2057,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/statechart/system/state_route_handler_context.js
 - lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js
 - lib/frameworks/sproutcore/frameworks/statechart/tests/debug/sequence_matcher.js
+- lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/advanced/event_queuing.js
 - lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/advanced/without_concurrent_states.js
 - lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/basic/with_concurrent_states.js
 - lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/basic/without_concurrent_states.js
@@ -2231,6 +2236,7 @@ files:
 - lib/frameworks/sproutcore/themes/ace/resources/checkbox/ace/16px/checkbox_unchecked.png
 - lib/frameworks/sproutcore/themes/ace/resources/checkbox/ace/16px/checkbox_unchecked_active.png
 - lib/frameworks/sproutcore/themes/ace/resources/checkbox/ace/checkbox.css
+- lib/frameworks/sproutcore/themes/ace/resources/collection/normal/grid.css
 - lib/frameworks/sproutcore/themes/ace/resources/collection/normal/list.css
 - lib/frameworks/sproutcore/themes/ace/resources/collection/normal/list_item.css
 - lib/frameworks/sproutcore/themes/ace/resources/collection/source-list/selection.png
@@ -2250,6 +2256,7 @@ files:
 - lib/frameworks/sproutcore/themes/ace/resources/menu/down.png
 - lib/frameworks/sproutcore/themes/ace/resources/menu/menu.css
 - lib/frameworks/sproutcore/themes/ace/resources/menu/menu.png
+- lib/frameworks/sproutcore/themes/ace/resources/menu/menu@2x.png
 - lib/frameworks/sproutcore/themes/ace/resources/menu/menu_item.png
 - lib/frameworks/sproutcore/themes/ace/resources/menu/up.png
 - lib/frameworks/sproutcore/themes/ace/resources/panel/panel.css