Skip to content

Commit

Permalink
Recompiled JS
Browse files Browse the repository at this point in the history
  • Loading branch information
mrg2001 committed Aug 30, 2016
1 parent bcc5154 commit 7c77062
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 17 deletions.
16 changes: 8 additions & 8 deletions dist/kickstart.js
Original file line number Diff line number Diff line change
Expand Up @@ -375,15 +375,15 @@ kickStart.register('route', function () {
return;
}
}
// path not found
if (typeof app.route.trigger == 'function') {
var eventData = app.route.trigger({ phase: 'before', type: 'error', target: 'self', hash: hash});
if (eventData.isCancelled === true) return false;
}
console.log('ERROR: route "' + hash + '" not found');
// if events are available
if (typeof app.route.trigger == 'function') app.route.trigger($.extend(eventData, { phase: 'after' }));
}
// path not found
if (typeof app.route.trigger == 'function') {
var eventData = app.route.trigger({ phase: 'before', type: 'error', target: 'self', hash: hash});
if (eventData.isCancelled === true) return false;
}
console.log('ERROR: route "' + hash + '" not found');
// if events are available
if (typeof app.route.trigger == 'function') app.route.trigger($.extend(eventData, { phase: 'after' }));
}

/*
Expand Down
2 changes: 1 addition & 1 deletion dist/kickstart.min.js

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

9 changes: 7 additions & 2 deletions dist/w2ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -4742,7 +4742,8 @@ w2utils.event = {
|| (search.type == 'percent' && w2utils.isFloat(value)) || (search.type == 'hex' && w2utils.isHex(value))
|| (search.type == 'currency' && w2utils.isMoney(value)) || (search.type == 'money' && w2utils.isMoney(value))
|| (search.type == 'date' && w2utils.isDate(value)) || (search.type == 'time' && w2utils.isTime(value))
|| (search.type == 'datetime' && w2utils.isDateTime(value))
|| (search.type == 'datetime' && w2utils.isDateTime(value)) || (search.type == 'enum' && w2utils.isAlphaNumeric(value))
|| (search.type == 'list' && w2utils.isAlphaNumeric(value))
) {
var tmp = {
field : search.field,
Expand Down Expand Up @@ -9650,7 +9651,7 @@ w2utils.event = {
(rec_style != '' ? 'custom_style="'+ rec_style +'"' : '') +
'>';
rec_html2 += '<tr id="grid_'+ this.name +'_rec_'+ record.recid +'" recid="'+ record.recid +'" line="'+ lineNum +'" index="'+ ind +'" '+
' class="'+ (lineNum % 2 === 0 ? 'w2ui-even' : 'w2ui-odd') +
' class="'+ (lineNum % 2 === 0 ? 'w2ui-even' : 'w2ui-odd') + ' ' + rec_class +
(isRowSelected && this.selectType == 'row' ? ' w2ui-selected' : '') +
(record.w2ui && record.w2ui.editable === false ? ' w2ui-no-edit' : '') +
(record.w2ui && record.w2ui.expanded === true ? ' w2ui-expanded' : '') + '" ' +
Expand Down Expand Up @@ -17620,6 +17621,7 @@ var w2prompt = function (label, title, callBack) {
* - added field.html.column
* - added field types html, empty, custom
* - httpHeaders
* - method
*
************************************************************************/

Expand All @@ -17642,6 +17644,7 @@ var w2prompt = function (label, title, callBack) {
this.original = {};
this.postData = {};
this.httpHeaders = {};
this.method = null; // only used when not null, otherwise set based on w2utils.settings.dataType
this.toolbar = {}; // if not empty, then it is toolbar
this.tabs = {}; // if not empty, then it is tabs object
this.style = '';
Expand Down Expand Up @@ -18088,6 +18091,7 @@ var w2prompt = function (label, title, callBack) {
ajaxOptions.contentType = 'application/json';
break;
}
if (this.method) ajaxOptions.type = this.method;
this.last.xhr = $.ajax(ajaxOptions)
.done(function (data, status, xhr) {
obj.unlock();
Expand Down Expand Up @@ -18265,6 +18269,7 @@ var w2prompt = function (label, title, callBack) {
ajaxOptions.contentType = 'application/json';
break;
}
if (this.method) ajaxOptions.type = this.method;
obj.last.xhr = $.ajax(ajaxOptions)
.done(function (data, status, xhr) {
obj.unlock();
Expand Down
12 changes: 6 additions & 6 deletions dist/w2ui.min.js

Large diffs are not rendered by default.

0 comments on commit 7c77062

Please sign in to comment.