diff --git a/services/QuillLMS/client/app/bundles/Connect/components/misc/diffedResponse.jsx b/services/QuillLMS/client/app/bundles/Connect/components/misc/diffedResponse.jsx index 46253721cd8..b30be3697c4 100644 --- a/services/QuillLMS/client/app/bundles/Connect/components/misc/diffedResponse.jsx +++ b/services/QuillLMS/client/app/bundles/Connect/components/misc/diffedResponse.jsx @@ -1,6 +1,6 @@ +import * as jsDiff from 'diff'; import React, { Component } from 'react'; import { connect } from 'react-redux'; -const jsDiff = require('diff'); export class DiffedResponse extends Component { diff --git a/services/QuillLMS/client/app/bundles/Connect/components/questions/response.tsx b/services/QuillLMS/client/app/bundles/Connect/components/questions/response.tsx index 3368e2a75c5..6bce7a86adc 100644 --- a/services/QuillLMS/client/app/bundles/Connect/components/questions/response.tsx +++ b/services/QuillLMS/client/app/bundles/Connect/components/questions/response.tsx @@ -18,7 +18,7 @@ import ConceptSelectorWithCheckbox from '../shared/conceptSelectorWithCheckbox.j import getBoilerplateFeedback from './boilerplateFeedback.jsx'; import ResponseList from './responseList.jsx'; -const jsDiff = require('diff'); +import * as jsDiff from 'diff'; interface ResponseObj { author: string, diff --git a/services/QuillLMS/client/app/bundles/Connect/components/renderForQuestions/renderEndState.jsx b/services/QuillLMS/client/app/bundles/Connect/components/renderForQuestions/renderEndState.jsx index 6a9ffdd3657..5f3e4510e65 100644 --- a/services/QuillLMS/client/app/bundles/Connect/components/renderForQuestions/renderEndState.jsx +++ b/services/QuillLMS/client/app/bundles/Connect/components/renderForQuestions/renderEndState.jsx @@ -1,8 +1,8 @@ +import * as jsDiff from 'diff'; import React from 'react'; import { connect } from 'react-redux'; import _ from 'underscore'; import { Feedback } from '../../../Shared/index'; -const jsDiff = require('diff'); import { hashToCollection, } from '../../../Shared/index'; diff --git a/services/QuillLMS/client/app/bundles/Connect/libs/diagnosticQuestion.js b/services/QuillLMS/client/app/bundles/Connect/libs/diagnosticQuestion.js index 98e35f0e3e5..3f07e653bd3 100644 --- a/services/QuillLMS/client/app/bundles/Connect/libs/diagnosticQuestion.js +++ b/services/QuillLMS/client/app/bundles/Connect/libs/diagnosticQuestion.js @@ -2,14 +2,13 @@ import fuzzy from 'fuzzyset.js'; import _ from 'underscore'; import constants from '../constants'; import { - checkChangeObjectMatch + checkChangeObjectMatch } from './algorithms/changeObjects'; import { getOptimalResponses, getSubOptimalResponses } from './sharedResponseFunctions'; import quillNormalize from './quillNormalizer'; import { sortByLevenshteinAndOptimal } from './responseTools.js'; -const jsDiff = require('diff'); const ERROR_TYPES = { NO_ERROR: 'NO_ERROR', diff --git a/services/QuillLMS/client/app/bundles/Connect/libs/fillInBlank.js b/services/QuillLMS/client/app/bundles/Connect/libs/fillInBlank.js index c65e66c460f..3d03245b66f 100644 --- a/services/QuillLMS/client/app/bundles/Connect/libs/fillInBlank.js +++ b/services/QuillLMS/client/app/bundles/Connect/libs/fillInBlank.js @@ -2,7 +2,6 @@ import _ from 'underscore'; import constants from '../constants'; import quillNormalize from './quillNormalizer'; import { getOptimalResponses } from './sharedResponseFunctions'; -const jsDiff = require('diff'); const ERROR_TYPES = { NO_ERROR: 'NO_ERROR', diff --git a/services/QuillLMS/client/app/bundles/Connect/libs/question.js b/services/QuillLMS/client/app/bundles/Connect/libs/question.js index a1f5e6c6656..f3b3a201eae 100644 --- a/services/QuillLMS/client/app/bundles/Connect/libs/question.js +++ b/services/QuillLMS/client/app/bundles/Connect/libs/question.js @@ -1,3 +1,4 @@ +import * as jsDiff from 'diff'; import fuzzy from 'fuzzyset.js'; import _ from 'underscore'; import constants from '../constants'; @@ -13,8 +14,7 @@ import { import quillNormalize from './quillNormalizer'; import { checkForMissingWords } from './requiredWords'; import { getOptimalResponses, getTopOptimalResponse } from './sharedResponseFunctions'; - -const jsDiff = require('diff'); +//import * as jsDiff from 'diff'; const ERROR_TYPES = { NO_ERROR: 'NO_ERROR', diff --git a/services/QuillLMS/client/app/bundles/Diagnostic/components/misc/diffedResponse.jsx b/services/QuillLMS/client/app/bundles/Diagnostic/components/misc/diffedResponse.jsx index 46253721cd8..b30be3697c4 100644 --- a/services/QuillLMS/client/app/bundles/Diagnostic/components/misc/diffedResponse.jsx +++ b/services/QuillLMS/client/app/bundles/Diagnostic/components/misc/diffedResponse.jsx @@ -1,6 +1,6 @@ +import * as jsDiff from 'diff'; import React, { Component } from 'react'; import { connect } from 'react-redux'; -const jsDiff = require('diff'); export class DiffedResponse extends Component { diff --git a/services/QuillLMS/client/app/bundles/Diagnostic/components/questions/response.jsx b/services/QuillLMS/client/app/bundles/Diagnostic/components/questions/response.jsx index 238b7f82b4c..6a8be9f23bc 100644 --- a/services/QuillLMS/client/app/bundles/Diagnostic/components/questions/response.jsx +++ b/services/QuillLMS/client/app/bundles/Diagnostic/components/questions/response.jsx @@ -18,7 +18,7 @@ import ConceptSelectorWithCheckbox from '../shared/conceptSelectorWithCheckbox.j import getBoilerplateFeedback from './boilerplateFeedback.jsx'; import ResponseList from './responseList.jsx'; -const jsDiff = require('diff'); +import * as jsDiff from 'diff'; export default class extends React.Component { constructor(props) { diff --git a/services/QuillLMS/client/app/bundles/Diagnostic/libs/diagnosticQuestion.js b/services/QuillLMS/client/app/bundles/Diagnostic/libs/diagnosticQuestion.js index 98e35f0e3e5..3f07e653bd3 100644 --- a/services/QuillLMS/client/app/bundles/Diagnostic/libs/diagnosticQuestion.js +++ b/services/QuillLMS/client/app/bundles/Diagnostic/libs/diagnosticQuestion.js @@ -2,14 +2,13 @@ import fuzzy from 'fuzzyset.js'; import _ from 'underscore'; import constants from '../constants'; import { - checkChangeObjectMatch + checkChangeObjectMatch } from './algorithms/changeObjects'; import { getOptimalResponses, getSubOptimalResponses } from './sharedResponseFunctions'; import quillNormalize from './quillNormalizer'; import { sortByLevenshteinAndOptimal } from './responseTools.js'; -const jsDiff = require('diff'); const ERROR_TYPES = { NO_ERROR: 'NO_ERROR', diff --git a/services/QuillLMS/client/app/bundles/Diagnostic/libs/fillInBlank.js b/services/QuillLMS/client/app/bundles/Diagnostic/libs/fillInBlank.js index c65e66c460f..3d03245b66f 100644 --- a/services/QuillLMS/client/app/bundles/Diagnostic/libs/fillInBlank.js +++ b/services/QuillLMS/client/app/bundles/Diagnostic/libs/fillInBlank.js @@ -2,7 +2,6 @@ import _ from 'underscore'; import constants from '../constants'; import quillNormalize from './quillNormalizer'; import { getOptimalResponses } from './sharedResponseFunctions'; -const jsDiff = require('diff'); const ERROR_TYPES = { NO_ERROR: 'NO_ERROR', diff --git a/services/QuillLMS/client/app/bundles/Diagnostic/libs/question.js b/services/QuillLMS/client/app/bundles/Diagnostic/libs/question.js index a1f5e6c6656..babb10ee4f0 100644 --- a/services/QuillLMS/client/app/bundles/Diagnostic/libs/question.js +++ b/services/QuillLMS/client/app/bundles/Diagnostic/libs/question.js @@ -2,19 +2,19 @@ import fuzzy from 'fuzzyset.js'; import _ from 'underscore'; import constants from '../constants'; import { - checkChangeObjectMatch + checkChangeObjectMatch } from './algorithms/changeObjects'; import { - getFeedbackForMissingWord + getFeedbackForMissingWord } from './algorithms/joiningWords'; import { - spacingBeforePunctuation + spacingBeforePunctuation } from './algorithms/spacingBeforePunctuation'; import quillNormalize from './quillNormalizer'; import { checkForMissingWords } from './requiredWords'; import { getOptimalResponses, getTopOptimalResponse } from './sharedResponseFunctions'; -const jsDiff = require('diff'); +import * as jsDiff from 'diff'; const ERROR_TYPES = { NO_ERROR: 'NO_ERROR', diff --git a/services/QuillLMS/client/app/bundles/Lessons/components/misc/diffedResponse.jsx b/services/QuillLMS/client/app/bundles/Lessons/components/misc/diffedResponse.jsx index 46253721cd8..b30be3697c4 100644 --- a/services/QuillLMS/client/app/bundles/Lessons/components/misc/diffedResponse.jsx +++ b/services/QuillLMS/client/app/bundles/Lessons/components/misc/diffedResponse.jsx @@ -1,6 +1,6 @@ +import * as jsDiff from 'diff'; import React, { Component } from 'react'; import { connect } from 'react-redux'; -const jsDiff = require('diff'); export class DiffedResponse extends Component { diff --git a/services/QuillLMS/client/app/bundles/Lessons/libs/diagnosticQuestion.js b/services/QuillLMS/client/app/bundles/Lessons/libs/diagnosticQuestion.js index 98e35f0e3e5..3f07e653bd3 100644 --- a/services/QuillLMS/client/app/bundles/Lessons/libs/diagnosticQuestion.js +++ b/services/QuillLMS/client/app/bundles/Lessons/libs/diagnosticQuestion.js @@ -2,14 +2,13 @@ import fuzzy from 'fuzzyset.js'; import _ from 'underscore'; import constants from '../constants'; import { - checkChangeObjectMatch + checkChangeObjectMatch } from './algorithms/changeObjects'; import { getOptimalResponses, getSubOptimalResponses } from './sharedResponseFunctions'; import quillNormalize from './quillNormalizer'; import { sortByLevenshteinAndOptimal } from './responseTools.js'; -const jsDiff = require('diff'); const ERROR_TYPES = { NO_ERROR: 'NO_ERROR', diff --git a/services/QuillLMS/client/app/bundles/Lessons/libs/fillInBlank.js b/services/QuillLMS/client/app/bundles/Lessons/libs/fillInBlank.js index c65e66c460f..3d03245b66f 100644 --- a/services/QuillLMS/client/app/bundles/Lessons/libs/fillInBlank.js +++ b/services/QuillLMS/client/app/bundles/Lessons/libs/fillInBlank.js @@ -2,7 +2,6 @@ import _ from 'underscore'; import constants from '../constants'; import quillNormalize from './quillNormalizer'; import { getOptimalResponses } from './sharedResponseFunctions'; -const jsDiff = require('diff'); const ERROR_TYPES = { NO_ERROR: 'NO_ERROR', diff --git a/services/QuillLMS/client/app/bundles/Lessons/libs/question.js b/services/QuillLMS/client/app/bundles/Lessons/libs/question.js index a1f5e6c6656..babb10ee4f0 100644 --- a/services/QuillLMS/client/app/bundles/Lessons/libs/question.js +++ b/services/QuillLMS/client/app/bundles/Lessons/libs/question.js @@ -2,19 +2,19 @@ import fuzzy from 'fuzzyset.js'; import _ from 'underscore'; import constants from '../constants'; import { - checkChangeObjectMatch + checkChangeObjectMatch } from './algorithms/changeObjects'; import { - getFeedbackForMissingWord + getFeedbackForMissingWord } from './algorithms/joiningWords'; import { - spacingBeforePunctuation + spacingBeforePunctuation } from './algorithms/spacingBeforePunctuation'; import quillNormalize from './quillNormalizer'; import { checkForMissingWords } from './requiredWords'; import { getOptimalResponses, getTopOptimalResponse } from './sharedResponseFunctions'; -const jsDiff = require('diff'); +import * as jsDiff from 'diff'; const ERROR_TYPES = { NO_ERROR: 'NO_ERROR',