From 36b4461d1d7eb50617086e9f7f593ba0cb0e7a8c Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 24 Jun 2019 17:01:15 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-749=20=E4=BF=AE=E6=94=B9doClick?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/button/buttons/button.icon.js | 2 +- src/base/single/input/checkbox/checkbox.image.js | 13 +------------ src/base/single/input/radio/radio.image.js | 2 +- src/case/button/icon/icon.trigger.js | 13 +------------ src/case/button/icon/iconhalf/icon.half.image.js | 13 +------------ src/case/checkbox/check.arrownode.js | 4 +--- src/case/checkbox/check.first.treenode.js | 3 --- src/case/checkbox/check.last.treenode.js | 3 --- src/case/checkbox/check.mid.treenode.js | 3 --- src/case/checkbox/check.treenode.js | 3 --- 10 files changed, 6 insertions(+), 53 deletions(-) diff --git a/src/base/single/button/buttons/button.icon.js b/src/base/single/button/buttons/button.icon.js index ec059e8bc..62f9a5bd0 100644 --- a/src/base/single/button/buttons/button.icon.js +++ b/src/base/single/button/buttons/button.icon.js @@ -48,5 +48,5 @@ BI.IconButton = BI.inherit(BI.BasicButton, { } } }); -BI.IconButton.EVENT_CHANGE = "IconButton.EVENT_CHANGE"; +BI.IconButton.EVENT_CHANGE = "EVENT_CHANGE"; BI.shortcut("bi.icon_button", BI.IconButton); \ No newline at end of file diff --git a/src/base/single/input/checkbox/checkbox.image.js b/src/base/single/input/checkbox/checkbox.image.js index c20127f60..dc1703567 100644 --- a/src/base/single/input/checkbox/checkbox.image.js +++ b/src/base/single/input/checkbox/checkbox.image.js @@ -15,19 +15,8 @@ BI.ImageCheckbox = BI.inherit(BI.IconButton, { iconWidth: 16, iconHeight: 16 }); - }, - - _init: function () { - BI.ImageCheckbox.superclass._init.apply(this, arguments); - }, - - doClick: function () { - BI.ImageCheckbox.superclass.doClick.apply(this, arguments); - if(this.isValid()) { - this.fireEvent(BI.Checkbox.EVENT_CHANGE); - } } }); -BI.ImageCheckbox.EVENT_CHANGE = "EVENT_CHANGE"; +BI.ImageCheckbox.EVENT_CHANGE = BI.IconButton.EVENT_CHANGE; BI.shortcut("bi.image_checkbox", BI.ImageCheckbox); \ No newline at end of file diff --git a/src/base/single/input/radio/radio.image.js b/src/base/single/input/radio/radio.image.js index 7fc365aea..744bb511a 100644 --- a/src/base/single/input/radio/radio.image.js +++ b/src/base/single/input/radio/radio.image.js @@ -28,6 +28,6 @@ BI.ImageRadio = BI.inherit(BI.IconButton, { } } }); -BI.ImageRadio.EVENT_CHANGE = "EVENT_CHANGE"; +BI.ImageRadio.EVENT_CHANGE = BI.IconButton.EVENT_CHANGE; BI.shortcut("bi.image_radio", BI.ImageRadio); \ No newline at end of file diff --git a/src/case/button/icon/icon.trigger.js b/src/case/button/icon/icon.trigger.js index f37906a75..6f7c2a1ee 100644 --- a/src/case/button/icon/icon.trigger.js +++ b/src/case/button/icon/icon.trigger.js @@ -13,18 +13,7 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, { baseCls: (conf.baseCls || "") + " bi-trigger-icon-button", extraCls: "pull-down-font" }); - }, - - _init: function () { - BI.TriggerIconButton.superclass._init.apply(this, arguments); - }, - - doClick: function () { - BI.TriggerIconButton.superclass.doClick.apply(this, arguments); - if (this.isValid()) { - this.fireEvent(BI.TriggerIconButton.EVENT_CHANGE, this); - } } }); -BI.TriggerIconButton.EVENT_CHANGE = "EVENT_CHANGE"; +BI.TriggerIconButton.EVENT_CHANGE = BI.IconButton.EVENT_CHANGE; BI.shortcut("bi.trigger_icon_button", BI.TriggerIconButton); \ No newline at end of file diff --git a/src/case/button/icon/iconhalf/icon.half.image.js b/src/case/button/icon/iconhalf/icon.half.image.js index 925f1211d..a9e9d0014 100644 --- a/src/case/button/icon/iconhalf/icon.half.image.js +++ b/src/case/button/icon/iconhalf/icon.half.image.js @@ -14,19 +14,8 @@ BI.HalfIconButton = BI.inherit(BI.IconButton, { iconHeight: 16, selected: false }); - }, - - _init: function () { - BI.HalfIconButton.superclass._init.apply(this, arguments); - }, - - doClick: function () { - BI.HalfIconButton.superclass.doClick.apply(this, arguments); - if(this.isValid()) { - this.fireEvent(BI.HalfIconButton.EVENT_CHANGE); - } } }); -BI.HalfIconButton.EVENT_CHANGE = "EVENT_CHANGE"; +BI.HalfIconButton.EVENT_CHANGE = BI.IconButton.EVENT_CHANGE; BI.shortcut("bi.half_icon_button", BI.HalfIconButton); \ No newline at end of file diff --git a/src/case/checkbox/check.arrownode.js b/src/case/checkbox/check.arrownode.js index 84b6fd578..ebcb784d7 100644 --- a/src/case/checkbox/check.arrownode.js +++ b/src/case/checkbox/check.arrownode.js @@ -8,9 +8,7 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, { extraCls: "bi-arrow-group-node-checkbox" }); }, - _init: function () { - BI.ArrowTreeGroupNodeCheckbox.superclass._init.apply(this, arguments); - }, + setSelected: function (v) { BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { diff --git a/src/case/checkbox/check.first.treenode.js b/src/case/checkbox/check.first.treenode.js index 19b3e75e4..572908d8d 100644 --- a/src/case/checkbox/check.first.treenode.js +++ b/src/case/checkbox/check.first.treenode.js @@ -11,10 +11,7 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { iconHeight: 24 }); }, - _init: function () { - BI.FirstTreeNodeCheckbox.superclass._init.apply(this, arguments); - }, setSelected: function (v) { BI.FirstTreeNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v === true) { diff --git a/src/case/checkbox/check.last.treenode.js b/src/case/checkbox/check.last.treenode.js index 58bb22f3d..e0a9f621d 100644 --- a/src/case/checkbox/check.last.treenode.js +++ b/src/case/checkbox/check.last.treenode.js @@ -11,10 +11,7 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { iconHeight: 24 }); }, - _init: function () { - BI.LastTreeNodeCheckbox.superclass._init.apply(this, arguments); - }, setSelected: function (v) { BI.LastTreeNodeCheckbox.superclass.setSelected.apply(this, arguments); if (v === true) { diff --git a/src/case/checkbox/check.mid.treenode.js b/src/case/checkbox/check.mid.treenode.js index 79a1a3e97..7679b466e 100644 --- a/src/case/checkbox/check.mid.treenode.js +++ b/src/case/checkbox/check.mid.treenode.js @@ -11,10 +11,7 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { iconHeight: 24 }); }, - _init: function () { - BI.MidTreeNodeCheckbox.superclass._init.apply(this, arguments); - }, setSelected: function (v) { BI.MidTreeNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v === true) { diff --git a/src/case/checkbox/check.treenode.js b/src/case/checkbox/check.treenode.js index 4f9088c4b..b5642aae4 100644 --- a/src/case/checkbox/check.treenode.js +++ b/src/case/checkbox/check.treenode.js @@ -11,10 +11,7 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { iconHeight: 24 }); }, - _init: function () { - BI.TreeNodeCheckbox.superclass._init.apply(this, arguments); - }, setSelected: function (v) { BI.TreeNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) {