Merge remote-tracking branch 'origin/AD-43-in-piece_detail-add-generic-field-' into AD-43-in-piece_detail-add-generic-field-

js/actions/user_actions.js

@@ -15,7 +15,7 @@ class UserActions {
                 this.actions.updateCurrentUser(res['users'][0]);
             })
             .catch((err) => {
-                console.log(err);           
+                console.log(err);
             });
     }
 };

js/components/ascribe_buttons/acl_button_list.js

@@ -14,41 +14,44 @@ let AclButtonList = React.createClass({
         this.setState(state);
     },
 
-    componentWillMount() {
+    componentDidMount() {
-        UserActions.fetchCurrentUser();
         UserStore.listen(this.onChange);
+        UserActions.fetchCurrentUser();
     },
 
     componentDidUnmount() {
         UserStore.unlisten(this.onChange);
     },
+
     render() {
-        return (<div className="text-center">
+        return (
-            <AclButton
+            <div className="text-center">
-                availableAcls={this.props.availableAcls}
+                <AclButton
-                action="transfer"
+                    availableAcls={this.props.availableAcls}
-                editions={this.props.editions}
+                    action="transfer"
-                currentUser={this.state.currentUser}
+                    editions={this.props.editions}
-                handleSuccess={this.props.handleSuccess} />
+                    currentUser={this.state.currentUser}
-            <AclButton
+                    handleSuccess={this.props.handleSuccess} />
-                availableAcls={this.props.availableAcls}
+                <AclButton
-                action="consign"
+                    availableAcls={this.props.availableAcls}
-                editions={this.props.editions}
+                    action="consign"
-                currentUser={this.state.currentUser}
+                    editions={this.props.editions}
-                handleSuccess={this.props.handleSuccess} />
+                    currentUser={this.state.currentUser}
-            <AclButton
+                    handleSuccess={this.props.handleSuccess} />
-                availableAcls={this.props.availableAcls}
+                <AclButton
-                action="loan"
+                    availableAcls={this.props.availableAcls}
-                editions={this.props.editions}
+                    action="loan"
-                currentUser={this.state.currentUser}
+                    editions={this.props.editions}
-                handleSuccess={this.props.handleSuccess} />
+                    currentUser={this.state.currentUser}
-            <AclButton
+                    handleSuccess={this.props.handleSuccess} />
-                availableAcls={this.props.availableAcls}
+                <AclButton
-                action="share"
+                    availableAcls={this.props.availableAcls}
-                editions={this.props.editions}
+                    action="share"
-                currentUser={this.state.currentUser}
+                    editions={this.props.editions}
-                handleSuccess={this.props.handleSuccess} />
+                    currentUser={this.state.currentUser}
-        </div>)
+                    handleSuccess={this.props.handleSuccess} />
+            </div>
+        );
     }
 });
 

js/components/ascribe_media/resource_viewer.js

@@ -25,7 +25,6 @@ let ResourceViewer = React.createClass({
     mixins: [InjectInHeadMixin],
 
     componentDidMount() {
-        this.inject('http://antani.com');
     },
 
     render() {

js/components/ascribe_modal/modal_wrapper.js

@@ -19,8 +19,7 @@ let ModalWrapper = React.createClass({
                         title={this.props.title}
                         editions={this.props.editions}
                         currentUser={this.props.currentUser}
-                        handleSuccess={this.props.handleSuccess}
+                        handleSuccess={this.props.handleSuccess}>
-                    >
                     {this.props.children}
                     </ModalBody>
                 }>

js/components/header.js

@@ -22,8 +22,12 @@ let Header = React.createClass({
     },
 
     componentDidMount() {
-        UserStore.listen(this.onChange)
         UserActions.fetchCurrentUser();
+        UserStore.listen(this.onChange)
+    },
+
+    componentDidUnmount() {
+        UserStore.unlisten(this.onChange)
     },
 
     onChange(state) {
@@ -40,7 +44,7 @@ let Header = React.createClass({
                     </a>
                 </Nav>
                 <Nav right>
-                    <DropdownButton eventKey={3} title={this.state.currentUser.username}>
+                    <DropdownButton eventKey="1" title={this.state.currentUser.username}>
                         <MenuItem eventKey="1" href="/art/account_settings/">{getLangText('Account Settings')}</MenuItem>
                         <li className="divider"></li>
                         <MenuItem eventKey="2" href="/art/faq/">{getLangText('FAQ')}</MenuItem>

js/mixins/form_mixin.js

@@ -7,8 +7,8 @@ import AlertDismissable from '../components/ascribe_forms/alert'
 export const FormMixin = {
     getInitialState() {
         return {
-            submitted: false
+            submitted: false,
-            , errors: []
+            errors: []
         }
     },
 

js/stores/user_store.js

@@ -1,11 +1,11 @@
 import alt from '../alt';
-import UserAction from '../actions/user_actions';
+import UserActions from '../actions/user_actions';
 
 
-class UserStore{
+class UserStore {
     constructor() {
         this.currentUser = {};
-        this.bindActions(UserAction);
+        this.bindActions(UserActions);
     }
 
     onUpdateCurrentUser(user) {