merge master again

src/client/js/app.js

@@ -38,8 +38,8 @@ import CustomCssEditor from './components/Admin/CustomCssEditor';
 import CustomScriptEditor from './components/Admin/CustomScriptEditor';
 import CustomHeaderEditor from './components/Admin/CustomHeaderEditor';
 import AdminRebuildSearch from './components/Admin/AdminRebuildSearch';
-
 import UserGroupPage from './components/Admin/UserGroup/UserGroupPage';
+
 import AppContainer from './services/AppContainer';
 import PageContainer from './services/PageContainer';
 import CommentContainer from './services/CommentContainer';

src/client/js/components/Page/TagLabels.jsx

@@ -56,7 +56,7 @@ class TagLabels extends React.Component {
         pageContainer.setState({ tags });
         editorContainer.setState({ tags });
 
-        this.toastSuccess();
+        this.apiSuccessHandler();
       }
       catch (err) {
         this.apiErrorHandler(err);
@@ -69,7 +69,7 @@ class TagLabels extends React.Component {
     }
   }
 
-  toastSuccess() {
+  apiSuccessHandler() {
     toastr.success(undefined, 'updated tags successfully', {
       closeButton: true,
       progressBar: true,