Skip to content

Commit

Permalink
changes for version 1.7.0:
Browse files Browse the repository at this point in the history
- Bug fixes for APEX 5.1 (Button rendering was buggy)
- Code Cleanup using separate JavaScript file
fixes #8
  • Loading branch information
Daniel Hochleitner committed Dec 22, 2016
1 parent afd1c87 commit 56c1615
Show file tree
Hide file tree
Showing 6 changed files with 230 additions and 46 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ ClockPicker is a item type plugin that gives you a nice clock-style overlay abov
It is based on JS Framework clockpicker (https://github.com/weareoutman/clockpicker).

## Changelog
#### 1.7.0 - Bug fixes for APEX 5.1 (Button rendering was buggy) / Code Cleanup using separate JavaScript file / fixed issue #8

#### 1.6.1 - fixed clockpicker button style

#### 1.6 - added possibility to show a clock button on right side
Expand Down
2 changes: 1 addition & 1 deletion apexplugin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name" : "ClockPicker",
"version" : "1.6.1",
"version" : "1.7.0",
"description" : "ClockPicker is a item type plugin that gives you a nice clock-style overlay above of an input field. It is based on JS Framework clockpicker",
"keywords" : ["clockpicker", "timepicker", "time", "clock"],
"homepage" : "https://github.com/Dani3lSun/apex-plugin-clockpicker",
Expand Down
76 changes: 76 additions & 0 deletions server/js/apexclockpicker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// APEX Clockpicker functions
// Author: Daniel Hochleitner
// Version: 1.7.0

// global namespace
var apexClockPicker = {
// parse string to boolean
parseBoolean: function(pString) {
var pBoolean;
if (pString.toLowerCase() == 'true') {
pBoolean = true;
}
if (pString.toLowerCase() == 'false') {
pBoolean = false;
}
if (!(pString.toLowerCase() == 'true') && !(pString.toLowerCase() == 'false')) {
pBoolean = undefined;
}
return pBoolean;
},
// function that gets called from plugin
initClockPicker: function(pItemId, pOptions, pLogging) {
var vOptions = pOptions;
var vPlacement = vOptions.placement;
var vAlign = vOptions.align;
var vAutoClose = apexClockPicker.parseBoolean(vOptions.autoclose);
var vDoneText = vOptions.donetext;
var vTwelveHour = apexClockPicker.parseBoolean(vOptions.twelvehour);
var vShowButtonInt = vOptions.showbutton;
var vLogging = apexClockPicker.parseBoolean(pLogging);
var vShowButton;

if (vShowButtonInt == 1 || vShowButtonInt == '1') {
vShowButton = true;
} else {
vShowButton = false;
}
// Logging
if (vLogging) {
console.log('apexClockPicker: pItemId:', pItemId);
console.log('apexClockPicker: vOptions.placement:', vOptions.placement);
console.log('apexClockPicker: vOptions.align:', vOptions.align);
console.log('apexClockPicker: vOptions.vAutoClose:', vOptions.autoclose);
console.log('apexClockPicker: vOptions.vDoneText:', vOptions.donetext);
console.log('apexClockPicker: vOptions.vTwelveHour:', vOptions.twelvehour);
console.log('apexClockPicker: vOptions.vShowButton:', vOptions.showbutton);
}
// Clockpicker
var clockPickerItem = $('#' + pItemId).clockpicker({
"placement": vPlacement,
"align": vAlign,
"autoclose": vAutoClose,
"donetext": vDoneText,
"twelvehour": vTwelveHour,
"default": "now"
});
// Clock Button
if (vShowButton) {
$('#' + pItemId + '_button').click(function(e) {
e.stopPropagation();
clockPickerItem.clockpicker('show');
});
}
// APEX item
apex.widget.initPageItem(pItemId, {
disable: function() {
apex.jQuery("#" + this.id).addClass("apex_disabled").prop("disabled", !0);
apex.jQuery("#" + this.id + "_button").addClass("apex_disabled").prop("disabled", !0);
},
enable: function() {
apex.jQuery("#" + this.id).removeClass("apex_disabled").prop("disabled", 0);
apex.jQuery("#" + this.id + "_button").removeClass("apex_disabled").prop("disabled", 0);
}
});
}
};
3 changes: 3 additions & 0 deletions server/js/apexclockpicker.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 56c1615

Please sign in to comment.