diff --git a/admin/tool/customlang/db/upgrade.php b/admin/tool/customlang/db/upgrade.php index 489f887b67e..01f87e95159 100644 --- a/admin/tool/customlang/db/upgrade.php +++ b/admin/tool/customlang/db/upgrade.php @@ -54,5 +54,8 @@ function xmldb_tool_customlang_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/admin/tool/log/db/upgrade.php b/admin/tool/log/db/upgrade.php index da2a60c2299..2a4eab3c23b 100644 --- a/admin/tool/log/db/upgrade.php +++ b/admin/tool/log/db/upgrade.php @@ -52,5 +52,8 @@ function xmldb_tool_log_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/admin/tool/log/store/database/db/upgrade.php b/admin/tool/log/store/database/db/upgrade.php index f12d84474cc..565efedde4e 100644 --- a/admin/tool/log/store/database/db/upgrade.php +++ b/admin/tool/log/store/database/db/upgrade.php @@ -42,5 +42,8 @@ function xmldb_logstore_database_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/admin/tool/log/store/standard/db/upgrade.php b/admin/tool/log/store/standard/db/upgrade.php index 0fa6a8f467d..9b4247b9a4a 100644 --- a/admin/tool/log/store/standard/db/upgrade.php +++ b/admin/tool/log/store/standard/db/upgrade.php @@ -120,5 +120,8 @@ function xmldb_logstore_standard_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/admin/tool/monitor/db/upgrade.php b/admin/tool/monitor/db/upgrade.php index ffb1750fa44..f02556d4a3e 100644 --- a/admin/tool/monitor/db/upgrade.php +++ b/admin/tool/monitor/db/upgrade.php @@ -56,5 +56,8 @@ function xmldb_tool_monitor_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/auth/cas/db/upgrade.php b/auth/cas/db/upgrade.php index f3abc3469fb..bca88a4ff61 100644 --- a/auth/cas/db/upgrade.php +++ b/auth/cas/db/upgrade.php @@ -74,5 +74,8 @@ function xmldb_auth_cas_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/auth/ldap/db/upgrade.php b/auth/ldap/db/upgrade.php index e73f92947b9..3a320e36836 100644 --- a/auth/ldap/db/upgrade.php +++ b/auth/ldap/db/upgrade.php @@ -64,5 +64,8 @@ function xmldb_auth_ldap_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/auth/manual/db/upgrade.php b/auth/manual/db/upgrade.php index e306b6abed3..3039953d649 100644 --- a/auth/manual/db/upgrade.php +++ b/auth/manual/db/upgrade.php @@ -56,5 +56,8 @@ function xmldb_auth_manual_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/auth/mnet/db/upgrade.php b/auth/mnet/db/upgrade.php index 5d2cb16903d..0090939edcd 100644 --- a/auth/mnet/db/upgrade.php +++ b/auth/mnet/db/upgrade.php @@ -56,5 +56,8 @@ function xmldb_auth_mnet_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/blocks/badges/db/upgrade.php b/blocks/badges/db/upgrade.php index 64c2e5d4f39..a9ff3a15dd5 100644 --- a/blocks/badges/db/upgrade.php +++ b/blocks/badges/db/upgrade.php @@ -79,5 +79,8 @@ function xmldb_block_badges_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/blocks/calendar_month/db/upgrade.php b/blocks/calendar_month/db/upgrade.php index 589c7060d8a..c83b12ada53 100644 --- a/blocks/calendar_month/db/upgrade.php +++ b/blocks/calendar_month/db/upgrade.php @@ -79,5 +79,8 @@ function xmldb_block_calendar_month_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/blocks/calendar_upcoming/db/upgrade.php b/blocks/calendar_upcoming/db/upgrade.php index f3c8e4e3626..08364090e5f 100644 --- a/blocks/calendar_upcoming/db/upgrade.php +++ b/blocks/calendar_upcoming/db/upgrade.php @@ -79,5 +79,8 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/blocks/community/db/upgrade.php b/blocks/community/db/upgrade.php index c6002aa6aa5..bcc82dc28f9 100644 --- a/blocks/community/db/upgrade.php +++ b/blocks/community/db/upgrade.php @@ -69,5 +69,8 @@ function xmldb_block_community_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/blocks/completionstatus/db/upgrade.php b/blocks/completionstatus/db/upgrade.php index bce3229fc10..070ebcc6217 100644 --- a/blocks/completionstatus/db/upgrade.php +++ b/blocks/completionstatus/db/upgrade.php @@ -76,5 +76,8 @@ function xmldb_block_completionstatus_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } \ No newline at end of file diff --git a/blocks/course_summary/db/upgrade.php b/blocks/course_summary/db/upgrade.php index b7c389a9686..0c1549e7518 100644 --- a/blocks/course_summary/db/upgrade.php +++ b/blocks/course_summary/db/upgrade.php @@ -80,5 +80,8 @@ function xmldb_block_course_summary_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } \ No newline at end of file diff --git a/blocks/html/db/upgrade.php b/blocks/html/db/upgrade.php index 24776aef3d8..ff87abfc02b 100644 --- a/blocks/html/db/upgrade.php +++ b/blocks/html/db/upgrade.php @@ -56,5 +56,8 @@ function xmldb_block_html_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/blocks/navigation/db/upgrade.php b/blocks/navigation/db/upgrade.php index 2f7240b932c..6ea92684726 100644 --- a/blocks/navigation/db/upgrade.php +++ b/blocks/navigation/db/upgrade.php @@ -81,5 +81,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } \ No newline at end of file diff --git a/blocks/quiz_results/db/upgrade.php b/blocks/quiz_results/db/upgrade.php index d7edead642e..ec753c97bd5 100644 --- a/blocks/quiz_results/db/upgrade.php +++ b/blocks/quiz_results/db/upgrade.php @@ -104,5 +104,8 @@ function xmldb_block_quiz_results_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } \ No newline at end of file diff --git a/blocks/recent_activity/db/upgrade.php b/blocks/recent_activity/db/upgrade.php index 6a12a7a259e..8d0f8935866 100644 --- a/blocks/recent_activity/db/upgrade.php +++ b/blocks/recent_activity/db/upgrade.php @@ -90,5 +90,8 @@ function xmldb_block_recent_activity_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/blocks/rss_client/db/upgrade.php b/blocks/rss_client/db/upgrade.php index afc2b80d218..cf8294e831a 100644 --- a/blocks/rss_client/db/upgrade.php +++ b/blocks/rss_client/db/upgrade.php @@ -50,5 +50,8 @@ function xmldb_block_rss_client_upgrade($oldversion) { upgrade_block_savepoint(true, 2015071700, 'rss_client'); } + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/blocks/section_links/db/upgrade.php b/blocks/section_links/db/upgrade.php index 16d38de4fde..057f2752fa3 100644 --- a/blocks/section_links/db/upgrade.php +++ b/blocks/section_links/db/upgrade.php @@ -92,5 +92,8 @@ function xmldb_block_section_links_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/blocks/selfcompletion/db/upgrade.php b/blocks/selfcompletion/db/upgrade.php index 79721a180b1..e79331c6338 100644 --- a/blocks/selfcompletion/db/upgrade.php +++ b/blocks/selfcompletion/db/upgrade.php @@ -80,5 +80,8 @@ function xmldb_block_selfcompletion_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } \ No newline at end of file diff --git a/blocks/settings/db/upgrade.php b/blocks/settings/db/upgrade.php index 584ed9d18a9..b1cf6f8bc2e 100644 --- a/blocks/settings/db/upgrade.php +++ b/blocks/settings/db/upgrade.php @@ -81,5 +81,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } \ No newline at end of file diff --git a/enrol/database/db/upgrade.php b/enrol/database/db/upgrade.php index 450eaef8adf..d1eb164670e 100644 --- a/enrol/database/db/upgrade.php +++ b/enrol/database/db/upgrade.php @@ -53,5 +53,8 @@ function xmldb_enrol_database_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/enrol/flatfile/db/upgrade.php b/enrol/flatfile/db/upgrade.php index 8ad41f99292..ebe5dd78245 100644 --- a/enrol/flatfile/db/upgrade.php +++ b/enrol/flatfile/db/upgrade.php @@ -54,5 +54,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/enrol/guest/db/upgrade.php b/enrol/guest/db/upgrade.php index ccd51b1fb40..8ae20049c90 100644 --- a/enrol/guest/db/upgrade.php +++ b/enrol/guest/db/upgrade.php @@ -63,6 +63,9 @@ function xmldb_enrol_guest_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/enrol/imsenterprise/db/upgrade.php b/enrol/imsenterprise/db/upgrade.php index eb1f8edaa0e..7fb9ea32f9e 100644 --- a/enrol/imsenterprise/db/upgrade.php +++ b/enrol/imsenterprise/db/upgrade.php @@ -56,5 +56,8 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/enrol/manual/db/upgrade.php b/enrol/manual/db/upgrade.php index db7d1829c96..7b98f19124a 100644 --- a/enrol/manual/db/upgrade.php +++ b/enrol/manual/db/upgrade.php @@ -72,6 +72,9 @@ function xmldb_enrol_manual_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2015091500, 'enrol', 'manual'); } + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/enrol/mnet/db/upgrade.php b/enrol/mnet/db/upgrade.php index dea1555faec..e66d6ec26c9 100644 --- a/enrol/mnet/db/upgrade.php +++ b/enrol/mnet/db/upgrade.php @@ -55,5 +55,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/enrol/paypal/db/upgrade.php b/enrol/paypal/db/upgrade.php index 01a129159f3..faf51dc318c 100644 --- a/enrol/paypal/db/upgrade.php +++ b/enrol/paypal/db/upgrade.php @@ -70,5 +70,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/enrol/self/db/upgrade.php b/enrol/self/db/upgrade.php index eac4712b48d..62cb0dfa464 100644 --- a/enrol/self/db/upgrade.php +++ b/enrol/self/db/upgrade.php @@ -71,6 +71,9 @@ function xmldb_enrol_self_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/filter/mathjaxloader/db/upgrade.php b/filter/mathjaxloader/db/upgrade.php index 68a9316fba5..eb1e4cd56e7 100644 --- a/filter/mathjaxloader/db/upgrade.php +++ b/filter/mathjaxloader/db/upgrade.php @@ -109,5 +109,8 @@ MathJax.Hub.Config({ // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/filter/mediaplugin/db/upgrade.php b/filter/mediaplugin/db/upgrade.php index adfa7db7a46..3e37445315d 100644 --- a/filter/mediaplugin/db/upgrade.php +++ b/filter/mediaplugin/db/upgrade.php @@ -78,5 +78,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/filter/tex/db/upgrade.php b/filter/tex/db/upgrade.php index b08a9e5374e..703a7d400a8 100644 --- a/filter/tex/db/upgrade.php +++ b/filter/tex/db/upgrade.php @@ -74,5 +74,8 @@ function xmldb_filter_tex_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/grade/grading/form/rubric/db/upgrade.php b/grade/grading/form/rubric/db/upgrade.php index 81949608f6b..a40da47ac60 100644 --- a/grade/grading/form/rubric/db/upgrade.php +++ b/grade/grading/form/rubric/db/upgrade.php @@ -62,5 +62,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php index 15954dc669a..a367aee8d15 100644 --- a/grade/report/overview/index.php +++ b/grade/report/overview/index.php @@ -36,6 +36,7 @@ if (!$course = $DB->get_record('course', array('id' => $courseid))) { print_error('nocourseid'); } require_login(null, false); +$PAGE->set_course($course); $context = context_course::instance($course->id); $systemcontext = context_system::instance(); diff --git a/grade/report/user/db/upgrade.php b/grade/report/user/db/upgrade.php index b4627efa651..f79d0d1602c 100644 --- a/grade/report/user/db/upgrade.php +++ b/grade/report/user/db/upgrade.php @@ -42,5 +42,8 @@ function xmldb_gradereport_user_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/lib/behat/classes/behat_selectors.php b/lib/behat/classes/behat_selectors.php index add2130ec74..4b85386dbb6 100644 --- a/lib/behat/classes/behat_selectors.php +++ b/lib/behat/classes/behat_selectors.php @@ -131,7 +131,7 @@ XPATH [./descendant::*[self::h2][normalize-space(.) = %locator%] or %locator% = 'frontpage'] XPATH , 'table' => << <<'),this.toolbar.append(n)),n}}}}),e.namespace("M.editor_atto").EditorPlugin=n;var s='',o="disabled",u="highlight",a="moodle-editor_atto-editor-plugin",f={EDITORWRAPPER:".editor_atto_content"};l.ATTRS={},l.prototype={buttons:null,buttonNames:null,buttonStates:null,menus:null,DISABLED:0,ENABLED:1,_buttonHandlers:null,_menuHideHandlers:null,_primaryKeyboardShortcut:null,_highlightQueue:null,addButton:function(t){var n=this.get("group"),r=this.name,i="atto_"+r+"_button",s,o=this.get("host");t.exec&&(i=i+"_"+t.exec),t.buttonName?i=i+"_"+t.buttonName:t.buttonName=t.exec||r,t.buttonClass=i,t=this._normalizeIcon(t),t.title||(t.title="pluginname");var u=M.util.get_string(t.title,"atto_"+r);s=e.Node.create('"),s.setAttribute("title",u),n.append(s);var a=this.toolbar.getAttribute("aria-activedescendant");a||(s.setAttribute("tabindex","0"),this.toolbar.setAttribute("aria-activedescendant",s.generateID()),this.get("host")._tabFocus=s),t=this._normalizeCallback(t),this._buttonHandlers.push(this.toolbar.delegate("click",t.callback,"."+i,this)),t.keys&&(typeof t.keyDescription!="undefined"&&(this._primaryKeyboardShortcut[i]=t.keyDescription),this._addKeyboardListener(t.callback,t.keys,i),this._primaryKeyboardShortcut[i]&&s.setAttribute("title",M.util.get_string("plugin_title_shortcut","editor_atto",{title:u,shortcut:this._primaryKeyboardShortcut[i]})));if(t.tags){var f=!0;typeof t.tagMatchRequiresAll=="boolean"&&(f=t.tagMatchRequiresAll),this._buttonHandlers.push(o.on(["atto:selectionchanged","change"],function(n){typeof this._highlightQueue[t.buttonName]!="undefined"&&this._highlightQueue[t.buttonName].cancel(),this._highlightQueue[t.buttonName]=e.soon(e.bind(function(e){o.selectionFilterMatches(t.tags,e.selectedNodes,f)?this.highlightButtons(t.buttonName):this.unHighlightButtons(t.buttonName)},this,n))},this))}return this.buttonNames.push(t.buttonName),this.buttons[t.buttonName]=s,this.buttonStates[t.buttonName]=this.ENABLED,s},addBasicButton:function(e){return e.exec?(e.icon||(e.icon="e/"+e.exec),e.callback=function(){document.execCommand(e.exec,!1,null),this.markUpdated()},this.addButton(e)):null},addToolbarMenu:function(t){var n=this.get("group"),r=this.name,i="atto_"+r+"_button",o,u;t.buttonName?i=i+"_"+t.buttonName:t.buttonName=r,t.buttonClass=i,t=this._normalizeIcon(t),t.title||(t.title="pluginname");var a=M.util.get_string(t.title,"atto_"+r);t.menuColor||(t.menuColor="transparent");var f=e.Handlebars.compile(s);return o=e.Node.create(f({buttonClass:i,config:t,title:a})),n.append(o),u=this.toolbar.getAttribute("aria-activedescendant"),u||(o.setAttribute("tabindex","0"),this.toolbar.setAttribute("aria-activedescendant",o.generateID())),this._buttonHandlers.push(this.toolbar.delegate("click",this._showToolbarMenu,"."+i,this,t),this.toolbar.delegate("key",this._showToolbarMenuAndFocus,"40, 32, enter","."+i,this,t)),this.buttonNames.push(t.buttonName),this.buttons[t.buttonName]=o,this.buttonStates[t.buttonName]=this.ENABLED,o},_showToolbarMenu:function(t,n){t.preventDefault();if(!this.isEnabled())return;if(t.currentTarget.ancestor("button",!0).hasAttribute(o))return;var r;this.menus[n.buttonClass]||(n.overlayWidth||(n.overlayWidth="14"),n.innerOverlayWidth||(n.innerOverlayWidth=parseInt(n.overlayWidth,10)-2+"em"),n.overlayWidth=parseInt(n.overlayWidth,10)+"em",this.menus[n.buttonClass]=new e.M.editor_atto.Menu(n),this.menus[n.buttonClass].get("contentBox").delegate("click",this._chooseMenuItem,".atto_menuentry a",this,n)),e.Array.each(this.get("host").openMenus,function(e){e.set("focusAfterHide",null)});var i=this.buttons[n.buttonName];i.focus(),this.get("host")._setTabFocus(i),r=this.menus[n.buttonClass],r.set("focusAfterHide",i),r.show(),r.align(this.buttons[n.buttonName],[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),this.get("host").openMenus=[r]},_showToolbarMenuAndFocus:function(e,t){this._showToolbarMenu(e,t),this.menus[t.buttonClass].get("boundingBox").one("a").focus()},_chooseMenuItem:function(e,t,n){var r=e.target.ancestor("a",!0).getData("index"),i=this._normalizeCallback(t.items[r],t.globalItemConfig);n=this.menus[t.buttonClass],n.set("preventHideMenu",!0),i.callback(e,i._callback,i.callbackArgs),n.set("preventHideMenu",!1),n.set("focusAfterHide",this.get("host").editor),n.hide(e)},_normalizeCallback:function(t,n){return t._callbackNormalized?t:(n||(n={}),t.inlineFormat=t.inlineFormat||n.inlineFormat,t._inlineCallback=t.callback||n.callback,t._callback=t.callback||n.callback,t.inlineFormat&&typeof t._inlineCallback=="function"&&(t._callback=function(e,n){this.get("host").applyFormat(e,t._inlineCallback,this,n)}),t.callback=e.rbind(this._callbackWrapper,this,t._callback,t.callbackArgs),t._callbackNormalized=!0 -,t)},_normalizeIcon:function(e){return e.iconurl||(e.iconComponent||(e.iconComponent="core"),e.iconurl=M.util.image_url(e.icon,e.iconComponent)),e},_callbackWrapper:function(e,t,n){e.preventDefault();if(!this.isEnabled())return;var r=e.currentTarget.ancestor("button",!0);if(r&&r.hasAttribute(o))return;!YUI.Env.UA.android&&!this.get("host").isActive()&&this.get("host").focus(),this.get("host").saveSelection(),r&&this.get("host")._setTabFocus(r);var i=[e,n];return this.get("host").restoreSelection(),t.apply(this,i)},_addKeyboardListener:function(t,n,r){var i="key",s=f.EDITORWRAPPER,o,u,a;if(e.Lang.isArray(n))return e.Array.each(n,function(e){this._addKeyboardListener(t,e)},this),this;typeof n=="object"?(n.eventtype&&(i=n.eventtype),n.container&&(s=n.container),o=n.keyCodes,u=t):(a=this._getDefaultMetaKey(),o=this._getKeyEvent()+n+"+"+a,typeof this._primaryKeyboardShortcut[r]=="undefined"&&(this._primaryKeyboardShortcut[r]=this._getDefaultMetaKeyDescription(n)),u=e.bind(function(e,n){this._eventUsesExactKeyModifiers(e,n)&&t.apply(this,[n])},this,[a])),this._buttonHandlers.push(this.editor.delegate(i,u,o,s,this))},_eventUsesExactKeyModifiers:function(t,n){var r=!0,i;return n.type!=="key"?!1:(i=e.Array.indexOf(t,"alt")>-1,r=r&&(n.altKey&&i||!n.altKey&&!i),i=e.Array.indexOf(t,"ctrl")>-1,r=r&&(n.ctrlKey&&i||!n.ctrlKey&&!i),i=e.Array.indexOf(t,"meta")>-1,r=r&&(n.metaKey&&i||!n.metaKey&&!i),i=e.Array.indexOf(t,"shift")>-1,r=r&&(n.shiftKey&&i||!n.shiftKey&&!i),r)},isEnabled:function(){var t=e.Object.some(this.buttonStates,function(e){return e===this.ENABLED},this);return t},disableButtons:function(e){return this._setButtonState(!1,e)},enableButtons:function(e){return this._setButtonState(!0,e)},_setButtonState:function(t,n){var r="setAttribute";return t&&(r="removeAttribute"),n?this.buttons[n]&&(this.buttons[n][r](o,o),this.buttonStates[n]=t?this.ENABLED:this.DISABLED):e.Array.each(this.buttonNames,function(e){this.buttons[e][r](o,o),this.buttonStates[e]=t?this.ENABLED:this.DISABLED},this),this.get("host").checkTabFocus(),this},highlightButtons:function(e){return this._changeButtonHighlight(!0,e)},unHighlightButtons:function(e){return this._changeButtonHighlight(!1,e)},_changeButtonHighlight:function(t,n){var r="addClass";return t||(r="removeClass"),n?this.buttons[n]&&this.buttons[n][r](u):e.Object.each(this.buttons,function(e){e[r](u)},this),this},_getDefaultMetaKey:function(){return e.UA.os==="macintosh"?"meta":"ctrl"},_getDefaultMetaKeyDescription:function(t){return e.UA.os==="macintosh"?M.util.get_string("editor_command_keycode","editor_atto",String.fromCharCode(t).toLowerCase()):M.util.get_string("editor_control_keycode","editor_atto",String.fromCharCode(t).toLowerCase())},_getKeyEvent:function(){return"down:"}},e.Base.mix(e.M.editor_atto.EditorPlugin,[l]),c.ATTRS={},c.prototype={_dialogue:null,getDialogue:function(t){t=t||{};var n=!1;t.focusAfterHide&&(n=t.focusAfterHide,delete t.focusAfterHide);if(!this._dialogue){var r=e.merge({visible:!1,modal:!0,close:!0,draggable:!0},t);this._dialogue=new M.core.dialogue(r)}return n!==!1&&(n===!0?this._dialogue.set("focusAfterHide",this.buttons[this.buttonNames[0]]):typeof n=="string"?this._dialogue.set("focusAfterHide",this.buttons[n]):this._dialogue.set("focusAfterHide",n)),this._dialogue}},e.Base.mix(e.M.editor_atto.EditorPlugin,[c])},"@VERSION@",{requires:["node","base","escape","event","event-outside","handlebars","event-custom","timers"]}); +,t)},_normalizeIcon:function(e){return e.iconurl||(e.iconComponent||(e.iconComponent="core"),e.iconurl=M.util.image_url(e.icon,e.iconComponent)),e},_callbackWrapper:function(e,t,n){e.preventDefault();if(!this.isEnabled())return;var r=e.currentTarget.ancestor("button",!0);if(r&&r.hasAttribute(o))return;!YUI.Env.UA.android&&!this.get("host").isActive()&&this.get("host").focus(),this.get("host").saveSelection(),r&&this.get("host")._setTabFocus(r);var i=[e,n];return this.get("host").restoreSelection(),t.apply(this,i)},_addKeyboardListener:function(t,n,r){var i="key",s=f.EDITORWRAPPER,o,u,a;if(e.Lang.isArray(n))return e.Array.each(n,function(e){this._addKeyboardListener(t,e)},this),this;typeof n=="object"?(n.eventtype&&(i=n.eventtype),n.container&&(s=n.container),o=n.keyCodes,u=t):(a=this._getDefaultMetaKey(),o=this._getKeyEvent()+n+"+"+a,typeof this._primaryKeyboardShortcut[r]=="undefined"&&(this._primaryKeyboardShortcut[r]=this._getDefaultMetaKeyDescription(n)),u=e.bind(function(e,n){this._eventUsesExactKeyModifiers(e,n)&&t.apply(this,[n])},this,[a])),this._buttonHandlers.push(this.editor.delegate(i,u,o,s,this))},_eventUsesExactKeyModifiers:function(t,n){var r=!0,i;return n.type!=="key"?!1:(i=e.Array.indexOf(t,"alt")>-1,r=r&&(n.altKey&&i||!n.altKey&&!i),i=e.Array.indexOf(t,"ctrl")>-1,r=r&&(n.ctrlKey&&i||!n.ctrlKey&&!i),i=e.Array.indexOf(t,"meta")>-1,r=r&&(n.metaKey&&i||!n.metaKey&&!i),i=e.Array.indexOf(t,"shift")>-1,r=r&&(n.shiftKey&&i||!n.shiftKey&&!i),r)},isEnabled:function(){var t=e.Object.some(this.buttonStates,function(e){return e===this.ENABLED},this);return t},disableButtons:function(e){return this._setButtonState(!1,e)},enableButtons:function(e){return this._setButtonState(!0,e)},_setButtonState:function(t,n){var r="setAttribute";return t&&(r="removeAttribute"),n?this.buttons[n]&&(this.buttons[n][r](o,o),this.buttonStates[n]=t?this.ENABLED:this.DISABLED):e.Array.each(this.buttonNames,function(e){this.buttons[e][r](o,o),this.buttonStates[e]=t?this.ENABLED:this.DISABLED},this),this.get("host").checkTabFocus(),this},highlightButtons:function(e){return this._changeButtonHighlight(!0,e)},unHighlightButtons:function(e){return this._changeButtonHighlight(!1,e)},_changeButtonHighlight:function(t,n){var r="addClass";return t||(r="removeClass"),n?this.buttons[n]&&this.buttons[n][r](u):e.Object.each(this.buttons,function(e){e[r](u)},this),this},_getDefaultMetaKey:function(){return e.UA.os==="macintosh"?"meta":"ctrl"},_getDefaultMetaKeyDescription:function(t){return e.UA.os==="macintosh"?M.util.get_string("editor_command_keycode","editor_atto",String.fromCharCode(t).toLowerCase()):M.util.get_string("editor_control_keycode","editor_atto",String.fromCharCode(t).toLowerCase())},_getKeyEvent:function(){return"down:"}},e.Base.mix(e.M.editor_atto.EditorPlugin,[l]),c.ATTRS={},c.prototype={_dialogue:null,getDialogue:function(t){t=t||{};var n=!1;t.focusAfterHide&&(n=t.focusAfterHide,delete t.focusAfterHide);if(!this._dialogue){var r=e.merge({visible:!1,modal:!0,close:!0,draggable:!0},t);this._dialogue=new M.core.dialogue(r)}return n!==!1&&(n===!0?this._dialogue.set("focusAfterHide",this.buttons[this.buttonNames[0]]):typeof n=="string"?this._dialogue.set("focusAfterHide",this.buttons[n]):this._dialogue.set("focusAfterHide",n)),this._dialogue}},e.Base.mix(e.M.editor_atto.EditorPlugin,[c])},"@VERSION@",{requires:["node","base","escape","event","event-outside","handlebars","event-custom","timers","moodle-editor_atto-menu"]}); diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js b/lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js index 6cedbfa2b8d..e436da555c7 100644 --- a/lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js +++ b/lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js @@ -1177,4 +1177,16 @@ EditorPluginDialogue.prototype = { Y.Base.mix(Y.M.editor_atto.EditorPlugin, [EditorPluginDialogue]); -}, '@VERSION@', {"requires": ["node", "base", "escape", "event", "event-outside", "handlebars", "event-custom", "timers"]}); +}, '@VERSION@', { + "requires": [ + "node", + "base", + "escape", + "event", + "event-outside", + "handlebars", + "event-custom", + "timers", + "moodle-editor_atto-menu" + ] +}); diff --git a/lib/editor/atto/yui/src/editor/meta/editor.json b/lib/editor/atto/yui/src/editor/meta/editor.json index c9907150ee8..a8f9ff38c63 100644 --- a/lib/editor/atto/yui/src/editor/meta/editor.json +++ b/lib/editor/atto/yui/src/editor/meta/editor.json @@ -27,7 +27,8 @@ "event-outside", "handlebars", "event-custom", - "timers" + "timers", + "moodle-editor_atto-menu" ] }, "moodle-editor_atto-menu": { diff --git a/lib/editor/tinymce/db/upgrade.php b/lib/editor/tinymce/db/upgrade.php index 73127cd5e29..6323f52b99c 100644 --- a/lib/editor/tinymce/db/upgrade.php +++ b/lib/editor/tinymce/db/upgrade.php @@ -184,5 +184,8 @@ fontselect,fontsizeselect,wrap,code,search,replace,wrap,nonbreaking,charmap,tabl // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php b/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php index 099897678d2..021ab457258 100644 --- a/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php +++ b/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php @@ -56,5 +56,8 @@ function xmldb_tinymce_spellchecker_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/lib/enrollib.php b/lib/enrollib.php index c69fb391ea7..426c9a26c92 100644 --- a/lib/enrollib.php +++ b/lib/enrollib.php @@ -452,7 +452,7 @@ function enrol_add_course_navigation(navigation_node $coursenode, $course) { } } // Check role permissions - if (has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride','moodle/role:override', 'moodle/role:assign'), $coursecontext)) { + if (has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override'), $coursecontext)) { $url = new moodle_url('/admin/roles/check.php', array('contextid'=>$coursecontext->id)); $permissionsnode->add(get_string('checkpermissions', 'role'), $url, navigation_node::TYPE_SETTING, null, 'permissions', new pix_icon('i/checkpermissions', '')); } diff --git a/lib/flowplayer/lib.php b/lib/flowplayer/lib.php index fa15b381dda..f9206c46447 100644 --- a/lib/flowplayer/lib.php +++ b/lib/flowplayer/lib.php @@ -36,7 +36,7 @@ function flowplayer_send_flash_content($filename) { // Note: Do not use any fancy APIs here, this must work in all supported versions. // No url params. - if (!empty($_GET) or !empty($_POST) or !empty($_REQUEST)) { + if (!empty($_GET) or !empty($_POST)) { header("HTTP/1.1 404 Not Found"); die; } diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php index a3d7233054b..2321e4abafa 100644 --- a/lib/phpunit/classes/util.php +++ b/lib/phpunit/classes/util.php @@ -131,6 +131,7 @@ class phpunit_util extends testing_util { } $resetdb = self::reset_database(); + $localename = self::get_locale_name(); $warnings = array(); if ($detectchanges === true) { @@ -163,14 +164,8 @@ class phpunit_util extends testing_util { $warnings[] = 'Warning: unexpected change of $COURSE'; } - if ($CFG->ostype === 'WINDOWS') { - if (setlocale(LC_TIME, 0) !== 'English_Australia.1252') { - $warnings[] = 'Warning: unexpected change of locale'; - } - } else { - if (setlocale(LC_TIME, 0) !== 'en_AU.UTF-8') { - $warnings[] = 'Warning: unexpected change of locale'; - } + if (setlocale(LC_TIME, 0) !== $localename) { + $warnings[] = 'Warning: unexpected change of locale'; } } @@ -262,11 +257,7 @@ class phpunit_util extends testing_util { core_date::phpunit_reset(); // Make sure the time locale is consistent - that is Australian English. - if ($CFG->ostype === 'WINDOWS') { - setlocale(LC_TIME, 'English_Australia.1252'); - } else { - setlocale(LC_TIME, 'en_AU.UTF-8'); - } + setlocale(LC_TIME, $localename); // verify db writes just in case something goes wrong in reset if (self::$lastdbwrites != $DB->perf_get_writes()) { @@ -362,6 +353,11 @@ class phpunit_util extends testing_util { public static function testing_ready_problem() { global $DB; + $localename = self::get_locale_name(); + if (setlocale(LC_TIME, $localename) === false) { + return array(PHPUNIT_EXITCODE_CONFIGERROR, "Required locale '$localename' is not installed."); + } + if (!self::is_test_site()) { // dataroot was verified in bootstrap, so it must be DB return array(PHPUNIT_EXITCODE_CONFIGERROR, 'Can not use database for testing, try different prefix'); @@ -798,4 +794,19 @@ class phpunit_util extends testing_util { self::$eventsink->add_event($event); } } + + /** + * Gets the name of the locale for testing environment (Australian English) + * depending on platform environment. + * + * @return string the locale name. + */ + protected static function get_locale_name() { + global $CFG; + if ($CFG->ostype === 'WINDOWS') { + return 'English_Australia.1252'; + } else { + return 'en_AU.UTF-8'; + } + } } diff --git a/message/output/email/db/upgrade.php b/message/output/email/db/upgrade.php index a8178e746ff..4d9e1d4953d 100644 --- a/message/output/email/db/upgrade.php +++ b/message/output/email/db/upgrade.php @@ -60,6 +60,9 @@ function xmldb_message_email_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/message/output/jabber/db/upgrade.php b/message/output/jabber/db/upgrade.php index 80d88a1d2ea..a42641f0b82 100644 --- a/message/output/jabber/db/upgrade.php +++ b/message/output/jabber/db/upgrade.php @@ -60,6 +60,9 @@ function xmldb_message_jabber_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php index df7ff9a60bb..50353b6f1c6 100644 --- a/message/output/popup/db/upgrade.php +++ b/message/output/popup/db/upgrade.php @@ -60,6 +60,9 @@ function xmldb_message_popup_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/mod/assign/db/upgrade.php b/mod/assign/db/upgrade.php index 2c51e85372b..2debb16447e 100644 --- a/mod/assign/db/upgrade.php +++ b/mod/assign/db/upgrade.php @@ -646,5 +646,8 @@ function xmldb_assign_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/mod/assign/feedback/comments/db/upgrade.php b/mod/assign/feedback/comments/db/upgrade.php index 7255de7c3fc..30cb8e9cb12 100644 --- a/mod/assign/feedback/comments/db/upgrade.php +++ b/mod/assign/feedback/comments/db/upgrade.php @@ -50,5 +50,8 @@ function xmldb_assignfeedback_comments_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/mod/assign/feedback/editpdf/db/upgrade.php b/mod/assign/feedback/editpdf/db/upgrade.php index d2742a244bc..89d6e74b501 100644 --- a/mod/assign/feedback/editpdf/db/upgrade.php +++ b/mod/assign/feedback/editpdf/db/upgrade.php @@ -76,5 +76,8 @@ function xmldb_assignfeedback_editpdf_upgrade($oldversion) { // Moodle v2.9.0 release upgrade line. // Put any upgrade step following this. + // Moodle v3.0.0 release upgrade line. + // Put any upgrade step following this. + return true; } diff --git a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js index 565dd2d0c65..286c0f3910e 100644 --- a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js +++ b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js @@ -26,23 +26,23 @@ var AJAXBASE = M.cfg.wwwroot + '/mod/assign/feedback/editpdf/ajax.php', DIALOGUE : 'assignfeedback_editpdf_widget' }, SELECTOR = { - PREVIOUSBUTTON : '.' + CSS.DIALOGUE + ' .navigate-previous-button', - NEXTBUTTON : '.' + CSS.DIALOGUE + ' .navigate-next-button', - SEARCHCOMMENTSBUTTON : '.' + CSS.DIALOGUE + ' .searchcommentsbutton', + PREVIOUSBUTTON : '.navigate-previous-button', + NEXTBUTTON : ' .navigate-next-button', + SEARCHCOMMENTSBUTTON : '.searchcommentsbutton', SEARCHFILTER : '.assignfeedback_editpdf_commentsearch input', SEARCHCOMMENTSLIST : '.assignfeedback_editpdf_commentsearch ul', - PAGESELECT : '.' + CSS.DIALOGUE + ' .navigate-page-select', - LOADINGICON : '.' + CSS.DIALOGUE + ' .loading', - PROGRESSBARCONTAINER : '.' + CSS.DIALOGUE + ' .progress-info.progress-striped', - DRAWINGREGION : '.' + CSS.DIALOGUE + ' .drawingregion', - DRAWINGCANVAS : '.' + CSS.DIALOGUE + ' .drawingcanvas', - SAVE : '.' + CSS.DIALOGUE + ' .savebutton', - COMMENTCOLOURBUTTON : '.' + CSS.DIALOGUE + ' .commentcolourbutton', - COMMENTMENU : ' .commentdrawable a', - ANNOTATIONCOLOURBUTTON : '.' + CSS.DIALOGUE + ' .annotationcolourbutton', - DELETEANNOTATIONBUTTON : '.' + CSS.DIALOGUE + ' .deleteannotationbutton', + PAGESELECT : '.navigate-page-select', + LOADINGICON : '.loading', + PROGRESSBARCONTAINER : '.progress-info.progress-striped', + DRAWINGREGION : '.drawingregion', + DRAWINGCANVAS : '.drawingcanvas', + SAVE : '.savebutton', + COMMENTCOLOURBUTTON : '.commentcolourbutton', + COMMENTMENU : '.commentdrawable a', + ANNOTATIONCOLOURBUTTON : '.annotationcolourbutton', + DELETEANNOTATIONBUTTON : '.deleteannotationbutton', UNSAVEDCHANGESDIV : '.assignfeedback_editpdf_unsavedchanges', - STAMPSBUTTON : '.' + CSS.DIALOGUE + ' .currentstampbutton', + STAMPSBUTTON : '.currentstampbutton', DIALOGUE : '.' + CSS.DIALOGUE }, SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)', @@ -66,14 +66,14 @@ var AJAXBASE = M.cfg.wwwroot + '/mod/assign/feedback/editpdf/ajax.php', }, CLICKTIMEOUT = 300, TOOLSELECTOR = { - 'comment': '.' + CSS.DIALOGUE + ' .commentbutton', - 'pen': '.' + CSS.DIALOGUE + ' .penbutton', - 'line': '.' + CSS.DIALOGUE + ' .linebutton', - 'rectangle': '.' + CSS.DIALOGUE + ' .rectanglebutton', - 'oval': '.' + CSS.DIALOGUE + ' .ovalbutton', - 'stamp': '.' + CSS.DIALOGUE + ' .stampbutton', - 'select': '.' + CSS.DIALOGUE + ' .selectbutton', - 'highlight': '.' + CSS.DIALOGUE + ' .highlightbutton' + 'comment': '.commentbutton', + 'pen': '.penbutton', + 'line': '.linebutton', + 'rectangle': '.rectanglebutton', + 'oval': '.ovalbutton', + 'stamp': '.stampbutton', + 'select': '.selectbutton', + 'highlight': '.highlightbutton' }, STROKEWEIGHT = 4; // This file is part of Moodle - http://moodle.org/ @@ -498,7 +498,7 @@ var DRAWABLE = function(editor) { this.store_position = function(container, x, y) { var drawingregion, scrollx, scrolly; - drawingregion = Y.one(SELECTOR.DRAWINGREGION); + drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION); scrollx = parseInt(drawingregion.get('scrollLeft'), 10); scrolly = parseInt(drawingregion.get('scrollTop'), 10); container.setData('x', x + scrollx); @@ -680,8 +680,8 @@ Y.extend(ANNOTATION, Y.Base, { */ draw_highlight : function() { var bounds, - drawingregion = Y.one(SELECTOR.DRAWINGREGION), - offsetcanvas = Y.one(SELECTOR.DRAWINGCANVAS).getXY(), + drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION), + offsetcanvas = this.editor.get_dialogue_element(SELECTOR.DRAWINGCANVAS).getXY(), shape; if (this.editor.currentannotation === this) { @@ -1553,7 +1553,7 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, { */ draw : function() { var drawable = new M.assignfeedback_editpdf.drawable(this.editor), - drawingregion = Y.one(SELECTOR.DRAWINGREGION), + drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION), node, position; @@ -1595,7 +1595,7 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, { draw_current_edit : function(edit) { var bounds = new M.assignfeedback_editpdf.rect(), drawable = new M.assignfeedback_editpdf.drawable(this.editor), - drawingregion = Y.one(SELECTOR.DRAWINGREGION), + drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION), node, position; @@ -2224,7 +2224,7 @@ Y.extend(COMMENTSEARCH, M.core.dialogue, { commentlist = Y.Node.create('