sproutcore 1.6.0.1-java → 1.7.1.beta-java

data/lib/frameworks/sproutcore/frameworks/desktop/system/drag.js

@@ -279,7 +279,7 @@ SC.Drag = SC.Object.extend(
     // if all else fails, check to see if the source object is a data source.
     } else {
       var source = this.get('source') ;
-      if (source && SC.typeOf(source.dragDataForType) == SC.T_FUNCTION) {
+      if (source && SC.typeOf(source.dragDataForType) === SC.T_FUNCTION) {
         return source.dragDataForType(this, dataType) ;
         
       // no data source found. :(
@@ -701,7 +701,8 @@ SC.Drag = SC.Object.extend(
       if (!ret) {
         ret = 1 ;
         while (x = x.get('parentView')) {
-          if (dropTargets[SC.guidFor(x)] !== undefined) ret++ ;
+          if (dropTargets[SC.guidFor(x)] !== undefined) ret = ret+1 ;
+          if(x.isPane && x.isMainPane) ret = ret+10000; // Arbitrary value always have the main pain on top
         }
         depth[guid] = ret ;
       }
@@ -902,7 +903,7 @@ SC.Drag = SC.Object.extend(
     ret = ret.sort(function(a,b) {
       var view = a;
       while (view = view.get('parentView')) {
-        if (b == view) return -1 ;
+        if (b === view) return -1 ;
       }
       return 1; 
     }) ;

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/ui.js

@@ -17,7 +17,11 @@ var items = [
   { separator: YES },
   { title: 'Selected Menu Item…', isChecked: YES, keyEquivalent: 'ctrl_shift_o' },
   { title: 'Item with Submenu', subMenu: [{ title: 'Submenu item 1' }, { title: 'Submenu item 2'}] },
-  { title: 'Disabled Menu Item', isEnabled: NO }//,
+  { title: 'Disabled Menu Item', isEnabled: NO },
+  { separator: YES },
+  { title: 'Unique Menu Item Class Per Item', exampleView: SC.MenuItemView.extend({
+      classNames: 'custom-menu-item'.w()
+    }) }
   // { isSeparator: YES },
   // { groupTitle: 'Menu Label', items: [{ title: 'Nested Item' }, { title: 'Nested Item' }] }
 ];
@@ -166,6 +170,15 @@ test('Custom MenuItemView Class', function() {
   menu2.remove();
 });
 
+
+test('Custom MenuItemView Class on an item using itemExampleViewKey', function() {
+  equals(menu.get('exampleView'), SC.MenuItemView, 'SC.MenuPane should generate SC.MenuItemViews by default');
+  menu.popup();
+  ok(menu.$('.custom-menu-item').length === 1, 'SC.MenuPane should generate one instance of a custom class if the item has an exampleView property');
+  ok($($('.sc-menu-item')[11]).hasClass('custom-menu-item'), 'The last menu item should have a custom class');
+  menu.remove();
+});
+
 test('Basic Submenus', function() {
   var smallMenu = SC.MenuPane.create({
     controlSize: SC.SMALL_CONTROL_SIZE,
@@ -227,13 +240,13 @@ test('Automatic Closing', function() {
 
 test('keyEquivalents', function() {
   var keyEquivalents = menu._keyEquivalents;
-  
-  // verify that keyEquivalents were mapped correctly and that multiple 
+
+  // verify that keyEquivalents were mapped correctly and that multiple
   // keyEquivalents work
   menu.items.forEach(function(item) {
     var keyEq = item.keyEquivalent, idx, len;
     if(!keyEq) return;
-    
+
     if(SC.typeOf(keyEq)===SC.T_ARRAY) {
       for(idx=0,len=keyEq.length;idx<len;idx++) {
         ok(keyEquivalents[keyEq[idx]], "keyEquivalent should map to " + keyEq[idx]);

data/lib/frameworks/sproutcore/frameworks/desktop/views/collection.js

@@ -2158,13 +2158,6 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
 
     if(!this.get('isSelectable')) return NO;
 
-    info = this.mouseDownInfo = {
-      event:        ev,
-      itemView:     itemView,
-      contentIndex: contentIndex,
-      at:           Date.now()
-    };
-
     // become first responder if possible.
     this.becomeFirstResponder() ;
 
@@ -2207,6 +2200,13 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
     sel = this.get('selection');
     if (sel) sel = sel.indexSetForSource(content);
 
+    info = this.mouseDownInfo = {
+      event:        ev,
+      itemView:     itemView,
+      contentIndex: contentIndex,
+      at:           Date.now()
+    };
+
     isSelected = sel ? sel.contains(contentIndex) : NO;
     info.modifierKeyPressed = modifierKeyPressed = ev.ctrlKey || ev.metaKey ;
 

data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_item.js

@@ -54,7 +54,7 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
     @default YES
   */
   acceptsFirstResponder: YES,
-  
+
   /**
     IE only attribute to block bluring of other controls
 
@@ -140,7 +140,8 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
           isModal: NO,
           isSubMenu: YES,
           parentMenu: parentMenu,
-          controlSize: parentMenu.get('controlSize')
+          controlSize: parentMenu.get('controlSize'),
+          exampleView: parentMenu.get('exampleView')
         });
       }
     }
@@ -302,7 +303,7 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
 
   /**
     The title from the content property.
-    
+
     @field
     @type String
     @observes content.title
@@ -470,9 +471,10 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
     }
 
     if(this.get('hasSubMenu')) {
-      this._subMenuTimer = this.invokeLater(this.showSubMenu,100) ;
+      this._subMenuTimer = this.invokeLater(this.showSubMenu, 100) ;
     }
-	  return YES ;
+
+	  return YES;
   },
 
   /** @private

data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js

@@ -1095,7 +1095,16 @@ SC.ScrollView = SC.View.extend({
     if (gen !== this.touchGeneration) return;
     
     var touch = this.touch, itemView;
-    if (touch && this.tracking && !this.dragging && !touch.touch.scrollHasEnded) {
+        
+    // NOTE!  On iPad it is possible that the timer set in touchStart() will not have yet fired and that touchEnd() will
+    // come in in the same Run Loop as the one that started with the call to touchStart().  The bad thing that happens is that 
+    // even though we cleared this.touch, occasionally if touchEnd() comes in right at the end of the Run Loop and
+    // then the timer expires and starts a new Run Loop to call beginTouchesInContent(), that this.touch will STILL exist
+    // here.  There's no explanation for it, and it's not 100% reproducible, but what happens is that if we try to capture
+    // the touch that has already ended, assignTouch() in RootResponder will check touch.hasEnded and throw an exception.
+    
+    // Therefore, don't capture a touch if the touch still exists and hasEnded
+    if (touch && this.tracking && !this.dragging && !touch.touch.scrollHasEnded && !touch.touch.hasEnded) {
       // try to capture the touch
       touch.touch.captureTouch(this, YES);
       
@@ -1270,8 +1279,8 @@ SC.ScrollView = SC.View.extend({
         positionInContentY = ((this._scroll_verticalScrollOffset||0) + touchYInFrame) / this._scale;
     
     // calculate deltas
-    var deltaX = positionInContentX - touch.startTouchOffset.x,
-        deltaY = positionInContentY - touch.startTouchOffset.y;
+    var deltaX = positionInContentX - touch.startTouchOffsetInContent.x,
+        deltaY = positionInContentY - touch.startTouchOffsetInContent.y;
     
     var isDragging = touch.dragging;
     if (!touch.scrolling.x && Math.abs(deltaX) > touch.scrollTolerance.x && touch.enableScrolling.x) {

data/lib/frameworks/sproutcore/frameworks/desktop/views/web.js

@@ -7,8 +7,8 @@
 
 /** @class
 
-  Used to display an iframe. The source, (specified by the value property) of 
-  the iFrame should be from the same domain. (i.e. the src / value should be 
+  Used to display an iframe. The source, (specified by the value property) of
+  the iFrame should be from the same domain. (i.e. the src / value should be
   from the same domain) if you want to access the contents of the iframe.
 
   @extends SC.View
@@ -17,7 +17,7 @@
 */
 SC.WebView = SC.View.extend(SC.Control, {/** @scope SC.WebView.prototype */
   classNames: 'sc-web-view',
-  
+
   /**
     @type Array
     @default ['value', 'shouldAutoResize']
@@ -27,7 +27,7 @@ SC.WebView = SC.View.extend(SC.Control, {/** @scope SC.WebView.prototype */
 
   /**
     The content of the iframe can be bigger than the size specifed when creating
-    the view. If you want the view to be auto-resized to the dimensions of the 
+    the view. If you want the view to be auto-resized to the dimensions of the
     iframe, then set the value of this property to YES.
     The web view can be auto resized only if the contents are from the same
     domain as the parent domain.
@@ -43,23 +43,23 @@ SC.WebView = SC.View.extend(SC.Control, {/** @scope SC.WebView.prototype */
   */
   render: function(context, firstTime) {
     var src = this.get('value'), iframe;
-    
+
     if (firstTime) {
-      context.push('<iframe src="' + src + 
+      context.push('<iframe src="' + src +
       '" style="position: absolute; width: 100%; height: 100%; border: 0px; margin: 0px; padding: 0px;"></iframe>');
-    } 
+    }
     else if(src!==this._lastSrc) {
       iframe = this.$('iframe');
       // clear out the previous src, to force a reload
       iframe.attr('src', 'javascript:;');
       iframe.attr('src', src);
     }
-    
+
     this._lastSrc = src;
   },
 
   /**
-    Called when the layer gets created. 
+    Called when the layer gets created.
   */
   didCreateLayer: function() {
     var f = this.$('iframe');
@@ -67,16 +67,25 @@ SC.WebView = SC.View.extend(SC.Control, {/** @scope SC.WebView.prototype */
     SC.Event.add(f, 'load', this, this.iframeDidLoad);
   },
 
+  /**
+    Called before the layer gets destroyed.
+  */
+  willDestroyLayer: function() {
+    var f = this.$('iframe');
+    // Remove the onload event so that the iframe can be released
+    SC.Event.remove(f, 'load', this, this.iframeDidLoad);
+  },
 
   /**  @private
     Called when iframe onload event is fired.
-    1. Resizes the view to fit the contents of the iframe using the 
+    1. Resizes the view to fit the contents of the iframe using the
     scroll width and scroll height of the contents of the iframe
-  
+
     The iframe contents can be accessed only when the src is from the same
     domain as the parent document
   */
   iframeDidLoad: function() {
+
     //fit the iframe to size of the contents.
     if (this.get('shouldAutoResize') === YES) {
       var contentWindow;
@@ -85,13 +94,13 @@ SC.WebView = SC.View.extend(SC.Control, {/** @scope SC.WebView.prototype */
         contentWindow = iframeElt.contentWindow;
         if(contentWindow && contentWindow.document && contentWindow.document.documentElement){
           var docElement = contentWindow.document.documentElement;
-          // setting the width before the height gives more accurate results.. 
+          // setting the width before the height gives more accurate results..
           // atleast for the test iframe content i'm using.
           //TODO: try out document flows other than top to bottom.
           if (!SC.browser.isIE) {
             this.$().width(docElement.scrollWidth);
-            this.$().height(docElement.scrollHeight);          
-          } 
+            this.$().height(docElement.scrollHeight);
+          }
           else {
             this.$().width(docElement.scrollWidth + 12);
             this.$().height(docElement.scrollHeight + 5);

data/lib/frameworks/sproutcore/frameworks/experimental/Buildfile

@@ -2,9 +2,13 @@ config :designer, :required => [:runtime, :foundation, :desktop]
 
 config :forms, :required => :desktop
 
+config :scroll_view, :required => [:runtime, :foundation, :desktop]
+
+config :menu, :required => [:'experimental/scroll_view']
+
 config :greenhouse,
   :required => [:sproutcore, :designer, :statechart],
   :theme => :ace,
   :css_theme => 'ace.greenhouse'
 
-config :polymorphism, :required => :datastore
+config :polymorphism, :required => :datastore

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/render_delegates/menu_scroller.js

@@ -0,0 +1,28 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+
+SC.BaseTheme.menuScrollerRenderDelegate = SC.RenderDelegate.create({
+  className: 'menu-scroller',
+
+  render: function (dataSource, context) {
+    this.addSizeClassName(dataSource, context);
+    context.addClass({
+      'sc-vertical': YES,
+      disabled: !dataSource.get('isEnabled')
+    });
+    context.push('<span class="scrollArrow ' + (dataSource.get('scrollDown') ? 'arrowDown' : 'arrowUp') + '">&nbsp;</span>');
+  },
+
+  update: function (dataSource, context) {
+    this.addSizeClassName(dataSource, context);
+    context.addClass({
+      'sc-vertical': YES,
+      disabled: !dataSource.get('isEnabled')
+    });
+  }
+});

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/tests/menu/scroll.js

@@ -0,0 +1,235 @@
+// ==========================================================================
+// Project:   SC.MenuScrollView Unit Test
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*globals SC module test ok equals same stop start */
+ 
+var view, pane;
+module("Menu Scroll View", {
+  setup: function () {
+    SC.RunLoop.begin();
+
+    var content = ['Dogfish Head',
+                   'Delerium',
+                   'Smuttynose',
+                   'Harpoon',
+                   'Bitburger',
+                   'Goose Island',
+                   'Old Speckled Hen',
+                   'Fuller\'s',
+                   'Anchor',
+                   'Brooklyn',
+                   'Lagunitas',
+                   'Coney Island'];
+
+    view = SC.MenuScrollView.create({
+      layout: { top: 100, left: 20, height: 100, width: 100 },
+      contentView: SC.SourceListView.design({
+        content: content
+      })
+    });
+
+    pane = SC.MainPane.create();
+    pane.appendChild(view);
+    pane.append();
+
+    SC.RunLoop.end();
+  },
+
+  teardown: function () {
+    SC.RunLoop.begin();
+    pane.remove();
+    pane.destroy();
+    SC.RunLoop.end();
+  }
+});
+
+test("menu scroll views cannot scroll horizontally", function () {
+  ok(!view.get('hasHorizontalScroller'),
+     "the horizontal scroller doesn't exist");
+  ok(!view.get('isHorizontalScrollerVisible'),
+     "the horizontal scroller shouldn't be visible");
+});
+
+test("vertical scroll views cannot scroll horizontally", function () {
+  ok(view.get('hasVerticalScroller'),
+     "the vertical scroller should exist");
+});
+
+test("menu scrollers not visible when content doesn't fill the container", function () {
+  SC.RunLoop.begin();
+  view.setPath('contentView.content', []);
+  SC.RunLoop.end();
+
+  equals(view.getPath('verticalScrollerView.isVisible'), NO,
+         "the top vertical scroller shouldn't be visible");
+  equals(view.getPath('verticalScrollerView2.isVisible'), NO,
+         "the bottom vertical scroller shouldn't be visible");
+});
+
+test("initially, only the bottom menu scroller should be visible", function () {
+  equals(view.getPath('verticalScrollerView.isVisible'), NO,
+         "the top scroller shouldn't be visible");
+  equals(view.getPath('verticalScrollerView2.isVisible'), YES,
+         "the bottom scroller should be visible");
+});
+
+// ..........................................................
+// autohidesVerticalScrollers => YES
+//
+
+// Top scroller visibility
+test("when setting `verticalScrollOffset` to anywhere before the scroller thickness, the top scroller will become invisible", function () {
+  view.scrollTo(0, 50);
+
+  ok(view.getPath('verticalScrollerView.isVisible'),
+     "top scroller should be visible");
+
+  view.scrollTo(0, view.getPath('verticalScrollerView.scrollerThickness'));
+  equals(view.get('verticalScrollOffset'), 0,
+         "view should be at 0px scroll offset");
+  ok(!view.getPath('verticalScrollerView.isVisible'),
+     "top scroller should NOT be visible");
+
+  view.scrollTo(0, 50);
+  ok(view.getPath('verticalScrollerView.isVisible'),
+     "top scroller should be visible");
+
+  view.scrollTo(0, view.getPath('verticalScrollerView.scrollerThickness') + 1);
+  ok(view.getPath('verticalScrollerView.isVisible'),
+     "top scroller should be visible");
+
+  view.scrollTo(0, 50);
+  ok(view.getPath('verticalScrollerView.isVisible'),
+     "top scroller should be visible");
+
+  view.scrollTo(0, view.getPath('verticalScrollerView.scrollerThickness') - 1);
+  ok(!view.getPath('verticalScrollerView.isVisible'),
+     "top scroller should NOT be visible");
+});
+
+// Bottom scroller visibility
+test("when setting `verticalScrollOffset` to anywhere before the scroller thickness, the bottom scroller will become invisible", function () {
+  var max = view.get('maximumVerticalScrollOffset');
+  ok(view.getPath('verticalScrollerView2.isVisible'),
+     "bottom scroller should be visible");
+
+  // @ bottom
+  view.scrollTo(0, max);
+  ok(!view.getPath('verticalScrollerView2.isVisible'),
+     "bottom scroller should NOT be visible");
+
+  view.scrollTo(0, 0);
+  ok(view.getPath('verticalScrollerView2.isVisible'),
+     "bottom scroller should be visible");
+
+  // just enough so bottom is invisible
+  view.scrollTo(0, max - view.getPath('verticalScrollerView2.scrollerThickness') - 1);
+  ok(view.getPath('verticalScrollerView2.isVisible'),
+     "bottom scroller should be visible");
+
+  view.scrollTo(0, 0);
+  ok(view.getPath('verticalScrollerView2.isVisible'),
+     "bottom scroller should be visible");
+
+  // exactly enough for bottom to be invisible
+  view.scrollTo(0, max - view.getPath('verticalScrollerView2.scrollerThickness'));
+  ok(!view.getPath('verticalScrollerView2.isVisible'),
+     "bottom scroller should NOT be visible");
+
+  view.scrollTo(0, 0);
+  ok(view.getPath('verticalScrollerView2.isVisible'),
+     "bottom scroller should be visible");
+
+  // more than enough for bottom to be invisible
+  view.scrollTo(0, max - view.getPath('verticalScrollerView2.scrollerThickness') + 1);
+  ok(!view.getPath('verticalScrollerView2.isVisible'),
+     "bottom scroller should NOT be visible");
+});
+
+test("when the top scroller becomes visible, the vertical scroll offset is adjusted by the scroller thickness", function () {
+  view.scrollBy(0, 1);
+
+  var thickness = view.getPath('verticalScrollerView.scrollerThickness');
+
+  // check for adjustment
+  equals(view.get('verticalScrollOffset'),
+         1 + thickness,
+         "the offset should be the scroller thickness + 1");
+
+  // shouldn't adjust this time
+  view.scrollBy(0, 1);
+  equals(view.get('verticalScrollOffset'),
+         2 + thickness,
+         "the offset should be the scroller thickness + 2");
+
+  // shouldn't adjust this time
+  view.scrollBy(0, -1);
+  equals(view.get('verticalScrollOffset'),
+         1 + thickness,
+         "the offset should be the scroller thickness + 1");
+
+  // check for adjustment
+  view.scrollBy(0, -1);
+  equals(view.get('verticalScrollOffset'), 0,
+         "the offset should be 0px");
+});
+
+// ..........................................................
+// autohidesVerticalScrollers => NO
+//
+
+test("when `autohidesVerticalScrollers` is NO, it will hide both when the content doesn't fill the container", function () {
+  view.set('autohidesVerticalScrollers', NO);
+  view.tile();
+
+  SC.RunLoop.begin();
+  view.setPath('contentView.content', []);
+  SC.RunLoop.end();
+
+  equals(view.getPath('verticalScrollerView.isVisible'), NO,
+         "the top vertical scroller shouldn't be visible");
+  equals(view.getPath('verticalScrollerView2.isVisible'), NO,
+         "the bottom vertical scroller shouldn't be visible");
+});
+
+test("when `autohidesVerticalScrollers` is NO, both scrollers will be shown when the content overflows", function () {
+  view.set('autohidesVerticalScrollers', NO);
+  view.tile();
+
+  equals(view.getPath('verticalScrollerView.isVisible'), YES,
+         "the top vertical scroller shouldn't be visible");
+  equals(view.getPath('verticalScrollerView2.isVisible'), YES,
+         "the bottom vertical scroller shouldn't be visible");
+});
+
+// ..........................................................
+// autohidesVerticalScroller  => NO AND
+// autohidesVerticalScrollers => NO
+//
+
+test("when `autohidesVerticalScroller` is NO, it will NOT hide both when the content doesn't fill the container", function () {
+  view.set('autohidesVerticalScroller', NO);
+  view.set('autohidesVerticalScrollers', NO);
+
+  SC.RunLoop.begin();
+  view.setPath('contentView.content', []);
+  SC.RunLoop.end();
+
+  equals(view.getPath('verticalScrollerView.isVisible'), YES,
+         "the top vertical scroller shouldn't be visible");
+  equals(view.getPath('verticalScrollerView2.isVisible'), YES,
+         "the bottom vertical scroller shouldn't be visible");
+});
+
+test("when `autohidesVerticalScroller` is NO, both scrollers will be shown when the content overflows", function () {
+  view.set('autohidesVerticalScroller', NO);
+  view.set('autohidesVerticalScrollers', NO);
+  view.tile();
+
+  equals(view.getPath('verticalScrollerView.isVisible'), YES,
+         "the top vertical scroller shouldn't be visible");
+  equals(view.getPath('verticalScrollerView2.isVisible'), YES,
+         "the bottom vertical scroller shouldn't be visible");
+});