sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/template_view/views/bindable_span.js

@@ -18,7 +18,7 @@ SC._BindableSpan = SC.TemplateView.extend(
    Internet Explorer 7, a <span> tag is used to ensure that inline elements are
    not rendered with display: block.
 
-   @property {String}
+   @type String
   */
   tagName: 'span',
 
@@ -27,7 +27,7 @@ SC._BindableSpan = SC.TemplateView.extend(
     +inverseTemplate+ should be rendered. This should be a function that takes
     a value and returns a Boolean.
 
-    @property {Function}
+    @type Function
   */
   shouldDisplayFunc: null,
 
@@ -41,21 +41,21 @@ SC._BindableSpan = SC.TemplateView.extend(
     outside the block. This would be NO when used with +{{#with foo}}+ because
     the template should receive the object found by evaluating +foo+.
 
-    @property {Boolean}
+    @type Boolean
   */
   preserveContext: NO,
 
   /**
     The template to render when +shouldDisplayFunc+ evaluates to YES.
 
-    @property {Function}
+    @type Function
   */
   displayTemplate: null,
 
   /**
     The template to render when +shouldDisplayFunc+ evaluates to NO.
 
-    @property {Function}
+    @type Function
   */
   inverseTemplate: null,
 
@@ -66,7 +66,7 @@ SC._BindableSpan = SC.TemplateView.extend(
     In addition, if +preserveContext+ is NO, this object will be passed to the
     template when rendering.
 
-    @property {String}
+    @type String
   */
   property: null,
 
@@ -174,7 +174,7 @@ SC._BindableSpan = SC.TemplateView.extend(
     elem = context.element();
     this.$().replaceWith(elem);
     this.set('layer', elem);
-    this._notifyDidCreateLayer();
+    this._rendered();
   }
 });
 

data/lib/frameworks/sproutcore/frameworks/template_view/views/template.js

@@ -40,14 +40,14 @@ SC.TemplateView = SC.CoreView.extend(
     +SC.TEMPLATES+ hash. Usually this hash will be populated for you
     automatically when you include +.handlebars+ files in your project.
 
-    @property {String}
+    @type String
   */
   templateName: null,
 
   /**
     The hash in which to look for +templateName+. Defaults to SC.TEMPLATES.
 
-    @property {Object}
+    @type Object
   */
   templates: SC.TEMPLATES,
 
@@ -59,7 +59,7 @@ SC.TemplateView = SC.CoreView.extend(
     In general, you should set the +templateName+ property instead of setting
     the template yourself.
 
-    @property {Function}
+    @type Function
   */
   template: function(key, value) {
     if (value !== undefined) {
@@ -91,7 +91,7 @@ SC.TemplateView = SC.CoreView.extend(
 
     By default, this will be the view itself.
 
-    @property {Object}
+    @type Object
   */
   context: function(key, value) {
     if (value !== undefined) {

data/lib/frameworks/sproutcore/frameworks/template_view/views/template_collection.js

@@ -15,7 +15,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
     If the tag is a list ('ul' or 'ol') each item will be wrapped into a 'li' tag.
     If the tag is a table ('table', 'thead', 'tbody') each item will be wrapped into a 'tr' tag.
 
-    @property {String}
+    @type String
     @default ul
   */
   tagName: 'ul',
@@ -46,7 +46,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
   */
   init: function() {
     var templateCollectionView = sc_super();
-    this._sctcv_contentDidChange();
+
     return templateCollectionView;
   },
 
@@ -59,8 +59,10 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
     if (this._sctcv_layerCreated) { return; }
     this._sctcv_layerCreated = true;
 
+    // Have to call this here, because we need to render before adding
+    // childViews so that itemViewTemplate is set by the template function.
     var content = this.get('content');
-    if(content) {
+    if (content) {
       this.arrayContentDidChange(0, 0, content.get('length'));
     }
   },
@@ -124,7 +126,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
   /**
     The name of a template to lookup if no inverse template is provided.
 
-    @property {String}
+    @type String
   */
   inverseTemplateName: null,
 
@@ -171,9 +173,6 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
     needed.
   */
   _sctcv_contentDidChange: function() {
-
-    this.$().empty();
-
     var oldContent = this._content, oldLen = 0;
     var content = this.get('content'), newLen = 0;
 
@@ -206,7 +205,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
     // If the contents were empty before and this template collection has an empty view
     // remove it now.
     var emptyView = this.get('emptyView');
-    if (emptyView) { emptyView.$().remove(); emptyView.removeFromParent(); }
+    if (emptyView) { emptyView.destroy(); }
 
     // Loop through child views that correspond with the removed items.
     // Note that we loop from the end of the array to the beginning because
@@ -217,8 +216,6 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
     for (idx = start+removedCount-1; idx >= start; idx--) {
       childView = childViews[idx];
       if(childView) {
-        childView.$().remove();
-        childView.removeFromParent();
         childView.destroy();
       }
     }
@@ -243,7 +240,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
         itemViewClass = this.get('itemViewClass'),
         childViews    = this.get('childViews'),
         addedViews    = [],
-        renderFunc, childView, itemOptions, elem, insertAtElement, item, itemElem, idx, len;
+        renderFunc, childView, itemOptions, elem = this.$(), insertAtElement, item, itemElem, idx, len;
 
     if (content) {
       var addedObjects = content.slice(start, start+addedCount);
@@ -252,8 +249,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
       // each item.
       itemOptions = this.get('itemViewOptions') || {};
 
-      elem = this.$();
-      insertAtElement = elem.find('li')[start-1] || null;
+      // insertAtElement = elem.find('li')[start-1] || null;
       len = addedObjects.get('length');
 
       // TODO: This logic is duplicated from the view helper. Refactor
@@ -288,13 +284,8 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
           childView.set('context', childView.get(contextProperty));
         }
 
-        itemElem = childView.createLayer().$();
-        if (!insertAtElement) {
-          elem.append(itemElem);
-        } else {
-          itemElem.insertAfter(insertAtElement);
-        }
-        insertAtElement = itemElem;
+        // Have to create child views manually.
+        childView.createLayer()._doAttach(elem[0]);
 
         addedViews.push(childView);
       }
@@ -309,7 +300,10 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
         content: this
       }));
       this.set('emptyView', childView);
-      childView.createLayer().$().appendTo(elem);
+
+      // Have to create child views manually.
+      childView.createLayer()._doAttach(elem[0]);
+
       this.childViews = [childView];
     }
 

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

@@ -463,7 +463,7 @@ CoreTest.Plan = {
   */
   pass: function(msg) {
     var w = this.working ;
-    if (!w) throw "pass("+msg+") called outside of a working test";
+    if (!w) throw new Error("pass("+msg+") called outside of a working test");
     w.assertions.push({ message: msg, result: CoreTest.OK });
     return this ;
   },
@@ -474,7 +474,7 @@ CoreTest.Plan = {
   */
   fail: function(msg) {
     var w = this.working ;
-    if (!w) throw "fail("+msg+") called outside of a working test";
+    if (!w) throw new Error("fail("+msg+") called outside of a working test");
     w.assertions.push({ message: msg, result: CoreTest.FAIL });
     return this ;
   },
@@ -485,7 +485,7 @@ CoreTest.Plan = {
   */
   warn: function(msg) {
     var w = this.working ;
-    if (!w) throw "warn("+msg+") called outside of a working test";
+    if (!w) throw new Error("warn("+msg+") called outside of a working test");
     w.assertions.push({ message: msg, result: CoreTest.WARN });
     return this ;
   },
@@ -496,7 +496,7 @@ CoreTest.Plan = {
   */
   error: function(msg, e) {
     var w = this.working ;
-    if (!w) throw "error("+msg+") called outside of a working test";
+    if (!w) throw new Error("error("+msg+") called outside of a working test");
 
     if(e && typeof console != "undefined" && console.error && console.warn ) {
       console.error(msg);

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

@@ -10,8 +10,8 @@
 sc_require('system/plan');
 
 /** @static
-  The runner will automatically run the default CoreTest.plan when the 
-  document is fully loaded.  It will also act as a delegate on the plan, 
+  The runner will automatically run the default CoreTest.plan when the
+  document is fully loaded.  It will also act as a delegate on the plan,
   logging the output to the screen or console.
 
   @since SproutCore 1.0
@@ -19,7 +19,7 @@ sc_require('system/plan');
 
 
 CoreTest.Runner = {
-  
+
   /**
     The CoreTest plan.  If not set, a default plan will be created.
   */
@@ -32,20 +32,20 @@ CoreTest.Runner = {
     var len = arguments.length,
         ret = CoreTest.beget(this),
         idx ;
-        
+
     for(idx=0;idx<len;idx++) CoreTest.mixin(ret, arguments[len]);
     if (!ret.plan) ret.plan = CoreTest.Plan.create({ delegate: ret });
     window.resizeTo(1400, 800);
-    Q$(window).load(function() { ret.begin(); });      
+    Q$(document).ready(function() { ret.begin(); });
     return ret ;
   },
-  
+
   begin: function() {
     var plan = CoreTest.plan;
     plan.delegate = this;
     plan.run();
   },
-  
+
   planDidBegin: function(plan) {
     // setup the report DOM element.
     var str = [
@@ -87,7 +87,7 @@ CoreTest.Runner = {
     this.report.find('.useragent').html(navigator.userAgent);
     this.logq = this.report.find('tbody');
     this.testCount = 0 ;
-    
+
     // listen to change event
     var runner = this;
     this.hidePassedCheckbox = this.report.find('.hide-passed input');
@@ -102,10 +102,10 @@ CoreTest.Runner = {
 
     Q$('body').append(this.report);
   },
-  
+
   hidePassedTestsDidChange: function() {
     var checked = this.hidePassedCheckbox.is(':checked');
-        
+
     if (checked) {
       this.logq.addClass('hide-clean');
     } else {
@@ -120,22 +120,22 @@ CoreTest.Runner = {
 
   planDidFinish: function(plan, r) {
     this.flush();
-    
+
     var result = this.report.find('.testresult .status');
     var str = CoreTest.fmt('<span>Completed %@ tests in %@ msec. </span>'
-              +'<span class="total">%@</span> total assertions: ', r.tests, 
+              +'<span class="total">%@</span> total assertions: ', r.tests,
               r.runtime, r.total);
-    
+
     if (r.passed > 0) {
       str += CoreTest.fmt('&nbsp;<span class="passed">%@ passed</span>', r.passed);
     }
-    
+
     if (r.failed > 0) {
       str += CoreTest.fmt('&nbsp;<span class="failed">%@ failed</span>', r.failed);
     }
 
     if (r.errors > 0) {
-      str += CoreTest.fmt('&nbsp;<span class="errors">%@ error%@</span>', 
+      str += CoreTest.fmt('&nbsp;<span class="errors">%@ error%@</span>',
             r.errors, (r.errors !== 1 ? 's' : ''));
     }
 
@@ -153,15 +153,15 @@ CoreTest.Runner = {
       this.report.find('.hide-passed').addClass('disabled')
         .find('input').attr('disabled', true);
       if (this.errors) this.errors.length = 0;
-    }     
+    }
     if(CoreTest.showUI) Q$('.core-test').css("right", "360px");
     result.html(str);
-    
+
     CoreTest.finished = true;
-    
+
     if (this.errors) CoreTest.errors=this.errors.join('');
 
-    
+
     // Unload the SproutCore event system so that the user can select the text
     // of the various events.  (It is handy when looking at failed tests.)
     if (SC  &&  SC.Event  &&  SC.Event.unload) {
@@ -171,17 +171,17 @@ CoreTest.Runner = {
       catch (e) {}
     }
   },
-  
+
   planDidRecord: function(plan, module, test, assertions, timings) {
-    var name = test, 
-        s    = { passed: 0, failed: 0, errors: 0, warnings: 0 }, 
-        len  = assertions.length, 
-        clean = '', 
+    var name = test,
+        s    = { passed: 0, failed: 0, errors: 0, warnings: 0 },
+        len  = assertions.length,
+        clean = '',
         idx, cur, q;
-    
+
     for(idx=0;idx<len;idx++) s[assertions[idx].result]++;
     if ((s.failed + s.errors + s.warnings) === 0) clean = "clean" ;
-    
+
     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.
@@ -209,15 +209,15 @@ CoreTest.Runner = {
           '<th style="background:grey; color:white" class="desc" colspan="2">'+
           '%@ (<span class="passed">%@</span>, <span class="failed">%@</span>'+
           ', <span class="errors">%@</span>, <span class="warnings">%@</span>'+
-          ')</th></tr>', clean, name, s.passed, s.failed, s.errors, s.warnings));  
+          ')</th></tr>', clean, name, s.passed, s.failed, s.errors, s.warnings));
     }
-    
+
     len = assertions.length;
     for(idx=0;idx<len;idx++) {
       cur = assertions[idx];
       clean = cur.result === CoreTest.OK ? 'clean' : 'dirty';
       logstr.push(CoreTest.fmt('<tr class="%@"><td class="desc">%@</td>'
-          +'<td class="action %@">%@</td></tr>', clean, cur.message, cur.result, 
+          +'<td class="action %@">%@</td></tr>', clean, cur.message, cur.result,
           (cur.result || '').toUpperCase()));
       if(clean=='dirty'){
         this.errors.push(CoreTest.fmt('<tr class="%@"><td class="desc">%@</td>'
@@ -225,11 +225,11 @@ CoreTest.Runner = {
         (cur.result || '').toUpperCase()));
       }
     }
-    
+
     this.testCount++;
     this.resultStr = CoreTest.fmt("Running – Completed %@ tests so far.", this.testCount);
   },
-  
+
   // called when the plan takes a break.  Good time to flush HTML output.
   planDidPause: function(plan) {
     if(!this._cacheResultSelector){
@@ -242,17 +242,17 @@ CoreTest.Runner = {
 
     if (this.showProgress) { this.flush(); }
   },
-  
+
   // flush any pending HTML changes...
   flush: function() {
     var logstr = this.logstr,
         resultStr = this.resultStr,
         result = this.report.find('.testresult .status');
-        
+
     if (logstr) this.logq.append(this.logstr.join('')) ;
-    
+
     if (resultStr) result.html(resultStr);
     this.resultStr = this.logstr = null ;
   }
-  
+
 };

data/lib/frameworks/sproutcore/scripts/run_sc_server_master.sh

@@ -0,0 +1,34 @@
+#!/bin/sh -ex
+
+OLD_PWD=$PWD
+
+WD=${MASTER_WD:-"/tmp/sproutcore_master_$$"}
+IP=${IP:-"127.0.0.1"}
+PORT=${PORT:-"4020"}
+
+echo "Running in $WD..."
+
+/bin/mkdir -p ${WD} || /bin/true
+cd ${WD}
+
+git clone https://github.com/sproutcore/abbot.git
+cat > Gemfile <<EOF
+source "http://rubygems.org"
+gem "sproutcore", :path => "./abbot/"
+EOF
+bundle install --binstubs
+./bin/sc-init master
+cd master
+mkdir frameworks
+cd frameworks
+ln -s ${OLD_PWD} sproutcore
+cd ..
+if [ -z ${TRAVIS_JOB_ID} ]; then
+    # not running under travis, stay in foreground until stopped
+    ../bin/sc-server --host=${IP} --port=${PORT} --allow-from-ips=${ALLOW_IPS:-"*.*.*.*"}
+else
+    # running under travis, daemonize
+    ( ../bin/sc-server --host=${IP} --port=${PORT} --allow-from-ips=${ALLOW_IPS:-"*.*.*.*"} & ) || /bin/true
+fi
+cd ${OLD_PWD}
+#rm -rf ${WD}