scrivito_content_browser 0.66.0 → 0.70.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 900154d9497a25db6f6771171c1e662b447fcea2
-  data.tar.gz: cf763af69103778eb8b810f4ab92f25298b9f8cd
+  metadata.gz: b02dfb7af0bad2c7486fd18f1b4034c2b4443d21
+  data.tar.gz: c1e75ebeedb96caf95348b1062b221a0c7726be0
 SHA512:
-  metadata.gz: 8e88e7b55b40ac2bf593ac21647a399ebf80d3785c6a38840b24fc11dab3cbc67b73f41c950f177ca7ca235f5c994433330e9af6f10e4f8cca1566fd2ab0b58a
-  data.tar.gz: 2f5d2ee0fbf56dd758a7f8a27514979ebd6c4c2731edeb5be7e7195d9e52630fdfcebb4c6f09909be2c283320589553819259b4f45b279abeef281ec62eb5793
+  metadata.gz: b3f25831e13318557b17aeda94537f03a7cf9b48eca7cc8ed5a3302cd83c9eeb715831d6199f27b2296f60655232b9186d312674727d5229ecb7878f51a4823c
+  data.tar.gz: f6ab7bbd67815896762157deea0b49425e0452c8197b56402c4b77412312e5e28ea0264a36478bfee053cbfd3a92c65c5eb1a94ed96c15df8d96bb7f6448206d

data/README.md

@@ -33,23 +33,34 @@ Before developing make sure you have both `nodejs` and `npm` installed, then:
     sudo npm install -g grunt-cli # install the grunt command
     grunt build # build the JS files - if it fails, check for name clashes with the node package
 
-If you want to develop the `scrivito_content_browser`-gem locally (including it by path)
+If you want to develop the `scrivito_content_browser`-gem locally (including it by path) you need to configure an `asset_host` in your rails application. Example `config/env/development.rb`:
 
-You need to write in your rails application. config/env/development.rb
+    config.action_controller.asset_host = Proc.new do |source|
+      if source =~ /scrivito_content_browser_pkg/
+        "http://localhost:8080/"
+      end
+    end
 
-  config.action_controller.asset_host = Proc.new { |source|
-    if source =~ /scrivito_content_browser_pkg/
-      "http://localhost:8080/"
-  end
+and be sure that you have this options
 
-  and be sure that you have this option is false
     config.assets.digest = false
+    config.assets.debug = true
 
-This part of code, and run the task npm start or grunt webpack-dev-server
+After that start webpack dev server:
 
-For test running use:
-  grunt webpack_run_test or simple grunt
-  or use karma start or grunt karma:test task to run webpack dev server watcher
+    npm start
+    # or
+    grunt webpack-dev-server
+
+## Run tests
+
+    grunt webpack_run_test
+    # or
+    grunt
+    # or
+    karma start
+    # or
+    grunt karma:test # to run webpack dev server watcher
 
 ## Changelog
 
@@ -57,7 +68,7 @@ For test running use:
 
 
 ## License
-Copyright (c) 2009 - 2014 Infopark AG (http://www.infopark.com)
+Copyright (c) 2009 - 2015 Infopark AG (http://www.infopark.com)
 
 This software can be used and modified under the LGPL-3.0. Please refer to
 http://www.gnu.org/licenses/lgpl-3.0.html for the license text.

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

@@ -88,8 +88,8 @@
 	      return props.promise;
 	    },
 	    _loadModal: function() {
-	      $('<div></div>').addClass('scrivito_overlay scrivito_show').appendTo($('body'));
-	      $('<div></div>').addClass('scrivito-content-browser show').appendTo($('body'));
+	      $('<div></div>').addClass('scrivito_overlay scrivito_show').appendTo($('#scrivito_editing'));
+	      $('<div></div>').addClass('scrivito-content-browser show').appendTo($('#scrivito_editing'));
 	      return this._center();
 	    },
 	    _buildFilter: function(options) {
@@ -834,7 +834,7 @@
 
 	InspectorComponent = __webpack_require__(65);
 
-	Footer = __webpack_require__(67);
+	Footer = __webpack_require__(68);
 
 	App = React.createClass({
 	  displayName: 'App',
@@ -920,11 +920,18 @@
 	      objCollection: new ObjCollection(initialSelection, selectionMode)
 	    };
 	  },
+	  _getBodyClassName: function() {
+	    if (this.state.viewMode.isInspectorMaximized()) {
+	      return "scrivito-content-browser-body scrivito-content-browser-inspector-max";
+	    } else {
+	      return "scrivito-content-browser-body";
+	    }
+	  },
 	  render: function() {
 	    return React.createElement("div", {
 	      "className": "scrivito-app-root"
 	    }, React.createElement("div", {
-	      "className": "scrivito-content-browser-body"
+	      "className": this._getBodyClassName()
 	    }, React.createElement("div", {
 	      "className": "scrivito-content-browser-wrapper"
 	    }, React.createElement(TopBar, {
@@ -950,6 +957,7 @@
 	    }), (this.state.objCollection.isLoadingAdditionalObjs() ? React.createElement(MoreItemsSpinner, {
 	      "objCollection": this.state.objCollection
 	    }) : void 0)), React.createElement(InspectorComponent, {
+	      "viewMode": this.state.viewMode,
 	      "objCollection": this.state.objCollection
 	    })), React.createElement(Footer, {
 	      "promise": this.props.promise,
@@ -983,6 +991,7 @@
 	    }
 	    this._mode = mode;
 	    this._standAlone = standAlone;
+	    this._isInspectorMaximized = false;
 	  }
 
 	  ViewMode.prototype.setMode = function(newMode) {
@@ -990,10 +999,19 @@
 	    return this.changed();
 	  };
 
+	  ViewMode.prototype.toggleInspectorMaximized = function() {
+	    this._isInspectorMaximized = !this._isInspectorMaximized;
+	    return this.changed();
+	  };
+
 	  ViewMode.prototype.getMode = function() {
 	    return this._mode;
 	  };
 
+	  ViewMode.prototype.isInspectorMaximized = function() {
+	    return this._isInspectorMaximized;
+	  };
+
 	  ViewMode.prototype.isList = function() {
 	    return this._mode === "list";
 	  };
@@ -1741,7 +1759,6 @@
 	          return _this.reload();
 	        };
 	      })(this));
-	      this.deselectObjs();
 	      return this._activateLoading();
 	    }
 	  };
@@ -1749,6 +1766,12 @@
 	  ObjCollection.prototype._destroyById = function(objId) {
 	    return scrivito.delete_obj(objId).done((function(_this) {
 	      return function() {
+	        _this._objs = _this._objs.filter(function(obj) {
+	          return obj.id() !== objId;
+	        });
+	        _this._selectedObjsIds = _this._selectedObjsIds.filter(function(selectedObjId) {
+	          return selectedObjId !== objId;
+	        });
 	        return _this.trigger('destroy-obj', objId);
 	      };
 	    })(this));
@@ -1989,7 +2012,7 @@
 	    }
 	  },
 	  toggleSortMenu: function() {
-	    return $('.scrivito_menu_box').fadeToggle();
+	    return $('.scrivito-content-browser-sort-menu .scrivito_menu_box').fadeToggle();
 	  },
 	  getSortIconClassName: function() {
 	    var sortIcon;
@@ -2004,7 +2027,7 @@
 	  render: function() {
 	    var sortItem;
 	    return React.createElement("span", {
-	      "className": "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()
@@ -2024,7 +2047,9 @@
 	        }));
 	      }
 	      return results;
-	    }).call(this)));
+	    }).call(this), React.createElement("li", {
+	      "className": "scrivito_menu_box_overlay"
+	    })));
 	  }
 	});
 
@@ -2104,13 +2129,13 @@
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AdditionalOptionFilter, Filter, FilterMixin, LastAddedFilter, QueryBuilder, SelectedFilter, TreeFilter;
 
-	FilterMixin = __webpack_require__(31);
+	FilterMixin = __webpack_require__(30);
 
-	AdditionalOptionFilter = __webpack_require__(32);
+	AdditionalOptionFilter = __webpack_require__(31);
 
-	TreeFilter = __webpack_require__(39);
+	TreeFilter = __webpack_require__(38);
 
-	SelectedFilter = __webpack_require__(30);
+	SelectedFilter = __webpack_require__(39);
 
 	QueryBuilder = __webpack_require__(20);
 
@@ -2227,39 +2252,6 @@
 
 /***/ },
 /* 30 */
-/***/ function(module, exports, __webpack_require__) {
-
-	/* WEBPACK VAR INJECTION */(function(React) {var SelectedFilter;
-
-	SelectedFilter = React.createClass({
-	  displayName: 'SelectedFilter',
-	  filterClass: function() {
-	    return React.addons.classSet({
-	      'scrivito-content-browser-filter-item': true,
-	      'selected-filter': true,
-	      'active': this.props.active
-	    });
-	  },
-	  render: function() {
-	    return React.createElement("div", {
-	      "className": this.filterClass(),
-	      "onClick": this.props.activateSelectedFilter
-	    }, React.createElement("i", {
-	      "className": "scrivito-content-browser-icon scrivito-content-browser-icon-ok-box"
-	    }), React.createElement("span", {
-	      "className": "scrivito-content-browser-filter-label"
-	    }, "Selected", React.createElement("span", {
-	      "className": "scrivito-content-browser-counter selected-total"
-	    }, this.props.selectedCount)));
-	  }
-	});
-
-	module.exports = SelectedFilter;
-
-	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
-
-/***/ },
-/* 31 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var FilterMixin;
@@ -2282,18 +2274,18 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 32 */
+/* 31 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var AdditionalOptionFilter, CheckBoxOptionFilter, DeselectAllRadioOptionFilter, ExpandableFilterNodeMixin, RadioOptionFilter;
 
-	ExpandableFilterNodeMixin = __webpack_require__(33);
+	ExpandableFilterNodeMixin = __webpack_require__(32);
 
-	DeselectAllRadioOptionFilter = __webpack_require__(34);
+	DeselectAllRadioOptionFilter = __webpack_require__(33);
 
-	RadioOptionFilter = __webpack_require__(36);
+	RadioOptionFilter = __webpack_require__(35);
 
-	CheckBoxOptionFilter = __webpack_require__(38);
+	CheckBoxOptionFilter = __webpack_require__(37);
 
 	AdditionalOptionFilter = React.createClass({
 	  displayName: 'AdditionalOptionFilter',
@@ -2349,7 +2341,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 33 */
+/* 32 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ExpandableFilterNodeMixin;
@@ -2384,12 +2376,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 34 */
+/* 33 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var DeselectAllRadioOptionFilter, OptionFilterLabelRenderMixin;
 
-	OptionFilterLabelRenderMixin = __webpack_require__(35);
+	OptionFilterLabelRenderMixin = __webpack_require__(34);
 
 	DeselectAllRadioOptionFilter = React.createClass({
 	  displayName: 'DeselectAllRadioOptionFilter',
@@ -2419,7 +2411,7 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 35 */
+/* 34 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var OptionFilterLabelRenderMixin;
@@ -2437,12 +2429,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 36 */
+/* 35 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var OptionFilterMixin, RadioOptionFilter;
 
-	OptionFilterMixin = __webpack_require__(37);
+	OptionFilterMixin = __webpack_require__(36);
 
 	RadioOptionFilter = React.createClass({
 	  displayName: 'RadioOptionFilter',
@@ -2467,12 +2459,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 37 */
+/* 36 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var OptionFilterLabelRenderMixin, OptionFilterMixin;
 
-	OptionFilterLabelRenderMixin = __webpack_require__(35);
+	OptionFilterLabelRenderMixin = __webpack_require__(34);
 
 	OptionFilterMixin = {
 	  mixins: [OptionFilterLabelRenderMixin],
@@ -2495,12 +2487,12 @@
 
 
 /***/ },
-/* 38 */
+/* 37 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var CheckBoxOptionFilter, OptionFilterMixin;
 
-	OptionFilterMixin = __webpack_require__(37);
+	OptionFilterMixin = __webpack_require__(36);
 
 	CheckBoxOptionFilter = React.createClass({
 	  displayName: 'CheckBoxOptionFilter',
@@ -2520,12 +2512,12 @@
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
 /***/ },
-/* 39 */
+/* 38 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var ExpandableFilterNodeMixin, TreeFilter;
 
-	ExpandableFilterNodeMixin = __webpack_require__(33);
+	ExpandableFilterNodeMixin = __webpack_require__(32);
 
 	TreeFilter = React.createClass({
 	  displayName: 'TreeFilter',
@@ -2584,6 +2576,39 @@
 
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 
+/***/ },
+/* 39 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(React) {var SelectedFilter;
+
+	SelectedFilter = React.createClass({
+	  displayName: 'SelectedFilter',
+	  filterClass: function() {
+	    return React.addons.classSet({
+	      'scrivito-content-browser-filter-item': true,
+	      'selected-filter': true,
+	      'active': this.props.active
+	    });
+	  },
+	  render: function() {
+	    return React.createElement("div", {
+	      "className": this.filterClass(),
+	      "onClick": this.props.activateSelectedFilter
+	    }, React.createElement("i", {
+	      "className": "scrivito-content-browser-icon scrivito-content-browser-icon-ok-box"
+	    }), React.createElement("span", {
+	      "className": "scrivito-content-browser-filter-label"
+	    }, "Selected", React.createElement("span", {
+	      "className": "scrivito-content-browser-counter selected-total"
+	    }, this.props.selectedCount)));
+	  }
+	});
+
+	module.exports = SelectedFilter;
+
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
+
 /***/ },
 /* 40 */
 /***/ function(module, exports, __webpack_require__) {
@@ -3820,10 +3845,12 @@
 /* 65 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(React) {var Inspector, ModalDialogsModule;
+	/* WEBPACK VAR INJECTION */(function(React) {var Inspector, MaximizeInspectorToggle, ModalDialogsModule;
 
 	ModalDialogsModule = __webpack_require__(66);
 
+	MaximizeInspectorToggle = __webpack_require__(67);
+
 	Inspector = React.createClass({
 	  displayName: 'Inspector',
 	  getDetailsClassName: function() {
@@ -3851,7 +3878,9 @@
 	  _showInspectorHeader: function(title) {
 	    return React.createElement("h3", {
 	      "title": title
-	    }, React.createElement("span", {
+	    }, React.createElement(MaximizeInspectorToggle, {
+	      "viewMode": this.props.viewMode
+	    }), React.createElement("span", {
 	      "title": "Details",
 	      "className": this.getDetailsClassName()
 	    }), React.createElement("span", {
@@ -3913,6 +3942,32 @@
 
 /***/ },
 /* 67 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(React) {var MaximizeInspectorToggle;
+
+	MaximizeInspectorToggle = React.createClass({
+	  displayName: 'MaximizeInspectorToggle',
+	  _toggleMaximized: function() {
+	    return this.props.viewMode.toggleInspectorMaximized();
+	  },
+	  render: function() {
+	    return React.createElement("span", {
+	      "className": "scrivito_move_left",
+	      "title": "Maximize details view",
+	      "onClick": this._toggleMaximized
+	    }, React.createElement("span", {
+	      "className": "scrivito_icon scrivito_icon_chevron_left"
+	    }));
+	  }
+	});
+
+	module.exports = MaximizeInspectorToggle;
+
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
+
+/***/ },
+/* 68 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(React) {var Footer, ModalDialogsModule;

data/config/initializers/scrivito_content_browser.rb

@@ -15,7 +15,8 @@ Scrivito::Configuration.register_obj_format('content_browser') do |obj, _, view_
   }
 
   if obj.binary_content_type && obj.binary_content_type.start_with?('image/')
-    format[:preview] = obj.binary_url
+    binary = obj.binary.transform(width: 260, height: 140)
+    format[:preview] = view_context.scrivito_path(binary)
   end
 
   format

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_content_browser
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.70.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-09-02 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.66.0
+        version: 0.70.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.66.0
+        version: 0.70.0.rc1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +89,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- Rakefile
 - app/assets/javascripts/dist/scrivito_content_browser_pkg.js
 - app/assets/javascripts/scrivito_content_browser.js
 - app/assets/javascripts/scrivito_content_browser/templates.js.erb

data/Rakefile

@@ -1,4 +0,0 @@
-#!/usr/bin/env rake
-
-require 'bundler/setup'
-Bundler::GemHelper.install_tasks