From 623660b86a9cc43d0489642f727550593f2f0f4f Mon Sep 17 00:00:00 2001 From: Mariusz Krzaczkowski Date: Thu, 18 Feb 2016 10:05:39 +0100 Subject: [PATCH 1/2] Disabling ClockPicker when the field is readable --- src/clockpicker.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/clockpicker.js b/src/clockpicker.js index 7f208aa..e52ffe9 100644 --- a/src/clockpicker.js +++ b/src/clockpicker.js @@ -367,7 +367,7 @@ fromnow: 0, // set default time to * milliseconds from now (using with default = 'now') placement: 'bottom', // clock popover placement align: 'left', // popover arrow align - donetext: '完成', // done button text + donetext: '完�??', // done button text autoclose: false, // auto close when minute is selected twelvehour: false, // change to 12 hour AM/PM clock from 24 hour vibrate: true // vibrate the device when dragging clock hand @@ -433,7 +433,9 @@ if (this.isShown) { return; } - + if ($(this.element).is('[readonly]')) { + return; + } raiseCallback(this.options.beforeShow); var self = this; From a3ec750e9e380fef3aa2598e4bb336ba59e14b02 Mon Sep 17 00:00:00 2001 From: Mariusz Krzaczkowski Date: Mon, 22 Feb 2016 08:18:08 +0100 Subject: [PATCH 2/2] Fix donetext --- src/clockpicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/clockpicker.js b/src/clockpicker.js index e52ffe9..237ef23 100644 --- a/src/clockpicker.js +++ b/src/clockpicker.js @@ -367,7 +367,7 @@ fromnow: 0, // set default time to * milliseconds from now (using with default = 'now') placement: 'bottom', // clock popover placement align: 'left', // popover arrow align - donetext: '完�??', // done button text + donetext: '完成', // done button text autoclose: false, // auto close when minute is selected twelvehour: false, // change to 12 hour AM/PM clock from 24 hour vibrate: true // vibrate the device when dragging clock hand