Rename helper module variable 'h' to '_'

Enhance readability.
This commit is contained in:
Hyunje Alex Jun
2016-02-22 21:49:33 +09:00
parent 4a661f181f
commit d277a363b0
10 changed files with 46 additions and 46 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
'use strict'; 'use strict';
var d = require('../lib/dom') var d = require('../lib/dom')
, h = require('../lib/helper') , _ = require('../lib/helper')
, instances = require('./instances'); , instances = require('./instances');
module.exports = function (element) { module.exports = function (element) {
@@ -16,7 +16,7 @@ module.exports = function (element) {
d.remove(i.scrollbarY); d.remove(i.scrollbarY);
d.remove(i.scrollbarXRail); d.remove(i.scrollbarXRail);
d.remove(i.scrollbarYRail); d.remove(i.scrollbarYRail);
h.removePsClasses(element); _.removePsClasses(element);
instances.remove(element); instances.remove(element);
}; };
+3 -3
View File
@@ -1,6 +1,6 @@
'use strict'; 'use strict';
var h = require('../../lib/helper') var _ = require('../../lib/helper')
, instances = require('../instances') , instances = require('../instances')
, updateGeometry = require('../update-geometry') , updateGeometry = require('../update-geometry')
, updateScroll = require('../update-scroll'); , updateScroll = require('../update-scroll');
@@ -15,7 +15,7 @@ function bindClickRailHandler(element, i) {
i.event.bind(i.scrollbarY, 'click', stopPropagation); i.event.bind(i.scrollbarY, 'click', stopPropagation);
} }
i.event.bind(i.scrollbarYRail, 'click', function (e) { i.event.bind(i.scrollbarYRail, 'click', function (e) {
var halfOfScrollbarLength = h.toInt(i.scrollbarYHeight / 2); var halfOfScrollbarLength = _.toInt(i.scrollbarYHeight / 2);
var positionTop = i.railYRatio * (e.pageY - window.pageYOffset - pageOffset(i.scrollbarYRail).top - halfOfScrollbarLength); var positionTop = i.railYRatio * (e.pageY - window.pageYOffset - pageOffset(i.scrollbarYRail).top - halfOfScrollbarLength);
var maxPositionTop = i.railYRatio * (i.railYHeight - i.scrollbarYHeight); var maxPositionTop = i.railYRatio * (i.railYHeight - i.scrollbarYHeight);
var positionRatio = positionTop / maxPositionTop; var positionRatio = positionTop / maxPositionTop;
@@ -36,7 +36,7 @@ function bindClickRailHandler(element, i) {
i.event.bind(i.scrollbarX, 'click', stopPropagation); i.event.bind(i.scrollbarX, 'click', stopPropagation);
} }
i.event.bind(i.scrollbarXRail, 'click', function (e) { i.event.bind(i.scrollbarXRail, 'click', function (e) {
var halfOfScrollbarLength = h.toInt(i.scrollbarXWidth / 2); var halfOfScrollbarLength = _.toInt(i.scrollbarXWidth / 2);
var positionLeft = i.railXRatio * (e.pageX - window.pageXOffset - pageOffset(i.scrollbarXRail).left - halfOfScrollbarLength); var positionLeft = i.railXRatio * (e.pageX - window.pageXOffset - pageOffset(i.scrollbarXRail).left - halfOfScrollbarLength);
var maxPositionLeft = i.railXRatio * (i.railXWidth - i.scrollbarXWidth); var maxPositionLeft = i.railXRatio * (i.railXWidth - i.scrollbarXWidth);
var positionRatio = positionLeft / maxPositionLeft; var positionRatio = positionLeft / maxPositionLeft;
+9 -9
View File
@@ -1,7 +1,7 @@
'use strict'; 'use strict';
var d = require('../../lib/dom') var d = require('../../lib/dom')
, h = require('../../lib/helper') , _ = require('../../lib/helper')
, instances = require('../instances') , instances = require('../instances')
, updateGeometry = require('../update-geometry') , updateGeometry = require('../update-geometry')
, updateScroll = require('../update-scroll'); , updateScroll = require('../update-scroll');
@@ -22,7 +22,7 @@ function bindMouseScrollXHandler(element, i) {
i.scrollbarXLeft = newLeft; i.scrollbarXLeft = newLeft;
} }
var scrollLeft = h.toInt(i.scrollbarXLeft * (i.contentWidth - i.containerWidth) / (i.containerWidth - (i.railXRatio * i.scrollbarXWidth))) - i.negativeScrollAdjustment; var scrollLeft = _.toInt(i.scrollbarXLeft * (i.contentWidth - i.containerWidth) / (i.containerWidth - (i.railXRatio * i.scrollbarXWidth))) - i.negativeScrollAdjustment;
updateScroll(element, 'left', scrollLeft); updateScroll(element, 'left', scrollLeft);
} }
@@ -34,14 +34,14 @@ function bindMouseScrollXHandler(element, i) {
}; };
var mouseUpHandler = function () { var mouseUpHandler = function () {
h.stopScrolling(element, 'x'); _.stopScrolling(element, 'x');
i.event.unbind(i.ownerDocument, 'mousemove', mouseMoveHandler); i.event.unbind(i.ownerDocument, 'mousemove', mouseMoveHandler);
}; };
i.event.bind(i.scrollbarX, 'mousedown', function (e) { i.event.bind(i.scrollbarX, 'mousedown', function (e) {
currentPageX = e.pageX; currentPageX = e.pageX;
currentLeft = h.toInt(d.css(i.scrollbarX, 'left')) * i.railXRatio; currentLeft = _.toInt(d.css(i.scrollbarX, 'left')) * i.railXRatio;
h.startScrolling(element, 'x'); _.startScrolling(element, 'x');
i.event.bind(i.ownerDocument, 'mousemove', mouseMoveHandler); i.event.bind(i.ownerDocument, 'mousemove', mouseMoveHandler);
i.event.once(i.ownerDocument, 'mouseup', mouseUpHandler); i.event.once(i.ownerDocument, 'mouseup', mouseUpHandler);
@@ -67,7 +67,7 @@ function bindMouseScrollYHandler(element, i) {
i.scrollbarYTop = newTop; i.scrollbarYTop = newTop;
} }
var scrollTop = h.toInt(i.scrollbarYTop * (i.contentHeight - i.containerHeight) / (i.containerHeight - (i.railYRatio * i.scrollbarYHeight))); var scrollTop = _.toInt(i.scrollbarYTop * (i.contentHeight - i.containerHeight) / (i.containerHeight - (i.railYRatio * i.scrollbarYHeight)));
updateScroll(element, 'top', scrollTop); updateScroll(element, 'top', scrollTop);
} }
@@ -79,14 +79,14 @@ function bindMouseScrollYHandler(element, i) {
}; };
var mouseUpHandler = function () { var mouseUpHandler = function () {
h.stopScrolling(element, 'y'); _.stopScrolling(element, 'y');
i.event.unbind(i.ownerDocument, 'mousemove', mouseMoveHandler); i.event.unbind(i.ownerDocument, 'mousemove', mouseMoveHandler);
}; };
i.event.bind(i.scrollbarY, 'mousedown', function (e) { i.event.bind(i.scrollbarY, 'mousedown', function (e) {
currentPageY = e.pageY; currentPageY = e.pageY;
currentTop = h.toInt(d.css(i.scrollbarY, 'top')) * i.railYRatio; currentTop = _.toInt(d.css(i.scrollbarY, 'top')) * i.railYRatio;
h.startScrolling(element, 'y'); _.startScrolling(element, 'y');
i.event.bind(i.ownerDocument, 'mousemove', mouseMoveHandler); i.event.bind(i.ownerDocument, 'mousemove', mouseMoveHandler);
i.event.once(i.ownerDocument, 'mouseup', mouseUpHandler); i.event.once(i.ownerDocument, 'mouseup', mouseUpHandler);
+2 -2
View File
@@ -1,6 +1,6 @@
'use strict'; 'use strict';
var h = require('../../lib/helper') var _ = require('../../lib/helper')
, d = require('../../lib/dom') , d = require('../../lib/dom')
, instances = require('../instances') , instances = require('../instances')
, updateGeometry = require('../update-geometry') , updateGeometry = require('../update-geometry')
@@ -57,7 +57,7 @@ function bindKeyboardHandler(element, i) {
while (activeElement.shadowRoot) { while (activeElement.shadowRoot) {
activeElement = activeElement.shadowRoot.activeElement; activeElement = activeElement.shadowRoot.activeElement;
} }
if (h.isEditable(activeElement)) { if (_.isEditable(activeElement)) {
return; return;
} }
} }
+6 -6
View File
@@ -1,6 +1,6 @@
'use strict'; 'use strict';
var h = require('../../lib/helper') var _ = require('../../lib/helper')
, instances = require('../instances') , instances = require('../instances')
, updateGeometry = require('../update-geometry') , updateGeometry = require('../update-geometry')
, updateScroll = require('../update-scroll'); , updateScroll = require('../update-scroll');
@@ -37,7 +37,7 @@ function bindSelectionHandler(element, i) {
clearInterval(scrollingLoop); clearInterval(scrollingLoop);
scrollingLoop = null; scrollingLoop = null;
} }
h.stopScrolling(element); _.stopScrolling(element);
} }
var isSelected = false; var isSelected = false;
@@ -68,10 +68,10 @@ function bindSelectionHandler(element, i) {
if (mousePosition.x < containerGeometry.left + 3) { if (mousePosition.x < containerGeometry.left + 3) {
scrollDiff.left = -5; scrollDiff.left = -5;
h.startScrolling(element, 'x'); _.startScrolling(element, 'x');
} else if (mousePosition.x > containerGeometry.right - 3) { } else if (mousePosition.x > containerGeometry.right - 3) {
scrollDiff.left = 5; scrollDiff.left = 5;
h.startScrolling(element, 'x'); _.startScrolling(element, 'x');
} else { } else {
scrollDiff.left = 0; scrollDiff.left = 0;
} }
@@ -82,14 +82,14 @@ function bindSelectionHandler(element, i) {
} else { } else {
scrollDiff.top = -20; scrollDiff.top = -20;
} }
h.startScrolling(element, 'y'); _.startScrolling(element, 'y');
} else if (mousePosition.y > containerGeometry.bottom - 3) { } else if (mousePosition.y > containerGeometry.bottom - 3) {
if (mousePosition.y - containerGeometry.bottom + 3 < 5) { if (mousePosition.y - containerGeometry.bottom + 3 < 5) {
scrollDiff.top = 5; scrollDiff.top = 5;
} else { } else {
scrollDiff.top = 20; scrollDiff.top = 20;
} }
h.startScrolling(element, 'y'); _.startScrolling(element, 'y');
} else { } else {
scrollDiff.top = 0; scrollDiff.top = 0;
} }
+3 -3
View File
@@ -1,7 +1,7 @@
'use strict'; 'use strict';
var instances = require('../instances') var instances = require('../instances')
, h = require('../../lib/helper') , _ = require('../../lib/helper')
, updateGeometry = require('../update-geometry') , updateGeometry = require('../update-geometry')
, updateScroll = require('../update-scroll'); , updateScroll = require('../update-scroll');
@@ -167,10 +167,10 @@ function bindTouchHandler(element, i, supportsTouch, supportsIePointer) {
} }
module.exports = function (element) { module.exports = function (element) {
if (!h.env.supportsTouch && !h.env.supportsIePointer) { if (!_.env.supportsTouch && !_.env.supportsIePointer) {
return; return;
} }
var i = instances.get(element); var i = instances.get(element);
bindTouchHandler(element, i, h.env.supportsTouch, h.env.supportsIePointer); bindTouchHandler(element, i, _.env.supportsTouch, _.env.supportsIePointer);
}; };
+2 -2
View File
@@ -1,7 +1,7 @@
'use strict'; 'use strict';
var cls = require('../lib/class') var cls = require('../lib/class')
, h = require('../lib/helper') , _ = require('../lib/helper')
, instances = require('./instances') , instances = require('./instances')
, updateGeometry = require('./update-geometry'); , updateGeometry = require('./update-geometry');
@@ -24,7 +24,7 @@ module.exports = function (element, userSettings) {
// Create a plugin instance. // Create a plugin instance.
var i = instances.add(element); var i = instances.add(element);
i.settings = h.extend(i.settings, userSettings); i.settings = _.extend(i.settings, userSettings);
cls.add(element, 'ps-theme-' + i.settings.theme); cls.add(element, 'ps-theme-' + i.settings.theme);
i.settings.handlers.forEach(function (handlerName) { i.settings.handlers.forEach(function (handlerName) {
+11 -11
View File
@@ -5,14 +5,14 @@ var cls = require('../lib/class')
, 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')
, h = require('../lib/helper'); , _ = require('../lib/helper');
var instances = {}; var instances = {};
function Instance(element) { function Instance(element) {
var i = this; var i = this;
i.settings = h.clone(defaultSettings); i.settings = _.clone(defaultSettings);
i.containerWidth = null; i.containerWidth = null;
i.containerHeight = null; i.containerHeight = null;
i.contentWidth = null; i.contentWidth = null;
@@ -47,13 +47,13 @@ function Instance(element) {
i.scrollbarXActive = null; i.scrollbarXActive = null;
i.scrollbarXWidth = null; i.scrollbarXWidth = null;
i.scrollbarXLeft = null; i.scrollbarXLeft = null;
i.scrollbarXBottom = h.toInt(d.css(i.scrollbarXRail, 'bottom')); i.scrollbarXBottom = _.toInt(d.css(i.scrollbarXRail, 'bottom'));
i.isScrollbarXUsingBottom = i.scrollbarXBottom === i.scrollbarXBottom; // !isNaN i.isScrollbarXUsingBottom = i.scrollbarXBottom === i.scrollbarXBottom; // !isNaN
i.scrollbarXTop = i.isScrollbarXUsingBottom ? null : h.toInt(d.css(i.scrollbarXRail, 'top')); i.scrollbarXTop = i.isScrollbarXUsingBottom ? null : _.toInt(d.css(i.scrollbarXRail, 'top'));
i.railBorderXWidth = h.toInt(d.css(i.scrollbarXRail, 'borderLeftWidth')) + h.toInt(d.css(i.scrollbarXRail, 'borderRightWidth')); i.railBorderXWidth = _.toInt(d.css(i.scrollbarXRail, 'borderLeftWidth')) + _.toInt(d.css(i.scrollbarXRail, 'borderRightWidth'));
// Set rail to display:block to calculate margins // Set rail to display:block to calculate margins
d.css(i.scrollbarXRail, 'display', 'block'); d.css(i.scrollbarXRail, 'display', 'block');
i.railXMarginWidth = h.toInt(d.css(i.scrollbarXRail, 'marginLeft')) + h.toInt(d.css(i.scrollbarXRail, 'marginRight')); i.railXMarginWidth = _.toInt(d.css(i.scrollbarXRail, 'marginLeft')) + _.toInt(d.css(i.scrollbarXRail, 'marginRight'));
d.css(i.scrollbarXRail, 'display', ''); d.css(i.scrollbarXRail, 'display', '');
i.railXWidth = null; i.railXWidth = null;
i.railXRatio = null; i.railXRatio = null;
@@ -66,13 +66,13 @@ function Instance(element) {
i.scrollbarYActive = null; i.scrollbarYActive = null;
i.scrollbarYHeight = null; i.scrollbarYHeight = null;
i.scrollbarYTop = null; i.scrollbarYTop = null;
i.scrollbarYRight = h.toInt(d.css(i.scrollbarYRail, 'right')); i.scrollbarYRight = _.toInt(d.css(i.scrollbarYRail, 'right'));
i.isScrollbarYUsingRight = i.scrollbarYRight === i.scrollbarYRight; // !isNaN i.isScrollbarYUsingRight = i.scrollbarYRight === i.scrollbarYRight; // !isNaN
i.scrollbarYLeft = i.isScrollbarYUsingRight ? null : h.toInt(d.css(i.scrollbarYRail, 'left')); i.scrollbarYLeft = i.isScrollbarYUsingRight ? null : _.toInt(d.css(i.scrollbarYRail, 'left'));
i.scrollbarYOuterWidth = i.isRtl ? h.outerWidth(i.scrollbarY) : null; i.scrollbarYOuterWidth = i.isRtl ? _.outerWidth(i.scrollbarY) : null;
i.railBorderYWidth = h.toInt(d.css(i.scrollbarYRail, 'borderTopWidth')) + h.toInt(d.css(i.scrollbarYRail, 'borderBottomWidth')); i.railBorderYWidth = _.toInt(d.css(i.scrollbarYRail, 'borderTopWidth')) + _.toInt(d.css(i.scrollbarYRail, 'borderBottomWidth'));
d.css(i.scrollbarYRail, 'display', 'block'); d.css(i.scrollbarYRail, 'display', 'block');
i.railYMarginHeight = h.toInt(d.css(i.scrollbarYRail, 'marginTop')) + h.toInt(d.css(i.scrollbarYRail, 'marginBottom')); i.railYMarginHeight = _.toInt(d.css(i.scrollbarYRail, 'marginTop')) + _.toInt(d.css(i.scrollbarYRail, 'marginBottom'));
d.css(i.scrollbarYRail, 'display', ''); d.css(i.scrollbarYRail, 'display', '');
i.railYHeight = null; i.railYHeight = null;
i.railYRatio = null; i.railYRatio = null;
+5 -5
View File
@@ -2,7 +2,7 @@
var cls = require('../lib/class') var cls = require('../lib/class')
, d = require('../lib/dom') , d = require('../lib/dom')
, h = require('../lib/helper') , _ = require('../lib/helper')
, instances = require('./instances') , instances = require('./instances')
, updateScroll = require('./update-scroll'); , updateScroll = require('./update-scroll');
@@ -82,8 +82,8 @@ module.exports = function (element) {
i.scrollbarXActive = true; i.scrollbarXActive = true;
i.railXWidth = i.containerWidth - i.railXMarginWidth; i.railXWidth = i.containerWidth - i.railXMarginWidth;
i.railXRatio = i.containerWidth / i.railXWidth; i.railXRatio = i.containerWidth / i.railXWidth;
i.scrollbarXWidth = getThumbSize(i, h.toInt(i.railXWidth * i.containerWidth / i.contentWidth)); i.scrollbarXWidth = getThumbSize(i, _.toInt(i.railXWidth * i.containerWidth / i.contentWidth));
i.scrollbarXLeft = h.toInt((i.negativeScrollAdjustment + element.scrollLeft) * (i.railXWidth - i.scrollbarXWidth) / (i.contentWidth - i.containerWidth)); i.scrollbarXLeft = _.toInt((i.negativeScrollAdjustment + element.scrollLeft) * (i.railXWidth - i.scrollbarXWidth) / (i.contentWidth - i.containerWidth));
} else { } else {
i.scrollbarXActive = false; i.scrollbarXActive = false;
} }
@@ -92,8 +92,8 @@ module.exports = function (element) {
i.scrollbarYActive = true; i.scrollbarYActive = true;
i.railYHeight = i.containerHeight - i.railYMarginHeight; i.railYHeight = i.containerHeight - i.railYMarginHeight;
i.railYRatio = i.containerHeight / i.railYHeight; i.railYRatio = i.containerHeight / i.railYHeight;
i.scrollbarYHeight = getThumbSize(i, h.toInt(i.railYHeight * i.containerHeight / i.contentHeight)); i.scrollbarYHeight = getThumbSize(i, _.toInt(i.railYHeight * i.containerHeight / i.contentHeight));
i.scrollbarYTop = h.toInt(element.scrollTop * (i.railYHeight - i.scrollbarYHeight) / (i.contentHeight - i.containerHeight)); i.scrollbarYTop = _.toInt(element.scrollTop * (i.railYHeight - i.scrollbarYHeight) / (i.contentHeight - i.containerHeight));
} else { } else {
i.scrollbarYActive = false; i.scrollbarYActive = false;
} }
+3 -3
View File
@@ -1,7 +1,7 @@
'use strict'; 'use strict';
var d = require('../lib/dom') var d = require('../lib/dom')
, h = require('../lib/helper') , _ = require('../lib/helper')
, instances = require('./instances') , instances = require('./instances')
, updateGeometry = require('./update-geometry') , updateGeometry = require('./update-geometry')
, updateScroll = require('./update-scroll'); , updateScroll = require('./update-scroll');
@@ -19,8 +19,8 @@ module.exports = function (element) {
// Recalculate rail margins // Recalculate rail margins
d.css(i.scrollbarXRail, 'display', 'block'); d.css(i.scrollbarXRail, 'display', 'block');
d.css(i.scrollbarYRail, 'display', 'block'); d.css(i.scrollbarYRail, 'display', 'block');
i.railXMarginWidth = h.toInt(d.css(i.scrollbarXRail, 'marginLeft')) + h.toInt(d.css(i.scrollbarXRail, 'marginRight')); i.railXMarginWidth = _.toInt(d.css(i.scrollbarXRail, 'marginLeft')) + _.toInt(d.css(i.scrollbarXRail, 'marginRight'));
i.railYMarginHeight = h.toInt(d.css(i.scrollbarYRail, 'marginTop')) + h.toInt(d.css(i.scrollbarYRail, 'marginBottom')); i.railYMarginHeight = _.toInt(d.css(i.scrollbarYRail, 'marginTop')) + _.toInt(d.css(i.scrollbarYRail, 'marginBottom'));
// Hide scrollbars not to affect scrollWidth and scrollHeight // Hide scrollbars not to affect scrollWidth and scrollHeight
d.css(i.scrollbarXRail, 'display', 'none'); d.css(i.scrollbarXRail, 'display', 'none');