Skip to content

Fix for SSR usage. #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
miracle2k wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for SSR usage. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e38642f
Guard DOM access for fix server usage.
miracle2k Mar 27, 2017
53588c7
gulp release run.
miracle2k Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 63 additions & 39 deletions example/dist/bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,10 @@ module.exports = {

},{}],8:[function(require,module,exports){
var modalFactory = require('./modalFactory');
var insertKeyframesRule = require('domkit/insertKeyframesRule');
var appendVendorPrefix = require('domkit/appendVendorPrefix');
var canUseDOM = require('./canUseDOM');
var insertKeyframesRule = canUseDOM ? require('domkit/insertKeyframesRule') : function() {};
var appendVendorPrefix = canUseDOM ? require('domkit/appendVendorPrefix') : function() {};


var animation = {
show: {
Expand All @@ -258,22 +260,22 @@ var animation = {
showModalAnimation: insertKeyframesRule({
'0%': {
opacity: 0,
transform: 'translate3d(-50%, -300px, 0)'
transform: 'translate(-50%, -300px)'
},
'100%': {
opacity: 1,
transform: 'translate3d(-50%, -50%, 0)'
transform: 'translate(-50%, -50%)'
}
}),

hideModalAnimation: insertKeyframesRule({
'0%': {
opacity: 1,
transform: 'translate3d(-50%, -50%, 0)'
transform: 'translate(-50%, -50%)'
},
'100%': {
opacity: 0,
transform: 'translate3d(-50%, 100px, 0)'
transform: 'translate(-50%, 100px)'
}
}),

Expand All @@ -298,22 +300,22 @@ var animation = {
showContentAnimation: insertKeyframesRule({
'0%': {
opacity: 0,
transform: 'translate3d(0, -20px, 0)'
transform: 'translate(0, -20px)'
},
'100%': {
opacity: 1,
transform: 'translate3d(0, 0, 0)'
transform: 'translate(0, 0)'
}
}),

hideContentAnimation: insertKeyframesRule({
'0%': {
opacity: 1,
transform: 'translate3d(0, 0, 0)'
transform: 'translate(0, 0)'
},
'100%': {
opacity: 0,
transform: 'translate3d(0, 50px, 0)'
transform: 'translate(0, 50px)'
}
})
};
Expand All @@ -335,7 +337,7 @@ module.exports = modalFactory({
return appendVendorPrefix({
position: "fixed",
width: "500px",
transform: "translate3d(-50%, -50%, 0)",
transform: "translate(-50%, -50%)",
top: "50%",
left: "50%",
backgroundColor: "white",
Expand Down Expand Up @@ -374,10 +376,11 @@ module.exports = modalFactory({
}
});

},{"./modalFactory":14,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],9:[function(require,module,exports){
},{"./canUseDOM":14,"./modalFactory":15,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],9:[function(require,module,exports){
var modalFactory = require('./modalFactory');
var insertKeyframesRule = require('domkit/insertKeyframesRule');
var appendVendorPrefix = require('domkit/appendVendorPrefix');
var canUseDOM = require('./canUseDOM');
var insertKeyframesRule = canUseDOM ? require('domkit/insertKeyframesRule') : function() {};
var appendVendorPrefix = canUseDOM ? require('domkit/appendVendorPrefix') : function() {};

var animation = {
show: {
Expand Down Expand Up @@ -473,10 +476,11 @@ module.exports = modalFactory({
}
});

},{"./modalFactory":14,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],10:[function(require,module,exports){
},{"./canUseDOM":14,"./modalFactory":15,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],10:[function(require,module,exports){
var modalFactory = require('./modalFactory');
var insertKeyframesRule = require('domkit/insertKeyframesRule');
var appendVendorPrefix = require('domkit/appendVendorPrefix');
var canUseDOM = require('./canUseDOM');
var insertKeyframesRule = canUseDOM ? require('domkit/insertKeyframesRule') : function() {};
var appendVendorPrefix = canUseDOM ? require('domkit/appendVendorPrefix') : function() {};

var animation = {
show: {
Expand All @@ -488,7 +492,6 @@ var animation = {
animationTimingFunction: 'ease-out'
},
showContentAnimation: insertKeyframesRule({

'0%': {
opacity: 0,
transform: 'translate3d(calc(-100vw - 50%), 0, 0)'
Expand All @@ -504,7 +507,6 @@ var animation = {
}),

hideContentAnimation: insertKeyframesRule({

'0%': {
opacity: 1,
transform: 'translate3d(0, 0, 0)'
Expand Down Expand Up @@ -589,11 +591,12 @@ module.exports = modalFactory({
}
});

},{"./modalFactory":14,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],11:[function(require,module,exports){
},{"./canUseDOM":14,"./modalFactory":15,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],11:[function(require,module,exports){
var React = require('react');
var modalFactory = require('./modalFactory');
var insertKeyframesRule = require('domkit/insertKeyframesRule');
var appendVendorPrefix = require('domkit/appendVendorPrefix');
var canUseDOM = require('./canUseDOM');
var insertKeyframesRule = canUseDOM ? require('domkit/insertKeyframesRule') : function() {};
var appendVendorPrefix = canUseDOM ? require('domkit/appendVendorPrefix') : function() {};

var animation = {
show: {
Expand Down Expand Up @@ -737,10 +740,11 @@ module.exports = modalFactory({
}
});

},{"./modalFactory":14,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5,"react":undefined}],12:[function(require,module,exports){
},{"./canUseDOM":14,"./modalFactory":15,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5,"react":undefined}],12:[function(require,module,exports){
var modalFactory = require('./modalFactory');
var insertKeyframesRule = require('domkit/insertKeyframesRule');
var appendVendorPrefix = require('domkit/appendVendorPrefix');
var canUseDOM = require('./canUseDOM');
var insertKeyframesRule = canUseDOM ? require('domkit/insertKeyframesRule') : function() {};
var appendVendorPrefix = canUseDOM ? require('domkit/appendVendorPrefix') : function() {};

var animation = {
show: {
Expand Down Expand Up @@ -839,10 +843,11 @@ module.exports = modalFactory({
}
});

},{"./modalFactory":14,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],13:[function(require,module,exports){
},{"./canUseDOM":14,"./modalFactory":15,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],13:[function(require,module,exports){
var modalFactory = require('./modalFactory');
var insertKeyframesRule = require('domkit/insertKeyframesRule');
var appendVendorPrefix = require('domkit/appendVendorPrefix');
var canUseDOM = require('./canUseDOM');
var insertKeyframesRule = canUseDOM ? require('domkit/insertKeyframesRule') : function() {};
var appendVendorPrefix = canUseDOM ? require('domkit/appendVendorPrefix') : function() {};

var animation = {
show: {
Expand Down Expand Up @@ -1083,10 +1088,18 @@ module.exports = modalFactory({
}
});

},{"./modalFactory":14,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],14:[function(require,module,exports){
},{"./canUseDOM":14,"./modalFactory":15,"domkit/appendVendorPrefix":1,"domkit/insertKeyframesRule":5}],14:[function(require,module,exports){
const canUseDOM = !!(
typeof window !== 'undefined' &&
window.document &&
window.document.createElement
);
module.exports = canUseDOM;
},{}],15:[function(require,module,exports){
var React = require('react');
var transitionEvents = require('domkit/transitionEvents');
var appendVendorPrefix = require('domkit/appendVendorPrefix');
var canUseDOM = require('./canUseDOM');
var transitionEvents = canUseDOM ? require('domkit/transitionEvents') : function() {};
var appendVendorPrefix = canUseDOM ? require('domkit/appendVendorPrefix') : function() {};

module.exports = function(animation){

Expand Down Expand Up @@ -1124,7 +1137,7 @@ module.exports = function(animation){
return {
willHidden: false,
hidden: true
}
};
},

hasHidden: function(){
Expand All @@ -1146,7 +1159,7 @@ module.exports = function(animation){

handleBackdropClick: function() {
if (this.props.closeOnClick) {
this.hide();
this.hide("backdrop");
}
},

Expand Down Expand Up @@ -1208,7 +1221,7 @@ module.exports = function(animation){
this.setState({
hidden: true
});
this.props.onHide();
this.props.onHide(this.state.hideSource);
},

enter: function(){
Expand All @@ -1230,10 +1243,15 @@ module.exports = function(animation){
}.bind(this), 0);
},

hide: function(){
hide: function(source){
if (this.hasHidden()) return;

if (!source) {
source = "hide";
}

this.setState({
hideSource: source,
willHidden: true
});
},
Expand All @@ -1242,14 +1260,20 @@ module.exports = function(animation){
if (this.hasHidden())
this.show();
else
this.hide();
this.hide("toggle");
},

listenKeyboard: function(event) {
(typeof(this.props.keyboard)=="function")
?this.props.keyboard(event)
:this.closeOnEsc(event);
},

closeOnEsc: function(event){
if (this.props.keyboard &&
(event.key === "Escape" ||
event.keyCode === 27)) {
this.hide();
this.hide("keyboard");
}
},

Expand All @@ -1261,9 +1285,9 @@ module.exports = function(animation){
window.removeEventListener("keydown", this.listenKeyboard, true);
}
});
}
};

},{"domkit/appendVendorPrefix":1,"domkit/transitionEvents":7,"react":undefined}],"boron":[function(require,module,exports){
},{"./canUseDOM":14,"domkit/appendVendorPrefix":1,"domkit/transitionEvents":7,"react":undefined}],"boron":[function(require,module,exports){
module.exports = {
DropModal: require('./DropModal'),
WaveModal: require('./WaveModal'),
Expand Down
34 changes: 20 additions & 14 deletions example/dist/codemirror.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
}
.cm-fat-cursor .CodeMirror-cursor {
width: auto;
border: 0;
border: 0 !important;
background: #7e7;
}
.cm-fat-cursor div.CodeMirror-cursors {
Expand Down Expand Up @@ -88,8 +88,14 @@

.cm-tab { display: inline-block; text-decoration: inherit; }

.CodeMirror-rulers {
position: absolute;
left: 0; right: 0; top: -50px; bottom: -20px;
overflow: hidden;
}
.CodeMirror-ruler {
border-left: 1px solid #ccc;
top: 0; bottom: 0;
position: absolute;
}

Expand Down Expand Up @@ -165,7 +171,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
}

/* The fake, visible scrollbars. Used to force redraw during scrolling
before actuall scrolling happens, thus preventing shaking and
before actual scrolling happens, thus preventing shaking and
flickering artifacts. */
.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
position: absolute;
Expand All @@ -191,16 +197,15 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}

.CodeMirror-gutters {
position: absolute; left: 0; top: 0;
min-height: 100%;
z-index: 3;
}
.CodeMirror-gutter {
white-space: normal;
height: 100%;
display: inline-block;
vertical-align: top;
margin-bottom: -30px;
/* Hack to make IE7 behave */
*zoom:1;
*display:inline;
}
.CodeMirror-gutter-wrapper {
position: absolute;
Expand All @@ -218,11 +223,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
cursor: default;
z-index: 4;
}
.CodeMirror-gutter-wrapper {
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
}
.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }

.CodeMirror-lines {
cursor: text;
Expand All @@ -244,6 +246,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
position: relative;
overflow: visible;
-webkit-tap-highlight-color: transparent;
-webkit-font-variant-ligatures: contextual;
font-variant-ligatures: contextual;
}
.CodeMirror-wrap pre {
word-wrap: break-word;
Expand All @@ -265,6 +269,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}

.CodeMirror-widget {}

.CodeMirror-rtl pre { direction: rtl; }

.CodeMirror-code {
outline: none;
}
Expand All @@ -287,7 +293,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
visibility: hidden;
}

.CodeMirror-cursor { position: absolute; }
.CodeMirror-cursor {
position: absolute;
pointer-events: none;
}
.CodeMirror-measure pre { position: static; }

div.CodeMirror-cursors {
Expand All @@ -314,9 +323,6 @@ div.CodeMirror-dragcursors {
background: rgba(255, 255, 0, .4);
}

/* IE7 hack to prevent it from returning funny offsetTops on the spans */
.CodeMirror span { *vertical-align: text-bottom; }

/* Used to force a border model for a node */
.cm-force-border { padding-right: .1px; }

Expand Down
Loading