Fix confirm command

dvlpp · Nov 3, 2015 · ae785c7 · ae785c7
1 parent 2c89247
commit ae785c7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 21 deletions.
diff --git a/resources/assets/js/sharp.commands.js b/resources/assets/js/sharp.commands.js
@@ -1,18 +1,15 @@
 $(window).load(function () {
 
-    // ---
-    // Show confirm on commands
-    // ---
-    $("body.sharp-list a.command[data-confirm]").click(function() {
-        return confirm($(this).data("confirm"));
-    });
-
     // ---
     // Ajax command call
     // ---
     $("body.sharp-list a.command").click(function (e) {
         e.preventDefault();
 
+        if($(this).data("confirm") && !confirm($(this).data("confirm"))) {
+            return;
+        }
+
         var url = $(this).attr("href");
         var $form = $(".form-command-" + $(this).data("command"));
 

diff --git a/resources/assets/sharp.form.min.js b/resources/assets/sharp.form.min.js
diff --git a/resources/assets/sharp.ui.js b/resources/assets/sharp.ui.js
@@ -12565,19 +12565,16 @@ function hidePageOverlay() {
     $body.css("overflow", "auto");
 };$(window).load(function () {
 
-    // ---
-    // Show confirm on commands
-    // ---
-    $("body.sharp-list a.command[data-confirm]").click(function() {
-        return confirm($(this).data("confirm"));
-    });
-
     // ---
     // Ajax command call
     // ---
     $("body.sharp-list a.command").click(function (e) {
         e.preventDefault();
 
+        if($(this).data("confirm") && !confirm($(this).data("confirm"))) {
+            return;
+        }
+
         var url = $(this).attr("href");
         var $form = $(".form-command-" + $(this).data("command"));
 

diff --git a/resources/assets/sharp.ui.min.js b/resources/assets/sharp.ui.min.js
diff --git a/resources/views/cms/cmslayout.blade.php b/resources/views/cms/cmslayout.blade.php
@@ -14,7 +14,7 @@
 
     <link href='http://fonts.googleapis.com/css?family=Lato:100,400,700,400italic,700italic' rel='stylesheet' type='text/css'>
 
-    <link href="/sharp/sharp.min.css" rel="stylesheet">
+    <link href="/sharp/sharp.min.css?v={{ $sharpVersion }}" rel="stylesheet">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -105,7 +105,7 @@
 </footer>
 
 @section("scripts")
-<script src="/sharp/sharp.ui.min.js?v=3"></script>
+<script src="/sharp/sharp.ui.min.js?v={{ $sharpVersion }}"></script>
 @show
 
 </body>

diff --git a/resources/views/cms/entityForm.blade.php b/resources/views/cms/entityForm.blade.php
@@ -119,5 +119,5 @@
 
 @section("scripts")
     @parent
-    <script src="/sharp/sharp.form.min.js"></script>
+    <script src="/sharp/sharp.form.min.js?v={{ $sharpVersion }}"></script>
 @endsection
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.0.0
+3.0.8