Merge branch 'master' of github.com:konvajs/konva

This commit is contained in:
Anton Lavrenov 2016-11-11 16:04:04 -06:00
commit 43fa56a381
3 changed files with 5 additions and 5 deletions

View File

@ -224,8 +224,8 @@
}; };
var glob = var glob =
typeof window !== 'undefined' ? window :
typeof global !== 'undefined' ? global : typeof global !== 'undefined' ? global :
typeof window !== 'undefined' ? window :
typeof WorkerGlobalScope !== 'undefined' ? self : {}; typeof WorkerGlobalScope !== 'undefined' ? self : {};
@ -270,7 +270,7 @@
} }
Konva.document = document; Konva.document = document;
Konva.window = window; Konva.window = window;
})(typeof window !== 'undefined' ? window : global); })(typeof global !== 'undefined' ? global : window);
/*eslint-disable eqeqeq, no-cond-assign, no-empty*/ /*eslint-disable eqeqeq, no-cond-assign, no-empty*/
(function() { (function() {

2
konva.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -224,8 +224,8 @@
}; };
var glob = var glob =
typeof window !== 'undefined' ? window :
typeof global !== 'undefined' ? global : typeof global !== 'undefined' ? global :
typeof window !== 'undefined' ? window :
typeof WorkerGlobalScope !== 'undefined' ? self : {}; typeof WorkerGlobalScope !== 'undefined' ? self : {};
@ -270,4 +270,4 @@
} }
Konva.document = document; Konva.document = document;
Konva.window = window; Konva.window = window;
})(typeof window !== 'undefined' ? window : global); })(typeof global !== 'undefined' ? global : window);