aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
Diffstat (limited to 'view/js')
-rw-r--r--view/js/acl.js6
-rw-r--r--view/js/mod_cloud.js14
2 files changed, 9 insertions, 11 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index 9b08571ae..9b9f0eba3 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -53,8 +53,6 @@ function ACL(backend_url) {
$(document).on('click','.acl-button-show',that.on_button_show);
$(document).on('click','.acl-button-hide',that.on_button_hide);
- $(document).on('click','.acl-button-hide',that.on_button_hide);
-
$("#acl-search").keypress(that.on_search);
/* startup! */
@@ -64,7 +62,7 @@ function ACL(backend_url) {
}
-ACL.prototype.get_form_data = function(event) {
+ACL.prototype.get_form_data = function(event, form_id) {
form_id = $(this).data('form_id');
@@ -401,5 +399,5 @@ ACL.prototype.populate = function(data) {
$(el).attr('src', $(el).data("src"));
$(el).removeAttr("data-src");
});
- that.update_view();
+ //that.update_view();
};
diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js
index e56ec2a81..5b3c78bed 100644
--- a/view/js/mod_cloud.js
+++ b/view/js/mod_cloud.js
@@ -100,13 +100,13 @@ function prepareHtml(f, i) {
}
function formatSizeUnits(bytes){
- if (bytes>=1000000000) {bytes=(bytes/1000000000).toFixed(2)+' GB';}
- else if (bytes>=1000000) {bytes=(bytes/1000000).toFixed(2)+' MB';}
- else if (bytes>=1000) {bytes=(bytes/1000).toFixed(2)+' KB';}
- else if (bytes>1) {bytes=bytes+' bytes';}
- else if (bytes==1) {bytes=bytes+' byte';}
- else {bytes='0 byte';}
- return bytes;
+ if (bytes>=1000000000) {bytes=(bytes/1000000000).toFixed(2)+' GB';}
+ else if (bytes>=1000000) {bytes=(bytes/1000000).toFixed(2)+' MB';}
+ else if (bytes>=1000) {bytes=(bytes/1000).toFixed(2)+' KB';}
+ else if (bytes>1) {bytes=bytes+' bytes';}
+ else if (bytes==1) {bytes=bytes+' byte';}
+ else {bytes='0 byte';}
+ return bytes;
}
// this is basically a js port of include/text.php getIconFromType() function