scrivito_content_browser 0.70.2 → 0.71.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b44f9ab8aed765bb3a0bfb5b6dd0231e7d69f8ed
-  data.tar.gz: 5b5e46cb871dde69631ab3a5ef1c7fd1ec4061da
+  metadata.gz: 03c6abc031002d18d02f52ff5ef26eb5de0d253c
+  data.tar.gz: bdd7ce35cd826c78815238cd5501ba30f7d5ab36
 SHA512:
-  metadata.gz: 59b6d55317f067bda4b19e5463e92049f96591960c39ba4f7f23659e3fd8a01123384ab60fc5c72ae80977e2f3947184568556bfaa1914769a7a242d16f2e1b6
-  data.tar.gz: da12a5515e6e4ffa129cd828e3c2a758e468ca5b276d716500bbb2f2cc0828f691241e898f4abaa929271b91e059b944bfe81edab4fd72b05c1b2c0173de6ed2
+  metadata.gz: cd78417be08177deb41412b539166337083037dcc2db511fcf0805a1eef98dd3f8d08fe3eb82417c2efa0071146725e14de40b65e45a5238fadfed484826a354
+  data.tar.gz: dcb27f297b5f5bbd1efeda27de7db7f7a83dddc7688f9ddb1d1f7a5eae284847bed864fc637effc02575ff362b24216c248f01e02ce75f95a4da7bc0e8d798c6

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

@@ -58,6 +58,7 @@
 	  return {
 	    filters: {},
 	    base_preset: {},
+	    ESCAPE: 27,
 	    base_query: null,
 	    _center: function() {
 	      var domElement, domElements, i, len, results;
@@ -90,6 +91,12 @@
 	    _loadModal: function() {
 	      $('<div></div>').addClass('scrivito_overlay scrivito_show').appendTo($('#scrivito_editing'));
 	      $('<div></div>').addClass('scrivito-content-browser show').appendTo($('#scrivito_editing'));
+	      $(document).off('keyup.scrivito_content_browser');
+	      $(document).on('keyup.scrivito_content_browser', (function(_this) {
+	        return function(e) {
+	          return _this.keyUpHandler(e);
+	        };
+	      })(this));
 	      return this._center();
 	    },
 	    _buildFilter: function(options) {
@@ -109,6 +116,12 @@
 	        "options": options
 	      }), this._getLastContentBrowserElement());
 	    },
+	    keyUpHandler: function(e) {
+	      if (e.keyCode === this.ESCAPE) {
+	        e.preventDefault();
+	        return this.close();
+	      }
+	    },
 	    _getLastElementByClassName: function(className) {
 	      var elements;
 	      elements = document.getElementsByClassName(className);
@@ -125,7 +138,10 @@
 	    },
 	    close: function() {
 	      this._remove(this._getLastOverlayElement());
-	      return this._remove(this._getLastContentBrowserElement());
+	      this._remove(this._getLastContentBrowserElement());
+	      if (!this._getLastContentBrowserElement()) {
+	        return $(document).off('keyup.scrivito_content_browser');
+	      }
 	    },
 	    open: function(options) {
 	      var promise;
@@ -822,19 +838,19 @@
 
 	AddedObjsCollection = __webpack_require__(17);
 
-	ObjCollection = __webpack_require__(23);
+	ObjCollection = __webpack_require__(25);
 
-	TopBar = __webpack_require__(24);
+	TopBar = __webpack_require__(27);
 
-	Filter = __webpack_require__(29);
+	Filter = __webpack_require__(32);
 
-	Items = __webpack_require__(41);
+	Items = __webpack_require__(44);
 
-	MoreItemsSpinner = __webpack_require__(64);
+	MoreItemsSpinner = __webpack_require__(67);
 
-	InspectorComponent = __webpack_require__(65);
+	InspectorComponent = __webpack_require__(68);
 
-	Footer = __webpack_require__(68);
+	Footer = __webpack_require__(71);
 
 	App = React.createClass({
 	  displayName: 'App',
@@ -893,8 +909,10 @@
 	  _selectLatestAddedObj: function(addedObjsCollection) {
 	    var lastCreatedObj;
 	    if (this.refs.filterView.state.selectedFilter === false) {
-	      lastCreatedObj = _.first(addedObjsCollection.objs()).createdObj();
-	      return this.state.objCollection.toggleSelected(lastCreatedObj.id());
+	      lastCreatedObj = _.first(addedObjsCollection.createdObjs());
+	      if (lastCreatedObj) {
+	        return this.state.objCollection.toggleSelected(lastCreatedObj.id());
+	      }
 	    }
 	  },
 	  componentDidMount: function() {
@@ -1056,7 +1074,7 @@
 	  };
 
 	  AddedObjsCollection.prototype.createdObjs = function() {
-	    return _.map(this._objs, function(addedObj) {
+	    return _.map(this._completedObjs(), function(addedObj) {
 	      return addedObj.createdObj();
 	    });
 	  };
@@ -1117,6 +1135,12 @@
 	    });
 	  };
 
+	  AddedObjsCollection.prototype._completedObjs = function() {
+	    return _.filter(this._objs, function(addedObj) {
+	      return addedObj.status() === "completed";
+	    });
+	  };
+
 	  AddedObjsCollection.prototype._buildPresets = function(presets) {
 	    return _.extend({}, this._basePreset, presets);
 	  };
@@ -1132,21 +1156,26 @@
 /* 18 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var AddedObj, Obj, QueryBuilder;
+	var AddedObj, Fetcher, Obj, QueryBuilder;
 
 	Obj = __webpack_require__(19);
 
 	QueryBuilder = __webpack_require__(20);
 
-	AddedObj = (function() {
-	  AddedObj.prototype.MAX_RETRY = 2;
+	Fetcher = __webpack_require__(23);
 
+	AddedObj = (function() {
 	  function AddedObj(addedObjsCollection, file, presetAttributes1) {
 	    var objAttributes;
 	    this.addedObjsCollection = addedObjsCollection;
 	    this.presetAttributes = presetAttributes1 != null ? presetAttributes1 : {};
-	    this._status = 'active';
-	    this._updateProgressByStatus(this._status);
+	    this._fetcher = new Fetcher();
+	    this._fetcher.onChange((function(_this) {
+	      return function() {
+	        return _this._setObj();
+	      };
+	    })(this));
+	    this._updateProgressByStatus();
 	    this._fileName = file != null ? file.name : void 0;
 	    this._uniqueId = _.uniqueId("added_obj_");
 	    objAttributes = this._buildObjAttributes(file, this.presetAttributes);
@@ -1154,18 +1183,18 @@
 	      return function(objData) {
 	        _this._progress = 50;
 	        _this.addedObjsCollection.changed();
-	        return _this._fetchObj(objData.id);
+	        return _this._fetcher.fetch(objData.id);
 	      };
 	    })(this)).fail((function(_this) {
 	      return function(failure) {
 	        _this._failureMessage = failure.message;
-	        return _this._setStatus('failed');
+	        return _this._fetcher.fail();
 	      };
 	    })(this));
 	  }
 
 	  AddedObj.prototype.status = function() {
-	    return this._status;
+	    return this._fetcher.status();
 	  };
 
 	  AddedObj.prototype.createdObj = function() {
@@ -1188,48 +1217,14 @@
 	    return this._uniqueId;
 	  };
 
-	  AddedObj.prototype._fetchObj = function(id, retryCount) {
-	    if (retryCount == null) {
-	      retryCount = 0;
+	  AddedObj.prototype._setObj = function() {
+	    if (this.status() === 'completed') {
+	      this._obj = new Obj(this._fetcher.obj());
 	    }
-	    return QueryBuilder.byId(id).load_batch().then(((function(_this) {
-	      return function(searchResult) {
-	        if (searchResult.hits.length > 0) {
-	          _this._obj = new Obj(searchResult.hits[0]);
-	          return _this._setStatus('completed');
-	        } else {
-	          return _this._objNotYetIndexed(id, retryCount);
-	        }
-	      };
-	    })(this)), (function(_this) {
-	      return function() {
-	        return _this._setStatus('failed');
-	      };
-	    })(this));
+	    return this._updateStatus();
 	  };
 
-	  AddedObj.prototype._objNotYetIndexed = function(id, retryCount) {
-	    var fetchObjFunction;
-	    if (retryCount < this.MAX_RETRY) {
-	      fetchObjFunction = (function(_this) {
-	        return function() {
-	          return _this._fetchObj(id, retryCount + 1);
-	        };
-	      })(this);
-	      return window.setTimeout(fetchObjFunction, 500);
-	    } else {
-	      this._setStatus('failed');
-	      return $.Deferred().reject();
-	    }
-	  };
-
-	  AddedObj.prototype._setStatus = function(status) {
-	    this._status = status;
-	    this._updateProgressByStatus(status);
-	    return this.addedObjsCollection.changed();
-	  };
-
-	  AddedObj.prototype._updateProgressByStatus = function(status) {
+	  AddedObj.prototype._updateProgressByStatus = function() {
 	    return this._progress = (function() {
 	      switch (this.status()) {
 	        case 'active':
@@ -1242,6 +1237,11 @@
 	    }).call(this);
 	  };
 
+	  AddedObj.prototype._updateStatus = function() {
+	    this._updateProgressByStatus();
+	    return this.addedObjsCollection.changed();
+	  };
+
 	  AddedObj.prototype._buildObjAttributes = function(file, presetAttributes) {
 	    var objAttributes;
 	    objAttributes = {};
@@ -1606,7 +1606,117 @@
 /* 23 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var Listenable, Obj, ObjCollection, SortCriteria,
+	var Fetcher, FetcherStatus, Listenable, QueryBuilder,
+	  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+	  hasProp = {}.hasOwnProperty;
+
+	QueryBuilder = __webpack_require__(20);
+
+	Listenable = __webpack_require__(6);
+
+	FetcherStatus = __webpack_require__(24);
+
+	Fetcher = (function(superClass) {
+	  extend(Fetcher, superClass);
+
+	  Fetcher.prototype.MAX_RETRY = 2;
+
+	  Fetcher.prototype.status = function() {
+	    return this._fetcherStatus.status();
+	  };
+
+	  function Fetcher() {
+	    Fetcher.__super__.constructor.call(this);
+	    this._fetcherStatus = new FetcherStatus();
+	  }
+
+	  Fetcher.prototype.obj = function() {
+	    return this._obj;
+	  };
+
+	  Fetcher.prototype.fail = function() {
+	    this._fetcherStatus.fail();
+	    return this.changed();
+	  };
+
+	  Fetcher.prototype.complete = function() {
+	    this._fetcherStatus.complete();
+	    return this.changed();
+	  };
+
+	  Fetcher.prototype.fetch = function(id, retryCount) {
+	    if (retryCount == null) {
+	      retryCount = 0;
+	    }
+	    return QueryBuilder.byId(id).load_batch(id).then(((function(_this) {
+	      return function(searchResult) {
+	        if (searchResult.hits.length > 0) {
+	          _this._obj = searchResult.hits[0];
+	          return _this.complete();
+	        } else {
+	          return _this._objNotYetIndexed(retryCount, function() {
+	            return _this.fetch(id, retryCount + 1);
+	          });
+	        }
+	      };
+	    })(this)), (function(_this) {
+	      return function() {
+	        return _this.fail();
+	      };
+	    })(this));
+	  };
+
+	  Fetcher.prototype._objNotYetIndexed = function(retryCount, fetchObjFunction) {
+	    if (retryCount < this.MAX_RETRY) {
+	      return window.setTimeout(fetchObjFunction, 500);
+	    } else {
+	      this.fail();
+	      return $.Deferred().reject();
+	    }
+	  };
+
+	  return Fetcher;
+
+	})(Listenable);
+
+	module.exports = Fetcher;
+
+
+/***/ },
+/* 24 */
+/***/ function(module, exports) {
+
+	var FetcherStatus;
+
+	FetcherStatus = (function() {
+	  FetcherStatus.prototype.status = function() {
+	    return this._status;
+	  };
+
+	  function FetcherStatus() {
+	    this._status = 'active';
+	  }
+
+	  FetcherStatus.prototype.fail = function() {
+	    return this._status = 'failed';
+	  };
+
+	  FetcherStatus.prototype.complete = function() {
+	    return this._status = 'completed';
+	  };
+
+	  return FetcherStatus;
+
+	})();
+
+	module.exports = FetcherStatus;
+
+
+/***/ },
+/* 25 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var Deleter, Listenable, Obj, ObjCollection, SortCriteria,
 	  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
 	  hasProp = {}.hasOwnProperty;
 
@@ -1616,6 +1726,8 @@
 
 	SortCriteria = __webpack_require__(7);
 
+	Deleter = __webpack_require__(26);
+
 	ObjCollection = (function(superClass) {
 	  extend(ObjCollection, superClass);
 
@@ -1764,7 +1876,9 @@
 	  };
 
 	  ObjCollection.prototype._destroyById = function(objId) {
-	    return scrivito.delete_obj(objId).done((function(_this) {
+	    var deleter;
+	    deleter = new Deleter(objId);
+	    return deleter.deleteObj().always((function(_this) {
 	      return function() {
 	        _this._objs = _this._objs.filter(function(obj) {
 	          return obj.id() !== objId;
@@ -1837,14 +1951,77 @@
 
 
 /***/ },
-/* 24 */
+/* 26 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var Deleter, QueryBuilder;
+
+	QueryBuilder = __webpack_require__(20);
+
+	Deleter = (function() {
+	  Deleter.prototype.MAX_RETRY = 5;
+
+	  Deleter.prototype.TIMEOUT = 500;
+
+	  function Deleter(objId) {
+	    this.objId = objId;
+	    this._promise = $.Deferred();
+	  }
+
+	  Deleter.prototype.deleteObj = function() {
+	    scrivito.delete_obj(this.objId).then((function(_this) {
+	      return function() {
+	        return _this._checkDelete();
+	      };
+	    })(this), (function(_this) {
+	      return function() {
+	        return _this._promise.reject();
+	      };
+	    })(this));
+	    return this._promise;
+	  };
+
+	  Deleter.prototype._checkDelete = function(retryCount) {
+	    if (retryCount == null) {
+	      retryCount = 0;
+	    }
+	    return QueryBuilder.byId(this.objId).load_batch().then(((function(_this) {
+	      return function(searchResult) {
+	        if (searchResult.hits.length === 0) {
+	          return _this._promise.resolve();
+	        } else {
+	          return _this._reCheck(retryCount, function() {
+	            return _this._checkDelete(retryCount + 1);
+	          });
+	        }
+	      };
+	    })(this)));
+	  };
+
+	  Deleter.prototype._reCheck = function(retryCount, fetchObjFunction) {
+	    if (retryCount < this.MAX_RETRY) {
+	      return window.setTimeout(fetchObjFunction, this.TIMEOUT);
+	    } else {
+	      return this._promise.reject();
+	    }
+	  };
+
+	  return Deleter;
+
+	})();
+
+	module.exports = Deleter;
+
+
+/***/ },
+/* 27 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ActiveNodeConfigCollector, SortMenu, TopBar, ViewModeBar;
 
-	ViewModeBar = __webpack_require__(25);
+	ViewModeBar = __webpack_require__(28);
 
-	SortMenu = __webpack_require__(27);
+	SortMenu = __webpack_require__(30);
 
 	ActiveNodeConfigCollector = __webpack_require__(21);
 
@@ -1912,12 +2089,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 25 */
+/* 28 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ViewModeBar, ViewModeBarItem;
 
-	ViewModeBarItem = __webpack_require__(26);
+	ViewModeBarItem = __webpack_require__(29);
 
 	ViewModeBar = React.createClass({
 	  displayName: 'ViewModeBar',
@@ -1945,7 +2122,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 26 */
+/* 29 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ViewModeBarItem;
@@ -1994,12 +2171,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 27 */
+/* 30 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var SortMenu, SortMenuItem;
 
-	SortMenuItem = __webpack_require__(28);
+	SortMenuItem = __webpack_require__(31);
 
 	SortMenu = React.createClass({
 	  displayName: 'SortMenu',
@@ -2034,7 +2211,7 @@
 	    }), this.props.filter.sortCriteria.activeElement(), React.createElement("i", {
 	      "className": "scrivito_icon scrivito-content-browser-menu-icon scrivito_icon_chevron_down"
 	    }), React.createElement("ul", {
-	      "className": "scrivito_menu_box scrivito_right"
+	      "className": "scrivito_menu_box scrivito_left"
 	    }, (function() {
 	      var i, len, ref, results;
 	      ref = Object.keys(this.sortItemsData);
@@ -2058,7 +2235,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 28 */
+/* 31 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var SortCriteria, SortMenuItem;
@@ -2124,22 +2301,22 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 29 */
+/* 32 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AdditionalOptionFilter, Filter, FilterMixin, LastAddedFilter, QueryBuilder, SelectedFilter, TreeFilter;
 
-	FilterMixin = __webpack_require__(30);
+	FilterMixin = __webpack_require__(33);
 
-	AdditionalOptionFilter = __webpack_require__(31);
+	AdditionalOptionFilter = __webpack_require__(34);
 
-	TreeFilter = __webpack_require__(38);
+	TreeFilter = __webpack_require__(41);
 
-	SelectedFilter = __webpack_require__(39);
+	SelectedFilter = __webpack_require__(42);
 
 	QueryBuilder = __webpack_require__(20);
 
-	LastAddedFilter = __webpack_require__(40);
+	LastAddedFilter = __webpack_require__(43);
 
 	Filter = React.createClass({
 	  displayName: 'Filter',
@@ -2251,7 +2428,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 30 */
+/* 33 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var FilterMixin;
@@ -2274,18 +2451,18 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 31 */
+/* 34 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AdditionalOptionFilter, CheckBoxOptionFilter, DeselectAllRadioOptionFilter, ExpandableFilterNodeMixin, RadioOptionFilter;
 
-	ExpandableFilterNodeMixin = __webpack_require__(32);
+	ExpandableFilterNodeMixin = __webpack_require__(35);
 
-	DeselectAllRadioOptionFilter = __webpack_require__(33);
+	DeselectAllRadioOptionFilter = __webpack_require__(36);
 
-	RadioOptionFilter = __webpack_require__(35);
+	RadioOptionFilter = __webpack_require__(38);
 
-	CheckBoxOptionFilter = __webpack_require__(37);
+	CheckBoxOptionFilter = __webpack_require__(40);
 
 	AdditionalOptionFilter = React.createClass({
 	  displayName: 'AdditionalOptionFilter',
@@ -2341,7 +2518,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 32 */
+/* 35 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ExpandableFilterNodeMixin;
@@ -2376,12 +2553,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 33 */
+/* 36 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var DeselectAllRadioOptionFilter, OptionFilterLabelRenderMixin;
 
-	OptionFilterLabelRenderMixin = __webpack_require__(34);
+	OptionFilterLabelRenderMixin = __webpack_require__(37);
 
 	DeselectAllRadioOptionFilter = React.createClass({
 	  displayName: 'DeselectAllRadioOptionFilter',
@@ -2411,7 +2588,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 34 */
+/* 37 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var OptionFilterLabelRenderMixin;
@@ -2429,12 +2606,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 35 */
+/* 38 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var OptionFilterMixin, RadioOptionFilter;
 
-	OptionFilterMixin = __webpack_require__(36);
+	OptionFilterMixin = __webpack_require__(39);
 
 	RadioOptionFilter = React.createClass({
 	  displayName: 'RadioOptionFilter',
@@ -2459,12 +2636,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 36 */
+/* 39 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var OptionFilterLabelRenderMixin, OptionFilterMixin;
 
-	OptionFilterLabelRenderMixin = __webpack_require__(34);
+	OptionFilterLabelRenderMixin = __webpack_require__(37);
 
 	OptionFilterMixin = {
 	  mixins: [OptionFilterLabelRenderMixin],
@@ -2487,12 +2664,12 @@
 
 
 /***/ },
-/* 37 */
+/* 40 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var CheckBoxOptionFilter, OptionFilterMixin;
 
-	OptionFilterMixin = __webpack_require__(36);
+	OptionFilterMixin = __webpack_require__(39);
 
 	CheckBoxOptionFilter = React.createClass({
 	  displayName: 'CheckBoxOptionFilter',
@@ -2512,12 +2689,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 38 */
+/* 41 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ExpandableFilterNodeMixin, TreeFilter;
 
-	ExpandableFilterNodeMixin = __webpack_require__(32);
+	ExpandableFilterNodeMixin = __webpack_require__(35);
 
 	TreeFilter = React.createClass({
 	  displayName: 'TreeFilter',
@@ -2577,7 +2754,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 39 */
+/* 42 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var SelectedFilter;
@@ -2610,7 +2787,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 40 */
+/* 43 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedFilter;
@@ -2644,20 +2821,20 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 41 */
+/* 44 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var Items, LastAddedItems, PresetBuilder, TableView, TableViewContent, ThumbnailItems;
 
-	TableView = __webpack_require__(42);
+	TableView = __webpack_require__(45);
 
-	ThumbnailItems = __webpack_require__(43);
+	ThumbnailItems = __webpack_require__(46);
 
-	PresetBuilder = __webpack_require__(51);
+	PresetBuilder = __webpack_require__(54);
 
-	LastAddedItems = __webpack_require__(52);
+	LastAddedItems = __webpack_require__(55);
 
-	TableViewContent = __webpack_require__(62);
+	TableViewContent = __webpack_require__(65);
 
 	Items = React.createClass({
 	  displayName: 'Items',
@@ -2773,7 +2950,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 42 */
+/* 45 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var TableView;
@@ -2793,18 +2970,18 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 43 */
+/* 46 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ActiveNodeConfigCollector, InfiniteScrollMixin, ObjCreation, ThumbnailAddItem, ThumbnailItem, ThumbnailItems;
 
-	InfiniteScrollMixin = __webpack_require__(44);
+	InfiniteScrollMixin = __webpack_require__(47);
 
-	ThumbnailItem = __webpack_require__(45);
+	ThumbnailItem = __webpack_require__(48);
 
-	ThumbnailAddItem = __webpack_require__(48);
+	ThumbnailAddItem = __webpack_require__(51);
 
-	ObjCreation = __webpack_require__(50);
+	ObjCreation = __webpack_require__(53);
 
 	ActiveNodeConfigCollector = __webpack_require__(21);
 
@@ -2851,7 +3028,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 44 */
+/* 47 */
 /***/ function(module, exports) {
 
 	var InfiniteScrollMixin;
@@ -2918,14 +3095,14 @@
 
 
 /***/ },
-/* 45 */
+/* 48 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var InspectedItemMixin, MimeTypeIcon, ThumbnailItem;
 
-	InspectedItemMixin = __webpack_require__(46);
+	InspectedItemMixin = __webpack_require__(49);
 
-	MimeTypeIcon = __webpack_require__(47);
+	MimeTypeIcon = __webpack_require__(50);
 
 	ThumbnailItem = React.createClass({
 	  displayName: 'ThumbnailItem',
@@ -2984,7 +3161,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 46 */
+/* 49 */
 /***/ function(module, exports) {
 
 	var InspectedItemMixin;
@@ -3015,7 +3192,7 @@
 
 
 /***/ },
-/* 47 */
+/* 50 */
 /***/ function(module, exports) {
 
 	var MimeTypeIcon;
@@ -3062,12 +3239,12 @@
 
 
 /***/ },
-/* 48 */
+/* 51 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AddItemMixin, ThumbnailAddItem;
 
-	AddItemMixin = __webpack_require__(49);
+	AddItemMixin = __webpack_require__(52);
 
 	ThumbnailAddItem = React.createClass({
 	  displayName: 'ThumbnailAddItem',
@@ -3092,7 +3269,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 49 */
+/* 52 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AddItemMixin;
@@ -3187,14 +3364,14 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 50 */
+/* 53 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var ActiveNodeConfigCollector, ObjCreation, PresetBuilder;
 
 	ActiveNodeConfigCollector = __webpack_require__(21);
 
-	PresetBuilder = __webpack_require__(51);
+	PresetBuilder = __webpack_require__(54);
 
 	ObjCreation = (function() {
 	  function ObjCreation(filter) {
@@ -3274,7 +3451,7 @@
 
 
 /***/ },
-/* 51 */
+/* 54 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var ActiveNodeConfigCollector, PresetBuilder;
@@ -3370,16 +3547,16 @@
 
 
 /***/ },
-/* 52 */
+/* 55 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItems, LastAddedTableViewContent, LastAddedThumbnailItems, TableView;
 
-	LastAddedTableViewContent = __webpack_require__(53);
+	LastAddedTableViewContent = __webpack_require__(56);
 
-	LastAddedThumbnailItems = __webpack_require__(59);
+	LastAddedThumbnailItems = __webpack_require__(62);
 
-	TableView = __webpack_require__(42);
+	TableView = __webpack_require__(45);
 
 	LastAddedItems = React.createClass({
 	  displayName: 'LastAddedItems',
@@ -3402,16 +3579,16 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 53 */
+/* 56 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedTableViewContent, LastAddedTableViewErrorItem, LastAddedTableViewItem, TableViewItem;
 
-	LastAddedTableViewErrorItem = __webpack_require__(54);
+	LastAddedTableViewErrorItem = __webpack_require__(57);
 
-	LastAddedTableViewItem = __webpack_require__(56);
+	LastAddedTableViewItem = __webpack_require__(59);
 
-	TableViewItem = __webpack_require__(58);
+	TableViewItem = __webpack_require__(61);
 
 	LastAddedTableViewContent = React.createClass({
 	  displayName: 'LastAddedTableViewContent',
@@ -3453,12 +3630,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 54 */
+/* 57 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedErrorItemMixin, LastAddedTableViewErrorItem;
 
-	LastAddedErrorItemMixin = __webpack_require__(55);
+	LastAddedErrorItemMixin = __webpack_require__(58);
 
 	LastAddedTableViewErrorItem = React.createClass({
 	  displayName: 'LastAddedTableViewError',
@@ -3481,7 +3658,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 55 */
+/* 58 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedErrorItemMixin;
@@ -3519,12 +3696,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 56 */
+/* 59 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin, LastAddedTableViewItem;
 
-	LastAddedItemMixin = __webpack_require__(57);
+	LastAddedItemMixin = __webpack_require__(60);
 
 	LastAddedTableViewItem = React.createClass({
 	  displayName: 'LastAddedTableViewItem',
@@ -3549,7 +3726,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 57 */
+/* 60 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin;
@@ -3575,12 +3752,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 58 */
+/* 61 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var InspectedItemMixin, TableViewItem;
 
-	InspectedItemMixin = __webpack_require__(46);
+	InspectedItemMixin = __webpack_require__(49);
 
 	TableViewItem = React.createClass({
 	  displayName: 'TableViewItem',
@@ -3624,16 +3801,16 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 59 */
+/* 62 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedThumbnailErrorItem, LastAddedThumbnailItem, LastAddedThumbnailItems, ThumbnailItem;
 
-	LastAddedThumbnailErrorItem = __webpack_require__(60);
+	LastAddedThumbnailErrorItem = __webpack_require__(63);
 
-	LastAddedThumbnailItem = __webpack_require__(61);
+	LastAddedThumbnailItem = __webpack_require__(64);
 
-	ThumbnailItem = __webpack_require__(45);
+	ThumbnailItem = __webpack_require__(48);
 
 	LastAddedThumbnailItems = React.createClass({
 	  displayName: "LastAddedThumbnailItems",
@@ -3677,12 +3854,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 60 */
+/* 63 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedErrorItemMixin, LastAddedThumbnailErrorItem;
 
-	LastAddedErrorItemMixin = __webpack_require__(55);
+	LastAddedErrorItemMixin = __webpack_require__(58);
 
 	LastAddedThumbnailErrorItem = React.createClass({
 	  displayName: 'LastAddedThumbnailErrorItem',
@@ -3707,12 +3884,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 61 */
+/* 64 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var LastAddedItemMixin, LastAddedThumbnailItem;
 
-	LastAddedItemMixin = __webpack_require__(57);
+	LastAddedItemMixin = __webpack_require__(60);
 
 	LastAddedThumbnailItem = React.createClass({
 	  displayName: 'LastAddedThumbnailItem',
@@ -3743,18 +3920,18 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 62 */
+/* 65 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var InfiniteScrollMixin, ObjCreation, TableViewAddItem, TableViewContent, TableViewItem;
 
-	TableViewItem = __webpack_require__(58);
+	TableViewItem = __webpack_require__(61);
 
-	TableViewAddItem = __webpack_require__(63);
+	TableViewAddItem = __webpack_require__(66);
 
-	ObjCreation = __webpack_require__(50);
+	ObjCreation = __webpack_require__(53);
 
-	InfiniteScrollMixin = __webpack_require__(44);
+	InfiniteScrollMixin = __webpack_require__(47);
 
 	TableViewContent = React.createClass({
 	  mixins: [InfiniteScrollMixin],
@@ -3791,12 +3968,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 63 */
+/* 66 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AddItemMixin, TableViewAddItem;
 
-	AddItemMixin = __webpack_require__(49);
+	AddItemMixin = __webpack_require__(52);
 
 	TableViewAddItem = React.createClass({
 	  mixins: [AddItemMixin],
@@ -3821,7 +3998,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 64 */
+/* 67 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var MoreItemsSpinner;
@@ -3842,14 +4019,14 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 65 */
+/* 68 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var Inspector, MaximizeInspectorToggle, ModalDialogsModule;
 
-	ModalDialogsModule = __webpack_require__(66);
+	ModalDialogsModule = __webpack_require__(69);
 
-	MaximizeInspectorToggle = __webpack_require__(67);
+	MaximizeInspectorToggle = __webpack_require__(70);
 
 	Inspector = React.createClass({
 	  displayName: 'Inspector',
@@ -3914,7 +4091,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 66 */
+/* 69 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ModalDialogsModule;
@@ -3941,7 +4118,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 67 */
+/* 70 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var MaximizeInspectorToggle;
@@ -3967,12 +4144,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 68 */
+/* 71 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var Footer, ModalDialogsModule;
 
-	ModalDialogsModule = __webpack_require__(66);
+	ModalDialogsModule = __webpack_require__(69);
 
 	Footer = React.createClass({
 	  displayName: 'Footer',

data/app/controllers/scrivito_content_browser/content_browser_controller.rb

@@ -25,7 +25,7 @@ module ScrivitoContentBrowser
     private
 
     def details_view_template(obj)
-      "#{obj.obj_class_name.underscore}/details"
+      "#{obj.obj_class.underscore}/details"
     end
   end
 end

data/config/initializers/obj_extension.rb

@@ -5,7 +5,7 @@ module ScrivitoContentBrowser
       if binary?
         "#{file_extension.upcase} #{ConverterHelper.human_binary_length self}"
       else
-        obj_class_name
+        obj_class
       end
     end
   end

data/config/initializers/scrivito_content_browser.rb

@@ -5,7 +5,7 @@ Scrivito::Configuration.register_obj_format('content_browser') do |obj, _, view_
 
   format = {
     id: obj.id,
-    file_type: obj.obj_class_name,
+    file_type: obj.obj_class,
     file_size: ConverterHelper.human_binary_length(obj),
     last_changed: obj[:_last_changed],
     title: obj.description_for_editor.presence || obj.binary.try(:filename),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_content_browser
 version: !ruby/object:Gem::Version
-  version: 0.70.2
+  version: 0.71.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.70.2
+        version: 0.71.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.70.2
+        version: 0.71.0.rc1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement