From 1541f73addc20cf2ae5a9d06a53b93629c9e6d33 Mon Sep 17 00:00:00 2001 From: Hyunje Alex Jun Date: Sat, 24 Jan 2015 15:03:52 +0000 Subject: [PATCH] More independent. --- src/js/lib/dom.js | 24 ++++++++++++++++++++++++ src/js/lib/helper.js | 9 +++++++++ src/js/plugin/ps.js | 27 +++++++++++++-------------- 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/js/lib/dom.js b/src/js/lib/dom.js index 5ce9bad..5fd9d7c 100644 --- a/src/js/lib/dom.js +++ b/src/js/lib/dom.js @@ -49,3 +49,27 @@ exports.css = function (element, styleNameOrObject, styleValue) { } } }; + +exports.matches = function (element, query) { + if (typeof element.matches !== 'undefined') { + return element.matches(query); + } else { + if (typeof element.matchesSelector !== 'undefined') { + return element.matchesSelector(query); + } else if (element.webkitMatchesSelector !== 'undefined') { + return element.webkitMatchesSelector(query); + } else if (element.mozMatchesSelector !== 'undefined') { + return element.mozMatchesSelector(query); + } else if (element.msMatchesSelector !== 'undefined') { + return element.msMatchesSelector(query); + } + } +}; + +exports.remove = function (element) { + if (typeof element.remove !== 'undefined') { + element.remove(); + } else { + element.parentNode.removeChild(element); + } +}; diff --git a/src/js/lib/helper.js b/src/js/lib/helper.js index e0c7c6a..482c609 100644 --- a/src/js/lib/helper.js +++ b/src/js/lib/helper.js @@ -3,6 +3,8 @@ */ 'use strict'; +var d = require('./dom'); + exports.toInt = function (x) { if (typeof x === 'string') { return parseInt(x, 10); @@ -34,3 +36,10 @@ exports.extend = function (original, source) { } return result; }; + +exports.isEditable = function (el) { + return d.matches(el, "input,[contenteditable]") || + d.matches(el, "select,[contenteditable]") || + d.matches(el, "textarea,[contenteditable]") || + d.matches(el, "button,[contenteditable]"); +}; diff --git a/src/js/plugin/ps.js b/src/js/plugin/ps.js index 84e0081..89d6326 100644 --- a/src/js/plugin/ps.js +++ b/src/js/plugin/ps.js @@ -223,7 +223,7 @@ module.exports = function (element, settingOrCommand) { $(scrollbarX).bind(eventClass('mousedown'), function (e) { currentPageX = e.pageX; - currentLeft = $(scrollbarX).position().left; + currentLeft = h.toInt(d.css(scrollbarX, 'left')); cls.add(element, 'ps-in-scrolling'); $(ownerDocument).bind(eventClass('mousemove'), mouseMoveHandler); @@ -255,7 +255,7 @@ module.exports = function (element, settingOrCommand) { $(scrollbarY).bind(eventClass('mousedown'), function (e) { currentPageY = e.pageY; - currentTop = $(scrollbarY).position().top; + currentTop = h.toInt(d.css(scrollbarY, 'top')); cls.add(element, 'ps-in-scrolling'); $(ownerDocument).bind(eventClass('mousemove'), mouseMoveHandler); @@ -424,7 +424,7 @@ module.exports = function (element, settingOrCommand) { while (activeElement.shadowRoot) { activeElement = activeElement.shadowRoot.activeElement; } - if ($(activeElement).is(":input,[contenteditable]")) { + if (h.isEditable(activeElement)) { return; } @@ -485,7 +485,7 @@ module.exports = function (element, settingOrCommand) { $(scrollbarY).bind(eventClass('click'), stopPropagation); $(scrollbarYRail).bind(eventClass('click'), function (e) { var halfOfScrollbarLength = h.toInt(scrollbarYHeight / 2); - var positionTop = e.pageY - $(scrollbarYRail).offset().top - halfOfScrollbarLength; + var positionTop = e.pageY - scrollbarYRail.offsetTop - halfOfScrollbarLength; var maxPositionTop = containerHeight - scrollbarYHeight; var positionRatio = positionTop / maxPositionTop; @@ -501,7 +501,7 @@ module.exports = function (element, settingOrCommand) { $(scrollbarX).bind(eventClass('click'), stopPropagation); $(scrollbarXRail).bind(eventClass('click'), function (e) { var halfOfScrollbarLength = h.toInt(scrollbarXWidth / 2); - var positionLeft = e.pageX - $(scrollbarXRail).offset().left - halfOfScrollbarLength; + var positionLeft = e.pageX - scrollbarXRail.offsetLeft - halfOfScrollbarLength; var maxPositionLeft = containerWidth - scrollbarXWidth; var positionRatio = positionLeft / maxPositionLeft; @@ -570,12 +570,11 @@ module.exports = function (element, settingOrCommand) { $(window).bind(eventClass('mousemove'), function (e) { if (isSelected) { var mousePosition = {x: e.pageX, y: e.pageY}; - var containerOffset = $(element).offset(); var containerGeometry = { - left: containerOffset.left, - right: containerOffset.left + element.offsetWidth, - top: containerOffset.top, - bottom: containerOffset.top + element.offsetHeight + left: element.offsetLeft, + right: element.offsetLeft + element.offsetWidth, + top: element.offsetTop, + bottom: element.offsetTop + element.offsetHeight }; if (mousePosition.x < containerGeometry.left + 3) { @@ -762,10 +761,10 @@ module.exports = function (element, settingOrCommand) { $(element).data('perfect-scrollbar', null); $(element).data('perfect-scrollbar-update', null); $(element).data('perfect-scrollbar-destroy', null); - $(scrollbarX).remove(); - $(scrollbarY).remove(); - $(scrollbarXRail).remove(); - $(scrollbarYRail).remove(); + d.remove(scrollbarX); + d.remove(scrollbarY); + d.remove(scrollbarXRail); + d.remove(scrollbarYRail); // clean all variables scrollbarXActive =