From 7fc9fb606a8f6c73eb2827f51baef8294db4bb4f Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 15 Jun 2015 08:00:53 -0400 Subject: fixes mm-1223 gracefully handle missing analytics configs --- web/react/utils/client.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/react') diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index b83ee22e7..701d3d25b 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -4,16 +4,16 @@ module.exports.track = function(category, action, label, prop, val) { global.window.snowplow('trackStructEvent', category, action, label, prop, val); - if (global.window.analytics != null) global.window.analytics.track(action, {category: category, label: label, property: prop, value: val}); + global.window.analytics.track(action, {category: category, label: label, property: prop, value: val}); }; module.exports.trackPage = function() { global.window.snowplow('trackPageView'); - if (global.window.analytics != null) global.window.analytics.page(); + global.window.analytics.page(); }; function handleError(method_name, xhr, status, err) { - var _LTracker = global.window._LTracker || []; + var _LTracker = global.window._LTracker; var e = null; try { -- cgit v1.2.3-1-g7c22 From 111dbe516c583e1b6f608d6a7d95f764a07a8e29 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 15 Jun 2015 08:01:54 -0400 Subject: don't remove null check for ltracker --- web/react/utils/client.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react') diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 701d3d25b..e9f2108a0 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -13,7 +13,7 @@ module.exports.trackPage = function() { }; function handleError(method_name, xhr, status, err) { - var _LTracker = global.window._LTracker; + var _LTracker = global.window._LTracker | []; var e = null; try { -- cgit v1.2.3-1-g7c22 From 753b952bde9ee28311ca49c2ec0113e06a40bd4f Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 15 Jun 2015 08:02:39 -0400 Subject: fix typo --- web/react/utils/client.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react') diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index e9f2108a0..786e6dcea 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -13,7 +13,7 @@ module.exports.trackPage = function() { }; function handleError(method_name, xhr, status, err) { - var _LTracker = global.window._LTracker | []; + var _LTracker = global.window._LTracker || []; var e = null; try { -- cgit v1.2.3-1-g7c22 From 95b468e05afdea85ad33270268dd8c0f54708036 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 15 Jun 2015 09:40:46 -0400 Subject: fixes mm-1237 remove sessions and activity log from account settings --- web/react/components/settings_sidebar.jsx | 6 ++++-- web/react/components/user_settings.jsx | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'web/react') diff --git a/web/react/components/settings_sidebar.jsx b/web/react/components/settings_sidebar.jsx index 34e3c9203..a1546890f 100644 --- a/web/react/components/settings_sidebar.jsx +++ b/web/react/components/settings_sidebar.jsx @@ -14,11 +14,13 @@ module.exports = React.createClass({
  • General
  • Security
  • Notifications
    • -
  • Sessions
    • -
  • Activity Log
  • Appearance
    • ); + /* Temporarily removing sessions and activity logs +
  • Sessions
    • +
  • Activity Log
    • + */ } }); diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index b165a59ad..9af2cbf04 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -1126,6 +1126,9 @@ module.exports = React.createClass({ ); + + /* Temporarily removing sessoions and activity_log tabs + } else if (this.props.activeTab === 'sessions') { return (
    @@ -1138,6 +1141,8 @@ module.exports = React.createClass({
    ); + */ + } else if (this.props.activeTab === 'appearance') { return (
    -- cgit v1.2.3-1-g7c22 From 54ab3c896de244e56c52df2c877ff63814a53d33 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 15 Jun 2015 09:41:23 -0400 Subject: fix typo --- web/react/components/user_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react') diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index 9af2cbf04..a9c2433f2 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -1127,7 +1127,7 @@ module.exports = React.createClass({
    ); - /* Temporarily removing sessoions and activity_log tabs + /* Temporarily removing sessions and activity_log tabs } else if (this.props.activeTab === 'sessions') { return ( -- cgit v1.2.3-1-g7c22 From adceb8c929b57d8c320b9b39167fb25f04ca99a1 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 15 Jun 2015 11:51:10 -0400 Subject: fixes mm-1245 filenames are now url escaped --- web/react/components/view_image.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react') diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 7d0f0d8a9..4cb30e1d3 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -165,7 +165,7 @@ module.exports = React.createClass({ | : "" } - Download + Download {loading} -- cgit v1.2.3-1-g7c22 From c84e091f2a55d12889e6ad4cb3a94017035fd881 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Mon, 15 Jun 2015 09:37:26 -0700 Subject: Invalid RootId parameter error message no longer displays on the client. Changed acceptance of error from Agree to Okay. --- web/react/components/create_comment.jsx | 3 --- web/react/components/post_deleted_modal.jsx | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'web/react') diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index 3534c7573..0b8eb4a07 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -55,9 +55,6 @@ module.exports = React.createClass({ }.bind(this), function(err) { - var state = {} - state.server_error = err.message; - this.setState(state); if (err.message === "Invalid RootId parameter") { if ($('#post_deleted').length > 0) $('#post_deleted').modal('show'); } diff --git a/web/react/components/post_deleted_modal.jsx b/web/react/components/post_deleted_modal.jsx index 307120df3..83b007bad 100644 --- a/web/react/components/post_deleted_modal.jsx +++ b/web/react/components/post_deleted_modal.jsx @@ -23,7 +23,7 @@ module.exports = React.createClass({

    Someone deleted the message on which you tried to post a comment.

    - +
    -- cgit v1.2.3-1-g7c22 From 7edcb60112ea0e8e8b8c1d53f2883f5f0dadaecd Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Mon, 15 Jun 2015 10:51:44 -0700 Subject: Changed text describing the find more teams function for clarity --- web/react/components/find_team.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react') diff --git a/web/react/components/find_team.jsx b/web/react/components/find_team.jsx index 329592a73..91a842ffc 100644 --- a/web/react/components/find_team.jsx +++ b/web/react/components/find_team.jsx @@ -56,7 +56,7 @@ module.exports = React.createClass({

    Find Your Team

    -

    {"An email will be sent to this address with links to any " + strings.TeamPlural}

    +

    {"We'll send you an email with links to your " + strings.TeamPlural + "."}

    -- cgit v1.2.3-1-g7c22 From 2048b9567fd5bf005ed64106fa4f9038355f5669 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Mon, 15 Jun 2015 11:09:57 -0700 Subject: Error messages revolving around comment creation appear clientside unless we have a better solution in place --- web/react/components/create_comment.jsx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'web/react') diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index 0b8eb4a07..9bcbad079 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -55,9 +55,15 @@ module.exports = React.createClass({ }.bind(this), function(err) { + var state = {}; + state.server_error = err.message; + if (err.message === "Invalid RootId parameter") { if ($('#post_deleted').length > 0) $('#post_deleted').modal('show'); } + else { + this.setState(state); + } }.bind(this) ); }, -- cgit v1.2.3-1-g7c22