RubyGems - sproutcore - Versions diffs - 1.7.1.beta → 1.8.0 - Mend

sproutcore 1.7.1.beta → 1.8.0

Files changed (445) hide show

data/lib/frameworks/sproutcore/frameworks/testing/system/runner.js CHANGED Viewed

@@ -60,14 +60,14 @@ CoreTest.Runner = {
     if (navigator.userAgent.indexOf('MSIE')==-1) {
       str.push(
           '<label class="show-progress">',
-            '<input type="checkbox"'+(this.showProgress?' checked="checked"':'')+'" /> Show progess (slower)',
+            '<input type="checkbox"'+(this.showProgress?' checked="checked"':'')+'" /> Show progress (slower)',
           '</label>'
       );
     }
     str.push(
           '<label class="show-progress">',
-            '<input type="checkbox"'+(this.showProgress?' checked="checked"':'')+'" /> Show progess (slower)',
+            '<input type="checkbox"'+(this.showProgress?' checked="checked"':'')+'" /> Show progress (slower)',
           '</label>',
           '<span class="status">Running...</span>',
         '</div>',

data/lib/frameworks/sproutcore/frameworks/testing/system/suite.js CHANGED Viewed

@@ -37,7 +37,7 @@
   ## Defining a Suite
   To define a test suite, simply call the extend() method, passing any
-  attributs you want to define on the stuie along with this method.  You can
+  attributes you want to define on the suite along with this method.  You can
   then add functions that will define the test suite with the define() method.
   Functions you pass to define will have an instance of the test suite passed
@@ -169,7 +169,7 @@ CoreTest.Suite = /** @scope CoreTest.Suite.prototype */ {
   /**
     Default teardown method for use with modules.  This method will call the
-    destroyObejct() method, passing the current object property on the
+    destroyObject() method, passing the current object property on the
     receiver.  It will also clear the object property.
   */
   teardown: function() {
@@ -188,7 +188,7 @@ CoreTest.Suite = /** @scope CoreTest.Suite.prototype */ {
   /**
     Default method to destroy a generated object instance after a test has
-    completed.  If you override newObject() you can also overried this method
+    completed.  If you override newObject() you can also override this method
     to cleanup the object you just created.
     Default method does nothing.
@@ -208,7 +208,7 @@ CoreTest.Suite = /** @scope CoreTest.Suite.prototype */ {
           teardown: function() { T.teardown(); }
         }
-    @param {String} desc detailed descrition
+    @param {String} desc detailed description
     @returns {CoreTest.Suite} receiver
   */
   module: function(desc) {

data/lib/frameworks/sproutcore/frameworks/yuireset/resources/base.css CHANGED Viewed

@@ -22,7 +22,7 @@ h1,h2,h3 {
 	/* top & bottom margin based on font size */
 	margin:1em 0;
 }
-h1,h2,h3,h4,h5,h6,strong {
+h1,h2,h3,h4,h5,h6{
 	/*bringing boldness back to headers and the strong element*/
 	font-weight:bold;
 }

data/lib/frameworks/sproutcore/frameworks/yuireset/resources/reset.css CHANGED Viewed

@@ -65,7 +65,6 @@ cite,
 code,
 dfn,
 em,
-strong,
 th,
 var {
 	font-style:normal;

data/lib/frameworks/sproutcore/frameworks/yuireset/resources/view.css CHANGED Viewed

@@ -24,10 +24,10 @@
     cursor:  text;
   }
   /*Use the following to know what view has the focus in webkit*/
- /* &.focus {
-         outline: auto 5px solid;
-         outline-offset: -2px;
-       }*/
+ /*&.focus {
+           outline: auto 7px -webkit-focus-ring-color;
+           outline-offset: -2px;
+         }*/
   /* This className is useful when aligning buttons to the right */
   &.text-align-right{
     text-align:right;

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

@@ -1,4 +1,4 @@
-<% # SPROUTCORE DEFAULT INDEX TEMPLATE
+<% # SPROUTCORE DEFAULT INDEX TEMPLATE
    # This template provide provides a basic wrapper for a SproutCore client.
    # 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
@@ -12,53 +12,76 @@
 <html<% unless @content_for_html5_manifest.blank? %> manifest="app.manifest"<% end %>>
   <head>
     <meta http-equiv="X-UA-Compatible" content="IE=edge<%= config.chrome_frame ? ',chrome=1' : '' %>" />
     <script>
     var SC_benchmarkPreloadEvents = { headStart: new Date().getTime() };
     </script>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <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" />
     <% if config.touch_enabled %>
-    <link rel="apple-touch-icon<%= '-precomposed' if config.precomposed_icon %>" href="<%= sc_static(config.icon || 'sproutcore-logo.png') %>" />
-    <link rel="apple-touch-startup-image" media="screen and (orientation:portrait)" href="<%= sc_static(config.startup_image_portrait || 'sproutcore-startup-portrait.png') %>" />
-    <link rel="apple-touch-startup-image" media="screen and (orientation:landscape)" href="<%= sc_static(config.startup_image_landscape || 'sproutcore-startup-landscape.png') %>" />
+    <% if config.precomposed_icon %>
+    <link rel="apple-touch-icon-precomposed" href="<%= sc_static(config.precomposed_icon) %>" />
+    <% elsif config.icon %>
+    <link rel="apple-touch-icon" href="<%= sc_static(config.icon) %>" />
+    <% end %>
+    <% if config.startup_image_portrait %>
+    <link rel="apple-touch-startup-image" media="screen and (orientation:portrait)" href="<%= sc_static(config.startup_image_portrait) %>" />
+    <% end %>
+    <% if config.startup_image_landscape %>
+    <link rel="apple-touch-startup-image" media="screen and (orientation:landscape)" href="<%= sc_static(config.startup_image_landscape) %>" />
     <% end %>
-    <link rel="shortcut icon" href="<%= sc_static(config.favicon || 'favicon.ico') %>" type="image/x-icon" />
+    <% end %>
+    <% if config.favicon %>
+    <link rel="shortcut icon" href="<%= sc_static(config.favicon) %>" type="image/x-icon" />
+    <% end %>
 <% # 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
+   # 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.
--%>
-  <%= bootstrap %>
+   # these in your Buildfile with the 'bootstrap' config.
+-%>
+    <script>
+      window.SC = window.SC || { MODULE_INFO: {}, LAZY_INSTANTIATION: {} };
+      SC.buildMode = '<%=SC.build_mode%>';
+      SC.buildNumber = '<%=target[:build_number]%>';
+      SC.buildLocale = '<%=language%>';
+    </script>
-    <% #
+    <%= bootstrap %>
+    <% #
        # 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
+       # stylesheets, you don't need to change it here.  Instead use the
        # required option in your config.
     -%>
     <script>
-      (function() {
+      (function() {
         var styles = [];
         if (window.devicePixelRatio == 2 || 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 {
           styles = <%= stylesheet_urls_for_client.to_json %>;
+          SC.APP_IMAGE_ASSETS = <%= image_urls_for_client(nil, { :sprited => true }).to_json %>;
         }
-        var head = document.getElementsByTagName("head")[0];
-        var len = styles.length, idx;
+        var head = document.getElementsByTagName("head")[0],
+            len = styles.length, idx, css;
         for (idx = 0; idx < len; idx++) {
-          var css   = document.createElement('link');
+          css = document.createElement('link');
           css.rel   = 'stylesheet';
           css.type  = 'text/css';
           css.href  = styles[idx];
@@ -73,29 +96,29 @@
       SC.benchmarkPreloadEvents['headEnd'] = new Date().getTime();
     </script>
   </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
+   # If you need to specify a custom theme name, use CONFIG.theme_name
 -%>
-  <body class="<%= [theme_name(:default => 'sc-theme'), 'focus'].compact.join(' ') %>">
+  <body class="<%= [theme_name(:default => 'sc-theme'), 'sc-focus'].compact.join(' ') %>">
     <script>
     SC.benchmarkPreloadEvents['bodyStart'] = new Date().getTime();
     </script>
-<% # This section is used to setup additional optional class names on the
+<% # 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.
+   # show the proper CSS as soon as the page appears.
 -%>
 <%= inline_javascript('sproutcore/bootstrap:setup_body_class_names') %>
 <% #
-   # This is where you root body element will appear.  To cause your
+   # 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. If you use
+   # just declare content_for('loading') in one of your partials. If you use
    # sc-gen to generate your app, it will create a file called loading.rhtml
    # under english.lproj. You can insert the desired content there.
 -%>
@@ -104,7 +127,7 @@
 <%= @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
@@ -140,23 +163,23 @@
 </script>
 <% end %>
 <% #
-   # If you use old-style view helpers in your page, this method must be
+   # 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.
+   # 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.
+   # need to do before the page ends.  This is required for loading unit
+   # tests among other things.
 -%>
 <%= @content_for_final -%>
 <%

data/lib/frameworks/sproutcore/license.js CHANGED Viewed

@@ -1,9 +1,8 @@
-/**
- * @license
+/*!
  * ==========================================================================
  * SproutCore -- JavaScript Application Framework
- * Copyright 2006-2011, Strobe Inc. and contributors.
  * Copyright ©2008-2011 Apple Inc. All rights reserved.
+ * Copyright 2006-2011, Strobe Inc. and contributors.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,6 +26,5 @@
  *
  * For more information about SproutCore, visit http://www.sproutcore.com
  *
- *
  * ==========================================================================
  */

data/lib/frameworks/sproutcore/themes/ace/resources/body.css CHANGED Viewed

@@ -1,3 +1,7 @@
+body {
+  overflow: hidden;
+}
 .sc-main {
   background: #ccc;
 }
@@ -10,4 +14,4 @@
 .sc-view {
   font-family: Helvetica, sans-serif;
-}
+}

data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/18px/button.css CHANGED Viewed

@@ -1,11 +1,11 @@
 @theme(sc-small-size) {
   $theme.button {
+    font-size: 11px;
     .sc-button-label {
-      font-size: 11px;
       margin-top:-4px;
-      height: 18px;
+      height: 16px;
       padding-top:2px;
     }

data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/24px/button.css CHANGED Viewed

@@ -3,7 +3,7 @@
   $theme.button {
     .sc-button-label {
-      height: 24px;
+      height: 22px;
       padding-top:2px;
     }
@@ -29,53 +29,61 @@
   @theme(point-left) {
     $theme.button {
-      @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+      @include slices("normal_button_pointer.png", $left: 12, $right: 12, $skip: middle right);
       .middle { left: 12px; }
+      .right { right:10px; width:3px }
       &.active {
-        @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        @include slices("active_button_pointer.png", $left: 12, $right: 12, $skip: middle right);
         .middle { left: 12px; }
+        .right { right:10px; width:3px }
       }
       &.sel, &.def {
-        @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        @include slices("selected_button_pointer.png", $left: 12, $right: 12, $skip: middle right);
         .middle { left: 12px; }
+        .right { right:10px; width:3px }
       }
       &.sel.active, &.def.active {
-        @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, $skip: middle right);
         .middle { left: 12px; }
+        .right { right:10px; width:3px }
       }
     }
   }
   @theme(point-right) {
     $theme.button {
-      @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+      @include slices("normal_button_pointer.png", $left: 12, $right: 12, $skip: middle left);
       .middle { right: 12px; }
+      .left { left:10px; width:3px }
       &.active {
-        @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        @include slices("active_button_pointer.png", $left: 12, $right: 12, $skip: middle left);
         .middle { right: 12px; }
+        .left { left:10px; width:3px }
       }
       &.sel, &.def {
-        @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        @include slices("selected_button_pointer.png", $left: 12, $right: 12, $skip: middle left);
         .middle { right: 12px; }
+        .left { left:10px; width:3px }
       }
       &.sel.active, &.def.active {
-        @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, $skip: middle left);
         .middle { right: 12px; }
+        .left { left:10px; width:3px }
       }
     }
   }
   @theme(capsule) {
     $theme.button {
-      @include slices("normal_button_capsule.png", $left: 12, $right: 12, skip-middle);
+      @include slices("normal_button_capsule.png", $left: 12, $right: 12, $skip: middle);
       & > .middle { left: 12px; right: 12px; }
@@ -84,17 +92,17 @@
       }
       &.active {
-        @include slices("active_button_capsule.png", $left: 12, $right: 12, skip-middle);
+        @include slices("active_button_capsule.png", $left: 12, $right: 12, $skip: middle);
         .middle { left: 12px; right: 12px; }
       }
       &.sel, &.def {
-        @include slices("selected_button_capsule.png", $left: 12, $right: 12, skip-middle);
+        @include slices("selected_button_capsule.png", $left: 12, $right: 12, $skip: middle);
         .middle { left: 12px; right: 12px; }
       }
       &.sel.active, &.def.active {
-        @include slices("selected_active_button_capsule.png", $left: 12, $right: 12, skip-middle);
+        @include slices("selected_active_button_capsule.png", $left: 12, $right: 12, $skip: middle);
         .middle { left: 12px; right: 12px; }
       }
     }

data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/30px/button.css CHANGED Viewed

@@ -1,11 +1,10 @@
 @theme(sc-huge-size) {
   $theme.button {
+    font-size:13px;
     .sc-button-label {
       margin-top:4px;
       height: 30px;
-      font-size:13px;
     }
@@ -32,46 +31,54 @@
   @theme(point-left) {
     $theme.button {
-      @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+      @include slices("normal_button_pointer.png", $left: 12, $right: 12, $skip: middle right);
       .middle { left: 12px; }
+      .right { right:10px; width:3px }
       &.active {
-        @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        @include slices("active_button_pointer.png", $left: 12, $right: 12, $skip: middle right);
         .middle { left: 12px; }
+        .right { right:10px; width:3px }
       }
       &.sel, &.def {
-        @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        @include slices("selected_button_pointer.png", $left: 12, $right: 12, $skip: middle right);
         .middle { left: 12px; }
+        .right { right:10px; width:3px }
       }
       &.sel.active, &.def.active {
-        @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, $skip: middle right);
         .middle { left: 12px; }
+        .right { right:10px; width:3px }
       }
     }
   }
   @theme(point-right) {
     $theme.button {
-      @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+      @include slices("normal_button_pointer.png", $left: 12, $right: 12, $skip: middle left);
       .middle { right: 12px; }
+      .left { left:10px; width:3px }
       &.active {
-        @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        @include slices("active_button_pointer.png", $left: 12, $right: 12, $skip: middle left);
         .middle { right: 12px; }
+        .left { left:10px; width:3px }
       }
       &.sel, &.def {
-        @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        @include slices("selected_button_pointer.png", $left: 12, $right: 12, $skip: middle left);
         .middle { right: 12px; }
+        .left { left:10px; width:3px }
       }
       &.sel.active, &.def.active {
-        @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, $skip: middle left);
         .middle { right: 12px; }
+        .left { left:10px; width:3px }
       }
     }
   }