RubyGems - sproutcore - Versions diffs - 1.4.0.rc.4 → 1.4.0.rc.5 - Mend

sproutcore 1.4.0.rc.4 → 1.4.0.rc.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

data/VERSION.yml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 :major: 1
 :minor: 4
-:patch: 0.rc.4
+:patch: 0.rc.5
 :digest: e038ba5746bb757cd0ff2391828c5f03496fbb64
 :dist:
   frameworks/sproutcore: 7174adeb47aa0930c95ddae79e2c9cf042fded45

data/lib/frameworks/sproutcore/frameworks/desktop/views/collection.js CHANGED Viewed

@@ -900,6 +900,12 @@ SC.CollectionView = SC.View.extend(
           // we'll destroy the layer now.
           existing.destroyLayer();
         }
+        // We don't want the old layer hanging around, even if we are going
+        // to reuse it.
+        // (Charles Jolley personally guarantees this code)
+        layer = existing.get('layer');
+        layer.parentNode.removeChild(layer);
         containerView.removeChild(existing);
       }

data/lib/sproutcore/models/target.rb CHANGED Viewed

@@ -346,7 +346,11 @@ module SC
       # read cache from disk if needed
       if @file_attr_cache.nil? && File.exists?(file_attr_cache_path)
-        @file_attr_cache = JSON.parse File.read(file_attr_cache_path)
+        begin
+          @file_attr_cache = JSON.parse File.read(file_attr_cache_path)
+        rescue JSON::ParserError
+          # Unparseable, will be handled by the following conditional
+        end
         # Sometimes the file is corrupted, in this case, clear the cache
         File.delete file_attr_cache_path unless @file_attr_cache

metadata CHANGED Viewed

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 4
   - 0
   - rc
-  - 4
-  version: 1.4.0.rc.4
+  - 5
+  version: 1.4.0.rc.5
 platform: ruby
 authors:
 - Sprout Systems, Inc.  Apple Inc. and contributors
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-09-14 00:00:00 -07:00
+date: 2010-09-15 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -1656,11 +1656,6 @@ files:
 - lib/frameworks/sproutcore/frameworks/media/views/simple_controls.js
 - lib/frameworks/sproutcore/frameworks/media/views/video.js
 - lib/frameworks/sproutcore/frameworks/mini/license.js
-- lib/frameworks/sproutcore/frameworks/mobile/english.lproj/core.css
-- lib/frameworks/sproutcore/frameworks/mobile/lib/index.rhtml
-- lib/frameworks/sproutcore/frameworks/mobile/system/root_responder.js
-- lib/frameworks/sproutcore/frameworks/mobile/tests/views/button/ui.js
-- lib/frameworks/sproutcore/frameworks/mobile/views/button.js
 - lib/frameworks/sproutcore/frameworks/runtime/core.js
 - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/base.js
 - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/indexOf.js

data/lib/frameworks/sproutcore/frameworks/mobile/english.lproj/core.css DELETED Viewed

@@ -1,12 +0,0 @@
-/* Core styles needed for iphone apps to operate correctly. */
-body
-{
-	margin: 0px;
-	padding: 0px;
-	background-color: #fff;
-	/* Turn off font resizing */
-	-webkit-text-size-adjust: none;
-}

data/lib/frameworks/sproutcore/frameworks/mobile/lib/index.rhtml DELETED Viewed

@@ -1,125 +0,0 @@
-<% # SPROUTCORE MOBILE INDEX TEMPLATE
-   # This template provide provides a basic wrapper for a mobile SproutCore
-   # client.  It provides much of the same functionality found in the
-   # default template except that it also includes necessary configs needed
-   # for loading your page on the iPhone.
-   #
-   # Most of the time, it will be sufficient for your own needs.  However, if
-   # you need to create your own template, you can do so by copying this file
-   # into your client, naming it 'index.rhtml' and then adding the options
-   # :layout => 'lib/index' to your Buildfile.
-   #
-   # See the comments in this file for more information on what you can
-   # change.
--%>
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-    <meta name = "viewport" content = "width = device-width, height = device-height, user-scalable = no" />
-<% # Set the 'title' in your config to alter this setting %>
-    <title><%= title %></title>
-<% #
-   # You may choose to load one or more bootstrap resources.  These are
-   # JS targets that you would like to load at the top of the page.  Specify
-   # these in your Buildfile with the 'bootstrap' config.
--%>
- <% if config.bootstrap %>
-  <script src="<%= static_url(config.bootstrap) %>" type="text/javascript"></script>
-  <% end -%>
-<% #
-   # Bootstrap code is loaded at the top of your page to do any early setup
-   # you might need, including basic browser detection.  The default
-   # bootstrap code provided by SproutCore simply detects your browser
-   # platform.  Add more by including templates targeting the bootstrap
--%>
-  <% if @content_for_bootstrap %>
-  <script type="text/javascript">
-  <%= @content_for_bootstrap %>
-  </script>
-  <% end -%>
-<% #
-   # This line should appear in your head area to include the stylesheets
-   # generated by your client.  If you need to include your own
-   # stylesheets, you don't need to change it here.  Instead use the
-   # required option in your config.
--%>
-   <%= stylesheets_for_client %>
-   <%= @content_for_page_styles %>
-  </head>
-<% # The theme CSS class is added automatically based on your chosen theme.
-   # If you need to specify a custom theme name, use CONFIG.theme_name
--%>
-  <body class="<%= [theme_name(:default => 'sc-theme'), 'focus'].compact.join(' ') %>">
-<% # This section is used to setup additional optional class names on the
-   # body content based on JS-selected conditions.  Use this to make sure you
-   # show the proper CSS as soon as the page appears.
--%>
-<% unless @content_for_setup_body_class_names.blank? %>
-    <script type="text/javascript">
-    <%= @content_for_setup_body_class_names %>
-    </script>
-<% end -%>
-<% #
-   # This is where you root body element will appear.  To cause your
-   # content to appear here, just declare content_for('body') in one of
-   # your partials.
--%>
-<%= @content_for_body %>
-<% #
-   # This is where your loading screen will appear.  To add a loading screen
-   # just declare content_for('loading') in one of your partials.
--%>
-<% unless @content_for_loading.blank? %>
-<div id="loading">
-<%= @content_for_loading %>
-</div>
-<% end -%>
-<% #
-   # This is where the resources you declare will appear.  By default anything
-   # you add to partials will be added to this section unless you specify
-   # otherwise.  Note that resources are initially hidden so you can pull them
-   # apart as needed on page load.
--%>
-<% unless @content_for_resources.blank? %>
-    <!-- Resources to be removed from DOM on page load -->
-    <div id="resources" style="display:none; visibility: hidden;">
-      <%= @content_for_resources -%>
-    </div>
-<% end -%>
-<% #
-   # This line should appear at the bottom of your page to include your
-   # generated JavaScript and any libraries you reference.  If you need
-   # to include other javascripts, add them to the :requires option of
-   # your client in routes.rb instead of changing it here.
--%>
-<%= javascripts_for_client %>
-<% unless @content_for_page_javascript.blank? %>
-<%= @content_for_page_javascript %>
-<% end -%>
-<% #
-   # If you use old-style view helpers in your page, this method must be
-   # called to actually add the page views to your HTML.  Normally this will
-   # not generate any content.
--%>
-<% #render_page_views -%>
-<% # Older SproutCore applications need SC.didLoad to be called after onload.
-   # This is no longer required by SproutCore so it is off by default.  To
-   # reenable set use_window_onload = true in yur config.
--%>
-<% if config.use_window_onload %>
-<!-- Start SproutCore on Page Load -->
-    <script type="text/javascript">window.onload = SC.didLoad;</script>
-<% end -%>
-<% #
-   # The final content section can be used to add any last minute setup you
-   # need to do before the page ends.  This is required for loading unit
-   # tests among other things.
--%>
-<%= @content_for_final -%>
-	</body>
-</html>

data/lib/frameworks/sproutcore/frameworks/mobile/system/root_responder.js DELETED Viewed

@@ -1,12 +0,0 @@
-// ========================================================================
-// SproutCore -- JavaScript Application Framework
-// Copyright ©2006-2008, Sprout Systems, Inc. and contributors.
-// Portions copyright ©2008 Apple Inc.  All rights reserved.
-// ========================================================================
-// Swap in platform-specific subclass.  Class-cluster FTW!
-SC.RootResponder = SC.RootResponder.extend({
-  platform: 'mobile',
-}) ;

data/lib/frameworks/sproutcore/frameworks/mobile/tests/views/button/ui.js DELETED Viewed

@@ -1,9 +0,0 @@
-// ==========================================================================
-// Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
-//            portions copyright @2009 Apple Inc.
-// License:   Licensed under MIT license (see license.js)
-// ==========================================================================
-/*global module test htmlbody ok equals same stop start */

data/lib/frameworks/sproutcore/frameworks/mobile/views/button.js DELETED Viewed

@@ -1,191 +0,0 @@
-// ==========================================================================
-// Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
-//            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licensed under MIT license (see license.js)
-// ==========================================================================
-/** @class
-  Implements a push-button-style button.  This class is used to implement
-  both standard push buttons and tab-style controls.
-  @extends SC.View
-  @extends SC.Control
-  @extends SC.Button
-  @since SproutCore 1.0
-*/
-SC.ButtonView = SC.View.extend(SC.Control, SC.Button,
-/** @scope SC.ButtonView.prototype */ {
-  tagName: 'a',
-  classNames: ['sc-button-view'],
-  /**
-    optionally set this to the theme you want this button to have.
-    This is used to determine the type of button this is.  You generally
-    should set a class name on the HTML with the same value to allow CSS
-    styling.
-    The default SproutCore theme supports "regular", "checkbox", and "radio"
-  */
-  theme: 'square',
-  /**
-    The button href value.  This can be used to create localized button href values.  Setting an empty or null href will set it to javascript:;
-  */
-  href: '',
-  /**
-    The name of the action you want triggered when the button is pressed.
-    This property is used in conjunction with the target property to execute
-    a method when a regular button is pressed.  These properties are not
-    relevant when the button is used in toggle mode.
-    If you do not set a target, then pressing a button will cause the
-    responder chain to search for a view that implements the action you name
-    here.  If you set a target, then the button will try to call the method
-    on the target itself.
-    For legacy support, you can also set the action property to a function.
-    Doing so will cause the function itself to be called when the button is
-    clicked.  It is generally better to use the target/action approach and
-    to implement your code in a controller of some type.
-    @type String
-  */
-  action: null,
-  /**
-    The target object to invoke the action on when the button is pressed.
-    If you set this target, the action will be called on the target object
-    directly when the button is clicked.  If you leave this property set to
-    null, then the button will search the responder chain for a view that
-    implements the action when the button is pressed instead.
-    @type Object
-  */
-  target: null,
-  /**
-    fakes a click... evt is optional.
-    Temporarily highlights the button to show that it is being triggered.
-    Does nothing if the button is disabled.
-    @returns {bool} success/failure of the request
-  */
-  triggerAction: function(evt) {
-    if (!this.get('isEnabled')) return false;
-    this.set('isActive', YES);
-    this._action(evt);
-    this.invokeLater('set', 200, 'isActive', NO);
-    return true;
-  },
-  // ................................................................
-  // INTERNAL SUPPORT
-  _TEMPORARY_CLASS_HASH: {},
-  // display properties that should automatically cause a refresh.
-  // isCancel and isDefault also cause a refresh but this is implemented as
-  // a separate observer (see below)
-  displayProperties: 'href icon title value'.w(),
-  render: function(context, firstTime) {
-    // add href attr if tagName is anchor...
-    if (this.get('tagName') === 'a') {
-      var href = this.get('href');
-      if (!href || (href.length === 0)) href = "javascript"+":;";
-      context.attr('href', href);
-    }
-    // add some standard attributes & classes.
-    var classes = this._TEMPORARY_CLASS_HASH, icon = this.get('icon');
-    classes.def = this.get('isDefault');
-    classes.cancel = this.get('isCancel');
-    classes.icon = !!icon;
-    var theme = this.get('theme');
-    if(theme) classes[theme] = YES;
-    context.attr('role', 'button').setClass(classes);
-    // don't reset the content if the touch is down because we don't want to
-    // regenerate the event.
-    if (!this._isTouchActive) {
-      context = context.begin('span').addClass('sc-button-inner');
-      this.renderTitle(context, firstTime) ; // from button mixin
-      context = context.end();
-    }
-   },
-  _isTouchActive: NO,
-  /** @private
-    On touch start, set active only if enabled.
-  */
-  touchStart: function(evt) {
-    if (!this.get('isEnabled')) return YES ; // handled event, but do nothing
-    this.set('isActive', YES);
-    this._isTouchActive = YES;
-    return YES ;
-  },
-  /** @private
-    Remove the active class on touchExited if mouse is down.
-  */
-  touchExited: function(evt) {
-    if (this._isTouchActive) this.set('isActive', NO);
-    return YES;
-  },
-  /** @private
-    If mouse was down and we renter the button area, set the active state again.
-  */
-  touchEntered: function(evt) {
-    this.set('isActive', this._isTouchActive);
-    return YES;
-  },
-  /** @private
-    ON mouse up, trigger the action only if we are enabled and the mouse was released inside of the view.
-  */
-  touchEnd: function(evt) {
-    // track independently in case isEnabled has changed
-    if (this._isTouchActive) this.set('isActive', NO);
-    this._isTouchActive = false;
-    // trigger action if final touch was inside of button frame.
-    // if touch event was cancelled, do not trigger action
-    var inside, touchPoint, rect, changed;
-    if (evt.changedTouches.length > 0) {
-      changed = evt.changedTouches[0];
-      touchPoint = { x: changed.pageX, y: changed.pageY };
-      rect = this.convertFrameToView(this.get('frame'), null);
-      inside = SC.pointInRect(touchPoint, rect);
-    } else inside = YES ;
-    if (!evt.cancel && inside && this.get('isEnabled')) this._action(evt) ;
-    return true ;
-  },
-  /** @private  Perform an action based on the behavior of the button.
-   - toggle behavior: switch to on/off state
-   - on behavior: turn on.
-   - off behavior: turn off.
-   - otherwise: invoke target/action
-  */
-  _action: function(evt) {
-    console.log('action!');
-    var action = this.get('action');
-    var target = this.get('target') || null;
-    var pane   = this.get('pane');
-    var responder = pane ? pane.get('rootResponder') : null ;
-    if (responder) responder.sendAction(action, target, this, pane);
-  }
-}) ;