Merge pull request #988 from kanaabe/global-issue

@eessex => Make window.global available on ArticleList
artsy · Mar 23, 2017 · 8de79d9 · 8de79d9
2 parents b89e885 + 0dffb8d
commit 8de79d9
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 4 deletions.
diff --git a/client/apps/edit/components/section_text/index.coffee b/client/apps/edit/components/section_text/index.coffee
@@ -1,6 +1,5 @@
 React = require 'react'
 ReactDOM = require 'react-dom'
-window.global = window
 sd = require('sharify').data
 window.process = {env: {NODE_ENV: sd.NODE_ENV}}
 

diff --git a/client/assets/main.coffee b/client/assets/main.coffee
@@ -5,6 +5,7 @@
 
 Backbone = require 'backbone'
 window.jQuery = window.$ = $ = require 'jquery'
+window.global = window
 
 class Router extends Backbone.Router
 

diff --git a/client/components/article_list/index.coffee b/client/components/article_list/index.coffee
@@ -6,8 +6,8 @@
 #   articles: []
 # }
 
-_ = require 'underscore'
 React = require 'react'
+_ = require 'underscore'
 { input, div, a, h1, h2 } = React.DOM
 moment = require 'moment'
 icons = -> require('./icons.jade') arguments...

diff --git a/client/components/rich_text/components/input_paragraph.coffee b/client/components/rich_text/components/input_paragraph.coffee
@@ -8,7 +8,6 @@
 # }
 
 React = require 'react'
-window.global = window
 sd = require('sharify').data
 window.process = {env: {NODE_ENV: sd.NODE_ENV}}
 { ContentState,

diff --git a/client/components/rich_text_caption/index.coffee b/client/components/rich_text_caption/index.coffee
@@ -1,5 +1,4 @@
 React = require 'react'
-window.global = window
 sd = require('sharify').data
 window.process = {env: {NODE_ENV: sd.NODE_ENV}}
 { convertToRaw,