From f1661f7efbfead8d64f15936d491e56672e9fd49 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 16 Nov 2016 17:48:35 +0100 Subject: [PATCH] Use native scrollbars --- .../js/vendor/perfect-scrollbar-0.6.14.min.js | 2 - src/scripts/tutti/1_project-navigation.js | 11 -- src/styles/_project.sass | 1 + src/styles/_search.sass | 5 +- src/styles/main.sass | 1 - src/styles/plugins/_js_perfectscrollbar.sass | 147 ------------------ src/styles/theatre.sass | 2 + src/templates/layout.jade | 5 - .../custom/asset/view_theatre_embed.jade | 5 - src/templates/nodes/search.jade | 6 - src/templates/projects/edit.jade | 5 - src/templates/projects/view.jade | 23 --- src/templates/users/index.jade | 4 - 13 files changed, 5 insertions(+), 212 deletions(-) delete mode 100644 pillar/web/static/assets/js/vendor/perfect-scrollbar-0.6.14.min.js delete mode 100644 src/styles/plugins/_js_perfectscrollbar.sass diff --git a/pillar/web/static/assets/js/vendor/perfect-scrollbar-0.6.14.min.js b/pillar/web/static/assets/js/vendor/perfect-scrollbar-0.6.14.min.js deleted file mode 100644 index 5b9e33ea..00000000 --- a/pillar/web/static/assets/js/vendor/perfect-scrollbar-0.6.14.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/* perfect-scrollbar v0.6.14 */ -!function t(e,n,r){function o(i,s){if(!n[i]){if(!e[i]){var a="function"==typeof require&&require;if(!s&&a)return a(i,!0);if(l)return l(i,!0);var c=new Error("Cannot find module '"+i+"'");throw c.code="MODULE_NOT_FOUND",c}var u=n[i]={exports:{}};e[i][0].call(u.exports,function(t){var n=e[i][1][t];return o(n?n:t)},u,u.exports,t,e,n,r)}return n[i].exports}for(var l="function"==typeof require&&require,i=0;i=0&&n.splice(r,1),t.className=n.join(" ")}n.add=function(t,e){t.classList?t.classList.add(e):r(t,e)},n.remove=function(t,e){t.classList?t.classList.remove(e):o(t,e)},n.list=function(t){return t.classList?Array.prototype.slice.apply(t.classList):t.className.split(" ")}},{}],3:[function(t,e,n){"use strict";function r(t,e){return window.getComputedStyle(t)[e]}function o(t,e,n){return"number"==typeof n&&(n=n.toString()+"px"),t.style[e]=n,t}function l(t,e){for(var n in e){var r=e[n];"number"==typeof r&&(r=r.toString()+"px"),t.style[n]=r}return t}var i={};i.e=function(t,e){var n=document.createElement(t);return n.className=e,n},i.appendTo=function(t,e){return e.appendChild(t),t},i.css=function(t,e,n){return"object"==typeof e?l(t,e):"undefined"==typeof n?r(t,e):o(t,e,n)},i.matches=function(t,e){return"undefined"!=typeof t.matches?t.matches(e):"undefined"!=typeof t.matchesSelector?t.matchesSelector(e):"undefined"!=typeof t.webkitMatchesSelector?t.webkitMatchesSelector(e):"undefined"!=typeof t.mozMatchesSelector?t.mozMatchesSelector(e):"undefined"!=typeof t.msMatchesSelector?t.msMatchesSelector(e):void 0},i.remove=function(t){"undefined"!=typeof t.remove?t.remove():t.parentNode&&t.parentNode.removeChild(t)},i.queryChildren=function(t,e){return Array.prototype.filter.call(t.childNodes,function(t){return i.matches(t,e)})},e.exports=i},{}],4:[function(t,e,n){"use strict";var r=function(t){this.element=t,this.events={}};r.prototype.bind=function(t,e){"undefined"==typeof this.events[t]&&(this.events[t]=[]),this.events[t].push(e),this.element.addEventListener(t,e,!1)},r.prototype.unbind=function(t,e){var n="undefined"!=typeof e;this.events[t]=this.events[t].filter(function(r){return!(!n||r===e)||(this.element.removeEventListener(t,r,!1),!1)},this)},r.prototype.unbindAll=function(){for(var t in this.events)this.unbind(t)};var o=function(){this.eventElements=[]};o.prototype.eventElement=function(t){var e=this.eventElements.filter(function(e){return e.element===t})[0];return"undefined"==typeof e&&(e=new r(t),this.eventElements.push(e)),e},o.prototype.bind=function(t,e,n){this.eventElement(t).bind(e,n)},o.prototype.unbind=function(t,e,n){this.eventElement(t).unbind(e,n)},o.prototype.unbindAll=function(){for(var t=0;te.scrollbarYTop?1:-1;i(t,"top",t.scrollTop+s*e.containerHeight),l(t),r.stopPropagation()}),e.event.bind(e.scrollbarX,"click",r),e.event.bind(e.scrollbarXRail,"click",function(r){var o=r.pageX-window.pageXOffset-n(e.scrollbarXRail).left,s=o>e.scrollbarXLeft?1:-1;i(t,"left",t.scrollLeft+s*e.containerWidth),l(t),r.stopPropagation()})}var o=t("../instances"),l=t("../update-geometry"),i=t("../update-scroll");e.exports=function(t){var e=o.get(t);r(t,e)}},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],11:[function(t,e,n){"use strict";function r(t,e){function n(n){var o=r+n*e.railXRatio,i=Math.max(0,e.scrollbarXRail.getBoundingClientRect().left)+e.railXRatio*(e.railXWidth-e.scrollbarXWidth);o<0?e.scrollbarXLeft=0:o>i?e.scrollbarXLeft=i:e.scrollbarXLeft=o;var s=l.toInt(e.scrollbarXLeft*(e.contentWidth-e.containerWidth)/(e.containerWidth-e.railXRatio*e.scrollbarXWidth))-e.negativeScrollAdjustment;c(t,"left",s)}var r=null,o=null,s=function(e){n(e.pageX-o),a(t),e.stopPropagation(),e.preventDefault()},u=function(){l.stopScrolling(t,"x"),e.event.unbind(e.ownerDocument,"mousemove",s)};e.event.bind(e.scrollbarX,"mousedown",function(n){o=n.pageX,r=l.toInt(i.css(e.scrollbarX,"left"))*e.railXRatio,l.startScrolling(t,"x"),e.event.bind(e.ownerDocument,"mousemove",s),e.event.once(e.ownerDocument,"mouseup",u),n.stopPropagation(),n.preventDefault()})}function o(t,e){function n(n){var o=r+n*e.railYRatio,i=Math.max(0,e.scrollbarYRail.getBoundingClientRect().top)+e.railYRatio*(e.railYHeight-e.scrollbarYHeight);o<0?e.scrollbarYTop=0:o>i?e.scrollbarYTop=i:e.scrollbarYTop=o;var s=l.toInt(e.scrollbarYTop*(e.contentHeight-e.containerHeight)/(e.containerHeight-e.railYRatio*e.scrollbarYHeight));c(t,"top",s)}var r=null,o=null,s=function(e){n(e.pageY-o),a(t),e.stopPropagation(),e.preventDefault()},u=function(){l.stopScrolling(t,"y"),e.event.unbind(e.ownerDocument,"mousemove",s)};e.event.bind(e.scrollbarY,"mousedown",function(n){o=n.pageY,r=l.toInt(i.css(e.scrollbarY,"top"))*e.railYRatio,l.startScrolling(t,"y"),e.event.bind(e.ownerDocument,"mousemove",s),e.event.once(e.ownerDocument,"mouseup",u),n.stopPropagation(),n.preventDefault()})}var l=t("../../lib/helper"),i=t("../../lib/dom"),s=t("../instances"),a=t("../update-geometry"),c=t("../update-scroll");e.exports=function(t){var e=s.get(t);r(t,e),o(t,e)}},{"../../lib/dom":3,"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],12:[function(t,e,n){"use strict";function r(t,e){function n(n,r){var o=t.scrollTop;if(0===n){if(!e.scrollbarYActive)return!1;if(0===o&&r>0||o>=e.contentHeight-e.containerHeight&&r<0)return!e.settings.wheelPropagation}var l=t.scrollLeft;if(0===r){if(!e.scrollbarXActive)return!1;if(0===l&&n<0||l>=e.contentWidth-e.containerWidth&&n>0)return!e.settings.wheelPropagation}return!0}var r=!1;e.event.bind(t,"mouseenter",function(){r=!0}),e.event.bind(t,"mouseleave",function(){r=!1});var i=!1;e.event.bind(e.ownerDocument,"keydown",function(c){if(!(c.isDefaultPrevented&&c.isDefaultPrevented()||c.defaultPrevented)){var u=l.matches(e.scrollbarX,":focus")||l.matches(e.scrollbarY,":focus");if(r||u){var d=document.activeElement?document.activeElement:e.ownerDocument.activeElement;if(d){if("IFRAME"===d.tagName)d=d.contentDocument.activeElement;else for(;d.shadowRoot;)d=d.shadowRoot.activeElement;if(o.isEditable(d))return}var p=0,f=0;switch(c.which){case 37:p=c.metaKey?-e.contentWidth:c.altKey?-e.containerWidth:-30;break;case 38:f=c.metaKey?e.contentHeight:c.altKey?e.containerHeight:30;break;case 39:p=c.metaKey?e.contentWidth:c.altKey?e.containerWidth:30;break;case 40:f=c.metaKey?-e.contentHeight:c.altKey?-e.containerHeight:-30;break;case 33:f=90;break;case 32:f=c.shiftKey?90:-90;break;case 34:f=-90;break;case 35:f=c.ctrlKey?-e.contentHeight:-e.containerHeight;break;case 36:f=c.ctrlKey?t.scrollTop:e.containerHeight;break;default:return}a(t,"top",t.scrollTop-f),a(t,"left",t.scrollLeft+p),s(t),i=n(p,f),i&&c.preventDefault()}}})}var o=t("../../lib/helper"),l=t("../../lib/dom"),i=t("../instances"),s=t("../update-geometry"),a=t("../update-scroll");e.exports=function(t){var e=i.get(t);r(t,e)}},{"../../lib/dom":3,"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],13:[function(t,e,n){"use strict";function r(t,e){function n(n,r){var o=t.scrollTop;if(0===n){if(!e.scrollbarYActive)return!1;if(0===o&&r>0||o>=e.contentHeight-e.containerHeight&&r<0)return!e.settings.wheelPropagation}var l=t.scrollLeft;if(0===r){if(!e.scrollbarXActive)return!1;if(0===l&&n<0||l>=e.contentWidth-e.containerWidth&&n>0)return!e.settings.wheelPropagation}return!0}function r(t){var e=t.deltaX,n=-1*t.deltaY;return"undefined"!=typeof e&&"undefined"!=typeof n||(e=-1*t.wheelDeltaX/6,n=t.wheelDeltaY/6),t.deltaMode&&1===t.deltaMode&&(e*=10,n*=10),e!==e&&n!==n&&(e=0,n=t.wheelDelta),t.shiftKey?[-n,-e]:[e,n]}function o(e,n){var r=t.querySelector("textarea:hover, select[multiple]:hover, .ps-child:hover");if(r){if(!window.getComputedStyle(r).overflow.match(/(scroll|auto)/))return!1;var o=r.scrollHeight-r.clientHeight;if(o>0&&!(0===r.scrollTop&&n>0||r.scrollTop===o&&n<0))return!0;var l=r.scrollLeft-r.clientWidth;if(l>0&&!(0===r.scrollLeft&&e<0||r.scrollLeft===l&&e>0))return!0}return!1}function s(s){var c=r(s),u=c[0],d=c[1];o(u,d)||(a=!1,e.settings.useBothWheelAxes?e.scrollbarYActive&&!e.scrollbarXActive?(d?i(t,"top",t.scrollTop-d*e.settings.wheelSpeed):i(t,"top",t.scrollTop+u*e.settings.wheelSpeed),a=!0):e.scrollbarXActive&&!e.scrollbarYActive&&(u?i(t,"left",t.scrollLeft+u*e.settings.wheelSpeed):i(t,"left",t.scrollLeft-d*e.settings.wheelSpeed),a=!0):(i(t,"top",t.scrollTop-d*e.settings.wheelSpeed),i(t,"left",t.scrollLeft+u*e.settings.wheelSpeed)),l(t),a=a||n(u,d),a&&(s.stopPropagation(),s.preventDefault()))}var a=!1;"undefined"!=typeof window.onwheel?e.event.bind(t,"wheel",s):"undefined"!=typeof window.onmousewheel&&e.event.bind(t,"mousewheel",s)}var o=t("../instances"),l=t("../update-geometry"),i=t("../update-scroll");e.exports=function(t){var e=o.get(t);r(t,e)}},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],14:[function(t,e,n){"use strict";function r(t,e){e.event.bind(t,"scroll",function(){l(t)})}var o=t("../instances"),l=t("../update-geometry");e.exports=function(t){var e=o.get(t);r(t,e)}},{"../instances":18,"../update-geometry":19}],15:[function(t,e,n){"use strict";function r(t,e){function n(){var t=window.getSelection?window.getSelection():document.getSelection?document.getSelection():"";return 0===t.toString().length?null:t.getRangeAt(0).commonAncestorContainer}function r(){c||(c=setInterval(function(){return l.get(t)?(s(t,"top",t.scrollTop+u.top),s(t,"left",t.scrollLeft+u.left),void i(t)):void clearInterval(c)},50))}function a(){c&&(clearInterval(c),c=null),o.stopScrolling(t)}var c=null,u={top:0,left:0},d=!1;e.event.bind(e.ownerDocument,"selectionchange",function(){t.contains(n())?d=!0:(d=!1,a())}),e.event.bind(window,"mouseup",function(){d&&(d=!1,a())}),e.event.bind(window,"keyup",function(){d&&(d=!1,a())}),e.event.bind(window,"mousemove",function(e){if(d){var n={x:e.pageX,y:e.pageY},l={left:t.offsetLeft,right:t.offsetLeft+t.offsetWidth,top:t.offsetTop,bottom:t.offsetTop+t.offsetHeight};n.xl.right-3?(u.left=5,o.startScrolling(t,"x")):u.left=0,n.yl.bottom-3?(n.y-l.bottom+3<5?u.top=5:u.top=20,o.startScrolling(t,"y")):u.top=0,0===u.top&&0===u.left?a():r()}})}var o=t("../../lib/helper"),l=t("../instances"),i=t("../update-geometry"),s=t("../update-scroll");e.exports=function(t){var e=l.get(t);r(t,e)}},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],16:[function(t,e,n){"use strict";function r(t,e,n,r){function o(n,r){var o=t.scrollTop,l=t.scrollLeft,i=Math.abs(n),s=Math.abs(r);if(s>i){if(r<0&&o===e.contentHeight-e.containerHeight||r>0&&0===o)return!e.settings.swipePropagation}else if(i>s&&(n<0&&l===e.contentWidth-e.containerWidth||n>0&&0===l))return!e.settings.swipePropagation;return!0}function a(e,n){s(t,"top",t.scrollTop-n),s(t,"left",t.scrollLeft-e),i(t)}function c(){w=!0}function u(){w=!1}function d(t){return t.targetTouches?t.targetTouches[0]:t}function p(t){return!(!t.targetTouches||1!==t.targetTouches.length)||!(!t.pointerType||"mouse"===t.pointerType||t.pointerType===t.MSPOINTER_TYPE_MOUSE)}function f(t){if(p(t)){Y=!0;var e=d(t);g.pageX=e.pageX,g.pageY=e.pageY,v=(new Date).getTime(),null!==y&&clearInterval(y),t.stopPropagation()}}function h(t){if(!Y&&e.settings.swipePropagation&&f(t),!w&&Y&&p(t)){var n=d(t),r={pageX:n.pageX,pageY:n.pageY},l=r.pageX-g.pageX,i=r.pageY-g.pageY;a(l,i),g=r;var s=(new Date).getTime(),c=s-v;c>0&&(m.x=l/c,m.y=i/c,v=s),o(l,i)&&(t.stopPropagation(),t.preventDefault())}}function b(){!w&&Y&&(Y=!1,clearInterval(y),y=setInterval(function(){return l.get(t)&&(m.x||m.y)?Math.abs(m.x)<.01&&Math.abs(m.y)<.01?void clearInterval(y):(a(30*m.x,30*m.y),m.x*=.8,void(m.y*=.8)):void clearInterval(y)},10))}var g={},v=0,m={},y=null,w=!1,Y=!1;n&&(e.event.bind(window,"touchstart",c),e.event.bind(window,"touchend",u),e.event.bind(t,"touchstart",f),e.event.bind(t,"touchmove",h),e.event.bind(t,"touchend",b)),r&&(window.PointerEvent?(e.event.bind(window,"pointerdown",c),e.event.bind(window,"pointerup",u),e.event.bind(t,"pointerdown",f),e.event.bind(t,"pointermove",h),e.event.bind(t,"pointerup",b)):window.MSPointerEvent&&(e.event.bind(window,"MSPointerDown",c),e.event.bind(window,"MSPointerUp",u),e.event.bind(t,"MSPointerDown",f),e.event.bind(t,"MSPointerMove",h),e.event.bind(t,"MSPointerUp",b)))}var o=t("../../lib/helper"),l=t("../instances"),i=t("../update-geometry"),s=t("../update-scroll");e.exports=function(t){if(o.env.supportsTouch||o.env.supportsIePointer){var e=l.get(t);r(t,e,o.env.supportsTouch,o.env.supportsIePointer)}}},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],17:[function(t,e,n){"use strict";var r=t("../lib/helper"),o=t("../lib/class"),l=t("./instances"),i=t("./update-geometry"),s={"click-rail":t("./handler/click-rail"),"drag-scrollbar":t("./handler/drag-scrollbar"),keyboard:t("./handler/keyboard"),wheel:t("./handler/mouse-wheel"),touch:t("./handler/touch"),selection:t("./handler/selection")},a=t("./handler/native-scroll");e.exports=function(t,e){e="object"==typeof e?e:{},o.add(t,"ps-container");var n=l.add(t);n.settings=r.extend(n.settings,e),o.add(t,"ps-theme-"+n.settings.theme),n.settings.handlers.forEach(function(e){s[e](t)}),a(t),i(t)}},{"../lib/class":2,"../lib/helper":6,"./handler/click-rail":10,"./handler/drag-scrollbar":11,"./handler/keyboard":12,"./handler/mouse-wheel":13,"./handler/native-scroll":14,"./handler/selection":15,"./handler/touch":16,"./instances":18,"./update-geometry":19}],18:[function(t,e,n){"use strict";function r(t){function e(){a.add(t,"ps-focus")}function n(){a.remove(t,"ps-focus")}var r=this;r.settings=s.clone(c),r.containerWidth=null,r.containerHeight=null,r.contentWidth=null,r.contentHeight=null,r.isRtl="rtl"===u.css(t,"direction"),r.isNegativeScroll=function(){var e=t.scrollLeft,n=null;return t.scrollLeft=-1,n=t.scrollLeft<0,t.scrollLeft=e,n}(),r.negativeScrollAdjustment=r.isNegativeScroll?t.scrollWidth-t.clientWidth:0,r.event=new d,r.ownerDocument=t.ownerDocument||document,r.scrollbarXRail=u.appendTo(u.e("div","ps-scrollbar-x-rail"),t),r.scrollbarX=u.appendTo(u.e("div","ps-scrollbar-x"),r.scrollbarXRail),r.scrollbarX.setAttribute("tabindex",0),r.event.bind(r.scrollbarX,"focus",e),r.event.bind(r.scrollbarX,"blur",n),r.scrollbarXActive=null,r.scrollbarXWidth=null,r.scrollbarXLeft=null,r.scrollbarXBottom=s.toInt(u.css(r.scrollbarXRail,"bottom")),r.isScrollbarXUsingBottom=r.scrollbarXBottom===r.scrollbarXBottom,r.scrollbarXTop=r.isScrollbarXUsingBottom?null:s.toInt(u.css(r.scrollbarXRail,"top")),r.railBorderXWidth=s.toInt(u.css(r.scrollbarXRail,"borderLeftWidth"))+s.toInt(u.css(r.scrollbarXRail,"borderRightWidth")),u.css(r.scrollbarXRail,"display","block"),r.railXMarginWidth=s.toInt(u.css(r.scrollbarXRail,"marginLeft"))+s.toInt(u.css(r.scrollbarXRail,"marginRight")),u.css(r.scrollbarXRail,"display",""),r.railXWidth=null,r.railXRatio=null,r.scrollbarYRail=u.appendTo(u.e("div","ps-scrollbar-y-rail"),t),r.scrollbarY=u.appendTo(u.e("div","ps-scrollbar-y"),r.scrollbarYRail),r.scrollbarY.setAttribute("tabindex",0),r.event.bind(r.scrollbarY,"focus",e),r.event.bind(r.scrollbarY,"blur",n),r.scrollbarYActive=null,r.scrollbarYHeight=null,r.scrollbarYTop=null,r.scrollbarYRight=s.toInt(u.css(r.scrollbarYRail,"right")),r.isScrollbarYUsingRight=r.scrollbarYRight===r.scrollbarYRight,r.scrollbarYLeft=r.isScrollbarYUsingRight?null:s.toInt(u.css(r.scrollbarYRail,"left")),r.scrollbarYOuterWidth=r.isRtl?s.outerWidth(r.scrollbarY):null,r.railBorderYWidth=s.toInt(u.css(r.scrollbarYRail,"borderTopWidth"))+s.toInt(u.css(r.scrollbarYRail,"borderBottomWidth")),u.css(r.scrollbarYRail,"display","block"),r.railYMarginHeight=s.toInt(u.css(r.scrollbarYRail,"marginTop"))+s.toInt(u.css(r.scrollbarYRail,"marginBottom")),u.css(r.scrollbarYRail,"display",""),r.railYHeight=null,r.railYRatio=null}function o(t){return t.getAttribute("data-ps-id")}function l(t,e){t.setAttribute("data-ps-id",e)}function i(t){t.removeAttribute("data-ps-id")}var s=t("../lib/helper"),a=t("../lib/class"),c=t("./default-setting"),u=t("../lib/dom"),d=t("../lib/event-manager"),p=t("../lib/guid"),f={};n.add=function(t){var e=p();return l(t,e),f[e]=new r(t),f[e]},n.remove=function(t){delete f[o(t)],i(t)},n.get=function(t){return f[o(t)]}},{"../lib/class":2,"../lib/dom":3,"../lib/event-manager":4,"../lib/guid":5,"../lib/helper":6,"./default-setting":8}],19:[function(t,e,n){"use strict";function r(t,e){return t.settings.minScrollbarLength&&(e=Math.max(e,t.settings.minScrollbarLength)),t.settings.maxScrollbarLength&&(e=Math.min(e,t.settings.maxScrollbarLength)),e}function o(t,e){var n={width:e.railXWidth};e.isRtl?n.left=e.negativeScrollAdjustment+t.scrollLeft+e.containerWidth-e.contentWidth:n.left=t.scrollLeft,e.isScrollbarXUsingBottom?n.bottom=e.scrollbarXBottom-t.scrollTop:n.top=e.scrollbarXTop+t.scrollTop,s.css(e.scrollbarXRail,n);var r={top:t.scrollTop,height:e.railYHeight};e.isScrollbarYUsingRight?e.isRtl?r.right=e.contentWidth-(e.negativeScrollAdjustment+t.scrollLeft)-e.scrollbarYRight-e.scrollbarYOuterWidth:r.right=e.scrollbarYRight-t.scrollLeft:e.isRtl?r.left=e.negativeScrollAdjustment+t.scrollLeft+2*e.containerWidth-e.contentWidth-e.scrollbarYLeft-e.scrollbarYOuterWidth:r.left=e.scrollbarYLeft+t.scrollLeft,s.css(e.scrollbarYRail,r),s.css(e.scrollbarX,{left:e.scrollbarXLeft,width:e.scrollbarXWidth-e.railBorderXWidth}),s.css(e.scrollbarY,{top:e.scrollbarYTop,height:e.scrollbarYHeight-e.railBorderYWidth})}var l=t("../lib/helper"),i=t("../lib/class"),s=t("../lib/dom"),a=t("./instances"),c=t("./update-scroll");e.exports=function(t){var e=a.get(t);e.containerWidth=t.clientWidth,e.containerHeight=t.clientHeight,e.contentWidth=t.scrollWidth,e.contentHeight=t.scrollHeight;var n;t.contains(e.scrollbarXRail)||(n=s.queryChildren(t,".ps-scrollbar-x-rail"),n.length>0&&n.forEach(function(t){s.remove(t)}),s.appendTo(e.scrollbarXRail,t)),t.contains(e.scrollbarYRail)||(n=s.queryChildren(t,".ps-scrollbar-y-rail"),n.length>0&&n.forEach(function(t){s.remove(t)}),s.appendTo(e.scrollbarYRail,t)),!e.settings.suppressScrollX&&e.containerWidth+e.settings.scrollXMarginOffset=e.railXWidth-e.scrollbarXWidth&&(e.scrollbarXLeft=e.railXWidth-e.scrollbarXWidth),e.scrollbarYTop>=e.railYHeight-e.scrollbarYHeight&&(e.scrollbarYTop=e.railYHeight-e.scrollbarYHeight),o(t,e),e.scrollbarXActive?i.add(t,"ps-active-x"):(i.remove(t,"ps-active-x"),e.scrollbarXWidth=0,e.scrollbarXLeft=0,c(t,"left",0)),e.scrollbarYActive?i.add(t,"ps-active-y"):(i.remove(t,"ps-active-y"),e.scrollbarYHeight=0,e.scrollbarYTop=0,c(t,"top",0))}},{"../lib/class":2,"../lib/dom":3,"../lib/helper":6,"./instances":18,"./update-scroll":20}],20:[function(t,e,n){"use strict";var r,o,l=t("./instances"),i=function(t){var e=document.createEvent("Event");return e.initEvent(t,!0,!0),e};e.exports=function(t,e,n){if("undefined"==typeof t)throw"You must provide an element to the update-scroll function";if("undefined"==typeof e)throw"You must provide an axis to the update-scroll function";if("undefined"==typeof n)throw"You must provide a value to the update-scroll function";"top"===e&&n<=0&&(t.scrollTop=n=0,t.dispatchEvent(i("ps-y-reach-start"))),"left"===e&&n<=0&&(t.scrollLeft=n=0,t.dispatchEvent(i("ps-x-reach-start")));var s=l.get(t);"top"===e&&n>=s.contentHeight-s.containerHeight&&(n=s.contentHeight-s.containerHeight,n-t.scrollTop<=1?n=t.scrollTop:t.scrollTop=n,t.dispatchEvent(i("ps-y-reach-end"))),"left"===e&&n>=s.contentWidth-s.containerWidth&&(n=s.contentWidth-s.containerWidth,n-t.scrollLeft<=1?n=t.scrollLeft:t.scrollLeft=n,t.dispatchEvent(i("ps-x-reach-end"))),r||(r=t.scrollTop),o||(o=t.scrollLeft),"top"===e&&nr&&t.dispatchEvent(i("ps-scroll-down")),"left"===e&&no&&t.dispatchEvent(i("ps-scroll-right")),"top"===e&&(t.scrollTop=r=n,t.dispatchEvent(i("ps-scroll-y"))),"left"===e&&(t.scrollLeft=o=n,t.dispatchEvent(i("ps-scroll-x")))}},{"./instances":18}],21:[function(t,e,n){"use strict";var r=t("../lib/helper"),o=t("../lib/dom"),l=t("./instances"),i=t("./update-geometry"),s=t("./update-scroll");e.exports=function(t){var e=l.get(t);e&&(e.negativeScrollAdjustment=e.isNegativeScroll?t.scrollWidth-t.clientWidth:0,o.css(e.scrollbarXRail,"display","block"),o.css(e.scrollbarYRail,"display","block"),e.railXMarginWidth=r.toInt(o.css(e.scrollbarXRail,"marginLeft"))+r.toInt(o.css(e.scrollbarXRail,"marginRight")),e.railYMarginHeight=r.toInt(o.css(e.scrollbarYRail,"marginTop"))+r.toInt(o.css(e.scrollbarYRail,"marginBottom")),o.css(e.scrollbarXRail,"display","none"),o.css(e.scrollbarYRail,"display","none"),i(t),s(t,"top",t.scrollTop),s(t,"left",t.scrollLeft),o.css(e.scrollbarXRail,"display",""),o.css(e.scrollbarYRail,"display",""))}},{"../lib/dom":3,"../lib/helper":6,"./instances":18,"./update-geometry":19,"./update-scroll":20}]},{},[1]); \ No newline at end of file diff --git a/src/scripts/tutti/1_project-navigation.js b/src/scripts/tutti/1_project-navigation.js index 4850a2f7..0a895c0b 100644 --- a/src/scripts/tutti/1_project-navigation.js +++ b/src/scripts/tutti/1_project-navigation.js @@ -2,20 +2,12 @@ function projectNavCollapse() { $("#project-side-container").addClass('collapsed'); $("ul.breadcrumb.context").addClass('active'); - - if (typeof Ps !== 'undefined'){ - Ps.destroy(document.getElementById('project_tree')); - }; }; function projectNavExpand() { $("#project-side-container").removeClass('collapsed'); $("ul.breadcrumb.context").removeAttr('class'); - - if (typeof Ps !== 'undefined'){ - Ps.initialize(document.getElementById('project_tree'), {suppressScrollX: true}); - } }; function projectNavCheck(){ @@ -177,7 +169,4 @@ function containerResizeY(window_height){ } }; - - if (projectTree){ Ps.update(projectTree) } - }; diff --git a/src/styles/_project.sass b/src/styles/_project.sass index 45f27be5..3cba04a4 100644 --- a/src/styles/_project.sass +++ b/src/styles/_project.sass @@ -740,6 +740,7 @@ ul.project_nav-edit-list position: relative // for scrollbar alignment margin-top: $project_header-height background-color: $color-background-light + overflow-y: auto &.edit margin-top: 0 diff --git a/src/styles/_search.sass b/src/styles/_search.sass index d1bbd971..defb3cf0 100644 --- a/src/styles/_search.sass +++ b/src/styles/_search.sass @@ -309,10 +309,9 @@ $search-hit-width_grid: 100px border-left: 2px solid darken(white, 3%) #search-hit-container - position: absolute // for custom scrollbars + position: absolute // for scrollbars width: 100% - .ps-scrollbar-y-rail - z-index: 1 + overflow-y: auto #error_container position: relative diff --git a/src/styles/main.sass b/src/styles/main.sass index e07f8470..12ce2a31 100644 --- a/src/styles/main.sass +++ b/src/styles/main.sass @@ -19,6 +19,5 @@ @import plugins/_jstree @import plugins/_js_select2 -@import plugins/js_perfectscrollbar /* CSS for pillar-font comes from fontello.com using static/assets/font/config.json */ diff --git a/src/styles/plugins/_js_perfectscrollbar.sass b/src/styles/plugins/_js_perfectscrollbar.sass deleted file mode 100644 index 3139630f..00000000 --- a/src/styles/plugins/_js_perfectscrollbar.sass +++ /dev/null @@ -1,147 +0,0 @@ -$color-scrollbars-base: lighten($color-background-nav, 25%) - -.ps-container - .ps-scrollbar-y - opacity: 0 - transition: opacity 150ms ease-in-out - - &:hover - .ps-scrollbar-y - opacity: 1 - - -/* perfect-scrollbar v0.6.3 */ -.ps-container - -ms-touch-action: none - overflow: hidden !important - -.ps-container.ps-active-x > .ps-scrollbar-x-rail, -.ps-container.ps-active-y > .ps-scrollbar-y-rail - display: block - -.ps-container > .ps-scrollbar-x-rail - display: none - position: absolute - /* please don't change 'position' */ - -webkit-border-radius: 4px - -moz-border-radius: 4px - -ms-border-radius: 4px - border-radius: 4px - opacity: 0 - -webkit-transition: background-color .2s linear, opacity .2s linear - -moz-transition: background-color .2s linear, opacity .2s linear - -o-transition: background-color .2s linear, opacity .2s linear - transition: background-color .2s linear, opacity .2s linear - bottom: 3px - /* there must be 'bottom' for ps-scrollbar-x-rail */ - height: 8px - -.ps-container > .ps-scrollbar-x-rail > .ps-scrollbar-x - position: absolute - /* please don't change 'position' */ - background-color: $color-scrollbars-base - -webkit-border-radius: 4px - -moz-border-radius: 4px - -ms-border-radius: 4px - border-radius: 4px - -webkit-transition: background-color .2s linear - -moz-transition: background-color .2s linear - -o-transition: background-color .2s linear - transition: background-color .2s linear - bottom: 0 - /* there must be 'bottom' for ps-scrollbar-x */ - height: 5px - -.ps-container > .ps-scrollbar-y-rail - display: none - position: absolute - /* please don't change 'position' */ - -webkit-border-radius: 4px - -moz-border-radius: 4px - -ms-border-radius: 4px - border-radius: 4px - opacity: 0.6 - -webkit-transition: background-color .2s linear, opacity .2s linear - -moz-transition: background-color .2s linear, opacity .2s linear - -o-transition: background-color .2s linear, opacity .2s linear - transition: background-color .2s linear, opacity .2s linear - right: 3px - /* there must be 'right' for ps-scrollbar-y-rail */ - width: 5px - margin: - top: 5px - bottom: 5px - -#project_nav.ps-container > .ps-scrollbar-y-rail - margin-top: $project_header-height + 10 - -.ps-container > .ps-scrollbar-y-rail > .ps-scrollbar-y - position: absolute - /* please don't change 'position' */ - background-color: $color-scrollbars-base - -webkit-border-radius: 4px - -moz-border-radius: 4px - -ms-border-radius: 4px - border-radius: 4px - -webkit-transition: background-color .2s linear - -moz-transition: background-color .2s linear - -o-transition: background-color .2s linear - transition: background-color .2s linear, height .2s linear - right: 0 - /* there must be 'right' for ps-scrollbar-y */ - width: 5px - - -.ps-container.ps-in-scrolling - pointer-events: none - - &.ps-x - .ps-scrollbar-x-rail - background-color: rgba($color-scrollbars-base, .2) - opacity: 0.9 - .ps-scrollbar-x - background-color: rgba($color-scrollbars-base, .2) - - &.ps-y - .ps-scrollbar-y-rail - background-color: rgba($color-scrollbars-base, .2) - opacity: 0.9 - .ps-scrollbar-y - background-color: rgba($color-scrollbars-base, .2) - - -.ps-container:hover - - .ps-scrollbar-x-rail, .ps-scrollbar-y-rail - opacity: 0.6 - - &:hover - background-color: rgba($color-scrollbars-base, .2) - opacity: 0.9 - - .ps-scrollbar-x, .ps-scrollbar-y - background-color: $color-scrollbars-base - - - &.ps-in-scrolling - pointer-events: none - - &.ps-x - .ps-scrollbar-x-rail - background-color: rgba($color-scrollbars-base, .2) - opacity: 0.9 - - .ps-scrollbar-x - background-color: rgba($color-scrollbars-base, .1) - - &.ps-y - .ps-scrollbar-y-rail - background-color: rgba($color-scrollbars-base, .2) - opacity: 0.9 - - .ps-scrollbar-y - background-color: rgba($color-scrollbars-base, .1) - - - - diff --git a/src/styles/theatre.sass b/src/styles/theatre.sass index 66579678..aa18c3cb 100644 --- a/src/styles/theatre.sass +++ b/src/styles/theatre.sass @@ -45,6 +45,7 @@ body.theatre .container-page width: 100% padding: 25px position: relative + overflow: auto &:hover ul#theatre-tools @@ -145,6 +146,7 @@ body.theatre .container-page border-left: 2px solid $color-background-nav transition: right 200ms ease-in-out position: absolute + overflow-y: auto .theatre-info-header border-bottom: thin solid $color-background diff --git a/src/templates/layout.jade b/src/templates/layout.jade index cb295465..f2f8973a 100644 --- a/src/templates/layout.jade +++ b/src/templates/layout.jade @@ -408,7 +408,6 @@ html(lang="en") link(href='//fonts.googleapis.com/css?family=Roboto:300,400', rel='stylesheet', type='text/css') script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.bootstrap-3.3.7.min.js') }}") - script(src="{{ url_for('static_pillar', filename='assets/js/vendor/perfect-scrollbar-0.6.14.min.js') }}") script. $(document).ready(function() { @@ -417,10 +416,6 @@ html(lang="en") // Resize #notifications and change overflow for scrollbars $(window).on("resize", function() { notificationsResize(); }); - - // Load perfectScrollbar - Ps.initialize(document.getElementById('notifications'), {suppressScrollX: true}); - {% endif %} }); diff --git a/src/templates/nodes/custom/asset/view_theatre_embed.jade b/src/templates/nodes/custom/asset/view_theatre_embed.jade index 7752faaa..44a21c89 100644 --- a/src/templates/nodes/custom/asset/view_theatre_embed.jade +++ b/src/templates/nodes/custom/asset/view_theatre_embed.jade @@ -49,9 +49,6 @@ include ../_scripts script. $(function () { - // Load scrollbar for sidebar - Ps.initialize(document.getElementById('theatre-info'), {suppressScrollX: true}); - var file_width = {{ node.file.width }}; var file_height = {{ node.file.height }}; var theatre_media = document.getElementById('theatre-media'); @@ -80,11 +77,9 @@ script. if (started_zoomed_in) { $theatre_media.removeClass('zoomed-in'); $theatre_media.addClass('zoomed-out'); - Ps.destroy(theatre_media); } else { $theatre_media.addClass('zoomed-in'); $theatre_media.removeClass('zoomed-out'); - Ps.initialize(theatre_media); } // Style toolbar button diff --git a/src/templates/nodes/search.jade b/src/templates/nodes/search.jade index 8e29756f..a862a80c 100644 --- a/src/templates/nodes/search.jade +++ b/src/templates/nodes/search.jade @@ -265,12 +265,6 @@ script(type="text/javascript"). } }); - /* Scrollbars */ - if (typeof Ps !== 'undefined'){ - Ps.initialize(searchList, {suppressScrollX: true}); - Ps.initialize(document.getElementById('search-hit-container'), {suppressScrollX: true}); - } - /* Hide site-wide search, kinda confusing */ $('.search-input').hide(); diff --git a/src/templates/projects/edit.jade b/src/templates/projects/edit.jade index 4411a9b2..dfdbe0f4 100644 --- a/src/templates/projects/edit.jade +++ b/src/templates/projects/edit.jade @@ -174,11 +174,6 @@ script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets script(type="text/javascript"). - /* Initialize scrollbars */ - if ((typeof Ps !== 'undefined') && window.innerWidth > 768){ - Ps.initialize(document.getElementById('project_tree'), {suppressScrollX: true}); - } - $('.project-mode-edit').show(); ProjectUtils.setProjectAttributes({projectId: "{{project._id}}", isProject: true, nodeId: ''}); diff --git a/src/templates/projects/view.jade b/src/templates/projects/view.jade index 3572489a..f02371e9 100644 --- a/src/templates/projects/view.jade +++ b/src/templates/projects/view.jade @@ -244,11 +244,6 @@ script. var projectTree = document.getElementById('project_tree'); - /* Initialize project_tree scrollbar */ - if ((typeof Ps !== 'undefined') && projectTree && window.innerWidth > 768){ - Ps.initialize(projectTree, {suppressScrollX: true}); - } - var urlNodeMove = "{{url_for('projects.move_node')}}"; var urlNodeFeature = "{{url_for('projects.add_featured_node')}}"; var urlNodeDelete = "{{url_for('projects.delete_node')}}"; @@ -564,18 +559,6 @@ script. displayStorage(data.node.original.storage_node, data.node.original.path); jstreeAPI.toggle_node(data.node); } - - /* Update scrollbar */ - Ps.update(projectTree); - }); - - $(projectTree).on("open_node.jstree", function () { - /* Update scrollbar */ - Ps.update(projectTree); - }); - $(projectTree).on("close_node.jstree", function () { - /* Update scrollbar */ - Ps.update(projectTree); }); }; @@ -593,12 +576,6 @@ script. } }); - if (projectTree){ - $(projectTree).hover(function(){ - Ps.update(projectTree); - }); - } - | {% endblock %} | {% block comment_scripts %} {% endblock%} diff --git a/src/templates/users/index.jade b/src/templates/users/index.jade index bb591148..52f487ef 100644 --- a/src/templates/users/index.jade +++ b/src/templates/users/index.jade @@ -96,10 +96,6 @@ script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.select script(type="text/javascript"). - if (typeof Ps !== 'undefined'){ - Ps.initialize(document.getElementById('hits'), {suppressScrollX: true}); - } - function displayUser(userId) { var url = '/u/' + userId + '/edit?embed=1'; $.get(url, function(dataHtml){