From 4d04c5dda7defb4c6f72626fd1bf910bf39f03f4 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 15 Aug 2015 09:53:55 +1000
Subject: [PATCH] Sweet alert logic has grown large enough to warrant its own
 file

---
 modules/backend/assets/js/backend.js          | 63 ------------------
 modules/backend/assets/js/october-min.js      | 25 ++++----
 modules/backend/assets/js/october.alerts.js   | 64 +++++++++++++++++++
 modules/backend/assets/js/october.js          |  1 +
 .../backend/assets/js/october.simplelist.js   |  2 +-
 5 files changed, 80 insertions(+), 75 deletions(-)
 create mode 100644 modules/backend/assets/js/october.alerts.js

diff --git a/modules/backend/assets/js/backend.js b/modules/backend/assets/js/backend.js
index 7c13650f1..d8e8839d4 100644
--- a/modules/backend/assets/js/backend.js
+++ b/modules/backend/assets/js/backend.js
@@ -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
  */
diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index 224cb7cab..271c2f668 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -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')
diff --git a/modules/backend/assets/js/october.alerts.js b/modules/backend/assets/js/october.alerts.js
new file mode 100644
index 000000000..d46340731
--- /dev/null
+++ b/modules/backend/assets/js/october.alerts.js
@@ -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)
+    }
+})
diff --git a/modules/backend/assets/js/october.js b/modules/backend/assets/js/october.js
index 61cf0d177..851f1332c 100644
--- a/modules/backend/assets/js/october.js
+++ b/modules/backend/assets/js/october.js
@@ -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
diff --git a/modules/backend/assets/js/october.simplelist.js b/modules/backend/assets/js/october.simplelist.js
index 0add060c2..b26b2a377 100644
--- a/modules/backend/assets/js/october.simplelist.js
+++ b/modules/backend/assets/js/october.simplelist.js
@@ -1,5 +1,5 @@
 /*
- * SimpleList control. 
+ * SimpleList control.
  *
  * Data attributes:
  * - data-control="simplelist" - enables the simplelist plugin