Skip to content

Commit

Permalink
MINOR Moved EditorToolbar() from CMSMain to LeftAndMain (as we don't …
Browse files Browse the repository at this point in the history
…support loading link forms via ajax)
  • Loading branch information
chillu committed Jan 3, 2012
1 parent b4b6e5a commit 1ec694d
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions admin/code/LeftAndMain.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ function init() {
array(
THIRDPARTY_DIR . '/prototype/prototype.js',
THIRDPARTY_DIR . '/behaviour/behaviour.js',
SAPPHIRE_DIR . '/javascript/prototype_improvements.js',
THIRDPARTY_DIR . '/jquery/jquery.js',
SAPPHIRE_DIR . '/javascript/jquery_improvements.js',
THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js',
Expand Down Expand Up @@ -256,6 +257,8 @@ function init() {
SAPPHIRE_DIR . '/javascript/Validator.js',
SAPPHIRE_DIR . '/javascript/i18n.js',
SAPPHIRE_ADMIN_DIR . '/javascript/ssui.core.js',
SAPPHIRE_DIR . '/javascript/tiny_mce_improvements.js',
CMS_DIR . '/javascript/ThumbnailStripField.js',
)
);

Expand Down Expand Up @@ -974,6 +977,13 @@ public function doAdd($data, $form) {
return $this->redirect(Controller::join_links($this->Link('show'), $record->ID));
}
}

/**
* Return the CMS's HTML-editor toolbar
*/
public function EditorToolbar() {
return Object::create('HtmlEditorField_Toolbar', $this, "EditorToolbar");
}

/**
* Batch Actions Handler
Expand Down

0 comments on commit 1ec694d

Please sign in to comment.