Skip to content

Commit

Permalink
Merge branch 'MDL-55200_master'
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed Jul 18, 2016
2 parents f60a16a + 51ed235 commit 8c00f1c
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 16 deletions.
23 changes: 18 additions & 5 deletions ...on/type/ddmarker/yui/build/moodle-qtype_ddmarker-form/moodle-qtype_ddmarker-form-debug.js
View file
Expand Up @@ -32,10 +32,14 @@ Y.extend(DDMARKER_FORM, M.qtype_ddmarker.dd_base_class, {
var tn = Y.one(this.get('topnode'));
tn.one('div.fcontainer').append(
'<div class="ddarea">' +
'<div class="markertexts"></div>' +
'<div class="droparea"></div>' +
'<div class="dropzones"></div>' +
'<div class="grid"></div>' +
'<div class="markertexts"></div>' +
'<div class="droparea"></div>' +
'<div class="dropzones"></div>' +
'<ul class="pager">' +
'<li><span id="xcoordpreview">X = </span></li>' +
'<li><span id="ycoordpreview">Y = </span></li>' +
'</ul>' +
'<div class="grid"></div>' +
'</div>');
this.doc = this.doc_structure(this);
this.stop_selector_events();
Expand All @@ -44,6 +48,15 @@ Y.extend(DDMARKER_FORM, M.qtype_ddmarker.dd_base_class, {
Y.later(500, this, this.update_drop_zones, [pendingid], true);
Y.after(this.load_bg_image, M.form_filepicker, 'callback', this);
this.load_bg_image();

var topnode = Y.one(this.get('topnode'));
topnode.one('.grid').on('mousemove', function (e) {
var img = topnode.one('.dropbackground');
var x = Math.round(Number(e.pageX) - img.getX() - 1);
var y = Math.round(Number(e.pageY) - img.getY() - 1);
topnode.one('#xcoordpreview').setHTML("X = " + x);
topnode.one('#ycoordpreview').setHTML("Y = " + y);
});
},

load_bg_image : function() {
Expand Down Expand Up @@ -118,7 +131,7 @@ Y.extend(DDMARKER_FORM, M.qtype_ddmarker.dd_base_class, {
}
},
set_options_for_drag_item_selectors : function () {
var dragitemsoptions = {'0': ''};
var dragitemsoptions = {0: ''};
for (var i = 1; i <= this.form.get_form_value('noitems', []); i++) {
var label = this.get_marker_text(i);
if (label !== "") {
Expand Down
2 changes: 1 addition & 1 deletion ...tion/type/ddmarker/yui/build/moodle-qtype_ddmarker-form/moodle-qtype_ddmarker-form-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 18 additions & 5 deletions question/type/ddmarker/yui/build/moodle-qtype_ddmarker-form/moodle-qtype_ddmarker-form.js
View file
Expand Up @@ -32,10 +32,14 @@ Y.extend(DDMARKER_FORM, M.qtype_ddmarker.dd_base_class, {
var tn = Y.one(this.get('topnode'));
tn.one('div.fcontainer').append(
'<div class="ddarea">' +
'<div class="markertexts"></div>' +
'<div class="droparea"></div>' +
'<div class="dropzones"></div>' +
'<div class="grid"></div>' +
'<div class="markertexts"></div>' +
'<div class="droparea"></div>' +
'<div class="dropzones"></div>' +
'<ul class="pager">' +
'<li><span id="xcoordpreview">X = </span></li>' +
'<li><span id="ycoordpreview">Y = </span></li>' +
'</ul>' +
'<div class="grid"></div>' +
'</div>');
this.doc = this.doc_structure(this);
this.stop_selector_events();
Expand All @@ -44,6 +48,15 @@ Y.extend(DDMARKER_FORM, M.qtype_ddmarker.dd_base_class, {
Y.later(500, this, this.update_drop_zones, [pendingid], true);
Y.after(this.load_bg_image, M.form_filepicker, 'callback', this);
this.load_bg_image();

var topnode = Y.one(this.get('topnode'));
topnode.one('.grid').on('mousemove', function (e) {
var img = topnode.one('.dropbackground');
var x = Math.round(Number(e.pageX) - img.getX() - 1);
var y = Math.round(Number(e.pageY) - img.getY() - 1);
topnode.one('#xcoordpreview').setHTML("X = " + x);
topnode.one('#ycoordpreview').setHTML("Y = " + y);
});
},

load_bg_image : function() {
Expand Down Expand Up @@ -118,7 +131,7 @@ Y.extend(DDMARKER_FORM, M.qtype_ddmarker.dd_base_class, {
}
},
set_options_for_drag_item_selectors : function () {
var dragitemsoptions = {'0': ''};
var dragitemsoptions = {0: ''};
for (var i = 1; i <= this.form.get_form_value('noitems', []); i++) {
var label = this.get_marker_text(i);
if (label !== "") {
Expand Down
23 changes: 18 additions & 5 deletions question/type/ddmarker/yui/src/form/js/form.js
View file
Expand Up @@ -30,10 +30,14 @@ Y.extend(DDMARKER_FORM, M.qtype_ddmarker.dd_base_class, {
var tn = Y.one(this.get('topnode'));
tn.one('div.fcontainer').append(
'<div class="ddarea">' +
'<div class="markertexts"></div>' +
'<div class="droparea"></div>' +
'<div class="dropzones"></div>' +
'<div class="grid"></div>' +
'<div class="markertexts"></div>' +
'<div class="droparea"></div>' +
'<div class="dropzones"></div>' +
'<ul class="pager">' +
'<li><span id="xcoordpreview">X = </span></li>' +
'<li><span id="ycoordpreview">Y = </span></li>' +
'</ul>' +
'<div class="grid"></div>' +
'</div>');
this.doc = this.doc_structure(this);
this.stop_selector_events();
Expand All @@ -42,6 +46,15 @@ Y.extend(DDMARKER_FORM, M.qtype_ddmarker.dd_base_class, {
Y.later(500, this, this.update_drop_zones, [pendingid], true);
Y.after(this.load_bg_image, M.form_filepicker, 'callback', this);
this.load_bg_image();

var topnode = Y.one(this.get('topnode'));
topnode.one('.grid').on('mousemove', function (e) {
var img = topnode.one('.dropbackground');
var x = Math.round(Number(e.pageX) - img.getX() - 1);
var y = Math.round(Number(e.pageY) - img.getY() - 1);
topnode.one('#xcoordpreview').setHTML("X = " + x);
topnode.one('#ycoordpreview').setHTML("Y = " + y);
});
},

load_bg_image : function() {
Expand Down Expand Up @@ -116,7 +129,7 @@ Y.extend(DDMARKER_FORM, M.qtype_ddmarker.dd_base_class, {
}
},
set_options_for_drag_item_selectors : function () {
var dragitemsoptions = {'0': ''};
var dragitemsoptions = {0: ''};
for (var i = 1; i <= this.form.get_form_value('noitems', []); i++) {
var label = this.get_marker_text(i);
if (label !== "") {
Expand Down

0 comments on commit 8c00f1c

Please sign in to comment.