-define([\r
-'fnpjs/layout',\r
-'fnpjs/vbox',\r
-'views/tabs/tabs',\r
-'libs/text!./mainLayout.html',\r
-'libs/text!./editingLayout.html',\r
-'libs/text!./diffLayout.html',\r
-], function(layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {\r
-\r
-'use strict';\r
-\r
-return function(sandbox) {\r
- \r
- function addMainTab(title, slug, view) {\r
- views.mainTabs.addTab(title, slug, view);\r
- }\r
- \r
- var dirty = {\r
- sourceEditor: false,\r
- documentCanvas: false,\r
- metadataEditor: false,\r
- };\r
- \r
- var synchronizeTab = function(slug) {\r
- function tabIsDirty(slug) {\r
- if(slug === 'editor' && (dirty.documentCanvas || dirty.metadataEditor))\r
- return true;\r
- if(slug === 'sourceEditor' && dirty.sourceEditor)\r
- return true;\r
- return false;\r
- }\r
- \r
- if(tabIsDirty(slug)) {\r
- var reason, doc;\r
- if(slug === 'sourceEditor') {\r
- doc = sandbox.getModule('sourceEditor').getDocument();\r
- reason = 'source_edit';\r
- dirty.sourceEditor = false;\r
- }\r
- if(slug === 'editor') {\r
- var doc = dirty.documentCanvas ? sandbox.getModule('documentCanvas').getDocument() : sandbox.getModule('data').getDocument();\r
- if(dirty.metadataEditor) {\r
- doc = sandbox.getModule('metadataEditor').attachMetadata(doc);\r
- }\r
- reason = 'edit';\r
- dirty.documentCanvas = dirty.metadataEditor = false;\r
- }\r
- sandbox.getModule('data').commitDocument(doc, reason);\r
- }\r
- }\r
- \r
- var commands = {\r
- highlightDocumentNode: function(wlxmlNode, origin) {\r
- ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {\r
- if(!origin || moduleName != origin)\r
- sandbox.getModule(moduleName).highlightNode(wlxmlNode)\r
- });\r
- },\r
- dimDocumentNode: function(wlxmlNode, origin) {\r
- ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {\r
- if(!origin || moduleName != origin)\r
- sandbox.getModule(moduleName).dimNode(wlxmlNode)\r
- });\r
- },\r
- selectNode: function(wlxmlNode, origin) {\r
- sandbox.getModule('documentCanvas').selectNode(wlxmlNode);\r
- sandbox.getModule('nodePane').setNode(wlxmlNode);\r
- sandbox.getModule('nodeFamilyTree').setNode(wlxmlNode);\r
- sandbox.getModule('nodeBreadCrumbs').setNode(wlxmlNode);\r
- \r
- },\r
- resetDocument: function(document, reason) {\r
- var modules = [];\r
- if(reason === 'source_edit')\r
- modules = ['documentCanvas', 'metadataEditor'];\r
- else if (reason === 'edit')\r
- modules = ['sourceEditor'];\r
- else if (reason === 'revert')\r
- modules = ['documentCanvas', 'metadataEditor', 'sourceEditor'];\r
- \r
- modules.forEach(function(moduleName) {\r
- sandbox.getModule(moduleName).setDocument(document);\r
- });\r
- }\r
- }\r
- \r
-\r
- var views = {\r
- mainLayout: new layout.Layout(mainLayoutTemplate),\r
- mainTabs: (new tabs.View()).render(),\r
- visualEditing: new layout.Layout(visualEditingLayoutTemplate),\r
- visualEditingSidebar: (new tabs.View({stacked: true})).render(),\r
- currentNodePaneLayout: new vbox.VBox(),\r
- diffLayout: new layout.Layout(diffLayoutTemplate)\r
- }\r
- \r
- views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());\r
- addMainTab('Edytor', 'editor', views.visualEditing.getAsView());\r
- addMainTab(gettext('Source'), 'sourceEditor', '');\r
- addMainTab('Historia', 'history', views.diffLayout.getAsView());\r
- \r
- sandbox.getDOM().append(views.mainLayout.getAsView());\r
- \r
- views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());\r
-\r
- views.mainTabs.on('tabSelected', function(event) {\r
- if(event.prevSlug) {\r
- synchronizeTab(event.prevSlug);\r
- }\r
- });\r
- \r
- /* Events handling */\r
- \r
- var eventHandlers = {};\r
- \r
- eventHandlers.sourceEditor = {\r
- ready: function() {\r
- addMainTab(gettext('Source'), 'sourceEditor', sandbox.getModule('sourceEditor').getView());\r
- sandbox.getModule('sourceEditor').setDocument(sandbox.getModule('data').getDocument());\r
- },\r
- xmlChanged: function() {\r
- dirty.sourceEditor = true;\r
- },\r
- documentSet: function() {\r
- dirty.sourceEditor = false;\r
- }\r
- };\r
- \r
- eventHandlers.data = {\r
- ready: function() {\r
- views.mainLayout.setView('mainView', views.mainTabs.getAsView());\r
- \r
- _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer'], function(moduleName) {\r
- sandbox.getModule(moduleName).start();\r
- });\r
- },\r
- documentChanged: function(document, reason) {\r
- commands.resetDocument(document, reason);\r
- },\r
- savingStarted: function() {\r
- sandbox.getModule('mainBar').setCommandEnabled('save', false);\r
- sandbox.getModule('indicator').showMessage(gettext('Saving...'));\r
- },\r
- savingEnded: function(status) {\r
- sandbox.getModule('mainBar').setCommandEnabled('save', true);\r
- sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});\r
- },\r
- restoringStarted: function(event) {\r
- sandbox.getModule('mainBar').setCommandEnabled('save', false);\r
- sandbox.getModule('indicator').showMessage(gettext('Restoring version ' + event.version + '...'));\r
- },\r
- historyItemAdded: function(item) {\r
- sandbox.getModule('documentHistory').addHistory([item], {animate: true});\r
- },\r
- diffFetched: function(diff) {\r
- sandbox.getModule('diffViewer').setDiff(diff);\r
- },\r
- documentReverted: function(event) {\r
- commands.resetDocument(event.document, 'revert');\r
- sandbox.getModule('mainBar').setCommandEnabled('save', true);\r
- sandbox.getModule('indicator').clearMessage({message:'Wersja ' + event.reverted_version + ' przywrócona'});\r
- sandbox.getModule('mainBar').setVersion(event.current_version);\r
- }\r
- }\r
- \r
- eventHandlers.mainBar = {\r
- ready: function() {\r
- sandbox.getModule('mainBar').setVersion(sandbox.getModule('data').getDocumentVersion());\r
- views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());\r
- },\r
- 'cmd.save': function() {\r
- synchronizeTab(views.mainTabs.getCurrentSlug());\r
- sandbox.getModule('data').saveDocument();\r
- }\r
- }\r
- \r
- eventHandlers.indicator = {\r
- ready: function() {\r
- views.mainLayout.setView('messages', sandbox.getModule('indicator').getView());\r
- }\r
- };\r
- \r
-\r
- \r
- eventHandlers.documentCanvas = {\r
- ready: function() {\r
- sandbox.getModule('documentCanvas').setDocument(sandbox.getModule('data').getDocument());\r
- views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());\r
- },\r
- documentSet: function() {\r
- dirty.documentCanvas = false;\r
- },\r
- \r
- nodeSelected: function(wlxmlNode) {\r
- commands.selectNode(wlxmlNode);\r
- },\r
- \r
- contentChanged: function() {\r
- dirty.documentCanvas = true;\r
- },\r
- \r
- nodeHovered: function(wlxmlNode) {\r
- commands.highlightDocumentNode(wlxmlNode);\r
- },\r
- \r
- nodeBlured: function(wlxmlNode) {\r
- commands.dimDocumentNode(wlxmlNode);\r
- }\r
- };\r
-\r
- eventHandlers.nodePane = {\r
- ready: function() {\r
- views.currentNodePaneLayout.appendView(sandbox.getModule('nodePane').getView());\r
- },\r
- \r
- nodeChanged: function(attr, value) {\r
- sandbox.getModule('documentCanvas').modifyCurrentNode(attr, value);\r
- }\r
- };\r
- \r
- eventHandlers.metadataEditor = {\r
- ready: function() {\r
- sandbox.getModule('metadataEditor').setDocument(sandbox.getModule('data').getDocument());\r
- views.visualEditingSidebar.addTab({icon: 'info-sign'}, 'metadataEditor', sandbox.getModule('metadataEditor').getView());\r
- },\r
- metadataChanged: function(metadata) {\r
- dirty.metadataEditor = true;\r
- },\r
- metadataSet: function() {\r
- dirty.metadataEditor = false;\r
- },\r
- };\r
- \r
- eventHandlers.nodeFamilyTree = {\r
- ready: function() {\r
- views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());\r
- },\r
- nodeEntered: function(wlxmlNode) {\r
- commands.highlightDocumentNode(wlxmlNode, 'nodeFamilyTree');\r
- },\r
- nodeLeft: function(wlxmlNode) {\r
- commands.dimDocumentNode(wlxmlNode, 'nodeFamilyTree');\r
- },\r
- nodeSelected: function(wlxmlNode) {\r
- commands.selectNode(wlxmlNode);\r
- }\r
- };\r
- \r
- eventHandlers.documentToolbar = {\r
- ready: function() {\r
- views.visualEditing.setView('toolbar', sandbox.getModule('documentToolbar').getView());\r
- },\r
- toggleGrid: function(toggle) {\r
- sandbox.getModule('documentCanvas').toggleGrid(toggle);\r
- },\r
- newNodeRequested: function(wlxmlTag, wlxmlClass) {\r
- if(window.getSelection().isCollapsed) {\r
- sandbox.getModule('documentCanvas').insertNewNode(wlxmlTag, wlxmlClass);\r
- } else {\r
- sandbox.getModule('documentCanvas').wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
- }\r
- }\r
- };\r
- \r
- eventHandlers.nodeBreadCrumbs = {\r
- ready: function() {\r
- views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView());\r
- },\r
- nodeHighlighted: function(wlxmlNode) {\r
- commands.highlightDocumentNode(wlxmlNode, 'nodeBreadCrumbs');\r
- },\r
- nodeDimmed: function(wlxmlNode) {\r
- commands.dimDocumentNode(wlxmlNode, 'nodeBreadCrumbs');\r
- },\r
- nodeSelected: function(wlxmlNode) {\r
- commands.selectNode(wlxmlNode);\r
- } \r
- }\r
- \r
- eventHandlers.documentHistory = {\r
- ready: function() {\r
- sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory());\r
- views.diffLayout.setView('left', sandbox.getModule('documentHistory').getView());\r
- },\r
- compare: function(ver1, ver2) {\r
- sandbox.getModule('data').fetchDiff(ver1, ver2);\r
- },\r
- restoreVersion: function(event) {\r
- sandbox.getModule('data').restoreVersion(event);\r
- },\r
- displayVersion: function(event) {\r
- window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId());\r
- }\r
- }\r
- \r
- eventHandlers.diffViewer = {\r
- ready: function() {\r
- views.diffLayout.setView('right', sandbox.getModule('diffViewer').getView());\r
- }\r
- }\r
- \r
- /* api */\r
- \r
- return {\r
- start: function() {\r
- sandbox.getModule('data').start();\r
- },\r
- handleEvent: function(moduleName, eventName, args) {\r
- if('')\r
- wysiwigHandler.handleEvent(moduleName, eventName, args);\r
- else if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {\r
- eventHandlers[moduleName][eventName].apply(eventHandlers, args);\r
- }\r
- }\r
- }\r
-};\r
-\r
+define([
+'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) {
+
+'use strict';
+
+return function(sandbox) {
+
+ function addMainTab(title, slug, view) {
+ views.mainTabs.addTab(title, slug, view);
+ }
+
+ var dirty = {
+ sourceEditor: false,
+ documentCanvas: false,
+ metadataEditor: false,
+ };
+
+ var synchronizeTab = function(slug) {
+ function tabIsDirty(slug) {
+ if(slug === 'editor' && (dirty.documentCanvas || dirty.metadataEditor))
+ return true;
+ if(slug === 'sourceEditor' && dirty.sourceEditor)
+ return true;
+ return false;
+ }
+
+ if(tabIsDirty(slug)) {
+ var reason, doc;
+ if(slug === 'sourceEditor') {
+ doc = sandbox.getModule('sourceEditor').getDocument();
+ reason = 'source_edit';
+ dirty.sourceEditor = false;
+ }
+ if(slug === 'editor') {
+ doc = dirty.documentCanvas ? sandbox.getModule('documentCanvas').getDocument() : sandbox.getModule('data').getDocument();
+ if(dirty.metadataEditor) {
+ doc = sandbox.getModule('metadataEditor').attachMetadata(doc);
+ }
+ reason = 'edit';
+ dirty.documentCanvas = dirty.metadataEditor = false;
+ }
+ sandbox.getModule('data').commitDocument(doc, reason);
+ }
+ };
+
+ var commands = {
+ highlightDocumentElement: function(element, origin) {
+ ///'nodeBreadCrumbs', 'nodeFamilyTree'
+ ['documentCanvas', ].forEach(function(moduleName) {
+ if(!origin || moduleName != origin)
+ sandbox.getModule(moduleName).highlightElement(element);
+ });
+ },
+ dimDocumentElement: function(element, origin) {
+ //'nodeBreadCrumbs', 'nodeFamilyTree'
+ ['documentCanvas'].forEach(function(moduleName) {
+ if(!origin || moduleName != origin)
+ sandbox.getModule(moduleName).dimElement(element);
+ });
+ },
+ jumpToDocumentElement: function(element) {
+ sandbox.getModule('documentCanvas').jumpToElement(element);
+ },
+ updateCurrentNodeElement: function(nodeElement) {
+ sandbox.getModule('nodePane').setNodeElement(nodeElement);
+ sandbox.getModule('nodeFamilyTree').setElement(nodeElement);
+ sandbox.getModule('nodeBreadCrumbs').setNodeElement(nodeElement);
+ },
+ 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')
+ modules = ['documentCanvas', 'metadataEditor', 'sourceEditor'];
+
+ modules.forEach(function(moduleName) {
+ sandbox.getModule(moduleName).setDocument(document);
+ });
+ }
+ };
+
+
+ var views = {
+ mainLayout: new layout.Layout(mainLayoutTemplate),
+ mainTabs: (new tabs.View()).render(),
+ visualEditing: new layout.Layout(visualEditingLayoutTemplate),
+ visualEditingSidebar: (new tabs.View({stacked: true})).render(),
+ currentNodePaneLayout: new vbox.VBox(),
+ diffLayout: new layout.Layout(diffLayoutTemplate)
+ };
+
+ views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());
+ addMainTab('Edytor', 'editor', views.visualEditing.getAsView());
+ addMainTab(gettext('Source'), 'sourceEditor', '');
+ addMainTab('Historia', 'history', views.diffLayout.getAsView());
+
+ sandbox.getDOM().append(views.mainLayout.getAsView());
+
+ views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());
+
+ views.mainTabs.on('tabSelected', function(event) {
+ if(event.prevSlug) {
+ synchronizeTab(event.prevSlug);
+ }
+ });
+
+ /* Events handling */
+
+ var eventHandlers = {};
+
+ eventHandlers.sourceEditor = {
+ ready: function() {
+ addMainTab(gettext('Source'), 'sourceEditor', sandbox.getModule('sourceEditor').getView());
+ sandbox.getModule('sourceEditor').setDocument(sandbox.getModule('data').getDocument());
+ },
+ xmlChanged: function() {
+ dirty.sourceEditor = true;
+ },
+ documentSet: function() {
+ dirty.sourceEditor = false;
+ }
+ };
+
+ eventHandlers.data = {
+ ready: function() {
+ views.mainLayout.setView('mainView', views.mainTabs.getAsView());
+
+ _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer'], function(moduleName) {
+ 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) {
+ sandbox.getModule('mainBar').setCommandEnabled('save', true);
+ sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});
+ },
+ restoringStarted: function(event) {
+ sandbox.getModule('mainBar').setCommandEnabled('save', false);
+ sandbox.getModule('indicator').showMessage(gettext('Restoring version ') + event.version + '...');
+ },
+ historyItemAdded: function(item) {
+ sandbox.getModule('documentHistory').addHistory([item], {animate: true});
+ },
+ diffFetched: function(diff) {
+ sandbox.getModule('diffViewer').setDiff(diff);
+ },
+ documentReverted: function(event) {
+ commands.resetDocument(event.document, 'revert');
+ sandbox.getModule('mainBar').setCommandEnabled('save', true);
+ sandbox.getModule('indicator').clearMessage({message:'Wersja ' + event.reverted_version + ' przywrócona'});
+ sandbox.getModule('mainBar').setVersion(event.current_version);
+ }
+ };
+
+ eventHandlers.mainBar = {
+ ready: function() {
+ sandbox.getModule('mainBar').setVersion(sandbox.getModule('data').getDocumentVersion());
+ views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());
+ },
+ 'cmd.save': function() {
+ synchronizeTab(views.mainTabs.getCurrentSlug());
+ sandbox.getModule('data').saveDocument();
+ }
+ };
+
+ eventHandlers.indicator = {
+ ready: function() {
+ views.mainLayout.setView('messages', sandbox.getModule('indicator').getView());
+ }
+ };
+
+
+
+ eventHandlers.documentCanvas = {
+ ready: function() {
+ sandbox.getModule('documentCanvas').setDocument(sandbox.getModule('data').getDocument());
+ views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
+ },
+ documentSet: function() {
+ dirty.documentCanvas = false;
+ },
+
+ currentTextElementSet: function(textElement) {
+ commands.updateCurrentTextElement(textElement);
+ },
+
+ currentNodeElementSet: function(nodeElement) {
+ commands.updateCurrentNodeElement(nodeElement);
+ },
+
+ currentNodeElementChanged: function(nodeElement) {
+ commands.updateCurrentNodeElement(nodeElement);
+ dirty.documentCanvas = true;
+ },
+
+ contentChanged: function() {
+ dirty.documentCanvas = true;
+ },
+
+ nodeHovered: function(canvasNode) {
+ commands.highlightDocumentNode(canvasNode);
+ },
+
+ nodeBlured: function(canvasNode) {
+ commands.dimDocumentNode(canvasNode);
+ }
+ };
+
+ eventHandlers.nodePane = {
+ ready: function() {
+ views.currentNodePaneLayout.appendView(sandbox.getModule('nodePane').getView());
+ },
+
+ nodeElementChange: function(attr, value) {
+ sandbox.getModule('documentCanvas').modifyCurrentNodeElement(attr, value);
+ }
+ };
+
+ eventHandlers.metadataEditor = {
+ ready: function() {
+ sandbox.getModule('metadataEditor').setDocument(sandbox.getModule('data').getDocument());
+ views.visualEditingSidebar.addTab({icon: 'info-sign'}, 'metadataEditor', sandbox.getModule('metadataEditor').getView());
+ },
+ metadataChanged: function(metadata) {
+ dirty.metadataEditor = true;
+ },
+ metadataSet: function() {
+ dirty.metadataEditor = false;
+ },
+ };
+
+ eventHandlers.nodeFamilyTree = {
+ ready: function() {
+ views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());
+ },
+ elementEntered: function(element) {
+ commands.highlightDocumentElement(element, 'nodeFamilyTree');
+ },
+ elementLeft: function(element) {
+ commands.dimDocumentElement(element, 'nodeFamilyTree');
+ },
+ elementClicked: function(element) {
+ commands.jumpToDocumentElement(element);
+ }
+ };
+
+ eventHandlers.documentToolbar = {
+ ready: function() {
+ views.visualEditing.setView('toolbar', sandbox.getModule('documentToolbar').getView());
+ },
+ command: function(cmd, params) {
+ sandbox.getModule('documentCanvas').command(cmd, params);
+ }
+ };
+
+ eventHandlers.nodeBreadCrumbs = {
+ ready: function() {
+ views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView());
+ },
+ elementEntered: function(element) {
+ commands.highlightDocumentElement(element, 'nodeBreadCrumbs');
+ },
+ elementLeft: function(element) {
+ commands.dimDocumentElement(element, 'nodeBreadCrumbs');
+ },
+ elementClicked: function(element) {
+ commands.jumpToDocumentElement(element);
+ }
+ };
+
+ eventHandlers.documentHistory = {
+ ready: function() {
+ sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory());
+ views.diffLayout.setView('left', sandbox.getModule('documentHistory').getView());
+ },
+ compare: function(ver1, ver2) {
+ sandbox.getModule('data').fetchDiff(ver1, ver2);
+ },
+ restoreVersion: function(event) {
+ sandbox.getModule('data').restoreVersion(event);
+ },
+ displayVersion: function(event) {
+ window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId());
+ }
+ };
+
+ eventHandlers.diffViewer = {
+ ready: function() {
+ views.diffLayout.setView('right', sandbox.getModule('diffViewer').getView());
+ }
+ };
+
+ /* api */
+
+ return {
+ start: function() {
+ sandbox.getModule('data').start();
+ },
+ handleEvent: function(moduleName, eventName, args) {
+ if('')
+ wysiwigHandler.handleEvent(moduleName, eventName, args);
+ else if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {
+ eventHandlers[moduleName][eventName].apply(eventHandlers, args);
+ }
+ }
+ };
+};
+