From 053431aaf021b263715c433b3d852e959d6ff093 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 21 Nov 2009 02:22:30 +0000 Subject: [PATCH] MINOR Using jquery-latest.js in FileIframeField and RemoveOrphanedPagesTask git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92476 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/FileIFrameField.php | 4 ++-- tasks/RemoveOrphanedPagesTask.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forms/FileIFrameField.php b/forms/FileIFrameField.php index be13bebb2..4ce429639 100755 --- a/forms/FileIFrameField.php +++ b/forms/FileIFrameField.php @@ -51,7 +51,7 @@ class FileIFrameField extends FileField { public function Field() { Requirements::css(THIRDPARTY_DIR . '/jquery/themes/default/ui.all.css'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); + Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery-latest.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.dialog.js'); @@ -97,7 +97,7 @@ class FileIFrameField extends FileField { // clear the requirements added by any parent controllers Requirements::clear(); Requirements::add_i18n_javascript('sapphire/javascript/lang'); - Requirements::javascript('jsparty/jquery/jquery.js'); + Requirements::javascript('jsparty/jquery/jquery-latest.js'); Requirements::javascript('sapphire/javascript/FileIFrameField.js'); Requirements::css('cms/css/typography.css'); diff --git a/tasks/RemoveOrphanedPagesTask.php b/tasks/RemoveOrphanedPagesTask.php index 952c457e1..45301eab3 100644 --- a/tasks/RemoveOrphanedPagesTask.php +++ b/tasks/RemoveOrphanedPagesTask.php @@ -61,7 +61,7 @@ in the other stage:
} function index() { - Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); + Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery-latest.js'); Requirements::customCSS('#OrphanIDs .middleColumn {width: auto;}'); Requirements::customCSS('#OrphanIDs label {display: inline;}');