summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-10-02 18:02:55 +0200
committerVincent Petry <pvince81@owncloud.com>2015-10-02 18:03:48 +0200
commitf135128664cae62a831ed46853ac820af6a4812b (patch)
tree755e4e24065b5261829af7994848a156a661ed6f /core/js
parentaaabe356b59b32a384514c5f8940119d9760cc6f (diff)
downloadnextcloud-server-f135128664cae62a831ed46853ac820af6a4812b.tar.gz
nextcloud-server-f135128664cae62a831ed46853ac820af6a4812b.zip
Fix filelist size issues, breadcrumb, multiselect
- calculate multiselect header width to exclude scrollbar - call FileList._onResize() when sidebar is toggled ("appresized"), this also updates the breadcrumb width - moved global getScrollBarWidth() to OC.Util namespace
Diffstat (limited to 'core/js')
-rw-r--r--core/js/js.js68
1 files changed, 43 insertions, 25 deletions
diff --git a/core/js/js.js b/core/js/js.js
index e40141ac617..38ccc70cb15 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1637,6 +1637,45 @@ OC.Util = {
},
/**
+ * Returns the width of a generic browser scrollbar
+ *
+ * @return {int} width of scrollbar
+ */
+ getScrollBarWidth: function() {
+ if (this._scrollBarWidth) {
+ return this._scrollBarWidth;
+ }
+
+ var inner = document.createElement('p');
+ inner.style.width = "100%";
+ inner.style.height = "200px";
+
+ var outer = document.createElement('div');
+ outer.style.position = "absolute";
+ outer.style.top = "0px";
+ outer.style.left = "0px";
+ outer.style.visibility = "hidden";
+ outer.style.width = "200px";
+ outer.style.height = "150px";
+ outer.style.overflow = "hidden";
+ outer.appendChild (inner);
+
+ document.body.appendChild (outer);
+ var w1 = inner.offsetWidth;
+ outer.style.overflow = 'scroll';
+ var w2 = inner.offsetWidth;
+ if(w1 === w2) {
+ w2 = outer.clientWidth;
+ }
+
+ document.body.removeChild (outer);
+
+ this._scrollBarWidth = (w1 - w2);
+
+ return this._scrollBarWidth;
+ },
+
+ /**
* Remove the time component from a given date
*
* @param {Date} date date
@@ -1926,32 +1965,11 @@ jQuery.fn.exists = function(){
return this.length > 0;
};
+/**
+ * @deprecated use OC.Util.getScrollBarWidth() instead
+ */
function getScrollBarWidth() {
- var inner = document.createElement('p');
- inner.style.width = "100%";
- inner.style.height = "200px";
-
- var outer = document.createElement('div');
- outer.style.position = "absolute";
- outer.style.top = "0px";
- outer.style.left = "0px";
- outer.style.visibility = "hidden";
- outer.style.width = "200px";
- outer.style.height = "150px";
- outer.style.overflow = "hidden";
- outer.appendChild (inner);
-
- document.body.appendChild (outer);
- var w1 = inner.offsetWidth;
- outer.style.overflow = 'scroll';
- var w2 = inner.offsetWidth;
- if(w1 === w2) {
- w2 = outer.clientWidth;
- }
-
- document.body.removeChild (outer);
-
- return (w1 - w2);
+ return OC.Util.getScrollBarWidth();
}
/**