perfect-scrollbar: update to 0.6.10
This commit is contained in:
parent
748d0e576c
commit
24d4716204
4 changed files with 65 additions and 104 deletions
|
@ -170,9 +170,8 @@
|
||||||
var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
|
var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
|
||||||
var notifications_empty = unescape($("#nav-notifications-menu").html());
|
var notifications_empty = unescape($("#nav-notifications-menu").html());
|
||||||
|
|
||||||
/* enable perfect-scrollbars for nav-notivications-menu */
|
/* enable perfect-scrollbars for different elements */
|
||||||
$('#nav-notifications-menu').perfectScrollbar();
|
$('#nav-notifications-menu, aside').perfectScrollbar();
|
||||||
$('aside').perfectScrollbar();
|
|
||||||
|
|
||||||
/* nav update event */
|
/* nav update event */
|
||||||
$('nav').bind('nav-update', function(e,data){
|
$('nav').bind('nav-update', function(e,data){
|
||||||
|
|
|
@ -1,10 +1,19 @@
|
||||||
/* perfect-scrollbar v0.6.8 */
|
/* perfect-scrollbar v0.6.10 */
|
||||||
.ps-container {
|
.ps-container {
|
||||||
-ms-touch-action: none;
|
-ms-touch-action: none;
|
||||||
overflow: hidden !important; }
|
touch-action: none;
|
||||||
|
overflow: hidden !important;
|
||||||
|
-ms-overflow-style: none; }
|
||||||
|
@supports (-ms-overflow-style: none) {
|
||||||
|
.ps-container {
|
||||||
|
overflow: auto !important; } }
|
||||||
|
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
|
||||||
|
.ps-container {
|
||||||
|
overflow: auto !important; } }
|
||||||
.ps-container.ps-active-x > .ps-scrollbar-x-rail,
|
.ps-container.ps-active-x > .ps-scrollbar-x-rail,
|
||||||
.ps-container.ps-active-y > .ps-scrollbar-y-rail {
|
.ps-container.ps-active-y > .ps-scrollbar-y-rail {
|
||||||
display: block; }
|
display: block;
|
||||||
|
background-color: transparent; }
|
||||||
.ps-container.ps-in-scrolling {
|
.ps-container.ps-in-scrolling {
|
||||||
pointer-events: none; }
|
pointer-events: none; }
|
||||||
.ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
|
.ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
|
||||||
|
@ -23,13 +32,12 @@
|
||||||
/* please don't change 'position' */
|
/* please don't change 'position' */
|
||||||
-webkit-border-radius: 4px;
|
-webkit-border-radius: 4px;
|
||||||
-moz-border-radius: 4px;
|
-moz-border-radius: 4px;
|
||||||
-ms-border-radius: 4px;
|
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
-webkit-transition: background-color 0.2s linear, opacity 0.2s linear;
|
-webkit-transition: background-color .2s linear, opacity .2s linear;
|
||||||
-moz-transition: background-color 0.2s linear, opacity 0.2s linear;
|
-moz-transition: background-color .2s linear, opacity .2s linear;
|
||||||
-o-transition: background-color 0.2s linear, opacity 0.2s linear;
|
-o-transition: background-color .2s linear, opacity .2s linear;
|
||||||
transition: background-color 0.2s linear, opacity 0.2s linear;
|
transition: background-color .2s linear, opacity .2s linear;
|
||||||
bottom: 3px;
|
bottom: 3px;
|
||||||
/* there must be 'bottom' for ps-scrollbar-x-rail */
|
/* there must be 'bottom' for ps-scrollbar-x-rail */
|
||||||
height: 8px; }
|
height: 8px; }
|
||||||
|
@ -39,12 +47,11 @@
|
||||||
background-color: #aaa;
|
background-color: #aaa;
|
||||||
-webkit-border-radius: 4px;
|
-webkit-border-radius: 4px;
|
||||||
-moz-border-radius: 4px;
|
-moz-border-radius: 4px;
|
||||||
-ms-border-radius: 4px;
|
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
-webkit-transition: background-color 0.2s linear;
|
-webkit-transition: background-color .2s linear;
|
||||||
-moz-transition: background-color 0.2s linear;
|
-moz-transition: background-color .2s linear;
|
||||||
-o-transition: background-color 0.2s linear;
|
-o-transition: background-color .2s linear;
|
||||||
transition: background-color 0.2s linear;
|
transition: background-color .2s linear;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
/* there must be 'bottom' for ps-scrollbar-x */
|
/* there must be 'bottom' for ps-scrollbar-x */
|
||||||
height: 8px; }
|
height: 8px; }
|
||||||
|
@ -54,13 +61,12 @@
|
||||||
/* please don't change 'position' */
|
/* please don't change 'position' */
|
||||||
-webkit-border-radius: 4px;
|
-webkit-border-radius: 4px;
|
||||||
-moz-border-radius: 4px;
|
-moz-border-radius: 4px;
|
||||||
-ms-border-radius: 4px;
|
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
-webkit-transition: background-color 0.2s linear, opacity 0.2s linear;
|
-webkit-transition: background-color .2s linear, opacity .2s linear;
|
||||||
-moz-transition: background-color 0.2s linear, opacity 0.2s linear;
|
-moz-transition: background-color .2s linear, opacity .2s linear;
|
||||||
-o-transition: background-color 0.2s linear, opacity 0.2s linear;
|
-o-transition: background-color .2s linear, opacity .2s linear;
|
||||||
transition: background-color 0.2s linear, opacity 0.2s linear;
|
transition: background-color .2s linear, opacity .2s linear;
|
||||||
right: 3px;
|
right: 3px;
|
||||||
/* there must be 'right' for ps-scrollbar-y-rail */
|
/* there must be 'right' for ps-scrollbar-y-rail */
|
||||||
width: 8px; }
|
width: 8px; }
|
||||||
|
@ -70,12 +76,11 @@
|
||||||
background-color: #aaa;
|
background-color: #aaa;
|
||||||
-webkit-border-radius: 4px;
|
-webkit-border-radius: 4px;
|
||||||
-moz-border-radius: 4px;
|
-moz-border-radius: 4px;
|
||||||
-ms-border-radius: 4px;
|
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
-webkit-transition: background-color 0.2s linear;
|
-webkit-transition: background-color .2s linear;
|
||||||
-moz-transition: background-color 0.2s linear;
|
-moz-transition: background-color .2s linear;
|
||||||
-o-transition: background-color 0.2s linear;
|
-o-transition: background-color .2s linear;
|
||||||
transition: background-color 0.2s linear;
|
transition: background-color .2s linear;
|
||||||
right: 0;
|
right: 0;
|
||||||
/* there must be 'right' for ps-scrollbar-y */
|
/* there must be 'right' for ps-scrollbar-y */
|
||||||
width: 8px; }
|
width: 8px; }
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
/* perfect-scrollbar v0.6.8 */
|
/* perfect-scrollbar v0.6.10
|
||||||
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
|
*
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
||||||
* Licensed under the MIT License
|
* Licensed under the MIT License
|
||||||
*
|
*
|
||||||
* Source: https://github.com/noraesae/perfect-scrollbar
|
* Source: https://github.com/noraesae/perfect-scrollbar
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var ps = require('../main')
|
var ps = require('../main')
|
||||||
|
@ -50,9 +52,6 @@ if (typeof define === 'function' && define.amd) {
|
||||||
module.exports = mountJQuery;
|
module.exports = mountJQuery;
|
||||||
|
|
||||||
},{"../main":7,"../plugin/instances":18}],2:[function(require,module,exports){
|
},{"../main":7,"../plugin/instances":18}],2:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
function oldAdd(element, className) {
|
function oldAdd(element, className) {
|
||||||
|
@ -97,9 +96,6 @@ exports.list = function (element) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{}],3:[function(require,module,exports){
|
},{}],3:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var DOM = {};
|
var DOM = {};
|
||||||
|
@ -186,9 +182,6 @@ DOM.queryChildren = function (element, selector) {
|
||||||
module.exports = DOM;
|
module.exports = DOM;
|
||||||
|
|
||||||
},{}],4:[function(require,module,exports){
|
},{}],4:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var EventElement = function (element) {
|
var EventElement = function (element) {
|
||||||
|
@ -262,9 +255,6 @@ EventManager.prototype.once = function (element, eventName, handler) {
|
||||||
module.exports = EventManager;
|
module.exports = EventManager;
|
||||||
|
|
||||||
},{}],5:[function(require,module,exports){
|
},{}],5:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
module.exports = (function () {
|
module.exports = (function () {
|
||||||
|
@ -280,9 +270,6 @@ module.exports = (function () {
|
||||||
})();
|
})();
|
||||||
|
|
||||||
},{}],6:[function(require,module,exports){
|
},{}],6:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var cls = require('./class')
|
var cls = require('./class')
|
||||||
|
@ -366,9 +353,6 @@ exports.env = {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"./class":2,"./dom":3}],7:[function(require,module,exports){
|
},{"./class":2,"./dom":3}],7:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var destroy = require('./plugin/destroy')
|
var destroy = require('./plugin/destroy')
|
||||||
|
@ -382,9 +366,6 @@ module.exports = {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"./plugin/destroy":9,"./plugin/initialize":17,"./plugin/update":21}],8:[function(require,module,exports){
|
},{"./plugin/destroy":9,"./plugin/initialize":17,"./plugin/update":21}],8:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
@ -400,13 +381,11 @@ module.exports = {
|
||||||
useKeyboard: true,
|
useKeyboard: true,
|
||||||
useSelectionScroll: false,
|
useSelectionScroll: false,
|
||||||
wheelPropagation: false,
|
wheelPropagation: false,
|
||||||
wheelSpeed: 1
|
wheelSpeed: 1,
|
||||||
|
theme: 'default'
|
||||||
};
|
};
|
||||||
|
|
||||||
},{}],9:[function(require,module,exports){
|
},{}],9:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var d = require('../lib/dom')
|
var d = require('../lib/dom')
|
||||||
|
@ -431,9 +410,6 @@ module.exports = function (element) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../lib/dom":3,"../lib/helper":6,"./instances":18}],10:[function(require,module,exports){
|
},{"../lib/dom":3,"../lib/helper":6,"./instances":18}],10:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var h = require('../../lib/helper')
|
var h = require('../../lib/helper')
|
||||||
|
@ -496,9 +472,6 @@ module.exports = function (element) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],11:[function(require,module,exports){
|
},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],11:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var d = require('../../lib/dom')
|
var d = require('../../lib/dom')
|
||||||
|
@ -604,12 +577,10 @@ module.exports = function (element) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../../lib/dom":3,"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],12:[function(require,module,exports){
|
},{"../../lib/dom":3,"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],12:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var h = require('../../lib/helper')
|
var h = require('../../lib/helper')
|
||||||
|
, d = require('../../lib/dom')
|
||||||
, instances = require('../instances')
|
, instances = require('../instances')
|
||||||
, updateGeometry = require('../update-geometry')
|
, updateGeometry = require('../update-geometry')
|
||||||
, updateScroll = require('../update-scroll');
|
, updateScroll = require('../update-scroll');
|
||||||
|
@ -652,7 +623,10 @@ function bindKeyboardHandler(element, i) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!hovered) {
|
var focused = d.matches(i.scrollbarX, ':focus') ||
|
||||||
|
d.matches(i.scrollbarY, ':focus');
|
||||||
|
|
||||||
|
if (!hovered && !focused) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -730,10 +704,7 @@ module.exports = function (element) {
|
||||||
bindKeyboardHandler(element, i);
|
bindKeyboardHandler(element, i);
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],13:[function(require,module,exports){
|
},{"../../lib/dom":3,"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],13:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var instances = require('../instances')
|
var instances = require('../instances')
|
||||||
|
@ -870,9 +841,6 @@ module.exports = function (element) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],14:[function(require,module,exports){
|
},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],14:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var instances = require('../instances')
|
var instances = require('../instances')
|
||||||
|
@ -890,9 +858,6 @@ module.exports = function (element) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../instances":18,"../update-geometry":19}],15:[function(require,module,exports){
|
},{"../instances":18,"../update-geometry":19}],15:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var h = require('../../lib/helper')
|
var h = require('../../lib/helper')
|
||||||
|
@ -1004,9 +969,6 @@ module.exports = function (element) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],16:[function(require,module,exports){
|
},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],16:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var instances = require('../instances')
|
var instances = require('../instances')
|
||||||
|
@ -1177,9 +1139,6 @@ module.exports = function (element, supportsTouch, supportsIePointer) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],17:[function(require,module,exports){
|
},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],17:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var cls = require('../lib/class')
|
var cls = require('../lib/class')
|
||||||
|
@ -1205,6 +1164,7 @@ module.exports = function (element, userSettings) {
|
||||||
var i = instances.add(element);
|
var i = instances.add(element);
|
||||||
|
|
||||||
i.settings = h.extend(i.settings, userSettings);
|
i.settings = h.extend(i.settings, userSettings);
|
||||||
|
cls.add(element, 'ps-theme-' + i.settings.theme);
|
||||||
|
|
||||||
clickRailHandler(element);
|
clickRailHandler(element);
|
||||||
dragScrollbarHandler(element);
|
dragScrollbarHandler(element);
|
||||||
|
@ -1226,12 +1186,10 @@ module.exports = function (element, userSettings) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../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(require,module,exports){
|
},{"../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(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var d = require('../lib/dom')
|
var cls = require('../lib/class')
|
||||||
|
, d = require('../lib/dom')
|
||||||
, defaultSettings = require('./default-setting')
|
, defaultSettings = require('./default-setting')
|
||||||
, EventManager = require('../lib/event-manager')
|
, EventManager = require('../lib/event-manager')
|
||||||
, guid = require('../lib/guid')
|
, guid = require('../lib/guid')
|
||||||
|
@ -1261,9 +1219,19 @@ function Instance(element) {
|
||||||
i.event = new EventManager();
|
i.event = new EventManager();
|
||||||
i.ownerDocument = element.ownerDocument || document;
|
i.ownerDocument = element.ownerDocument || document;
|
||||||
|
|
||||||
|
function focus() {
|
||||||
|
cls.add(element, 'ps-focus');
|
||||||
|
}
|
||||||
|
|
||||||
|
function blur() {
|
||||||
|
cls.remove(element, 'ps-focus');
|
||||||
|
}
|
||||||
|
|
||||||
i.scrollbarXRail = d.appendTo(d.e('div', 'ps-scrollbar-x-rail'), element);
|
i.scrollbarXRail = d.appendTo(d.e('div', 'ps-scrollbar-x-rail'), element);
|
||||||
i.scrollbarX = d.appendTo(d.e('div', 'ps-scrollbar-x'), i.scrollbarXRail);
|
i.scrollbarX = d.appendTo(d.e('div', 'ps-scrollbar-x'), i.scrollbarXRail);
|
||||||
i.scrollbarX.setAttribute('tabindex', 0);
|
i.scrollbarX.setAttribute('tabindex', 0);
|
||||||
|
i.event.bind(i.scrollbarX, 'focus', focus);
|
||||||
|
i.event.bind(i.scrollbarX, 'blur', blur);
|
||||||
i.scrollbarXActive = null;
|
i.scrollbarXActive = null;
|
||||||
i.scrollbarXWidth = null;
|
i.scrollbarXWidth = null;
|
||||||
i.scrollbarXLeft = null;
|
i.scrollbarXLeft = null;
|
||||||
|
@ -1281,6 +1249,8 @@ function Instance(element) {
|
||||||
i.scrollbarYRail = d.appendTo(d.e('div', 'ps-scrollbar-y-rail'), element);
|
i.scrollbarYRail = d.appendTo(d.e('div', 'ps-scrollbar-y-rail'), element);
|
||||||
i.scrollbarY = d.appendTo(d.e('div', 'ps-scrollbar-y'), i.scrollbarYRail);
|
i.scrollbarY = d.appendTo(d.e('div', 'ps-scrollbar-y'), i.scrollbarYRail);
|
||||||
i.scrollbarY.setAttribute('tabindex', 0);
|
i.scrollbarY.setAttribute('tabindex', 0);
|
||||||
|
i.event.bind(i.scrollbarY, 'focus', focus);
|
||||||
|
i.event.bind(i.scrollbarY, 'blur', blur);
|
||||||
i.scrollbarYActive = null;
|
i.scrollbarYActive = null;
|
||||||
i.scrollbarYHeight = null;
|
i.scrollbarYHeight = null;
|
||||||
i.scrollbarYTop = null;
|
i.scrollbarYTop = null;
|
||||||
|
@ -1336,10 +1306,7 @@ exports.get = function (element) {
|
||||||
return instances[getId(element)];
|
return instances[getId(element)];
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../lib/dom":3,"../lib/event-manager":4,"../lib/guid":5,"../lib/helper":6,"./default-setting":8}],19:[function(require,module,exports){
|
},{"../lib/class":2,"../lib/dom":3,"../lib/event-manager":4,"../lib/guid":5,"../lib/helper":6,"./default-setting":8}],19:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var cls = require('../lib/class')
|
var cls = require('../lib/class')
|
||||||
|
@ -1468,9 +1435,6 @@ module.exports = function (element) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"../lib/class":2,"../lib/dom":3,"../lib/helper":6,"./instances":18,"./update-scroll":20}],20:[function(require,module,exports){
|
},{"../lib/class":2,"../lib/dom":3,"../lib/helper":6,"./instances":18,"./update-scroll":20}],20:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var instances = require('./instances');
|
var instances = require('./instances');
|
||||||
|
@ -1513,29 +1477,25 @@ module.exports = function (element, axis, value) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (axis === 'top' && value <= 0) {
|
if (axis === 'top' && value <= 0) {
|
||||||
element.scrollTop = 0;
|
element.scrollTop = value = 0; // don't allow negative scroll
|
||||||
element.dispatchEvent(yStartEvent);
|
element.dispatchEvent(yStartEvent);
|
||||||
return; // don't allow negative scroll
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (axis === 'left' && value <= 0) {
|
if (axis === 'left' && value <= 0) {
|
||||||
element.scrollLeft = 0;
|
element.scrollLeft = value = 0; // don't allow negative scroll
|
||||||
element.dispatchEvent(xStartEvent);
|
element.dispatchEvent(xStartEvent);
|
||||||
return; // don't allow negative scroll
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var i = instances.get(element);
|
var i = instances.get(element);
|
||||||
|
|
||||||
if (axis === 'top' && value >= i.contentHeight - i.containerHeight) {
|
if (axis === 'top' && value >= i.contentHeight - i.containerHeight) {
|
||||||
element.scrollTop = i.contentHeight - i.containerHeight;
|
element.scrollTop = value = i.contentHeight - i.containerHeight; // don't allow scroll past container
|
||||||
element.dispatchEvent(yEndEvent);
|
element.dispatchEvent(yEndEvent);
|
||||||
return; // don't allow scroll past container
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (axis === 'left' && value >= i.contentWidth - i.containerWidth) {
|
if (axis === 'left' && value >= i.contentWidth - i.containerWidth) {
|
||||||
element.scrollLeft = i.contentWidth - i.containerWidth;
|
element.scrollLeft = value = i.contentWidth - i.containerWidth; // don't allow scroll past container
|
||||||
element.dispatchEvent(xEndEvent);
|
element.dispatchEvent(xEndEvent);
|
||||||
return; // don't allow scroll past container
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!lastTop) {
|
if (!lastTop) {
|
||||||
|
@ -1575,9 +1535,6 @@ module.exports = function (element, axis, value) {
|
||||||
};
|
};
|
||||||
|
|
||||||
},{"./instances":18}],21:[function(require,module,exports){
|
},{"./instances":18}],21:[function(require,module,exports){
|
||||||
/* Copyright (c) 2015 Hyunje Alex Jun and other contributors
|
|
||||||
* Licensed under the MIT License
|
|
||||||
*/
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var d = require('../lib/dom')
|
var d = require('../lib/dom')
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
/* perfect-scrollbar v0.6.8 */
|
/* perfect-scrollbar v0.6.10 */
|
||||||
.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-in-scrolling{pointer-events:none}.ps-container.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail{background-color:#eee;opacity:0.9}.ps-container.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail>.ps-scrollbar-x{background-color:#999}.ps-container.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail{background-color:#eee;opacity:0.9}.ps-container.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail>.ps-scrollbar-y{background-color:#999}.ps-container>.ps-scrollbar-x-rail{display:none;position:absolute;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;border-radius:4px;opacity:0;-webkit-transition:background-color 0.2s linear,opacity 0.2s linear;-moz-transition:background-color 0.2s linear,opacity 0.2s linear;-o-transition:background-color 0.2s linear,opacity 0.2s linear;transition:background-color 0.2s linear,opacity 0.2s linear;bottom:3px;height:8px}.ps-container>.ps-scrollbar-x-rail>.ps-scrollbar-x{position:absolute;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;border-radius:4px;-webkit-transition:background-color 0.2s linear;-moz-transition:background-color 0.2s linear;-o-transition:background-color 0.2s linear;transition:background-color 0.2s linear;bottom:0;height:8px}.ps-container>.ps-scrollbar-y-rail{display:none;position:absolute;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;border-radius:4px;opacity:0;-webkit-transition:background-color 0.2s linear,opacity 0.2s linear;-moz-transition:background-color 0.2s linear,opacity 0.2s linear;-o-transition:background-color 0.2s linear,opacity 0.2s linear;transition:background-color 0.2s linear,opacity 0.2s linear;right:3px;width:8px}.ps-container>.ps-scrollbar-y-rail>.ps-scrollbar-y{position:absolute;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;border-radius:4px;-webkit-transition:background-color 0.2s linear;-moz-transition:background-color 0.2s linear;-o-transition:background-color 0.2s linear;transition:background-color 0.2s linear;right:0;width:8px}.ps-container:hover.ps-in-scrolling{pointer-events:none}.ps-container:hover.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail{background-color:#eee;opacity:0.9}.ps-container:hover.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail>.ps-scrollbar-x{background-color:#999}.ps-container:hover.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail{background-color:#eee;opacity:0.9}.ps-container:hover.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail>.ps-scrollbar-y{background-color:#999}.ps-container:hover>.ps-scrollbar-x-rail,.ps-container:hover>.ps-scrollbar-y-rail{opacity:0.6}.ps-container:hover>.ps-scrollbar-x-rail:hover{background-color:#eee;opacity:0.9}.ps-container:hover>.ps-scrollbar-x-rail:hover>.ps-scrollbar-x{background-color:#999}.ps-container:hover>.ps-scrollbar-y-rail:hover{background-color:#eee;opacity:0.9}.ps-container:hover>.ps-scrollbar-y-rail:hover>.ps-scrollbar-y{background-color:#999}
|
.ps-container{-ms-touch-action:none;touch-action:none;overflow:hidden !important;-ms-overflow-style:none}@supports (-ms-overflow-style: none){.ps-container{overflow:auto !important}}@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none){.ps-container{overflow:auto !important}}.ps-container.ps-active-x>.ps-scrollbar-x-rail,.ps-container.ps-active-y>.ps-scrollbar-y-rail{display:block;background-color:transparent}.ps-container.ps-in-scrolling{pointer-events:none}.ps-container.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail{background-color:#eee;opacity:0.9}.ps-container.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail>.ps-scrollbar-x{background-color:#999}.ps-container.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail{background-color:#eee;opacity:0.9}.ps-container.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail>.ps-scrollbar-y{background-color:#999}.ps-container>.ps-scrollbar-x-rail{display:none;position:absolute;-webkit-border-radius:4px;-moz-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;height:8px}.ps-container>.ps-scrollbar-x-rail>.ps-scrollbar-x{position:absolute;background-color:#aaa;-webkit-border-radius:4px;-moz-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;height:8px}.ps-container>.ps-scrollbar-y-rail{display:none;position:absolute;-webkit-border-radius:4px;-moz-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;right:3px;width:8px}.ps-container>.ps-scrollbar-y-rail>.ps-scrollbar-y{position:absolute;background-color:#aaa;-webkit-border-radius:4px;-moz-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;right:0;width:8px}.ps-container:hover.ps-in-scrolling{pointer-events:none}.ps-container:hover.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail{background-color:#eee;opacity:0.9}.ps-container:hover.ps-in-scrolling.ps-x>.ps-scrollbar-x-rail>.ps-scrollbar-x{background-color:#999}.ps-container:hover.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail{background-color:#eee;opacity:0.9}.ps-container:hover.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail>.ps-scrollbar-y{background-color:#999}.ps-container:hover>.ps-scrollbar-x-rail,.ps-container:hover>.ps-scrollbar-y-rail{opacity:0.6}.ps-container:hover>.ps-scrollbar-x-rail:hover{background-color:#eee;opacity:0.9}.ps-container:hover>.ps-scrollbar-x-rail:hover>.ps-scrollbar-x{background-color:#999}.ps-container:hover>.ps-scrollbar-y-rail:hover{background-color:#eee;opacity:0.9}.ps-container:hover>.ps-scrollbar-y-rail:hover>.ps-scrollbar-y{background-color:#999}
|
||||||
|
|
Loading…
Reference in a new issue