about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexander Kabui2020-12-16 14:57:37 +0300
committerGitHub2020-12-16 14:57:37 +0300
commite744352ec32809f791754fe7828c7e81813b24c7 (patch)
treeb5c6d2c6ec16007cbfafff57467bc47e94658d75
parent66f7e4977f751e3b533ee8fcdbba3547b9e0eace (diff)
downloadgenenetwork2-e744352ec32809f791754fe7828c7e81813b24c7.tar.gz
Replace jquery libs(jquery cookie,jquery ui,jquery js) (#512)
* replace jquery-ui in templates

* replace jquery-cookie library in templates

* replace jquery.min.js in templates

* add jquery-ui to mechanical rob

* add  jquery-cookie to mechanical rob

* add jquery min  js to mechanical rob

Co-authored-by: BonfaceKilz <bonfacemunyoki@gmail.com>
-rw-r--r--test/requests/link_checker.py3
-rw-r--r--wqflask/wqflask/templates/base.html6
-rw-r--r--wqflask/wqflask/templates/loading.html2
3 files changed, 7 insertions, 4 deletions
diff --git a/test/requests/link_checker.py b/test/requests/link_checker.py
index a22c2b54..eb27d9fe 100644
--- a/test/requests/link_checker.py
+++ b/test/requests/link_checker.py
@@ -117,6 +117,9 @@ def check_packaged_js_files(args_obj, parser):
         "/js/nvd3/nv.d3.min.css",
         "/js/qtip2/jquery.qtip.min.js",
         "/js/js_alt/md5.min.js",
+        "/js/jquery-ui/jquery-ui.min.js",
+        "/js/jquery-cookie/jquery.cookie.js",
+        "/js/jquery/jquery.min.js",
         "/js/typeahead/typeahead.bundle.js",
         "/js/underscore-string/underscore.string.min.js",
         "/js/js_alt/jstat.min.js",
diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index bb618294..e368a4be 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -238,7 +238,7 @@
       <!--</div>-->
     </div>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="{{ url_for('js', filename='jquery/jquery.min.js') }}" type="text/javascript"></script>
     <script src="/static/packages/bootstrap/js/bootstrap.min.js"></script>
     <script>
             //http://stackoverflow.com/questions/11521763/bootstrap-scrollspy-not-working
@@ -250,9 +250,9 @@
               }
             })
     </script>
-    <script src="/static/new/js_external/jquery.cookie.js"></script>
+    <script src="{{ url_for('js', filename='jquery-cookie/jquery.cookie.js') }}" type="text/javascript"></script>
     <script type="text/javascript" src="/static/new/js_external/json2.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="{{ url_for('js', filename='jquery-ui/jquery-ui.min.js') }}" type="text/javascript"></script>
 
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='colorbox/jquery.colorbox-min.js') }}"></script>
     <!--<script type="text/javascript" src="/static/new/javascript/login.js"></script>-->
diff --git a/wqflask/wqflask/templates/loading.html b/wqflask/wqflask/templates/loading.html
index 9b335dfe..94e17724 100644
--- a/wqflask/wqflask/templates/loading.html
+++ b/wqflask/wqflask/templates/loading.html
@@ -38,7 +38,7 @@
     </div>
   </div>
 </form>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+<script src="{{ url_for('js', filename='jquery/jquery.min.js') }}" type="text/javascript"></script>
 <script src="/static/packages/bootstrap/js/bootstrap.min.js"></script>
 <script  type="text/javascript">