Permalink
Browse files

MDL-38650 theme_mymobile: Convert to new jQuery support infrastructure.

  • Loading branch information...
gjb2048 committed Mar 25, 2013
1 parent 373a8e0 commit 42d79f551d5f948c25754e3d3dca56dc05cf6912
@@ -154,13 +154,6 @@
}
}
-// Add the required JavaScript to the page
-$THEME->javascripts = array(
- 'jquery-1.7.1.min',
- 'custom',
- 'jquery.mobile-1.1.1'
-);
-
// Sets a custom render factory to use with the theme, used when working with custom renderers.
$THEME->rendererfactory = 'theme_overridden_renderer_factory';
$THEME->csspostprocess = 'mymobile_user_settings';

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,42 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file describes jQuery plugins available in the moodle
+ * core component. These can be included in page using:
+ * $PAGE->requires->jquery();
+ * $PAGE->requires->jquery_plugin('migrate', 'core');
+ * $PAGE->requires->jquery_plugin('ui', 'core');
+ * $PAGE->requires->jquery_plugin('ui-css', 'core');
+ *
+ * Please note that other moodle plugins can not use the sample
+ * jquery plugin names, only one is loaded if collision detected.
+ *
+ * Any Moodle plugin may add jquery/plugins.php and include extra
+ * jQuery plugins.
+ *
+ * Themes or other plugin may blacklist any jquery plugin,
+ * for example to override default jQueryUI theme.
+ *
+ * @package core
+ * @copyright 2013 Petr Skoda {@link http://skodak.org}
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$plugins = array(
+ 'mymobile' => array('files' => array('custom.js')), // Do not forget to bump up version after modification!
+ 'mobile' => array('files' => array('jquery.mobile-1.1.1.js'))
+);
View
@@ -63,4 +63,11 @@ function mymobile_set_customcss($css, $customcss) {
$tag = '[[setting:customcss]]';
$css = str_replace($tag, $customcss, $css);
return $css;
+}
+
+function theme_mymobile_page_init(moodle_page $page) {
+ $page->requires->jquery();
+ $page->requires->jquery_plugin('migrate');
+ $page->requires->jquery_plugin('mymobile', 'theme_mymobile');
+ $page->requires->jquery_plugin('mobile', 'theme_mymobile');
}
@@ -635,6 +635,9 @@ public function header() {
$this->page->add_body_class('userloggedinas');
}
+ // Give themes a chance to init/alter the page object.
+ $this->page->theme->init_page($this->page);
+
$this->page->set_state(moodle_page::STATE_PRINTING_HEADER);
// Find the appropriate page layout file, based on $this->page->pagelayout.

0 comments on commit 42d79f5

Please sign in to comment.