Skip to content

Commit

Permalink
Merge pull request #23 from DEFAULTERROR1/#18-numpad-for-mobile-inputs
Browse files Browse the repository at this point in the history 
#18 numpad for mobile inputs
  • Loading branch information
@vsubhuman
vsubhuman authored Jul 27, 2018
2 parents 6efdc4d + cc51565 commit a1541be
Show file tree
Hide file tree
Showing 32 changed files with 8,203 additions and 50 deletions.
1 change: 1 addition & 0 deletions cardano-calculator/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vscode
83 changes: 60 additions & 23 deletions cardano-calculator/assets/css/cardano-calculator.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,53 @@ code {
* SMALL SCREENS AND SWIPER *
****************************/

.swiper-container {
width: 100%;
margin-top: 2rem;
}
.swiper-pagination {
position: relative!important;
}
.swiper-slide {
padding: 2rem 3rem 0 3rem;
}
.swiper-pagination-bullet {
width: calc(25% - 10px)!important;
height: auto!important;
margin: 0 5px!important;
padding: 5px 0!important;
border-bottom: 2px solid #ccc;
background: #fff!important;
border-radius: 0!important;
outline: 0!important;
}
.swiper-pagination-bullet-active {
background: #fff!important;
border-bottom: 2px solid #007bff!important;
}
.swiper-button-next, .swiper-button-prev {
outline: 0;
}

@media (max-width: 767.99px) {

.swiper-container-horizontal > .swiper-pagination-bullets .swiper-pagination-bullet {
font-size: 12px;
}
.swiper-button-prev, .swiper-container-rtl .swiper-button-next {
left: 0;
}
.swiper-button-next, .swiper-container-rtl .swiper-button-prev {
right: 0;
}
.swiper-slide {
padding: 2rem 1.5rem;
}

.no-padding-mobile {
padding: 0;
}

.card-body .form-group.col-md-3 {
margin-top: 0;
margin-bottom: 0;
Expand Down Expand Up @@ -108,31 +146,30 @@ code {
}
}

.swiper-container {
width: 100%;
margin-top: 2rem;
}
.swiper-pagination {
position: relative!important;
}
.swiper-slide {
padding: 2rem 3rem 0 3rem;
/**************
* Numpad Overwrites *
**************/
.nmpd-grid {
max-width: 100%;
}
.swiper-pagination-bullet {
width: calc(25% - 10px)!important;
height: auto!important;
margin: 0 5px!important;
padding: 5px 0!important;
border-bottom: 2px solid #ccc;
background: #fff!important;
border-radius: 0!important;
outline: 0!important;
.nmpd-grid button {
width: 100%;
}
.swiper-pagination-bullet-active {
background: #fff!important;
border-bottom: 2px solid #007bff!important;
.modal-backdrop {
background-color: rgba(0, 0, 0, .5);
}
.swiper-button-next, .swiper-button-prev {
outline: 0;

@media (max-width: 767.99px) {

.nmpd-grid {
width: 100%;
}

}

/**************
* Tooltip Overwrites *
**************/
.tooltip {
z-index: 1029!important;
}
5 changes: 5 additions & 0 deletions cardano-calculator/assets/css/vendor/jquery.numpad/jquery.numpad.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.nmpd-wrapper {display: none;}
.nmpd-target {cursor: pointer;}
.nmpd-grid {position:absolute; left:50px; top:50px; z-index:5000; -khtml-user-select: none; padding:10px; width: initial;}
.nmpd-overlay {z-index:4999;}
input.nmpd-display {text-align: right;}
73 changes: 73 additions & 0 deletions cardano-calculator/assets/js/cardano-calculator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,75 @@ function parseParamIntoContext(el, shift = 0) {
return parsedValue
}

function initNumpad() {

$('.nmpd-wrapper').remove();

let delimiter = window.CardanoCalculatorLocale ? window.CardanoCalculatorLocale.separators.order : ',',
decimalMark = window.CardanoCalculatorLocale ? window.CardanoCalculatorLocale.separators.decimal : '.';

$.fn.numpad.defaults.gridTpl = '<div class="modal-content"></div>';
$.fn.numpad.defaults.backgroundTpl = '<div class="modal-backdrop in"></div>';
$.fn.numpad.defaults.displayTpl = '<input type="text" class="form-control">';
$.fn.numpad.defaults.rowTpl = '<div class="row mb-2"></div>';
$.fn.numpad.defaults.displayCellTpl = '<div class="col-12"></div>';
$.fn.numpad.defaults.cellTpl = '<div class="col-3"></div>';
$.fn.numpad.defaults.buttonNumberTpl = '<button type="button" class="btn btn-default"></button>';
$.fn.numpad.defaults.buttonFunctionTpl = '<button type="button" class="btn" style="width: 100%;"></button>';
$.fn.numpad.defaults.textDone = 'Done'; // TODO: tranlate button
$.fn.numpad.defaults.textDelete = 'Del'; // TODO: tranlate button
$.fn.numpad.defaults.textClear = 'Clear'; // TODO: tranlate button
$.fn.numpad.defaults.textCancel = 'Cancel'; // TODO: tranlate button
$.fn.numpad.defaults.decimalSeparator = decimalMark;
$.fn.numpad.defaults.hidePlusMinusButton = true;

$('.inp-param').each(function() {

let target = $(this);
let isCleaveField = target.hasClass('cleave-num');

target.numpad({
hideDecimalButton: !isCleaveField,
onKeypadCreate: function() {

$(this).find('.done').addClass('btn-primary');

},
onKeypadOpen: function() {

let el = $(this).find('.nmpd-display');
el.attr('readonly', true);

},
onKeypadClose: function() {

let el = $(this).find('.nmpd-display');

if (isCleaveField) {

let unformatted = accounting.unformat(el.val(), decimalMark);
let formatted = accounting.formatNumber(unformatted, 2, delimiter, decimalMark);

target.val(formatted);

}

},
onChange: function() {

let el = $(this).find('.nmpd-display');

if (isCleaveField) {
// TODO: format numpads display field
}

}
});

});

}

let Layouts = Object.freeze({
TABLE: {
name: 'TABLE',
Expand Down Expand Up @@ -355,6 +424,7 @@ function initCalcLayout(layoutName = Cookies.get('layout')) {
initCleave(window.CardanoCalculatorLocale);
initInputFieldEvents();
updateCalculations();
($.isMobile) ? initNumpad() : null;
}
});
}
Expand Down Expand Up @@ -400,6 +470,7 @@ function initLocale() {
Cookies.set('locale', selectedLocaleName);
setCurrentLocale(selectedLocale);
restartCleave(selectedLocale);
($.isMobile) ? initNumpad() : null;
updateCalculations();
}
});
Expand All @@ -409,6 +480,8 @@ function initLocale() {

$(function() {

$.isMobile = (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(navigator.userAgent.substr(0,4))) ? true : false;

initLocale();

Handlebars.registerHelper('str', function (str) {
Expand Down
Loading

0 comments on commit a1541be

Please sign in to comment.