scrivito_content_browser 1.4.3 → 1.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2e230129305a9e23863747094f862d0465c168c
-  data.tar.gz: 20fd1f06685c67b4633027f8946c21ac5cf7d6a7
+  metadata.gz: 3d953dddb23d78433151e47a2f31e7ec82d46b31
+  data.tar.gz: 38e777d29ecb7490b4051adc442d1970cf7735fb
 SHA512:
-  metadata.gz: 70a02e727931bb2a704c28aac4a084360349eadb161e29579f776a065b8b03d6950bbb0aecfe360841617e017fd76061462294a9080d79883c9c6ec1ee89ccf5
-  data.tar.gz: 0b1218fffef74201e169f0068d6f71f5005c90caba00da7bcf7fbcca0211525caf7a1b183cd5f01bc2a816f62f33c18626f8cca62470fd04fc100742e09eeda0
+  metadata.gz: 50a90e1c10b74ee23bb0c1bccb849de42294ebebf243b4657a90e475fb69ca45602031635d20342470474e7c92aa27251f250e13b5c5eb55f13db1274c14e2cc
+  data.tar.gz: 7a1475ea59b2c320c01d38e45ebe64491559efaed8e038b42c69fbbb6326781be557b93c82cbbfb5650af21f3b2c933bb575757fdbe21b53aa114e64b132631a

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

@@ -189,9 +189,11 @@
 	  };
 	})();
 
-	scrivito.register_public_api("content_browser", scrivito.content_browser);
+	scrivito.registerPublicApi("content_browser", function() {
+	  return scrivito.content_browser;
+	});
 
-	scrivito.register_browse_content(function() {
+	scrivito.registerBrowseContent(function() {
 	  return scrivito.content_browser.open({
 	    selection_mode: 'single',
 	    standAlone: true
@@ -3755,7 +3757,6 @@
 	  'content_browser.last_added.failed_upload_counts': '$1 Error(s)',
 	  'content_browser.last_added.title_info': 'Display full upload error message',
 	  'content_browser.last_added.upload_error': 'The selected filter options cannot be applied to the file(s) you wanted to upload',
-	  'content_browser.last_added.forbidden_upload': 'You cannot upload files here. Please select a suitable filter.',
 	  'content_browser.last_added.preset_error': "#values can not be called on an invalid Preset",
 	  'content_browser.filter.more_filters': 'more filters',
 	  'content_browser.filter.selected_filter': 'Selected',
@@ -3800,7 +3801,6 @@
 	  'content_browser.last_added.failed_upload_counts': '$1 Fehler',
 	  'content_browser.last_added.title_info': 'Vollständige Fehlermeldung anzeigen',
 	  'content_browser.last_added.upload_error': 'Die ausgewählten Filteroptionen können nicht auf die Datei(en) angewendet werden, die Sie hochladen wollten.',
-	  'content_browser.last_added.forbidden_upload': 'Sie können keine Dateien hierher hochladen. Bitte wählen Sie einen passenden Filter.',
 	  'content_browser.last_added.preset_error': "#values kann nicht auf einer ungültigen Vorbelegung aufgerufen werden.",
 	  'content_browser.filter.more_filters': 'Weitere Filter',
 	  'content_browser.filter.selected_filter': 'Ausgewählt',
@@ -22624,7 +22624,11 @@
 	  };
 
 	  ActiveNodeConfig.prototype._valueForNode = function(node) {
-	    return node.value || node.name;
+	    if (node.value === void 0) {
+	      return node.name;
+	    } else {
+	      return node.value;
+	    }
 	  };
 
 	  ActiveNodeConfig.prototype._findConfig = function(attrName) {
@@ -23439,10 +23443,10 @@
 	    var className;
 	    className = this.baseItemsClass();
 	    if (this.state.dragInProgress) {
-	      if (this.props.lastAdded.isVisible || !this.props.editingView) {
-	        className += " uploader-drag-over-forbiden";
-	      } else {
+	      if (this.props.editingView) {
 	        className += " uploader-drag-over";
+	      } else {
+	        className += " uploader-drag-over-forbiden";
 	      }
 	    }
 	    return className;
@@ -23481,35 +23485,35 @@
 	      _obj_class: objClass
 	    };
 	  },
-	  uploadFiles: function(event) {
-	    var dataTransfer, files, preset;
+	  handleFileDrop: function(event) {
+	    var files, _ref1;
 	    this.changeDragState(false)(event);
-	    if (this.props.lastAdded.isVisible || !this.props.editingView) {
-	      return;
-	    }
-	    dataTransfer = event.dataTransfer;
-	    if (dataTransfer == null) {
-	      return;
-	    }
-	    files = dataTransfer.files;
-	    if (files.length > 0) {
-	      preset = this.buildPreset();
-	      if (preset.isValid()) {
-	        this.props.disableTags();
-	        return _.each(files, (function(_this) {
-	          return function(file) {
-	            var attributes;
-	            attributes = _this._fileAttributes(file);
-	            _this.props.createObj(attributes, _this.props.basePreset, preset.values(), _this.props.tags.activeTags);
-	            return _this.props.filter.deselectHierarchicalFilters();
-	          };
-	        })(this));
-	      } else {
-	        return this._showConflictingPresetsAlert(preset.errors());
-	      }
+	    files = (_ref1 = event.dataTransfer) != null ? _ref1.files : void 0;
+	    if (this.props.editingView && (files != null ? files.length : void 0)) {
+	      return this._uploadFiles(files);
+	    }
+	  },
+	  _uploadFiles: function(files) {
+	    var preset;
+	    preset = this._buildPreset();
+	    if (preset.isValid()) {
+	      this.props.disableTags();
+	      _.each(files, (function(_this) {
+	        return function(file) {
+	          return _this._uploadFile(file, preset);
+	        };
+	      })(this));
+	      return this.props.filter.deselectHierarchicalFilters();
+	    } else {
+	      return this._showConflictingPresetsAlert(preset.errors());
 	    }
 	  },
-	  buildPreset: function() {
+	  _uploadFile: function(file, preset) {
+	    var attributes;
+	    attributes = this._fileAttributes(file);
+	    return this.props.createObj(attributes, this.props.basePreset, preset.values(), this.props.tags.activeTags);
+	  },
+	  _buildPreset: function() {
 	    var presetBuilder;
 	    presetBuilder = new PresetBuilder(this.props.filter);
 	    return presetBuilder.generatePreset();
@@ -23538,7 +23542,7 @@
 	    return React.createElement("div", {
 	      "className": this.dropZoneClass(),
 	      "onDragOver": this.changeDragState(true),
-	      "onDrop": this.uploadFiles,
+	      "onDrop": this.handleFileDrop,
 	      "onDragLeave": this.changeDragState(false)
 	    }, this.renderTagBar(), (this.props.objCollection.isLoading() ? React.createElement("div", {
 	      "className": "scrivito-content-browser-loading"
@@ -24209,17 +24213,8 @@
 
 	LastAddedItems = React.createClass({
 	  displayName: 'LastAddedItems',
-	  getForbiddenUploadText: function() {
-	    return scrivito.translate('content_browser.last_added.forbidden_upload');
-	  },
 	  render: function() {
-	    return React.createElement("div", null, (this.props.dragInProgress ? React.createElement("div", {
-	      "className": "scrivito-content-browser-text"
-	    }, React.createElement("span", {
-	      "className": "scrivito_icon scrivito_icon_error"
-	    }), React.createElement("span", {
-	      "className": "scrivito_title"
-	    }, this.getForbiddenUploadText())) : this.props.viewMode === objDisplayAction.TABLE_VIEW ? React.createElement(TableView, {
+	    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,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_content_browser
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.5.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.5.0.rc1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement