fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui

es6
windy 7 years ago
parent
abb8516c15 e101a31316
commit
27518cc52f
7 changed files with 130 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      demo/js/case/combo/demo.text_value_combo.js
  2. 2
      demo/js/widget/multiselect/demo.multi_select_tree.js
  3. 10
      dist/base.js
  4. 10
      dist/bundle.js
  5. 50
      dist/demo.js
  6. 10
      dist/fineui.js
  7. 10
      src/base/layer/layer.popup.js

48
demo/js/case/combo/demo.text_value_combo.js
Unescape View File

@ -29,6 +29,54 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
text: "MVC-3", text: "MVC-3",
iconCls: "pull-right-font", iconCls: "pull-right-font",
value: 3 value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}] }]
}, { }, {
type: "bi.search_multi_text_value_combo", type: "bi.search_multi_text_value_combo",

2
demo/js/widget/multiselect/demo.multi_select_tree.js
Unescape View File

@ -13,7 +13,7 @@ Demo.MultiSelectList = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () { _createMultiSelectCombo: function () {
var self = this; var self = this;
var widget = BI.createWidget({ var widget = BI.createWidget({
type: "bi.multi_select_insert_no_bar_list", type: "bi.multi_select_insert_list",
ref: function (ref) { ref: function (ref) {
self.list = ref; self.list = ref;
}, },

10
dist/base.js vendored
Unescape View File

@ -15622,8 +15622,14 @@ BI.PopupView = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.PopupView.superclass._init.apply(this, arguments); BI.PopupView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.wheelHandler = new BI.WheelHandler(function (deltaX, deltaY) {
var scrollTop = self.button_group.element.scrollTop();
scrollTop += deltaY;
self.button_group.element.scrollTop(scrollTop);
}, false, true);
var fn = function (e) { var fn = function (e) {
e.stopPropagation(); self.wheelHandler.onWheel(e.originalEvent);
e.stopEvent();
}, stop = function (e) { }, stop = function (e) {
e.stopEvent(); e.stopEvent();
return false; return false;
@ -15634,7 +15640,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
"max-width": o.maxWidth + "px" "max-width": o.maxWidth + "px"
}).bind({click: fn}); }).bind({click: fn});
this.element.bind("mousewheel", fn); this.element.bind("mousewheel", BI.bind(fn, this));
o.stopPropagation && this.element.bind({mousedown: fn, mouseup: fn, mouseover: fn}); o.stopPropagation && this.element.bind({mousedown: fn, mouseup: fn, mouseover: fn});
o.stopEvent && this.element.bind({mousedown: stop, mouseup: stop, mouseover: stop}); o.stopEvent && this.element.bind({mousedown: stop, mouseup: stop, mouseover: stop});

10
dist/bundle.js vendored
Unescape View File

@ -51430,8 +51430,14 @@ BI.PopupView = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.PopupView.superclass._init.apply(this, arguments); BI.PopupView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.wheelHandler = new BI.WheelHandler(function (deltaX, deltaY) {
var scrollTop = self.button_group.element.scrollTop();
scrollTop += deltaY;
self.button_group.element.scrollTop(scrollTop);
}, false, true);
var fn = function (e) { var fn = function (e) {
e.stopPropagation(); self.wheelHandler.onWheel(e.originalEvent);
e.stopEvent();
}, stop = function (e) { }, stop = function (e) {
e.stopEvent(); e.stopEvent();
return false; return false;
@ -51442,7 +51448,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
"max-width": o.maxWidth + "px" "max-width": o.maxWidth + "px"
}).bind({click: fn}); }).bind({click: fn});
this.element.bind("mousewheel", fn); this.element.bind("mousewheel", BI.bind(fn, this));
o.stopPropagation && this.element.bind({mousedown: fn, mouseup: fn, mouseover: fn}); o.stopPropagation && this.element.bind({mousedown: fn, mouseup: fn, mouseover: fn});
o.stopEvent && this.element.bind({mousedown: stop, mouseup: stop, mouseover: stop}); o.stopEvent && this.element.bind({mousedown: stop, mouseup: stop, mouseover: stop});

50
dist/demo.js vendored
Unescape View File

@ -2228,6 +2228,54 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
text: "MVC-3", text: "MVC-3",
iconCls: "pull-right-font", iconCls: "pull-right-font",
value: 3 value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}, {
text: "MVC-3",
iconCls: "pull-right-font",
value: 3
}] }]
}, { }, {
type: "bi.search_multi_text_value_combo", type: "bi.search_multi_text_value_combo",
@ -12853,7 +12901,7 @@ Demo.MultiSelectList = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () { _createMultiSelectCombo: function () {
var self = this; var self = this;
var widget = BI.createWidget({ var widget = BI.createWidget({
type: "bi.multi_select_insert_no_bar_list", type: "bi.multi_select_insert_list",
ref: function (ref) { ref: function (ref) {
self.list = ref; self.list = ref;
}, },

10
dist/fineui.js vendored
Unescape View File

@ -51679,8 +51679,14 @@ BI.PopupView = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.PopupView.superclass._init.apply(this, arguments); BI.PopupView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.wheelHandler = new BI.WheelHandler(function (deltaX, deltaY) {
var scrollTop = self.button_group.element.scrollTop();
scrollTop += deltaY;
self.button_group.element.scrollTop(scrollTop);
}, false, true);
var fn = function (e) { var fn = function (e) {
e.stopPropagation(); self.wheelHandler.onWheel(e.originalEvent);
e.stopEvent();
}, stop = function (e) { }, stop = function (e) {
e.stopEvent(); e.stopEvent();
return false; return false;
@ -51691,7 +51697,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
"max-width": o.maxWidth + "px" "max-width": o.maxWidth + "px"
}).bind({click: fn}); }).bind({click: fn});
this.element.bind("mousewheel", fn); this.element.bind("mousewheel", BI.bind(fn, this));
o.stopPropagation && this.element.bind({mousedown: fn, mouseup: fn, mouseover: fn}); o.stopPropagation && this.element.bind({mousedown: fn, mouseup: fn, mouseover: fn});
o.stopEvent && this.element.bind({mousedown: stop, mouseup: stop, mouseover: stop}); o.stopEvent && this.element.bind({mousedown: stop, mouseup: stop, mouseover: stop});

10
src/base/layer/layer.popup.js
Unescape View File

@ -44,8 +44,14 @@ BI.PopupView = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.PopupView.superclass._init.apply(this, arguments); BI.PopupView.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.wheelHandler = new BI.WheelHandler(function (deltaX, deltaY) {
var scrollTop = self.button_group.element.scrollTop();
scrollTop += deltaY;
self.button_group.element.scrollTop(scrollTop);
}, false, true);
var fn = function (e) { var fn = function (e) {
e.stopPropagation(); self.wheelHandler.onWheel(e.originalEvent);
e.stopEvent();
}, stop = function (e) { }, stop = function (e) {
e.stopEvent(); e.stopEvent();
return false; return false;
@ -56,7 +62,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
"max-width": o.maxWidth + "px" "max-width": o.maxWidth + "px"
}).bind({click: fn}); }).bind({click: fn});
this.element.bind("mousewheel", fn); this.element.bind("mousewheel", BI.bind(fn, this));
o.stopPropagation && this.element.bind({mousedown: fn, mouseup: fn, mouseover: fn}); o.stopPropagation && this.element.bind({mousedown: fn, mouseup: fn, mouseover: fn});
o.stopEvent && this.element.bind({mousedown: stop, mouseup: stop, mouseover: stop}); o.stopEvent && this.element.bind({mousedown: stop, mouseup: stop, mouseover: stop});

Write Preview
Loading…
Cancel
Save