diff --git a/js/actions/piece_list_actions.js b/js/actions/piece_list_actions.js
index 31f1bca5..87304ca7 100644
--- a/js/actions/piece_list_actions.js
+++ b/js/actions/piece_list_actions.js
@@ -3,14 +3,11 @@
import alt from '../alt';
import Q from 'q';
-import ActionQueue from '../utils/action_queue_utils';
-
import PieceListFetcher from '../fetchers/piece_list_fetcher';
-class PieceListActions extends ActionQueue {
- constructor() {
- super();
+class PieceListActions {
+ constructor() {
this.generateActions(
'updatePieceList',
'updatePieceListRequestActions',
@@ -35,7 +32,6 @@ class PieceListActions extends ActionQueue {
});
// afterwards, we can load the list
-
return Q.Promise((resolve, reject) => {
PieceListFetcher
.fetch(page, pageSize, search, orderBy, orderAsc, filterBy)
diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
index 0890db00..d2c3265f 100644
--- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
+++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
@@ -4,13 +4,10 @@ import React from 'react';
import PieceListToolbarFilterWidget from './piece_list_toolbar_filter_widget';
import PieceListToolbarOrderWidget from './piece_list_toolbar_order_widget';
+import SearchBar from '../search_bar';
-import Input from 'react-bootstrap/lib/Input';
-import Glyphicon from 'react-bootstrap/lib/Glyphicon';
-import { getLangText } from '../../utils/lang_utils';
let PieceListToolbar = React.createClass({
-
propTypes: {
className: React.PropTypes.string,
searchFor: React.PropTypes.func,
@@ -39,11 +36,6 @@ let PieceListToolbar = React.createClass({
])
},
- searchFor() {
- let searchTerm = this.refs.search.getInputDOMNode().value;
- this.props.searchFor(searchTerm);
- },
-
getFilterWidget(){
if (this.props.filterParams){
return (
@@ -55,6 +47,7 @@ let PieceListToolbar = React.createClass({
}
return null;
},
+
getOrderWidget(){
if (this.props.orderParams){
return (
@@ -68,24 +61,20 @@ let PieceListToolbar = React.createClass({
},
render() {
- let searchIcon =