Skip to content

Commit 1f1e2b9

Browse files
committed
fix menubutton. Fixes #673
1 parent b97f6d9 commit 1f1e2b9

File tree

7 files changed

+49
-9
lines changed

7 files changed

+49
-9
lines changed

build/menubutton-min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/menubutton.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Copyright 2014, KISSY v1.49
33
MIT Licensed
4-
build time: May 27 14:15
4+
build time: Sep 4 19:28
55
*/
66
/*
77
Combined processedModules by KISSY Module Compiler:
@@ -149,7 +149,7 @@ KISSY.add("menubutton/control", ["node", "button", "./render"], function(S, requ
149149
var menu = this.get("menu");
150150
return menu.get("rendered") && menu.getChildAt(index)
151151
}, _onSetDisabled:function(v) {
152-
if(!v) {
152+
if(v) {
153153
this.set("collapsed", true)
154154
}
155155
}, destructor:function() {

build/menubutton/assets/dpl-min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/menubutton/assets/dpl.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Copyright 2014, KISSY v1.49
33
MIT Licensed
4-
build time: May 27 14:15
4+
build time: Sep 4 19:28
55
*/
66
/**
77
* MenuButton style for KISSY from Bootstrap dropdown.

src/menubutton/coverage/src/menubutton/control.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ function visit22_237_1(result) {
405405
function visit21_236_1(result) {
406406
_$jscoverage['/menubutton/control.js'].branchData['236'][1].ranCondition(result);
407407
return result;
408-
}_$jscoverage['/menubutton/control.js'].branchData['183'][1].init(16, 2, '!v');
408+
}_$jscoverage['/menubutton/control.js'].branchData['183'][1].init(16, 1, 'v');
409409
function visit20_183_1(result) {
410410
_$jscoverage['/menubutton/control.js'].branchData['183'][1].ranCondition(result);
411411
return result;
@@ -651,7 +651,7 @@ KISSY.add(function(S, require) {
651651
_onSetDisabled: function(v) {
652652
_$jscoverage['/menubutton/control.js'].functionData[10]++;
653653
_$jscoverage['/menubutton/control.js'].lineData[183]++;
654-
if (visit20_183_1(!v)) {
654+
if (visit20_183_1(v)) {
655655
_$jscoverage['/menubutton/control.js'].lineData[184]++;
656656
this.set('collapsed', true);
657657
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<script src="/kissy/build/seed.js" ></script>
2+
<script src="/kissy/src/package.js"></script>
3+
<link rel="stylesheet" type="text/css" href="http://docs.kissyui.com/1.4/source/raw/demo/menu/assets/c2c-ui.css">
4+
<select name="decorateSelect" id="decorateSelect">
5+
<option value="-1">请选择</option>
6+
<option value="1">北京</option>
7+
<option value="2">上海</option>
8+
<option value="3">天津</option>
9+
<option value="4">南京</option>
10+
<option value="5">杭州</option>
11+
<option value="6">其他</option>
12+
</select>
13+
<script>
14+
KISSY.use("menubutton", function (S, MenuButton) {
15+
(function () {
16+
// 调用 Select.decorate 接口替换已有的 select 元素
17+
var select = MenuButton.Select.decorate('#decorateSelect', {
18+
width: 200,
19+
prefixCls: "c2c-",
20+
disabled: true,
21+
// 设置对齐方式, 与普通的 Align 大体一致
22+
// 该配置同菜单配置项
23+
menu: {
24+
align: {
25+
offset: [0, -1]
26+
},
27+
height: 150,
28+
elStyle: {
29+
overflow: "auto",
30+
overflowX: "hidden"
31+
}
32+
}
33+
});
34+
35+
select.on("click", function (e) {
36+
alert('当前值为: ' + select.get("value"));
37+
});
38+
})();
39+
});
40+
</script>

src/menubutton/src/menubutton/control.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ KISSY.add(function (S, require) {
180180

181181
// 禁用时关闭已显示菜单
182182
_onSetDisabled: function (v) {
183-
if(!v){
183+
if(v){
184184
this.set('collapsed', true);
185185
}
186186
},

0 commit comments

Comments
 (0)