<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -526,7 +526,7 @@ SC.ScrollView = SC.View.extend(SC.Border, {
     this._scroll_wheelDeltaX += evt.wheelDeltaX;
     this._scroll_wheelDeltaY += evt.wheelDeltaY;
     this.invokeLater(this._scroll_mouseWheel, 10) ;
-    return YES ;  
+    return this.get('canScrollHorizontal') || this.get('canScrollVertical') ;  
   },
   
   /** @private */</diff>
      <filename>frameworks/desktop/views/scroll.js</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>c4cf6d0b8affed19a714a1e0149a6566a98d4cf6</id>
    </parent>
    <parent>
      <id>4001283b3a845e4f0f22944356bbc74a77bf97f1</id>
    </parent>
  </parents>
  <author>
    <name>Charles Jolley</name>
    <email>charles@sproutit.com</email>
  </author>
  <url>http://github.com/sproutit/sproutcore/commit/db572faa1871cc95fa62c4b26d616cb20148cc5c</url>
  <id>db572faa1871cc95fa62c4b26d616cb20148cc5c</id>
  <committed-date>2009-11-11T13:46:12-08:00</committed-date>
  <authored-date>2009-11-11T13:46:12-08:00</authored-date>
  <message>Merge branch 'public/master'

* public/master:
  ScrollView#mouseWheel only returns YES if its capable of scrolling.
  The even/odd classes were already being applied to list items</message>
  <tree>5f6c4248c67e09b37c55e4bd0b7167f7f7338715</tree>
  <committer>
    <name>Charles Jolley</name>
    <email>charles@sproutit.com</email>
  </committer>
</commit>
