diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 6d1ee2d3d..18329fb4f 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -78589,7 +78589,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, @@ -78606,7 +78606,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -78719,7 +78719,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/bundle.js b/dist/bundle.js index 7aa08fce4..df002451c 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -78993,7 +78993,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, @@ -79010,7 +79010,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -79123,7 +79123,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index dd254b357..e4468358b 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -78834,7 +78834,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, @@ -78851,7 +78851,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -78964,7 +78964,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/fineui.js b/dist/fineui.js index 5805f5db4..a381723e4 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -79238,7 +79238,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, @@ -79255,7 +79255,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -79368,7 +79368,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index d1b9081ad..218f895da 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -62012,7 +62012,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, @@ -62029,7 +62029,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -62142,7 +62142,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/widget.js b/dist/widget.js index e0fe989ea..c9dac8587 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -19360,7 +19360,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, @@ -19377,7 +19377,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -19490,7 +19490,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index 50f8f26c1..644ccbd08 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -14,7 +14,7 @@ }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, @@ -31,7 +31,7 @@ action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -144,7 +144,6 @@ } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";