Changeset 17484

Show
Ignore:
Timestamp:
09/09/08 14:07:37 (3 months ago)
Author:
jbergius
Message:

Added markitup to datamanager2 and replaced Prototype based markdown editing with markitup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.helper.datamanager2/config/manifest.inc

    r17445 r17484  
    4747            'role' => 'developer', 
    4848        ), 
     49        'jbergius' => array 
     50        ( 
     51            'name' => 'Joonas Bergius', 
     52            'email' => 'joonas.bergius@gmail.com', 
     53            'role' => 'developer', 
     54        ), 
    4955    ), 
    5056    'dependencies' => array 

  • trunk/midcom/midcom.helper.datamanager2/widget/markdown.php

    r14329 r17484  
    7373            return false; 
    7474        } 
    75          
    76         $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/Pearified/JavaScript/Prototype/prototype.js'); 
    77         $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/control.textarea.js'); 
    78         $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/control.textarea.markdown.js'); 
     75 
     76        $_MIDCOM->enable_jquery(); 
     77        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/markitup/jquery.markitup.pack.js'); 
     78        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/markitup/sets/markdown/set.js'); 
    7979        $_MIDCOM->add_link_head 
    8080        ( 
    …… 
    8383                'rel' => 'stylesheet', 
    8484                'type' => 'text/css', 
    85                 'href' => MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/control.textarea.markdown.css', 
     85                'href' => MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/markitup/skins/markitup/style.css', 
    8686            ) 
    8787        ); 
     88        $_MIDCOM->add_link_head 
     89        ( 
     90            array 
     91            ( 
     92                'rel' => 'stylesheet', 
     93                'type' => 'text/css', 
     94                'href' => MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/markitup/sets/markdown/style.css', 
     95            ) 
     96        ); 
     97         
    8898        return true; 
    8999    } 
    …… 
    111121        $this->_form->applyFilter($this->name, 'trim'); 
    112122         
    113         $toolbar =& HTML_QuickForm::createElement('static', "{$this->name}_toolbar", '', "<script>{$this->name}_markdown_toolbar = new Control.TextArea.ToolBar.Markdown('{$this->_namespace}{$this->name}');\n</script>"); 
     123        $toolbar =& HTML_QUICKFORM::createElement('static', "{$this->name}_toolbar", '', "<script> jQuery('#{$this->_namespace}{$this->name}').markItUp(mySettings);\n</script>"); 
    114124        $elements[] =& $toolbar; 
    115125