Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Moves ImmutableComponent into app folder from js folder
Browse files Browse the repository at this point in the history
Auditors: @bsclifton
  • Loading branch information
NejcZdovc committed Apr 19, 2017
1 parent 90d9290 commit c719806
Show file tree
Hide file tree
Showing 90 changed files with 89 additions and 89 deletions.
2 changes: 1 addition & 1 deletion app/renderer/components/bookmarks/addEditBookmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
const React = require('react')

// Components
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const Dialog = require('../../../../js/components/dialog')
const AddEditBookmarkHanger = require('./addEditBookmarkHanger')

Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/bookmarks/addEditBookmarkHanger.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
const React = require('react')

// Components
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const Button = require('../../../../js/components/button')

// Actions
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/bookmarks/bookmarkToolbarButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const Immutable = require('immutable')
const {StyleSheet, css} = require('aphrodite/no-important')

// Components
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')

// Actions
const windowActions = require('../../../../js/actions/windowActions')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/bookmarks/bookmarksToolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const ReactDOM = require('react-dom')
const {StyleSheet, css} = require('aphrodite/no-important')

// Components
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const Button = require('../../../../js/components/button')
const BookmarkToolbarButton = require('./bookmarkToolbarButton')

Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/browserAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const electron = require('electron')
const ipc = electron.ipcRenderer
const Button = require('../../../js/components/button')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/browserActionBadge.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const {StyleSheet, css} = require('aphrodite')
const commonStyles = require('./styles/global')

Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/checkDefaultBrowserDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const Dialog = require('../../../js/components/dialog')
const Button = require('../../../js/components/button')
const SwitchControl = require('../../../js/components/switchControl')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/commonForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')

const {StyleSheet, css} = require('aphrodite/no-important')
const globalStyles = require('./styles/global')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/downloadItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const Button = require('../../../js/components/button')
const contextMenus = require('../../../js/contextMenus')
const downloadStates = require('../../../js/constants/downloadStates')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/downloadsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const Button = require('../../../js/components/button')
const contextMenus = require('../../../js/contextMenus')
const windowActions = require('../../../js/actions/windowActions')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const {StyleSheet, css} = require('aphrodite/no-important')
const globalStyles = require('./styles/global')
const commonStyles = require('./styles/commonStyles')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/fullScreenWarning.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const urlResolve = require('url').resolve

const {StyleSheet, css} = require('aphrodite/no-important')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/helpfulText.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const globalStyles = require('./styles/global')

class HelpfulText extends ImmutableComponent {
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/importBrowserDataPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const Dialog = require('../../../js/components/dialog')
const Button = require('../../../js/components/button')
const SwitchControl = require('../../../js/components/switchControl')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const {StyleSheet, css} = require('aphrodite/no-important')
const globalStyles = require('./styles/global')

Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/menubar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

const React = require('react')
const Immutable = require('immutable')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const windowActions = require('../../../js/actions/windowActions')
const separatorMenuItem = require('../../common/commonMenu').separatorMenuItem
const keyCodes = require('../../common/constants/keyCodes')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/messageBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const Dialog = require('../../../js/components/dialog')
const Button = require('../../../js/components/button')
const SwitchControl = require('../../../js/components/switchControl')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/navigation/navigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const contextMenus = require('../../../../js/contextMenus')
const getSetting = require('../../../../js/settings').getSetting

// Components
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const NavigationBar = require('./navigationBar')
const LongPressButton = require('../../../../js/components/longPressButton')
const Menubar = require('../menubar')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/navigation/urlBarIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const windowActions = require('../../../../js/actions/windowActions')
const cx = require('../../../../js/lib/classSet')
const dragTypes = require('../../../../js/constants/dragTypes')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/navigation/urlBarSuggestionItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const suggestionTypes = require('../../../../js/constants/suggestionTypes')
const cx = require('../../../../js/lib/classSet')

Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/navigation/urlBarSuggestions.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')

const UrlBarSuggestionItem = require('./urlBarSuggestionItem')
const windowActions = require('../../../../js/actions/windowActions')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/preferences/extensionsTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')

const {StyleSheet, css} = require('aphrodite')
const globalStyles = require('../styles/global')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/preferences/helpfulHints.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const {StyleSheet, css} = require('aphrodite')
const globalStyles = require('../styles/global')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const appConfig = require('../../../../../js/constants/appConfig')
const Button = require('../../../../../js/components/button')
const {SettingsList, SettingItem, SettingCheckbox} = require('../../settings')
const {SettingDropdown} = require('../../dropdown')
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')

// style
const commonStyles = require('../../styles/commonStyles')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const {StyleSheet, css} = require('aphrodite')
// components
const Button = require('../../../../../js/components/button')
const ModalOverlay = require('../../../../../js/components/modalOverlay')
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')

// styles
const commonStyles = require('../../styles/commonStyles')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const React = require('react')
const {StyleSheet, css} = require('aphrodite/no-important')

// components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')

// style
const globalStyles = require('../../styles/global')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const {l10nErrorText} = require('../../../../common/lib/httpUtil')
const {changeSetting} = require('../../../lib/settingsUtil')

// components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')
const Button = require('../../../../../js/components/button')
const {FormTextbox} = require('../../textbox')
const {FormDropdown} = require('../../dropdown')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/preferences/payment/history.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const appUrlUtil = require('../../../../../js/lib/appUrlUtil')

// components
const Button = require('../../../../../js/components/button')
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')

// style
const globalStyles = require('../../styles/global')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const React = require('react')
const {StyleSheet, css} = require('aphrodite')

// components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')
const Button = require('../../../../../js/components/button')

// style
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const {StyleSheet, css} = require('aphrodite')
const {btcToCurrencyString} = require('../../../../common/lib/ledgerUtil')

// components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')
const Button = require('../../../../../js/components/button')
const {RecoveryKeyTextbox} = require('../../textbox')
const {SettingsList, SettingItem} = require('../../settings')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/preferences/payment/ledgerTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const React = require('react')
const {StyleSheet, css} = require('aphrodite')

// components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')
const SortableTable = require('../../../../../js/components/sortableTable')
const SwitchControl = require('../../../../../js/components/switchControl')
const Button = require('../../../../../js/components/button')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/preferences/payment/pinnedInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const React = require('react')
const {StyleSheet, css} = require('aphrodite')

// components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')

// style
const globalStyles = require('../../styles/global')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/preferences/paymentsTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const {StyleSheet, css} = require('aphrodite/no-important')

// Components
const cx = require('../../../../js/lib/classSet')
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const ModalOverlay = require('../../../../js/components/modalOverlay')
const {SettingCheckbox} = require('../settings')
const DisabledContent = require('./payment/disabledContent')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/preferences/pluginsTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const aboutActions = require('../../../../js/about/aboutActions')
const getSetting = require('../../../../js/settings').getSetting
const settings = require('../../../../js/constants/settings')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const preferenceTabs = require('../../../../js/constants/preferenceTabs')
const PreferenceNavigationButton = require('./preferenceNavigationButton')
const HelpfulHints = require('./helpfulHints')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const {StyleSheet, css} = require('aphrodite')
const globalStyles = require('../styles/global')

Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/preferences/syncTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// Note that these are webpack requires, not CommonJS node requiring requires
const React = require('react')
const ImmutableComponent = require('../../../../js/components/immutableComponent')
const ImmutableComponent = require('../immutableComponent')
const Immutable = require('immutable')
const niceware = require('niceware')

Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/publisherToggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const appActions = require('../../../js/actions/appActions')
const settings = require('../../../js/constants/settings')
const getSetting = require('../../../js/settings').getSetting
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/reduxComponent.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const appStore = require('../../../js/stores/appStoreRenderer')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const React = require('react')
const windowStore = require('../../../js/stores/windowStore')

Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/releaseNotes.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const Dialog = require('../../../js/components/dialog')
const {StyleSheet, css} = require('aphrodite')
const commonStyles = require('./styles/commonStyles')
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const ImmutableComponent = require('../../../js/components/immutableComponent')
const ImmutableComponent = require('./immutableComponent')
const {StyleSheet, css} = require('aphrodite')
const aboutActions = require('../../../js/about/aboutActions')
const getSetting = require('../../../js/settings').getSetting
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/tabs/content/audioTabIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const React = require('react')
const {StyleSheet, css} = require('aphrodite/no-important')

// Components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')
const TabIcon = require('./tabIcon')

// Styles
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/tabs/content/closeTabIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const React = require('react')
const {StyleSheet, css} = require('aphrodite/no-important')

// Components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')
const TabIcon = require('./tabIcon')

// Utils
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/tabs/content/favIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const React = require('react')
const {StyleSheet, css} = require('aphrodite/no-important')

// Components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')
const TabIcon = require('./tabIcon')

// Utils
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/components/tabs/content/newSessionIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const React = require('react')
const {StyleSheet, css} = require('aphrodite/no-important')

// Components
const ImmutableComponent = require('../../../../../js/components/immutableComponent')
const ImmutableComponent = require('../../immutableComponent')
const TabIcon = require('./tabIcon')

// Utils
Expand Down
Loading

1 comment on commit c719806

@bsclifton
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++ LGTM 😄

Please sign in to comment.