summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-15 12:12:19 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-15 12:12:19 +0100
commit3de65e2e0acb87e801cf46def29aaec326db79ab (patch)
tree62d5c5c77c13f0c24e3991571e3e72e4b7d6ea4a
parent572544bbd626d04e37120d52e26f42426d7bed28 (diff)
downloadIshtar-3de65e2e0acb87e801cf46def29aaec326db79ab.tar.bz2
Ishtar-3de65e2e0acb87e801cf46def29aaec326db79ab.zip
Fix old window load
-rw-r--r--ishtar_common/static/js/ishtar.js2
-rw-r--r--version.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 8d1c2ccc1..ff8e43b54 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -280,8 +280,8 @@ function load_opened_shortcut_menu(){
}
function load_shortcut_menu(opened){
- $('.modal-progress').modal('show');
if (show_shortcut_menu && shortcut_url){
+ $('.modal-progress').modal('show');
$.ajax({
url: shortcut_url,
cache: false,
diff --git a/version.py b/version.py
index 82feb2808..8885edb48 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
-# 2.1.dev.16
-VERSION = (2, 1, 'dev', 16)
+# 2.1.dev.17
+VERSION = (2, 1, 'dev', 17)
def get_version():