sproutcore 1.10.3.1 → 1.11.0.rc1

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

@@ -58,7 +58,7 @@ module Chance
     }
 
     @@uid = 0
-    
+
     @@generation = 0
 
     def initialize(options = {})
@@ -67,10 +67,10 @@ module Chance
       @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?
-      
+
       @@uid += 1
       @uid = @@uid
-      
+
       @options[:instance_id] = @uid if @options[:instance_id].nil?
 
       if @options[:theme].length > 0 and @options[:theme][0] != "."
@@ -80,7 +80,7 @@ module Chance
       # The mapped files are a map from file names in the Chance Instance to
       # their identifiers in Chance itself.
       @mapped_files = { }
-      
+
       # The file mtimes are a collection of mtimes for all the files we have. Each time we
       # read a file we record the mtime, and then we compare on check_all_files
       @file_mtimes = { }
@@ -96,7 +96,7 @@ module Chance
 
       # Tracks whether _render has been called.
       @has_rendered = false
-      
+
       # A generation number for the current render. This allows the slicing and spriting
       # to be invalidated smartly.
       @render_cycle = 0
@@ -114,7 +114,7 @@ module Chance
         # Don't do anything if there is nothing to do.
         return
       end
-      
+
       path = path.to_s
       file = Chance.has_file(identifier)
 
@@ -133,14 +133,14 @@ module Chance
         # Don't do anything if there is nothing to do
         return
       end
-      
+
       path = path.to_s
       @mapped_files.delete path
 
       # Invalidate our render because things have changed.
       clean
     end
-    
+
     # unmaps all files
     def unmap_all
       @mapped_files = {}
@@ -155,7 +155,7 @@ module Chance
           needs_clean = true
         end
       }
-      
+
       clean if needs_clean
     end
 
@@ -169,7 +169,7 @@ module Chance
       return Chance.get_file(@mapped_files[path])
     end
 
-    def output_for(file)
+    def output_for(file, dst_path)
       return @files[file] if not @files[file].nil?
 
       # small hack: we are going to determine whether it is x2 by whether it has
@@ -180,7 +180,7 @@ module Chance
       if opts
         send opts[:method], opts
       elsif sprite_names({ :x2 => x2 }).include? file
-        return sprite_data({:name => file, :x2 => x2 })
+        return sprite_data({:name => file, :x2 => x2 }, dst_path)
       else
         raise "Chance does not generate a file named '#{file}'" if opts.nil?
       end
@@ -228,7 +228,7 @@ module Chance
 
       # Update the render cycle to invalidate sprites, slices, etc.
       @render_cycle = @render_cycle + 1
-      
+
       @files = {}
       begin
         # SCSS code executing needs to know what the current instance of Chance is,
@@ -236,21 +236,21 @@ module Chance
         Chance._current_instance = self
 
         # Step 1: preprocess CSS, determining order and parsing the slices out.
-        # The output of this process is a "virtual" file that imports all of the 
+        # The output of this process is a "virtual" file that imports all of the
         # SCSS files used by this Chance instance. This also sets up the @slices hash.
         import_css = _preprocess
-        
+
         # Because we encapsulate with instance_id, we should not have collisions even IF another chance
         # instance were running at the same time (which it couldn't; if it were, there'd be MANY other issues)
         image_css_path = File.join('./tmp/chance/image_css', @options[:instance_id].to_s, '_image_css.scss')
         FileUtils.mkdir_p(File.dirname(image_css_path))
-        
+
         file = File.new(image_css_path, "w")
         file.write(_css_for_slices)
         file.close
-        
+
         image_css_path = File.join('./tmp/chance/image_css', @options[:instance_id].to_s, 'image_css')
-        
+
 
         # STEP 2: Preparing input CSS
         # The main CSS file we pass to the Sass Engine will have placeholder CSS for the
@@ -317,10 +317,10 @@ module Chance
       else
         ret = postprocess_css_dataurl(opts)
       end
-      
+
       ret = _strip_slice_class_names(ret)
     end
-    
+
     #
     # Strips dummy slice class names that were added by Chance so that SCSS could do its magic,
     # but which are no longer needed.
@@ -331,10 +331,10 @@ module Chance
     end
 
 
-    # 
+    #
     # COMBINING CSS
     #
-    
+
     # Determines the "Chance Header" to add at the beginning of the file. The
     # Chance Header can set, for instance, the $theme variable.
     #
@@ -343,33 +343,33 @@ module Chance
     # only used for this purpose)
     #
     # For backwards-compatibility, the fallback if no _theme.css file is present
-    # is to return code setting $theme to the now-deprecated @options[:theme] 
+    # is to return code setting $theme to the now-deprecated @options[:theme]
     # passed to Chance
     def chance_header_for_file(file)
       # 'file' is the name of a file, so we actually need to start at dirname(file)
       dir = File.dirname(file)
-      
+
       # This should not be slow, as this is just a hash lookup
       while dir.length > 0 and not dir == "."
         header_file = @mapped_files[File.join(dir, "_theme.css")]
         if not header_file.nil?
           return Chance.get_file(header_file)
         end
-        
+
         dir = File.dirname(dir)
       end
-      
+
       # Make sure to look globally
       header_file = @mapped_files["_theme.css"]
       return Chance.get_file(header_file) if not header_file.nil?
-      
+
       {
         # Never changes (without a restart, at least)
         :mtime => 0,
         :content => "$theme: '" + @options[:theme] + "';\n"
       }
     end
-    
+
     #
     # _include_file is the recursive method in the depth-first-search
     # that creates the ordered list of files.
@@ -381,7 +381,7 @@ module Chance
     #
     def _include_file(file)
       return if not file =~ /\.css$/
-      
+
       # skip _theme.css files
       return if file =~ /_theme\.css$/
 
@@ -417,7 +417,7 @@ module Chance
       @@generation = @@generation + 1
       files = @mapped_files.values
       @file_list = []
-      
+
       # We have to sort alphabetically first...
       tmp_file_list = []
       @mapped_files.each {|p, f| tmp_file_list.push([p, f]) }
@@ -425,11 +425,11 @@ module Chance
 
       tmp_file_list.each {|paths|
         p, f = paths
-        
+
         # Save the mtime for caching
         mtime = Chance.update_file_if_needed(f)
         @file_mtimes[p] = mtime
-        
+
         _include_file(f)
       }
 
@@ -440,7 +440,7 @@ module Chance
         # 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]])
-        
+
         content = "@_chance_file " + relative_paths[file[:path]] + ";\n"
         content += header_file[:content]
         content += file[:content]
@@ -448,7 +448,7 @@ module Chance
         parser = Chance::Parser.new(content, @options)
         parser.parse
         file[:parsed_css] = parser.css
-        
+
         # We used to use an md5 hash here, but this hides the original file name
         # from SCSS, which makes the file name + line number comments useless.
         #
@@ -458,7 +458,7 @@ module Chance
         tmp_path = "./tmp/chance/#{path_safe}.scss"
 
         FileUtils.mkdir_p(File.dirname(tmp_path))
-        
+
         if (not file[:mtime] or not file[:wtime] or file[:wtime] < file[:mtime] or
             not header_file[:mtime] or file[:wtime] < header_file[:mtime])
           f = File.new(tmp_path, "w")

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

@@ -102,9 +102,10 @@ module Chance
         #
         # Usually, this is computed as a simple max of itself and the width of any
         # given slice. However, when repeating, the least common multiple is used,
-        # and the smallest item is stored as well.
+        # and the smallest items are stored as well.
         size = 1
-        smallest_size = nil
+        largest_size = nil
+        used_area = 0
 
         is_horizontal = sprite[:use_horizontal_layout]
 
@@ -130,22 +131,22 @@ module Chance
             slice_height = canvas.height
           end
 
-          slice_length = is_horizontal ? slice_width : slice_height
+          # slice_length = is_horizontal ? slice_width : slice_height
           slice_size = is_horizontal ? slice_height : slice_width
 
           # When repeating, we must use the least common multiple so that
           # we can ensure the repeat pattern works even with multiple repeat
           # sizes. However, we should take into account how much extra we are
-          # adding by tracking the smallest size item as well.
+          # adding by tracking the largest size item as well.
           if slice[:repeat] != "no-repeat"
-            smallest_size = slice_size if smallest_size.nil?
-            smallest_size = [slice_size, smallest_size].min
-
             size = size.lcm slice_size
           else
             size = [size, slice_size + padding * 2].max
           end
 
+          largest_size = size if largest_size.nil?
+          largest_size = [size, largest_size].max
+
           slice[:slice_width] = slice_width.to_i
           slice[:slice_height] = slice_height.to_i
         }
@@ -178,7 +179,6 @@ module Chance
             row_length = 0
           end
 
-
           # We have extras for manual tweaking of offsetx/y. We have to make sure there
           # is padding for this (on either side)
           #
@@ -228,14 +228,15 @@ module Chance
             inset = (inset.to_f / 2).ceil * 2
           end
 
+          used_area += slice_size * slice_length
         end
         pos += row_length
 
-        # TODO: USE A CONSTANT FOR THIS WARNING
-        smallest_size = size if smallest_size == nil
-        if size - smallest_size > 10
-          puts "WARNING: Used more than 10 extra rows or columns to accommodate repeating slices."
-          puts "Wasted up to " + (pos * size-smallest_size).to_s + " pixels"
+        total_area = pos * largest_size
+
+        if total_area > 300000 # an arbritrarily large sprite size at which we could begin to worry about the efficiency
+          efficiency = (used_area / total_area.to_f) * 100
+          sprite[:efficiency] = efficiency
         end
 
         sprite[:width] = is_horizontal ? pos : size
@@ -246,7 +247,7 @@ module Chance
 
       # Generates the image for the specified sprite, putting it in the sprite's
       # :image property.
-      def generate_sprite(sprite)
+      def generate_sprite(sprite, dst_path)
         canvas = canvas_for_sprite(sprite)
         sprite[:canvas] = canvas
 
@@ -275,6 +276,10 @@ module Chance
 
           compose_slice_on_canvas(canvas, slice, x, y, width, height)
         end
+
+        if sprite[:efficiency] != nil and sprite[:efficiency] < 50.0
+          # SC.logger.warn "Inefficient sprite: '#{dst_path}'.\n The content to wasted space ratio for the sprite is only #{sprite[:efficiency].round(0)}%. This sprite could be optimized by removing overly large slices within it.\n"
+        end
       end
 
       def canvas_for_sprite(sprite)
@@ -364,7 +369,7 @@ module Chance
 
       end
 
-      def sprite_data(opts)
+      def sprite_data(opts, dst_path)
         _render
         slice_images(opts)
         generate_sprite_definitions(opts)
@@ -379,7 +384,7 @@ module Chance
         end
 
 
-        generate_sprite(sprite) if not sprite[:has_generated]
+        generate_sprite(sprite, dst_path) if not sprite[:has_generated]
 
         ret = sprite[:canvas].to_blob
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sproutcore
 version: !ruby/object:Gem::Version
-  version: 1.10.3.1
+  version: 1.11.0.rc1
 platform: ruby
 authors:
 - Strobe, Inc., Apple Inc. and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -1122,11 +1122,16 @@ files:
 - lib/frameworks/sproutcore/apps/welcome/main.js
 - lib/frameworks/sproutcore/Buildfile
 - lib/frameworks/sproutcore/CHANGELOG.md
+- lib/frameworks/sproutcore/CONTRIBUTORS.md
 - lib/frameworks/sproutcore/frameworks/ajax/fixtures/file_exists.json
 - lib/frameworks/sproutcore/frameworks/ajax/fixtures/malformed.json
+- lib/frameworks/sproutcore/frameworks/ajax/mixins/websocket_delegate.js
 - lib/frameworks/sproutcore/frameworks/ajax/system/request.js
 - lib/frameworks/sproutcore/frameworks/ajax/system/response.js
+- lib/frameworks/sproutcore/frameworks/ajax/system/websocket.js
 - lib/frameworks/sproutcore/frameworks/ajax/tests/system/request.js
+- lib/frameworks/sproutcore/frameworks/ajax/tests/system/websocket.js
+- lib/frameworks/sproutcore/frameworks/ajax/tests/system/xhr_response_test.js
 - lib/frameworks/sproutcore/frameworks/bootstrap/core.js
 - lib/frameworks/sproutcore/frameworks/bootstrap/README
 - lib/frameworks/sproutcore/frameworks/bootstrap/setup_body_class_names.js
@@ -1140,10 +1145,12 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/controllers/controller.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/controllers/object.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/core.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/english.lproj/ordinal.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/ext/function.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/ext/object.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/ext/run_loop.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/ext/string.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/french.lproj/ordinal.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/mixins/action_support.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/mixins/delegate_support.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/mixins/responder_context.js
@@ -1155,11 +1162,12 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/panes/manipulation.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane_statechart.js
-- lib/frameworks/sproutcore/frameworks/core_foundation/panes/visibility.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/protocols/child_view_layout_protocol.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/protocols/observable_protocol.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/protocols/sparse_array_delegate.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/protocols/view_transition_protocol.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/system/application.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/system/bezier_curves.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/system/browser.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/system/builder.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/system/color.js
@@ -1182,6 +1190,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/system/string.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/system/theme.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/system/timer.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/system/touch.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/system/utils/rect.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/system/utils.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/array_case.js
@@ -1194,6 +1203,8 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/multiple_case.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/single_case.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/single_enumerable_case.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/core_tests.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/ext/number_test.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/ext/object_test.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/action_support.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/responder_context.js
@@ -1221,11 +1232,14 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/push_text.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/tag.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/update.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/design_modes_test.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/makeKeyPane.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/makeMainPane.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/makeMenuPane.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/mouse_events.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/root_responder.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/targetForAction.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/touch.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/selection_set/add.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/selection_set/copy.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/selection_set/indexSetForSource.js
@@ -1238,18 +1252,21 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/timer/isPaused.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/timer/performAction.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/timer/schedule.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/touch.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/normalizeURL.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/offset.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/rect.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/main_pane.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/append_remove.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/child_view.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/design_mode_test.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/firstResponder.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/keyPane.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/layout.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/sendEvent.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/animation.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/attribute_bindings_test.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/background_color.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/border_frame_test.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/build.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/build_children.js
@@ -1291,6 +1308,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/views/view/animation.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/views/view/base.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/views/view/cursor.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/views/view/design_mode.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/views/view/enabled.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/views/view/keyboard.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js
@@ -1341,6 +1359,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/datastore/tests/integration/cyclical_relationship.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/integration/mail_model.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/integration/many_array.js
+- lib/frameworks/sproutcore/frameworks/datastore/tests/integration/store_interaction_test.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/integration/test_runner_model.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/datetime_recordattribute.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/many_attribute.js
@@ -1349,6 +1368,9 @@ files:
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array_complex.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_complex.js
+- lib/frameworks/sproutcore/frameworks/datastore/tests/models/polymorphism/many.js
+- lib/frameworks/sproutcore/frameworks/datastore/tests/models/polymorphism/simple.js
+- lib/frameworks/sproutcore/frameworks/datastore/tests/models/polymorphism/single.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/core_methods.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/destroy.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/error_methods.js
@@ -1361,6 +1383,8 @@ files:
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/record_attribute.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/models/single_attribute.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/many_array/core_methods.js
+- lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/autonomous_dataSourceCallbacks.js
+- lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/autonomous_pushChanges.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/chain.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/commitChanges.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/commitChangesFromNestedStore.js
@@ -1403,6 +1427,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/init.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/loadRecord.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/loadRecords.js
+- lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/materializeRecord.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushChanges.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushRelationships.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/readDataHash.js
@@ -1415,7 +1440,8 @@ files:
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/writeDataHash.js
 - lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/system/datetime.js
 - lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/tests/system/datetime.js
-- lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/resources/strings.js
+- lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/english.lproj/strings.js
+- lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/french.lproj/strings.js
 - lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/system/datetime.js
 - lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/tests/system/datetime.js
 - lib/frameworks/sproutcore/frameworks/debug/core.js
@@ -1467,15 +1493,14 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/debug/drag.js
 - lib/frameworks/sproutcore/frameworks/desktop/debug/resources/a_sample_image.jpg
 - lib/frameworks/sproutcore/frameworks/desktop/debug/resources/iframe.html
-- lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_fast_path.js
 - lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_group.js
 - lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_row_delegate.js
 - lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_view_delegate.js
 - lib/frameworks/sproutcore/frameworks/desktop/mixins/navigation_builder.js
-- lib/frameworks/sproutcore/frameworks/desktop/mixins/scrollable.js
 - lib/frameworks/sproutcore/frameworks/desktop/mixins/split_child.js
 - lib/frameworks/sproutcore/frameworks/desktop/mixins/split_thumb.js
 - lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js
+- lib/frameworks/sproutcore/frameworks/desktop/panes/draggable.js
 - lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js
 - lib/frameworks/sproutcore/frameworks/desktop/panes/modal.js
 - lib/frameworks/sproutcore/frameworks/desktop/panes/palette.js
@@ -1559,6 +1584,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/resources/menu.css
 - lib/frameworks/sproutcore/frameworks/desktop/resources/menu_item_view.css
 - lib/frameworks/sproutcore/frameworks/desktop/resources/modal.css
+- lib/frameworks/sproutcore/frameworks/desktop/resources/overlay-scroller.css
 - lib/frameworks/sproutcore/frameworks/desktop/resources/panel.css
 - lib/frameworks/sproutcore/frameworks/desktop/resources/picker.css
 - lib/frameworks/sproutcore/frameworks/desktop/resources/progress.css
@@ -1571,11 +1597,9 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/resources/split_divider.css
 - lib/frameworks/sproutcore/frameworks/desktop/resources/tab.css
 - lib/frameworks/sproutcore/frameworks/desktop/resources/toolbar.css
-- lib/frameworks/sproutcore/frameworks/desktop/resources/touch-scroller.css
 - lib/frameworks/sproutcore/frameworks/desktop/resources/web.css
 - lib/frameworks/sproutcore/frameworks/desktop/resources/well.css
 - lib/frameworks/sproutcore/frameworks/desktop/system/drag.js
-- lib/frameworks/sproutcore/frameworks/desktop/system/undo_manager.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/integration/dialog.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/ui.js
@@ -1588,8 +1612,6 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/ui.js
-- lib/frameworks/sproutcore/frameworks/desktop/tests/panes/select_button/methods.js
-- lib/frameworks/sproutcore/frameworks/desktop/tests/panes/select_button/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/panes/sheet/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/panes/sheet/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/content.js
@@ -1605,6 +1627,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/deselect.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/displayProperties.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/itemViewForContentIndex.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/keyboard.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/layerIdFor.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/length.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/mouse.js
@@ -1618,17 +1641,19 @@ files:
 - 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
-- lib/frameworks/sproutcore/frameworks/desktop/tests/views/disclosure/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/disclosure/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/drag_and_drop.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/image_button/ui.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/link_view_test.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/contentIndexesInRect.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/drag_and_drop.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/layoutForContentIndex.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/render.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowDelegate.js
-- lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowHeightForContentIndex.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowOffsetForContentIndex.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowSizeForContentIndex.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_alternatingrows.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_outline.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_row_heights.js
@@ -1636,12 +1661,15 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/list_item.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/menu_item/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/menu_item/ui.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/menu_scroll_view/menu_scroll_view_test.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/progress/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/progress/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/radio/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/radio/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/integration.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/methods.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/scale.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/touch.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroller.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/methods.js
@@ -1649,8 +1677,6 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/ui.js
-- lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/methods.js
-- lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/separator.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/slider/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/slider/ui.js
@@ -1678,24 +1704,24 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/views/disclosure.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/grid.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/image_button.js
+- lib/frameworks/sproutcore/frameworks/desktop/views/link_view.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/list.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/list_item.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/master_detail.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/menu_item.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/menu_scroll.js
+- lib/frameworks/sproutcore/frameworks/desktop/views/menu_scroller_view.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/navigation.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/navigation_bar.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/popup_button.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/progress.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/radio.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/scene.js
-- lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js
+- lib/frameworks/sproutcore/frameworks/desktop/views/scroll_view.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/scroller.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/segment.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/select.js
-- lib/frameworks/sproutcore/frameworks/desktop/views/select_button.js
-- lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/separator.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/slider.js
 - lib/frameworks/sproutcore/frameworks/desktop/views/source_list.js
@@ -1724,30 +1750,6 @@ files:
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/views/form_row.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form_row.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/render_delegates/menu_scroller.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/tests/menu/scroll.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/views/menu/scroll.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/views/menu/scroller.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/models/record.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/README.md
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/many.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/simple.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/single.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/desktop_scroller.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/native_scroll.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/scroll.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/touch_scroller.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/integration.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/methods.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/ui.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/core_scroll.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/core_scroller.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/desktop/scroll.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/desktop/scroller.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/scroll.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/scroller.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/touch/scroll.js
-- lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/touch/scroller.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu_item.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/mixins/select_view_menu.js
@@ -1758,7 +1760,9 @@ files:
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/popup_button/menu_setup.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/popup_button/show_menu.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/select/menu_width.js
+- lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/select/method.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/select/selected_item.js
+- lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/select/ui.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/popup_button.js
 - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/select.js
 - lib/frameworks/sproutcore/frameworks/experimental/README.md
@@ -1771,9 +1775,11 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/debug/control_test_pane.js
 - lib/frameworks/sproutcore/frameworks/foundation/debug/test-image.png
 - lib/frameworks/sproutcore/frameworks/foundation/delegates/inline_text_field.js
+- lib/frameworks/sproutcore/frameworks/foundation/english.lproj/inflections.js
 - lib/frameworks/sproutcore/frameworks/foundation/ext/string.js
 - lib/frameworks/sproutcore/frameworks/foundation/fixtures/file_exists.json
 - lib/frameworks/sproutcore/frameworks/foundation/fixtures/malformed.json
+- lib/frameworks/sproutcore/frameworks/foundation/french.lproj/inflections.js
 - lib/frameworks/sproutcore/frameworks/foundation/gestures/pinch.js
 - lib/frameworks/sproutcore/frameworks/foundation/gestures/swipe.js
 - lib/frameworks/sproutcore/frameworks/foundation/gestures/tap.js
@@ -1818,6 +1824,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/resources/label.css
 - lib/frameworks/sproutcore/frameworks/foundation/resources/static_layout.css
 - lib/frameworks/sproutcore/frameworks/foundation/resources/text_field.css
+- lib/frameworks/sproutcore/frameworks/foundation/spanish.lproj/inflections.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/app_cache.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/cookie.js
@@ -1830,13 +1837,13 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/system/string.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/task_queue.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/text_selection.js
+- lib/frameworks/sproutcore/frameworks/foundation/system/undo_manager.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/user_defaults.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/utils/colors.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/utils/misc.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/utils/range.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/utils/string_measurement.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/utils/string_metric_optimization.js
-- lib/frameworks/sproutcore/frameworks/foundation/tasks/preload_bundle.js
 - lib/frameworks/sproutcore/frameworks/foundation/tasks/task.js
 - lib/frameworks/sproutcore/frameworks/foundation/TESTING
 - lib/frameworks/sproutcore/frameworks/foundation/tests/controllers/tree/outline_case.js
@@ -1862,6 +1869,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/validatable/ui.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/flat_case.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/group_case.js
+- lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/methods.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/outline_case.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/render_delegates/render_delegate.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/app_cache_test.js
@@ -1871,6 +1879,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/math.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/string.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/task_queue.js
+- lib/frameworks/sproutcore/frameworks/foundation/tests/system/undo_manager.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/user_defaults.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/pointInElement.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/range.js
@@ -1918,7 +1927,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/views/inline_text_field.js
 - lib/frameworks/sproutcore/frameworks/foundation/views/label.js
 - lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js
-- lib/frameworks/sproutcore/frameworks/jquery/jquery-1.8.3-patched.js
+- lib/frameworks/sproutcore/frameworks/jquery/jquery-1.11.1.js
 - lib/frameworks/sproutcore/frameworks/media/media_capabilities.js
 - lib/frameworks/sproutcore/frameworks/media/render_delegates/media_slider.js
 - lib/frameworks/sproutcore/frameworks/media/resources/controls.png
@@ -1963,7 +1972,9 @@ files:
 - lib/frameworks/sproutcore/frameworks/runtime/ext/array.js
 - lib/frameworks/sproutcore/frameworks/runtime/ext/date.js
 - lib/frameworks/sproutcore/frameworks/runtime/ext/function.js
+- lib/frameworks/sproutcore/frameworks/runtime/ext/number.js
 - lib/frameworks/sproutcore/frameworks/runtime/ext/string.js
+- lib/frameworks/sproutcore/frameworks/runtime/ext/window.js
 - lib/frameworks/sproutcore/frameworks/runtime/license.js
 - lib/frameworks/sproutcore/frameworks/runtime/mixins/array.js
 - lib/frameworks/sproutcore/frameworks/runtime/mixins/comparable.js
@@ -2001,6 +2012,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/runtime/tests/core/objectForPropertyPath.js
 - lib/frameworks/sproutcore/frameworks/runtime/tests/core/requiredObjectForPropertyPath.js
 - lib/frameworks/sproutcore/frameworks/runtime/tests/core/tupleForPropertyPath.js
+- lib/frameworks/sproutcore/frameworks/runtime/tests/ext/number_test.js
 - lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/array.js
 - lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/array_observers.js
 - lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/comparable.js
@@ -2156,6 +2168,7 @@ files:
 - lib/frameworks/sproutcore/phantomjs/test_runner.js
 - lib/frameworks/sproutcore/README.md
 - lib/frameworks/sproutcore/scripts/run_sc_server_master.sh
+- lib/frameworks/sproutcore/themes/ace/resources/_variables.css
 - lib/frameworks/sproutcore/themes/ace/resources/body.css
 - lib/frameworks/sproutcore/themes/ace/resources/button/ace/18px/active_button.png
 - lib/frameworks/sproutcore/themes/ace/resources/button/ace/18px/button.css
@@ -2290,7 +2303,7 @@ files:
 - lib/frameworks/sproutcore/themes/ace/resources/radio/radio_selected_active.png
 - lib/frameworks/sproutcore/themes/ace/resources/radio/radio_unselected.png
 - lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal.css
-- lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal_touch.css
+- lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal_overlay.css
 - lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/thumb.png
 - lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/track_and_arrows.png
 - lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/track_and_arrows_active.png
@@ -2298,7 +2311,7 @@ files:
 - lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/track_and_arrows.png
 - lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/track_and_arrows_active.png
 - lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical.css
-- lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical_touch.css
+- lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical_overlay.css
 - lib/frameworks/sproutcore/themes/ace/resources/segmented/18px/segmented.css
 - lib/frameworks/sproutcore/themes/ace/resources/segmented/18px/segmented_active.png
 - lib/frameworks/sproutcore/themes/ace/resources/segmented/18px/segmented_normal.png
@@ -2328,18 +2341,28 @@ files:
 - lib/frameworks/sproutcore/themes/ace/resources/segmented/44px/segmented_selected.png
 - lib/frameworks/sproutcore/themes/ace/resources/segmented/44px/segmented_selected_active.png
 - lib/frameworks/sproutcore/themes/ace/resources/segmented/segmented.css
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/14px/knob.png
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/14px/knob_active.png
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/14px/slider.css
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/16px/knob.png
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/16px/knob_active.png
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/16px/slider.css
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/knob.png
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/knob_active.png
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/slider.css
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/track.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob-active.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob-active@2x.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob@2x.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/slider.css
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/track.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/track@2x.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob-active.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob-active@2x.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob@2x.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/slider.css
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/track.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/track@2x.png
 - lib/frameworks/sproutcore/themes/ace/resources/slider/ace/slider.css
-- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/track.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob-active.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob-active@2x.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob@2x.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/slider.css
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/track.png
+- lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/track@2x.png
 - lib/frameworks/sproutcore/themes/ace/resources/split/split.css
 - lib/frameworks/sproutcore/themes/ace/resources/tab/tab.css
 - lib/frameworks/sproutcore/themes/ace/resources/toolbar/toolbar.css
@@ -2426,9 +2449,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: sproutcore
 rubygems_version: 2.0.7