sproutit-sproutcore 1.0.20090721145281 → 1.0.20090721145282

data/frameworks/sproutcore/frameworks/foundation/views/view.js

@@ -262,6 +262,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     // if the state has changed, update it and notify children
     if (last !== cur) {
       this.set('isVisibleInWindow', cur) ;
+      this._needsVisibiltyChange = YES ; // update even if we aren't visible
       
       var childViews = this.get('childViews'), len = childViews.length, idx;
       for(idx=0;idx<len;idx++) {
@@ -271,20 +272,14 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
       // if we just became visible, update layer + layout if needed...
       if (cur) {
         if (this.parentViewDidResize) this.parentViewDidResize();
-        this.set('layerNeedsUpdate', YES);
-        this.invokeOnce(this.updateLayerIfNeeded);
         
         if (this.get('childViewsNeedLayout')) {
           this.invokeOnce(this.layoutChildViewsIfNeeded);
         }
-        
-      // if we just became invisible, force an update to hide the layer
-      } else {
-        var that = this;
-        this.set('layerNeedsUpdate', YES);
-        this.invokeOnce(function() { that.updateLayerIfNeeded(YES); });
       }
       
+      this.set('layerNeedsUpdate', YES) ;
+      
       // if we were firstResponder, resign firstResponder also if no longer
       // visible.
       if (!cur && this.get('isFirstResponder')) this.resignFirstResponder();
@@ -670,19 +665,19 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     @returns {SC.View} receiver
     @test in updateLayer
   */
-  updateLayerIfNeeded: function(isVisible) {
-    if (!isVisible) isVisible = this.get('isVisibleInWindow') ;
-    if (isVisible && this.get('layerNeedsUpdate')) {
+  updateLayerIfNeeded: function() {
+    var viz = this.get('isVisibleInWindow') ;
+    if ((viz || this._needsVisibiltyChange) && this.get('layerNeedsUpdate')) {
+      this._needsVisibiltyChange = NO ;
       // only update a layer if it already exists
       if (this.get('layer')) {
         this.beginPropertyChanges() ;
         this.set('layerNeedsUpdate', NO) ;
         this.updateLayer() ;
         this.endPropertyChanges() ;
-        
-      // clear our layerNeedsUpdate flag so we can respond to changes later
-      } else this.set('layerNeedsUpdate', NO) ;
+      }
     }
+    else this.set('layerNeedsUpdate', NO) ;
     return this ;
   },
   
@@ -707,6 +702,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     var context = this.renderContext(this.get('layer')) ;
     this.prepareContext(context, NO) ;
     context.update() ;
+    if (this.didUpdateLayer) this.didUpdateLayer(); // call to update DOM
     return this ;
   },
   
@@ -870,11 +866,14 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     cursor = this.get('cursor') ;
     if (cursor) context.addClass(cursor.get('className')) ;
     
+    this.beginPropertyChanges() ;
+    this.set('layerNeedsUpdate', NO) ;
     this.render(context, firstTime) ;
     if (mixins = this.renderMixin) {
       len = mixins.length;
       for(idx=0; idx<len; ++idx) mixins[idx].call(this, context, firstTime) ;
     }
+    this.endPropertyChanges() ;
   },
   
   /**

data/frameworks/sproutcore/frameworks/mini/license.js

@@ -0,0 +1,28 @@
+/*! @license
+==========================================================================
+SproutCore -- JavaScript Application Framework
+copyright 2006-2008, Sprout Systems, 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"), 
+to deal in the Software without restriction, including without limitation 
+the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+DEALINGS IN THE SOFTWARE.
+
+For more information about SproutCore, visit http://www.sproutcore.com
+
+
+==========================================================================
+@license */

data/frameworks/sproutcore/frameworks/runtime/core.js

@@ -597,6 +597,27 @@ SC.mixin(/** @scope SC */ {
     }
 
     return root ;
+  },
+  
+  
+  // ..........................................................
+  // LOCALIZATION SUPPORT
+  // 
+  
+  /**
+    Known loc strings
+  */
+  STRINGS: {},
+  
+  /**
+    This is a simplified handler for installing a bunch of strings.  This
+    ignores the language name and simply applies the passed strings hash.
+    
+    @param {String} lang the language the strings are for
+    @param {Hash} strings hash of strings
+  */
+  stringsFor: function(lang, strings) {
+    SC.mixin(SC.STRINGS, strings);
   }
   
   
@@ -854,3 +875,17 @@ String.prototype.fmt = function() {
   }) ;
 };
 
+/**
+  Localizes the string.  This will look up the reciever string as a key 
+  in the current Strings hash.  If the key matches, the loc'd value will be
+  used.  The resulting string will also be passed through fmt() to insert
+  any variables.
+  
+  @param args {Object...} optional arguments to interpolate also
+  @returns {String} the localized and formatted string.
+*/
+String.prototype.loc = function() {
+  var str = SC.STRINGS[this] || this;
+  return str.fmt.apply(str,arguments) ;
+};
+

data/frameworks/sproutcore/frameworks/runtime/mixins/enumerable.js

@@ -834,7 +834,7 @@ SC.Reducers = {
   */
   reducedProperty: function(key, value, generateProperty) {
      
-    if (key[0] !== '@') return undefined ; // not a reduced property
+    if (!key || key.charAt(0) !== '@') return undefined ; // not a reduced property
     
     // get the reducer key and the reducer
     var matches = key.match(/^@([^(]*)(\(([^)]*)\))?$/) ;

data/frameworks/sproutcore/frameworks/runtime/system/sparse_array.js

@@ -97,6 +97,13 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
   */
   rangeWindowSize: 1,
   
+  /*
+    This array contains all the start_indexes of ranges requested. This is to 
+    avoid calling sparseArrayDidRequestRange to often. Indexes are removed and 
+    added as range requests are completed.
+  */
+  requestedRangeIndex: [],
+  
   /** 
     Returns the object at the specified index.  If the value for the index
     is currently undefined, invokes the didRequestIndex() method to notify
@@ -115,6 +122,37 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
     return ret ;
   },
 
+  /**
+    Returns the set of indexes that are currently defined on the sparse array.
+    If you pass an optional index set, the search will be limited to only 
+    those indexes.  Otherwise this method will return an index set containing
+    all of the defined indexes.  Currently this can be quite expensive if 
+    you have a lot of indexes defined.
+    
+    @param {SC.IndexSet} indexes optional from indexes
+    @returns {SC.IndexSet} defined indexes
+  */
+  definedIndexes: function(indexes) {
+    var ret = SC.IndexSet.create(),
+        content = this._sa_content,
+        idx, len;
+        
+    if (!content) return ret.freeze(); // nothing to do
+    
+    if (indexes) {
+      indexes.forEach(function(idx) { 
+        if (content[idx] !== undefined) ret.add(idx);
+      });
+    } else {      
+      len = content.length;
+      for(idx=0;idx<len;idx++) {
+        if (content[idx] !== undefined) ret.add(idx);
+      }
+    }
+    
+    return ret.freeze();
+  },
+  
   _TMP_RANGE: {},
   
   /**
@@ -122,6 +160,8 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
     loaded.  This will possibly expand the index into a range and then invoke
     an appropriate method on the delegate to request the data.
     
+    It will check if the range has been already requested.
+    
     @param {SC.SparseArray} receiver
   */
   requestIndex: function(idx) {
@@ -130,17 +170,19 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
     
     // adjust window
     var len = this.get('rangeWindowSize'), start = idx;
-    if (len > 1) start = Math.floor(start / windowSize);
+    if (len > 1) start = start - Math.floor(start % len);
     if (len < 1) len = 1 ;
     
     // invoke appropriate callback
     this._requestingIndex++;
     if (del.sparseArrayDidRequestRange) {
       var range = this._TMP_RANGE;
-      range.start = start;
-      range.length = len;
-      del.sparseArrayDidRequestRange(this, range);
-      
+      if(this.wasRangeRequested(start)===-1){
+        range.start = start;
+        range.length = len;
+        del.sparseArrayDidRequestRange(this, range);
+        this.requestedRangeIndex.push(start);
+      }
     } else if (del.sparseArrayDidRequestIndex) {
       while(--len >= 0) del.sparseArrayDidRequestIndex(this, start + len);
     }
@@ -149,6 +191,38 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
     return this ;
   },
   
+  /*
+    This method is called by requestIndex to check if the range has already 
+    been requested. We assume that rangeWindowSize is not changed often.
+    
+     @param {Number} startIndex
+     @return {Number} index in requestRangeIndex
+  */
+  wasRangeRequested: function(rangeStart) {
+    var i, ilen;
+    for(i=0, ilen=this.requestedRangeIndex.length; i<ilen; i++){
+      if(this.requestedRangeIndex[i]===rangeStart) return i;
+    }
+    return -1;
+  },
+  
+  /*
+    This method has to be called after a request for a range has completed.
+    To remove the index from the sparseArray to allow future updates on the 
+    range.
+    
+     @param {Number} startIndex
+     @return {Number} index in requestRangeIndex
+  */
+  rangeRequestCompleted: function(start) { 
+    var i = this.wasRangeRequested(start);
+    if(i>=0) { 
+      this.requestedRangeIndex.removeAt(i,1);
+      return YES;
+    }
+    return NO;
+  },
+  
   /**
     This method sets the content for the specified to the objects in the 
     passed array.  If you change the way SparseArray implements its internal

data/frameworks/sproutcore/frameworks/runtime/tests/mixins/enumerable.js

@@ -98,7 +98,7 @@ module("Real Array & DummyEnumerable", {
   },
   
   teardown: function() {
-    delete enumerables ;
+    delete enumerables;
     delete Array.prototype["@max(balance)"] ; // remove cached value
     delete Array.prototype["@min(balance)"] ;
   }
@@ -153,7 +153,7 @@ test("should run forEach() to go through objects", function() {
     }, this);
     
     var len = src.get('length') ;
-    for(var idx=0;idx<len;idx++) {
+    for(idx=0;idx<len;idx++) {
       equals(items[idx], src.objectAt(idx)) ;
       equals(indexes[idx], idx) ;
       equals(arrays[idx], src) ;
@@ -187,7 +187,7 @@ test("should map to values while passing proper params", function() {
     }, this);
     
     var len = src.get('length') ;
-    for(var idx=0;idx<len;idx++) {
+    for(idx=0;idx<len;idx++) {
       equals(src.objectAt(idx), items[idx], "items") ;
       equals(idx, indexes[idx], "indexes") ;
       equals(src, arrays[idx], 'arrays') ;
@@ -220,7 +220,7 @@ test("should filter to items that return for callback", function() {
     }, this);
     
     var len = src.get('length') ;
-    for(var idx=0;idx<len;idx++) {
+    for(idx=0;idx<len;idx++) {
       equals(src.objectAt(idx), items[idx], "items") ;
       equals(idx, indexes[idx], "indexes") ;
       equals(src, arrays[idx], 'arrays') ;
@@ -254,7 +254,7 @@ test("should return true if function for every() returns true", function() {
     }, this);
     
     var len = src.get('length') ;
-    for(var idx=0;idx<len;idx++) {
+    for(idx=0;idx<len;idx++) {
       equals(src.objectAt(idx), items[idx], "items") ;
       equals(idx, indexes[idx], "indexes") ;
       equals(src, arrays[idx], 'arrays') ;
@@ -298,7 +298,7 @@ test("should return false if all functions for some() returns false", function()
     }, this);
     
     var len = src.get('length') ;
-    for(var idx=0;idx<len;idx++) {
+    for(idx=0;idx<len;idx++) {
       equals(src.objectAt(idx), items[idx], "items") ;
       equals(idx, indexes[idx], "indexes") ;
       equals(src, arrays[idx], 'arrays') ;

data/frameworks/sproutcore/frameworks/runtime/tests/system/sparse_array.js

@@ -84,6 +84,59 @@ test("element to be added is at idx > length of array ", function() {
 });
 
 
+test("Check that requestIndex works with a rangeWindowSize larger than 1", function() {
+	var ary = SC.SparseArray.array(10) ;
+	var didRequestRange=NO;
+	
+	var DummyDelegate = SC.Object.extend({
+    content: [], // source array
+
+    sparseArrayDidRequestLength: function(sparseArray) {
+      sparseArray.provideLength(this.content.length);
+    },
+
+    sparseArrayDidRequestIndex: function(sparseArray, index) {
+      sparseArray.provideObjectAtIndex(index, this.content[index]);
+    },
+
+    sparseArrayDidRequestIndexOf: function(sparseArray, object) {
+      return this.content.indexOf(object);    
+    },
+
+    sparseArrayShouldReplace: function(sparseArray, idx, amt, objects) {
+      this.content.replace(idx, amt, objects) ; // keep internal up-to-date
+      return YES ; // allow anything
+    },
+    sparseArrayDidRequestRange: function(sparseArray, range) {
+       didRequestRange=YES;
+     }
+
+  });
+  ary.set('delegate', DummyDelegate.create());
+	ary.set('rangeWindowSize', 4);
+	equals(10, ary.get('length'), "length") ;
+	ary.objectAt(7);
+	equals(didRequestRange, YES, "The range was requested") ;
+});
+
+
+// ..........................................................
+// definedIndexes
+// 
+
+test("definedIndexes", function() {
+  var ary = SC.SparseArray.array(10);
+  ary.provideObjectAtIndex(5, "foo");
+  
+  var expected = SC.IndexSet.create().add(5);
+  same(ary.definedIndexes(), expected, 'definedIndexes() should return all defined indexes');
+  
+  same(ary.definedIndexes(SC.IndexSet.create().add(2, 10)), expected, 'definedIndexes([2..11]) should return indexes within');
+  
+  same(ary.definedIndexes(SC.IndexSet.create().add(2)), SC.IndexSet.EMPTY, 'definedIndexes([2]) should return empty set (since does not overlap with defined index)');
+  
+});
+
 // ..........................................................
 // TEST SC.ARRAY COMPLIANCE
 // 

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

@@ -226,6 +226,10 @@ CoreTest.Plan = {
     @returns {CoreTest.Plan} receiver
   */
   module: function(desc, lifecycle) {
+    if (typeof SC !== 'undefined' && SC.filename) {
+      desc = SC.filename.replace(/^.+?\/current\/tests\//,'') + '\n' + desc;
+    }
+    
     this.currentModule = desc;
 
     if (!lifecycle) lifecycle = {};

data/frameworks/sproutcore/frameworks/testing/system/runner.js

@@ -141,7 +141,7 @@ CoreTest.Runner = {
     for(idx=0;idx<len;idx++) s[assertions[idx].result]++;
     if ((s.failed + s.errors + s.warnings) === 0) clean = "clean" ;
     
-    if (module) name = module + " module: " + test ;
+    if (module) name = module.replace(/\n/g, '<br />') + " module: " + test ;
     name = CoreTest.fmt('%@ - %@msec', name, timings.total_end - timings.total_begin);
     // place results into a single string to append all at once.
     var logstr = this.logstr ;

data/frameworks/sproutcore/themes/standard_theme/english.lproj/radio.css

@@ -34,6 +34,10 @@
 	margin-bottom: 3px;
 }
 
+.sc-radio-view.sc-layout-horizontal  .sc-radio-button {
+  padding-right: 8px;
+}
+
 .sc-theme .sc-radio-view.sc-layout-vertical .sc-radio-button img.button {
 	position: absolute ;
 	margin: 0;

data/gen/design/Buildfile

@@ -0,0 +1,23 @@
+# ==========================================================================
+# Generator: Controller
+# Copyright: ©2006-2009 Sprout Systems, Inc. and contributors
+#            portions copyright ©2009 Apple, Inc.
+# ==========================================================================
+
+namespace :generator do
+
+  # - Verify required properties are present
+  # - Accept second argument as base class
+  # - If file name end in "_design" strip it off.
+  # - Make sure filename ends in _page.
+  task :prepare do
+    GENERATOR.requires! :target_project, :target, :namespace, :class_name
+    GENERATOR.base_class_name ||= GENERATOR.arguments[2]
+    
+    filename = GENERATOR.filename.sub(/_design$/,'')
+    filename = "#{filename}_page" unless filename =~ /_page$/
+    GENERATOR.filename = filename
+      
+  end
+  
+end

data/gen/design/README

@@ -0,0 +1 @@
+Your design is now ready to use!

data/gen/design/USAGE

@@ -0,0 +1,10 @@
+design - Create a new page design for your SproutCore app.  
+
+USAGE:
+
+  sc-gen design AppName.designName [--filename=FILENAME] [--target=TARGET_NAME]
+
+DISCUSSION:
+
+This generator will create a new SproutCore page design, similar to the main_page design that comes with all new apps.
+

data/gen/design/templates/english.lproj/@filename@.js

@@ -0,0 +1,16 @@
+// ==========================================================================
+// Project:   <%= namespace_instance_name %>
+// Copyright: ©<%= Time.now.year %> My Company, Inc.
+// ==========================================================================
+/*globals <%= namespace %> */
+
+// This page describes a part of the interface for your application.
+<%= namespace_instance_name %> = SC.Page.design({
+
+  // Add your views here.  Ex:
+  
+  // mainView: SC.View.design({
+  //   layout: { top: 0, left: 0, right: 0, height: 0 }
+  // })
+
+});

data/gen/page/Buildfile

@@ -0,0 +1,36 @@
+# ==========================================================================
+# Generator: APP
+# Copyright: ©2006-2009 Sprout Systems, Inc. and contributors
+#            portions copyright ©2009 Apple, Inc.
+# ==========================================================================
+
+namespace :generator do
+  
+  # Require a project then make sure the build root is always the project 
+  # root.
+  task :prepare do
+    GENERATOR.requires! :target_project
+    
+    # if the target name has a slash in it, then we are trying to create a 
+    # nested target.  extract the final part (since this is the target name)
+    # and then set the build root to the parent target.
+    if GENERATOR.target_name && GENERATOR.target_name =~ /\//
+      parent_target_name = GENERATOR.target_name.split('/')
+      GENERATOR.target_name = parent_target_name.pop
+      
+      parent_target_name = parent_target_name * "/"
+      project = GENERATOR.target_project
+      
+      GENERATOR.parent_target_name = parent_target_name
+      GENERATOR.parent_target = project.target_for(parent_target_name)
+      GENERATOR.requires! :parent_target, :parent_target_name
+      
+      GENERATOR.build_root = GENERATOR.parent_target.source_root
+    
+    # otherwise just use project_root
+    else        
+      GENERATOR.build_root = GENERATOR.target_project.project_root
+    end
+  end
+  
+end

data/gen/page/README

@@ -0,0 +1 @@
+Your page target is now ready to use!

data/gen/page/USAGE

@@ -0,0 +1,15 @@
+page - Create a new SproutCore page target.
+
+USAGE:
+
+  sc-gen page PageName [--filename=FILENAME] [--target=TARGET_NAME]
+
+DISCUSSION:
+
+*IMPORTANT:* This generator does not create a page design (e.g. main_page.js) in an app.  Use "sc-gen design" instead.
+
+This generator will create a new SproutCore page for a particular project.  A page is much like an app but you will often place primarily static content here.  You should pass as the first parameter your PageName you want to create.  For example:
+
+sc-gen page NotFound
+
+defines a new page called NotFound in the file pages/not_found/.

data/gen/page/templates/pages/@target_name@/Buildfile

@@ -0,0 +1,16 @@
+#  ==========================================================================
+#  Project:   <%= namespace %> Buildfile
+#  Copyright: ©<%= Time.now.year %> My Company, Inc.
+#  ==========================================================================
+
+# You can use to buildfile to add a custom page title, set environment 
+# variables, and require any specific JavaScript or other libraries you want
+# to use.  
+#
+# The default configuration just sets the page title and also requires 
+# SproutCore-Mini (a smaller version of SproutCore)
+#
+config :<%= target_name %>, 
+  :required => ['sproutcore/mini'],
+  :title    => '<%= target_name.split('_').map { |x| x.capitalize }.join(" ") %>'
+  

data/gen/page/templates/pages/@target_name@/core.js

@@ -0,0 +1,22 @@
+// ==========================================================================
+// Project:   <%= namespace %>
+// Copyright: ©<%= Time.now.year %> My Company, Inc.
+// ==========================================================================
+/*globals <%= namespace %> */
+
+/** @namespace
+
+  Static page JavaScript
+  
+  @extends SC.Object
+*/
+<%= namespace %> = SC.Object.create(
+  /** @scope <%= namespace %>.prototype */ {
+
+  NAMESPACE: '<%= namespace %>',
+  VERSION: '0.1.0'
+  
+  // TODO: You can place any JavaScript you need on your page here.  If you
+  // don't want any JavaScript, just delete this file.
+
+}) ;

data/gen/page/templates/pages/@target_name@/english.lproj/body.css

@@ -0,0 +1 @@
+/* Add any extra CSS for this page here.  You can also add other CSS files if you want */

data/gen/page/templates/pages/@target_name@/english.lproj/body.rhtml

@@ -0,0 +1,7 @@
+<%% content_for :body do %>
+<%% # Any HTML inside this area will be placed into the main body of the HTML
+    # page.
+%>
+<h1><%= target_name.split('_').map { |x| x.capitalize }.join(" ") %></h1>
+
+<%% end %>

data/gen/page/templates/pages/@target_name@/english.lproj/strings.js

@@ -0,0 +1,15 @@
+// ==========================================================================
+// Project:   <%= namespace %> Strings
+// Copyright: ©<%= Time.now.year %> My Company, Inc.
+// ==========================================================================
+/*globals <%= namespace %> */
+
+// Place strings you want to localize here.  In your app, use the key and
+// localize it using "key string".loc().  HINT: For your key names, use the
+// english string with an underscore in front.  This way you can still see
+// how your UI will look and you'll notice right away when something needs a
+// localized string added to this file!
+//
+SC.stringsFor('English', {
+  // "_String Key": "Localized String"
+}) ;

data/gen/view/README

@@ -1 +1 @@
-Your controller is now ready to use!
+Your view is now ready to use!

data/gen/view/USAGE

@@ -1,13 +1,13 @@
-model - Create a new controller class in your SproutCore app.
+view - Create a new view class in your SproutCore app.
 
 USAGE:
 
-  sc-gen controller AppName.ClassNameController [--filename=FILENAME] [--target=TARGET_NAME]
+  sc-gen view AppName.NewView [--filename=FILENAME] [--target=TARGET_NAME]
 
 DISCUSSION:
 
-This generator will create a new SproutCore controller file in your app.  You should pass as the first parameter your AppName.ClassNameController combination you want to create.  For example:
+This generator will create a new SproutCore view in your app.  You should pass as the first parameter your AppName.NewView combination you want to create.  For example:
 
-sc-gen controller Todos.TaskController
+sc-gen view Todos.TaskView
 
-defines a new class called Todos.TaskController in the file apps/todos/controllers/task.js .
+defines a new class called Todos.TaskView in the file apps/todos/views/task.js .

data/lib/sproutcore/builders/base.rb

@@ -61,9 +61,20 @@ module SC
 
       # Handles occurances of sc_static() or static_url()
       def replace_static_url(line)
-        line.gsub(/(sc_static|static_url)\(\s*['"](.+)['"]\s*\)/) do | rsrc |
+        line.gsub(/(sc_static|static_url|sc_target)\(\s*['"](.+)['"]\s*\)/) do | rsrc |
+          entry_name = $2
+          entry_name = "#{$2}:index.html" if $1 == 'sc_target'
           static_entry = entry.manifest.find_entry($2)
-          static_url(static_entry.nil? ? '' : static_entry.cacheable_url)
+          
+          if static_entry.nil?
+            url = ''
+          elsif $1 == 'sc_target'
+            url = static_entry.friendly_url || static_entry.cacheable_url
+          else
+            url = static_entry.cacheable_url 
+          end
+            
+          static_url(url)
         end
       end