sproutcore 1.6.0.beta.1 → 1.6.0.beta.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+*SproutCore 1.6.0.beta.2 (May 10, 2011)*
+
+* Framework updates
+* Less noisy packager task
+
+
 *SproutCore 1.6.0.beta.1 (May 8, 2011)*
 
 * Better dependencies for Windows
@@ -6,6 +12,7 @@
 * Uses newer version of Thin
 * Uses newer version of YUI Compressor
 
+
 *SproutCore 1.5.0 (April 19, 2011)*
 
 * Fixed description for init, docs and gen tasks
@@ -18,6 +25,7 @@
 
 * Fixed a compatibility issue with Windows environments
 
+
 *SproutCore 1.5.0.rc.1 (April 1, 2011)*
 
 * Made it possible to share index.html across multiple languages vs. duplicating it for each.

data/Rakefile

@@ -56,5 +56,7 @@ begin
     t.resource_files = ["vendor", "VERSION.yml"]
   end
 rescue LoadError
-  puts "`gem install packager` for packaging tasks"
+  if Rake.application.options.show_tasks
+    puts "`gem install packager` for packaging tasks"
+  end
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 6
-:patch: 0.beta.1
+:patch: 0.beta.2

data/lib/frameworks/sproutcore/CHANGELOG.md

@@ -2,6 +2,13 @@
 CHANGE LOG FOR 1.6
 ==================
 
+1.6.0.beta.2
+------------
+* Allow native touch scrolling inside an SC.TemplatePane.
+* Add SC.Button template control.
+* Created SC.TextField and SC.Checkbox views to eventually replace the *Support mixins.
+
+
 1.6.0.beta.1
 ------------
 * Bugfixes to synchronization between SproutCore RecordArray/ManyArray/ChildArray and TemplateCollectionView

data/lib/frameworks/sproutcore/frameworks/core_foundation/controls/button.js

@@ -0,0 +1,49 @@
+sc_require('views/template');
+
+SC.Button = SC.TemplateView.extend({
+  classNames: ['sc-button'],
+
+  // Setting isActive to true will trigger the classBinding and add
+  // 'is-active' to our layer's class names.
+  mouseDown: function() {
+    this.set('isActive', true);
+    this._isMouseDown = YES;
+  },
+
+  mouseExited: function() {
+    this.set('isActive', false);
+  },
+
+  mouseEntered: function() {
+    if (this._isMouseDown) {
+      this.set('isActive', true);
+    }
+  },
+
+  // Setting isActive to false will remove 'is-active' from our
+  // layer's class names.
+  mouseUp: function(event) {
+    if (this.get('isActive')) {
+      var action = this.get('action'),
+          target = this.get('target') || null,
+          rootResponder = this.getPath('pane.rootResponder');
+
+      if (action && rootResponder) {
+        rootResponder.sendAction(action, target, this, this.get('pane'), null, this);
+      }
+
+      this.set('isActive', false);
+    }
+
+    this._isMouseDown = NO;
+  },
+
+  touchStart: function(touch) {
+    this.mouseDown(touch);
+  },
+
+  touchEnd: function(touch) {
+    this.mouseUp(touch);
+  }
+});
+

data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/checkbox_support.js

@@ -4,9 +4,44 @@
 //            ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+
+sc_require('views/template');
+
 /** @class */
 
-SC.CheckboxSupport = /** @scope SC.CheckboxSupport.prototype */{
+SC.Checkbox = SC.TemplateView.extend(
+  /** @scope SC.Checkbox.prototype */ {
+
+  title: null,
+  value: null,
+
+  classNames: ['sc-checkbox'],
+  template: SC.Handlebars.compile('<label><input type="checkbox">{{title}}</label>'),
+
+  didCreateLayer: function() {
+    var self = this;
+
+    this.$('input').bind('change', function() {
+      self.domValueDidChange(this);
+    });
+  },
+
+  domValueDidChange: function(node) {
+    this.set('value', !!$(node).attr('checked'));
+  },
+
+  value: function(key, value) {
+    if (value !== undefined) {
+      this.$('input').attr('checked', value);
+    } else {
+      value = this.$('input').attr('checked');
+    }
+
+    return value;
+  }.property()
+});
+
+SC.CheckboxSupport = /** @scope SC.CheckboxSupport */{
   didCreateLayer: function() {
     this.$('input').change(jQuery.proxy(function() {
       SC.RunLoop.begin();

data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/text_field_support.js

@@ -4,11 +4,109 @@
 //            ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/** @class
 
-*/
-SC.TextFieldSupport = /** @scope SC.TextFieldSupport.prototype */{
-  
+sc_require('views/template');
+
+/** @class */
+
+SC.TextField = SC.TemplateView.extend(
+  /** @scope SC.TextField.prototype */ {
+
+  classNames: ['sc-text-field'],
+
+  // we can't use bindAttr because of a race condition:
+  //
+  // when `value` is set, the bindAttr observer immediately calls
+  // `get` in order to persist it to the DOM, but because we made
+  // the `value` property idempotent, when it gets called by
+  // bindAttr, it fetches the not-yet-updated value from the DOM
+  // and returns it.
+  //
+  // In short, because we need to be able to catch changes to the
+  // DOM made directly, we cannot also rely on bindAttr to update
+  // the property: a chicken-and-egg problem.
+  template: SC.Handlebars.compile('<input type="text">'),
+
+  didCreateLayer: function() {
+    var self = this;
+
+    var input = this.$('input');
+    input.val(this._value);
+
+    SC.Event.add(input, 'focus', this, this.focusIn);
+    SC.Event.add(input, 'blur', this, this.focusOut);
+
+    this.$('input').bind('change', function() {
+      self.domValueDidChange(SC.$(this));
+    });
+  },
+
+  /**
+    The problem this property is trying to solve is twofold:
+
+    1. Make it possible to set the value of a text field that has
+       not yet been inserted into the DOM
+    2. Make sure that `value` properly reflects changes made directly
+       to the element's `value` property.
+
+    In order to achieve (2), we need to make the property volatile,
+    so that SproutCore will call the getter no matter what if get()
+    is called.
+
+    In order to achieve (1), we need to store a local cache of the
+    value, so that SproutCore can set the proper value as soon as
+    the underlying DOM element is created.
+  */
+  value: function(key, value) {
+    var input = this.$('input');
+
+    if (value !== undefined) {
+      this._value = value;
+      input.val(value);
+    } else if (input.length) {
+      if(window.billy) { debugger; }
+      this._value = value = input.val();
+    } else {
+      if(window.billy) { debugger; }
+      value = this._value;
+    }
+
+    return value;
+  }.property().idempotent(),
+
+  domValueDidChange: function(jquery) {
+    this.set('value', jquery.val());
+  },
+
+  focusIn: function(event) {
+    this.becomeFirstResponder();
+    this.tryToPerform('focus', event);
+  },
+
+  focusOut: function(event) {
+    this.resignFirstResponder();
+    this.tryToPerform('blur', event);
+  },
+
+  willLoseFirstResponder: function() {
+    this.notifyPropertyChange('value');
+  },
+
+  keyUp: function(evt) {
+    this.domValueDidChange(this.$('input'));
+
+    if (evt.keyCode === 13) {
+      return this.insertNewline(evt);
+    } else if (evt.keyCode === 27) {
+      return this.cancel(evt);
+    }
+
+    return true;
+  }
+});
+
+SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
+
   /** @private
     Used internally to store value because the layer may not exist
   */

data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/template.js

@@ -16,7 +16,19 @@
     })
   }
 */
-SC.TemplatePane = SC.Object.extend({});
+SC.TemplatePane = SC.Object.extend({
+  touchStart: function(touch) {
+    touch.allowDefault();
+  },
+
+  touchesDragged: function(evt, touches) {
+    evt.allowDefault();
+  },
+
+  touchEnd: function(touch) {
+    touch.allowDefault();
+  }
+});
 
 SC.mixin(SC.TemplatePane, {
   append: function(attrs) {

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controls/button.js

@@ -0,0 +1,78 @@
+var button;
+
+module("SC.Button", {
+  setup: function() {
+    button = SC.Button.create();
+
+    pane = SC.MainPane.create({
+      childViews: [button]
+    });
+    pane.append();
+  },
+
+  teardown: function() {
+    pane.remove();
+  }
+});
+
+function synthesizeEvent(type, view) {
+  var event = new SC.Event({
+    type: type,
+    target: view.get('layer')
+  });
+  SC.RootResponder.responder[type](event);
+}
+
+test("should trigger an action when clicked", function() {
+  var wasClicked = false;
+
+  var actionObject = SC.Object.create({
+    myAction: function() {
+      wasClicked = true;
+    }
+  });
+
+  button.target = actionObject;
+  button.action = 'myAction';
+
+  synthesizeEvent('mousedown', button);
+  synthesizeEvent('mouseup', button);
+
+  ok(wasClicked);
+});
+
+test("should not trigger action if mouse leaves area before mouseup", function() {
+  var wasClicked = false;
+
+  var actionObject = SC.Object.create({
+    myAction: function() {
+      wasClicked = true;
+    }
+  });
+
+  var otherButton = SC.Button.create();
+  pane.appendChild(otherButton);
+
+  button.target = actionObject;
+  button.action = 'myAction';
+
+  synthesizeEvent('mousedown', button);
+  synthesizeEvent('mousemove', button);
+  ok(button.get('isActive'), "becomes active when hovered");
+  synthesizeEvent('mousemove', otherButton);
+  ok(!button.get('isActive'), "loses active state if mouse exits");
+  synthesizeEvent('mouseup', button);
+
+  ok(!wasClicked);
+
+  wasClicked = false;
+
+  synthesizeEvent('mousedown', button);
+  synthesizeEvent('mousemove', button);
+  synthesizeEvent('mousemove', otherButton);
+  synthesizeEvent('mousemove', button);
+  synthesizeEvent('mouseup', button);
+
+  ok(wasClicked);
+});
+

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/template_helpers/checkbox_support.js

@@ -34,5 +34,31 @@
     checkboxView.set('value', true);
     ok(checkboxView.$('input').attr("checked"), "sets value of DOM to value property");
   });
+
+  module("SC.Checkbox", {
+    setup: function() {
+      checkboxView = SC.Checkbox.create({});
+
+      pane = SC.MainPane.create({
+        childViews: [checkboxView]
+      });
+      pane.append();
+    },
+
+    teardown: function() {
+      pane.remove();
+    }
+  });
+
+  test("value property mirrors input value", function() {
+    checkboxView.$('input').attr('checked', true);
+
+    equals(checkboxView.get('value'), true, "gets value property from DOM");
+
+    checkboxView.$('input').attr('checked', false);
+
+    checkboxView.set('value', true);
+    ok(checkboxView.$('input').attr("checked"), "sets value of DOM to value property");
+  });
 })();
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/template_helpers/text_field_support.js

@@ -100,4 +100,94 @@
     equals(cancelCalled, 1, "calls cancel after pressing escape key");
 
   });
+
+  module("SC.TextField", {
+    setup: function() {
+      TestObject = window.TestObject = SC.Object.create({
+        value: null
+      });
+
+      textFieldView = SC.TextField.create();
+
+      pane = SC.MainPane.create({
+        childViews: [textFieldView]
+      });
+      pane.append();
+    },
+
+    teardown: function() {
+      pane.remove();
+      TestObject = window.TestObject = textFieldView = pane = null;
+    }
+  });
+
+  test("value property mirrors input value", function() {
+    textFieldView.$('input').val('foo bar');
+
+    equals(textFieldView.get('value'), 'foo bar', "gets value property from DOM");
+
+    textFieldView.set('value', "afterlife");
+    equals(textFieldView.$('input').val(), "afterlife", "sets value of DOM to value property");
+  });
+
+  test("value binding works properly for inputs that haven't been created", function() {
+    var view = SC.TextField.create({
+      valueBinding: 'TestObject.value'
+    });
+
+    equals(view.get('value'), null, "precond - default value is null");
+    equals(view.$('input').length, 0, "precond - view doesn't have its layer created yet, thus no input element");
+
+    SC.run(function() { TestObject.set('value', 'ohai'); });
+
+    equals(view.get('value'), 'ohai', "value property was properly updated");
+
+    SC.run(function() { pane.appendChild(view); });
+
+    equals(view.get('value'), 'ohai', "value property remains the same once the view has been appended");
+    equals(view.$('input').val(), 'ohai', "value is reflected in the input element once it is created");
+  });
+
+  test("listens for focus and blur events", function() {
+    var focusCalled = 0;
+    var blurCalled = 0;
+
+    textFieldView.focus = function() {
+      focusCalled++;
+    };
+    textFieldView.blur = function() {
+      blurCalled++;
+    };
+
+    equals(focusCalled+blurCalled, 0, "precond - no callbacks called yet");
+
+    textFieldView.$('input').focus();
+    equals(focusCalled, 1, "focus called after field receives focus");
+
+    textFieldView.$('input').blur();
+    equals(blurCalled, 1, "blur alled after field blurs");
+  });
+
+  test("calls correct method for key events", function() {
+    var insertNewlineCalled = 0;
+    var cancelCalled = 0;
+
+    textFieldView.insertNewline = function() {
+      insertNewlineCalled++;
+      return YES;
+    };
+    textFieldView.cancel = function() {
+      cancelCalled++;
+      return YES;
+    };
+
+    textFieldView.$('input').focus();
+    equals(insertNewlineCalled+cancelCalled, 0, "precond - no callbacks called yet");
+
+    SC.RootResponder.responder.keyup(new SC.Event({ type: 'keyup', keyCode: 13 }));
+    equals(insertNewlineCalled, 1, "calls insertNewline after hitting return");
+
+    SC.RootResponder.responder.keyup(new SC.Event({ type: 'keyup', keyCode: 27 }));
+    equals(cancelCalled, 1, "calls cancel after pressing escape key");
+  });
 })();

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

@@ -3,6 +3,7 @@ sc_require("ext/handlebars/bind");
 sc_require("ext/handlebars/collection");
 sc_require("ext/handlebars/localization");
 sc_require("ext/handlebars/view");
+sc_require("views/view");
 
 // Global hash of shared templates. This will automatically be populated
 // by the build tools so that you can store your Handlebars templates in

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

@@ -1,3 +1,4 @@
+sc_require('mixins/delegate_support');
 
 /** @class */
 SC.CoreView = SC.Responder.extend(SC.DelegateSupport);

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

@@ -36,7 +36,7 @@ if (typeof console === 'undefined') {
 // rest of the methods go into the mixin defined below.
 
 /**
-  @version 1.6.0.beta.1
+  @version 1.6.0.beta.2
   @namespace
 
   All SproutCore methods and functions are defined
@@ -57,7 +57,7 @@ if (typeof console === 'undefined') {
 window.SC = window.SC || {} ;
 window.SproutCore = window.SproutCore || SC ;
 
-SC.VERSION = '1.6.0.beta.1';
+SC.VERSION = '1.6.0.beta.2';
 
 /**
   @private

metadata

@@ -2,7 +2,7 @@
 name: sproutcore
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.6.0.beta.1
+  version: 1.6.0.beta.2
 platform: ruby
 authors: 
 - Strobe, Inc., Apple Inc. and contributors
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 Z
+date: 2011-05-10 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -958,6 +959,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/controllers/controller.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/controllers/object.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/controls/button.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/core.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/ext/function.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/ext/handlebars/bind.js
@@ -1016,6 +1018,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/multiple_case.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/single_case.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/single_enumerable_case.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/controls/button.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/responder_context.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/string.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/template_helpers/checkbox_support.js
@@ -2296,6 +2299,7 @@ files:
 - lib/frameworks/sproutcore/themes/legacy_theme/Source/icons/48/19.png
 - lib/frameworks/sproutcore/themes/legacy_theme/Source/icons/48/2.png
 - lib/frameworks/sproutcore/themes/legacy_theme/theme.js
+has_rdoc: true
 homepage: http://www.sproutcore.com
 licenses: []
 
@@ -2321,7 +2325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sproutcore
-rubygems_version: 1.7.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: SproutCore is a platform for building native look-and-feel applications on the web