Update static JS files

static/js/web2py-bootstrap4.js

@@ -0,0 +1,82 @@
+(function($, undefined) {
+  $.web2py.ajax_fields = function(target) {
+    /*
+     *this attaches something to a newly loaded fragment/page
+     * Ideally all events should be bound to the document, so we can avoid calling
+     * this over and over... all will be bound to the document
+     */
+    /*adds btn class to buttons*/
+    $('button:not([class^="btn"])', target).addClass('btn btn-default');
+    $("p.w2p-autocomplete-widget input").addClass('form-control');
+    $('form input[type="submit"]:not([class^="btn"]), form input[type="button"]:not([class^="btn"])', target).addClass('btn btn-default');
+    /* javascript for PasswordWidget*/
+    $('input[type=password][data-w2p_entropy]', target).each(function() {
+      $.web2py.validate_entropy($(this));
+    });
+    /* javascript for ListWidget*/
+    $('ul.w2p_list', target).each(function() {
+      function pe(ul, e) {
+        var new_line = ml(ul);
+        rel(ul);
+        if ($(e.target).closest('li').is(':visible')) {
+          /* make sure we didn't delete the element before we insert after */
+          new_line.insertAfter($(e.target).closest('li'));
+        } else {
+          /* the line we clicked on was deleted, just add to end of list */
+          new_line.appendTo(ul);
+        }
+        new_line.find(":text").focus();
+        return false;
+      }
+
+      function rl(ul, e) {
+        if ($(ul).find('li').length > 1) {
+          /* only remove if we have more than 1 item so the list is never empty */
+          $(e.target).closest('li').remove();
+        }
+      }
+
+      function ml(ul) {
+        /* clone the first field */
+        var line = $(ul).find("li:first").clone(true);
+        line.find(':text').val('');
+        return line;
+      }
+
+      function rel(ul) {
+        /* keep only as many as needed*/
+        $(ul).find("li").each(function() {
+          var trimmed = $.trim($(this).find(":text").val());
+          if (trimmed == '') $(this).remove();
+          else $(this).find(":text").val(trimmed);
+        });
+      }
+      var ul = this;
+      $(ul).find(":text").addClass('form-control').wrap("<div class='input-group'></div>").after('<div class="input-group-append"><i class="fa fa-plus-circle"></i></div>&nbsp;<div class="input-group-append"><i class="fa fa-minus-circle"></i></div>').keypress(function(e) {
+        return (e.which == 13) ? pe(ul, e) : true;
+      }).next().click(function(e) {
+        pe(ul, e);
+        e.preventDefault();
+      }).next().click(function(e) {
+        rl(ul, e);
+        e.preventDefault();
+      });
+    });
+  }
+
+  $(function() {
+    $(".nav ul.dropdown-menu").each(function() {
+      var toggle = jQuery(this).parent();
+      if (toggle.parent().hasClass("nav")) {
+        toggle.attr("data-w2pmenulevel", "l0");
+        toggle.children("a")
+          .addClass("dropdown-toggle")
+          .append('<span class="caret"> </span>')
+          .attr("data-toggle", "dropdown");
+      } else {
+        toggle.addClass("dropdown-submenu").removeClass("dropdown");
+      };
+    });
+  });
+
+})(jQuery);

static/js/web2py.js

@@ -267,7 +267,7 @@
                 }
             });
             /* help preventing double form submission for normal form (not LOADed) */
-            $(doc).on('submit', 'form:not(.no_disable)', function (e) {
+            $(doc).on('submit', 'form', function (e) {
                 var submit_buttons = $(this).find(web2py.formInputClickSelector);
                 submit_buttons.each(function() {
                     web2py.disableElement($(this));
@@ -283,7 +283,11 @@
             doc.ajaxSuccess(function (e, xhr) {
                 var redirect = xhr.getResponseHeader('web2py-redirect-location');
                 if (redirect !== null) {
-                    window.location = redirect;
+                    if (!redirect.endsWith('#')) {
+                        window.location.href = redirect;
+                    } else {
+                        window.location.reload();
+                    }
                 }
                 /* run this here only if this Ajax request is NOT for a web2py component. */
                 if (xhr.getResponseHeader('web2py-component-content') === null) {
@@ -335,7 +339,7 @@
                     } else {
                         formData = form.serialize(); // Fallback for older browsers.
                     }
-                    web2py.ajax_page('post', url, formData, target, form);
+                    web2py.ajax_page('post', url, formData, target);
 
                     e.preventDefault();
                 });
@@ -367,6 +371,24 @@
                     'data': data,
                     'processData': !isFormData,
                     'contentType': contentType,
+                    'xhr': function() {
+                        var xhr = new window.XMLHttpRequest();
+
+                        xhr.upload.addEventListener("progress", function(evt) {
+                            if (evt.lengthComputable) {
+                                var percentComplete = evt.loaded / evt.total;
+                                percentComplete = parseInt(percentComplete * 100);
+                                web2py.fire(element, 'w2p:uploadProgress', [percentComplete], target);
+
+                                if (percentComplete === 100) {
+                                    web2py.fire(element, 'w2p:uploadComplete', [], target);
+                                }
+
+                            }
+                        }, false);
+
+                        return xhr;
+                    },
                     'beforeSend': function (xhr, settings) {
                         xhr.setRequestHeader('web2py-component-location', document.location);
                         xhr.setRequestHeader('web2py-component-element', target);
@@ -617,7 +639,7 @@
         flash: function (message, status) {
             var flash = $('.w2p_flash');
             web2py.hide_flash();
-            flash.html(message).addClass(status);
+            flash.text(message).addClass(status);
             if (flash.html()) flash.append('<span id="closeflash"> &times; </span>')[animateIn]();
         },
         hide_flash: function () {

views/uikit_layout.html

@@ -25,13 +25,24 @@
     <link rel="stylesheet" href="{{=URL('static','uikit-3/css/uikit.min.css')}}" />
     <script src="{{=URL('static','uikit-3/js/uikit.min.js')}}"></script>
     <script src="{{=URL('static','uikit-3/js/uikit-icons.min.js')}}"></script>
+    <script src="{{=URL('static','js/web2py.js')}}"></script>
     <link rel="stylesheet" type="text/css" href="{{=URL('static', 'css/content.css')}}" />
 
+    <!-- include the relevant bits of 'web2py_ajax.html' -->
+    <script type="text/javascript"><!--
+      // These variables are used by the web2py_ajax_init function in web2py_ajax.js (which is loaded below).
+      {{=ASSIGNJS(
+      w2p_ajax_confirm_message = T('Are you sure you want to delete this object?'),
+      w2p_ajax_disable_with_message = T('Working...'),
+      w2p_ajax_date_format = T('%Y-%m-%d'),
+      w2p_ajax_datetime_format = T('%Y-%m-%d %H:%M:%S'),
+      ajax_error_500 = T.M('An error occured, please [[reload %s]] the page') % URL(args=request.args, vars=request.get_vars)
+      )}}
+      //--></script>
     {{
     response.include_meta()
     response.include_files()
     }}
-    <!-- include 'web2py_ajax.html' could be done here, but it performs more than we want so we disect it and keep only the bits we really need -->
 
 
     {{if is_testing:}}<script>window.is_testing = true;</script>{{pass}}

views/web2py_ajax.html

@@ -9,7 +9,7 @@
     )}}
     //--></script>
 {{
-response.files.insert(0,URL('static','js/jquery.min.js'))
+response.files.insert(0,URL('static','js/jquery.js'))
 response.files.insert(1,URL('static','css/calendar.css'))
 response.files.insert(2,URL('static','js/calendar.js'))
 response.files.insert(3,URL('static','js/web2py.js'))