Skip to content
Snippets Groups Projects
Commit a323da8a authored by srosse's avatar srosse
Browse files

OO-3265: use a different drag and drop library (dragula), fix double save... 

OO-3265: use a different drag and drop library (dragula), fix double save issue and javascript errors
parent 91792edd
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1147 additions and 193 deletions
NOTICE.TXT
+ 1
− 0
View file @ a323da8a
......@@ -137,6 +137,7 @@ This produce uses software based on the MIT License
* jQuery UI Slider Pips (MIT License) [https://github.com/simeydotme/jQuery-ui-Slider-Pips]
* maphilight (MIT License) [https://github.com/kemayo/maphilight]
* iFrame Resizer (MIT License) [https://github.com/davidjbradshaw/iframe-resizer]
* Dragula (MIT License) [https://github.com/bevacqua/dragula]
-----------------------------------------------------------------------
This product uses software based on the BSD License
......
pom.xml
+ 9
− 45
View file @ a323da8a
......@@ -159,6 +159,7 @@
</aggregations>
<excludes>
<exclude>**/jw/*</exclude>
<exclude>**/dragula/*</exclude>
<exclude>**/mediaelementjs/*</exclude>
<exclude>**/mediaelementjs/**/*</exclude>
<exclude>**/sliderpips/jquery-ui-slider-pips.js</exclude>
......@@ -192,6 +193,7 @@
<excludes>
<exclude>**/*.min.js</exclude>
<exclude>**/jw/*</exclude>
<exclude>**/dragula/*</exclude>
<exclude>**/mediaelementjs/*</exclude>
<exclude>**/mediaelementjs/**/*</exclude>
<exclude>**/sliderpips/jquery-ui-slider-pips.js</exclude>
......@@ -232,18 +234,19 @@
<aggregation>
<output>${basedir}/src/main/webapp/static/js/jquery/qti/jquery.qti.min.js</output>
<removeIncluded>false</removeIncluded>
<includes>
<includes><!-- qtiAutosave, qtiTimer are loaded separately -->
<include>${basedir}/target/jquery/jquery/qti/jquery.associate.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.choice.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.gapMatch.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.graphicAssociate.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.graphicGap.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.graphicOrder.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.hotspot.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.hotspot.responsive.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.match.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.match_dnd.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.order.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.positionObject.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.qtiAutosave.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.qtiTimer.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.selectPoint.min.js</include>
<include>${basedir}/target/jquery/jquery/qti/jquery.slider.min.js</include>
</includes>
......@@ -307,48 +310,7 @@
</aggregations>
<excludes>
<exclude>**/jw/*</exclude>
<exclude>**/mediaelementjs/*</exclude>
<exclude>**/mediaelementjs/**/*</exclude>
<exclude>**/sliderpips/jquery-ui-slider-pips.js</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>compressqti</id>
<phase>process-resources</phase>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<suffix>.min</suffix>
<force>true</force>
<encoding>UTF-8</encoding>
<nocompress>false</nocompress>
<outputDirectory>${basedir}/target/bootstrap</outputDirectory>
<sourceDirectory>${basedir}/src/main/webapp/static/bootstrap</sourceDirectory>
<excludeResources>true</excludeResources>
<aggregations>
<aggregation>
<output>${basedir}/target/bootstrap/bootstrap-openolat.min.js</output>
<removeIncluded>false</removeIncluded>
<includes>
<!-- <include>${basedir}/target/bootstrap/javascripts/bootstrap/affix.min.js</include> -->
<include>${basedir}/target/bootstrap/javascripts/bootstrap/alert.min.js</include>
<include>${basedir}/target/bootstrap/javascripts/bootstrap/button.min.js</include>
<!-- <include>${basedir}/target/bootstrap/javascripts/bootstrap/carousel.min.js</include> -->
<include>${basedir}/target/bootstrap/javascripts/bootstrap/collapse.min.js</include>
<include>${basedir}/target/bootstrap/javascripts/bootstrap/dropdown.min.js</include>
<include>${basedir}/target/bootstrap/javascripts/bootstrap/tab.min.js</include>
<include>${basedir}/target/bootstrap/javascripts/bootstrap/transition.min.js</include>
<!-- <include>${basedir}/target/bootstrap/javascripts/bootstrap/scrollspy.min.js</include> -->
<include>${basedir}/target/bootstrap/javascripts/bootstrap/modal.min.js</include>
<include>${basedir}/target/bootstrap/javascripts/bootstrap/tooltip.min.js</include>
<include>${basedir}/target/bootstrap/javascripts/bootstrap/popover.min.js</include>
</includes>
</aggregation>
</aggregations>
<excludes>
<exclude>**/jw/*</exclude>
<exclude>**/dragula/*</exclude>
<exclude>**/mediaelementjs/*</exclude>
<exclude>**/mediaelementjs/**/*</exclude>
<exclude>**/sliderpips/jquery-ui-slider-pips.js</exclude>
......@@ -379,11 +341,13 @@
<include>${basedir}/target/jquery/jquery/cropper/cropper.min.css</include>
<include>${basedir}/target/jquery/jquery/sliderpips/jquery-ui-slider-pips.min.css</include>
<include>${basedir}/target/jquery/jquery/ui/jquery-ui-1.11.4.custom.min.css</include>
<include>${basedir}/src/main/webapp/static/js/dragula/dragula.min.css</include>
</includes>
</aggregation>
</aggregations>
<excludes>
<exclude>**/jw/*</exclude>
<exclude>**/dragula/*</exclude>
<exclude>**/mediaelementjs/*</exclude>
<exclude>**/mediaelementjs/**/*</exclude>
<exclude>**/sliderpips/jquery-ui-slider-pips.js</exclude>
......
src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
+ 1
− 0
View file @ a323da8a
......@@ -136,6 +136,7 @@ $!analytics
<link type="text/css" href='$r.staticLink("js/jquery/cropper/cropper.css")' rel="stylesheet" />
<link type="text/css" href='$r.staticLink("js/jquery/sliderpips/jquery-ui-slider-pips.css")' rel="stylesheet" />
<link type="text/css" href='$r.staticLink("js/jquery/ui/jquery-ui-1.11.4.custom.min.css")' rel="stylesheet" />
<link type="text/css" href='$r.staticLink("js/dragula/dragula.css")' rel="stylesheet" />
#else
<link type="text/css" href='$r.staticLink("js/js.plugins.min.css")' rel="stylesheet" />
#end
......
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectComponent.java
+ 39
− 22
View file @ a323da8a
......@@ -25,12 +25,15 @@ import java.net.URI;
import java.util.Collections;
import org.apache.velocity.context.Context;
import org.olat.core.CoreSpringFactory;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.AbstractComponent;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.control.JSAndCSSAdder;
import org.olat.core.gui.render.ValidationResult;
import org.olat.core.gui.render.velocity.VelocityComponent;
import org.olat.core.helpers.Settings;
import org.olat.ims.qti21.QTI21Module;
import org.olat.ims.qti21.ui.CandidateSessionContext;
import uk.ac.ed.ph.jqtiplus.node.content.variable.FeedbackElement;
......@@ -54,6 +57,7 @@ public abstract class AssessmentObjectComponent extends AbstractComponent implem
private Context context;
private boolean hideFeedbacks = false;
private final boolean mathAssess;
private String mapperUri;
private String submissionMapperUri;
......@@ -63,6 +67,7 @@ public abstract class AssessmentObjectComponent extends AbstractComponent implem
public AssessmentObjectComponent(String name) {
super(name);
mathAssess = CoreSpringFactory.getImpl(QTI21Module.class).isMathAssessExtensionEnabled();
}
public abstract AssessmentObjectFormItem getQtiItem();
......@@ -185,35 +190,47 @@ public abstract class AssessmentObjectComponent extends AbstractComponent implem
@Override
public void validate(UserRequest ureq, ValidationResult vr) {
super.validate(ureq, vr);
loadJavascripts(vr);
}
protected void loadJavascripts(ValidationResult vr) {
JSAndCSSAdder jsa = vr.getJsAndCSSAdder();
jsa.addRequiredStaticJsFile("assessment/rendering/javascript/QtiWorksRendering.js");
jsa.addRequiredStaticJsFile("assessment/rendering/javascript/AsciiMathInputController.js");
jsa.addRequiredStaticJsFile("assessment/rendering/javascript/UpConversionAjaxController.js");
if(mathAssess) {
jsa.addRequiredStaticJsFile("assessment/rendering/javascript/AsciiMathInputController.js");
jsa.addRequiredStaticJsFile("assessment/rendering/javascript/UpConversionAjaxController.js");
}
jsa.addRequiredStaticJsFile("js/jquery/maphilight/jquery.maphilight.js");
// drawing needs slider, slider need it too
// order needs sortable
// drag and drop used a lot...
jsa.addRequiredStaticJsFile("js/jquery/ui/jquery-ui-1.11.4.custom.qti.min.js");
// hotspot
jsa.addRequiredStaticJsFile("js/jquery/maphilight/jquery.maphilight.js");
// drawing
jsa.addRequiredStaticJsFile("js/jquery/openolat/jquery.paint.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.choice.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.associate.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.graphicAssociate.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.graphicGap.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.graphicOrder.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.selectPoint.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.positionObject.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.slider.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.order.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.match.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.match_dnd.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.gapMatch.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.hotspot.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.hotspot.responsive.js");
if(Settings.isDebuging()) {
// order needs dragula
jsa.addRequiredStaticJsFile("js/dragula/dragula.js");
// qtiAutosave and qtiTimer are loaded by the controller
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.associate.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.choice.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.gapMatch.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.graphicAssociate.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.graphicGap.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.graphicOrder.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.hotspot.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.hotspot.responsive.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.match.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.match_dnd.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.order.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.positionObject.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.selectPoint.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.slider.js");
} else {
jsa.addRequiredStaticJsFile("js/dragula/dragula.min.js");
jsa.addRequiredStaticJsFile("js/jquery/qti/jquery.qti.min.js");
}
}
@Override
......
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectVelocityRenderDecorator.java
+ 29
− 20
View file @ a323da8a
......@@ -21,6 +21,7 @@ package org.olat.ims.qti21.ui.components;
import static org.olat.ims.qti21.ui.components.AssessmentRenderFunctions.renderValue;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
......@@ -632,26 +633,30 @@ public class AssessmentObjectVelocityRenderDecorator extends VelocityRenderDecor
}
public String renderKprimSpecialFlowStatics(List<FlowStatic> flowStaticList) {
StringOutput sb = new StringOutput();
if(flowStaticList != null && flowStaticList.size() > 0) {
flowStaticList.forEach((flow)
-> avc.getHTMLRendererSingleton().renderFlow(renderer, sb, avc, resolvedAssessmentItem, itemSessionState, flow, ubu, translator));
}
String specialKprim = sb.toString();
if("+".equals(specialKprim)) {
if(translator != null) {
specialKprim = translator.translate("kprim.plus");
} else {
specialKprim = "True";
try(StringOutput sb = new StringOutput()) {
if(flowStaticList != null && flowStaticList.size() > 0) {
flowStaticList.forEach((flow)
-> avc.getHTMLRendererSingleton().renderFlow(renderer, sb, avc, resolvedAssessmentItem, itemSessionState, flow, ubu, translator));
}
} else if("-".equals(specialKprim)) {
if(translator != null) {
specialKprim = translator.translate("kprim.minus");
} else {
specialKprim = "False";
String specialKprim = sb.toString();
if("+".equals(specialKprim)) {
if(translator != null) {
specialKprim = translator.translate("kprim.plus");
} else {
specialKprim = "True";
}
} else if("-".equals(specialKprim)) {
if(translator != null) {
specialKprim = translator.translate("kprim.minus");
} else {
specialKprim = "False";
}
}
return specialKprim;
} catch(IOException e) {
log.error("", e);
return "";
}
return specialKprim;
}
public String renderTextOrVariables(List<TextOrVariable> textOrVariables) {
......@@ -706,9 +711,13 @@ public class AssessmentObjectVelocityRenderDecorator extends VelocityRenderDecor
}
public String toString(Value value, String delimiter, String mappingIndicator) {
StringOutput out = new StringOutput(32);
renderValue(out, value, delimiter, mappingIndicator);
return out.toString();
try(StringOutput out = new StringOutput(32)) {
renderValue(out, value, delimiter, mappingIndicator);
return out.toString();
} catch(IOException e) {
log.error("", e);
return "";
}
}
public String toJavascriptArguments(List<? extends Choice> choices) {
......
src/main/java/org/olat/ims/qti21/ui/components/AssessmentTreeComponent.java
+ 6
− 0
View file @ a323da8a
......@@ -20,6 +20,7 @@
package org.olat.ims.qti21.ui.components;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.render.ValidationResult;
import uk.ac.ed.ph.jqtiplus.node.item.interaction.Interaction;
import uk.ac.ed.ph.jqtiplus.node.test.AssessmentTest;
......@@ -125,6 +126,11 @@ public class AssessmentTreeComponent extends AssessmentObjectComponent {
return itemProcessingContext;
}
@Override
protected void loadJavascripts(ValidationResult vr) {
//don't load them
}
@Override
protected void doDispatchRequest(UserRequest ureq) {
super.doDispatchRequest(ureq);
......
src/main/java/org/olat/ims/qti21/ui/components/_content/orderInteraction.html
+ 5
− 7
View file @ a323da8a
......@@ -4,6 +4,7 @@
#set($respondedVisibleChoices = $orderChoices.getRespondedVisibleChoices())
#set($unselectedVisibleChoices = $orderChoices.getUnselectedVisibleChoices())
#set($orientation = $r.getOrientation($interaction.orientation))
#set($responseValue = $r.getResponseValue($interaction.responseIdentifier))
<input name="qtiworks_presented_${responseIdentifier}" type="hidden" value="1" />
<div class="$localName">
......@@ -24,8 +25,7 @@
#end
<ul>
#foreach($unselectedChoice in $unselectedVisibleChoices)
<li id="qtiworks_response_${unselectedChoice.identifier}" class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
$r.renderFlowStatics($unselectedChoice.getFlowStatics())</li>
<li id="qtiworks_response_${unselectedChoice.identifier}" class="o_assessmentitem_order_item">$r.renderFlowStatics($unselectedChoice.getFlowStatics())</li>
#end
</ul>
</div>
......@@ -35,20 +35,18 @@
#end
<ul class="clearfix">
#foreach($respondedChoice in $respondedVisibleChoices)
<li id="qtiworks_response_${respondedChoice.identifier}" class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
$r.renderFlowStatics($respondedChoice.getFlowStatics())</li>
<li id="qtiworks_response_${respondedChoice.identifier}" class="o_assessmentitem_order_item">$r.renderFlowStatics($respondedChoice.getFlowStatics())</li>
#end
</ul>
</div>
<script type="text/javascript">
<script>
jQuery(function() {
jQuery('#qtiworks_response_${responseIdentifier}').orderInteraction({
responseIdentifier: '$responseIdentifier',
formDispatchFieldId: '$r.formDispatchFieldId',
initialSourceOrder: [$r.toJavascriptArguments($unselectedVisibleChoices)],
initialTargetOrder: [$r.toJavascriptArguments($respondedVisibleChoices)],
minChoices: #if($interaction.minChoices) $interaction.minChoices #else null #end,
maxChoices: #if($interaction.maxChoices) $interaction.maxChoices #else null #end,
responseValue: '$r.toString($responseValue,",")',
opened: $isItemSessionOpen
});
});
......
src/main/webapp/static/js/dragula/README 0 → 100644
+ 3
− 0
View file @ a323da8a
Dragula:
Version: master (like 3.7.2)
https://github.com/bevacqua/dragula
\ No newline at end of file
src/main/webapp/static/js/dragula/dragula.css 0 → 100644
+ 22
− 0
View file @ a323da8a
.gu-mirror {
position: fixed !important;
margin: 0 !important;
z-index: 9999 !important;
opacity: 0.8;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
filter: alpha(opacity=80);
}
.gu-hide {
display: none !important;
}
.gu-unselectable {
-webkit-user-select: none !important;
-moz-user-select: none !important;
-ms-user-select: none !important;
user-select: none !important;
}
.gu-transit {
opacity: 0.2;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
filter: alpha(opacity=20);
}
src/main/webapp/static/js/dragula/dragula.js 0 → 100644
+ 908
− 0
View file @ a323da8a
This diff is collapsed.
src/main/webapp/static/js/dragula/dragula.min.css 0 → 100644
+ 1
− 0
View file @ a323da8a
.gu-mirror{position:fixed!important;margin:0!important;z-index:9999!important;opacity:.8;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";filter:alpha(opacity=80)}.gu-hide{display:none!important}.gu-unselectable{-webkit-user-select:none!important;-moz-user-select:none!important;-ms-user-select:none!important;user-select:none!important}.gu-transit{opacity:.2;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";filter:alpha(opacity=20)}
\ No newline at end of file
src/main/webapp/static/js/dragula/dragula.min.js 0 → 100644
+ 1
− 0
View file @ a323da8a
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n;n="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,n.dragula=e()}}(function(){return function e(n,t,r){function o(u,c){if(!t[u]){if(!n[u]){var a="function"==typeof require&&require;if(!c&&a)return a(u,!0);if(i)return i(u,!0);var f=new Error("Cannot find module '"+u+"'");throw f.code="MODULE_NOT_FOUND",f}var l=t[u]={exports:{}};n[u][0].call(l.exports,function(e){var t=n[u][1][e];return o(t?t:e)},l,l.exports,e,n,t,r)}return t[u].exports}for(var i="function"==typeof require&&require,u=0;u<r.length;u++)o(r[u]);return o}({1:[function(e,n,t){"use strict";function r(e){var n=u[e];return n?n.lastIndex=0:u[e]=n=new RegExp(c+e+a,"g"),n}function o(e,n){var t=e.className;t.length?r(n).test(t)||(e.className+=" "+n):e.className=n}function i(e,n){e.className=e.className.replace(r(n)," ").trim()}var u={},c="(?:^|\\s)",a="(?:\\s|$)";n.exports={add:o,rm:i}},{}],2:[function(e,n,t){(function(t){"use strict";function r(e,n){function t(e){return-1!==le.containers.indexOf(e)||fe.isContainer(e)}function r(e){var n=e?"remove":"add";o(S,n,"mousedown",O),o(S,n,"mouseup",L)}function c(e){var n=e?"remove":"add";o(S,n,"mousemove",N)}function m(e){var n=e?"remove":"add";w[n](S,"selectstart",C),w[n](S,"click",C)}function h(){r(!0),L({})}function C(e){ce&&e.preventDefault()}function O(e){ne=e.clientX,te=e.clientY;var n=1!==i(e)||e.metaKey||e.ctrlKey;if(!n){var t=e.target,r=T(t);r&&(ce=r,c(),"mousedown"===e.type&&(p(t)?t.focus():e.preventDefault()))}}function N(e){if(ce){if(0===i(e))return void L({});if(void 0===e.clientX||e.clientX!==ne||void 0===e.clientY||e.clientY!==te){if(fe.ignoreInputTextSelection){var n=y("clientX",e),t=y("clientY",e),r=x.elementFromPoint(n,t);if(p(r))return}var o=ce;c(!0),m(),D(),B(o);var a=u(W);Z=y("pageX",e)-a.left,ee=y("pageY",e)-a.top,E.add(ie||W,"gu-transit"),K(),U(e)}}}function T(e){if(!(le.dragging&&J||t(e))){for(var n=e;v(e)&&t(v(e))===!1;){if(fe.invalid(e,n))return;if(e=v(e),!e)return}var r=v(e);if(r&&!fe.invalid(e,n)){var o=fe.moves(e,r,n,g(e));if(o)return{item:e,source:r}}}}function X(e){return!!T(e)}function Y(e){var n=T(e);n&&B(n)}function B(e){$(e.item,e.source)&&(ie=e.item.cloneNode(!0),le.emit("cloned",ie,e.item,"copy")),Q=e.source,W=e.item,re=oe=g(e.item),le.dragging=!0,le.emit("drag",W,Q)}function P(){return!1}function D(){if(le.dragging){var e=ie||W;M(e,v(e))}}function I(){ce=!1,c(!0),m(!0)}function L(e){if(I(),le.dragging){var n=ie||W,t=y("clientX",e),r=y("clientY",e),o=a(J,t,r),i=q(o,t,r);i&&(ie&&fe.copySortSource||!ie||i!==Q)?M(n,i):fe.removeOnSpill?R():A()}}function M(e,n){var t=v(e);ie&&fe.copySortSource&&n===Q&&t.removeChild(W),k(n)?le.emit("cancel",e,Q,Q):le.emit("drop",e,n,Q,oe),j()}function R(){if(le.dragging){var e=ie||W,n=v(e);n&&n.removeChild(e),le.emit(ie?"cancel":"remove",e,n,Q),j()}}function A(e){if(le.dragging){var n=arguments.length>0?e:fe.revertOnSpill,t=ie||W,r=v(t),o=k(r);o===!1&&n&&(ie?r&&r.removeChild(ie):Q.insertBefore(t,re)),o||n?le.emit("cancel",t,Q,Q):le.emit("drop",t,r,Q,oe),j()}}function j(){var e=ie||W;I(),z(),e&&E.rm(e,"gu-transit"),ue&&clearTimeout(ue),le.dragging=!1,ae&&le.emit("out",e,ae,Q),le.emit("dragend",e),Q=W=ie=re=oe=ue=ae=null}function k(e,n){var t;return t=void 0!==n?n:J?oe:g(ie||W),e===Q&&t===re}function q(e,n,r){function o(){var o=t(i);if(o===!1)return!1;var u=H(i,e),c=V(i,u,n,r),a=k(i,c);return a?!0:fe.accepts(W,i,Q,c)}for(var i=e;i&&!o();)i=v(i);return i}function U(e){function n(e){le.emit(e,f,ae,Q)}function t(){s&&n("over")}function r(){ae&&n("out")}if(J){e.preventDefault();var o=y("clientX",e),i=y("clientY",e),u=o-Z,c=i-ee;J.style.left=u+"px",J.style.top=c+"px";var f=ie||W,l=a(J,o,i),d=q(l,o,i),s=null!==d&&d!==ae;(s||null===d)&&(r(),ae=d,t());var p=v(f);if(d===Q&&ie&&!fe.copySortSource)return void(p&&p.removeChild(f));var m,h=H(d,l);if(null!==h)m=V(d,h,o,i);else{if(fe.revertOnSpill!==!0||ie)return void(ie&&p&&p.removeChild(f));m=re,d=Q}(null===m&&s||m!==f&&m!==g(f))&&(oe=m,d.insertBefore(f,m),le.emit("shadow",f,d,Q))}}function _(e){E.rm(e,"gu-hide")}function F(e){le.dragging&&E.add(e,"gu-hide")}function K(){if(!J){var e=W.getBoundingClientRect();J=W.cloneNode(!0),J.style.width=d(e)+"px",J.style.height=s(e)+"px",E.rm(J,"gu-transit"),E.add(J,"gu-mirror"),fe.mirrorContainer.appendChild(J),o(S,"add","mousemove",U),E.add(fe.mirrorContainer,"gu-unselectable"),le.emit("cloned",J,W,"mirror")}}function z(){J&&(E.rm(fe.mirrorContainer,"gu-unselectable"),o(S,"remove","mousemove",U),v(J).removeChild(J),J=null)}function H(e,n){for(var t=n;t!==e&&v(t)!==e;)t=v(t);return t===S?null:t}function V(e,n,t,r){function o(){var n,o,i,u=e.children.length;for(n=0;u>n;n++){if(o=e.children[n],i=o.getBoundingClientRect(),c&&i.left+i.width/2>t)return o;if(!c&&i.top+i.height/2>r)return o}return null}function i(){var e=n.getBoundingClientRect();return u(c?t>e.left+d(e)/2:r>e.top+s(e)/2)}function u(e){return e?g(n):n}var c="horizontal"===fe.direction,a=n!==e?i():o();return a}function $(e,n){return"boolean"==typeof fe.copy?fe.copy:fe.copy(e,n)}var G=arguments.length;1===G&&Array.isArray(e)===!1&&(n=e,e=[]);var J,Q,W,Z,ee,ne,te,re,oe,ie,ue,ce,ae=null,fe=n||{};void 0===fe.moves&&(fe.moves=l),void 0===fe.accepts&&(fe.accepts=l),void 0===fe.invalid&&(fe.invalid=P),void 0===fe.containers&&(fe.containers=e||[]),void 0===fe.isContainer&&(fe.isContainer=f),void 0===fe.copy&&(fe.copy=!1),void 0===fe.copySortSource&&(fe.copySortSource=!1),void 0===fe.revertOnSpill&&(fe.revertOnSpill=!1),void 0===fe.removeOnSpill&&(fe.removeOnSpill=!1),void 0===fe.direction&&(fe.direction="vertical"),void 0===fe.ignoreInputTextSelection&&(fe.ignoreInputTextSelection=!0),void 0===fe.mirrorContainer&&(fe.mirrorContainer=x.body);var le=b({containers:fe.containers,start:Y,end:D,cancel:A,remove:R,destroy:h,canMove:X,dragging:!1});return fe.removeOnSpill===!0&&le.on("over",_).on("out",F),r(),le}function o(e,n,r,o){var i={mouseup:"touchend",mousedown:"touchstart",mousemove:"touchmove"},u={mouseup:"pointerup",mousedown:"pointerdown",mousemove:"pointermove"},c={mouseup:"MSPointerUp",mousedown:"MSPointerDown",mousemove:"MSPointerMove"};t.navigator.pointerEnabled?w[n](e,u[r],o):t.navigator.msPointerEnabled?w[n](e,c[r],o):(w[n](e,i[r],o),w[n](e,r,o))}function i(e){if(void 0!==e.touches)return e.touches.length;if(void 0!==e.which&&0!==e.which)return e.which;if(void 0!==e.buttons)return e.buttons;var n=e.button;return void 0!==n?1&n?1:2&n?3:4&n?2:0:void 0}function u(e){var n=e.getBoundingClientRect();return{left:n.left+c("scrollLeft","pageXOffset"),top:n.top+c("scrollTop","pageYOffset")}}function c(e,n){return"undefined"!=typeof t[n]?t[n]:S.clientHeight?S[e]:x.body[e]}function a(e,n,t){var r,o=e||{},i=o.className;return o.className+=" gu-hide",r=x.elementFromPoint(n,t),o.className=i,r}function f(){return!1}function l(){return!0}function d(e){return e.width||e.right-e.left}function s(e){return e.height||e.bottom-e.top}function v(e){return e.parentNode===x?null:e.parentNode}function p(e){return"INPUT"===e.tagName||"TEXTAREA"===e.tagName||"SELECT"===e.tagName||m(e)}function m(e){return e?"false"===e.contentEditable?!1:"true"===e.contentEditable?!0:m(v(e)):!1}function g(e){function n(){var n=e;do n=n.nextSibling;while(n&&1!==n.nodeType);return n}return e.nextElementSibling||n()}function h(e){return e.targetTouches&&e.targetTouches.length?e.targetTouches[0]:e.changedTouches&&e.changedTouches.length?e.changedTouches[0]:e}function y(e,n){var t=h(n),r={pageX:"clientX",pageY:"clientY"};return e in r&&!(e in t)&&r[e]in t&&(e=r[e]),t[e]}var b=e("contra/emitter"),w=e("crossvent"),E=e("./classes"),x=document,S=x.documentElement;n.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./classes":1,"contra/emitter":5,crossvent:6}],3:[function(e,n,t){n.exports=function(e,n){return Array.prototype.slice.call(e,n)}},{}],4:[function(e,n,t){"use strict";var r=e("ticky");n.exports=function(e,n,t){e&&r(function(){e.apply(t||null,n||[])})}},{ticky:9}],5:[function(e,n,t){"use strict";var r=e("atoa"),o=e("./debounce");n.exports=function(e,n){var t=n||{},i={};return void 0===e&&(e={}),e.on=function(n,t){return i[n]?i[n].push(t):i[n]=[t],e},e.once=function(n,t){return t._once=!0,e.on(n,t),e},e.off=function(n,t){var r=arguments.length;if(1===r)delete i[n];else if(0===r)i={};else{var o=i[n];if(!o)return e;o.splice(o.indexOf(t),1)}return e},e.emit=function(){var n=r(arguments);return e.emitterSnapshot(n.shift()).apply(this,n)},e.emitterSnapshot=function(n){var u=(i[n]||[]).slice(0);return function(){var i=r(arguments),c=this||e;if("error"===n&&t["throws"]!==!1&&!u.length)throw 1===i.length?i[0]:i;return u.forEach(function(r){t.async?o(r,i,c):r.apply(c,i),r._once&&e.off(n,r)}),e}},e}},{"./debounce":4,atoa:3}],6:[function(e,n,t){(function(t){"use strict";function r(e,n,t,r){return e.addEventListener(n,t,r)}function o(e,n,t){return e.attachEvent("on"+n,f(e,n,t))}function i(e,n,t,r){return e.removeEventListener(n,t,r)}function u(e,n,t){var r=l(e,n,t);return r?e.detachEvent("on"+n,r):void 0}function c(e,n,t){function r(){var e;return p.createEvent?(e=p.createEvent("Event"),e.initEvent(n,!0,!0)):p.createEventObject&&(e=p.createEventObject()),e}function o(){return new s(n,{detail:t})}var i=-1===v.indexOf(n)?o():r();e.dispatchEvent?e.dispatchEvent(i):e.fireEvent("on"+n,i)}function a(e,n,r){return function(n){var o=n||t.event;o.target=o.target||o.srcElement,o.preventDefault=o.preventDefault||function(){o.returnValue=!1},o.stopPropagation=o.stopPropagation||function(){o.cancelBubble=!0},o.which=o.which||o.keyCode,r.call(e,o)}}function f(e,n,t){var r=l(e,n,t)||a(e,n,t);return h.push({wrapper:r,element:e,type:n,fn:t}),r}function l(e,n,t){var r=d(e,n,t);if(r){var o=h[r].wrapper;return h.splice(r,1),o}}function d(e,n,t){var r,o;for(r=0;r<h.length;r++)if(o=h[r],o.element===e&&o.type===n&&o.fn===t)return r}var s=e("custom-event"),v=e("./eventmap"),p=t.document,m=r,g=i,h=[];t.addEventListener||(m=o,g=u),n.exports={add:m,remove:g,fabricate:c}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./eventmap":7,"custom-event":8}],7:[function(e,n,t){(function(e){"use strict";var t=[],r="",o=/^on/;for(r in e)o.test(r)&&t.push(r.slice(2));n.exports=t}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],8:[function(e,n,t){(function(e){function t(){try{var e=new r("cat",{detail:{foo:"bar"}});return"cat"===e.type&&"bar"===e.detail.foo}catch(n){}return!1}var r=e.CustomEvent;n.exports=t()?r:"function"==typeof document.createEvent?function(e,n){var t=document.createEvent("CustomEvent");return n?t.initCustomEvent(e,n.bubbles,n.cancelable,n.detail):t.initCustomEvent(e,!1,!1,void 0),t}:function(e,n){var t=document.createEventObject();return t.type=e,n?(t.bubbles=Boolean(n.bubbles),t.cancelable=Boolean(n.cancelable),t.detail=n.detail):(t.bubbles=!1,t.cancelable=!1,t.detail=void 0),t}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],9:[function(e,n,t){var r,o="function"==typeof setImmediate;r=o?function(e){setImmediate(e)}:function(e){setTimeout(e,0)},n.exports=r},{}]},{},[2])(2)});
\ No newline at end of file
src/main/webapp/static/js/jquery/qti/jquery.order.js
+ 89
− 72
View file @ a323da8a
(function ($) {
$.fn.orderInteraction = function(options) {
var settings = $.extend({
responseIdentifier: null,
formDispatchFieldId: null,
initialSourceOrder: null,
initialTargetOrder: null,
responseValue: null,
minChoices: null,
maxChoices: null
}, options );
try {
order(this, settings);
} catch(e) {
if(window.console) console.log(e);
}
$.fn.orderInteraction = function(options) {
var settings = $.extend({
responseIdentifier: null,
formDispatchFieldId: null,
minChoices: null,
maxChoices: null,
responseValue: null,
opened: false
}, options );
try {
console.log(settings.responseValue);
if(typeof settings.responseValue != "undefined" && settings.responseValue.length > 0) {
recalculate(settings);
}
if(settings.opened) {
order(this, settings);
}
} catch(e) {
if(window.console) console.log(e);
}
return this;
};
};
function order($obj, settings) {
var containerId = '#qtiworks_response_' + settings.responseIdentifier;
var sourceList = jQuery(containerId + ' div.source ul');
var targetList = jQuery(containerId + ' div.target ul');
var sourceContainer = jQuery(containerId + ' div.source ul').get(0);
var targetContainer = jQuery(containerId + ' div.target ul').get(0);
var drake = dragula([sourceContainer, targetContainer], {
copy: function (el, source) {
return false;
},
accepts: function (el, target) {
return target !== sourceContainer;
}
});
drake.on('drag', function(el, container) {
//
}).on('over', function(el, container, source){
if(container === targetContainer) {
jQuery(container).addClass('oo-accepted');
}
}).on('drop', function(el, target, source, sibling) {
recalculate(settings);
setFlexiFormDirty(settings.formDispatchFieldId);
}).on('dragend', function(el) {
jQuery(targetContainer).removeClass('oo-accepted');
}).on('out', function(el) {
jQuery(targetContainer).removeClass('oo-accepted');
});
}
function recalculate(settings) {
var containerId = '#qtiworks_response_' + settings.responseIdentifier;
var sourceList = jQuery(containerId + ' div.source ul');
var targetList = jQuery(containerId + ' div.target ul');
function order($obj, settings) {
var containerQuery = jQuery('#qtiworks_response_' + settings.responseIdentifier);
var targetBox = jQuery('#qtiworks_response_' + settings.responseIdentifier + ' div.target');
var sourceList = jQuery('#qtiworks_response_' + settings.responseIdentifier + ' div.source ul');
var targetList = jQuery('#qtiworks_response_' + settings.responseIdentifier + ' div.target ul');
var hiddenInputContainer = jQuery('#qtiworks_response_' + settings.responseIdentifier + ' div.hiddenInputContainer');
var targetBox = jQuery(containerId + ' div.target');
var hiddenInputContainer = jQuery(containerId + ' div.hiddenInputContainer');
/* Add jQuery UI Sortable effect to sourceList */
var listSelector = '#qtiworks_response_' + settings.responseIdentifier + ' ul';
sourceList.sortable({
connectWith: listSelector,
stop: function() {
_sorted(settings);
setFlexiFormDirty(settings.formDispatchFieldId);
}
});
sourceList.disableSelection();
targetList.sortable({
connectWith: listSelector,
stop: function() {
_sorted(settings);
setFlexiFormDirty(settings.formDispatchFieldId);
}
});
targetList.disableSelection();
}
function _sorted(settings) {
var sourceList = jQuery('#qtiworks_response_' + settings.responseIdentifier + ' div.source ul');
var targetList = jQuery('#qtiworks_response_' + settings.responseIdentifier + ' div.target ul');
var selectedCount = targetList.children('li').size();
if (settings.minChoices != null && settings.maxChoices != null) {
if (selectedCount < settings.minChoices || selectedCount > settings.maxChoices) {
if (settings.minChoices != settings.maxChoices) {
alert("You must select and order between "
+ settings.minChoices + " and "
+ settings.maxChoices + " items");
} else {
alert("You must select and order exactly "
+ settings.minChoices + " item"
+ (minChoices > 1 ? "s" : ""));
}
targetBox.toggleClass('highlight', true);
return false;
} else {
targetBox.toggleClass('highlight', false);
}
}
var selectedCount = targetList.children('li').size();
if (settings.minChoices != null && settings.maxChoices != null) {
if (selectedCount < settings.minChoices || selectedCount > settings.maxChoices) {
if (settings.minChoices != settings.maxChoices) {
alert("You must select and order between " + settings.minChoices + " and " + settings.maxChoices + " items");
} else {
alert("You must select and order exactly " + settings.minChoices + " item" + (minChoices>1 ? "s" : ""));
}
targetBox.toggleClass('highlight', true);
return false;
}
else {
targetBox.toggleClass('highlight', false);
}
}
var hiddenInputContainer = jQuery('#qtiworks_response_' + settings.responseIdentifier + ' div.hiddenInputContainer');
var hiddenInputContainer = jQuery(containerId + ' div.hiddenInputContainer');
hiddenInputContainer.empty();
targetList.children('li').each(function(index) {
var choiceId = this.id.substring('qtiworks_response_'.length); // Trim leading 'qtiworks_response_'
var inputElement = jQuery('<input type="hidden">');
inputElement.attr('name', 'qtiworks_response_' + settings.responseIdentifier);
inputElement.attr('value', choiceId);
hiddenInputContainer.append(inputElement);
});
}
hiddenInputContainer.empty();
targetList.children('li').each(function(index) {
var choiceId = this.id.substring('qtiworks_response_'.length); // Trim leading 'qtiworks_response_'
var inputElement = jQuery('<input type="hidden">');
inputElement.attr('name', 'qtiworks_response_' + settings.responseIdentifier);
inputElement.attr('value', choiceId);
hiddenInputContainer.append(inputElement);
});
}
}( jQuery ));
src/main/webapp/static/js/js.plugins.min.css
+ 1
− 1
View file @ a323da8a
This diff is collapsed.
src/main/webapp/static/themes/light/_config.scss
+ 6
− 5
View file @ a323da8a
......@@ -426,11 +426,11 @@ $o-qti-match-drag-border-color : $brand-warning !default;
$o-qti-match-sources-bg : $o-qti-run-infos-bg !default;
$o-qti-match-sources-border-color : $o-qti-run-infos-border-color !default;
$o-qti-match-source-bg : $state-warning-bg !default;
$o-qti-match-source-border-style : dashed !default;
$o-qti-match-source-border-style : dashed !default;
$o-qti-match-selected-border-color : $brand-warning !default;
$o-qti-match-selected-bg : lighten($brand-warning, 25%) !default;
$o-qti-match-selected-bg : lighten($brand-warning, 25%) !default;
$o-qti-match-drop-accept-border-color : darken($brand-info, 25%) !default;
$o-qti-match-target-border-color : $brand-info !default;
$o-qti-match-target-border-color : $brand-info !default;
$o-qti-match-target-bg : $state-info-bg !default;
$o-qti-match-border-radius : $panel-border-radius !default;
$o-qti-order-source-border-style : dashed !default;
......@@ -440,10 +440,11 @@ $o-qti-order-source-bg : $state-warning-bg !default;
$o-qti-order-sources-bg : $o-qti-run-infos-bg !default;
$o-qti-order-drop-accept-border-color : darken($brand-info, 25%) !default;
$o-qti-order-target-bg : $state-info-bg !default;
$o-qti-order-target-border-color : $brand-info !default;
$o-qti-textEntryInteraction-color : $text-color !default;
$o-qti-textEntryInteraction-bg : #fff !default;
$o-qti-textEntryInteraction-border-color : $o-qti-gap-border-color !default;
$o-qti-textEntryInteraction-filled-color : $o-qti-userselection-color !default;
$o-qti-textEntryInteraction-border-color : $o-qti-gap-border-color !default;
$o-qti-textEntryInteraction-filled-color : $o-qti-userselection-color !default;
$o-qti-textEntryInteraction-filled-bg : $o-qti-userselection-bg !default;
$o-qti-textEntryInteraction-filled-border-color : $o-qti-userselection-border-color !default;
......
src/main/webapp/static/themes/light/content.css.map
+ 1
− 1
View file @ a323da8a
This diff is collapsed.
src/main/webapp/static/themes/light/modules/_qti21.scss
+ 22
− 17
View file @ a323da8a
......@@ -416,10 +416,14 @@ img.o_hotspot_responsive[usemap] {
div.box.target {
ul {
border: 2px solid $o-qti-order-drop-accept-border-color;
border: 2px solid $o-qti-order-target-border-color;
border-radius: $o-qti-order-border-radius;
background: $o-qti-order-target-bg;
}
&.oo-accepted {
border-color: $o-qti-order-drop-accept-border-color;
}
}
}
div.box.target.vertical {
......@@ -455,21 +459,6 @@ img.o_hotspot_responsive[usemap] {
list-style-type: none;
margin: 0;
padding: 0;
li {
padding: 10px;
margin-bottom: 10px;
border: 2px $o-qti-order-source-border-style $o-qti-gap-border-color;
border-radius: $o-qti-order-border-radius;
background-color: #ffffff;
background: $o-qti-order-source-bg;
@include clearfix;
span.ui-icon {
position: absolute;
margin-left: -1.3em;
}
}
}
}
......@@ -531,6 +520,22 @@ img.o_hotspot_responsive[usemap] {
}
}
li.o_assessmentitem_order_item {
padding: 10px;
margin-bottom: 10px;
border: 2px $o-qti-order-source-border-style $o-qti-gap-border-color;
border-radius: $o-qti-order-border-radius;
background-color: #ffffff;
background: $o-qti-order-source-bg;
list-style-type: none;
@include clearfix;
}
body>li.o_assessmentitem_order_item {
display:block;
}
/* item display wrapper to distinguish from the item tree */
.o_assessmentitem_wrapper {
.itemTitle {
......
src/main/webapp/static/themes/light/theme.css
+ 1
− 1
View file @ a323da8a
This diff is collapsed.
src/main/webapp/static/themes/light/theme.css.map
+ 1
− 1
View file @ a323da8a
This diff is collapsed.
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