sproutcore 1.5.0.pre.4.1 → 1.5.0.pre.5

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/device.js

@@ -97,7 +97,7 @@ SC.device = SC.Object.create({
   */
   setup: function() {
     var responder = SC.RootResponder.responder;
-    responder.listenFor('online offline'.w(), document, this);
+    responder.listenFor('online offline'.w(), window, this);
     
     this.orientationHandlingShouldChange();
   },

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/platform.js

@@ -148,9 +148,29 @@ SC.platform = {
   /** @private
     When simulating touch events, this method is called when mousemove events
     are received.
+
+    If the altKey is depresed and pinch center not yet established, we will capture the mouse position.
   */
   _simtouch_mousemove: function(evt) {
-    if (!this._mousedown) return NO;
+    if (!this._mousedown) {
+      /*
+        we need to capture when was the first spot that the altKey was pressed and use it as
+        the center point of a pinch
+       */
+      if(evt.altKey && this._pinchCenter == null) {
+        this._pinchCenter = {
+          pageX: evt.pageX,
+          pageY: evt.pageY,
+          screenX: evt.screenX,
+          screenY: evt.screenY,
+          clientX: evt.clientX,
+          clientY: evt.clientY
+        };
+      } else if(!evt.altKey && this._pinchCenter != null){
+        this._pinchCenter = null;
+      }
+      return NO;
+    }
 
     var manufacturedEvt = this.manufactureTouchEvent(evt, 'touchmove');
     return SC.RootResponder.responder.touchmove(manufacturedEvt);
@@ -186,17 +206,22 @@ SC.platform = {
     Note that this method edits the passed event in place, and returns
     that same instance instead of a new, modified version.
 
+    If altKey is depressed and we have previously captured a position for the center of
+    the pivot point for the virtual second touch, we will manufacture an additional touch.
+    The position of the virtual touch will be the reflection of the mouse position,
+    relative to the pinch center.
+
     @param {Event} evt the mouse event to modify
     @param {String} type the type of event (e.g., touchstart)
     @returns {Event} the mouse event with an added changedTouches array
   */
   manufactureTouchEvent: function(evt, type) {
-    var touch, touchIdentifier = this._simtouch_counter;
+    var realTouch, virtualTouch, realTouchIdentifier = this._simtouch_counter;
 
-    touch = {
+    realTouch = {
       type: type,
       target: evt.target,
-      identifier: touchIdentifier,
+      identifier: realTouchIdentifier,
       pageX: evt.pageX,
       pageY: evt.pageY,
       screenX: evt.screenX,
@@ -204,8 +229,38 @@ SC.platform = {
       clientX: evt.clientX,
       clientY: evt.clientY
     };
+    evt.touches = [ realTouch ];
+
+    /*
+      simulate pinch gesture
+     */
+    if(evt.altKey && this._pinchCenter != null)
+    {
+      //calculate the mirror position of the virtual touch
+      var pageX = this._pinchCenter.pageX + this._pinchCenter.pageX - evt.pageX ,
+          pageY = this._pinchCenter.pageY + this._pinchCenter.pageY - evt.pageY,
+          screenX = this._pinchCenter.screenX + this._pinchCenter.screenX - evt.screenX,
+          screenY = this._pinchCenter.screenY + this._pinchCenter.screenY - evt.screenY,
+          clientX = this._pinchCenter.clientX + this._pinchCenter.clientX - evt.clientX,
+          clientY = this._pinchCenter.clientY + this._pinchCenter.clientY - evt.clientY,
+          virtualTouchIdentifier = this._simtouch_counter + 1;
+
+      virtualTouch = {
+        type: type,
+        target: evt.target,
+        identifier: virtualTouchIdentifier,
+        pageX: pageX,
+        pageY: pageY,
+        screenX: screenX,
+        screenY: screenY,
+        clientX: clientX,
+        clientY: clientY
+      };
+
+      evt.touches = [ realTouch , virtualTouch];
+    }
+    evt.changedTouches = evt.touches;
 
-    evt.changedTouches = evt.touches = [ touch ];
     return evt;
   },
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/ready.js

@@ -56,7 +56,7 @@ SC.mixin({
     },
     done: function() {
       SC.isReady = true;
-      if(window.main && !SC.suppressMain) { main(); }
+      if(window.main && !SC.suppressMain && (SC.mode === SC.APP_MODE)) { main(); }
       SC.RunLoop.end();
     }
   }

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/render_context.js

@@ -607,7 +607,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
   */
   addClass: function(nameOrClasses) {
     if(nameOrClasses === undefined || nameOrClasses === null) {
-      console.warn('You are adding an undefined or empty class'+ this.toString());
+      SC.Logger.warn('You are adding an undefined or empty class'+ this.toString());
       return this;
     }
 
@@ -804,7 +804,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
           this._styles = {};
         } else {
           if (this._cloneStyles) {
-            this._styles = SC.beget(this._styles);
+            this._styles = SC.clone(this._styles);
             this._cloneStyles = NO ;
           }
         }

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/root_responder.js

@@ -1953,7 +1953,7 @@ SC.RootResponder = SC.Object.extend({
       var view = this.targetViewForEvent(evt) ;
       this.sendEvent('animationDidStart', evt, view) ;
     } catch (e) {
-      console.warn('Exception during animationDidStart: %@'.fmt(e)) ;
+      SC.Logger.warn('Exception during animationDidStart: %@'.fmt(e)) ;
       throw e;
     }
 
@@ -1965,7 +1965,7 @@ SC.RootResponder = SC.Object.extend({
       var view = this.targetViewForEvent(evt) ;
       this.sendEvent('animationDidIterate', evt, view) ;
     } catch (e) {
-      console.warn('Exception during animationDidIterate: %@'.fmt(e)) ;
+      SC.Logger.warn('Exception during animationDidIterate: %@'.fmt(e)) ;
       throw e;
     }
 
@@ -1977,7 +1977,7 @@ SC.RootResponder = SC.Object.extend({
       var view = this.targetViewForEvent(evt) ;
       this.sendEvent('animationDidEnd', evt, view) ;
     } catch (e) {
-      console.warn('Exception during animationDidEnd: %@'.fmt(e)) ;
+      SC.Logger.warn('Exception during animationDidEnd: %@'.fmt(e)) ;
       throw e;
     }
 
@@ -1989,7 +1989,7 @@ SC.RootResponder = SC.Object.extend({
       var view = this.targetViewForEvent(evt) ;
       this.sendEvent('transitionDidEnd', evt, view) ;
     } catch (e) {
-      console.warn('Exception during transitionDidEnd: %@'.fmt(e)) ;
+      SC.Logger.warn('Exception during transitionDidEnd: %@'.fmt(e)) ;
       throw e;
     }
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/ready/done.js

@@ -0,0 +1,32 @@
+var realMainFunction, realApplicationMode, timesMainCalled;
+module("SC.onReady.done", {
+  setup: function() {
+    timesMainCalled = 0;
+
+    realMainFunction = window.main;
+    window.main = function() {
+      timesMainCalled += 1;
+    };
+
+    realApplicationMode = SC.mode;
+  },
+
+  teardown: function() {
+    window.main = realMainFunction;
+    SC.mode = realApplicationMode;
+  }
+});
+
+test("When the application is done loading in test mode", function() {
+  SC.mode = SC.TEST_MODE;
+  SC.onReady.done();
+
+  equals(timesMainCalled, 0, "main should not have been called");
+});
+
+test("When the application is done loading in application mode", function() {
+  SC.mode = SC.APP_MODE;
+  SC.onReady.done();
+
+  equals(timesMainCalled, 1, "main should have been called");
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/offset.js

@@ -6,12 +6,13 @@
 
 var pane, view1, view2, view3, view4;
 
-htmlbody('<style> body { height: 1500px; width: 1500px; } </style>');
 
 
 module("SC.offset", {
 
   setup: function() {
+    htmlbody('<style> body { height: 1500px; width: 1500px; } </style>');
+
     var viewportEl;
 
     SC.RunLoop.begin();
@@ -75,6 +76,8 @@ module("SC.offset", {
       pane.remove();
       pane = view1 = view2 = view3 = view4 = null;
     // }
+
+    clearHtmlbody();
   }
 });
 
@@ -265,4 +268,4 @@ test("A regular view with window scroll offset top:100, left: 100", function() {
   SC.RunLoop.begin();
   SC.Timer.schedule({ target: this, action: function() { return testPosition4(element1, element2, element3, element4); }, interval: 200 });
   SC.RunLoop.end();
-});
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/append_remove.js

@@ -6,12 +6,17 @@
 
 /*global module test equals context ok same Q$ htmlbody */
 
-htmlbody('<div id="appendtest"></div>');
-
 // ..........................................................
 // appendTo()
 //
-module("SC.Pane#appendTo");
+module("SC.Pane#appendTo", {
+  setup: function(){
+    htmlbody('<div id="appendtest"></div>');
+  },
+  teardown: function(){
+    clearHtmlbody()
+  }
+});
 
 test("adding to document for first time - appendTo(elem)", function() {
   var pane = SC.Pane.create();

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/layout.js

@@ -22,10 +22,10 @@ module("SC.Pane#layout", {
 });
 
 test("make sure that a call to adjust actually adjusts the view's size", function() {  
-  SC.run(function() {
-    pane.adjust({ width: 100, height: 50 });
-  });
-  
+  SC.RunLoop.begin();
+  pane.adjust({ width: 100, height: 50 });
+  SC.RunLoop.end();
+
   equals(pane.$()[0].style.width, '100px', 'width should have been adjusted');
   equals(pane.$()[0].style.height, '50px', 'height should have been adjusted');
 });

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template_view/collection.js

@@ -1,5 +1,7 @@
 module("SC.TemplateCollectionView");
 
+TemplateTests = {};
+
 test("creating a collection view works", function() {
   var ExampleView = SC.TemplateView.extend({
     tagName: 'li',
@@ -36,30 +38,74 @@ test("a block passed to a collection helper defaults to the content property of
   });
 
   var view = SC.TemplateView.create({
-    template: SC.Handlebars.compile('{{#collection "TemplateTests.CollectionTestView"}} <aside>{{this}}</aside> {{/collection}}')
+    template: SC.Handlebars.compile('{{#collection "TemplateTests.CollectionTestView"}} <aside>{{content}}</aside> {{/collection}}')
   });
 
   view.createLayer();
+
   equals(view.$('li:has(aside:contains("foo")) + li:has(aside:contains("bar")) + li:has(aside:contains("baz"))').length, 1, 'one aside element is created for each content item');
 });
 
-test("a block passed to a collection helper defaults to the content property of the context", function() {
+test("a block passed to a collection helper defaults to the view", function() {
   TemplateTests.CollectionTestView = SC.TemplateCollectionView.create({
     content: ['foo', 'bar', 'baz']
   });
 
   var view = SC.TemplateView.create({
-    template: SC.Handlebars.compile('{{#collection "TemplateTests.CollectionTestView"}} <aside>{{this}}</aside> {{/collection}}')
+    template: SC.Handlebars.compile('{{#collection "TemplateTests.CollectionTestView"}} <aside>{{content}}</aside> {{/collection}}')
   });
 
   view.createLayer();
   equals(view.$('li:has(aside:contains("foo")) + li:has(aside:contains("bar")) + li:has(aside:contains("baz"))').length, 1, 'precond - one aside element is created for each content item');
 
-  window.billy = true;
-
   SC.run(function() {
     TemplateTests.CollectionTestView.set('content', []);
   });
   equals(view.$('aside').length, 0, "all list item views should be removed from DOM");
 });
 
+test("should include an id attribute if id is set in the options hash", function() {
+  var view = SC.TemplateView.create({
+    template: SC.Handlebars.compile('{{#collection "TemplateTests.CollectionTestView" id="baz"}}foo{{/collection}}')
+  });
+
+  view.createLayer();
+  equals(view.$('ul#baz').length, 1, "adds an id attribute");
+});
+
+test("should give its item views the class specified by itemClass", function() {
+  TemplateTests.itemClassTestCollectionView = SC.TemplateCollectionView.create({
+    content: ['foo', 'bar', 'baz']
+  });
+  var view = SC.TemplateView.create({
+    template: SC.Handlebars.compile('{{#collection "TemplateTests.itemClassTestCollectionView" itemClass="baz"}}foo{{/collection}}')
+  });
+
+  view.createLayer();
+  equals(view.$('ul li.baz').length, 3, "adds class attribute");
+});
+
+test("should give its item views the classBinding specified by itemClassBinding", function() {
+  TemplateTests.itemClassBindingTestCollectionView = SC.TemplateCollectionView.create({
+    content: [SC.Object.create({ isBaz: false }), SC.Object.create({ isBaz: true }), SC.Object.create({ isBaz: true })]
+  });
+  var view = SC.TemplateView.create({
+    template: SC.Handlebars.compile('{{#collection "TemplateTests.itemClassBindingTestCollectionView" itemClassBinding="content.isBaz"}}foo{{/collection}}')
+  });
+
+  view.createLayer();
+  equals(view.$('ul li.is-baz').length, 2, "adds class on initial rendering");
+
+  SC.run(function() {
+    TemplateTests.itemClassBindingTestCollectionView.setPath('content.0.isBaz', true);
+  });
+
+  equals(view.$('ul li.is-baz').length, 3, "adds class when property changes");
+
+  SC.run(function() {
+    TemplateTests.itemClassBindingTestCollectionView.setPath('content.0.isBaz', false);
+  });
+
+  equals(view.$('ul li.is-baz').length, 2, "removes class when property changes");
+});
+

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template_view/core.js

@@ -65,3 +65,21 @@ test("template views return YES to mouseDown if there is a mouseUp method", func
 
   ok(view.tryToPerform('mouseDown'), "view returns YES if we add a mouseUp method");
 });
+
+test("should add a 'hidden' class to a template view when isVisible is true", function() {
+  var view = SC.TemplateView.create();
+
+  ok(view.get('isVisible'), "precond - views default to being visible");
+
+  view.set('template', function() { return "foo"; });
+
+  view.createLayer();
+  ok(!view.$().hasClass('hidden'), "does not have hidden class applied");
+
+  SC.run(function() { view.set('isVisible', NO); });
+  ok(view.$().hasClass('hidden'), "adds hidden class when isVisible changes to NO");
+
+  SC.run(function() { view.set('isVisible', YES); });
+  ok(!view.$().hasClass('hidden'), "removes hidden class when isVisible changes to YES");
+});
+

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template_view/handlebars.js

@@ -72,6 +72,22 @@ test("child views can be inserted using the {{view}} Handlebars helper", functio
 
 });
 
+test("should accept relative paths to views", function() {
+  var view = SC.TemplateView.create({
+    template: SC.Handlebars.compile('Hey look, at {{view ".myCool.view"}}'),
+
+    myCool: SC.Object.create({
+      view: SC.TemplateView.create({
+        template: SC.Handlebars.compile("my cool view")
+      })
+    })
+  });
+
+  view.createLayer();
+
+  equals(view.$().text(), "Hey look, at my cool view");
+});
+
 test("child views can be inserted inside a bind block", function() {
   var templates = SC.Object.create({
     nester: SC.Handlebars.compile("<h1 id='hello-world'>Hello {{world}}</h1>{{view \"TemplateTests.LabelView\"}}"),
@@ -131,6 +147,56 @@ test("SC.TemplateView updates when a property changes", function() {
   equals(view.$('#first').text(), "bazam", "view updates when a bound property changes");
 });
 
+test("should not update when a property is removed from the view", function() {
+  var templates = SC.Object.create({
+    foo: SC.Handlebars.compile('<h1 id="first">{{#bind "content"}}{{#bind "foo"}}{{bind "baz"}}{{/bind}}{{/bind}}</h1>')
+  });
+  var removeCalled = 0;
+
+  var view = SC.TemplateView.create({
+    templateName: 'foo',
+    templates: templates,
+
+    content: SC.Object.create({
+      foo: SC.Object.create({
+        baz: "unicorns",
+
+        removeObserver: function(property, func) {
+          sc_super();
+          removeCalled++;
+        }
+      })
+    })
+  });
+
+  view.createLayer();
+
+  equals(view.$('#first').text(), "unicorns", "precond - renders the bound value");
+
+  var oldContent = view.get('content');
+
+  SC.run(function() {
+    view.set('content', SC.Object.create({
+      foo: SC.Object.create({
+        baz: "ninjas"
+      })
+    }));
+  });
+
+  equals(view.$('#first').text(), 'ninjas', "updates to new content value");
+
+  SC.run(function() {
+    oldContent.setPath('foo.baz', 'rockstars');
+  });
+
+  SC.run(function() {
+    oldContent.setPath('foo.baz', 'ewoks');
+  });
+
+  equals(removeCalled, 1, "does not try to remove observer more than once");
+  equals(view.$('#first').text(), "ninjas", "does not update removed object");
+});
+
 
 test("Handlebars templates update properties if a content object changes", function() {
   var templates;
@@ -175,6 +241,90 @@ test("Handlebars templates update properties if a content object changes", funct
   equals(view.$('#price').text(), "$5", "should update price field when price property is changed");
 });
 
+test("Template updates correctly if a path is passed to the bind helper", function() {
+  var templates;
+
+  templates = SC.Object.create({
+    menu: SC.Handlebars.compile('<h1>{{bind "coffee.price"}}</h1>')
+  });
+
+  var view = SC.TemplateView.create({
+    templateName: 'menu',
+    templates: templates,
+
+    coffee: SC.Object.create({
+      price: '$4'
+    })
+  });
+
+  view.createLayer();
+
+  equals(view.$('h1').text(), "$4", "precond - renders price");
+
+  view.setPath('coffee.price', "$5");
+
+  equals(view.$('h1').text(), "$5", "updates when property changes");
+
+  view.set('coffee', { price: "$6" });
+  equals(view.$('h1').text(), "$6", "updates when parent property changes");
+});
+
+test("Template updates correctly if a path is passed to the bind helper and the context object is an SC.ObjectController", function() {
+  var templates;
+
+  templates = SC.Object.create({
+    menu: SC.Handlebars.compile('<h1>{{bind "coffee.price"}}</h1>')
+  });
+
+  var controller = SC.ObjectController.create();
+  var realObject = SC.Object.create({
+    price: "$4"
+  });
+
+  controller.set('content', realObject);
+
+  var view = SC.TemplateView.create({
+    templateName: 'menu',
+    templates: templates,
+
+    coffee: controller
+  });
+
+  view.createLayer();
+
+  equals(view.$('h1').text(), "$4", "precond - renders price");
+
+  realObject.set('price', "$5");
+
+  equals(view.$('h1').text(), "$5", "updates when property is set on real object");
+
+  SC.run(function() {
+    controller.set('price', "$6" );
+  });
+
+  equals(view.$('h1').text(), "$6", "updates when property is set on object controller");
+});
+
+test("Should insert a localized string if the {{loc}} helper is used", function() {
+  SC.stringsFor('en', {
+    'Brazil': 'Brasilia'
+  });
+
+  templates = SC.Object.create({
+    'loc': SC.Handlebars.compile('<h1>Country: {{loc "Brazil"}}')
+  });
+
+  var view = SC.TemplateView.create({
+    templateName: 'loc',
+    templates: templates,
+
+    country: 'Brazil'
+  });
+
+  view.createLayer();
+  equals(view.$('h1').text(), 'Country: Brasilia', "returns localized value");
+});
+
 test("Template views return a no-op function if their template cannot be found", function() {
   var view = SC.TemplateView.create({
     templateName: 'cantBeFound'
@@ -293,3 +443,114 @@ test("Collection views that specify an example view class have their children be
 
   ok(parentView.childViews[0].childViews[0].isCustom, "uses the example view class");
 });
+
+test("should update boundIf blocks if the conditional changes", function() {
+  var templates = SC.Object.create({
+   foo: SC.Handlebars.compile('<h1 id="first">{{#boundIf "content.myApp.isEnabled"}}{{content.wham}}{{/boundIf}}</h1>')
+  });
+
+  var view = SC.TemplateView.create({
+    templateName: 'foo',
+    templates: templates,
+
+    content: SC.Object.create({
+      wham: 'bam',
+      thankYou: "ma'am",
+      myApp: SC.Object.create({
+        isEnabled: YES
+      })
+    })
+  });
+
+  view.createLayer();
+
+  equals(view.$('#first').text(), "bam", "renders block when condition is true");
+
+  SC.run(function() { view.get('content').setPath('myApp.isEnabled', NO); });
+
+  equals(view.$('#first').text(), "", "re-renders without block when condition is false");
+});
+
+test("{{view}} id attribute should set id on layer", function() {
+  var templates = SC.Object.create({
+    foo: SC.Handlebars.compile('{{#view "TemplateTests.IdView" id="bar"}}baz{{/view}}')
+  });
+
+  TemplateTests.IdView = SC.TemplateView.create();
+
+  var view = SC.TemplateView.create({
+    templateName: 'foo',
+    templates: templates
+  });
+
+  view.createLayer();
+
+  equals(view.$('#bar').length, 1, "adds id attribute to layer");
+  equals(view.$('#bar').text(), 'baz', "emits content");
+});
+
+test("{{view}} class attribute should set class on layer", function() {
+  var templates = SC.Object.create({
+    foo: SC.Handlebars.compile('{{#view "TemplateTests.IdView" class="bar"}}baz{{/view}}')
+  });
+
+  TemplateTests.IdView = SC.TemplateView.create();
+
+  var view = SC.TemplateView.create({
+    templateName: 'foo',
+    templates: templates
+  });
+
+  view.createLayer();
+
+  equals(view.$('.bar').length, 1, "adds class attribute to layer");
+  equals(view.$('.bar').text(), 'baz', "emits content");
+});
+
+test("should be able to bind view class names to properties", function() {
+  var templates = SC.Object.create({
+    template: SC.Handlebars.compile('{{#view "TemplateTests.classBindingView" classBinding="isDone"}}foo{{/view}}')
+  });
+
+  TemplateTests.classBindingView = SC.TemplateView.create({
+    isDone: YES
+  });
+
+  var view = SC.TemplateView.create({
+    templateName: 'template',
+    templates: templates
+  });
+
+  view.createLayer();
+
+  equals(view.$('.is-done').length, 1, "dasherizes property and sets class name");
+
+  SC.run(function() {
+    TemplateTests.classBindingView.set('isDone', NO);
+  });
+
+  equals(view.$('.is-done').length, 0, "removes class name if bound property is set to false");
+});
+
+test("should be able to bind element attributes using {{bindAttr}}", function() {
+  var template = SC.Handlebars.compile('<img {{bindAttr src="content.url" alt="content.title"}}>');
+
+  var view = SC.TemplateView.create({
+    template: template,
+    content: SC.Object.create({
+      url: "http://www.sproutcore.com/assets/images/logo.png",
+      title: "The SproutCore Logo"
+    })
+  });
+
+  view.createLayer();
+
+  equals(view.$('img').attr('src'), "http://www.sproutcore.com/assets/images/logo.png", "sets src attribute");
+  equals(view.$('img').attr('alt'), "The SproutCore Logo", "sets alt attribute");
+
+  SC.run(function() {
+    view.setPath('content.title', "El logo de Esproutcore");
+  });
+
+  equals(view.$('img').attr('alt'), "El logo de Esproutcore", "updates alt attribute when content's title attribute changes");
+});