rsence-pre 2.2.0.10 → 2.2.0.11

data/VERSION

@@ -1 +1 @@
-2.2.0.10.pre
+2.2.0.11.pre

data/js/foundation/eventmanager/eventmanager.js

@@ -888,7 +888,7 @@ EVENT = {
     else if (e.detail) {
       _delta = 0 - (e.detail / 3);
     }
-    if (BROWSER_TYPE.opera || BROWSER_TYPE.safari) {
+    if (BROWSER_TYPE.opera || BROWSER_TYPE.safari || BROWSER_TYPE.ie) {
       _delta = 0 - _delta;
     }
     for (; i !== _this.focused.length; i++) {

data/js/foundation/geom/rect/rect.js

@@ -139,6 +139,13 @@ HRect = HClass.extend({
         if(!_view.flexTop){
           _this.top = _this.bottom - _this.height;
         }
+        if( _this.bottom-_this.top < 0 ){
+          _this.bottom = _this.top;
+        }
+        if( _this.right-_this.left < 0 ){
+          _this.right = _this.left;
+        }
+        // console.log(_this.left,this.top,this.right-this.left,this.bottom-this.top);
         _this.updateSecondaryValues();
       }
     }

data/js/foundation/view/view.js

@@ -876,7 +876,12 @@ HView = HClass.extend({
   **/
   parentSize: function(){
     if(this.parent.elemId === 0){
-      var _winSize = ELEM.windowSize();
+      var
+      _winSize = ELEM.windowSize(),
+      _docSize = ELEM.getScrollSize(0);
+      if( _docSize[0] > _winSize[0] || _docSize[1] > _winSize[1] ){
+        _docSize = _winSize;
+      }
       return [ _winSize[0], _winSize[1] ];
     }
     else {
@@ -1003,6 +1008,12 @@ HView = HClass.extend({
           _validHeight && this.setMinHeight( _height );
           _bottom = _parentHeight - _bottomOffset;
         }
+        if( _leftOffset > _right ){
+          _right = _leftOffset;
+        }
+        if( _topOffset > _bottom ){
+          _bottom = _topOffset;
+        }
         this.rect = HRect.nu(_leftOffset,_topOffset,_right,_bottom);
         
         if(!this.rect.isValid){

data/js/menus/minimenu/minimenu.js

@@ -108,16 +108,20 @@ HMiniMenu = HRadioButtonList.extend({
   },
   
   drawSubviews: function(){
+    var itemStyle = {
+      'background-color': '#f6f6f6',
+      'border': '1px solid #999',
+      'overflow': 'auto',
+      'overflow-x': 'hidden'
+    };
+    if(!BROWSER_TYPE.ie){
+      itemStyle.opacity = 0.9;
+    }
     this.menuItemView = HView.nu(
       [ this.rect.left, this.rect.top, this.rect.width, 10 ],
       this.app, {
         visible: false,
-        style: [
-          ['background-color','#f6f6f6'],
-          ['border', '1px solid #999'],
-          ['overflow-y', 'auto'],
-          ['opacity', 0.9]
-        ]
+        style: itemStyle
       }
     );
   },

data/js/menus/minimenuitem/minimenuitem.js

@@ -17,17 +17,31 @@ HMiniMenuItem = HRadioButton.extend({
   
   defaultEvents: {
     click: true,
-    mouseUp: true
+    mouseUp: true,
+    mouseDown: true
   },
   
+  _activateParentParent: function(){
+    var _parentParent = this.parent.parent;
+    EVENT.changeActiveControl(_parentParent);
+  },
+
   click: function(){
     this.base();
-    EVENT.changeActiveControl(this.parent.parent);
+    this._activateParentParent();
+    return true;
+  },
+  
+  mouseDown: function(){
+    this.base();
+    this.click();
+    return true;
   },
   
   mouseUp: function(){
     this.base();
     this.click();
+    return true;
   }
   
 });

data/js/menus/popupmenu/themes/default/popupmenu.css

@@ -43,7 +43,7 @@
 
 .popupmenu_label {
   left: 13px; right: 11px; top: 0px;
-  height: 22px; line-height: 22px;
+  height: 22px; line-height: #{(BROWSER_TYPE.ie7||BROWSER_TYPE.ie6)?'20':'22'}px;
   text-align: left;
   text-overflow: ellipsis;
   overflow: hidden;

data/js/views/scrollview/scrollview.js

@@ -17,6 +17,12 @@ HScrollView = HControl.extend({
     scrollY: true
   }),
   drawSubviews: function(){
+    if(this.options.scrollX === 'auto' || this.options.scrollY === 'auto'){
+      this.setStyle('overflow','auto');
+    }
+    else if(this.options.scrollX || this.options.scrollY){
+      this.setStyle('overflow','scroll');
+    }
     if(!this.options.scrollX){
       this.setStyle('overflow-x','hidden');
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 107
+  hash: 105
   prerelease: 
   segments: 
   - 2
   - 2
   - 0
-  - 10
-  version: 2.2.0.10
+  - 11
+  version: 2.2.0.11
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-11 00:00:00 Z
+date: 2011-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsence-deps