Changeset 327:e7e19491aac8

Timestamp:

06/02/11 09:53:51 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Insert/update link works fine now

Files:

• admin/js/tiny_mce/plugins/dcControls/editor_plugin.js (modified) (3 diffs)
• inc/admin/lib.dc.page.php (modified) (1 diff)

admin/js/tiny_mce/plugins/dcControls/editor_plugin.js

@@ -56 +56 @@
                          return;
                     
+                    var url = popup_post_url + '?q=' + se.getContent();
+                    
                     ed.windowManager.open({
-                         file: popup_post_url,
+                         file: url,
                          width: 760,
                          height: 500,
@@ -117 +119 @@
                
                // Register shortcuts
+               ed.addShortcut('ctrl+alt+c', 'dcControls.inlinecode_desc', 'dcCode');
                ed.addShortcut('ctrl+alt+q', 'dcControls.quote_desc', 'dcQuote');
                ed.addShortcut('ctrl+alt+l', 'dcControls.link_desc', 'dcExternalLink');
@@ -127 +130 @@
                     cm.setActive('inlinecode', n.nodeName == 'CODE' || ed.dom.getParent(n, 'CODE'));
                     cm.setActive('quote', n.nodeName == 'Q' || ed.dom.getParent(n, 'Q'));
-                    cm.setActive('postlink', n.nodeName == 'A' && !n.name);
+                    cm.setActive('postlink', n.nodeName == 'A' && n.href.indexOf(ed.settings.post_url_pattern) != -1);
                });
           },

inc/admin/lib.dc.page.php

@@ -565 +565 @@
                'convert_newlines_to_brs' => 'true',
                'paste_auto_cleanup_on_paste' => 'true',
-               'formats' => '{underline: {inline: "ins"},strikethrough: {inline: "del"},inlinecode: {inline: "code"},quote: {inline: "q"}}'
+               'formats' => '{underline: {inline: "ins"},strikethrough: {inline: "del"},inlinecode: {inline: "code"},quote: {inline: "q"}}',
+               'post_url_pattern' => $GLOBALS['core']->blog->getQMarkURL().$GLOBALS['core']->url->getBase('post')
           ));
           $tb->addPlugins('xhtml',array(