L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle

Browse Source 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
This commit is contained in:
Dan Poltawski
2013-10-24 10:19:47 +08:00
parent 295e4fa8f4 673c4ffe60
commit 459dbd4362
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
Vendored
+2 -2
View File
@@ -3310,7 +3310,7 @@ EDITOR.prototype = {
}
filename = stamp.substr(stamp.lastIndexOf('/'));
this.currentedit.stamp = filename;
this.refresh_button_state();
this.handle_tool_button(e, "stamp");
},
context: this
});
@@ -3333,7 +3333,7 @@ EDITOR.prototype = {
currenttoolnode.removeClass('assignfeedback_editpdf_selectedbutton');
currenttoolnode.setAttribute('aria-pressed', 'false');
this.currentedit.tool = tool;
if (tool !== "comment" && tool !== "select") {
if (tool !== "comment" && tool !== "select" && tool !== "stamp") {
this.lastannotationtool = tool;
}
this.refresh_button_state();
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
Vendored
+2 -2
View File
@@ -3310,7 +3310,7 @@ EDITOR.prototype = {
}
filename = stamp.substr(stamp.lastIndexOf('/'));
this.currentedit.stamp = filename;
this.refresh_button_state();
this.handle_tool_button(e, "stamp");
},
context: this
});
@@ -3333,7 +3333,7 @@ EDITOR.prototype = {
currenttoolnode.removeClass('assignfeedback_editpdf_selectedbutton');
currenttoolnode.setAttribute('aria-pressed', 'false');
this.currentedit.tool = tool;
if (tool !== "comment" && tool !== "select") {
if (tool !== "comment" && tool !== "select" && tool !== "stamp") {
this.lastannotationtool = tool;
}
this.refresh_button_state();
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
Vendored
+2 -2
View File
@@ -499,7 +499,7 @@ EDITOR.prototype = {
}
filename = stamp.substr(stamp.lastIndexOf('/'));
this.currentedit.stamp = filename;
this.refresh_button_state();
this.handle_tool_button(e, "stamp");
},
context: this
});
@@ -522,7 +522,7 @@ EDITOR.prototype = {
currenttoolnode.removeClass('assignfeedback_editpdf_selectedbutton');
currenttoolnode.setAttribute('aria-pressed', 'false');
this.currentedit.tool = tool;
if (tool !== "comment" && tool !== "select") {
if (tool !== "comment" && tool !== "select" && tool !== "stamp") {
this.lastannotationtool = tool;
}
this.refresh_button_state();