mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX wrong jsparty PATH references
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63296 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
6afad36c39
commit
2c11afb2df
@ -187,7 +187,7 @@ class ContentController extends Controller {
|
||||
Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css');
|
||||
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
|
||||
// Requirements::javascript(THIRDPARTY_DIR . 'jsparty/prototype.js');
|
||||
// Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
||||
Requirements::customScript(<<<JS
|
||||
Behaviour.register({
|
||||
'#switchView a' : {
|
||||
|
@ -119,9 +119,9 @@ class DropdownField_WithAdd extends DropdownField {
|
||||
function Field() {
|
||||
|
||||
//Add these js file so that the DropdownField_WithAdd can work alone (in a webpage, rather than CMS).
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/prototype.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/behaviour.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/prototype_improvements.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
|
||||
Requirements::Javascript(SAPPHIRE_DIR . "/javascript/DropdownField_WithAdd.js");
|
||||
|
||||
$dropdown = parent::Field();
|
||||
|
@ -239,10 +239,10 @@ class TableListField extends FormField {
|
||||
|
||||
parent::__construct($name);
|
||||
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/prototype.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/behaviour.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/prototype_improvements.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/scriptaculous/effects.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
|
||||
Requirements::javascript(SAPPHIRE_DIR . '/javascript/TableListField.js');
|
||||
Requirements::css(SAPPHIRE_DIR . '/css/TableListField.css');
|
||||
}
|
||||
|
@ -360,11 +360,11 @@ class Security extends Controller {
|
||||
* @return string Returns the "lost password" page as HTML code.
|
||||
*/
|
||||
public function lostpassword() {
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/prototype.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/behaviour.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/loader.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/prototype_improvements.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/scriptaculous/effects.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
|
||||
|
||||
$tmpPage = new Page();
|
||||
$tmpPage->Title = _t('Security.LOSTPASSWORDHEADER', 'Lost Password');
|
||||
@ -410,11 +410,11 @@ class Security extends Controller {
|
||||
* @return string Returns the "password sent" page as HTML code.
|
||||
*/
|
||||
public function passwordsent($request) {
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/behaviour.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/loader.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/prototype.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/prototype_improvements.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . 'jsparty/scriptaculous/effects.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
|
||||
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
|
||||
|
||||
$tmpPage = new Page();
|
||||
$tmpPage->Title = _t('Security.LOSTPASSWORDHEADER');
|
||||
|
Loading…
Reference in New Issue
Block a user