Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Breaking/tdr 10 upgrade jquery #87

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Breaking/tdr 10 upgrade jquery #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b95aedd
version bump
krampstudio Nov 29, 2019
647bfc0
update eslint to ensure fixed vuln
krampstudio Nov 29, 2019
3327c08
use temporary branches for deps
krampstudio Dec 2, 2019
27f1ab1
migrate props for jquery compat
krampstudio Dec 13, 2019
5591c77
update qunit test runner
krampstudio Dec 13, 2019
e54b2cd
Merge branch 'develop' into breaking/TDR-10_upgrade-jquery
krampstudio Jan 6, 2020
2ebc0f7
change build cluster
krampstudio Jan 6, 2020
acb8c36
trigger build
krampstudio Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pipeline {
agent {
label 'master'
label 'builder'
}
stages {
stage('Frontend Tests') {
Expand All @@ -20,7 +20,7 @@ pipeline {
steps {
sh(
label: 'Setup frontend toolchain',
script: 'npm install'
script: 'npm i'
)
sh (
label : 'Run frontend tests',
Expand Down
1,219 changes: 609 additions & 610 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oat-sa/tao-test-runner-qti",
"version": "0.14.0",
"version": "1.0.0",
"description": "TAO Test Runner QTI implementation",
"files": [
"dist",
Expand Down Expand Up @@ -48,26 +48,26 @@
"@oat-sa/browserslist-config-tao": "^0.1.0",
"@oat-sa/expr-eval": "1.3.0",
"@oat-sa/rollup-plugin-wildcard-external": "^0.1.0",
"@oat-sa/tao-core-libs": "^0.3.0",
"@oat-sa/tao-core-sdk": "^0.8.1",
"@oat-sa/tao-core-ui": "^0.26.0",
"@oat-sa/tao-item-runner": "^0.3.1",
"@oat-sa/tao-item-runner-qti": "^0.3.2",
"@oat-sa/tao-qunit-testrunner": "^0.1.3",
"@oat-sa/tao-test-runner": "^0.5.0",
"@oat-sa/tao-core-libs": "oat-sa/tao-core-libs-fe#breaking/TDR-10_upgrade-jquery",
"@oat-sa/tao-core-sdk": "oat-sa/tao-core-sdk-fe#breaking/TDR-10_upgrade-jquery",
"@oat-sa/tao-core-ui": "oat-sa/tao-core-ui-fe#breaking/TDR-10_upgrade-jquery",
"@oat-sa/tao-item-runner": "oat-sa/tao-item-runner-fe#breaking/TDR-10_upgrade-jquery",
"@oat-sa/tao-item-runner-qti": "oat-sa/tao-item-runner-qti-fe#breaking/TDR-10_upgrade-jquery",
"@oat-sa/tao-test-runner": "oat-sa/tao-test-runner-fe#breaking/TDR-10_upgrade-jquery",
"@oat-sa/tao-qunit-testrunner": "^1.0.3",
"async": "0.2.10",
"autoprefixer": "^9.6.1",
"decimal.js": "10.1.1",
"dompurify": "1.0.11",
"eslint": "^6.0.1",
"eslint-plugin-es": "^1.4.0",
"eslint": "^6.7.0",
"eslint-plugin-es": "^1.4.1",
"eslint-plugin-jsdoc": "^8.7.0",
"gamp": "0.2.1",
"glob": "^7.1.4",
"glob-promise": "^3.4.0",
"handlebars": "1.3.0",
"interactjs": "1.3.4",
"jquery": "1.9.1",
"jquery": "2.2.4",
"jquery-mockjax": "^2.5.0",
"lodash": "2.4.1",
"moment": "2.11.1",
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/offlineSyncModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function offlineSyncModalFactory(proxy) {
$countdown.html(__('The download will be available in <strong>%d</strong> seconds', delaySec));
if (delaySec < 1) {
this.stop();
$secondaryButton.removeProp('disabled');
$secondaryButton.prop('disabled', false);
$countdown.html('');
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/content/dialog/itemInlineMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default pluginFactory({
* Enable the button
*/
enable: function enable() {
this.$button.removeProp('disabled').removeClass('disabled');
this.$button.prop('disabled', false).removeClass('disabled');
},

disable: function disable() {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/content/rubricBlock/rubricBlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export default pluginFactory({
* Enable the container
*/
enable: function enable() {
this.$element.removeProp('disabled').removeClass('disabled');
this.$element.prop('disabled', false).removeClass('disabled');
},

/**
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/navigation/next.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export default pluginFactory({
* Enable the button
*/
enable: function enable() {
this.$element.removeProp('disabled').removeClass('disabled');
this.$element.prop('disabled', false).removeClass('disabled');
},

/**
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/navigation/nextSection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export default pluginFactory({
* Enable the button
*/
enable: function enable() {
this.$element.removeProp('disabled').removeClass('disabled');
this.$element.prop('disabled', false).removeClass('disabled');
},

/**
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/navigation/previous.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ export default pluginFactory({
* Enable the button
*/
enable: function enable() {
this.$element.removeProp('disabled').removeClass('disabled');
this.$element.prop('disabled', false).removeClass('disabled');
},

/**
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/navigation/skip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export default pluginFactory({
* Enable the button
*/
enable: function enable() {
this.$element.removeProp('disabled').removeClass('disabled');
this.$element.prop('disabled', false).removeClass('disabled');
},

/**
Expand Down
2 changes: 1 addition & 1 deletion src/ui/toolbox/entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export default function itemComponentFactory(specs, defaults) {
.setTemplate(entryTpl)
.on('enable', function() {
if (this.is('rendered')) {
this.$component.removeProp('disabled');
this.$component.prop('disabled', false);
}
})
.on('disable', function() {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/toolbox/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ export default function menuComponentFactory(specs, defaults) {
.setTemplate(menuTpl)
.on('enable', function enable() {
if (this.is('rendered')) {
this.$component.removeProp('disabled');
this.$component.prop('disabled', false);
}
})
.on('disable', function disable() {
Expand Down