require jQuery when it is used

Change-Id: Ibbc93ceff7e7863af52d89cf7ef9166e404c59cc Reviewed-on: https://gerrit.instructure.com/106496 Tested-by: Jenkins Reviewed-by: Simon Williams <simon@instructure.com> Reviewed-by: Clay Diffrient <cdiffrient@instructure.com> Product-Review: Ryan Shaw <ryan@instructure.com> QA-Review: Ryan Shaw <ryan@instructure.com>
2017-03-27 14:05:54 -06:00 · 2017-03-27 14:05:54 -06:00 · ee4c1228a3
parent 8c16bbd999
commit ee4c1228a3
17 changed files with 31 additions and 17 deletions
--- a/app/coffeescripts/ember/screenreader_gradebook/tests/integration/item_selection.spec.coffee
+++ b/app/coffeescripts/ember/screenreader_gradebook/tests/integration/item_selection.spec.coffee
@ -1,8 +1,9 @@
 define [
+  'jquery'
  '../start_app'
  'ember'
  '../shared_ajax_fixtures'
-], (startApp, Ember, fixtures) ->
+], ($, startApp, Ember, fixtures) ->

  App = null

--- a/app/coffeescripts/views/profiles/AvatarUploadBaseView.coffee
+++ b/app/coffeescripts/views/profiles/AvatarUploadBaseView.coffee
@ -1,4 +1,4 @@
-define ['Backbone'], (Backbone) ->
+define ['jquery', 'Backbone'], ($, Backbone) ->

  class AvatarUploadBaseView extends Backbone.View

--- a/app/jsx/external_apps/components/ConfigurationTypeSelector.js
+++ b/app/jsx/external_apps/components/ConfigurationTypeSelector.js
@ -1,4 +1,5 @@
 import I18n from 'i18n!external_tools'
+import $ from 'jquery'
 import React from 'react'
 import Header from 'jsx/external_apps/components/Header'
 import ExternalToolsTable from 'jsx/external_apps/components/ExternalToolsTable'
--- a/public/javascripts/str/stripTags.js
+++ b/public/javascripts/str/stripTags.js
@ -1,4 +1,4 @@
-define(["jquery"], function() {
+define(["jquery"], function($) {

  /* Make an html snippet plain text.
   *
--- a/spec/coffeescripts/CollaborationsSpec.coffee
+++ b/spec/coffeescripts/CollaborationsSpec.coffee
@ -1,4 +1,4 @@
-define ['collaborations'], (collaborations) ->
+define ['collaborations', 'jquery', 'jquery.ajaxJSON'], (collaborations, $) ->

  oldAjaxJSON = null
  QUnit.module "Collaborations",
@ -54,4 +54,4 @@ define ['collaborations'], (collaborations) ->
    $("#fixtures").append(dom)
    $.ajaxJSON = (url, method, data, callback)->
      equal url, 'http://url/'
-    collaborations.Events.onExternalContentReady({}, {service_id: 1, contentItems: {}})
+    collaborations.Events.onExternalContentReady({}, {service_id: 1, contentItems: {}})
--- a/spec/coffeescripts/TinymceEditorBoxListSpec.coffee
+++ b/spec/coffeescripts/TinymceEditorBoxListSpec.coffee
@ -1,4 +1,4 @@
-define ['tinymce.editor_box_list'], (EditorBoxList)->
+define ['tinymce.editor_box_list', 'jquery'], (EditorBoxList, $)->
  list = null
  QUnit.module "EditorBoxList",
    setup: ->
--- a/spec/coffeescripts/api/gradingPeriodSetsApiSpec.coffee
+++ b/spec/coffeescripts/api/gradingPeriodSetsApiSpec.coffee
@ -2,7 +2,9 @@ define [
  'axios'
  'helpers/fakeENV',
  'compiled/api/gradingPeriodSetsApi'
-], (axios, fakeENV, api) ->
+  'jquery'
+  'jquery.ajaxJSON'
+], (axios, fakeENV, api, $) ->
  deserializedSets = [
    {
      id: '1',
--- a/spec/coffeescripts/gradebook/GradebookHelpersSpec.coffee
+++ b/spec/coffeescripts/gradebook/GradebookHelpersSpec.coffee
@ -1,7 +1,8 @@
 define [
+  'jquery'
  'compiled/gradebook/GradebookHelpers'
  'jsx/gradebook/shared/constants'
-], (GradebookHelpers, GradebookConstants) ->
+], ($, GradebookHelpers, GradebookConstants) ->
  QUnit.module "GradebookHelpers#noErrorsOnPage",
    setup: ->
      @mockFind = @mock($, "find")
--- a/spec/coffeescripts/gradezilla/GradebookHelpersSpec.coffee
+++ b/spec/coffeescripts/gradezilla/GradebookHelpersSpec.coffee
@ -1,7 +1,8 @@
 define [
+  'jquery'
  'compiled/gradezilla/GradebookHelpers'
  'jsx/gradezilla/shared/constants'
-], (GradebookHelpers, GradebookConstants) ->
+], ($, GradebookHelpers, GradebookConstants) ->
  QUnit.module "GradebookHelpers#noErrorsOnPage",
    setup: ->
      @mockFind = @mock($, "find")
--- a/spec/coffeescripts/jsx/dashboard_card/DashboardCardActionSpec.coffee
+++ b/spec/coffeescripts/jsx/dashboard_card/DashboardCardActionSpec.coffee
@ -1,10 +1,11 @@
 define [
+  'jquery'
  'react'
  'react-dom'
  'react-addons-test-utils'
  'underscore'
  'jsx/dashboard_card/DashboardCardAction'
-], (React, ReactDOM, TestUtils, _, DashboardCardAction) ->
+], ($, React, ReactDOM, TestUtils, _, DashboardCardAction) ->

  QUnit.module 'DashboardCardAction',
    setup: ->
--- a/spec/coffeescripts/jsx/dashboard_card/DashboardCardSpec.coffee
+++ b/spec/coffeescripts/jsx/dashboard_card/DashboardCardSpec.coffee
@ -1,4 +1,5 @@
 define [
+  'jquery'
  'react'
  'react-dom'
  'react-addons-test-utils'
@ -6,7 +7,7 @@ define [
  'jsx/dashboard_card/DashboardCard'
  'jsx/dashboard_card/CourseActivitySummaryStore',
  'helpers/assertions'
-], (React, ReactDOM, TestUtils, _, DashboardCard, CourseActivitySummaryStore, assertions) ->
+], ($, React, ReactDOM, TestUtils, _, DashboardCard, CourseActivitySummaryStore, assertions) ->

  QUnit.module 'DashboardCard',
    setup: ->
--- a/spec/coffeescripts/jsx/due_dates/DueDateAddRowButtonSpec.coffee
+++ b/spec/coffeescripts/jsx/due_dates/DueDateAddRowButtonSpec.coffee
@ -1,10 +1,11 @@
 define [
+  'jquery'
  'react'
  'react-dom'
  'react-addons-test-utils'
  'underscore'
  'jsx/due_dates/DueDateAddRowButton'
-], (React, ReactDOM, {Simulate, SimulateNative}, _, DueDateAddRowButton) ->
+], ($, React, ReactDOM, {Simulate, SimulateNative}, _, DueDateAddRowButton) ->

  QUnit.module 'DueDateAddRowButton with true display prop',
    setup: ->
--- a/spec/coffeescripts/jsx/due_dates/DueDateCalendarsSpec.coffee
+++ b/spec/coffeescripts/jsx/due_dates/DueDateCalendarsSpec.coffee
@ -1,11 +1,12 @@
 define [
+  'jquery'
  'react'
  'react-dom'
  'react-addons-test-utils'
  'underscore'
  'jsx/due_dates/DueDateCalendars'
  'helpers/fakeENV'
-], (React, ReactDOM, {Simulate, SimulateNative}, _, DueDateCalendars, fakeENV) ->
+], ($, React, ReactDOM, {Simulate, SimulateNative}, _, DueDateCalendars, fakeENV) ->

  QUnit.module 'DueDateCalendars',
    setup: ->
--- a/spec/coffeescripts/jsx/due_dates/DueDateRemoveRowLinkSpec.coffee
+++ b/spec/coffeescripts/jsx/due_dates/DueDateRemoveRowLinkSpec.coffee
@ -1,10 +1,11 @@
 define [
+  'jquery'
  'react'
  'react-dom'
  'react-addons-test-utils'
  'underscore'
  'jsx/due_dates/DueDateRemoveRowLink'
-], (React, ReactDOM, {Simulate}, _, DueDateRemoveRowLink) ->
+], ($, React, ReactDOM, {Simulate}, _, DueDateRemoveRowLink) ->

  QUnit.module 'DueDateRemoveRowLink',
    setup: ->
--- a/spec/coffeescripts/jsx/due_dates/DueDateRowSpec.coffee
+++ b/spec/coffeescripts/jsx/due_dates/DueDateRowSpec.coffee
@ -1,11 +1,12 @@
 define [
+  'jquery'
  'react'
  'react-dom'
  'react-addons-test-utils'
  'underscore'
  'jsx/due_dates/DueDateRow'
  'helpers/fakeENV'
-], (React, ReactDOM, {Simulate, SimulateNative}, _, DueDateRow, fakeENV) ->
+], ($, React, ReactDOM, {Simulate, SimulateNative}, _, DueDateRow, fakeENV) ->

  QUnit.module 'DueDateRow with empty props and canDelete true',
    setup: ->
--- a/spec/coffeescripts/jsx/due_dates/DueDatesSpec.coffee
+++ b/spec/coffeescripts/jsx/due_dates/DueDatesSpec.coffee
@ -1,4 +1,5 @@
 define [
+  'jquery'
  'react'
  'react-dom'
  'react-addons-test-utils'
@ -8,7 +9,7 @@ define [
  'jsx/due_dates/StudentGroupStore'
  'compiled/models/AssignmentOverride'
  'helpers/fakeENV'
-], (React, ReactDOM, TestUtils, _, DueDates, OverrideStudentStore, StudentGroupStore, AssignmentOverride, fakeENV) ->
+], ($, React, ReactDOM, TestUtils, _, DueDates, OverrideStudentStore, StudentGroupStore, AssignmentOverride, fakeENV) ->

  findAllByTag = TestUtils.scryRenderedDOMComponentsWithTag
  findAllByClass = TestUtils.scryRenderedDOMComponentsWithClass
--- a/spec/coffeescripts/jsx/external_apps/components/Lti2IframeSpec.coffee
+++ b/spec/coffeescripts/jsx/external_apps/components/Lti2IframeSpec.coffee
@ -1,9 +1,10 @@
 define [
+  'jquery'
  'react'
  'react-dom'
  'react-addons-test-utils'
  'jsx/external_apps/components/Lti2Iframe'
-], (React, ReactDOM, TestUtils, Lti2Iframe) ->
+], ($, React, ReactDOM, TestUtils, Lti2Iframe) ->

  Simulate = TestUtils.Simulate
  wrapper = document.getElementById('fixtures')