From 4988b546678f8a45a022b0b9e1c6be7f2ac483fb Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 11 Jun 2012 14:54:54 +0800 Subject: [PATCH] MDL-33317 Theme: added jQuery noConflict to myMobile --- theme/mymobile/config.php | 1 + theme/mymobile/javascript/jquery-noconflict.js | 1 + theme/mymobile/layout/embedded.php | 1 + 3 files changed, 3 insertions(+) create mode 100644 theme/mymobile/javascript/jquery-noconflict.js diff --git a/theme/mymobile/config.php b/theme/mymobile/config.php index f6bd2307219..3b0bc55fc04 100644 --- a/theme/mymobile/config.php +++ b/theme/mymobile/config.php @@ -156,6 +156,7 @@ if ($thisdevice == "default" || $thisdevice == "tablet" || optional_param('mymob // Add the required JavaScript to the page $THEME->javascripts = array( 'jquery-1.6.4.min', + 'jquery-noconflict', 'custom', 'jquery.mobile-1.0', 'scrollview', diff --git a/theme/mymobile/javascript/jquery-noconflict.js b/theme/mymobile/javascript/jquery-noconflict.js new file mode 100644 index 00000000000..aa32286f6a3 --- /dev/null +++ b/theme/mymobile/javascript/jquery-noconflict.js @@ -0,0 +1 @@ +jQuery.noConflict(); \ No newline at end of file diff --git a/theme/mymobile/layout/embedded.php b/theme/mymobile/layout/embedded.php index 172bc3dcdaa..5a0141073e1 100644 --- a/theme/mymobile/layout/embedded.php +++ b/theme/mymobile/layout/embedded.php @@ -36,6 +36,7 @@ if ($showswatch == "light") { $databodytheme = 'c'; } $mypagetype = $PAGE->pagetype; +$bodyclasses = array(); echo $OUTPUT->doctype() ?> htmlattributes() ?>>