scrivito_content_browser 1.5.5 → 1.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6dedcb0f78684ca57d04192be2ea9efa1b1c6a1
-  data.tar.gz: 96c59dc878010077552e1c89e9ff4471d9768abc
+  metadata.gz: 368c742f5efb9d2bd399683b6b0a1dd63474fc68
+  data.tar.gz: 827a4bd6e3bf82cceede5a870122df948433eef5
 SHA512:
-  metadata.gz: 061cb80a6a06a61547242e5a6b1945e80a6669bff1450f7660c589ff3f0b13d13e6e257bbbc7a9b0fdf142c29443c455f2fa94dc9eecfb31103d42bcc2d3f7d7
-  data.tar.gz: b90112ad6e2d033879c60827e09957755275f3301f5bbb29868a8ec34ce79d90d66f35f84f13b64b4927ef906e77ae0753ac58318df85d4d235d80dc9c1fe7d6
+  metadata.gz: 0811abb6434da6c907a2fda67447a9c1bde36759756d38767d660f2e46099db3a0cc6664856ddb888f4d58c37dcb894af6ff5ff6204fdd116e6f430b6c801b90
+  data.tar.gz: 40aca6adc8c32337f3761eadd54973d893a58c8d87777570639eb1d4dcf1145d95e9199048c4fc6268df5e4294c202291dfaf4d1532beb13631a0dca71c5cd9f

data/app/assets/javascripts/dist/scrivito_content_browser_pkg.js

@@ -60,7 +60,7 @@
 
 	Provider = ReactRedux.Provider;
 
-	configureStore = __webpack_require__(258);
+	configureStore = __webpack_require__(259);
 
 	scrivito.content_browser = (function() {
 	  return {
@@ -193,11 +193,16 @@
 	  return scrivito.content_browser;
 	});
 
-	scrivito.registerBrowseContent(function() {
-	  return scrivito.content_browser.open({
+	scrivito.registerBrowseContent(function(options) {
+	  var defaultOptions;
+	  if (options == null) {
+	    options = {};
+	  }
+	  defaultOptions = {
 	    selection_mode: 'single',
 	    standAlone: true
-	  });
+	  };
+	  return scrivito.content_browser.open(_.extend(defaultOptions, options));
 	});
 
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
@@ -3740,7 +3745,7 @@
 	  'content_browser.table_view.file_size': 'File size',
 	  'content_browser.table_view.last_change': 'Last change',
 	  'content_browser.sort.relevance.title': 'Sort by relevance',
-	  'content_browser.sort.relevance.asc_criteria_title': 'Relevance',
+	  'content_browser.sort.relevance.desc_criteria_title': 'Relevance',
 	  'content_browser.sort.file_name.title': 'Sort by filename',
 	  'content_browser.sort.file_name.asc_criteria_title': 'Filename: From A to Z',
 	  'content_browser.sort.file_name.desc_criteria_title': 'Filename: From Z to A',
@@ -3784,7 +3789,7 @@
 	  'content_browser.table_view.file_size': 'Dateigröße',
 	  'content_browser.table_view.last_change': 'Letzte Änderung',
 	  'content_browser.sort.relevance.title': 'Nach Relevanz sortieren',
-	  'content_browser.sort.relevance.asc_criteria_title': 'Relevanz',
+	  'content_browser.sort.relevance.desc_criteria_title': 'Relevanz',
 	  'content_browser.sort.file_name.title': 'Nach Dateiname sortieren',
 	  'content_browser.sort.file_name.asc_criteria_title': 'Dateiname: Von A bis Z',
 	  'content_browser.sort.file_name.desc_criteria_title': 'Dateiname: Von Z bis A',
@@ -20295,31 +20300,35 @@
 /* 180 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var App, AppContainer, Filter, Footer, InspectorComponent, Items, MoreItemsSpinner, ObjCollection, ReactRedux, TopBar, createObj, disableTags, fetchTags, objDeleted, redux, setLastAddedVisibility, _ref, _ref1;
+	/* WEBPACK VAR INJECTION */(function(React) {var App, AppContainer, Filter, Footer, InspectorComponent, Items, MoreItemsSpinner, Obj, ObjCollection, ReactRedux, TopBar, createObj, deselectObjs, disableTags, fetchTags, initializeSelection, objDeleted, redux, setLastAddedVisibility, toggleSelect, _ref, _ref1, _ref2;
 
 	ObjCollection = __webpack_require__(181);
 
+	Obj = __webpack_require__(182);
+
 	TopBar = __webpack_require__(183);
 
 	Filter = __webpack_require__(210);
 
 	Items = __webpack_require__(224);
 
-	MoreItemsSpinner = __webpack_require__(250);
+	MoreItemsSpinner = __webpack_require__(251);
 
-	InspectorComponent = __webpack_require__(251);
+	InspectorComponent = __webpack_require__(252);
 
-	Footer = __webpack_require__(255);
+	Footer = __webpack_require__(256);
 
 	ReactRedux = __webpack_require__(185);
 
 	redux = __webpack_require__(193);
 
-	setLastAddedVisibility = __webpack_require__(256).setLastAddedVisibility;
+	setLastAddedVisibility = __webpack_require__(257).setLastAddedVisibility;
+
+	_ref = __webpack_require__(258), createObj = _ref.createObj, objDeleted = _ref.objDeleted;
 
-	_ref = __webpack_require__(257), createObj = _ref.createObj, objDeleted = _ref.objDeleted;
+	_ref1 = __webpack_require__(250), fetchTags = _ref1.fetchTags, disableTags = _ref1.disableTags;
 
-	_ref1 = __webpack_require__(249), fetchTags = _ref1.fetchTags, disableTags = _ref1.disableTags;
+	_ref2 = __webpack_require__(231), toggleSelect = _ref2.toggleSelect, initializeSelection = _ref2.initializeSelection, deselectObjs = _ref2.deselectObjs;
 
 	App = React.createClass({
 	  displayName: 'App',
@@ -20340,11 +20349,24 @@
 	  updateLastAdded: function(showLastAdded) {
 	    return this.props.dispatch(setLastAddedVisibility(showLastAdded));
 	  },
-	  destroyAddedObj: function(objId) {
+	  destroyObj: function(objId) {
 	    return this.props.dispatch(objDeleted(objId));
 	  },
+	  toggleObjSelection: function(objId) {
+	    return this.props.dispatch(toggleSelect(objId));
+	  },
+	  deselectObjs: function() {
+	    return this.props.dispatch(deselectObjs());
+	  },
 	  activateInitialFilter: function() {
 	    if (this.refs.filterView.activateInitialFilter) {
+	      if (this.props.options.selection) {
+	        _.map(this.props.options.selection, (function(_this) {
+	          return function(objId) {
+	            return _this.toggleObjSelection(objId);
+	          };
+	        })(this));
+	      }
 	      return this.refs.filterView.activateInitialFilter();
 	    }
 	  },
@@ -20355,20 +20377,18 @@
 	    return this.props.dispatch(fetchTags(query));
 	  },
 	  componentDidMount: function() {
+	    this.props.dispatch(initializeSelection(this.props.options.selection_mode));
 	    this.state.filter.onChange(this.updateFilter);
 	    this.state.objCollection.onChange(this.updateObjCollection);
-	    this.state.objCollection.on('destroy-obj', this.destroyAddedObj);
+	    this.state.objCollection.on('destroy-obj', this.destroyObj);
 	    return this.activateInitialFilter();
 	  },
 	  getInitialState: function() {
-	    var initialSelection, selectionMode;
-	    initialSelection = this.props.options.selection || [];
-	    selectionMode = this.props.options.selection_mode;
 	    return {
 	      filter: this.props.initialFilter,
 	      objs: [],
 	      sortCriteria: this.props.initialFilter.sortCriteria,
-	      objCollection: new ObjCollection(initialSelection, selectionMode)
+	      objCollection: new ObjCollection()
 	    };
 	  },
 	  _getBodyClassName: function() {
@@ -20402,8 +20422,10 @@
 	      "updateLastAdded": this.updateLastAdded,
 	      "sortCriteria": this.props.sortCriteria,
 	      "additionCount": this.props.lastAdded.additions.length,
-	      "dispatch": this.props.dispatch,
-	      "showLastAdded": this.props.lastAdded.isVisible
+	      "deselectObjs": this.deselectObjs,
+	      "showLastAdded": this.props.lastAdded.isVisible,
+	      "initialSelection": this.props.options.selection || [],
+	      "selectedObjs": this.props.selection.selectedObjs
 	    }), React.createElement(Items, {
 	      "disableTags": this.disableTagBar,
 	      "ref": "itemView",
@@ -20414,6 +20436,9 @@
 	      "basePreset": this.props.options.base_preset,
 	      "viewMode": this.props.objDisplay.viewMode,
 	      "lastAdded": this.props.lastAdded,
+	      "toggleObjSelection": this.toggleObjSelection,
+	      "selectedObjs": this.props.selection.selectedObjs,
+	      "selectionMode": this.props.selection.selectionMode,
 	      "filter": this.state.filter,
 	      "editingView": this.props.options.editingView
 	    }), (this.state.objCollection.isLoadingAdditionalObjs() ? React.createElement(MoreItemsSpinner, {
@@ -20421,10 +20446,14 @@
 	    }) : void 0)), React.createElement(InspectorComponent, {
 	      "dispatch": this.props.dispatch,
 	      "editingView": this.props.options.editingView,
-	      "objCollection": this.state.objCollection
+	      "disableDelete": !!this.props.options.disableDelete,
+	      "objCollection": this.state.objCollection,
+	      "selectedObjs": this.props.selection.selectedObjs
 	    })), React.createElement(Footer, {
 	      "promise": this.props.promise,
 	      "editingView": this.props.options.editingView,
+	      "disableDelete": this.props.options.disableDelete,
+	      "selectedObjs": this.props.selection.selectedObjs,
 	      "standAlone": this.props.options.standAlone,
 	      "objCollection": this.state.objCollection
 	    }));
@@ -20456,11 +20485,8 @@
 	ObjCollection = (function(_super) {
 	  __extends(ObjCollection, _super);
 
-	  function ObjCollection(selectedObjsIds, _selectionMode, objs) {
-	    this._selectionMode = _selectionMode;
+	  function ObjCollection(objs) {
 	    ObjCollection.__super__.constructor.call(this);
-	    this._selectionMode || (this._selectionMode = 'multi');
-	    this._selectedObjsIds = selectedObjsIds || [];
 	    this._objs = objs || [];
 	    this._isAlreadyReversed = false;
 	    this._curQueryNumber = 0;
@@ -20470,39 +20496,12 @@
 	    return this._objs;
 	  };
 
-	  ObjCollection.prototype.hasMoreItems = function() {
-	    return this._nextQuery != null;
-	  };
-
-	  ObjCollection.prototype.selectedObjsIds = function() {
-	    return this._selectedObjsIds;
-	  };
-
-	  ObjCollection.prototype.isSingleElementSelected = function() {
-	    return this.getSelectedObjs().length === 1;
-	  };
-
-	  ObjCollection.prototype.getSelectedObjs = function() {
-	    var selectedObjs;
-	    selectedObjs = [];
-	    _.each(this._selectedObjsIds, (function(_this) {
-	      return function(selected) {
-	        var selectedObj;
-	        selectedObj = _.find(_this._objs, function(obj) {
-	          if (obj != null) {
-	            return obj.id() === selected;
-	          }
-	        });
-	        if (selectedObj != null) {
-	          return selectedObjs.push(selectedObj);
-	        }
-	      };
-	    })(this));
-	    return selectedObjs;
+	  ObjCollection.prototype.setObjs = function(objs) {
+	    return this._objs = objs;
 	  };
 
-	  ObjCollection.prototype.deselectObjs = function() {
-	    return this._selectedObjsIds = [];
+	  ObjCollection.prototype.hasMoreItems = function() {
+	    return this._nextQuery != null;
 	  };
 
 	  ObjCollection.prototype.isLoading = function() {
@@ -20521,10 +20520,6 @@
 	    }
 	  };
 
-	  ObjCollection.prototype.isSingleSelectionMode = function() {
-	    return this._selectionMode === 'single';
-	  };
-
 	  ObjCollection.prototype.loadFromBackend = function(query) {
 	    this._query = query;
 	    this._curQueryNumber += 1;
@@ -20538,30 +20533,6 @@
 	    }
 	  };
 
-	  ObjCollection.prototype.toggleSelected = function(obj) {
-	    if (this.isSelected(obj.id())) {
-	      this._selectedObjsIds = _.without(this._selectedObjsIds, obj.id());
-	    } else {
-	      if (this.isSingleSelectionMode()) {
-	        this._selectedObjsIds = [obj.id()];
-	      } else {
-	        this._selectedObjsIds.push(obj.id());
-	      }
-	    }
-	    if (!this.isPresentInObjCollection(obj)) {
-	      this._objs.push(obj);
-	    }
-	    return this.changed();
-	  };
-
-	  ObjCollection.prototype.isPresentInObjCollection = function(obj) {
-	    return _.where(this._objs, obj).length > 0;
-	  };
-
-	  ObjCollection.prototype.isSelected = function(objId) {
-	    return _.contains(this._selectedObjsIds, objId);
-	  };
-
 	  ObjCollection.prototype.loadNextPage = function() {
 	    var queryNumber;
 	    if (this.hasMoreItems() && !this.isLoadingAdditionalObjs()) {
@@ -20580,10 +20551,10 @@
 	    }
 	  };
 
-	  ObjCollection.prototype.destroySelectedObjs = function() {
+	  ObjCollection.prototype.destroyObjs = function(deletedObjs) {
 	    var deferreds;
-	    if (this._selectedObjsIds.length > 0) {
-	      deferreds = _.map(this._selectedObjsIds, (function(_this) {
+	    if (deletedObjs.length > 0) {
+	      deferreds = _.map(deletedObjs, (function(_this) {
 	        return function(objId) {
 	          return _this._destroyById(objId);
 	        };
@@ -20603,9 +20574,6 @@
 	        _this._objs = _.reject(_this._objs, function(obj) {
 	          return obj.id() === objId;
 	        });
-	        _this._selectedObjsIds = _this._selectedObjsIds.filter(function(selectedObjId) {
-	          return selectedObjId !== objId;
-	        });
 	        return _this.trigger('destroy-obj', objId);
 	      };
 	    })(this));
@@ -20634,6 +20602,25 @@
 	    })(this));
 	  };
 
+	  ObjCollection.prototype.getObjs = function(objIds) {
+	    var selectedObjs;
+	    selectedObjs = [];
+	    _.each(objIds, (function(_this) {
+	      return function(selected) {
+	        var selectedObj;
+	        selectedObj = _.find(_this._objs, function(obj) {
+	          if (obj != null) {
+	            return obj.id() === selected;
+	          }
+	        });
+	        if (selectedObj != null) {
+	          return selectedObjs.push(selectedObj);
+	        }
+	      };
+	    })(this));
+	    return selectedObjs;
+	  };
+
 	  ObjCollection.prototype._setAndLoadObjs = function(results, next, queryNumber) {
 	    var curObjs;
 	    if (queryNumber === this._curQueryNumber) {
@@ -20656,7 +20643,6 @@
 
 	  ObjCollection.prototype._resetObjsCollectionParams = function() {
 	    this._query = null;
-	    this.deselectObjs();
 	    this._resetLoadingState();
 	    return this.changed();
 	  };
@@ -20732,10 +20718,6 @@
 	    return scrivito.details_url_for_obj_id(this.id());
 	  };
 
-	  Obj.prototype.hasDetailsView = function() {
-	    return this._attr['has_details_view'];
-	  };
-
 	  return Obj;
 
 	})();
@@ -20762,7 +20744,7 @@
 	  },
 	  getInitialState: function() {
 	    return {
-	      searchTerm: this.props.filter.searchTerm || ""
+	      searchTerm: this.props.filter.searchTerm || ''
 	    };
 	  },
 	  triggerSearchWithEnter: function(event) {
@@ -20809,16 +20791,16 @@
 	  },
 	  render: function() {
 	    return React.createElement("div", {
-	      "className": "scrivito-content-browser-topbar"
+	      "className": 'scrivito-content-browser-topbar'
 	    }, React.createElement("div", {
-	      "className": "scrivito-content-browser-search"
+	      "className": 'scrivito-content-browser-search'
 	    }, React.createElement("span", {
-	      "className": "text-input-wrapper"
+	      "className": 'text-input-wrapper'
 	    }, React.createElement("input", {
-	      "refs": "searchTermText",
-	      "type": "text",
+	      "refs": 'searchTermText',
+	      "type": 'text',
 	      "placeholder": this._getSearchPlaceholder(),
-	      "className": "search-field",
+	      "className": 'search-field',
 	      "value": this.state.searchTerm,
 	      "onChange": this.updateSearchTerm,
 	      "onKeyUp": this.triggerSearchWithEnter
@@ -20827,7 +20809,7 @@
 	      "className": this.clearButtonClassName(),
 	      "title": scrivito.translate('content_browser.search_bar.clear_button')
 	    })), React.createElement("button", {
-	      "className": "search-field-button",
+	      "className": 'search-field-button',
 	      "onClick": this.updateSearchFilter.bind(this, this.state.searchTerm)
 	    }, scrivito.translate('content_browser.search_bar.search_button'))), React.createElement(ViewModeBar, {
 	      "viewMode": this.props.viewMode
@@ -22326,22 +22308,22 @@
 	  displayName: 'SortMenu',
 	  sortItemsData: function() {
 	    return {
-	      "relevance": {
+	      'relevance': {
 	        itemTitle: scrivito.translate('content_browser.sort.relevance.title'),
-	        ascCriteriaTitle: scrivito.translate('content_browser.sort.relevance.asc_criteria_title'),
-	        sortItemType: "relevance"
+	        descCriteriaTitle: scrivito.translate('content_browser.sort.relevance.desc_criteria_title'),
+	        sortItemType: 'relevance'
 	      },
-	      "filename": {
+	      'filename': {
 	        itemTitle: scrivito.translate('content_browser.sort.file_name.title'),
 	        descCriteriaTitle: scrivito.translate('content_browser.sort.file_name.desc_criteria_title'),
 	        ascCriteriaTitle: scrivito.translate('content_browser.sort.file_name.asc_criteria_title'),
-	        sortItemType: "blob:filename"
+	        sortItemType: 'blob:filename'
 	      },
-	      "date": {
+	      'date': {
 	        itemTitle: scrivito.translate('content_browser.sort.date.title'),
 	        descCriteriaTitle: scrivito.translate('content_browser.sort.date.desc_criteria_title'),
 	        ascCriteriaTitle: scrivito.translate('content_browser.sort.date.asc_criteria_title'),
-	        sortItemType: "_last_changed"
+	        sortItemType: '_last_changed'
 	      }
 	    };
 	  },
@@ -22365,11 +22347,11 @@
 	  },
 	  getSortIconClassName: function() {
 	    var sortIcon;
-	    sortIcon = "scrivito_icon ";
+	    sortIcon = 'scrivito_icon ';
 	    if (this.props.sortCriteria.sortDirection === DESC_SORT_ORDER) {
-	      sortIcon += "scrivito_icon_sort_up";
+	      sortIcon += 'scrivito_icon_sort_up';
 	    } else {
-	      sortIcon += "scrivito_icon_sort_down";
+	      sortIcon += 'scrivito_icon_sort_down';
 	    }
 	    return sortIcon;
 	  },
@@ -22382,16 +22364,16 @@
 	  render: function() {
 	    var sortItem;
 	    return React.createElement("span", {
-	      "className": "scrivito-content-browser-sort-menu scrivito_button scrivito_lightgrey scrivito_right",
+	      "className": 'scrivito-content-browser-sort-menu scrivito_button scrivito_lightgrey scrivito_right',
 	      "onClick": this.toggleSortMenu
 	    }, React.createElement("i", {
 	      "className": this.getSortIconClassName()
 	    }), React.createElement("span", {
-	      "className": "scrivito-content-browser-sort-menu-title"
+	      "className": 'scrivito-content-browser-sort-menu-title'
 	    }, this.getSortActiveCriteriaTitle()), React.createElement("i", {
-	      "className": "scrivito_icon scrivito-content-browser-menu-icon scrivito_icon_chevron_down"
+	      "className": 'scrivito_icon scrivito-content-browser-menu-icon scrivito_icon_chevron_down'
 	    }), React.createElement("ul", {
-	      "className": "scrivito_menu_box scrivito_left"
+	      "className": 'scrivito_menu_box scrivito_left'
 	    }, (function() {
 	      var _i, _len, _ref1, _results;
 	      _ref1 = Object.keys(this.sortItemsData());
@@ -22409,7 +22391,7 @@
 	      }
 	      return _results;
 	    }).call(this), React.createElement("li", {
-	      "className": "scrivito_menu_box_overlay"
+	      "className": 'scrivito_menu_box_overlay'
 	    })));
 	  }
 	});
@@ -22677,7 +22659,7 @@
 	        "filter": additionalFilter
 	      });
 	    });
-	    return this.renderSubFiltersList(subFilters, "compact");
+	    return this.renderSubFiltersList(subFilters, 'compact');
 	  },
 	  _activeTags: function() {
 	    return this._activeTags;
@@ -22687,7 +22669,7 @@
 	  },
 	  _triggerReduxStateChanged: function(newProps, oldProps) {
 	    if (!this._isBuiltInFilterSelected() && !_.isEqual(newProps, oldProps)) {
-	      return this.props.filter.trigger("reduxStateChanged", this.props.filter);
+	      return this.props.filter.trigger('reduxStateChanged', this.props.filter);
 	    }
 	  },
 	  componentWillReceiveProps: function(nextProps) {
@@ -22708,7 +22690,7 @@
 	      selectedFilter: false
 	    });
 	    this.props.updateLastAdded(false);
-	    this.props.objCollection.deselectObjs();
+	    this.props.deselectObjs();
 	    return this.props.objCollection.loadFromBackend(query);
 	  },
 	  loadObjs: function(filter) {
@@ -22729,26 +22711,27 @@
 	  },
 	  getFilterClassName: function() {
 	    var filterBrowserClass;
-	    filterBrowserClass = "scrivito-content-browser-filter";
+	    filterBrowserClass = 'scrivito-content-browser-filter';
 	    if (this.props.additionCount > 0 && this.props.standAlone) {
 	      return filterBrowserClass;
 	    }
 	    if (this.props.additionCount > 0) {
-	      filterBrowserClass += " last_added";
+	      filterBrowserClass += ' last_added';
 	    }
 	    if (this.props.standAlone) {
-	      filterBrowserClass += " stand-alone";
+	      filterBrowserClass += ' stand-alone';
 	    }
 	    return filterBrowserClass;
 	  },
 	  componentDidMount: function() {
+	    this._sortCriteria = this.props.sortCriteria;
 	    this._activeTags = this.props.tags.activeTags;
 	    this.props.filter.onChange(this.loadObjsAndTags);
-	    return this.props.filter.on("reduxStateChanged", this.loadObjs);
+	    return this.props.filter.on('reduxStateChanged', this.loadObjs);
 	  },
 	  activateInitialFilter: function() {
-	    if (this.props.objCollection.selectedObjsIds().length > 0) {
-	      return this.activateSelectedFilter();
+	    if (this.props.initialSelection.length > 0) {
+	      return this.activateSelectedFilter(this.props.initialSelection);
 	    } else if (this.props.filter.hasActiveChildren()) {
 	      return this.loadObjsAndTags(this.props.filter);
 	    }
@@ -22759,10 +22742,10 @@
 	    });
 	    this.props.disableTags();
 	    this.props.updateLastAdded(true);
-	    this.props.objCollection.deselectObjs();
+	    this.props.deselectObjs();
 	    return this.props.filter.deselectHierarchicalFilters();
 	  },
-	  activateSelectedFilter: function() {
+	  activateSelectedFilter: function(selectedObjsIds) {
 	    var query;
 	    this.props.filter.deselectHierarchicalFilters();
 	    this.setState({
@@ -22770,7 +22753,7 @@
 	    });
 	    this.props.disableTags();
 	    this.props.updateLastAdded(false);
-	    query = QueryBuilder.byId(this.props.objCollection.selectedObjsIds());
+	    query = QueryBuilder.byId(selectedObjsIds);
 	    return this.props.objCollection.loadFromBackend(query);
 	  },
 	  getInitialState: function() {
@@ -22781,12 +22764,12 @@
 	  renderFilterSeparator: function() {
 	    if (this.props.filter.hasAdditionalFilters() && this.props.filter.hasHierarchicalFilters()) {
 	      return React.createElement("div", {
-	        "className": "scrivito_separator"
+	        "className": 'scrivito_separator'
 	      }, scrivito.translate('content_browser.filter.more_filters'));
 	    }
 	  },
 	  render: function() {
-	    var selectedObjsCount, treeSubFilters;
+	    var treeSubFilters;
 	    treeSubFilters = _.map(this.props.filter.getHierarchicalFilters(), (function(_this) {
 	      return function(treeFilter) {
 	        return React.createElement(TreeFilter, {
@@ -22795,13 +22778,12 @@
 	        });
 	      };
 	    })(this));
-	    selectedObjsCount = this.props.objCollection.getSelectedObjs().length;
 	    return React.createElement("div", {
 	      "className": this.getFilterClassName()
 	    }, React.createElement("div", {
-	      "className": "scrivito-content-browser-filter-fixed"
+	      "className": 'scrivito-content-browser-filter-fixed'
 	    }, (!this.props.standAlone ? React.createElement(SelectedFilter, {
-	      "selectedCount": selectedObjsCount,
+	      "selectedObjs": this.props.selectedObjs,
 	      "active": this.state.selectedFilter,
 	      "activateSelectedFilter": this.activateSelectedFilter
 	    }) : void 0), (this.props.additionCount > 0 ? React.createElement(LastAddedFilter, {
@@ -22809,7 +22791,7 @@
 	      "active": this.props.showLastAdded,
 	      "activateLastAddedFilter": this.activateLastAddedFilter
 	    }) : void 0)), React.createElement("div", {
-	      "className": "scrivito-content-browser-filter-scroll"
+	      "className": 'scrivito-content-browser-filter-scroll'
 	    }, this.renderSubFiltersList(treeSubFilters), this.renderFilterSeparator(), this.renderAdditionalFilters()));
 	  }
 	});
@@ -23172,10 +23154,9 @@
 	    this.tags = tags;
 	    this.sortCriteria = sortCriteria;
 	    this._collector = new ActiveNodeConfigCollector(this.filter);
-	    this.sortCriteria || (this.sortCriteria = {
-	      sortField: '_last_changed',
-	      sortDirection: DESC_SORT_ORDER
-	    });
+	    if (!this.sortCriteria) {
+	      throw new Error('sortCriteria is not initialized. Please explicit initialize the sort criteria param');
+	    }
 	    if (baseQuery) {
 	      this._baseQuery = QueryBuilder.prepareQuery(baseQuery);
 	    }
@@ -23214,29 +23195,36 @@
 	  };
 
 	  QueryBuilder.prototype._sortQuery = function(query) {
-	    if ((query != null) && this._needOrder()) {
-	      query = query.order(this.sortCriteria.sortField);
-	      if (this.sortCriteria.sortDirection === DESC_SORT_ORDER) {
-	        if (!query.orderReversed) {
-	          query.reverse_order();
+	    if (query != null) {
+	      if (this._isRelevanceSortCriteria()) {
+	        if (!this._hasSearchTerm()) {
+	          query = this._setOrderInQuery(query, '_last_changed', DESC_SORT_ORDER);
 	        }
+	      } else {
+	        query = this._setOrderInQuery(query, this.sortCriteria.sortField, this.sortCriteria.sortDirection);
+	      }
+	    }
+	    return query;
+	  };
+
+	  QueryBuilder.prototype._setOrderInQuery = function(query, sortField, sortDirection) {
+	    query = query.order(sortField);
+	    if (sortDirection === DESC_SORT_ORDER) {
+	      if (!query.orderReversed) {
+	        query.reverse_order();
 	      }
 	    }
 	    return query;
 	  };
 
-	  QueryBuilder.prototype._needOrder = function() {
-	    return this.sortCriteria.sortField !== "relevance";
+	  QueryBuilder.prototype._isRelevanceSortCriteria = function() {
+	    return this.sortCriteria.sortField === 'relevance';
 	  };
 
 	  QueryBuilder.prototype._addSearchTermQuery = function(query) {
 	    var searchQuery;
-	    if (this.filter.searchTerm && this.filter.searchTerm.length > 0) {
+	    if (this._hasSearchTerm()) {
 	      searchQuery = scrivito.obj_where('*', 'contains_prefix', this.filter.searchTerm);
-	      this.sortCriteria = {
-	        sortField: "relevance",
-	        sortDirection: ASC_SORT_ORDER
-	      };
 	      return this._addOrCreateQuery(query, searchQuery);
 	    } else {
 	      return query;
@@ -23267,6 +23255,10 @@
 	    }
 	  };
 
+	  QueryBuilder.prototype._hasSearchTerm = function() {
+	    return this.filter.searchTerm && this.filter.searchTerm.length > 0;
+	  };
+
 	  return QueryBuilder;
 
 	})();
@@ -23324,17 +23316,20 @@
 	    }
 	    return classNames;
 	  },
+	  activateSelectedFilter: function() {
+	    return this.props.activateSelectedFilter(this.props.selectedObjs);
+	  },
 	  render: function() {
 	    return React.createElement("div", {
 	      "className": this.filterClass(),
-	      "onClick": this.props.activateSelectedFilter
+	      "onClick": this.activateSelectedFilter
 	    }, React.createElement("i", {
 	      "className": "scrivito-content-browser-icon scrivito-content-browser-icon-ok-box"
 	    }), React.createElement("span", {
 	      "className": "scrivito-content-browser-filter-label"
 	    }, scrivito.translate('content_browser.filter.selected_filter'), React.createElement("span", {
 	      "className": "scrivito-content-browser-counter selected-total"
-	    }, this.props.selectedCount)));
+	    }, this.props.selectedObjs.length)));
 	  }
 	});
 
@@ -23380,26 +23375,28 @@
 /* 224 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var Items, LastAddedItems, Obj, PresetBuilder, TableView, TableViewContent, TagBar, ThumbnailItems, objDisplayAction, toggleExpandTagBar, toggleTag, _ref;
+	/* WEBPACK VAR INJECTION */(function(React) {var Items, LastAddedItems, Obj, PresetBuilder, TableView, TableViewContent, TagBar, ThumbnailItems, objDisplayAction, toggleExpandTagBar, toggleTag, uploadedObjs, _ref;
 
 	TableView = __webpack_require__(225);
 
 	ThumbnailItems = __webpack_require__(226);
 
-	PresetBuilder = __webpack_require__(234);
+	PresetBuilder = __webpack_require__(235);
 
-	LastAddedItems = __webpack_require__(235);
+	LastAddedItems = __webpack_require__(236);
 
-	TableViewContent = __webpack_require__(246);
+	TableViewContent = __webpack_require__(247);
 
-	TagBar = __webpack_require__(248);
+	TagBar = __webpack_require__(249);
 
 	objDisplayAction = __webpack_require__(205);
 
-	_ref = __webpack_require__(249), toggleExpandTagBar = _ref.toggleExpandTagBar, toggleTag = _ref.toggleTag;
+	_ref = __webpack_require__(250), toggleExpandTagBar = _ref.toggleExpandTagBar, toggleTag = _ref.toggleTag;
 
 	Obj = __webpack_require__(182);
 
+	uploadedObjs = __webpack_require__(242).uploadedObjs;
+
 	Items = React.createClass({
 	  displayName: 'Items',
 	  getInitialState: function() {
@@ -23408,11 +23405,16 @@
 	    };
 	  },
 	  componentWillReceiveProps: function(nextProps) {
-	    var obj;
+	    var obj, objData, objs;
 	    if (this.props.lastAdded.isVisible && nextProps.lastAdded.lastAddedObj) {
+	      objData = uploadedObjs(nextProps.lastAdded.additions);
+	      objs = _.map(objData, function(newObj) {
+	        return new Obj(newObj);
+	      });
+	      this.props.objCollection.setObjs(objs);
 	      if (this.props.lastAdded.lastAddedObj !== nextProps.lastAdded.lastAddedObj) {
 	        obj = new Obj(nextProps.lastAdded.lastAddedObj);
-	        return this.props.objCollection.toggleSelected(obj);
+	        return this.props.toggleObjSelection(obj.id());
 	      }
 	    }
 	  },
@@ -23543,10 +23545,11 @@
 	    }, React.createElement("i", {
 	      "className": "scrivito_icon scrivito_icon_refresh"
 	    })) : this.props.lastAdded.isVisible ? React.createElement(LastAddedItems, {
-	      "objCollection": this.props.objCollection,
 	      "activeTags": this.props.tags.activeTags,
-	      "toggleSelected": this.props.toggleSelected,
+	      "selectionMode": this.props.selectionMode,
 	      "filter": this.props.filter,
+	      "toggleObjSelection": this.props.toggleObjSelection,
+	      "selectedObjs": this.props.selectedObjs,
 	      "createObj": this.props.createObj,
 	      "basePreset": this.props.basePreset,
 	      "viewMode": this.props.viewMode,
@@ -23555,7 +23558,6 @@
 	    }) : this.props.viewMode === objDisplayAction.TABLE_VIEW ? React.createElement(TableView, {
 	      "objCollection": this.props.objCollection,
 	      "activeTags": this.props.tags.activeTags,
-	      "toggleSelected": this.props.toggleSelected,
 	      "filter": this.props.filter,
 	      "createObj": this.props.createObj,
 	      "basePreset": this.props.basePreset
@@ -23566,18 +23568,24 @@
 	      "ps": true,
 	      "basePreset": true,
 	      "t": true,
+	      "toggleObjSelection": this.props.toggleObjSelection,
 	      "createObj": this.props.createObj,
 	      "objCollection": this.props.objCollection,
 	      "editingView": this.props.editingView,
+	      "selectedObjs": this.props.selectedObjs,
+	      "selectionMode": this.props.selectionMode,
 	      "filter": this.props.filter
 	    })) : React.createElement(ThumbnailItems, {
 	      "objCollection": this.props.objCollection,
 	      "viewMode": this.props.viewMode,
+	      "toggleObjSelection": this.props.toggleObjSelection,
+	      "selectionMode": this.props.selectionMode,
 	      "activeTags": this.props.tags.activeTags,
 	      "basePreset": this.props.basePreset,
 	      "filter": this.props.filter,
 	      "editingView": this.props.editingView,
-	      "createObj": this.props.createObj
+	      "createObj": this.props.createObj,
+	      "selectedObjs": this.props.selectedObjs
 	    })));
 	  }
 	});
@@ -23616,9 +23624,9 @@
 
 	ThumbnailItem = __webpack_require__(228);
 
-	ThumbnailAddItem = __webpack_require__(231);
+	ThumbnailAddItem = __webpack_require__(232);
 
-	ObjCreation = __webpack_require__(233);
+	ObjCreation = __webpack_require__(234);
 
 	ActiveNodeConfigCollector = __webpack_require__(208);
 
@@ -23646,8 +23654,10 @@
 	      return function(obj) {
 	        return React.createElement(ThumbnailItem, {
 	          "key": obj.id(),
+	          "selectedObjs": _this.props.selectedObjs,
+	          "toggleObjSelection": _this.props.toggleObjSelection,
 	          "obj": obj,
-	          "objCollection": _this.props.objCollection
+	          "selectionMode": _this.props.selectionMode
 	        });
 	      };
 	    })(this));
@@ -23743,12 +23753,14 @@
 /* 228 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var InspectedItemMixin, MimeTypeIcon, ThumbnailItem;
+	/* WEBPACK VAR INJECTION */(function(React) {var InspectedItemMixin, MimeTypeIcon, SINGLE_SELECTION_MODE, ThumbnailItem;
 
 	InspectedItemMixin = __webpack_require__(229);
 
 	MimeTypeIcon = __webpack_require__(230);
 
+	SINGLE_SELECTION_MODE = __webpack_require__(231).SINGLE_SELECTION_MODE;
+
 	ThumbnailItem = React.createClass({
 	  displayName: 'ThumbnailItem',
 	  mixins: [InspectedItemMixin],
@@ -23795,7 +23807,7 @@
 	      "className": "scrivito-content-browser-thumbnails-name"
 	    }, this.props.obj.title()), React.createElement("span", {
 	      "className": "scrivito-content-browser-thumbnails-size"
-	    }, this.props.obj.subtitle()), (!this.props.objCollection.isSingleSelectionMode() ? React.createElement("span", {
+	    }, this.props.obj.subtitle()), (this.props.selectionMode !== SINGLE_SELECTION_MODE ? React.createElement("span", {
 	      "className": 'scrivito-content-browser-thumbnails-select select-item'
 	    }) : void 0))));
 	  }
@@ -23812,10 +23824,13 @@
 	var InspectedItemMixin;
 
 	InspectedItemMixin = {
+	  isSelectedItem: function(objId) {
+	    return _.contains(this.props.selectedObjs, objId);
+	  },
 	  getItemClasses: function() {
 	    var className;
 	    className = 'content-browser-item ';
-	    if (this.props.objCollection.isSelected(this.props.obj.id())) {
+	    if (this.isSelectedItem(this.props.obj.id())) {
 	      className += 'active';
 	    }
 	    return className;
@@ -23823,13 +23838,13 @@
 	  selectClass: function() {
 	    var className;
 	    className = this.baseSelectClass();
-	    if (this.props.objCollection.isSelected(this.props.obj.id())) {
+	    if (this.isSelectedItem(this.props.obj.id())) {
 	      className += ' active';
 	    }
 	    return className;
 	  },
 	  handleSelectClick: function() {
-	    return this.props.objCollection.toggleSelected(this.props.obj);
+	    return this.props.toggleObjSelection(this.props.obj.id());
 	  }
 	};
 
@@ -23885,11 +23900,63 @@
 
 /***/ },
 /* 231 */
+/***/ function(module, exports) {
+
+	var DESELECT_OBJS, INITIALIZE_SELECTION, MULTI_SELECTION_MODE, SINGLE_SELECTION_MODE, TOGGLE_SELECT, deselectObjs, initializeSelection, toggleSelect;
+
+	TOGGLE_SELECT = 'TOGGLE_SELECT';
+
+	DESELECT_OBJS = 'DESELECT_OBJS';
+
+	INITIALIZE_SELECTION = 'INITIALIZE_SELECTION';
+
+	SINGLE_SELECTION_MODE = 'single';
+
+	MULTI_SELECTION_MODE = 'multi';
+
+	toggleSelect = (function(_this) {
+	  return function(objId) {
+	    return {
+	      type: TOGGLE_SELECT,
+	      objId: objId
+	    };
+	  };
+	})(this);
+
+	initializeSelection = (function(_this) {
+	  return function(mode) {
+	    return {
+	      type: INITIALIZE_SELECTION,
+	      mode: mode
+	    };
+	  };
+	})(this);
+
+	deselectObjs = function() {
+	  return {
+	    type: DESELECT_OBJS
+	  };
+	};
+
+	module.exports = {
+	  DESELECT_OBJS: DESELECT_OBJS,
+	  TOGGLE_SELECT: TOGGLE_SELECT,
+	  INITIALIZE_SELECTION: INITIALIZE_SELECTION,
+	  SINGLE_SELECTION_MODE: SINGLE_SELECTION_MODE,
+	  MULTI_SELECTION_MODE: MULTI_SELECTION_MODE,
+	  toggleSelect: toggleSelect,
+	  initializeSelection: initializeSelection,
+	  deselectObjs: deselectObjs
+	};
+
+
+/***/ },
+/* 232 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AddItemMixin, ThumbnailAddItem;
 
-	AddItemMixin = __webpack_require__(232);
+	AddItemMixin = __webpack_require__(233);
 
 	ThumbnailAddItem = React.createClass({
 	  displayName: 'ThumbnailAddItem',
@@ -23914,7 +23981,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 232 */
+/* 233 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AddItemMixin;
@@ -24009,14 +24076,14 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 233 */
+/* 234 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var ActiveNodeConfigCollector, ObjCreation, PresetBuilder;
 
 	ActiveNodeConfigCollector = __webpack_require__(208);
 
-	PresetBuilder = __webpack_require__(234);
+	PresetBuilder = __webpack_require__(235);
 
 	ObjCreation = (function() {
 	  function ObjCreation(filter) {
@@ -24096,7 +24163,7 @@
 
 
 /***/ },
-/* 234 */
+/* 235 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var ActiveNodeConfigCollector, PresetBuilder;
@@ -24192,14 +24259,14 @@
 
 
 /***/ },
-/* 235 */
+/* 236 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItems, LastAddedTableViewContent, LastAddedThumbnailItems, TableView, objDisplayAction;
 
-	LastAddedTableViewContent = __webpack_require__(236);
+	LastAddedTableViewContent = __webpack_require__(237);
 
-	LastAddedThumbnailItems = __webpack_require__(243);
+	LastAddedThumbnailItems = __webpack_require__(244);
 
 	TableView = __webpack_require__(225);
 
@@ -24211,23 +24278,23 @@
 	    return React.createElement("div", null, (this.props.viewMode === objDisplayAction.TABLE_VIEW ? React.createElement(TableView, {
 	      "objCollection": this.props.objCollection,
 	      "activeTags": this.props.activeTags,
-	      "toggleSelected": this.props.toggleSelected,
 	      "filter": this.props.filter,
 	      "createObj": this.props.createObj,
 	      "basePreset": this.props.basePreset
 	    }, React.createElement(LastAddedTableViewContent, {
-	      "objCollection": this.props.objCollection,
 	      "activeTags": this.props.activeTags,
-	      "toggleSelected": this.props.toggleSelected,
 	      "filter": this.props.filter,
+	      "selectedObjs": this.props.selectedObjs,
+	      "toggleObjSelection": this.props.toggleObjSelection,
 	      "createObj": this.props.createObj,
 	      "additions": this.props.additions,
 	      "basePreset": this.props.basePreset
 	    })) : React.createElement(LastAddedThumbnailItems, {
-	      "objCollection": this.props.objCollection,
 	      "activeTags": this.props.activeTags,
-	      "toggleSelected": this.props.toggleSelected,
+	      "selectionMode": this.props.selectionMode,
 	      "filter": this.props.filter,
+	      "toggleObjSelection": this.props.toggleObjSelection,
+	      "selectedObjs": this.props.selectedObjs,
 	      "createObj": this.props.createObj,
 	      "additions": this.props.additions,
 	      "basePreset": this.props.basePreset
@@ -24240,20 +24307,20 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 236 */
+/* 237 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedTableViewContent, LastAddedTableViewErrorItem, LastAddedTableViewItem, Obj, TableViewItem, failed, isActive, isCompleted, _ref;
 
-	LastAddedTableViewErrorItem = __webpack_require__(237);
+	LastAddedTableViewErrorItem = __webpack_require__(238);
 
-	LastAddedTableViewItem = __webpack_require__(239);
+	LastAddedTableViewItem = __webpack_require__(240);
 
-	TableViewItem = __webpack_require__(242);
+	TableViewItem = __webpack_require__(243);
 
 	Obj = __webpack_require__(182);
 
-	_ref = __webpack_require__(241), isCompleted = _ref.isCompleted, isActive = _ref.isActive, failed = _ref.failed;
+	_ref = __webpack_require__(242), isCompleted = _ref.isCompleted, isActive = _ref.isActive, failed = _ref.failed;
 
 	LastAddedTableViewContent = React.createClass({
 	  displayName: 'LastAddedTableViewContent',
@@ -24279,9 +24346,10 @@
 	        } else if (isCompleted(addition)) {
 	          obj = new Obj(addition.obj);
 	          return React.createElement(TableViewItem, {
+	            "toggleObjSelection": _this.props.toggleObjSelection,
+	            "selectedObjs": _this.props.selectedObjs,
 	            "key": obj.id(),
-	            "obj": obj,
-	            "objCollection": _this.props.objCollection
+	            "obj": obj
 	          });
 	        }
 	      };
@@ -24299,12 +24367,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 237 */
+/* 238 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedErrorItemMixin, LastAddedTableViewErrorItem;
 
-	LastAddedErrorItemMixin = __webpack_require__(238);
+	LastAddedErrorItemMixin = __webpack_require__(239);
 
 	LastAddedTableViewErrorItem = React.createClass({
 	  displayName: 'LastAddedTableViewError',
@@ -24327,7 +24395,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 238 */
+/* 239 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedErrorItemMixin;
@@ -24362,12 +24430,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 239 */
+/* 240 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin, LastAddedTableViewItem;
 
-	LastAddedItemMixin = __webpack_require__(240);
+	LastAddedItemMixin = __webpack_require__(241);
 
 	LastAddedTableViewItem = React.createClass({
 	  displayName: 'LastAddedTableViewItem',
@@ -24392,12 +24460,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 240 */
+/* 241 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin, isActive;
 
-	isActive = __webpack_require__(241).isActive;
+	isActive = __webpack_require__(242).isActive;
 
 	LastAddedItemMixin = {
 	  uploadInProgress: function() {
@@ -24420,10 +24488,10 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 241 */
+/* 242 */
 /***/ function(module, exports) {
 
-	var failed, isActive, isCompleted, isFailed, status;
+	var failed, isActive, isCompleted, isFailed, status, uploadedObjs;
 
 	status = function(addition) {
 	  if (addition.progress === 0) {
@@ -24447,6 +24515,12 @@
 	  return status(addition) === "failed";
 	};
 
+	uploadedObjs = function(additions) {
+	  var completed;
+	  completed = _.filter(additions, isCompleted);
+	  return _.pluck(completed, 'obj');
+	};
+
 	failed = function(additions) {
 	  return _.filter(additions, isFailed);
 	};
@@ -24454,6 +24528,7 @@
 	module.exports = {
 	  status: status,
 	  failed: failed,
+	  uploadedObjs: uploadedObjs,
 	  isActive: isActive,
 	  isCompleted: isCompleted,
 	  isFailed: isFailed
@@ -24461,7 +24536,7 @@
 
 
 /***/ },
-/* 242 */
+/* 243 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var InspectedItemMixin, TableViewItem;
@@ -24510,20 +24585,20 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 243 */
+/* 244 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedThumbnailErrorItem, LastAddedThumbnailItem, LastAddedThumbnailItems, Obj, ThumbnailItem, failed, isActive, isCompleted, _ref;
 
-	LastAddedThumbnailErrorItem = __webpack_require__(244);
+	LastAddedThumbnailErrorItem = __webpack_require__(245);
 
-	LastAddedThumbnailItem = __webpack_require__(245);
+	LastAddedThumbnailItem = __webpack_require__(246);
 
 	ThumbnailItem = __webpack_require__(228);
 
 	Obj = __webpack_require__(182);
 
-	_ref = __webpack_require__(241), isCompleted = _ref.isCompleted, isActive = _ref.isActive, failed = _ref.failed;
+	_ref = __webpack_require__(242), isCompleted = _ref.isCompleted, isActive = _ref.isActive, failed = _ref.failed;
 
 	LastAddedThumbnailItems = React.createClass({
 	  displayName: "LastAddedThumbnailItems",
@@ -24552,8 +24627,10 @@
 	          obj = new Obj(addition.obj);
 	          return React.createElement(ThumbnailItem, {
 	            "key": obj.id(),
-	            "obj": obj,
-	            "objCollection": _this.props.objCollection
+	            "selectedObjs": _this.props.selectedObjs,
+	            "toggleObjSelection": _this.props.toggleObjSelection,
+	            "selectionMode": _this.props.selectionMode,
+	            "obj": obj
 	          });
 	        }
 	      };
@@ -24571,12 +24648,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 244 */
+/* 245 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedErrorItemMixin, LastAddedThumbnailErrorItem;
 
-	LastAddedErrorItemMixin = __webpack_require__(238);
+	LastAddedErrorItemMixin = __webpack_require__(239);
 
 	LastAddedThumbnailErrorItem = React.createClass({
 	  displayName: 'LastAddedThumbnailErrorItem',
@@ -24601,12 +24678,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 245 */
+/* 246 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin, LastAddedThumbnailItem;
 
-	LastAddedItemMixin = __webpack_require__(240);
+	LastAddedItemMixin = __webpack_require__(241);
 
 	LastAddedThumbnailItem = React.createClass({
 	  displayName: 'LastAddedThumbnailItem',
@@ -24637,16 +24714,16 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 246 */
+/* 247 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var InfiniteScrollMixin, ObjCreation, ReactDOM, TableViewAddItem, TableViewContent, TableViewItem;
 
-	TableViewItem = __webpack_require__(242);
+	TableViewItem = __webpack_require__(243);
 
-	TableViewAddItem = __webpack_require__(247);
+	TableViewAddItem = __webpack_require__(248);
 
-	ObjCreation = __webpack_require__(233);
+	ObjCreation = __webpack_require__(234);
 
 	InfiniteScrollMixin = __webpack_require__(227);
 
@@ -24661,7 +24738,9 @@
 	        return React.createElement(TableViewItem, {
 	          "key": obj.id(),
 	          "obj": obj,
-	          "objCollection": _this.props.objCollection
+	          "selectionMode": _this.props.selectionMode,
+	          "selectedObjs": _this.props.selectedObjs,
+	          "toggleObjSelection": _this.props.toggleObjSelection
 	        });
 	      };
 	    })(this));
@@ -24693,12 +24772,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 247 */
+/* 248 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AddItemMixin, TableViewAddItem;
 
-	AddItemMixin = __webpack_require__(232);
+	AddItemMixin = __webpack_require__(233);
 
 	TableViewAddItem = React.createClass({
 	  mixins: [AddItemMixin],
@@ -24723,7 +24802,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 248 */
+/* 249 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var TagBar;
@@ -24776,7 +24855,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 249 */
+/* 250 */
 /***/ function(module, exports) {
 
 	var TagsActionCreator;
@@ -24852,7 +24931,7 @@
 
 
 /***/ },
-/* 250 */
+/* 251 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var MoreItemsSpinner;
@@ -24873,77 +24952,60 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 251 */
+/* 252 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var Inspector, InspectorAction, MaximizeInspectorToggle, ModalDialogsModule, ReactRedux;
-
-	ModalDialogsModule = __webpack_require__(252);
+	/* WEBPACK VAR INJECTION */(function(React) {var Inspector, InspectorHeader, MaximizeInspectorToggle;
 
 	MaximizeInspectorToggle = __webpack_require__(253);
 
-	InspectorAction = __webpack_require__(254);
-
-	ReactRedux = __webpack_require__(185);
+	InspectorHeader = __webpack_require__(254);
 
 	Inspector = React.createClass({
 	  displayName: 'Inspector',
-	  getDetailsClassName: function() {
-	    return "scrivito_icon scrivito_icon_eye";
-	  },
-	  toggleInspectorMaximized: function() {
-	    return this.props.dispatch(InspectorAction.toggleInspectorMaximized());
-	  },
-	  getEmptyPlaceholder: function() {
-	    return React.createElement("div", {
-	      "className": "details-view"
-	    }, React.createElement("p", {
-	      "className": "no-editing-available"
-	    }, React.createElement("span", {
-	      "className": "scrivito_icon scrivito_icon_generic"
-	    }), "No edit view available."));
+	  propTypes: {
+	    editingView: React.PropTypes.bool.isRequired,
+	    disableDelete: React.PropTypes.bool.isRequired,
+	    selectedObjs: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
+	    objCollection: React.PropTypes.object.isRequired,
+	    dispatch: React.PropTypes.func.isRequired
 	  },
-	  _getMultiSelectedTitle: function() {
-	    return "Selected: " + (this.props.objCollection.getSelectedObjs().length) + " items";
-	  },
-	  _getInspectedObj: function() {
-	    return this.props.objCollection.getSelectedObjs()[0];
-	  },
-	  _fileDetail: function() {
-	    var _ref;
-	    return (_ref = this._getInspectedObj()) != null ? _ref.title() : void 0;
-	  },
-	  _showInspectorHeader: function(title) {
-	    return React.createElement("h3", {
-	      "title": title
-	    }, React.createElement(MaximizeInspectorToggle, {
-	      "toggleInspectorMaximized": this.toggleInspectorMaximized
-	    }), React.createElement("span", {
-	      "title": "Details",
-	      "className": this.getDetailsClassName()
-	    }), React.createElement("span", {
-	      "className": "title"
-	    }, title), (this.props.editingView ? React.createElement("span", {
-	      "className": "scrivito_icon scrivito_icon_trash scrivito_delete",
-	      "onClick": this._deleteInspectedObjs
-	    }) : void 0));
+	  _detailsViewUrl: function() {
+	    return scrivito.details_url_for_obj_id(this.props.selectedObjs[0]);
 	  },
 	  _deleteInspectedObjs: function() {
-	    return ModalDialogsModule.deleteObjs(this.props.objCollection.getSelectedObjs()).then((function(_this) {
-	      return function() {
-	        return _this.props.objCollection.destroySelectedObjs();
-	      };
-	    })(this));
+	    var _ref;
+	    if (this.props.selectedObjs.length) {
+	      return (_ref = scrivito.ConfirmDeleteDialog).open.apply(_ref, this.props.selectedObjs).then((function(_this) {
+	        return function(isConfirmed) {
+	          if (isConfirmed) {
+	            return _this.props.objCollection.destroyObjs(_this.props.selectedObjs);
+	          }
+	        };
+	      })(this));
+	    }
 	  },
 	  render: function() {
 	    return React.createElement("div", {
 	      "className": "scrivito-content-browser-inspector"
-	    }, (this.props.objCollection.getSelectedObjs().length > 0 ? this.props.objCollection.isSingleElementSelected() ? React.createElement("div", null, this._showInspectorHeader(this._fileDetail()), React.createElement("div", {
+	    }, (this.props.selectedObjs.length > 0 ? this.props.selectedObjs.length === 1 ? React.createElement("div", null, React.createElement(InspectorHeader, {
+	      "editingView": this.props.editingView,
+	      "disableDelete": this.props.disableDelete,
+	      "dispatch": this.props.dispatch,
+	      "selectedObjs": this.props.selectedObjs,
+	      "deleteInspectedObjs": this._deleteInspectedObjs
+	    }), React.createElement("div", {
 	      "className": "inspector-content"
-	    }, (this._getInspectedObj().hasDetailsView() ? React.createElement("iframe", {
-	      "src": this._getInspectedObj().detailsViewUrl(),
+	    }, React.createElement("iframe", {
+	      "src": this._detailsViewUrl(),
 	      "name": "scrivito_inspector"
-	    }) : this.getEmptyPlaceholder()))) : this._showInspectorHeader(this._getMultiSelectedTitle()) : void 0));
+	    }))) : React.createElement(InspectorHeader, {
+	      "editingView": this.props.editingView,
+	      "disableDelete": this.props.disableDelete,
+	      "dispatch": this.props.dispatch,
+	      "selectedObjs": this.props.selectedObjs,
+	      "deleteInspectedObjs": this._deleteInspectedObjs
+	    }) : void 0));
 	  }
 	});
 
@@ -24951,33 +25013,6 @@
 
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
-/***/ },
-/* 252 */
-/***/ function(module, exports, __webpack_require__) {
-
-	/* WEBPACK VAR INJECTION */(function(React) {var ModalDialogsModule;
-
-	ModalDialogsModule = {
-	  deleteObjs: function(selectedObjs) {
-	    var objectsToBeDeleted, title;
-	    if (selectedObjs.length === 1) {
-	      objectsToBeDeleted = selectedObjs[0].title();
-	      title = React.createElement("span", null, "Really delete ", React.createElement("q", null, objectsToBeDeleted), "?");
-	    } else {
-	      objectsToBeDeleted = "" + selectedObjs.length + " CMS objects";
-	      title = 'Really delete the selected items?';
-	    }
-	    return scrivito.content_browser._showConfirm({
-	      title: title,
-	      subtitle: "This will delete " + objectsToBeDeleted + ". Objects that were created in this working copy cannot be restored."
-	    });
-	  }
-	};
-
-	module.exports = ModalDialogsModule;
-
-	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
-
 /***/ },
 /* 253 */
 /***/ function(module, exports, __webpack_require__) {
@@ -25006,40 +25041,96 @@
 
 /***/ },
 /* 254 */
-/***/ function(module, exports) {
+/***/ function(module, exports, __webpack_require__) {
 
-	var InspectorActionCreator;
+	/* WEBPACK VAR INJECTION */(function(React) {var InspectorHeader, MaximizeInspectorToggle, toggleInspectorMaximized;
 
-	InspectorActionCreator = (function() {
-	  function InspectorActionCreator() {}
+	MaximizeInspectorToggle = __webpack_require__(253);
 
-	  InspectorActionCreator.MAXIMIZE_TOGGLE = 'MAXIMAZED_INSPECTOR_TOGGLE';
+	toggleInspectorMaximized = __webpack_require__(255).toggleInspectorMaximized;
 
-	  InspectorActionCreator.toggleInspectorMaximized = function() {
-	    return {
-	      type: this.MAXIMIZE_TOGGLE
-	    };
-	  };
+	InspectorHeader = scrivito.createReactClass({
+	  displayName: 'Inspector',
+	  propTypes: {
+	    editingView: React.PropTypes.bool.isRequired,
+	    disableDelete: React.PropTypes.bool.isRequired,
+	    selectedObjs: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
+	    dispatch: React.PropTypes.func.isRequired,
+	    deleteInspectedObjs: React.PropTypes.func.isRequired
+	  },
+	  _getMultiSelectedTitle: function() {
+	    return "Selected: " + this.props.selectedObjs.length + " items";
+	  },
+	  getDetailsClassName: function() {
+	    return "scrivito_icon scrivito_icon_eye";
+	  },
+	  _title: function() {
+	    var _ref;
+	    if (this.props.selectedObjs.length === 1) {
+	      return (_ref = this._getInspectedObj()) != null ? _ref.descriptionForEditor : void 0;
+	    } else {
+	      return this._getMultiSelectedTitle();
+	    }
+	  },
+	  _getInspectedObj: function() {
+	    var id;
+	    id = this.props.selectedObjs[0];
+	    return scrivito.BasicObj.get(id);
+	  },
+	  toggleInspectorMaximized: function() {
+	    return this.props.dispatch(toggleInspectorMaximized());
+	  },
+	  render: function() {
+	    return React.createElement("h3", {
+	      "title": this._title()
+	    }, React.createElement(MaximizeInspectorToggle, {
+	      "toggleInspectorMaximized": this.toggleInspectorMaximized
+	    }), React.createElement("span", {
+	      "title": "Details",
+	      "className": this.getDetailsClassName()
+	    }), React.createElement("span", {
+	      "className": "title"
+	    }, this._title()), (this.props.editingView && !this.props.disableDelete ? React.createElement("span", {
+	      "className": "scrivito_icon scrivito_icon_trash scrivito_delete",
+	      "onClick": this.props.deleteInspectedObjs
+	    }) : void 0));
+	  }
+	});
 
-	  return InspectorActionCreator;
+	module.exports = InspectorHeader;
 
-	})();
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
+
+/***/ },
+/* 255 */
+/***/ function(module, exports) {
 
-	module.exports = InspectorActionCreator;
+	var MAXIMIZE_TOGGLE, toggleInspectorMaximized;
+
+	MAXIMIZE_TOGGLE = 'MAXIMAZED_INSPECTOR_TOGGLE';
+
+	toggleInspectorMaximized = function() {
+	  return {
+	    type: MAXIMIZE_TOGGLE
+	  };
+	};
+
+	module.exports = {
+	  MAXIMIZE_TOGGLE: MAXIMIZE_TOGGLE,
+	  toggleInspectorMaximized: toggleInspectorMaximized
+	};
 
 
 /***/ },
-/* 255 */
+/* 256 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var Footer, ModalDialogsModule;
-
-	ModalDialogsModule = __webpack_require__(252);
+	/* WEBPACK VAR INJECTION */(function(React) {var Footer;
 
 	Footer = React.createClass({
 	  displayName: 'Footer',
 	  currentSelectedCount: function() {
-	    return this.props.objCollection.getSelectedObjs().length;
+	    return this.props.selectedObjs.length;
 	  },
 	  deleteButtonClass: function() {
 	    var className;
@@ -25057,13 +25148,16 @@
 	    }
 	  },
 	  doneClick: function() {
-	    return this.props.promise.resolve(this.props.objCollection.selectedObjsIds());
+	    return this.props.promise.resolve(this.props.selectedObjs);
 	  },
 	  deleteClick: function() {
-	    if (this.props.objCollection.getSelectedObjs().length > 0) {
-	      return ModalDialogsModule.deleteObjs(this.props.objCollection.getSelectedObjs()).then((function(_this) {
-	        return function() {
-	          return _this.props.objCollection.destroySelectedObjs();
+	    var _ref;
+	    if (this.props.selectedObjs.length) {
+	      return (_ref = scrivito.ConfirmDeleteDialog).open.apply(_ref, this.props.selectedObjs).then((function(_this) {
+	        return function(isConfirmed) {
+	          if (isConfirmed) {
+	            return _this.props.objCollection.destroyObjs(_this.props.selectedObjs);
+	          }
 	        };
 	      })(this));
 	    }
@@ -25079,7 +25173,7 @@
 	  render: function() {
 	    return React.createElement("div", {
 	      "className": "scrivito-content-browser-footer"
-	    }, (this.props.editingView ? React.createElement("a", {
+	    }, (this.props.editingView && !this.props.disableDelete ? React.createElement("a", {
 	      "className": this.deleteButtonClass(),
 	      "onClick": this.deleteClick
 	    }, scrivito.translate("content_browser.footer.delete"), React.createElement("span", {
@@ -25101,7 +25195,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 256 */
+/* 257 */
 /***/ function(module, exports) {
 
 	var LastAddedActionCreator;
@@ -25126,7 +25220,7 @@
 
 
 /***/ },
-/* 257 */
+/* 258 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var CREATE_OBJ_FAILED, CREATE_OBJ_FINISH, CREATE_OBJ_PROGRESS_UPDATE, CREATE_OBJ_START, DELETE_OBJ_FINISH, QueryBuilder, createObj, objDeleted, _createObjFailed, _createObjFinish, _createObjProgressUpdate, _createObjStart, _getTagsAttributes, _hasCorrectTagAttribute;
@@ -25250,16 +25344,16 @@
 
 
 /***/ },
-/* 258 */
+/* 259 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var applyMiddleware, combinedReducer, configureStore, createStore, thunkMiddleware, _ref;
 
-	thunkMiddleware = __webpack_require__(259);
+	thunkMiddleware = __webpack_require__(260);
 
 	_ref = __webpack_require__(193), createStore = _ref.createStore, applyMiddleware = _ref.applyMiddleware;
 
-	combinedReducer = __webpack_require__(260);
+	combinedReducer = __webpack_require__(261);
 
 	configureStore = function(initialState) {
 	  var createStoreWithMiddleware;
@@ -25271,7 +25365,7 @@
 
 
 /***/ },
-/* 259 */
+/* 260 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -25290,41 +25384,46 @@
 	module.exports = thunkMiddleware;
 
 /***/ },
-/* 260 */
+/* 261 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var Redux, TagsReducer, combinedReducer, inspectorReducer, lastAddedReducer, objDisplayReducer, sortCriteria;
+	var Redux, TagsReducer, combinedReducer, inspectorReducer, lastAddedReducer, objDisplayReducer, selectionReducer, sortCriteria;
 
 	Redux = __webpack_require__(193);
 
-	inspectorReducer = __webpack_require__(261);
+	inspectorReducer = __webpack_require__(262);
 
-	lastAddedReducer = __webpack_require__(262);
+	lastAddedReducer = __webpack_require__(263);
 
-	objDisplayReducer = __webpack_require__(265);
+	objDisplayReducer = __webpack_require__(266);
 
-	sortCriteria = __webpack_require__(266);
+	sortCriteria = __webpack_require__(267);
 
-	TagsReducer = __webpack_require__(267);
+	TagsReducer = __webpack_require__(268);
+
+	selectionReducer = __webpack_require__(269);
 
 	combinedReducer = Redux.combineReducers({
 	  objDisplay: objDisplayReducer,
 	  inspector: inspectorReducer,
 	  lastAdded: lastAddedReducer,
 	  sortCriteria: sortCriteria,
-	  tags: TagsReducer
+	  tags: TagsReducer,
+	  selection: selectionReducer
 	});
 
 	module.exports = combinedReducer;
 
 
 /***/ },
-/* 261 */
+/* 262 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var inspectorActions, inspectorReducer;
+	var DELETE_OBJ_FINISH, MAXIMIZE_TOGGLE, inspectorReducer;
+
+	MAXIMIZE_TOGGLE = __webpack_require__(255).MAXIMIZE_TOGGLE;
 
-	inspectorActions = __webpack_require__(254);
+	DELETE_OBJ_FINISH = __webpack_require__(258).DELETE_OBJ_FINISH;
 
 	inspectorReducer = function(state, action) {
 	  if (state == null) {
@@ -25333,10 +25432,14 @@
 	    };
 	  }
 	  switch (action.type) {
-	    case inspectorActions.MAXIMIZE_TOGGLE:
+	    case MAXIMIZE_TOGGLE:
 	      return _.extend({}, state, {
 	        isMaximized: !state.isMaximized
 	      });
+	    case DELETE_OBJ_FINISH:
+	      return _.extend({}, state, {
+	        isMaximized: false
+	      });
 	    default:
 	      return state;
 	  }
@@ -25346,16 +25449,16 @@
 
 
 /***/ },
-/* 262 */
+/* 263 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var CREATE_OBJ_FAILED, CREATE_OBJ_FINISH, CREATE_OBJ_PROGRESS_UPDATE, CREATE_OBJ_START, DELETE_OBJ_FINISH, LAST_ADDED_TOOGLE, LastAddedReducer, deleteAdition, update, updateAddition, _ref;
 
-	LAST_ADDED_TOOGLE = __webpack_require__(256).LAST_ADDED_TOOGLE;
+	LAST_ADDED_TOOGLE = __webpack_require__(257).LAST_ADDED_TOOGLE;
 
-	_ref = __webpack_require__(257), CREATE_OBJ_START = _ref.CREATE_OBJ_START, CREATE_OBJ_PROGRESS_UPDATE = _ref.CREATE_OBJ_PROGRESS_UPDATE, CREATE_OBJ_FINISH = _ref.CREATE_OBJ_FINISH, CREATE_OBJ_FAILED = _ref.CREATE_OBJ_FAILED, DELETE_OBJ_FINISH = _ref.DELETE_OBJ_FINISH;
+	_ref = __webpack_require__(258), CREATE_OBJ_START = _ref.CREATE_OBJ_START, CREATE_OBJ_PROGRESS_UPDATE = _ref.CREATE_OBJ_PROGRESS_UPDATE, CREATE_OBJ_FINISH = _ref.CREATE_OBJ_FINISH, CREATE_OBJ_FAILED = _ref.CREATE_OBJ_FAILED, DELETE_OBJ_FINISH = _ref.DELETE_OBJ_FINISH;
 
-	update = __webpack_require__(263);
+	update = __webpack_require__(264);
 
 	deleteAdition = function(state, objId) {
 	  var addedObjIndex;
@@ -25439,13 +25542,13 @@
 
 
 /***/ },
-/* 263 */
+/* 264 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports = __webpack_require__(264);
+	module.exports = __webpack_require__(265);
 
 /***/ },
-/* 264 */
+/* 265 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/**
@@ -25558,7 +25661,7 @@
 	module.exports = update;
 
 /***/ },
-/* 265 */
+/* 266 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var SET_VIEW_MODE, THUMBNAIL_VIEW, objDisplayReducer, _ref;
@@ -25585,7 +25688,7 @@
 
 
 /***/ },
-/* 266 */
+/* 267 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var CHANGE_SORT_ORDER, DESC_SORT_ORDER, sortCriteriaReducer, _ref;
@@ -25595,7 +25698,7 @@
 	sortCriteriaReducer = function(state, action) {
 	  if (state == null) {
 	    state = {
-	      sortField: '_last_changed',
+	      sortField: 'relevance',
 	      sortDirection: DESC_SORT_ORDER
 	    };
 	  }
@@ -25614,12 +25717,12 @@
 
 
 /***/ },
-/* 267 */
+/* 268 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var COMPLETE_FETCHING_TAGS, DISABLE_TAGS, EXPAND_TOGGLE, START_FETCHING_TAGS, TOGGLE_TAG, TagsReducer, defaultState, getActiveTags, _ref;
 
-	_ref = __webpack_require__(249), START_FETCHING_TAGS = _ref.START_FETCHING_TAGS, EXPAND_TOGGLE = _ref.EXPAND_TOGGLE, TOGGLE_TAG = _ref.TOGGLE_TAG, COMPLETE_FETCHING_TAGS = _ref.COMPLETE_FETCHING_TAGS, DISABLE_TAGS = _ref.DISABLE_TAGS;
+	_ref = __webpack_require__(250), START_FETCHING_TAGS = _ref.START_FETCHING_TAGS, EXPAND_TOGGLE = _ref.EXPAND_TOGGLE, TOGGLE_TAG = _ref.TOGGLE_TAG, COMPLETE_FETCHING_TAGS = _ref.COMPLETE_FETCHING_TAGS, DISABLE_TAGS = _ref.DISABLE_TAGS;
 
 	getActiveTags = function(currentActiveTags, actionTag) {
 	  var activeTags;
@@ -25671,5 +25774,57 @@
 	module.exports = TagsReducer;
 
 
+/***/ },
+/* 269 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var DELETE_OBJ_FINISH, DESELECT_OBJS, INITIALIZE_SELECTION, MULTI_SELECTION_MODE, TOGGLE_SELECT, getSelectedObjIds, selectionReducer, _ref;
+
+	_ref = __webpack_require__(231), TOGGLE_SELECT = _ref.TOGGLE_SELECT, DESELECT_OBJS = _ref.DESELECT_OBJS, INITIALIZE_SELECTION = _ref.INITIALIZE_SELECTION, MULTI_SELECTION_MODE = _ref.MULTI_SELECTION_MODE;
+
+	DELETE_OBJ_FINISH = __webpack_require__(258).DELETE_OBJ_FINISH;
+
+	getSelectedObjIds = function(ids, toggledObjId, mode) {
+	  if (_.contains(ids, toggledObjId)) {
+	    return _.without(ids, toggledObjId);
+	  } else if (mode === "multi") {
+	    return ids.concat([toggledObjId]);
+	  } else {
+	    return [toggledObjId];
+	  }
+	};
+
+	selectionReducer = function(state, action) {
+	  if (state == null) {
+	    state = {
+	      selectedObjs: [],
+	      selectionMode: MULTI_SELECTION_MODE
+	    };
+	  }
+	  switch (action.type) {
+	    case INITIALIZE_SELECTION:
+	      return _.extend({}, state, {
+	        selectionMode: action.mode || state.selectionMode
+	      });
+	    case TOGGLE_SELECT:
+	      return _.extend({}, state, {
+	        selectedObjs: getSelectedObjIds(state.selectedObjs, action.objId, state.selectionMode)
+	      });
+	    case DELETE_OBJ_FINISH:
+	      return _.extend({}, state, {
+	        selectedObjs: _.without(state.selectedObjs, action.objId)
+	      });
+	    case DESELECT_OBJS:
+	      return _.extend({}, state, {
+	        selectedObjs: []
+	      });
+	    default:
+	      return state;
+	  }
+	};
+
+	module.exports = selectionReducer;
+
+
 /***/ }
 /******/ ]);