From: Aleksander Łukasz Date: Fri, 11 Jul 2014 12:13:12 +0000 (+0200) Subject: editor: remove metadata editor which is now not needed X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/2a0f7de048f49f0087caae5962f124dbbb06d69e?ds=inline;hp=--cc editor: remove metadata editor which is now not needed --- 2a0f7de048f49f0087caae5962f124dbbb06d69e diff --git a/src/editor/modules.js b/src/editor/modules.js index 83ed141..6a9937f 100644 --- a/src/editor/modules.js +++ b/src/editor/modules.js @@ -17,7 +17,6 @@ define(function(require) { documentCanvas: require('modules/documentCanvas/documentCanvas'), documentToolbar: require('modules/documentToolbar/documentToolbar'), - metadataEditor: require('modules/metadataEditor/metadataEditor'), documentHistory: require('modules/documentHistory/documentHistory'), diffViewer: require('modules/diffViewer/diffViewer') diff --git a/src/editor/modules/metadataEditor/metadataEditor.js b/src/editor/modules/metadataEditor/metadataEditor.js deleted file mode 100644 index 70df62e..0000000 --- a/src/editor/modules/metadataEditor/metadataEditor.js +++ /dev/null @@ -1,212 +0,0 @@ -define([ -'libs/jquery', -'libs/underscore', -'libs/text!./templates/main.html', -'libs/text!./templates/item.html', -'views/openSelect/openSelect' -], function($, _, mainTemplate, itemTemplate, OpenSelectView) { - -'use strict'; -/* globals gettext */ - -return function(sandbox) { - - var currentNode, - adding = false, - metadataConfig = (sandbox.getConfig().metadata || []).sort(function(configRow1, configRow2) { - if(configRow1.key < configRow2.key) { - return -1; - } - if(configRow1.key > configRow2.key) { - return 1; - } - return 0; - }); - - var getValuesForKey = function(key) { - var toret = []; - metadataConfig.some(function(configRow) { - if(configRow.key === key) { - toret = configRow.values || []; - return true; - } - }); - return toret; - }; - - var view = { - node: $(_.template(mainTemplate)()), - setup: function() { - var view = this; - var metaTable = this.metaTable = this.node.find('table'); - - this.node.find('.rng-module-metadataEditor-addBtn').click(function() { - adding = true; - currentNode.document.transaction(function() { - currentNode.getMetadata().add('',''); - }, this, gettext('Add metadata row')); - }); - - this.metaTable.on('click', '.rng-visualEditor-metaRemoveBtn', function(e) { - currentNode.document.transaction(function() { - $(e.target).closest('tr').data('row').remove(); - }, this, gettext('Remove metadata row')); - }); - - this.metaTable.on('keydown', '[contenteditable]', function(e) { - /* globals document */ - if(e.which === 13) { - if($(document.activeElement).hasClass('rng-module-metadataEditor-metaItemKey')) { - metaTable.find('.rng-module-metadataEditor-metaItemValue').focus(); - } else { - var input = $(''); - input.appendTo('body').focus(); - view.node.find('.rng-module-metadataEditor-addBtn').focus(); - input.remove(); - } - e.preventDefault(); - } - }); - - this.metaTable.on('keyup', '[contenteditable]', _.throttle(function(e) { - if(e.which !== 13) { - var editable = $(e.target), - toSet = editable.text(), - row = editable.parents('tr').data('row'), - isKey = _.last(editable.attr('class').split('-')) === 'metaItemKey', - method = isKey ? 'setKey' : 'setValue'; - row.metadata.node.document.transaction(function() { - row[method](toSet); - }, this, gettext('Metadata edit')); - } - }, 500)); - }, - clear: function() { - }, - setMetadata: function(node) { - this.node.find('.rng-module-metadataEditor-addBtn').attr('disabled', !node); - if(!node) { - this.metaTable.html(''); - return; - } - var view = this, - metadata = node.getMetadata(); - this.metaTable.find('tr').remove(); - metadata.forEach(function(row) { - view.addMetadataRow(row); - }); - }, - addMetadataRow: function(row) { - var newRow = $(_.template(itemTemplate)({key: row.getKey() || '', value: row.getValue() || ''})); - newRow.appendTo(this.metaTable); - newRow.data('row', row); - - var keySelectView = new OpenSelectView({ - value: row.getKey() || '', - inputTemplate: _.template('
<%= value %>
')({value: row.getKey() || '' }), - setInput: function(inputDOM, value) { - if(inputDOM.text() !== value) { - inputDOM.text(value); - row.setKey(value); - } - valueSelectView.clearItems(); - getValuesForKey(value).forEach(function(value) { - valueSelectView.addItem(value); - }); - } - }); - newRow.find('td:first').append(keySelectView.el).data('view', keySelectView); - - - var valueSelectView = new OpenSelectView({ - value: row.getValue(), - inputTemplate: _.template('
<%= value %>
')({value: row.getValue() || '' }), - maxHeight: '300px', - maxWidth: '100px', - setInput: function(inputDOM, value) { - if(inputDOM.text() !== value) { - inputDOM.text(value); - row.setValue(value); - } - } - }); - newRow.find('td:nth-child(2)').append(valueSelectView.el).data('view', valueSelectView); - - - metadataConfig.forEach(function(configRow) { - keySelectView.addItem(configRow.key); - if(row.getKey() === configRow.key) { - (configRow.values || []).forEach(function(value) { - valueSelectView.addItem(value); - }); - } - }); - - if(adding) { - $(newRow.find('td div')[0]).focus(); - adding = false; - } - return newRow; - }, - updateMetadataRow: function(row) { - this._getRowTr(row, function(tr) { - var tds = tr.find('td'), - keyTd = $(tds[0]), - valueTd = $(tds[1]); - - keyTd.data('view').setInput(row.getKey()); - valueTd.data('view').setInput(row.getValue()); - }); - }, - removeMetadataRow: function(row) { - this._getRowTr(row, function(tr) { - tr.remove(); - }); - }, - _getRowTr: function(row, callback) { - this.metaTable.find('tr').each(function() { - var tr = $(this); - if(tr.data('row') === row) { - callback(tr); - return false; - } - }); - } - }; - - view.setup(); - - return { - start: function() { - sandbox.publish('ready'); - }, - setDocument: function(document) { - document.on('change', function(event) { - if(event.type === 'metadataAdded' && event.meta.node.sameNode(currentNode)) { - view.addMetadataRow(event.meta.row); - } - if(event.type === 'metadataChanged' && event.meta.node.sameNode(currentNode)) { - view.updateMetadataRow(event.meta.row); - } - if(event.type === 'metadataRemoved' && event.meta.node.sameNode(currentNode)) { - view.removeMetadataRow(event.meta.row); - } - if(event.type === 'nodeDetached' && event.meta.node.containsNode(currentNode)) { - view.setMetadata(null); - } - }); - }, - setNodeElement: function(node) { - if(currentNode && currentNode.sameNode(node)) { - return; - } - currentNode = node; - view.setMetadata(node); - }, - getView: function() { - return view.node; - } - }; -}; - -}); \ No newline at end of file diff --git a/src/editor/modules/metadataEditor/metadataEditor.less b/src/editor/modules/metadataEditor/metadataEditor.less deleted file mode 100644 index 499fb4f..0000000 --- a/src/editor/modules/metadataEditor/metadataEditor.less +++ /dev/null @@ -1,51 +0,0 @@ -.rng-module-metadataEditor { - - table { - table-layout:fixed; - margin-bottom:10px; - - [contenteditable] { - cursor: text; - word-wrap: break-word; - min-height: 13px; - } - - li:last-child { - border-bottom: none !important; - } - - tr td { - vertical-align: middle; - } - - tr td:nth-child(1){ - width: 30%; - } - - tr td:nth-child(2) { - width:70%; - } - - tr td:nth-child(3) { - width: 14px; - } - } - - .rng-module-metadataEditor-addBtn { - float:right; - margin-right:6px; - } - - .rng-visualEditor-metaRemoveBtn { - color: @red; - } - - .btn { - padding:3px; - line-height:10px; - } - - .drop-menu { - overflow: auto; - } -} \ No newline at end of file diff --git a/src/editor/modules/metadataEditor/templates/item.html b/src/editor/modules/metadataEditor/templates/item.html deleted file mode 100644 index f170c5a..0000000 --- a/src/editor/modules/metadataEditor/templates/item.html +++ /dev/null @@ -1,5 +0,0 @@ - - - - x - \ No newline at end of file diff --git a/src/editor/modules/metadataEditor/templates/main.html b/src/editor/modules/metadataEditor/templates/main.html deleted file mode 100644 index 5826f82..0000000 --- a/src/editor/modules/metadataEditor/templates/main.html +++ /dev/null @@ -1,8 +0,0 @@ -
-
- Meta dane - -
- -
-
\ No newline at end of file diff --git a/src/editor/styles/main.less b/src/editor/styles/main.less index 299cd47..e1e08a3 100644 --- a/src/editor/styles/main.less +++ b/src/editor/styles/main.less @@ -12,6 +12,5 @@ @import '../modules/documentToolbar/documentToolbar.less'; @import '../modules/documentHistory/documentHistory.less'; @import '../modules/indicator/indicator.less'; -@import '../modules/metadataEditor/metadataEditor.less'; @import '../modules/diffViewer/diffViewer.less'; @import '../modules/statusBar/statusBar.less';