You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2007/07/22 22:47:15 UTC
svn commit: r558545 - in /lenya/trunk/src/modules/tinymce: ./
resources/javascript/
resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/ xslt/
Author: nettings
Date: Sun Jul 22 13:47:12 2007
New Revision: 558545
URL: http://svn.apache.org/viewvc?view=rev&rev=558545
Log:
tinymce now uses the generic editors.insertLink usecase.
Added:
lenya/trunk/src/modules/tinymce/resources/javascript/editorCallbacks.js
- copied, changed from r558512, lenya/trunk/src/modules/tinymce/resources/javascript/insertLink.js
Removed:
lenya/trunk/src/modules/tinymce/resources/javascript/insertLink.js
lenya/trunk/src/modules/tinymce/xslt/link.xsl
Modified:
lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js
lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js
lenya/trunk/src/modules/tinymce/sitemap.xmap
Copied: lenya/trunk/src/modules/tinymce/resources/javascript/editorCallbacks.js (from r558512, lenya/trunk/src/modules/tinymce/resources/javascript/insertLink.js)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/resources/javascript/editorCallbacks.js?view=diff&rev=558545&p1=lenya/trunk/src/modules/tinymce/resources/javascript/insertLink.js&r1=558512&p2=lenya/trunk/src/modules/tinymce/resources/javascript/editorCallbacks.js&r2=558545
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/javascript/insertLink.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/javascript/editorCallbacks.js Sun Jul 22 13:47:12 2007
@@ -15,52 +15,8 @@
limitations under the License.
*/
-function insertLink() {
- var text = document.forms["link"].text.value;
- var title = document.forms["link"].title.value;
- var prefix = '/' + PUBLICATION_ID + '/' + AREA;
- var url = document.forms["link"].url.value;
- if (url.charAt(0) == "/") {
- // prepend hostname etc for internal links
- url = prefix + url;
- }
- var content = '<a xmlns="'+window.opener.XHTMLNS+'" href="'+url+'" title="'+title+'">'+text+'</a>';
- window.top.opener.TinyMCE_SimpleBrowserPlugin.browserCallback(url) ;
+function LenyaInsertLink(linkData) {
+ window.top.opener.TinyMCE_SimpleBrowserPlugin.browserCallback(linkData) ;
window.top.close() ;
}
-function setLink(uuid) {
- var language = CHOSEN_LANGUAGE;
- document.forms["link"].url.value = "lenya-document:" + uuid + ",lang=" + language;
-}
-
-function insertText() {
- var selectionContent = window.opener.getSelection().getEditableRange().toString();
- if (selectionContent.length != 0) {
- document.forms["link"].text.value = selectionContent;
- }
- focus();
-}
-
-function LinkTree(doc, treeElement) {
- this.doc = doc;
- this.treeElement = treeElement;
- this.selected = null;
-}
-
-LinkTree.prototype = new NavTree;
-
-LinkTree.prototype.handleItemClick = function(item, event) {
- setLink(item.uuid);
-}
-
-function buildTree() {
- var placeholder = document.getElementById('tree');
- var tree = new LinkTree(document, placeholder);
- tree.init(PUBLICATION_ID);
- tree.render();
- tree.loadInitialTree(AREA, DOCUMENT_ID);
-}
-
-var url;
-window.onload = insertText
Modified: lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js?view=diff&rev=558545&r1=558544&r2=558545
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js Sun Jul 22 13:47:12 2007
@@ -39,7 +39,7 @@
and search-and-replace. */
plugins : "save,fullscreen,searchreplace,table,contextmenu,simplebrowser",
- plugin_simplebrowser_browselinkurl : currentURL + '?lenya.module=tinymce&lenya.step=link-show&language=en',
+ plugin_simplebrowser_browselinkurl : currentURL + '?lenya.usecase=editors.insertLink&lenya.editorModule=tinymce',
plugin_simplebrowser_browseimageurl : currentURL + '?lenya.usecase=tinymce.insertImage',
plugin_simplebrowser_browseflashurl : '',
Modified: lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js?view=diff&rev=558545&r1=558544&r2=558545
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js Sun Jul 22 13:47:12 2007
@@ -89,9 +89,9 @@
}
},
- browserCallback : function(returnValue) {
- if(!returnValue) return;
- TinyMCE_SimpleBrowserPlugin.options['target'].document.forms[0].elements[TinyMCE_SimpleBrowserPlugin.options['field']].value = returnValue;
+ browserCallback : function(linkData) {
+ if(!linkData) return;
+ TinyMCE_SimpleBrowserPlugin.options['target'].document.forms[0].elements[TinyMCE_SimpleBrowserPlugin.options['field']].value = linkData['href'];
}
};
Modified: lenya/trunk/src/modules/tinymce/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/sitemap.xmap?view=diff&rev=558545&r1=558544&r2=558545
==============================================================================
--- lenya/trunk/src/modules/tinymce/sitemap.xmap (original)
+++ lenya/trunk/src/modules/tinymce/sitemap.xmap Sun Jul 22 13:47:12 2007
@@ -60,25 +60,6 @@
</map:pipeline>
<map:pipeline>
-
- <map:match pattern="link-show" type="step">
- <map:generate src="context://lenya/content/util/empty.xml"/>
- <map:transform src="fallback://lenya/modules/tinymce/xslt/link.xsl" label="content">
- <map:parameter name="infoarea" value="true"/>
- <map:parameter name="contextprefix" value=""/>
- <map:parameter name="publicationid" value="{page-envelope:publication-id}"/>
- <map:parameter name="area" value="authoring"/>
- <map:parameter name="tab" value="en"/>
- <map:parameter name="chosenlanguage" value="{page-envelope:document-language}"/>
- <map:parameter name="documentid" value="{page-envelope:document-id}"/>
- <map:parameter name="documenturl" value="/{page-envelope:document-url}"/>
- <map:parameter name="documentextension" value="{page-envelope:document-extension}"/>
- <map:parameter name="defaultlanguage" value="{page-envelope:default-language}"/>
- <map:parameter name="languages" value="{page-envelope:publication-languages-csv}"/>
- </map:transform>
- <map:call resource="style-cms-page"/>
- <map:serialize />
- </map:match>
<!-- this is the view of the usecase (see config/cocoon-xconf/usecases.xconf) -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org