diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php index f5e4e6f8d..00a390686 100644 --- a/modules/backend/behaviors/ImportExportController.php +++ b/modules/backend/behaviors/ImportExportController.php @@ -49,8 +49,8 @@ class ImportExportController extends ControllerBehavior { parent::__construct($controller); - $this->addJs('js/october.importexport.js', 'core'); - $this->addCss('css/importexport.css', 'core'); + $this->addJs('js/october.import.js', 'core'); + $this->addCss('css/import.css', 'core'); /* * Build configuration diff --git a/modules/backend/behaviors/importexportcontroller/assets/css/importexport.css b/modules/backend/behaviors/importexportcontroller/assets/css/import.css similarity index 100% rename from modules/backend/behaviors/importexportcontroller/assets/css/importexport.css rename to modules/backend/behaviors/importexportcontroller/assets/css/import.css diff --git a/modules/backend/behaviors/importexportcontroller/assets/js/october.importexport.js b/modules/backend/behaviors/importexportcontroller/assets/js/october.import.js similarity index 83% rename from modules/backend/behaviors/importexportcontroller/assets/js/october.importexport.js rename to modules/backend/behaviors/importexportcontroller/assets/js/october.import.js index 424bd894f..ad3440099 100644 --- a/modules/backend/behaviors/importexportcontroller/assets/js/october.importexport.js +++ b/modules/backend/behaviors/importexportcontroller/assets/js/october.import.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var ImportExportBehavior = function() { + var ImportBehavior = function() { this.bindColumnSorting = function() { /* @@ -20,12 +20,18 @@ var sortableOptions = { group: 'import-fields', usePlaceholderClone: true, - nested: false + nested: false, + onDrop: $.proxy(this.onDropColumn, this) } $('#importDbColumns > ul, .import-column-bindings > ul').sortable(sortableOptions) } + this.onDropColumn = function ($item, container, _super, event) { + + _super($item, container) + } + this.ignoreFileColumn = function(el) { var $el = $(el), $column = $el.closest('[data-column-id]') @@ -53,5 +59,5 @@ } } - $.oc.importExportBehavior = new ImportExportBehavior; + $.oc.importBehavior = new ImportBehavior; }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/assets/less/importexport.less b/modules/backend/behaviors/importexportcontroller/assets/less/import.less similarity index 100% rename from modules/backend/behaviors/importexportcontroller/assets/less/importexport.less rename to modules/backend/behaviors/importexportcontroller/assets/less/import.less diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_db_columns.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_db_columns.htm index 7774259d7..4fd3e41cc 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_db_columns.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_db_columns.htm @@ -13,5 +13,5 @@ \ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm index 75af795c1..cbf049e8e 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm @@ -13,14 +13,14 @@ data-delay="300" data-placement="right" title="Ignore this column" - onclick="$.oc.importExportBehavior.ignoreFileColumn(this)" + onclick="$.oc.importBehavior.ignoreFileColumn(this)" > @@ -40,5 +40,5 @@ \ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm index 6bbc1aca8..7d743ecd5 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm @@ -3,7 +3,7 @@ href="javascript:;" id="showIgnoredColumnsButton" class="btn btn-sm btn-default oc-icon-eye disabled" - onclick="$.oc.importExportBehavior.showIgnoredColumns()"> + onclick="$.oc.importBehavior.showIgnoredColumns()"> Show ignored columns \ No newline at end of file