Author: rudolf
Date: Fri May 14 09:30:18 2010
New Revision: 944170
URL: http://svn.apache.org/viewvc?rev=944170&view=rev
Log:
update to Firedocs version 1.3.6 (see bug id 48978). Thanks to Thomas Comiotto
Added:
lenya/contributions/2_0_X/modules/firedocs/resources/firedocs-1.3.6.xpi (with props)
Modified:
lenya/contributions/2_0_X/modules/firedocs/src/extension/chrome/content/LenyaOverlayManager.js
lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_de.meta
lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_en.meta
lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_de.meta
lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_en.meta
Added: lenya/contributions/2_0_X/modules/firedocs/resources/firedocs-1.3.6.xpi
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/firedocs/resources/firedocs-1.3.6.xpi?rev=944170&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/contributions/2_0_X/modules/firedocs/resources/firedocs-1.3.6.xpi
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lenya/contributions/2_0_X/modules/firedocs/src/extension/chrome/content/LenyaOverlayManager.js
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/firedocs/src/extension/chrome/content/LenyaOverlayManager.js?rev=944170&r1=944169&r2=944170&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/firedocs/src/extension/chrome/content/LenyaOverlayManager.js (original)
+++ lenya/contributions/2_0_X/modules/firedocs/src/extension/chrome/content/LenyaOverlayManager.js Fri May 14 09:30:18 2010
@@ -18,176 +18,115 @@
function LenyaOverlayManager() {
- this.logger = new Logger("LenyaOverlayManager");
-
- this.ioService = Components.classes["@mozilla.org/network/io-service;1"]
+ this.ioService = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService);
- var workspace = getWorkspace();
-
- workspace.addWorkspaceObserver(this);
-
- this.workspace = workspace;
+ var workspace = getWorkspace();
+ workspace.addWorkspaceObserver(this);
+ this.workspace = workspace;
}
LenyaOverlayManager.prototype = {
- workspace: null,
- editor: null,
- overlayEnabled: false,
-
-
- /* Workspace Observer */
-
- didOpenDocument: function (aURI, aData, aContentType) {
-
- var log = this.logger;
- log.entry("didOpenDocument()");
-
- log.debug(aURI.spec + ", " + aContentType);
-
- var workspace = this.workspace;
- var contentType = aContentType;
-
- this.addUriResolverToWorkspace();
-
- switch(aContentType) {
-
- case "application/lenya-links+xml":
- case "application/forrest+xml":
-
- this.addEditorToWorkspace();
-
- this.overlayEnabled = true;
- break;
-
- }
+ workspace: null,
+ editor: null,
+ overlayEnabled: false,
- log.exit("didOpenDocument()");
+ /* Workspace Observer */
- },
+ didOpenContent : function(aService, aRepository, aContent, aProperties) {
- didSaveDocument: function(aURI, aData) {},
+ var contentType = aProperties['mime-type'];
- addEditorToWorkspace: function() {
+ switch (contentType) {
- var log = this.logger;
- log.entry("addEditorToWorkspace()");
+ case "application/lenya-links+xml":
+ case "application/forrest+xml":
- var ioService = this.ioService;
- var workspace = this.workspace;
+ this.overlayEnabled = true;
+ this.contributeEditor(aService, aRepository, aContent, aProperties);
+ break;
- var serviceEditUri = workspace.atomPubServiceEditUri;
+ default :
+ this.overlayEnabled = false;
- if (serviceEditUri) {
-
- // remote configuration
-
- var atomPubService = new AtomPubService();
- var helper = new FiredocsAtomPubHelper();
-
- var entry = atomPubService.getEntry(serviceEditUri);
+ }
+ },
- if (entry) {
- // create editor
+ didSaveDocument: function(aURI, aData) {},
- var schemaUri = helper.getSchemaUri(entry);
- var stylesheetUri = helper.getStylesheetUri(entry);
- var stylesheetParameters = helper.getStylesheetParameters(entry);
- var insertsUri = helper.getInsertsUri(entry);
- var pageContextUri = helper.getPageContextUri(entry);
-
- var sitemaps = new Array();
+ contributeEditor: function(aService, aRepository, aContent, aProperties) {
- if (schemaUri && stylesheetUri) {
+ var workspace = getWorkspace();
- var editor = new WysiwygXmlEditor(workspace, schemaUri, stylesheetUri, stylesheetParameters, pageContextUri, sitemaps);
- editor.setEnableTransformPageContext(false);
- editor.setLabel("UniCMS Editor - WYSIWYG");
- workspace.addEditor(editor);
+ var uri = aProperties['uri'];
+ var schemaUri = aProperties['firedocs-schema'];
+ var stylesheetUri = aProperties['firedocs-stylesheet'];
+ var stylesheetParams = aProperties['firedocs-stylesheet-params'];
+ var pageContextUri = aProperties['firedocs-pagecontext'];
+ var transformPageContext = aProperties['firedocs-transform-pagecontext'];
- }
- }
- }
+ // get content stream and contribute editor to workspace
+ var params = {
+ 'repid' : aRepository,
+ 'id' : aContent
+ };
+ var req = aService.newRequest('getContentStream', params);
- log.exit("addEditorToWorkspace()");
+ var self = this;
- },
+ req.onReadyStateChange = function() {
+ var contentStream = req.response;
- addUriResolverToWorkspace: function() {
+ var domUtil = new DOMUtil();
+ var dom = domUtil.contentStreamToDocument(contentStream, "UTF-8",
+ uri);
- var log = this.logger;
- log.entry("addUriResolverToWorkspace()");
+ var editor = new WysiwygXmlEditor(schemaUri, stylesheetUri,
+ stylesheetParams, pageContextUri);
+ editor.setEnableTransformPageContext(transformPageContext);
- var ioService = this.ioService;
- var workspace = this.workspace;
+ editor.setLabel("Lenya Editor - WYSIWYG");
+ workspace.addEditor(editor);
- var resolver = null;
- var serviceEditUri = workspace.atomPubServiceEditUri;
+ editor.open(dom);
- if (serviceEditUri) {
+ self.editor = editor;
+ self.service = aService;
+ self.repid = aRepository;
+ self.cid = aContent;
- var atomPubService = new AtomPubService();
+ };
- var entry = atomPubService.getEntry(serviceEditUri);
-
+ workspace.progressPanel.setMessage("Open Content Stream");
+ req.send();
- if (entry) {
+ },
- var entryDocument = entry.ownerDocument;
- try {
- var result = entryDocument.evaluate("//firedocs:url-resolver/@href", entry, this.nsResolver, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+ didOpenEditor: function(aEditor) {
- if (!result.singleNodeValue)
- result = entryDocument.evaluate("//edit:uri-resolver/@href", entry, this.nsResolver, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+ if (aEditor == this.editor) {
+ document.getElementById("formattingToolbarItems").hidden = true;
+ document.getElementById("bulletsNumberingToolbarItems").hidden = true;
+ document.getElementById("linkToolbarItems").hidden = true;
+ document.getElementById("mediaToolbarItems").hidden = true;
- log.debug("Resolver uri: " + result.singleNodeValue);
+ document.getElementById("listSidebarPanel").hidden = true;
+ document.getElementById("tableSidebarPanel").hidden = true;
+ document.getElementById("linkSidebarPanel").hidden = true;
+ document.getElementById("anchorSidebarPanel").hidden = true;
- if (result.singleNodeValue) {
- var uriString = result.singleNodeValue.textContent;
- var baseUri = ioService.newURI(entryDocument.baseURI, null, null);
- uri = ioService.newURI(uriString, null, baseUri);
- resolver = new LenyaDocumentUriResolver(uri);
- }
- } catch(e) {
- log.errorException(e);
}
-
- log.debug("Resolver: " + resolver);
-
- }
-
- if (resolver)
- workspace.addUriResolver(resolver);
-
}
- log.exit("addUriResolverToWorkspace()");
-
- },
-
-
- didOpenEditor: function(aEditor) {},
-
-
- nsResolver: function(prefix) {
- var ns = {
- 'atom' : 'http://www.w3.org/2005/Atom',
- 'firedocs': 'www.firedocs.org/config/1.0',
- 'edit': 'http://apache.org/lenya/editing'
- };
- return ns[prefix] || null;
- }
-
-
};
Modified: lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_de.meta?rev=944170&r1=944169&r2=944170&view=diff
==============================================================================
--- lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_de.meta (original)
+++ lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_de.meta Fri May 14 09:30:18 2010
@@ -13,7 +13,7 @@
<lenya:internal>
<lenya:resourceType>links</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
- <lenya:mimeType>application/xml</lenya:mimeType>
+ <lenya:mimeType>application/lenya-links+xml</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_en.meta?rev=944170&r1=944169&r2=944170&view=diff
==============================================================================
--- lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_en.meta (original)
+++ lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/doctypes/links/index_en.meta Fri May 14 09:30:18 2010
@@ -13,7 +13,7 @@
<lenya:internal>
<lenya:resourceType>links</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
- <lenya:mimeType>application/xml</lenya:mimeType>
+ <lenya:mimeType>application/lenya-links+xml</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_de.meta?rev=944170&r1=944169&r2=944170&view=diff
==============================================================================
--- lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_de.meta (original)
+++ lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_de.meta Fri May 14 09:30:18 2010
@@ -21,7 +21,7 @@
<lenya:internal>
<lenya:resourceType>links</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
- <lenya:mimeType>application/xml</lenya:mimeType>
+ <lenya:mimeType>application/lenya-links+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya links</dc:title>
Modified: lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_en.meta?rev=944170&r1=944169&r2=944170&view=diff
==============================================================================
--- lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_en.meta (original)
+++ lenya/contributions/2_0_X/pubs/defaultfiredocs/example-content/links/index_en.meta Fri May 14 09:30:18 2010
@@ -21,7 +21,7 @@
<lenya:internal>
<lenya:resourceType>links</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
- <lenya:mimeType>application/xml</lenya:mimeType>
+ <lenya:mimeType>application/lenya-links+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya links</dc:title>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.