Update static JS files #795
Conversation
| @@ -9,7 +9,7 @@ | |||
| )}} | |||
| //--></script> | |||
| {{ | |||
| response.files.insert(0,URL('static','js/jquery.min.js')) | |||
| response.files.insert(0,URL('static','js/jquery.js')) | |||
There was a problem hiding this comment.
This looks like an unintentional commit
There was a problem hiding this comment.
It was just to test, as I hadn't minified the jquery lib, but I guess I can revert it now.
| @@ -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> | |||
There was a problem hiding this comment.
Could we just include webpy_ajax.html on pages that really need it?
At best this downloads a useless copy of jquery for every page, at worst introduces web2py behaviours which then fight with our JS (the "Working..." message appearing on all buttons I've seen in the past).
There was a problem hiding this comment.
Ah right. I didn't realise that was the reason we had killed it. I guess we might bung it in on pages that use Ajax then?
| {{ | ||
| 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 --> |
There was a problem hiding this comment.
Seems easier to remove calendar.js from views/web2py_ajax.html rather than replicating it all here. Why it was done like this I've no idea, but it was intentional: e4bf707
There was a problem hiding this comment.
I agree. Seems easiest to reinstate with the calendar stuff missing. But I think we probably require the include_meta() and include_files() stuff on all pages, so I'm not sure on the best way to only include web2py.js on some of the pages.
|
Closed in favour of #806 |
To test if this fixes #794