From e3d081dda1fe6502f0809ddf602d2c0bdf1f24ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 11 Jun 2014 11:06:16 +0200 Subject: [PATCH 1/1] editor: removing unused code (breadcrumbs) --- src/editor/modules.js | 1 - .../nodeBreadCrumbs/nodeBreadCrumbs.js | 69 ------------------- .../modules/nodeBreadCrumbs/template.html | 10 --- src/editor/modules/rng/rng.js | 20 +----- src/editor/styles/common.less | 5 -- 5 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js delete mode 100644 src/editor/modules/nodeBreadCrumbs/template.html diff --git a/src/editor/modules.js b/src/editor/modules.js index 312ac0b..83ed141 100644 --- a/src/editor/modules.js +++ b/src/editor/modules.js @@ -18,7 +18,6 @@ define(function(require) { documentCanvas: require('modules/documentCanvas/documentCanvas'), documentToolbar: require('modules/documentToolbar/documentToolbar'), metadataEditor: require('modules/metadataEditor/metadataEditor'), - nodeBreadCrumbs: require('modules/nodeBreadCrumbs/nodeBreadCrumbs'), documentHistory: require('modules/documentHistory/documentHistory'), diffViewer: require('modules/diffViewer/diffViewer') diff --git a/src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js b/src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js deleted file mode 100644 index 24a61de..0000000 --- a/src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js +++ /dev/null @@ -1,69 +0,0 @@ -define([ -'libs/jquery', -'libs/underscore', -'utils/wlxml', -'libs/text!./template.html'], function($, _, wlxmlUtils, templateSrc) { - -'use strict'; - -return function(sandbox) { - - var template = _.template(templateSrc), - listens = false; - - var view = { - dom: $('
' + template({node:null, parents: null}) + '
'), - setup: function() { - this.dom.on('click', 'a', function(e) { - e.preventDefault(); - var target = $(e.target); - sandbox.publish('elementClicked', target.data('element')); - }); - }, - - setNodeElement: function(nodeElement) { - this.dom.empty(); - this.currentNodeElement = nodeElement; - var parents; - if(nodeElement) { - parents = nodeElement.parents(); - } - - this.dom.html(template({node: nodeElement, parents: parents, utils: wlxmlUtils})); - - this.dom.find('li > a[href="#"]').each(function(idx, a) { - $(a).data('element', parents[parents.length - 1 - idx]); - }); - this.dom.find('a.active').data('element', nodeElement); - }, - - highlightNode: function(node) { - this.dom.find('a[data-id="'+node.id+'"]').addClass('rng-common-hoveredNode'); - }, - dimNode: function(node) { - this.dom.find('a[data-id="'+node.id+'"]').removeClass('rng-common-hoveredNode'); - } - }; - - view.setup(); - - return { - start: function() { sandbox.publish('ready'); }, - getView: function() { return view.dom; }, - setNodeElement: function(nodeElement) { - if(!listens && nodeElement) { - nodeElement.document.on('change', function() { - if(view.currentNodeElement && !view.currentNodeElement.isInDocument()) { - view.setNodeElement(null); - } - }); - listens = true; - } - view.setNodeElement(nodeElement); - }, - highlightNode: function(id) { view.highlightNode(id); }, - dimNode: function(id) { view.dimNode(id); } - }; -}; - -}); \ No newline at end of file diff --git a/src/editor/modules/nodeBreadCrumbs/template.html b/src/editor/modules/nodeBreadCrumbs/template.html deleted file mode 100644 index 062fb1e..0000000 --- a/src/editor/modules/nodeBreadCrumbs/template.html +++ /dev/null @@ -1,10 +0,0 @@ -
- -
\ No newline at end of file diff --git a/src/editor/modules/rng/rng.js b/src/editor/modules/rng/rng.js index 032fea4..4160ad9 100644 --- a/src/editor/modules/rng/rng.js +++ b/src/editor/modules/rng/rng.js @@ -26,17 +26,8 @@ return function(sandbox) { sandbox.getModule('documentCanvas').jumpToElement(element); }, refreshCanvasSelection: function(selection) { - var fragment = selection.toDocumentFragment(), - elementParent; - + var fragment = selection.toDocumentFragment(); sandbox.getModule('documentToolbar').setDocumentFragment(fragment); - - if(fragment && fragment.node) { - elementParent = fragment.node.getNearestElementNode(); - sandbox.getModule('nodeBreadCrumbs').setNodeElement(elementParent); - } else { - sandbox.getModule('nodeBreadCrumbs').setNodeElement(null); - } }, }; @@ -197,15 +188,6 @@ return function(sandbox) { } }; - eventHandlers.nodeBreadCrumbs = { - ready: function() { - views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView()); - }, - elementClicked: function(element) { - commands.jumpToDocumentElement(element); - } - }; - eventHandlers.documentHistory = { ready: function() { sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory()); diff --git a/src/editor/styles/common.less b/src/editor/styles/common.less index 00e1525..84af877 100644 --- a/src/editor/styles/common.less +++ b/src/editor/styles/common.less @@ -2,9 +2,4 @@ body { padding-top: 5px; } -.rng-common-hoveredNode { - border-color: red !important; - border-style:solid; - border-width:1px; -} -- 2.20.1