Gitlab CSE Unil

Commit 2beb21e4 authored by M. Chardon's avatar M. Chardon
Browse files

input d'édition transformé en textarea

parent 9a0554d6
...@@ -415,7 +415,7 @@ ul.assignfeedback_editpdfplus_menu { ...@@ -415,7 +415,7 @@ ul.assignfeedback_editpdfplus_menu {
width:200px; width:200px;
z-index: 51; z-index: 51;
} }
.assignfeedback_editpdfplus_hightlightplus_edition, .assignfeedback_editpdfplus_highlightplus_edition,
.assignfeedback_editpdfplus_frame_edition, .assignfeedback_editpdfplus_frame_edition,
.assignfeedback_editpdfplus_verticalline_edition, .assignfeedback_editpdfplus_verticalline_edition,
.assignfeedback_editpdfplus_stampcomment_edition, .assignfeedback_editpdfplus_stampcomment_edition,
...@@ -424,14 +424,14 @@ ul.assignfeedback_editpdfplus_menu { ...@@ -424,14 +424,14 @@ ul.assignfeedback_editpdfplus_menu {
padding-right:2px; padding-right:2px;
font-size:12px; font-size:12px;
} }
.assignfeedback_editpdfplus_hightlightplus_edition > div, .assignfeedback_editpdfplus_highlightplus_edition > div,
.assignfeedback_editpdfplus_frame_edition > div, .assignfeedback_editpdfplus_frame_edition > div,
.assignfeedback_editpdfplus_verticalline_edition > div, .assignfeedback_editpdfplus_verticalline_edition > div,
.assignfeedback_editpdfplus_stampcomment_edition > div, .assignfeedback_editpdfplus_stampcomment_edition > div,
.assignfeedback_editpdfplus_commentplus_edition > div { .assignfeedback_editpdfplus_commentplus_edition > div {
width:220px; width:220px;
} }
.assignfeedback_editpdfplus_hightlightplus_edition > div > p, .assignfeedback_editpdfplus_highlightplus_edition > div > p,
.assignfeedback_editpdfplus_frame_edition > div > p, .assignfeedback_editpdfplus_frame_edition > div > p,
.assignfeedback_editpdfplus_verticalline_edition > div > p, .assignfeedback_editpdfplus_verticalline_edition > div > p,
.assignfeedback_editpdfplus_stampcomment_edition > div > p, .assignfeedback_editpdfplus_stampcomment_edition > div > p,
......
...@@ -841,8 +841,10 @@ Y.extend(ANNOTATION, Y.Base, { ...@@ -841,8 +841,10 @@ Y.extend(ANNOTATION, Y.Base, {
get_div_edition: function () { get_div_edition: function () {
var divedition = "<div "; var divedition = "<div ";
divedition += "id='" + this.divcartridge + "_edit' "; divedition += "id='" + this.divcartridge + "_edit' ";
divedition += "class='assignfeedback_editpdfplus_" + this.tooltypefamille.label + "_edition' ";
divedition += "style='display:none;'> "; divedition += "style='display:none;'> ";
divedition += "<input id='" + this.divcartridge + "_editinput' type='text' value=\"" + this.get_valref() + "\" />"; divedition += "<textarea id='" + this.divcartridge + "_editinput' type='text' value=\"" + this.get_valref() + "\" >" + this.get_valref() + "</textarea>";
//divedition += "<input id='" + this.divcartridge + "_editinput' type='text' value=\"" + this.get_valref() + "\" />";
divedition += "</div>"; divedition += "</div>";
var diveditiondisplay = Y.Node.create(divedition); var diveditiondisplay = Y.Node.create(divedition);
var propositions = this.tooltype.texts; var propositions = this.tooltype.texts;
...@@ -2123,7 +2125,7 @@ Y.extend(ANNOTATIONHIGHLIGHTPLUS, M.assignfeedback_editpdfplus.annotation, { ...@@ -2123,7 +2125,7 @@ Y.extend(ANNOTATIONHIGHLIGHTPLUS, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_hightlightplus_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_hightlightplus_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
...@@ -2720,7 +2722,7 @@ Y.extend(ANNOTATIONSTAMPCOMMENT, M.assignfeedback_editpdfplus.annotation, { ...@@ -2720,7 +2722,7 @@ Y.extend(ANNOTATIONSTAMPCOMMENT, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_stampcomment_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_stampcomment_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
...@@ -2896,7 +2898,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -2896,7 +2898,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
dashstyle: [2, 2] dashstyle: [2, 2]
}); });
} }
//Y.log('draw : ' + this.shape_id);
drawable.shapes.push(shape); drawable.shapes.push(shape);
this.drawable = drawable; this.drawable = drawable;
...@@ -3049,7 +3050,7 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -3049,7 +3050,7 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_frame_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_frame_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
...@@ -3172,7 +3173,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -3172,7 +3173,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
var buttonrenderdisplay = this.editor.get_dialogue_element('#' + this.divcartridge + "_buttonpencil"); var buttonrenderdisplay = this.editor.get_dialogue_element('#' + this.divcartridge + "_buttonpencil");
divcartridge.setStyle('z-index', 1000); divcartridge.setStyle('z-index', 1000);
divpalette.show(); divpalette.show();
//divpalette.setStyle('z-index', 1000);
buttonrenderdisplay.on('click', this.hide_picker, this); buttonrenderdisplay.on('click', this.hide_picker, this);
}, },
hide_picker: function () { hide_picker: function () {
...@@ -3180,7 +3180,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -3180,7 +3180,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
var buttonrenderdisplay = this.editor.get_dialogue_element('#' + this.divcartridge + "_buttonpencil"); var buttonrenderdisplay = this.editor.get_dialogue_element('#' + this.divcartridge + "_buttonpencil");
var divcartridge = this.editor.get_dialogue_element('#' + this.divcartridge); var divcartridge = this.editor.get_dialogue_element('#' + this.divcartridge);
divpalette.hide(); divpalette.hide();
//divcartridge.setStyle('z-index', 0);
divcartridge.setStyle('z-index', 0); divcartridge.setStyle('z-index', 0);
buttonrenderdisplay.on('click', this.display_picker, this); buttonrenderdisplay.on('click', this.display_picker, this);
}, },
...@@ -3337,18 +3336,10 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -3337,18 +3336,10 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
if (shapesChildren[i].drawable) { if (shapesChildren[i].drawable) {
shapesChildren[i].drawable.erase(); shapesChildren[i].drawable.erase();
} }
//shapesChildren[i].destroy();
} }
} }
} }
} }
/*var children = Y.all('.class_' + this.divcartridge).get('nodes');
for (var i = 0; i < children.length; i++) {
var shapechd = this.editor.graphic.getShapeById(children[i].get('id'));
if (shapechd) {
shapechd.destroy();
}
}*/
this.editor.currentannotation = false; this.editor.currentannotation = false;
this.editor.save_current_page(); this.editor.save_current_page();
return; return;
...@@ -3567,7 +3558,7 @@ Y.extend(ANNOTATIONVERTICALLINE, M.assignfeedback_editpdfplus.annotation, { ...@@ -3567,7 +3558,7 @@ Y.extend(ANNOTATIONVERTICALLINE, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_verticalline_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_verticalline_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
...@@ -3859,7 +3850,7 @@ Y.extend(ANNOTATIONCOMMENTPLUS, M.assignfeedback_editpdfplus.annotation, { ...@@ -3859,7 +3850,7 @@ Y.extend(ANNOTATIONCOMMENTPLUS, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_commentplus_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_commentplus_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
......
...@@ -841,8 +841,10 @@ Y.extend(ANNOTATION, Y.Base, { ...@@ -841,8 +841,10 @@ Y.extend(ANNOTATION, Y.Base, {
get_div_edition: function () { get_div_edition: function () {
var divedition = "<div "; var divedition = "<div ";
divedition += "id='" + this.divcartridge + "_edit' "; divedition += "id='" + this.divcartridge + "_edit' ";
divedition += "class='assignfeedback_editpdfplus_" + this.tooltypefamille.label + "_edition' ";
divedition += "style='display:none;'> "; divedition += "style='display:none;'> ";
divedition += "<input id='" + this.divcartridge + "_editinput' type='text' value=\"" + this.get_valref() + "\" />"; divedition += "<textarea id='" + this.divcartridge + "_editinput' type='text' value=\"" + this.get_valref() + "\" >" + this.get_valref() + "</textarea>";
//divedition += "<input id='" + this.divcartridge + "_editinput' type='text' value=\"" + this.get_valref() + "\" />";
divedition += "</div>"; divedition += "</div>";
var diveditiondisplay = Y.Node.create(divedition); var diveditiondisplay = Y.Node.create(divedition);
var propositions = this.tooltype.texts; var propositions = this.tooltype.texts;
...@@ -2123,7 +2125,7 @@ Y.extend(ANNOTATIONHIGHLIGHTPLUS, M.assignfeedback_editpdfplus.annotation, { ...@@ -2123,7 +2125,7 @@ Y.extend(ANNOTATIONHIGHLIGHTPLUS, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_hightlightplus_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_hightlightplus_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
...@@ -2720,7 +2722,7 @@ Y.extend(ANNOTATIONSTAMPCOMMENT, M.assignfeedback_editpdfplus.annotation, { ...@@ -2720,7 +2722,7 @@ Y.extend(ANNOTATIONSTAMPCOMMENT, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_stampcomment_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_stampcomment_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
...@@ -3047,7 +3049,7 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -3047,7 +3049,7 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_frame_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_frame_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
...@@ -3170,7 +3172,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -3170,7 +3172,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
var buttonrenderdisplay = this.editor.get_dialogue_element('#' + this.divcartridge + "_buttonpencil"); var buttonrenderdisplay = this.editor.get_dialogue_element('#' + this.divcartridge + "_buttonpencil");
divcartridge.setStyle('z-index', 1000); divcartridge.setStyle('z-index', 1000);
divpalette.show(); divpalette.show();
//divpalette.setStyle('z-index', 1000);
buttonrenderdisplay.on('click', this.hide_picker, this); buttonrenderdisplay.on('click', this.hide_picker, this);
}, },
hide_picker: function () { hide_picker: function () {
...@@ -3178,7 +3179,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -3178,7 +3179,6 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
var buttonrenderdisplay = this.editor.get_dialogue_element('#' + this.divcartridge + "_buttonpencil"); var buttonrenderdisplay = this.editor.get_dialogue_element('#' + this.divcartridge + "_buttonpencil");
var divcartridge = this.editor.get_dialogue_element('#' + this.divcartridge); var divcartridge = this.editor.get_dialogue_element('#' + this.divcartridge);
divpalette.hide(); divpalette.hide();
//divcartridge.setStyle('z-index', 0);
divcartridge.setStyle('z-index', 0); divcartridge.setStyle('z-index', 0);
buttonrenderdisplay.on('click', this.display_picker, this); buttonrenderdisplay.on('click', this.display_picker, this);
}, },
...@@ -3335,18 +3335,10 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -3335,18 +3335,10 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
if (shapesChildren[i].drawable) { if (shapesChildren[i].drawable) {
shapesChildren[i].drawable.erase(); shapesChildren[i].drawable.erase();
} }
//shapesChildren[i].destroy();
} }
} }
} }
} }
/*var children = Y.all('.class_' + this.divcartridge).get('nodes');
for (var i = 0; i < children.length; i++) {
var shapechd = this.editor.graphic.getShapeById(children[i].get('id'));
if (shapechd) {
shapechd.destroy();
}
}*/
this.editor.currentannotation = false; this.editor.currentannotation = false;
this.editor.save_current_page(); this.editor.save_current_page();
return; return;
...@@ -3565,7 +3557,7 @@ Y.extend(ANNOTATIONVERTICALLINE, M.assignfeedback_editpdfplus.annotation, { ...@@ -3565,7 +3557,7 @@ Y.extend(ANNOTATIONVERTICALLINE, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_verticalline_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_verticalline_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
...@@ -3856,7 +3848,7 @@ Y.extend(ANNOTATIONCOMMENTPLUS, M.assignfeedback_editpdfplus.annotation, { ...@@ -3856,7 +3848,7 @@ Y.extend(ANNOTATIONCOMMENTPLUS, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_commentplus_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_commentplus_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
......
...@@ -300,8 +300,10 @@ Y.extend(ANNOTATION, Y.Base, { ...@@ -300,8 +300,10 @@ Y.extend(ANNOTATION, Y.Base, {
get_div_edition: function () { get_div_edition: function () {
var divedition = "<div "; var divedition = "<div ";
divedition += "id='" + this.divcartridge + "_edit' "; divedition += "id='" + this.divcartridge + "_edit' ";
divedition += "class='assignfeedback_editpdfplus_" + this.tooltypefamille.label + "_edition' ";
divedition += "style='display:none;'> "; divedition += "style='display:none;'> ";
divedition += "<input id='" + this.divcartridge + "_editinput' type='text' value=\"" + this.get_valref() + "\" />"; divedition += "<textarea id='" + this.divcartridge + "_editinput' type='text' value=\"" + this.get_valref() + "\" >" + this.get_valref() + "</textarea>";
//divedition += "<input id='" + this.divcartridge + "_editinput' type='text' value=\"" + this.get_valref() + "\" />";
divedition += "</div>"; divedition += "</div>";
var diveditiondisplay = Y.Node.create(divedition); var diveditiondisplay = Y.Node.create(divedition);
var propositions = this.tooltype.texts; var propositions = this.tooltype.texts;
......
...@@ -190,7 +190,7 @@ Y.extend(ANNOTATIONCOMMENTPLUS, M.assignfeedback_editpdfplus.annotation, { ...@@ -190,7 +190,7 @@ Y.extend(ANNOTATIONCOMMENTPLUS, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_commentplus_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_commentplus_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
......
...@@ -234,7 +234,7 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, { ...@@ -234,7 +234,7 @@ Y.extend(ANNOTATIONFRAME, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_frame_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_frame_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
......
...@@ -199,7 +199,7 @@ Y.extend(ANNOTATIONHIGHLIGHTPLUS, M.assignfeedback_editpdfplus.annotation, { ...@@ -199,7 +199,7 @@ Y.extend(ANNOTATIONHIGHLIGHTPLUS, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_hightlightplus_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_hightlightplus_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
......
...@@ -212,7 +212,7 @@ Y.extend(ANNOTATIONSTAMPCOMMENT, M.assignfeedback_editpdfplus.annotation, { ...@@ -212,7 +212,7 @@ Y.extend(ANNOTATIONSTAMPCOMMENT, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_stampcomment_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_stampcomment_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
......
...@@ -206,7 +206,7 @@ Y.extend(ANNOTATIONVERTICALLINE, M.assignfeedback_editpdfplus.annotation, { ...@@ -206,7 +206,7 @@ Y.extend(ANNOTATIONVERTICALLINE, M.assignfeedback_editpdfplus.annotation, {
//creation de la div d'edition //creation de la div d'edition
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
var diveditiondisplay = this.get_div_edition(); var diveditiondisplay = this.get_div_edition();
diveditiondisplay.addClass('assignfeedback_editpdfplus_verticalline_edition'); //diveditiondisplay.addClass('assignfeedback_editpdfplus_verticalline_edition');
divconteneurdisplay.append(diveditiondisplay); divconteneurdisplay.append(diveditiondisplay);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment