فهرست منبع

updated SweetAlert to new version

causefx 7 سال پیش
والد
کامیت
611070a392
4فایلهای تغییر یافته به همراه75 افزوده شده و 69 حذف شده
  1. 2 2
      index.php
  2. 73 67
      js/custom.js
  3. 0 0
      js/custom.min.js
  4. 0 0
      plugins/bower_components/sweetalert/sweetalert.min.js

+ 2 - 2
index.php

@@ -17,7 +17,7 @@
     <link href="plugins/bower_components/jquery-wizard-master/libs/formvalidation/formValidation.min.css"
           rel="stylesheet">
     <link href="plugins/bower_components/Magnific-Popup-master/dist/magnific-popup.css" rel="stylesheet">
-    <link href="plugins/bower_components/sweetalert/sweetalert.css" rel="stylesheet" type="text/css">
+    <!--<link href="plugins/bower_components/sweetalert/sweetalert.css" rel="stylesheet" type="text/css">-->
     <link href="plugins/bower_components/switchery/dist/switchery.min.css" rel="stylesheet"/>
     <link href="plugins/bower_components/dropzone-master/dist/dropzone.css" rel="stylesheet" type="text/css"/>
     <link href="plugins/bower_components/css-chart/css-chart.css" rel="stylesheet">
@@ -272,7 +272,7 @@
 <script src="plugins/bower_components/datatables/jquery.dataTables.min.js"></script>
 <script src="plugins/bower_components/datatables-plugins/sorting/datetime-moment.js"></script>
 <script src="plugins/bower_components/Magnific-Popup-master/dist/jquery.magnific-popup.min.js"></script>
-<script src="plugins/bower_components/sweetalert/sweetalert.min.js"></script>
+<script src="plugins/bower_components/sweetalert/sweetalert.min.js?v=<?php echo $GLOBALS['fileHash']; ?>"></script>
 <script src="plugins/bower_components/switchery/dist/switchery.min.js"></script>
 <script src="js/tinycolor.min.js"></script>
 <script src="plugins/bower_components/bootstrap-colorpicker-sliders/bootstrap.colorpickersliders.min.js"></script>

+ 73 - 67
js/custom.js

@@ -504,20 +504,33 @@ $(document).on("click", ".changeDefaultGroup", function () {
 });
 //DELETE GROUP
 $(document).on("click", ".deleteUserGroup", function () {
-    //Create POST Array
-    var post = {
-        action:'deleteUserGroup',
-        api:'api/?v1/settings/user/manage/groups',
-        id:$(this).parent().parent().attr("data-id"),
-        groupID:$(this).parent().parent().attr("data-group-id"),
-        groupName:$(this).parent().parent().attr("data-group"),
-        messageTitle:'',
-        messageBody:'Deleted User Group '+$(this).parent().parent().attr("data-group"),
-        error:'Organizr Function: User Group API Connection Failed'
-    };
-    var callbacks = $.Callbacks();
-    callbacks.add( buildGroupManagement );
-    settingsAPI(post,callbacks);
+    var group = $(this);
+    swal({
+        title: window.lang.translate('Delete ')+group.parent().parent().attr("data-group")+'?',
+        icon: "warning",
+        buttons: {
+            cancel: window.lang.translate('No'),
+            confirm: window.lang.translate('Yes'),
+        },
+        dangerMode: true,
+        confirmButtonColor: "#DD6B55"
+    }).then(function(willDelete) {
+        if (willDelete) {
+            var post = {
+                action:'deleteUserGroup',
+                api:'api/?v1/settings/user/manage/groups',
+                id:group.parent().parent().attr("data-id"),
+                groupID:group.parent().parent().attr("data-group-id"),
+                groupName:group.parent().parent().attr("data-group"),
+                messageTitle:'',
+                messageBody:'Deleted User Group '+group.parent().parent().attr("data-group"),
+                error:'Organizr Function: User Group API Connection Failed'
+            };
+            var callbacks = $.Callbacks();
+            callbacks.add( buildGroupManagement );
+            settingsAPI(post,callbacks);
+        }
+    });
 });
 //ADD GROUP
 $(document).on("click", ".addNewGroup", function () {
@@ -644,16 +657,15 @@ $(document).on("click", ".deleteUser", function () {
     var user = $(this);
     swal({
         title: window.lang.translate('Delete ')+user.parent().parent().attr("data-username")+'?',
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: window.lang.translate('Yes'),
-        cancelButtonText: window.lang.translate('No'),
-        closeOnConfirm: true,
-        closeOnCancel: true
-    }, function(isConfirm){
-        if (isConfirm) {
-            //Create POST Array
+        icon: "warning",
+        buttons: {
+            cancel: window.lang.translate('No'),
+            confirm: window.lang.translate('Yes'),
+        },
+        dangerMode: true,
+        confirmButtonColor: "#DD6B55"
+    }).then(function(willDelete) {
+        if (willDelete) {
             var post = {
                 action:'deleteUser',
                 api:'api/?v1/settings/user/manage/users',
@@ -668,7 +680,6 @@ $(document).on("click", ".deleteUser", function () {
             settingsAPI(post,callbacks);
         }
     });
-
 });
 // CHANGE TAB GROUP
 $(document).on("change", ".tabGroupSelect", function () {
@@ -817,17 +828,16 @@ $(document).on("change", ".defaultSwitch", function () {
 $(document).on("click", ".deleteTab", function () {
     var user = $(this);
     swal({
-        title: window.lang.translate('Delete ')+user.parent().parent().attr("data-name")+'?',
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: window.lang.translate('Yes'),
-        cancelButtonText: window.lang.translate('No'),
-        closeOnConfirm: true,
-        closeOnCancel: true
-    }, function(isConfirm){
-        if (isConfirm) {
-            //Create POST Array
+        title: window.lang.translate('Delete ') + user.parent().parent().attr("data-name") + '?',
+        icon: "warning",
+        buttons: {
+            cancel: window.lang.translate('No'),
+            confirm: window.lang.translate('Yes'),
+        },
+        dangerMode: true,
+        confirmButtonColor: "#DD6B55"
+    }).then(function(willDelete) {
+        if (willDelete) {
             var post = {
                 action:'deleteTab',
                 api:'api/?v1/settings/tab/editor/tabs',
@@ -1010,16 +1020,15 @@ $(document).on("click", ".deleteCategory", function () {
     var category = $(this);
     swal({
         title: window.lang.translate('Delete ')+category.parent().parent().attr("data-name")+'?',
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: window.lang.translate('Yes'),
-        cancelButtonText: window.lang.translate('No'),
-        closeOnConfirm: true,
-        closeOnCancel: true
-    }, function(isConfirm){
-        if (isConfirm) {
-            //Create POST Array
+        icon: "warning",
+        buttons: {
+            cancel: window.lang.translate('No'),
+            confirm: window.lang.translate('Yes'),
+        },
+        dangerMode: true,
+        confirmButtonColor: "#DD6B55"
+    }).then(function(willDelete) {
+        if (willDelete) {
             var post = {
                 action:'deleteCategory',
                 api:'api/?v1/settings/tab/editor/categories',
@@ -1154,16 +1163,15 @@ $(document).on("click", ".deleteImage", function () {
     var image = $(this);
     swal({
         title: window.lang.translate('Delete ')+image.attr("data-image-name")+'?',
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: window.lang.translate('Yes'),
-        cancelButtonText: window.lang.translate('No'),
-        closeOnConfirm: true,
-        closeOnCancel: true
-    }, function(isConfirm){
-        if (isConfirm) {
-            //Create POST Array
+        icon: "warning",
+        buttons: {
+            cancel: window.lang.translate('No'),
+            confirm: window.lang.translate('Yes'),
+        },
+        dangerMode: true,
+        confirmButtonColor: "#DD6B55"
+    }).then(function(willDelete) {
+        if (willDelete) {
             var post = {
                 action:'deleteImage',
                 api:'api/?v1/settings/image/manager/view',
@@ -1207,16 +1215,15 @@ $(document).on('click', '.disablePlugin', function() {
     var plugin = $(this);
     swal({
         title: window.lang.translate('Disable')+' '+plugin.attr("data-plugin-name")+'?',
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: window.lang.translate('Yes'),
-        cancelButtonText: window.lang.translate('No'),
-        closeOnConfirm: true,
-        closeOnCancel: true
-    }, function(isConfirm){
-        if (isConfirm) {
-            //Create POST Array
+        icon: "warning",
+        buttons: {
+            cancel: window.lang.translate('No'),
+            confirm: window.lang.translate('Yes'),
+        },
+        dangerMode: true,
+        confirmButtonColor: "#DD6B55"
+    }).then(function(willDelete) {
+        if (willDelete) {
             var post = {
                 action:'disable',
                 api:'api/?v1/settings/plugins/list',
@@ -1234,7 +1241,6 @@ $(document).on('click', '.disablePlugin', function() {
             setTimeout(function(){ buildPlugins();ajaxloader(); }, 3000);
         }
     });
-
 });
 // AUTH BACKEND HIDE SHOW
 $(document).on('change', '#authSelect, #authBackendSelect', function(e) {

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
js/custom.min.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
plugins/bower_components/sweetalert/sweetalert.min.js


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است