From 50a71976193237490e62d3aead5ef1c35369a6db Mon Sep 17 00:00:00 2001 From: Roderick Hsiao Date: Thu, 10 May 2018 17:44:33 -0700 Subject: [PATCH] Bump subscribe-ui-event --- package.json | 2 +- src/libs/ComponentSpecs.js | 4 ++-- src/libs/DebugDashboard.js | 2 +- src/libs/ViewportDetector.js | 14 +++++++------- tests/unit/utils/createI13nNode.js | 3 +-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 9160b2fd..98280ffd 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "debug": "^3.1.0", "hoist-non-react-statics": "^2.0.0", "prop-types": "^15.5.10", - "subscribe-ui-event": "^1.0.14" + "subscribe-ui-event": "^2.0.0" }, "devDependencies": { "babel": "^6.5.2", diff --git a/src/libs/ComponentSpecs.js b/src/libs/ComponentSpecs.js index 5cd0c5a8..1d92baaf 100644 --- a/src/libs/ComponentSpecs.js +++ b/src/libs/ComponentSpecs.js @@ -14,8 +14,8 @@ var ReactI13n = require('./ReactI13n'); var ViewportDetector = require('./ViewportDetector'); var clickHandler = require('./clickHandler'); var debug = require('debug')('I13nComponent'); -var listen = require('subscribe-ui-event/dist/lib/listen'); -var subscribe = require('subscribe-ui-event/dist/subscribe'); +var listen = require('subscribe-ui-event').listen; +var subscribe = require('subscribe-ui-event').subscribe; var IS_DEBUG_MODE = (function isDebugMode () { function getJsonFromUrl() { diff --git a/src/libs/DebugDashboard.js b/src/libs/DebugDashboard.js index 506be24e..45819245 100644 --- a/src/libs/DebugDashboard.js +++ b/src/libs/DebugDashboard.js @@ -3,7 +3,7 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ /* global document, window*/ -var listen = require('subscribe-ui-event/dist/lib/listen'); +var listen = require('subscribe-ui-event').listen; var supportClassList = false; var uniqueId = 0; diff --git a/src/libs/ViewportDetector.js b/src/libs/ViewportDetector.js index 7dea201f..b25890a8 100644 --- a/src/libs/ViewportDetector.js +++ b/src/libs/ViewportDetector.js @@ -2,13 +2,13 @@ * Copyright 2015, Yahoo Inc. * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ -var subscribe = require('subscribe-ui-event/dist/subscribe'); +var subscribe = require('subscribe-ui-event').subscribe; -var SUBSCRIBE_OPTIONS = { +var SUBSCRIBE_OPTIONS = { enableScrollInfo: true }; -var DEFAULT_VIEWPORT_MARGINS = { +var DEFAULT_VIEWPORT_MARGINS = { usePercent: false, top: 20, bottom: 20 @@ -19,8 +19,8 @@ var DEFAULT_VIEWPORT_MARGINS = { * @param {Object} element DOM element to detect * @param {Object} [options] options object * @param {Object} [options.margins] viewport detection margin setting - * @param {Object} [options.margins.top] viewport top margin setting - * @param {Object} [options.margins.bottom] viewport bottom margin setting + * @param {Object} [options.margins.top] viewport top margin setting + * @param {Object} [options.margins.bottom] viewport bottom margin setting * @param {Object} [options.margins.usePercent] true to use top and bottom as percentage instead of pixel * @param {Object} [options.target] target of ui events, should be a dom element * @param {Function} onEnterViewport callback when the DOM element enters the viewport @@ -32,9 +32,9 @@ var ViewportDetector = function ViewportDetector(element, options, onEnterViewpo this._element = element; this._onEnterViewport = onEnterViewport; - this._subscribers = []; + this._subscribers = []; this._rect; - this._margins = { + this._margins = { top: marginOptions.usePercent ? marginOptions.top * clientHeight : marginOptions.top, bottom: marginOptions.usePercent ? marginOptions.bottom * clientHeight : marginOptions.bottom }; diff --git a/tests/unit/utils/createI13nNode.js b/tests/unit/utils/createI13nNode.js index 4015cbe1..071b2745 100644 --- a/tests/unit/utils/createI13nNode.js +++ b/tests/unit/utils/createI13nNode.js @@ -80,8 +80,7 @@ describe('createI13nNode', function () { createReactClass = require('create-react-class'); mockery.registerMock('../libs/ReactI13n', MockReactI13n); - mockery.registerMock('subscribe-ui-event/dist/subscribe', mockSubscribe.subscribe); - mockery.registerMock('subscribe-ui-event/dist/listen', mockSubscribe.listen); + mockery.registerMock('subscribe-ui-event', mockSubscribe); mockery.registerMock('../libs/clickHandler', mockClickHandler); createI13nNode = require('../../../src/utils/createI13nNode');