Skip to content

Commit

Permalink
Merge pull request #25 from metal/ssr
Browse files Browse the repository at this point in the history
Makes components SSR compatible
  • Loading branch information
Robert Frampton authored Feb 20, 2018
2 parents 972eb51 + a30be9d commit 8be36db
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
12 changes: 10 additions & 2 deletions packages/metal-drag-drop/src/Drag.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

import {core, object} from 'metal';
import {core, object, isServerSide} from 'metal';
import dom from 'metal-dom';
import DragAutoScroll from './helpers/DragAutoScroll';
import DragScrollDelta from './helpers/DragScrollDelta';
Expand All @@ -21,6 +21,10 @@ class Drag extends State {
constructor(config) {
super(config);

if (isServerSide()) {
return;
}

/**
* The drag placeholder that is active at the moment.
* @type {Element}
Expand Down Expand Up @@ -866,7 +870,11 @@ Drag.STATE = {
container: {
setter: dom.toElement,
validator: 'validateElementOrString_',
value: document,
valueFn: function() {
if (!isServerSide()) {
return document;
}
},
},

/**
Expand Down
10 changes: 9 additions & 1 deletion packages/metal-toggler/src/Toggler.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

import core from 'metal';
import {core, isServerSide} from 'metal';
import dom from 'metal-dom';
import {EventHandler} from 'metal-events';
import State from 'metal-state';
Expand All @@ -15,6 +15,10 @@ class Toggler extends State {
constructor(config) {
super(config);

if (isServerSide()) {
return;
}

this.headerEventHandler_ = new EventHandler();

this.on('headerChanged', this.syncHeader);
Expand All @@ -25,6 +29,10 @@ class Toggler extends State {
* @inheritDoc
*/
disposeInternal() {
if (isServerSide()) {
return;
}

super.disposeInternal();
this.headerEventHandler_.removeAllListeners();
}
Expand Down

0 comments on commit 8be36db

Please sign in to comment.