Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@
}

handle_file_(settings) {
/** @see https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/jquery.form.generator.js#L545 */
var $inputReal = $('<input type="hidden" />')
// NOTE: do not attempt required / disabled etc on hidden inputs
.attr('name', settings.name)
Expand Down Expand Up @@ -490,7 +489,6 @@
}

handle_image_(settings) {
/** @see https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/jquery.form.generator.js#L496 */
/** @todo: support "enlargeImage"...? */
var src = settings.src || null;
if (src && !/^(http[s]?)?:?\//.test(src)) {
Expand Down Expand Up @@ -563,7 +561,6 @@
}

handle_tabs_(settings) {
/** https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/jquery.form.generator.js#L641 */
var $tabList = $(document.createElement('ul'));
var $container = $(document.createElement('div'));
$container.append($tabList);
Expand Down Expand Up @@ -625,7 +622,6 @@
}

handle_html_(settings) {
/** @see https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/jquery.form.generator.js#L265 */
const $wrapper = $(document.createElement('div'))
.attr(settings.attr || {})
.addClass(settings.cssClass)
Expand All @@ -636,7 +632,6 @@
}

handle_text_(settings) {
/** https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/jquery.form.generator.js#L823 */
var $wrapper = $(document.createElement('div')).addClass('mb-3 text');
var $textContainer = $(document.createElement('div'));

Expand Down Expand Up @@ -804,7 +799,6 @@
}

fieldLabel_(settings) {
/** @see https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/jquery.form.generator.js#L353 */
var $label = $(document.createElement('label'))
.attr({'for': settings.name || null })
.text(settings.title || settings.text)
Expand All @@ -817,7 +811,6 @@
;
$label.append('&nbsp;', $icon);
}
/** @see https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/jquery.form.generator.js#L345 */
if (settings.copyClipboard) {
$label.append('&nbsp;', $('<i/>')
.addClass('fa fa-clipboard far-clipboard -fn-copytoclipboard')
Expand Down Expand Up @@ -877,7 +870,6 @@
}

addCustomEvents_($input, settings) {
/** @see https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/jquery.form.generator.js#L123 */
var names = ['filled', 'change'].filter(function(name) {
return settings[name];
});
Expand Down
3 changes: 0 additions & 3 deletions src/Mapbender/DataManagerBundle/Resources/public/FormUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
return !self.validateInput(input);
});
// If there are erros, switch tab container (if any) to reveal the first affected input
/** @see https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/utils/fn.formData.js#L166 */
const $firstInvalid = invalidInputs.length && $(invalidInputs[0]);
const $tabElement = $firstInvalid && $firstInvalid.closest('.ui-tabs');
if ($tabElement && $tabElement.length) {
Expand All @@ -137,7 +136,6 @@
/**
* @param {HTMLElement} input
* @return {boolean}
* @see https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/utils/fn.formData.js#L13
*/
validateInput(input) {
const $input = $(input);
Expand Down Expand Up @@ -196,7 +194,6 @@
/** @var {Array<String>|null} valueList */
text = text.join(separator) || '';
}
/** @see https://github.com/mapbender/vis-ui.js/blob/0.2.84/src/js/jquery.form.generator.js#L157 */
if (window.clipboardData && window.clipboardData.setData) {
/** @see https://caniuse.com/mdn-api_clipboardevent_clipboarddata */
return clipboardData.setData("Text", text);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,6 @@
}
};

// TODO: remove this in next major release
if (!$.fn.DataTable.versionCheck('2.0')) {
settings.language = {
paginate: {
previous: '<<',
next: '>>'
}
};
}
settings.createdRow = this.onRowCreation.bind(this, schema);
return settings;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,52 +1,5 @@
$buttonActiveTextColor: #fff !default;

/** START: LEGACY: Remove this for Mapbender 5 */

.mb-element-data-manager .mapbender-element-result-table {
> .dataTables_wrapper {
> .row:first-child {
.col-md-6:first-child {
width: 0;
}

.col-md-6:last-child {
width: 100%;

.dataTables_filter {
text-align: left;

label {
width: 100%;
padding-left: 2px;

input {
display: block;
width: 100%;
margin-left: 0;
}
}
}
}
}

> .row:last-child {
text-align: center;

.col-sm-12 {
width: 100%;
margin-bottom: 7px;
}

.col-sm-12:last-child .pagination {
justify-content: center;
}
}
}
}
/** END: LEGACY **/



.mb-element-data-manager {
padding-right: 7px;

Expand Down
41 changes: 0 additions & 41 deletions src/Mapbender/DataSourceBundle/Component/DataStoreService.php

This file was deleted.

22 changes: 0 additions & 22 deletions src/Mapbender/DataSourceBundle/Component/FeatureTypeService.php

This file was deleted.

40 changes: 0 additions & 40 deletions src/Mapbender/DataSourceBundle/Component/RepositoryRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,46 +66,6 @@ public function getDataStoreDeclarations()
return $this->repositoryConfigs;
}

/**
* Alias for dataStoreFactory
*
* @param mixed[] $config
* @return DataStore
* @since 0.1.15
* @deprecated use aliased method directly
* aliased @since 0.1.22
*/
public function featureTypeFactory(array $config)
{
return $this->dataStoreFactory($config);
}

/**
* Alias for getDataStoreByName
*
* @param string $name
* @return DataStore
* @since 0.1.15
* @deprecated use aliased method directly
* aliased @since 0.1.22
*/
public function getFeatureTypeByName($name)
{
return $this->getDataStoreByName($name);
}

/**
* Alias for getDataStoreDeclarations
*
* @return array
* @deprecated use aliased method directly
* aliased @since 0.1.22
*/
public function getFeatureTypeDeclarations()
{
return $this->getDataStoreDeclarations();
}

/**
* @param string $name
* @return Connection
Expand Down
11 changes: 0 additions & 11 deletions src/Mapbender/DataSourceBundle/Entity/DataItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,6 @@ public function setId($id)
$this->attributes[$this->uniqueIdField] = $id;
}

/**
* Is id not null
*
* @return bool
* @deprecated use getId and coerce to boolean
*/
public function hasId()
{
return !is_null($this->getId());
}

/**
* Get id
*
Expand Down
20 changes: 0 additions & 20 deletions src/Mapbender/DigitizerBundle/Resources/public/MbDigitizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,6 @@
self.queuedRefresh_[schema.schemaName] = true;
}
}
// @todo ml: filter table rows for min/max resolution (not just on moveend, but always)
if (false) {
var layer = self.getSchemaLayer(schema);
var resolution = olMap.getView().getResolution();
if (resolution > layer.getMaxResolution() || resolution < layer.getMinResolution()) {
self.tableRenderer.replaceRows([]);
}
}
});
this.mbMap.element.on('mbmapsrschanged', function(event, data) {
self.featureEditor.pause();
Expand Down Expand Up @@ -677,18 +669,6 @@
return this.renderer.getLayers(schema);
}

/**
* @param {*} schema
* @returns {ol.layer.Vector|undefined}
* @deprecated use getSchemaLayers for proper multi-layer support
*/
getSchemaLayer(schema) {
if (schema.combine) {
throw new Error('Cannot get single layer for combination schema');
}
return this.getSchemaLayers(schema)[0];
}

cloneFeature(schema, feature) {
const newFeature = feature.clone();
const copyDefaults = schema.copy.data || {};
Expand Down