use subscribe-ui-event

yahoo · Aug 31, 2015 · c89d241 · c89d241
1 parent f3a2a21
commit c89d241
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 148 deletions.
diff --git a/package.json b/package.json
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "debug": "^2.1.3",
-    "eventemitter3": "^1.0.0",
     "hoist-non-react-statics": "^1.0.0",
     "object-assign": "^4.0.0",
     "promise": "^7.0.1",
-    "setimmediate": "^1.0.2"
+    "setimmediate": "^1.0.2",
+    "subscribe-ui-event": "^0.2.2"
   },
   "devDependencies": {
     "coveralls": "^2.11.1",

diff --git a/src/mixins/I13nMixin.js b/src/mixins/I13nMixin.js
@@ -316,7 +316,7 @@ var I13nMixin = {
     _recursiveDetectViewport: function () {
         var self = this;
         // detect viewport from the root, and skip all children's detection if it's not in the viewport
-        self._detectViewport(function detectCallback () {
+        self._detectViewport(null, null, function detectCallback () {
             if (self._i13nNode.isInViewport()) {
                 self._i13nNode.getChildrenNodes().forEach(function detectChildrenViewport (childNode) {
                     var reactComponent = childNode.getReactComponent();

diff --git a/src/mixins/viewport/EventEmitter.js b/src/mixins/viewport/EventEmitter.js
diff --git a/src/mixins/viewport/MessageMixin.js b/src/mixins/viewport/MessageMixin.js
diff --git a/src/mixins/viewport/ViewportMixin.js b/src/mixins/viewport/ViewportMixin.js
@@ -6,18 +6,11 @@
 'use strict';
 
 var React = require('react/addons');
-
-var MsgMixin = require('./MessageMixin');
-
-if (typeof window !== 'undefined') {
-    require('./scroll');
-    require('./visibility');
-}
+var subscribe = require('subscribe-ui-event').subscribe;
 
 /* Viewport mixin assumes you are on browser and already have the scroll lib */
 var Viewport = {
-    mixins: [MsgMixin],
-
+
     propTypes: {
         viewport: React.PropTypes.shape({
             margins: React.PropTypes.shape({
@@ -53,7 +46,7 @@ var Viewport = {
         callback && callback();
     },
 
-    _detectViewport: function (callback) {
+    _detectViewport: function (err, payload, callback) {
         var self = this;
         if (!self.isMounted()) {
             return;
@@ -75,11 +68,11 @@ var Viewport = {
     },
 
     subscribeViewportEvents: function () {
-        this.subscribe('scroll', this._detectViewport);
+        this.subscription = subscribe('scroll', this._detectViewport);
     },
 
     unsubscribeViewportEvents: function () {
-        this.unsubscribe('scroll');
+        this.subscription.unsubscribe();
     },
 
     onEnterViewport: function (callback) {

diff --git a/src/mixins/viewport/scroll.js b/src/mixins/viewport/scroll.js
diff --git a/src/mixins/viewport/visibility.js b/src/mixins/viewport/visibility.js