sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/theming.js

@@ -25,7 +25,7 @@ SC.View.reopen(
 
     Example: themeName: 'ace'
 
-    @property {String}
+    @type String
   */
   themeName: null,
 
@@ -37,7 +37,7 @@ SC.View.reopen(
     This property is private for the time being.
 
     @private
-    @property {String}
+    @type String
   */
   baseThemeName: null,
 
@@ -138,7 +138,7 @@ SC.View.reopen(
 
     You can also set the render delegate by using the 'renderDelegateName' property.
 
-    @property {Object}
+    @type Object
   */
   renderDelegate: function(key, value) {
     if (value) { this._setRenderDelegate = value; }
@@ -152,7 +152,7 @@ SC.View.reopen(
     if (renderDelegateName) {
       renderDelegate = this.get('theme')[renderDelegateName];
       if (!renderDelegate) {
-        throw "%@: Unable to locate render delegate \"%@\" in theme.".fmt(this, renderDelegateName);
+        throw new Error("%@: Unable to locate render delegate \"%@\" in theme.".fmt(this, renderDelegateName));
       }
 
       return renderDelegate;
@@ -239,7 +239,7 @@ SC.View.reopen(
     if (renderDelegate && renderDelegate.className) {
       context.addClass(renderDelegate.className);
     }
-    
+
     // @if(debug)
     if (renderDelegate && renderDelegate.name) {
       SC.Logger.error("Render delegates now use 'className' instead of 'name'.");
@@ -247,21 +247,21 @@ SC.View.reopen(
     }
     // @endif
   }.enhance(),
-  
+
 
   /**
     Invokes a method on the render delegate, if one is present and it implements
     that method.
-    
+
     @param {String} method The name of the method to call.
     @param arg One or more arguments.
   */
   invokeRenderDelegateMethod: function(method, args) {
     var renderDelegate = this.get('renderDelegate');
     if (!renderDelegate) return undefined;
-    
+
     if (SC.typeOf(renderDelegate[method]) !== SC.T_FUNCTION) return undefined;
-    
+
     args = SC.$A(arguments);
     args.shift();
     args.unshift(this.get('renderDelegateProxy'));
@@ -274,9 +274,8 @@ SC.View.reopen(
   @private
   View Render Delegate Proxies are tool SC.Views use to:
 
-  a) limit properties the render delegate can access to the displayProperties
-  b) look up 'display*' ('displayTitle' instead of 'title') to help deal with
-     differences between the render delegate's API and the view's.
+  - look up 'display*' ('displayTitle' instead of 'title') to help deal with
+    differences between the render delegate's API and the view's.
 
   RenderDelegateProxies are fully valid data sources for render delegates. They
   act as proxies to the view, interpreting the .get and .didChangeFor commands
@@ -286,8 +285,10 @@ SC.View.reopen(
 */
 SC.View._RenderDelegateProxy = {
 
+  //@if(debug)
   // for testing:
   isViewRenderDelegateProxy: YES,
+  //@endif
 
   /**
     Creates a View Render Delegate Proxy for the specified view.
@@ -328,10 +329,6 @@ SC.View._RenderDelegateProxy = {
     for instance, if the render delegate asks for 'title', this will
     look for 'displayTitle' in the view's displayProperties array.
 
-    If the property is not in `displayProperties`, but a property
-    is defined on the view, an error will be thrown to assist in
-    debugging.
-
    @param {String} property The name of the property the render delegate needs.
    @returns The value.
   */
@@ -342,11 +339,9 @@ SC.View._RenderDelegateProxy = {
 
     if (this._displayPropertiesLookup[displayProperty]) {
       return this._view.get(displayProperty);
-    } else if (this._displayPropertiesLookup[property]) {
+    } else {
       return this._view.get(property);
     }
-
-    return undefined;
   },
 
   /**
@@ -364,7 +359,7 @@ SC.View._RenderDelegateProxy = {
 
       if (this._displayPropertiesLookup[displayProperty]) {
         if (this._view.didChangeFor(context, displayProperty)) { return YES; }
-      } else if (this._displayPropertiesLookup[property]) {
+      } else {
         if (this._view.didChangeFor(context, property)) { return YES; }
       }
     }
@@ -377,9 +372,9 @@ SC.View._RenderDelegateProxy = {
   Generates a computed property that will look up the specified property from
   the view's render delegate, if present. You may specify a default value to
   return if there is no such property or is no render delegate.
-  
+
   The generated property is read+write, so it may be overridden.
-  
+
   @param {String} propertyName The name of the property to get from the render delegate..
   @param {Value} def The default value to use if the property is not present.
 */
@@ -402,7 +397,7 @@ SC.propertyFromRenderDelegate = function(propertyName, def) {
     }
 
     if (ret !== undefined) return ret;
-    
+
     return def;
   }.property('renderDelegate').cacheable();
 };

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/visibility.js

@@ -5,114 +5,32 @@ SC.View.reopen(
 
   /**
     Set to YES to indicate the view has visibility support added.
-  */
-  hasVisibility: YES,
 
-  /**
-    YES only if the view and all of its parent views are currently visible
-    in the window.  This property is used to optimize certain behaviors in
-    the view.  For example, updates to the view layer are not performed
-    if the view until the view becomes visible in the window.
+    @deprecated Version 1.10
   */
-  isVisibleInWindow: NO,
+  hasVisibility: YES,
 
   /**
    By default we don't disable the context menu. Overriding this property
    can enable/disable the context menu per view.
   */
-  isContextMenuEnabled: function() {
+  isContextMenuEnabled: function () {
     return SC.CONTEXT_MENU_ENABLED;
   }.property(),
 
   /**
-    Recomputes the isVisibleInWindow property based on the visibility of the
-    view and its parent.  If the recomputed value differs from the current
-    isVisibleInWindow state, this method will also call
-    recomputIsVisibleInWindow() on its child views as well.  As an optional
-    optimization, you can pass the isVisibleInWindow state of the parentView
-    if you already know it.
+    The visibility of the view does not need to be computed any longer as it
+    is maintained by the internal SC.View statechart.
 
-    You will not generally need to call or override this method yourself. It
-    is used by the SC.View hierarchy to relay window visibility changes up
-    and down the chain.
-
-    @property {Boolean} parentViewIsVisible
+    @deprecated Version 1.10
     @returns {SC.View} receiver
   */
-  recomputeIsVisibleInWindow: function(parentViewIsVisible) {
-    var previous = this.get('isVisibleInWindow'),
-        current  = this.get('isVisible'),
-        parentView;
-
-    // isVisibleInWindow = isVisible && parentView.isVisibleInWindow
-    // this approach only goes up to the parentView if necessary.
-    if (current) {
-      // If we weren't passed in 'parentViewIsVisible' (we generally aren't;
-      // it's an optimization), then calculate it.
-      if (parentViewIsVisible === undefined) {
-        parentView = this.get('parentView');
-        parentViewIsVisible = parentView ? parentView.get('isVisibleInWindow') : NO;
-      }
-      current = current && parentViewIsVisible;
-    }
-
-    // If our visibility has changed, then set the new value and notify our
-    // child views to update their value.
-    if (previous !== current) {
-      this.set('isVisibleInWindow', current);
-
-      var childViews = this.get('childViews'), len = childViews.length, idx, view;
-      for(idx=0;idx<len;idx++) {
-        view = childViews[idx];
-        if(view.recomputeIsVisibleInWindow) { view.recomputeIsVisibleInWindow(current); }
-      }
-
-      // For historical reasons, we'll also layout the child views if
-      // necessary.
-      if (current) {
-        if (this.get('childViewsNeedLayout')) { this.invokeOnce(this.layoutChildViewsIfNeeded); }
-      }
-      else {
-        // Also, if we were previously visible and were the first responder,
-        // resign it.  This more appropriately belongs in a
-        // 'isVisibleInWindow' observer or some such helper method because
-        // this work is not strictly related to computing the visibility, but
-        // view performance is critical, so avoiding the extra observer is
-        // worthwhile.
-        if (this.get('isFirstResponder')) { this.resignFirstResponder(); }
-      }
-    }
-
-    // If we're in this function, then that means one of our ancestor views
-    // changed, or changed its 'isVisibleInWindow' value.  That means that if
-    // we are out of sync with the layer, then we need to update our state
-    // now.
-    //
-    // For example, say we're isVisible=NO, but we have not yet added the
-    // 'sc-hidden' class to the layer because of the "don't update the layer if
-    // we're not visible in the window" check.  If any of our parent views
-    // became visible, our layer would incorrectly be shown!
-    this.updateLayerIfNeeded(YES);
+  recomputeIsVisibleInWindow: function () {
+    //@if(debug)
+    SC.warn("Developer Warning: Calling recomputeIsVisibleInWindow() is no longer necessary and has been deprecated.");
+    //@endif
 
     return this;
-  },
-
-
-  /** @private
-    Whenever the view's visibility changes, we need to recompute whether it is
-    actually visible inside the window (a view is only visible in the window
-    if it is marked as visibile and its parent view is as well), in addition
-    to updating the layer accordingly.
-  */
-  _sc_isVisibleDidChange: function() {
-    // 'isVisible' is effectively a displayProperty, but we'll call
-    // displayDidChange() manually here instead of declaring it as a
-    // displayProperty because that avoids having two observers on
-    // 'isVisible'.  A single observer is:
-    //   a.  More efficient
-    //   b.  More correct, because we can guarantee the order of operations
-    this.displayDidChange();
+  }
 
-    this.recomputeIsVisibleInWindow();
-  }.observes('isVisible')
-})
+});

data/lib/frameworks/sproutcore/frameworks/core_tools/core.js

@@ -4,12 +4,12 @@
 // ==========================================================================
 /*globals CoreTools */
 
-/** @namespace
+/**
 
   This framework contains common code shared by the SproutCore developer tools
   including the test runner, doc viewer and welcome apps.  It is not generally
   intended for use in your own applications.
-  
+
   @extends SC.Object
 */
 CoreTools = SC.Object.create( /** @scope CoreTools.prototype */ {

data/lib/frameworks/sproutcore/frameworks/core_tools/data_source.js

@@ -13,7 +13,7 @@
 CoreTools.DataSource = SC.DataSource.extend({
 
   /**
-    Fetch a group of records from the data source.  Knows how to fetch 
+    Fetch a group of records from the data source.  Knows how to fetch
     a list of targets and tests.
   */
   fetch: function(store, query) {
@@ -26,45 +26,45 @@ CoreTools.DataSource = SC.DataSource.extend({
         ret = this.fetchTests(store, query);
         break;
     }
-    
+
     return ret;
   },
-  
+
   // ..........................................................
   // FETCHING TARGETS
-  // 
-  
+  //
+
   /**
     Fetch the actual targets.  Only understands how to handle a remote query.
   */
   fetchTargets: function(store, query) {
-    
-    if (!query.get('isRemote')) return NO ; 
-    
+
+    if (!query.get('isRemote')) return NO ;
+
     SC.Request.getUrl(CoreTools.attachUrlPrefix('/sc/targets.json'))
       .set('isJSON', YES)
       .notify(this, 'fetchTargetsDidComplete', { query: query, store: store })
       .send();
     return YES ;
   },
-  
+
   fetchTargetsDidComplete: function(request, opts) {
     var response = request.get('response'),
         query    = opts.query,
         store    = opts.store,
         storeKeys;
-        
+
     if (!SC.$ok(response)) {
       console.error("TODO: Add handler when fetching targets fails");
     } else {
       storeKeys = store.loadRecords(CoreTools.Target, response);
-      store.loadQueryResults(query, storeKeys);
+      store.dataSourceDidFetchQuery(query, storeKeys);
     }
   },
-  
+
   // ..........................................................
   // FETCHING TESTS
-  // 
+  //
 
   /**
     Load tests for a particular URL.  Only understands local querys with a
@@ -72,28 +72,28 @@ CoreTools.DataSource = SC.DataSource.extend({
   */
   fetchTests: function(store, query) {
     var url = query.get('url') ;
-        
+
     if (!query.get('isRemote') || !url) return NO ; // not handled
-    
+
     SC.Request.getUrl(url)
       .set('isJSON', YES)
       .notify(this, 'fetchTestsDidComplete', { query: query, store: store })
       .send();
     return YES ;
   },
-  
+
   fetchTestsDidComplete: function(request, opts) {
     var response = request.get('response'),
         store    = opts.store,
         query    = opts.query,
         storeKeys;
-        
+
     if (!SC.$ok(response)) {
       console.error("TODO: Add handler when fetching tests fails");
     } else {
       storeKeys = store.loadRecords(CoreTools.Test, response);
-      store.loadQueryResults(query, storeKeys); // notify query loaded
+      store.dataSourceDidFetchQuery(query, storeKeys); // notify query loaded
     }
   }
-  
+
 });

data/lib/frameworks/sproutcore/frameworks/core_tools/models/target.js

@@ -2,9 +2,9 @@
 // Project:   CoreTools.Target
 // Copyright: ©2011 Apple Inc.
 // ==========================================================================
-/*globals CoreTools */
+/*global CoreTools */
 
-/** @class
+/**
 
   Describes a target in the build system.
 
@@ -38,7 +38,7 @@ CoreTools.Target = SC.Record.extend(
   /**
     URL to use to load the app.  If no an app, returns null
   */
-  appUrl: function() {
+  appUrl: function () {
     return (this.get('kind') === 'app') ? CoreTools.attachUrlPrefix(this.get('name')) : null;
   }.property('kind', 'name').cacheable(),
 
@@ -50,53 +50,68 @@ CoreTools.Target = SC.Record.extend(
   /**
     Children of this target.  Computed by getting the loaded targets
   */
-  children: function() {
+  children: function () {
     var store = this.get('store'),
-        query = CoreTools.TARGETS_QUERY,
-        ret   = store.find(query).filterProperty('parent', this);
+      query = CoreTools.TARGETS_QUERY,
+      ret = store.find(query).filterProperty('parent', this);
 
     if (ret) ret = ret.sortProperty('kind', 'displayName');
-    return (ret && ret.get('length')>0) ? ret : null ;
+    return (ret && ret.get('length') > 0) ? ret : null;
   }.property().cacheable(),
 
   /**
     Display name for this target
   */
-  displayName: function() {
+  displayName: function () {
     var name = (this.get('name') || '(unknown)').split('/');
-    return name[name.length-1];
+    return name[name.length - 1];
+  }.property('name').cacheable(),
+
+  /**
+    URL name for this target
+  */
+  urlName: function () {
+    var name = (this.get('name') || '/unknown').slice(1).replace(/\//g, '-');
+    return name;
   }.property('name').cacheable(),
 
   /**
     The icon to display.  Based on the type.
   */
-  targetIcon: function() {
+  targetIcon: function () {
     var ret = 'sc-icon-document-16';
-    switch(this.get('kind')) {
-      case "framework":
-        ret = 'sc-icon-folder-16';
-        break;
-
-      case "app":
-        ret = 'sc-icon-options-16';
-        break;
+    switch (this.get('kind')) {
+    case "framework":
+      ret = 'sc-icon-folder-16';
+      break;
+
+    case "app":
+      ret = this.get('sortKind') === 'sproutcore' ? 'sc-icon-options-16' : 'sc-icon-sproutcore-16';
+      break;
     }
-    return ret ;
-  }.property('kind').cacheable(),
+    return ret;
+  }.property('sortKind').cacheable(),
 
   /**
     This is the group key used to display.  Will be the kind unless the item
     belongs to the sproutcore target.
   */
-  sortKind: function() {
+  sortKind: function () {
     if (this.get('name') === '/sproutcore') return null;
+
     var parent = this.get('parent');
-    if (parent && (parent.get('name') === '/sproutcore')) return 'sproutcore';
-    else return (this.get('kind') || 'unknown').toLowerCase();
+    if (parent && parent.get('name') === '/sproutcore') {
+      // Lump all top-level SproutCore apps, frameworks and themes under SproutCore.
+      return 'sproutcore';
+    } else if (parent && parent.get('name').indexOf('/sproutcore') === 0) {
+      // The parent is a SproutCore framework, but we are not a top-level group.
+      return null;
+    } else {
+      return (this.get('kind') || 'unknown').toLowerCase();
+    }
   }.property('kind', 'parent').cacheable(),
 
-
-  testsQuery: function() {
+  testsQuery: function () {
     return SC.Query.remote(CoreTools.Test, { url: this.get('testsUrl') });
   }.property('testsUrl').cacheable(),
 
@@ -104,10 +119,11 @@ CoreTools.Target = SC.Record.extend(
     Returns all of the tests associated with this target by fetching the
     testsUrl.
   */
-  tests: function() {
+  tests: function () {
     return this.get('store').find(this.get('testsQuery'));
   }.property('testsQuery').cacheable()
 
-}) ;
+});
+
 
 CoreTools.TARGETS_QUERY = SC.Query.remote(CoreTools.Target);