aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-15 11:34:42 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-15 11:34:42 +0100
commit746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6 (patch)
tree093113813f751891d6f1686e9351727b449c102b /view
parentd868ebe4ba1cb2f7e577346fbece613e094699ad (diff)
downloadvolse-hubzilla-746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6.tar.gz
volse-hubzilla-746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6.tar.bz2
volse-hubzilla-746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6.zip
fix some regressions with permission roles
Diffstat (limited to 'view')
-rw-r--r--view/js/mod_connedit.js4
-rw-r--r--view/js/mod_defperms.js4
-rw-r--r--view/js/mod_settings.js4
-rwxr-xr-xview/tpl/abook_edit.tpl1
-rwxr-xr-xview/tpl/defperms.tpl1
5 files changed, 6 insertions, 8 deletions
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 7100e0d07..34e9a3b21 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -19,7 +19,7 @@ $(document).ready(function() {
$('#id_permcat').change(function() {
- $('.loading-role-rotator').spin(true);
+ $('.loading').toggleClass('invisible');
var permName = $('#id_permcat').val();
loadAbookRole(permName);
});
@@ -128,7 +128,7 @@ function loadAbookRole(name) {
if(this.value)
$('#me_id_perms_' + this.name).attr('checked','checked');
});
- $('.loading-role-rotator').spin(false);
+ $('.loading').toggleClass('invisible');
});
}
diff --git a/view/js/mod_defperms.js b/view/js/mod_defperms.js
index c89142579..18ebe268e 100644
--- a/view/js/mod_defperms.js
+++ b/view/js/mod_defperms.js
@@ -1,7 +1,7 @@
$(document).ready(function() {
$('#id_permcat').change(function() {
- $('.loading-role-rotator').show();
+ $('.loading').toggleClass('invisible');
var permName = $('#id_permcat').val();
loadConnectionRole(permName);
});
@@ -25,7 +25,7 @@ function loadConnectionRole(name) {
if(this.value)
$('#id_perms_' + this.name).attr('checked','checked');
});
- $('.loading-role-rotator').hide();
+ $('.loading').toggleClass('invisible');
});
}
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index f9faa3d5c..d3392c748 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -19,7 +19,7 @@ $(document).ready(function() {
});
$('#id_permcat_list').change(function() {
- $('.loading-role-rotator').spin(true);
+ $('.loading').toggleClass('invisible');
var permName = $('#id_permcat').val();
loadPermcat(permName);
});
@@ -172,7 +172,7 @@ function loadPermcat(name) {
if(this.value)
$('#me_id_perms_' + this.name).attr('checked','checked');
});
- $('.loading-role-rotator').spin(false);
+ $('.loading').toggleClass('invisible');
});
}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 13b94a560..81c182e1b 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -485,7 +485,6 @@
</div>
{{if $permcat_enable}}
- <div class="loading-role-rotator"></div>
<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
{{include file="field_select.tpl" field=$permcat}}
{{/if}}
diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl
index f4a711957..5273ee91b 100755
--- a/view/tpl/defperms.tpl
+++ b/view/tpl/defperms.tpl
@@ -17,7 +17,6 @@
<p>{{$permnote_self}}</p>
</div>
{{if $permcat_enable}}
- <div class="loading-role-rotator spinner-wrapper"></div>
<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
{{include file="field_select.tpl" field=$permcat}}
{{/if}}