rsence-pre 2.2.0.10 → 2.2.0.11
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/js/foundation/eventmanager/eventmanager.js +1 -1
- data/js/foundation/geom/rect/rect.js +7 -0
- data/js/foundation/view/view.js +12 -1
- data/js/menus/minimenu/minimenu.js +10 -6
- data/js/menus/minimenuitem/minimenuitem.js +16 -2
- data/js/menus/popupmenu/themes/default/popupmenu.css +1 -1
- data/js/views/scrollview/scrollview.js +6 -0
- metadata +4 -4
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.2.0.
|
1
|
+
2.2.0.11.pre
|
@@ -888,7 +888,7 @@ EVENT = {
|
|
888
888
|
else if (e.detail) {
|
889
889
|
_delta = 0 - (e.detail / 3);
|
890
890
|
}
|
891
|
-
if (BROWSER_TYPE.opera || BROWSER_TYPE.safari) {
|
891
|
+
if (BROWSER_TYPE.opera || BROWSER_TYPE.safari || BROWSER_TYPE.ie) {
|
892
892
|
_delta = 0 - _delta;
|
893
893
|
}
|
894
894
|
for (; i !== _this.focused.length; i++) {
|
@@ -139,6 +139,13 @@ HRect = HClass.extend({
|
|
139
139
|
if(!_view.flexTop){
|
140
140
|
_this.top = _this.bottom - _this.height;
|
141
141
|
}
|
142
|
+
if( _this.bottom-_this.top < 0 ){
|
143
|
+
_this.bottom = _this.top;
|
144
|
+
}
|
145
|
+
if( _this.right-_this.left < 0 ){
|
146
|
+
_this.right = _this.left;
|
147
|
+
}
|
148
|
+
// console.log(_this.left,this.top,this.right-this.left,this.bottom-this.top);
|
142
149
|
_this.updateSecondaryValues();
|
143
150
|
}
|
144
151
|
}
|
data/js/foundation/view/view.js
CHANGED
@@ -876,7 +876,12 @@ HView = HClass.extend({
|
|
876
876
|
**/
|
877
877
|
parentSize: function(){
|
878
878
|
if(this.parent.elemId === 0){
|
879
|
-
var
|
879
|
+
var
|
880
|
+
_winSize = ELEM.windowSize(),
|
881
|
+
_docSize = ELEM.getScrollSize(0);
|
882
|
+
if( _docSize[0] > _winSize[0] || _docSize[1] > _winSize[1] ){
|
883
|
+
_docSize = _winSize;
|
884
|
+
}
|
880
885
|
return [ _winSize[0], _winSize[1] ];
|
881
886
|
}
|
882
887
|
else {
|
@@ -1003,6 +1008,12 @@ HView = HClass.extend({
|
|
1003
1008
|
_validHeight && this.setMinHeight( _height );
|
1004
1009
|
_bottom = _parentHeight - _bottomOffset;
|
1005
1010
|
}
|
1011
|
+
if( _leftOffset > _right ){
|
1012
|
+
_right = _leftOffset;
|
1013
|
+
}
|
1014
|
+
if( _topOffset > _bottom ){
|
1015
|
+
_bottom = _topOffset;
|
1016
|
+
}
|
1006
1017
|
this.rect = HRect.nu(_leftOffset,_topOffset,_right,_bottom);
|
1007
1018
|
|
1008
1019
|
if(!this.rect.isValid){
|
@@ -108,16 +108,20 @@ HMiniMenu = HRadioButtonList.extend({
|
|
108
108
|
},
|
109
109
|
|
110
110
|
drawSubviews: function(){
|
111
|
+
var itemStyle = {
|
112
|
+
'background-color': '#f6f6f6',
|
113
|
+
'border': '1px solid #999',
|
114
|
+
'overflow': 'auto',
|
115
|
+
'overflow-x': 'hidden'
|
116
|
+
};
|
117
|
+
if(!BROWSER_TYPE.ie){
|
118
|
+
itemStyle.opacity = 0.9;
|
119
|
+
}
|
111
120
|
this.menuItemView = HView.nu(
|
112
121
|
[ this.rect.left, this.rect.top, this.rect.width, 10 ],
|
113
122
|
this.app, {
|
114
123
|
visible: false,
|
115
|
-
style:
|
116
|
-
['background-color','#f6f6f6'],
|
117
|
-
['border', '1px solid #999'],
|
118
|
-
['overflow-y', 'auto'],
|
119
|
-
['opacity', 0.9]
|
120
|
-
]
|
124
|
+
style: itemStyle
|
121
125
|
}
|
122
126
|
);
|
123
127
|
},
|
@@ -17,17 +17,31 @@ HMiniMenuItem = HRadioButton.extend({
|
|
17
17
|
|
18
18
|
defaultEvents: {
|
19
19
|
click: true,
|
20
|
-
mouseUp: true
|
20
|
+
mouseUp: true,
|
21
|
+
mouseDown: true
|
21
22
|
},
|
22
23
|
|
24
|
+
_activateParentParent: function(){
|
25
|
+
var _parentParent = this.parent.parent;
|
26
|
+
EVENT.changeActiveControl(_parentParent);
|
27
|
+
},
|
28
|
+
|
23
29
|
click: function(){
|
24
30
|
this.base();
|
25
|
-
|
31
|
+
this._activateParentParent();
|
32
|
+
return true;
|
33
|
+
},
|
34
|
+
|
35
|
+
mouseDown: function(){
|
36
|
+
this.base();
|
37
|
+
this.click();
|
38
|
+
return true;
|
26
39
|
},
|
27
40
|
|
28
41
|
mouseUp: function(){
|
29
42
|
this.base();
|
30
43
|
this.click();
|
44
|
+
return true;
|
31
45
|
}
|
32
46
|
|
33
47
|
});
|
@@ -17,6 +17,12 @@ HScrollView = HControl.extend({
|
|
17
17
|
scrollY: true
|
18
18
|
}),
|
19
19
|
drawSubviews: function(){
|
20
|
+
if(this.options.scrollX === 'auto' || this.options.scrollY === 'auto'){
|
21
|
+
this.setStyle('overflow','auto');
|
22
|
+
}
|
23
|
+
else if(this.options.scrollX || this.options.scrollY){
|
24
|
+
this.setStyle('overflow','scroll');
|
25
|
+
}
|
20
26
|
if(!this.options.scrollX){
|
21
27
|
this.setStyle('overflow-x','hidden');
|
22
28
|
}
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rsence-pre
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 105
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 2
|
8
8
|
- 2
|
9
9
|
- 0
|
10
|
-
-
|
11
|
-
version: 2.2.0.
|
10
|
+
- 11
|
11
|
+
version: 2.2.0.11
|
12
12
|
platform: ruby
|
13
13
|
authors:
|
14
14
|
- Riassence Inc.
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2011-06-
|
19
|
+
date: 2011-06-12 00:00:00 Z
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
22
22
|
name: rsence-deps
|