diff --git a/authorizer/authorizer-client.es6 b/authorizer/authorizer-client.js similarity index 94% rename from authorizer/authorizer-client.es6 rename to authorizer/authorizer-client.js index cd4f5219c..78d5d4d3a 100644 --- a/authorizer/authorizer-client.es6 +++ b/authorizer/authorizer-client.js @@ -5,9 +5,9 @@ module.exports = (core, config, store) => { const React = require("react"), - handleAuthErrors = require("./handleAuthErrors.es6"), - ToggleGroup = require("../ui/components/toggle-group.jsx")(core, config, store), - ToggleSwitch = require("../ui/components/toggle-switch.jsx")(core, config, store); + handleAuthErrors = require("./handleAuthErrors.js"), + ToggleGroup = require("../ui/components/toggle-group.js")(core, config, store), + ToggleSwitch = require("../ui/components/toggle-switch.js")(core, config, store); class Authorizer extends React.Component { constructor(props) { diff --git a/authorizer/error-handlers.es6 b/authorizer/error-handlers.js similarity index 100% rename from authorizer/error-handlers.es6 rename to authorizer/error-handlers.js diff --git a/authorizer/handleAuthErrors.es6 b/authorizer/handleAuthErrors.js similarity index 100% rename from authorizer/handleAuthErrors.es6 rename to authorizer/handleAuthErrors.js diff --git a/authorizer/invites.es6 b/authorizer/invites.js similarity index 97% rename from authorizer/invites.es6 rename to authorizer/invites.js index ebf6866a7..bb1b8d498 100644 --- a/authorizer/invites.es6 +++ b/authorizer/invites.js @@ -3,7 +3,7 @@ "use strict"; module.exports = (core, config, store) => { - const promisedAction = require("../lib/promised-action.es6")(core, config, store), + const promisedAction = require("../lib/promised-action.js")(core, config, store), getRoomPics = require("../../lib/get-room-pics.js"); core.on("pref-show", tabs => { diff --git a/authorizer/requests.es6 b/authorizer/requests.js similarity index 97% rename from authorizer/requests.es6 rename to authorizer/requests.js index e82eb2126..be82f1d29 100644 --- a/authorizer/requests.es6 +++ b/authorizer/requests.js @@ -5,7 +5,7 @@ const getAvatar = require("../lib/get-avatar.js"); module.exports = (core, config, store) => { - const promisedAction = require("../lib/promised-action.es6")(core, config, store); + const promisedAction = require("../lib/promised-action.js")(core, config, store); core.on("conf-show", tabs => { let container = document.createElement("div"), diff --git a/customization/customization-client.es6 b/customization/customization-client.js similarity index 100% rename from customization/customization-client.es6 rename to customization/customization-client.js diff --git a/email/email-client.es6 b/email/email-client.js similarity index 91% rename from email/email-client.es6 rename to email/email-client.js index 3d77628b3..f023f222d 100644 --- a/email/email-client.es6 +++ b/email/email-client.js @@ -4,8 +4,8 @@ module.exports = (core, config, store) => { const React = require("react"), - ToggleGroup = require("../ui/components/toggle-group.jsx")(core, config, store), - ToggleSwitch = require("../ui/components/toggle-switch.jsx")(core, config, store); + ToggleGroup = require("../ui/components/toggle-group.js")(core, config, store), + ToggleSwitch = require("../ui/components/toggle-switch.js")(core, config, store); class EmailConfig extends React.Component { constructor(props) { diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 482408533..ddb5af25b 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -29,7 +29,7 @@ import manifest from "gulp-manifest"; import config from "./server-config-defaults.js"; const babelify = babel.configure({ - extensions: [ ".es6", ".jsx" ], + ignore: "**/bower_components/**", optional: [ "runtime", "validation.react" @@ -47,7 +47,7 @@ const debug = !(gutil.env.production || config.env === "production"), }, files = { js: [ - "**/*.js", "**/*.es6", "**/*.jsx", "!**/*.min.js", + "**/*.js", "!**/*.min.js", "!node_modules/**", "!bower_components/**", "!public/s/**/*.js" ], @@ -171,7 +171,7 @@ gulp.task("bower", () => // Build browserify bundles gulp.task("bundle", () => - bundle("ui/app.es6", { + bundle("ui/app.js", { transform: [ babelify, optional ] }, bundled => bundled .pipe(sourcemaps.init({ loadMaps: true })) diff --git a/http/logout-client.es6 b/http/logout-client.js similarity index 100% rename from http/logout-client.es6 rename to http/logout-client.js diff --git a/lib/promised-action.es6 b/lib/promised-action.js similarity index 100% rename from lib/promised-action.es6 rename to lib/promised-action.js diff --git a/lib/promised-query.es6 b/lib/promised-query.js similarity index 100% rename from lib/promised-query.es6 rename to lib/promised-query.js diff --git a/lib/s3-upload.es6 b/lib/s3-upload.js similarity index 100% rename from lib/s3-upload.es6 rename to lib/s3-upload.js diff --git a/notification/desktop-notifications.es6 b/notification/desktop-notifications.js similarity index 92% rename from notification/desktop-notifications.es6 rename to notification/desktop-notifications.js index 6f4f67034..949c755bd 100644 --- a/notification/desktop-notifications.es6 +++ b/notification/desktop-notifications.js @@ -3,7 +3,7 @@ "use strict"; module.exports = (core, config, store) => { - const NotificationItem = require("./notification-item.es6")(core, config, store); + const NotificationItem = require("./notification-item.js")(core, config, store); core.on("note-dn", note => { if (typeof note.dismissTime === "number" || note.score < 70) { diff --git a/notification/notification-center-item.jsx b/notification/notification-center-item.js similarity index 95% rename from notification/notification-center-item.jsx rename to notification/notification-center-item.js index e1233c823..e05affe60 100644 --- a/notification/notification-center-item.jsx +++ b/notification/notification-center-item.js @@ -6,7 +6,7 @@ const React = require("react"), friendlyTime = require("../lib/friendly-time.js"); module.exports = (core, ...args) => { - const NotificationItem = require("./notification-item.es6")(core, ...args); + const NotificationItem = require("./notification-item.js")(core, ...args); class NotificationCenterItem extends React.Component { constructor(props) { diff --git a/notification/notification-center.jsx b/notification/notification-center.js similarity index 97% rename from notification/notification-center.jsx rename to notification/notification-center.js index 8292198da..2bd6f3b75 100644 --- a/notification/notification-center.jsx +++ b/notification/notification-center.js @@ -5,7 +5,7 @@ const React = require("react"); module.exports = (core, config, store) => { - const NotificationCenterItem = require("./notification-center-item.jsx")(core, config, store); + const NotificationCenterItem = require("./notification-center-item.js")(core, config, store); class NotificationCenter extends React.Component { constructor(props) { diff --git a/notification/notification-client.es6 b/notification/notification-client.es6 deleted file mode 100644 index ed197844a..000000000 --- a/notification/notification-client.es6 +++ /dev/null @@ -1,9 +0,0 @@ -/* eslint-env es6 */ - -"use strict"; - -module.exports = (...args) => { - require("./notification-handler.es6")(...args); - require("./desktop-notifications.es6")(...args); - require("./titlebar-ticker.es6")(...args); -}; diff --git a/notification/notification-client.js b/notification/notification-client.js new file mode 100644 index 000000000..93e79cd7d --- /dev/null +++ b/notification/notification-client.js @@ -0,0 +1,9 @@ +/* eslint-env es6 */ + +"use strict"; + +module.exports = (...args) => { + require("./notification-handler.js")(...args); + require("./desktop-notifications.js")(...args); + require("./titlebar-ticker.js")(...args); +}; diff --git a/notification/notification-handler.es6 b/notification/notification-handler.js similarity index 100% rename from notification/notification-handler.es6 rename to notification/notification-handler.js diff --git a/notification/notification-item.es6 b/notification/notification-item.js similarity index 100% rename from notification/notification-item.es6 rename to notification/notification-item.js diff --git a/notification/titlebar-ticker.es6 b/notification/titlebar-ticker.js similarity index 98% rename from notification/titlebar-ticker.es6 rename to notification/titlebar-ticker.js index 91bec4940..6cc708550 100644 --- a/notification/titlebar-ticker.es6 +++ b/notification/titlebar-ticker.js @@ -3,7 +3,7 @@ "use strict"; module.exports = (core, config, store) => { - const NotificationItem = require("./notification-item.es6")(core, config, store), + const NotificationItem = require("./notification-item.js")(core, config, store), regexUtils = require("../lib/regex-utils.js"), audio = "data:audio/wav;base64,UklGRnQGAABXQVZFZm10IBAAAAABAAEAESsAABErAAABAAgAZGF0YU8GAACBgIF/gn2Cf4B+gn5+fYJ/gIF/gH+BfX6AfXt5fXx7e3x9fH1+f4CAfnx9f3t9gIB9en2Dfn58fYKDgIJ9hnh7hIZ8gYR6fHyCe4GCioF+gH93foWCgoJ5gHx5gniAeYJ0dneCgXN1jn1+fI1zfHp8dYiCe3qIhHpmfXqMeZJ0ACb/AAD//wAAQ/8A3pYANv/qYek5OGp3tICeexjYUkWgYMzzAB//hDyVcX2Yi5ppXLNsXYKEZ3l7aHGTn1pnlZlwVpuUgqOKgIOMYIpsoXVydJKdc296kZl3h3OAcoV6ao6Be298ipCFhIFxk3yIeXNuh4eHiYh/c3h1eJCUenCCfH9yeZSKcHR7eH9ugYl+eImFfWxuhX1uiIx+gYZmg355hHlzgXl1dIeWdGmciXpteYWMc3GOfntye5Khh1+beoaFgmJ5k4KUe3CXim2GdJaFYXmec1GomG97b4mZcnCIbX6EbX6LbWd1e4B0d4x6cXuKcoKMdoB5eZt9doh0e32Ag5CSgnOEkIWBgX6AeYqRenJ9hoKDhIR6gIBte42DeHuFhm18g35we4x9dnmBgHp+bniBfIF2eYB3fYV3dX+FdIOCf3Z7foF8e4mAfHuCdn+Lc3WKhXyEhnt7goF4foSDhH17f4uFfnp/io90c4OBfHuCg4JyhIxycH2JgnuDiHl8hH98dIODdIKBeIZ8fHeCiXx+f3SIf3V7eYSCdHuCgnh6hIFzioV3gYuAeXl9e4V7e3+JgnV6gIJ7hIiCe3yIinx9hYGAhX17h4OBfICFfIiFfHh9hn93gnp2hYR6foF4dn9/dX1/eX9/dHN+goB3eoF8fHt6f316fIF6gIF8eH2Cgnt/goV6iHx3iIR6f4CDg3uGg3yAiIN9g4B/gn+CgX59hn96fn+FfX59f4SCgIR7foJ7fYGAfoF6f4F5fHyDfXmFfnt5hIB5fn1/fX1+gHl9foN8fYGCfoCGen6AgoB/gH9/g3p8fYWGfXqDhH17gIOCfn+CeoCDg3p6fIGFfXp/gYR9dYN/gX57e359foJ9foGAf357gICAfIJ7fn16hoV6fXyAgX+Bfn5+gnl5gYSBfH19e4h7fISEeIB+gH+Ed3+Cf3p6hX2Af3qAfX5/fn98f4GBgHt3gYZ/fX99gHx8gH97hoR3gX5/g3l+g31/g315f4N8fX+AgX6Af35+gH6AgX97foCCfX99gn1+gYF7gIR9en+DgH59f319gYB8fn1/f32Be3uCgXx+fYR/fH2Cf31+foKEfHyBg31/fn5/goJ7gIaAfX9/gn+Bgn56g4J/goF/foB/gIB/fn+Bf3uAgn96f398gIB/fnyAgHx9fn5+f3p+gnx9f3x/f398f399gH9/fn6Df3yBf39/gIB9f4F/gYF+f4CCfoF/f4KCgICAf4KAg4B+f4KCfX59goN9fYB/gIB6gH99fICAfX1/gnx7fYB/gXx9fn5/fn99fX5+fX5+fn5/f39/gX5/gnx+gIF/foCCfn2Af4J+foGBgX9/f4CCfIGAgYF/f36AgYB+gIGAgH2AgX99gH9/gH2Af3+AfXx9gHx+fHyAfX5+fH2Agnt7f35/fX9/f39/fXp+gH5+goB9f39/gn59gX+Af31/gIB/f39/gH6AgICBfoCEf4B+f4KBf4B/gYGDfn+Af4B/fn59foF+foKBfn9+fHyAfn5+fn+BeX+Fg3N7hX58gH+Afn6FdHuIgnh+g4B6e4iGeHqFhXh7g3+Af36Ag4SAeX+Een1+g4V7en6Ef3+AgX9/f4B+fHx+foJ/fH6ChHx9foGBg3t5foJ/f3x+fYF+f31+gICBgX5/f4F+fn5/fX59fn9+gIOAf3+Af4B9fn9+gX9+gX+BfoGBgIB/f31/gn+CfIB/fYF+f36Bf35/foB/f398gX+Af31/f4CBf358gIKAfn9+gn2Af35+gn99f36Bf31+f3+Af399f4CBfoCAfX+BfX+AgH6AgH9+gIZ9fYJ/iIB3fIt/dISBgHx/f4OFf32AgX53fIOCe4KBfn2Ben57f3t4f4N9gH6BgYKAgHl/gn1/f4N/f36DgoCBfoJ+eX17gH18e4F/fYB+hX6Dg4OBgIB8fHt+f39+fX9/foKBgIGEf31/gX6AgoGDfoCEf32BAA=="; diff --git a/store/action-handler.es6 b/store/action-handler.js similarity index 100% rename from store/action-handler.es6 rename to store/action-handler.js diff --git a/store/add-user-timezone.es6 b/store/add-user-timezone.js similarity index 100% rename from store/add-user-timezone.es6 rename to store/add-user-timezone.js diff --git a/store/init-user-up-manager.es6 b/store/init-user-up-manager.js similarity index 100% rename from store/init-user-up-manager.es6 rename to store/init-user-up-manager.js diff --git a/store/rule-manager.es6 b/store/rule-manager.js similarity index 80% rename from store/rule-manager.es6 rename to store/rule-manager.js index efc56267d..9a4387a24 100644 --- a/store/rule-manager.es6 +++ b/store/rule-manager.js @@ -2,8 +2,8 @@ module.exports = (...args) => { require("./rules/loadRooms.js")(...args); - require("./rules/loadRelatedUsers.es6")(...args); - require("./rules/handleUserPresence.es6")(...args); + require("./rules/loadRelatedUsers.js")(...args); + require("./rules/handleUserPresence.js")(...args); require("./rules/preLoadThreads.js")(...args); require("./rules/preLoadTexts.js")(...args); require("./rules/resetNavRanges.js")(...args); @@ -20,6 +20,6 @@ module.exports = (...args) => { require("./rules/selectedTexts.js")(...args); require("./rules/removeRelations.js")(...args); require("./rules/embedNavigate.js")(...args); - require("./rules/dissmissNoteOnNav.es6")(...args); - require("./rules/clearQueuedActions.es6")(...args); + require("./rules/dissmissNoteOnNav.js")(...args); + require("./rules/clearQueuedActions.js")(...args); }; diff --git a/store/rules/clearQueuedActions.es6 b/store/rules/clearQueuedActions.js similarity index 100% rename from store/rules/clearQueuedActions.es6 rename to store/rules/clearQueuedActions.js diff --git a/store/rules/dissmissNoteOnNav.es6 b/store/rules/dissmissNoteOnNav.js similarity index 100% rename from store/rules/dissmissNoteOnNav.es6 rename to store/rules/dissmissNoteOnNav.js diff --git a/store/rules/handleUserPresence.es6 b/store/rules/handleUserPresence.js similarity index 97% rename from store/rules/handleUserPresence.es6 rename to store/rules/handleUserPresence.js index 8f14d4879..f5f1ba4d7 100644 --- a/store/rules/handleUserPresence.es6 +++ b/store/rules/handleUserPresence.js @@ -2,7 +2,7 @@ module.exports = function(core, config, store) { var userUtils = require("./../../lib/user-utils.js"), - promisedAction = require("../../lib/promised-action.es6")(core), + promisedAction = require("../../lib/promised-action.js")(core), permissionLevels = require("./../../authorizer/permissionWeights.js"), queueBack = []; diff --git a/store/rules/loadRelatedUsers.es6 b/store/rules/loadRelatedUsers.js similarity index 100% rename from store/rules/loadRelatedUsers.es6 rename to store/rules/loadRelatedUsers.js diff --git a/store/state-manager.es6 b/store/state-manager.js similarity index 100% rename from store/state-manager.es6 rename to store/state-manager.js diff --git a/store/store.js b/store/store.js index 53cecb2ef..506ff4b73 100644 --- a/store/store.js +++ b/store/store.js @@ -296,9 +296,9 @@ Store.prototype.isRoomWritable = function(roomId, userId) { module.exports = function(core, config) { var store = new Store([ state ]); - require("./state-manager.es6")(core, config, store, state); - require("./action-handler.es6")(core, config, store, state); - require("./rule-manager.es6")(core, config, store, state); + require("./state-manager.js")(core, config, store, state); + require("./action-handler.js")(core, config, store, state); + require("./rule-manager.js")(core, config, store, state); require("./socket.js")(core, config, store, state); require("./session-manager.js")(core, config, store, state); require("./guest-params-handler.js")(core, config, store, state); diff --git a/threader/threader-client.es6 b/threader/threader-client.js similarity index 96% rename from threader/threader-client.es6 rename to threader/threader-client.js index 003ab044d..8caa072be 100644 --- a/threader/threader-client.es6 +++ b/threader/threader-client.js @@ -4,7 +4,7 @@ module.exports = (core, config, store) => { const React = require("react"), - ToggleSwitch = require("../ui/components/toggle-switch.jsx")(core, config, store); + ToggleSwitch = require("../ui/components/toggle-switch.js")(core, config, store); class ThreadSettings extends React.Component { constructor(props) { diff --git a/ui/app.es6 b/ui/app.js similarity index 66% rename from ui/app.es6 rename to ui/app.js index 270a2d4cd..9116a5c51 100644 --- a/ui/app.es6 +++ b/ui/app.js @@ -35,25 +35,25 @@ window.store = store = require("./../store/store.js")(core, config); let args = [ core, config, store ]; // Trunks -require("../widget/widget-client.es6")(...args); +require("../widget/widget-client.js")(...args); require("../history/history-client.js")(...args); // Apps -require("../notification/notification-client.es6")(...args); +require("../notification/notification-client.js")(...args); require("../anti-abuse/anti-abuse-client.js")(...args); -require("../authorizer/authorizer-client.es6")(...args); -require("../authorizer/requests.es6")(...args); -// require("../authorizer/invites.es6")(...args); -require("../email/email-client.es6")(...args); +require("../authorizer/authorizer-client.js")(...args); +require("../authorizer/requests.js")(...args); +// require("../authorizer/invites.js")(...args); +require("../email/email-client.js")(...args); require("../http/notifications-client.js")(...args); require("../http/room-general-settings-client.js")(...args); require("../http/seo-client.js")(...args); require("../http/user-profile-settings-client.js")(...args); require("../irc/irc-client.js")(...args); -require("../threader/threader-client.es6")(...args); +require("../threader/threader-client.js")(...args); require("../twitter/twitter-client.js")(...args); -require("../customization/customization-client.es6")(...args); -require("../authorizer/error-handlers.es6")(...args); +require("../customization/customization-client.js")(...args); +require("../authorizer/error-handlers.js")(...args); // User menu providers require("../browserid-auth/browserid-auth-client.js")(...args); @@ -61,28 +61,28 @@ require("../facebook/facebook-client.js")(...args); require("../github/github-client.js")(...args); require("../google/google-client.js")(...args); require("../push-notification/gcm-client.js")(...args); -require("../http/logout-client.es6")(...args); +require("../http/logout-client.js")(...args); // Modules -require("./modules/menu-listeners.es6")(...args); -require("./modules/dialogs-listeners.es6")(...args); +require("./modules/menu-listeners.js")(...args); +require("./modules/dialogs-listeners.js")(...args); require("./modules/settings-room.js")(...args); require("./modules/settings-user.js")(...args); -require("./modules/view-manager.es6")(...args); +require("./modules/view-manager.js")(...args); require("./modules/swipes.js")(...args); require("./modules/ui-handle-errors.js")(...args); -require("../store/init-user-up-manager.es6")(...args); -require("../store/add-user-timezone.es6")(...args); +require("../store/init-user-up-manager.js")(...args); +require("../store/add-user-timezone.js")(...args); // Render the client -require("./components/client.jsx")(...args); +require("./components/client.js")(...args); // Miscellaneous -require("./misc/fontloader.es6")(...args); -require("./misc/appcache.es6")(...args); -require("./misc/google-analytics.es6")(...args); -require("./misc/load-indicator.es6")(...args); -require("./misc/workarounds.es6")(...args); +require("./misc/fontloader.js")(...args); +require("./misc/appcache.js")(...args); +require("./misc/google-analytics.js")(...args); +require("./misc/load-indicator.js")(...args); +require("./misc/workarounds.js")(...args); // Initialize require("../init/init.js")(...args); diff --git a/ui/components/appbar-primary.jsx b/ui/components/appbar-primary.js similarity index 96% rename from ui/components/appbar-primary.jsx rename to ui/components/appbar-primary.js index 769c3cea1..9c5fec725 100644 --- a/ui/components/appbar-primary.jsx +++ b/ui/components/appbar-primary.js @@ -11,9 +11,9 @@ const showMenu = require("../utils/show-menu.js"), module.exports = function(core, config, store) { const React = require("react"), - Badge = require("./badge.jsx")(core, config, store), - NotificationCenter = require("../../notification/notification-center.jsx")(core, config, store), - FollowButton = require("./follow-button.jsx")(core, config, store); + Badge = require("./badge.js")(core, config, store), + NotificationCenter = require("../../notification/notification-center.js")(core, config, store), + FollowButton = require("./follow-button.js")(core, config, store); let AppbarPrimary = React.createClass({ toggleSidebarRight: function() { diff --git a/ui/components/badge.jsx b/ui/components/badge.js similarity index 100% rename from ui/components/badge.jsx rename to ui/components/badge.js diff --git a/ui/components/banner.jsx b/ui/components/banner.js similarity index 98% rename from ui/components/banner.jsx rename to ui/components/banner.js index 8b39c6f5a..f1fb0a162 100644 --- a/ui/components/banner.jsx +++ b/ui/components/banner.js @@ -8,7 +8,7 @@ var format = require("../../lib/format.js"), module.exports = function(core, config, store) { var React = require("react"), - RoomNameEntry = require("./room-name-entry.jsx")(core, config, store), + RoomNameEntry = require("./room-name-entry.js")(core, config, store), Banner; Banner = React.createClass({ diff --git a/ui/components/calltoactionbar.jsx b/ui/components/calltoactionbar.js similarity index 100% rename from ui/components/calltoactionbar.jsx rename to ui/components/calltoactionbar.js diff --git a/ui/components/chat-area-messages.jsx b/ui/components/chat-area-messages.js similarity index 98% rename from ui/components/chat-area-messages.jsx rename to ui/components/chat-area-messages.js index 4680b8098..35a00eb1a 100644 --- a/ui/components/chat-area-messages.jsx +++ b/ui/components/chat-area-messages.js @@ -4,7 +4,7 @@ module.exports = function(core, config, store) { const React = require("react"), - ChatItem = require("./chat-item.jsx")(core, config, store), + ChatItem = require("./chat-item.js")(core, config, store), Endless = require("../../bower_components/endless/endless.js"), rangeOps = require("../../lib/range-ops.js"); diff --git a/ui/components/chat-area.jsx b/ui/components/chat-area.js similarity index 82% rename from ui/components/chat-area.jsx rename to ui/components/chat-area.js index 82199d7e2..e3ce8dd28 100644 --- a/ui/components/chat-area.jsx +++ b/ui/components/chat-area.js @@ -4,11 +4,11 @@ module.exports = function(core, config, store) { const React = require("react"), - ChatAreaMessages = require("./chat-area-messages.jsx")(core, config, store), - ScrollTo = require("./scroll-to.jsx")(core, config, store), - Compose = require("./compose.jsx")(core, config, store), - PrivateRoom = require("./private-room.jsx")(core, config, store), - NoSuchRoom = require("./no-such-room.jsx")(core, config, store); + ChatAreaMessages = require("./chat-area-messages.js")(core, config, store), + ScrollTo = require("./scroll-to.js")(core, config, store), + Compose = require("./compose.js")(core, config, store), + PrivateRoom = require("./private-room.js")(core, config, store), + NoSuchRoom = require("./no-such-room.js")(core, config, store); let ChatArea = React.createClass({ scrollToBottom: function() { diff --git a/ui/components/chat-item.jsx b/ui/components/chat-item.js similarity index 100% rename from ui/components/chat-item.jsx rename to ui/components/chat-item.js diff --git a/ui/components/client.jsx b/ui/components/client.js similarity index 65% rename from ui/components/client.jsx rename to ui/components/client.js index a806fbb12..521e108d1 100644 --- a/ui/components/client.jsx +++ b/ui/components/client.js @@ -4,18 +4,18 @@ module.exports = function(core, config, store) { var React = require("react"), - Landing = require("./landing.jsx")(core, config, store), - Banner = require("./banner.jsx")(core, config, store), - AppbarPrimary = require("./appbar-primary.jsx")(core, config, store), - CallToActionBar = require("./calltoactionbar.jsx")(core, config, store), - ConnectionStatus = require("./connectionstatus.jsx")(core, config, store), - SidebarRight = require("./sidebar-right.jsx")(core, config, store), - ChatArea = require("./chat-area.jsx")(core, config, store), - RoomList = require("./room-list.jsx")(core, config, store), - ThreadList = require("./thread-list.jsx")(core, config, store), - Footer = require("./footer.jsx")(core, config, store), - CreateRoomButton = require("./create-room-button.jsx")(core, config, store), - CurrentDialog = require("../dialogs/current-dialog.es6")(core, config, store), + Landing = require("./landing.js")(core, config, store), + Banner = require("./banner.js")(core, config, store), + AppbarPrimary = require("./appbar-primary.js")(core, config, store), + CallToActionBar = require("./calltoactionbar.js")(core, config, store), + ConnectionStatus = require("./connectionstatus.js")(core, config, store), + SidebarRight = require("./sidebar-right.js")(core, config, store), + ChatArea = require("./chat-area.js")(core, config, store), + RoomList = require("./room-list.js")(core, config, store), + ThreadList = require("./thread-list.js")(core, config, store), + Footer = require("./footer.js")(core, config, store), + CreateRoomButton = require("./create-room-button.js")(core, config, store), + CurrentDialog = require("../dialogs/current-dialog.js")(core, config, store), Client; Client = React.createClass({ diff --git a/ui/components/compose.jsx b/ui/components/compose.js similarity index 96% rename from ui/components/compose.jsx rename to ui/components/compose.js index 741b82ed6..8db050831 100644 --- a/ui/components/compose.jsx +++ b/ui/components/compose.js @@ -8,10 +8,10 @@ const gen = require("../../lib/generate.browser.js"), module.exports = function(core, config, store) { var React = require("react"), - TextArea = require("./textarea.jsx")(core, config, store), - Suggestions = require("./suggestions.jsx")(core, config, store), - FileUpload = require("./file-upload.jsx")(core, config, store), - Loader = require("./loader.jsx")(core, config, store), + TextArea = require("./textarea.js")(core, config, store), + Suggestions = require("./suggestions.js")(core, config, store), + FileUpload = require("./file-upload.js")(core, config, store), + Loader = require("./loader.js")(core, config, store), Compose; Compose = React.createClass({ diff --git a/ui/components/connectionstatus.jsx b/ui/components/connectionstatus.js similarity index 100% rename from ui/components/connectionstatus.jsx rename to ui/components/connectionstatus.js diff --git a/ui/components/create-room-button.jsx b/ui/components/create-room-button.js similarity index 100% rename from ui/components/create-room-button.jsx rename to ui/components/create-room-button.js diff --git a/ui/components/file-upload.jsx b/ui/components/file-upload.js similarity index 97% rename from ui/components/file-upload.jsx rename to ui/components/file-upload.js index 769145be3..84cfcd63d 100644 --- a/ui/components/file-upload.jsx +++ b/ui/components/file-upload.js @@ -2,7 +2,7 @@ "use strict"; -const S3Upload = require("../../lib/s3-upload.es6"); +const S3Upload = require("../../lib/s3-upload.js"); module.exports = core => { const React = require("react"); diff --git a/ui/components/follow-button.jsx b/ui/components/follow-button.js similarity index 100% rename from ui/components/follow-button.jsx rename to ui/components/follow-button.js diff --git a/ui/components/footer.jsx b/ui/components/footer.js similarity index 100% rename from ui/components/footer.jsx rename to ui/components/footer.js diff --git a/ui/components/grid-view.jsx b/ui/components/grid-view.js similarity index 100% rename from ui/components/grid-view.jsx rename to ui/components/grid-view.js diff --git a/ui/components/landing.jsx b/ui/components/landing.js similarity index 95% rename from ui/components/landing.jsx rename to ui/components/landing.js index 7284f910b..a9b203b53 100644 --- a/ui/components/landing.jsx +++ b/ui/components/landing.js @@ -4,7 +4,7 @@ var userUtils = require("../../lib/user-utils.js"); module.exports = function(core, config, store) { var React = require("react"), - RoomNameEntry = require("./room-name-entry.jsx")(core, config, store), + RoomNameEntry = require("./room-name-entry.js")(core, config, store), Landing; Landing = React.createClass({ diff --git a/ui/components/list-view.jsx b/ui/components/list-view.js similarity index 100% rename from ui/components/list-view.jsx rename to ui/components/list-view.js diff --git a/ui/components/loader.jsx b/ui/components/loader.js similarity index 100% rename from ui/components/loader.jsx rename to ui/components/loader.js diff --git a/ui/components/no-such-room.jsx b/ui/components/no-such-room.js similarity index 93% rename from ui/components/no-such-room.jsx rename to ui/components/no-such-room.js index 2489cbdce..600a8f5d0 100644 --- a/ui/components/no-such-room.jsx +++ b/ui/components/no-such-room.js @@ -4,7 +4,7 @@ module.exports = (core, config, store) => { const React = require("react"), - CreateRoomButton = require("./create-room-button.jsx")(core, config, store); + CreateRoomButton = require("./create-room-button.js")(core, config, store); class NoSuchRoom extends React.Component { constructor(props) { diff --git a/ui/components/people-list-item.jsx b/ui/components/people-list-item.js similarity index 100% rename from ui/components/people-list-item.jsx rename to ui/components/people-list-item.js diff --git a/ui/components/people-list.jsx b/ui/components/people-list.js similarity index 94% rename from ui/components/people-list.jsx rename to ui/components/people-list.js index 327023f4c..60816aa71 100644 --- a/ui/components/people-list.jsx +++ b/ui/components/people-list.js @@ -2,8 +2,8 @@ module.exports = function(core, config, store) { var React = require("react"), - ListView = require("./list-view.jsx")(core, config, store), - PeopleListItem = require("./people-list-item.jsx")(core, config, store), + ListView = require("./list-view.js")(core, config, store), + PeopleListItem = require("./people-list-item.js")(core, config, store), PeopleList; PeopleList = React.createClass({ diff --git a/ui/components/private-room.jsx b/ui/components/private-room.js similarity index 96% rename from ui/components/private-room.jsx rename to ui/components/private-room.js index 5a8ffc500..23c24d0dc 100644 --- a/ui/components/private-room.jsx +++ b/ui/components/private-room.js @@ -4,7 +4,7 @@ module.exports = (core, config, store) => { const React = require("react"), - FollowButton = require("./follow-button.jsx")(core, config, store); + FollowButton = require("./follow-button.js")(core, config, store); class PrivateRoom extends React.Component { constructor(props) { diff --git a/ui/components/room-card.jsx b/ui/components/room-card.js similarity index 96% rename from ui/components/room-card.jsx rename to ui/components/room-card.js index 23d742824..0ecb2da7f 100644 --- a/ui/components/room-card.jsx +++ b/ui/components/room-card.js @@ -8,8 +8,8 @@ var userUtils = require("../../lib/user-utils.js"), module.exports = function(core, config, store) { var React = require("react"), - Badge = require("./badge.jsx")(core, config, store), - FollowButton = require("./follow-button.jsx")(core, config, store), + Badge = require("./badge.js")(core, config, store), + FollowButton = require("./follow-button.js")(core, config, store), RoomCard; RoomCard = React.createClass({ diff --git a/ui/components/room-list.jsx b/ui/components/room-list.js similarity index 95% rename from ui/components/room-list.jsx rename to ui/components/room-list.js index df11b7fe1..79075dd94 100644 --- a/ui/components/room-list.jsx +++ b/ui/components/room-list.js @@ -2,8 +2,8 @@ module.exports = function(core, config, store) { var React = require("react"), - RoomCard = require("./room-card.jsx")(core, config, store), - GridView = require("./grid-view.jsx")(core, config, store), + RoomCard = require("./room-card.js")(core, config, store), + GridView = require("./grid-view.js")(core, config, store), RoomList; RoomList = React.createClass({ diff --git a/ui/components/room-name-entry.jsx b/ui/components/room-name-entry.js similarity index 95% rename from ui/components/room-name-entry.jsx rename to ui/components/room-name-entry.js index 56964cfc1..6fe3bda36 100644 --- a/ui/components/room-name-entry.jsx +++ b/ui/components/room-name-entry.js @@ -4,7 +4,7 @@ module.exports = (core, config, store) => { const React = require("react"), - Suggestions = require("./suggestions.jsx")(core, config, store); + Suggestions = require("./suggestions.js")(core, config, store); class RoomNameEntry extends React.Component { constructor(props) { diff --git a/ui/components/scroll-to.jsx b/ui/components/scroll-to.js similarity index 100% rename from ui/components/scroll-to.jsx rename to ui/components/scroll-to.js diff --git a/ui/components/sidebar-right.jsx b/ui/components/sidebar-right.js similarity index 83% rename from ui/components/sidebar-right.jsx rename to ui/components/sidebar-right.js index a6b622e83..dbe658779 100644 --- a/ui/components/sidebar-right.jsx +++ b/ui/components/sidebar-right.js @@ -2,7 +2,7 @@ module.exports = function(core, config, store) { var React = require("react"), - PeopleList = require("./people-list.jsx")(core, config, store), + PeopleList = require("./people-list.js")(core, config, store), SidebarRight; SidebarRight = React.createClass({ diff --git a/ui/components/suggestions.jsx b/ui/components/suggestions.js similarity index 100% rename from ui/components/suggestions.jsx rename to ui/components/suggestions.js diff --git a/ui/components/textarea.jsx b/ui/components/textarea.js similarity index 100% rename from ui/components/textarea.jsx rename to ui/components/textarea.js diff --git a/ui/components/thread-card.es6 b/ui/components/thread-card.js similarity index 98% rename from ui/components/thread-card.es6 rename to ui/components/thread-card.js index c0317b1c0..7aa7b0e65 100644 --- a/ui/components/thread-card.es6 +++ b/ui/components/thread-card.js @@ -9,7 +9,7 @@ const format = require("../../lib/format.js"), module.exports = (core, config, store) => { const React = require("react"), - Badge = require("./badge.jsx")(core, config, store); + Badge = require("./badge.js")(core, config, store); class ThreadCard extends React.Component { constructor(props) { diff --git a/ui/components/thread-list.jsx b/ui/components/thread-list.js similarity index 96% rename from ui/components/thread-list.jsx rename to ui/components/thread-list.js index c528825b6..e2119c240 100644 --- a/ui/components/thread-list.jsx +++ b/ui/components/thread-list.js @@ -4,10 +4,10 @@ module.exports = function(core, config, store) { const React = require("react"), - ThreadCard = require("./thread-card.es6")(core, config, store), - GridView = require("./grid-view.jsx")(core, config, store), - PrivateRoom = require("./private-room.jsx")(core, config, store), - NoSuchRoom = require("./no-such-room.jsx")(core, config, store), + ThreadCard = require("./thread-card.js")(core, config, store), + GridView = require("./grid-view.js")(core, config, store), + PrivateRoom = require("./private-room.js")(core, config, store), + NoSuchRoom = require("./no-such-room.js")(core, config, store), rangeOps = require("../../lib/range-ops.js"); let ThreadList = React.createClass({ diff --git a/ui/components/toggle-group.jsx b/ui/components/toggle-group.js similarity index 100% rename from ui/components/toggle-group.jsx rename to ui/components/toggle-group.js diff --git a/ui/components/toggle-switch.jsx b/ui/components/toggle-switch.js similarity index 100% rename from ui/components/toggle-switch.jsx rename to ui/components/toggle-switch.js diff --git a/ui/components/valid-input.jsx b/ui/components/valid-input.js similarity index 100% rename from ui/components/valid-input.jsx rename to ui/components/valid-input.js diff --git a/ui/dialogs/current-dialog.es6 b/ui/dialogs/current-dialog.js similarity index 88% rename from ui/dialogs/current-dialog.es6 rename to ui/dialogs/current-dialog.js index 69321f847..e0ca26053 100644 --- a/ui/dialogs/current-dialog.es6 +++ b/ui/dialogs/current-dialog.js @@ -4,8 +4,8 @@ module.exports = (core, config, store) => { const React = require("react"), - ShareDialog = require("./share.es6")(core, config, store), - StartThread = require("./start-thread.es6")(core, config, store); + ShareDialog = require("./share.js")(core, config, store), + StartThread = require("./start-thread.js")(core, config, store); class CurrentDialog extends React.Component { constructor(props) { diff --git a/ui/dialogs/dialog.es6 b/ui/dialogs/dialog.js similarity index 100% rename from ui/dialogs/dialog.es6 rename to ui/dialogs/dialog.js diff --git a/ui/dialogs/share.es6 b/ui/dialogs/share.js similarity index 96% rename from ui/dialogs/share.es6 rename to ui/dialogs/share.js index 0ec4bd179..24ed12b64 100644 --- a/ui/dialogs/share.es6 +++ b/ui/dialogs/share.js @@ -4,7 +4,7 @@ module.exports = (core, config, store) => { const React = require("react"), - Dialog = require("./dialog.es6")(core, config, store); + Dialog = require("./dialog.js")(core, config, store); class ShareDialog extends React.Component { constructor(props) { diff --git a/ui/dialogs/start-thread.es6 b/ui/dialogs/start-thread.js similarity index 95% rename from ui/dialogs/start-thread.es6 rename to ui/dialogs/start-thread.js index c3f1d8966..f449d8cc8 100644 --- a/ui/dialogs/start-thread.es6 +++ b/ui/dialogs/start-thread.js @@ -4,10 +4,10 @@ module.exports = (core, config, store) => { const React = require("react"), - Dialog = require("./dialog.es6")(core, config, store), - Loader = require("../components/loader.jsx")(core, config, store), - FileUpload = require("../components/file-upload.jsx")(core, config, store), - promisedAction = require("../../lib/promised-action.es6")(core), + Dialog = require("./dialog.js")(core, config, store), + Loader = require("../components/loader.js")(core, config, store), + FileUpload = require("../components/file-upload.js")(core, config, store), + promisedAction = require("../../lib/promised-action.js")(core), generate = require("../../lib/generate.browser.js"); class StartThreadDialog extends React.Component { diff --git a/ui/form/InputText.es6 b/ui/form/InputText.js similarity index 100% rename from ui/form/InputText.es6 rename to ui/form/InputText.js diff --git a/ui/form/form.es6 b/ui/form/form.js similarity index 100% rename from ui/form/form.es6 rename to ui/form/form.js diff --git a/ui/misc/appcache.es6 b/ui/misc/appcache.js similarity index 100% rename from ui/misc/appcache.es6 rename to ui/misc/appcache.js diff --git a/ui/misc/fontloader.es6 b/ui/misc/fontloader.js similarity index 100% rename from ui/misc/fontloader.es6 rename to ui/misc/fontloader.js diff --git a/ui/misc/google-analytics.es6 b/ui/misc/google-analytics.js similarity index 100% rename from ui/misc/google-analytics.es6 rename to ui/misc/google-analytics.js diff --git a/ui/misc/load-indicator.es6 b/ui/misc/load-indicator.js similarity index 100% rename from ui/misc/load-indicator.es6 rename to ui/misc/load-indicator.js diff --git a/ui/misc/workarounds.es6 b/ui/misc/workarounds.js similarity index 100% rename from ui/misc/workarounds.es6 rename to ui/misc/workarounds.js diff --git a/ui/modules/dialogs-listeners.es6 b/ui/modules/dialogs-listeners.js similarity index 98% rename from ui/modules/dialogs-listeners.es6 rename to ui/modules/dialogs-listeners.js index 10178b3a6..3a3e46053 100644 --- a/ui/modules/dialogs-listeners.es6 +++ b/ui/modules/dialogs-listeners.js @@ -7,7 +7,7 @@ const handledDialogs = [ "share", "start-thread" ]; module.exports = function(core, config, store) { var userUtils = require("../../lib/user-utils.js"), - validateEntity = require("../utils/validate-entity.es6")(core, config, store), + validateEntity = require("../utils/validate-entity.js")(core, config, store), createEntity = require("../utils/create-entity.js")(core, config, store), showDialog = require("../utils/show-dialog.js")(core, config, store), currentDialog, currentDialogState, userChangeCallback; diff --git a/ui/modules/menu-listeners.es6 b/ui/modules/menu-listeners.js similarity index 100% rename from ui/modules/menu-listeners.es6 rename to ui/modules/menu-listeners.js diff --git a/ui/modules/view-manager.es6 b/ui/modules/view-manager.js similarity index 100% rename from ui/modules/view-manager.es6 rename to ui/modules/view-manager.js diff --git a/ui/utils/create-entity.js b/ui/utils/create-entity.js index 31b7a8bb7..8f92f55a7 100644 --- a/ui/utils/create-entity.js +++ b/ui/utils/create-entity.js @@ -5,7 +5,7 @@ var listenersAdded; module.exports = function(core, config, store) { - var validateEntity = require("./validate-entity.es6")(core, config, store), + var validateEntity = require("./validate-entity.js")(core, config, store), roomError = "We could not create the room. Please refresh the page and try again.", userError = "We could not create your account. Please refresh the page and try again.", roomCallback, userCallback; diff --git a/ui/utils/validate-entity.es6 b/ui/utils/validate-entity.js similarity index 100% rename from ui/utils/validate-entity.es6 rename to ui/utils/validate-entity.js diff --git a/widget/app-compatibility-helper.es6 b/widget/app-compatibility-helper.js similarity index 100% rename from widget/app-compatibility-helper.es6 rename to widget/app-compatibility-helper.js diff --git a/widget/set-statusbar-color.es6 b/widget/set-statusbar-color.js similarity index 100% rename from widget/set-statusbar-color.es6 rename to widget/set-statusbar-color.js diff --git a/widget/widget-client.es6 b/widget/widget-client.js similarity index 66% rename from widget/widget-client.es6 rename to widget/widget-client.js index 8a6ffa7c4..4b8bf694a 100644 --- a/widget/widget-client.es6 +++ b/widget/widget-client.js @@ -5,7 +5,7 @@ module.exports = (...args) => { require("./widget-bridge.js")(...args); require("./widget-config.js")(...args); - require("./set-statusbar-color.es6")(...args); + require("./set-statusbar-color.js")(...args); // require("./user-domain-blacklist.js")(...args); - require("./app-compatibility-helper.es6")(...args); + require("./app-compatibility-helper.js")(...args); };