Merge branch 'MDL-61633-36' of https://github.com/lucisgit/moodle into MOODLE_36_STABLE

This commit is contained in:
Andrew Nicols
2018-12-17 15:29:12 +08:00
4 changed files with 4 additions and 1 deletions
@@ -4595,6 +4595,7 @@ EDITOR.prototype = {
drawingcanvas.setStyle('backgroundImage', 'url("' + page.url + '")');
drawingcanvas.setStyle('width', page.width + 'px');
drawingcanvas.setStyle('height', page.height + 'px');
drawingcanvas.scrollIntoView();
// Update page select.
this.get_dialogue_element(SELECTOR.PAGESELECT).set('selectedIndex', this.currentpage);
File diff suppressed because one or more lines are too long
@@ -4595,6 +4595,7 @@ EDITOR.prototype = {
drawingcanvas.setStyle('backgroundImage', 'url("' + page.url + '")');
drawingcanvas.setStyle('width', page.width + 'px');
drawingcanvas.setStyle('height', page.height + 'px');
drawingcanvas.scrollIntoView();
// Update page select.
this.get_dialogue_element(SELECTOR.PAGESELECT).set('selectedIndex', this.currentpage);
@@ -1322,6 +1322,7 @@ EDITOR.prototype = {
drawingcanvas.setStyle('backgroundImage', 'url("' + page.url + '")');
drawingcanvas.setStyle('width', page.width + 'px');
drawingcanvas.setStyle('height', page.height + 'px');
drawingcanvas.scrollIntoView();
// Update page select.
this.get_dialogue_element(SELECTOR.PAGESELECT).set('selectedIndex', this.currentpage);