TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sweet alert logic has grown large enough to warrant its own file

This commit is contained in:
Samuel Georges 2015-08-15 09:53:55 +10:00
parent 0e3403f1aa
commit 4d04c5dda7
5 changed files with 80 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
modules/backend/assets/js/backend.js
View File

@ -15,69 +15,6 @@ $.ajaxPrefilter(function(options) {
}
})
/*
* Implement "Sweet Alert" with AJAX framework
*/
$(window).on('ajaxErrorMessage', function(event, message){
if (!message) return
swal({
title: message,
// type: 'error',
confirmButtonClass: 'btn-default'
})
// Prevent the default alert() message
event.preventDefault()
})
$(window).on('ajaxConfirmMessage', function(event, message){
if (!message) return
swal({
title: message,
// type: 'warning',
showCancelButton: true,
confirmButtonClass: 'btn-primary'
},
function(isConfirm){
isConfirm
? event.promise.resolve()
: event.promise.reject()
})
// Prevent the default confirm() message
event.preventDefault()
return true
})
/*
* Override "Sweet Alert" functions to translate default buttons
*/
$(document).on('ready', function(){
if (!window.swal) return
var swal = window.swal;
window.sweetAlert = window.swal = function(message, callback) {
if(typeof message === 'object') {
// Do not override if texts are provided
message.confirmButtonText = message.confirmButtonText || $.oc.lang.get('sweetalert.confirm_button_text');
message.cancelButtonText = message.cancelButtonText || $.oc.lang.get('sweetalert.cancel_button_text');
} else {
message = {
title: message,
confirmButtonText: $.oc.lang.get('sweetalert.confirm_button_text'),
cancelButtonText: $.oc.lang.get('sweetalert.cancel_button_text')
}
}
swal(message, callback);
}
})
/*
* Path helpers
*/

25
modules/backend/assets/js/october-min.js vendored
View File

@ -716,7 +716,20 @@ result=result[value]})
return result}
if(lang.locale===undefined){lang.locale=$('html').attr('lang')||'en'}
if(lang.loadedMessages===undefined){lang.load(lang.locale)}
return lang})($.oc.lang||{},$.oc.langMessages);+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype
return lang})($.oc.lang||{},$.oc.langMessages);$(window).on('ajaxErrorMessage',function(event,message){if(!message)return
swal({title:message,confirmButtonClass:'btn-default'})
event.preventDefault()})
$(window).on('ajaxConfirmMessage',function(event,message){if(!message)return
swal({title:message,showCancelButton:true,confirmButtonClass:'btn-primary'},function(isConfirm){isConfirm?event.promise.resolve():event.promise.reject()})
event.preventDefault()
return true})
$(document).on('ready',function(){if(!window.swal)return
var swal=window.swal
window.sweetAlert=window.swal=function(message,callback){if(typeof message==='object'){message.confirmButtonText=message.confirmButtonText||$.oc.lang.get('sweetalert.confirm_button_text')
message.cancelButtonText=message.cancelButtonText||$.oc.lang.get('sweetalert.cancel_button_text')}
else{message={title:message,confirmButtonText:$.oc.lang.get('sweetalert.confirm_button_text'),cancelButtonText:$.oc.lang.get('sweetalert.cancel_button_text')}}
swal(message,callback)}})
+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype
var Scrollpad=function(element,options){this.$el=$(element)
this.scrollbarElement=null
this.dragHandleElement=null
@ -1400,16 +1413,6 @@ return this}
$(document).ready(function(){$('[data-control=sidenav-tree]').sidenavTree()})}(window.jQuery);$.ajaxPrefilter(function(options){var token=$('meta[name="csrf-token"]').attr('content')
if(token){if(!options.headers)options.headers={}
options.headers['X-CSRF-TOKEN']=token}})
$(window).on('ajaxErrorMessage',function(event,message){if(!message)return
swal({title:message,confirmButtonClass:'btn-default'})
event.preventDefault()})
$(window).on('ajaxConfirmMessage',function(event,message){if(!message)return
swal({title:message,showCancelButton:true,confirmButtonClass:'btn-primary'},function(isConfirm){isConfirm?event.promise.resolve():event.promise.reject()})
event.preventDefault()
return true})
$(document).on('ready',function(){if(!window.swal)return
var swal=window.swal;window.sweetAlert=window.swal=function(message,callback){if(typeof message==='object'){message.confirmButtonText=message.confirmButtonText||$.oc.lang.get('sweetalert.confirm_button_text');message.cancelButtonText=message.cancelButtonText||$.oc.lang.get('sweetalert.cancel_button_text');}else{message={title:message,confirmButtonText:$.oc.lang.get('sweetalert.confirm_button_text'),cancelButtonText:$.oc.lang.get('sweetalert.cancel_button_text')}}
swal(message,callback);}})
if($.oc===undefined)
$.oc={}
$.oc.backendUrl=function(url){var backendBasePath=$('meta[name="backend-base-path"]').attr('content')

64
modules/backend/assets/js/october.alerts.js Normal file
View File

@ -0,0 +1,64 @@
/*
* Implement "Sweet Alert" with AJAX framework
*/
$(window).on('ajaxErrorMessage', function(event, message){
if (!message) return
swal({
title: message,
// type: 'error',
confirmButtonClass: 'btn-default'
})
// Prevent the default alert() message
event.preventDefault()
})
$(window).on('ajaxConfirmMessage', function(event, message){
if (!message) return
swal({
title: message,
// type: 'warning',
showCancelButton: true,
confirmButtonClass: 'btn-primary'
},
function(isConfirm){
isConfirm
? event.promise.resolve()
: event.promise.reject()
})
// Prevent the default confirm() message
event.preventDefault()
return true
})
/*
* Override "Sweet Alert" functions to translate default buttons
*/
$(document).on('ready', function(){
if (!window.swal) return
var swal = window.swal
window.sweetAlert = window.swal = function(message, callback) {
if (typeof message === 'object') {
// Do not override if texts are provided
message.confirmButtonText = message.confirmButtonText || $.oc.lang.get('sweetalert.confirm_button_text')
message.cancelButtonText = message.cancelButtonText || $.oc.lang.get('sweetalert.cancel_button_text')
}
else {
message = {
title: message,
confirmButtonText: $.oc.lang.get('sweetalert.confirm_button_text'),
cancelButtonText: $.oc.lang.get('sweetalert.cancel_button_text')
}
}
swal(message, callback)
}
})

1
modules/backend/assets/js/october.js
View File

@ -18,6 +18,7 @@
=require ../../../system/assets/vendor/prettify/prettify.js
=require october.lang.js
=require october.alerts.js
=require october.scrollpad.js
=require october.verticalmenu.js
=require october.navbar.js

2
modules/backend/assets/js/october.simplelist.js
View File

@ -1,5 +1,5 @@
/*
* SimpleList control.
* SimpleList control.
*
* Data attributes:
* - data-control="simplelist" - enables the simplelist plugin