fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
integration wip: removing unused code
[fnpeditor.git]
/
src
/
editor
/
modules
/
rng
/
rng.js
diff --git
a/src/editor/modules/rng/rng.js
b/src/editor/modules/rng/rng.js
index
614fc76
..
b1e091c
100644
(file)
--- a/
src/editor/modules/rng/rng.js
+++ b/
src/editor/modules/rng/rng.js
@@
-1,15
+1,18
@@
define([
define([
+'libs/underscore',
'fnpjs/layout',
'fnpjs/vbox',
'views/tabs/tabs',
'libs/text!./mainLayout.html',
'libs/text!./editingLayout.html',
'libs/text!./diffLayout.html',
'fnpjs/layout',
'fnpjs/vbox',
'views/tabs/tabs',
'libs/text!./mainLayout.html',
'libs/text!./editingLayout.html',
'libs/text!./diffLayout.html',
-], function(layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {
+], function(
_,
layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {
'use strict';
return function(sandbox) {
'use strict';
return function(sandbox) {
+
+ /* globals gettext */
function addMainTab(title, slug, view) {
views.mainTabs.addTab(title, slug, view);
function addMainTab(title, slug, view) {
views.mainTabs.addTab(title, slug, view);
@@
-18,16
+21,18
@@
return function(sandbox) {
var commands = {
highlightDocumentElement: function(element, origin) {
///'nodeBreadCrumbs', 'nodeFamilyTree'
var commands = {
highlightDocumentElement: function(element, origin) {
///'nodeBreadCrumbs', 'nodeFamilyTree'
- ['documentCanvas', ].forEach(function(moduleName) {
- if(!origin || moduleName !=
origin)
+ ['documentCanvas',
'nodeFamilyTree'
].forEach(function(moduleName) {
+ if(!origin || moduleName !=
= origin) {
sandbox.getModule(moduleName).highlightElement(element);
sandbox.getModule(moduleName).highlightElement(element);
+ }
});
},
dimDocumentElement: function(element, origin) {
//'nodeBreadCrumbs', 'nodeFamilyTree'
});
},
dimDocumentElement: function(element, origin) {
//'nodeBreadCrumbs', 'nodeFamilyTree'
- ['documentCanvas'].forEach(function(moduleName) {
- if(!origin || moduleName !=
origin)
+ ['documentCanvas'
, 'nodeFamilyTree'
].forEach(function(moduleName) {
+ if(!origin || moduleName !=
= origin) {
sandbox.getModule(moduleName).dimElement(element);
sandbox.getModule(moduleName).dimElement(element);
+ }
});
},
jumpToDocumentElement: function(element) {
});
},
jumpToDocumentElement: function(element) {
@@
-36,20
+41,16
@@
return function(sandbox) {
updateCurrentNodeElement: function(nodeElement) {
sandbox.getModule('nodePane').setNodeElement(nodeElement);
sandbox.getModule('nodeFamilyTree').setElement(nodeElement);
updateCurrentNodeElement: function(nodeElement) {
sandbox.getModule('nodePane').setNodeElement(nodeElement);
sandbox.getModule('nodeFamilyTree').setElement(nodeElement);
-
//
sandbox.getModule('nodeBreadCrumbs').setNodeElement(nodeElement);
+ sandbox.getModule('nodeBreadCrumbs').setNodeElement(nodeElement);
},
updateCurrentTextElement: function(textElement) {
sandbox.getModule('nodeFamilyTree').setElement(textElement);
},
resetDocument: function(document, reason) {
var modules = [];
},
updateCurrentTextElement: function(textElement) {
sandbox.getModule('nodeFamilyTree').setElement(textElement);
},
resetDocument: function(document, reason) {
var modules = [];
- if(reason === 'source_edit')
- modules = ['documentCanvas', 'metadataEditor'];
- else if (reason === 'edit')
- modules = ['sourceEditor'];
- else if (reason === 'revert')
+ if (reason === 'revert') {
modules = ['documentCanvas', 'metadataEditor', 'sourceEditor'];
modules = ['documentCanvas', 'metadataEditor', 'sourceEditor'];
-
+ }
modules.forEach(function(moduleName) {
sandbox.getModule(moduleName).setDocument(document);
});
modules.forEach(function(moduleName) {
sandbox.getModule(moduleName).setDocument(document);
});
@@
-95,14
+96,12
@@
return function(sandbox) {
sandbox.getModule(moduleName).start();
});
},
sandbox.getModule(moduleName).start();
});
},
- documentChanged: function(document, reason) {
- commands.resetDocument(document, reason);
- },
savingStarted: function() {
sandbox.getModule('mainBar').setCommandEnabled('save', false);
sandbox.getModule('indicator').showMessage(gettext('Saving...'));
},
savingEnded: function(status) {
savingStarted: function() {
sandbox.getModule('mainBar').setCommandEnabled('save', false);
sandbox.getModule('indicator').showMessage(gettext('Saving...'));
},
savingEnded: function(status) {
+ void(status);
sandbox.getModule('mainBar').setCommandEnabled('save', true);
sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});
},
sandbox.getModule('mainBar').setCommandEnabled('save', true);
sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});
},
@@
-130,7
+129,6
@@
return function(sandbox) {
views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());
},
'cmd.save': function() {
views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());
},
'cmd.save': function() {
- synchronizeTab(views.mainTabs.getCurrentSlug());
sandbox.getModule('data').saveDocument();
}
};
sandbox.getModule('data').saveDocument();
}
};
@@
-191,14
+189,14
@@
return function(sandbox) {
ready: function() {
views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());
},
ready: function() {
views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());
},
-
elementEntered: function(element
) {
- commands.highlightDocumentElement(
element
, 'nodeFamilyTree');
+
nodeEntered: function(node
) {
+ commands.highlightDocumentElement(
node
, 'nodeFamilyTree');
},
},
-
elementLeft: function(element
) {
- commands.dimDocumentElement(
element
, 'nodeFamilyTree');
+
nodeLeft: function(node
) {
+ commands.dimDocumentElement(
node
, 'nodeFamilyTree');
},
},
-
elementClicked: function(element
) {
- commands.jumpToDocumentElement(
element
);
+
nodeClicked: function(node
) {
+ commands.jumpToDocumentElement(
node
);
}
};
}
};
@@
-223,7
+221,7
@@
return function(sandbox) {
},
elementClicked: function(element) {
commands.jumpToDocumentElement(element);
},
elementClicked: function(element) {
commands.jumpToDocumentElement(element);
- }
+ }
};
eventHandlers.documentHistory = {
};
eventHandlers.documentHistory = {
@@
-255,9
+253,7
@@
return function(sandbox) {
sandbox.getModule('data').start();
},
handleEvent: function(moduleName, eventName, args) {
sandbox.getModule('data').start();
},
handleEvent: function(moduleName, eventName, args) {
- if('')
- wysiwigHandler.handleEvent(moduleName, eventName, args);
- else if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {
+ if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {
eventHandlers[moduleName][eventName].apply(eventHandlers, args);
}
}
eventHandlers[moduleName][eventName].apply(eventHandlers, args);
}
}