Changeset 445:c8fca536a9fb

Timestamp:

06/29/11 18:22:17 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Children:

466:71d37889bcfd, 593:b5ab1abd7721

Message:

Fixed encoding entities bug + initialize shortcuts

Files:

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

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

@@ -113 +113 @@
                });
                
+               // Init shortcuts
+               for (var s in ed.shortcuts) {
+                    delete ed.shortcuts[s];
+               }
                // Register shortcuts
-               ed.addShortcut('alt+shift+c', 'dcControls.inlinecode_desc', 'dcCode');
-               ed.addShortcut('alt+shift+q', 'dcControls.quote_desc', 'dcQuote');
-               ed.addShortcut('alt+shift+l', 'dcControls.link_desc', 'dcLink');
-               ed.addShortcut('alt+shift+i', 'dcControls.imglink_desc', 'dcImgLink');
-               ed.addShortcut('alt+shift+m', 'dcControls.media_desc', 'dcMedia');
-               ed.addShortcut('alt+shift+w', 'dcControls.media_desc', 'dcWebMedia');
+               ed.addShortcut('ctrl+alt+l', 'dcControls.link_desc', 'dcLink');
+               ed.addShortcut('ctrl+alt+m', 'dcControls.media_desc', 'dcMedia');
+               ed.addShortcut('ctrl+alt+w', 'dcControls.media_desc', 'dcWebMedia');
                
                // Register changes management

inc/admin/lib.dc.page.php

@@ -566 +566 @@
                'paste_auto_cleanup_on_paste' => 'true',
                'forced_root_block' => '',
-               '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"}}',
+               'entity_encoding' => 'raw'
           ));
           $tb->addPlugins('xhtml',array(