upgrade jquery to 1.7.2

when you require ['jquery'] you are now getting the
version of jquery that has our patches applied to it
you should not need to think about the patching as
you write code.

this also applies to jqueryui/dialog, that will return
the patched version of it.

test plan:
make sure javascript still works on our site ;)

Change-Id: I237fa8da5f93167140c4d42b80eb3ef17d95c1e6
Reviewed-on: https://gerrit.instructure.com/9878
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
This commit is contained in:
Ryan Shaw 2012-04-06 11:02:00 -06:00
parent a4b3f14708
commit 605231a418
121 changed files with 3277 additions and 2957 deletions

View File

@ -1,7 +1,7 @@
define [ define [
'jquery' 'jquery'
'jst/AssignmentDetailsDialog' 'jst/AssignmentDetailsDialog'
'jquery.instructure_jquery_patches' # dialog 'jqueryui/dialog'
], ($, assignmentDetailsDialogTemplate) -> ], ($, assignmentDetailsDialogTemplate) ->
class AssignmentDetailsDialog class AssignmentDetailsDialog

View File

@ -4,7 +4,7 @@ define [
'jst/mute_dialog' 'jst/mute_dialog'
'jquery.ajaxJSON' 'jquery.ajaxJSON'
'jquery.disableWhileLoading' 'jquery.disableWhileLoading'
'jquery.instructure_jquery_patches' # dialog 'jqueryui/dialog'
'vendor/jquery.ba-tinypubsub' 'vendor/jquery.ba-tinypubsub'
], (I18n, $, mute_dialog_template) -> ], (I18n, $, mute_dialog_template) ->

View File

@ -5,7 +5,7 @@ define [
'jquery.ajaxJSON' 'jquery.ajaxJSON'
'jquery.disableWhileLoading' 'jquery.disableWhileLoading'
'jquery.instructure_forms' 'jquery.instructure_forms'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_plugins' 'jquery.instructure_misc_plugins'
'vendor/jquery.scrollTo' 'vendor/jquery.scrollTo'
], ($, submissionDetailsDialog) -> ], ($, submissionDetailsDialog) ->

View File

@ -3,7 +3,7 @@ define [
'i18n!calendar' 'i18n!calendar'
'compiled/calendar/EditAppointmentGroupDetails' 'compiled/calendar/EditAppointmentGroupDetails'
'jst/calendar/editAppointmentGroup' 'jst/calendar/editAppointmentGroup'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
], ($, I18n, EditAppointmentGroupDetails, editAppointmentGroupTemplate) -> ], ($, I18n, EditAppointmentGroupDetails, editAppointmentGroupTemplate) ->
dialog = $('<div id="edit_event"><div class="wrapper"></div>').appendTo('body').dialog dialog = $('<div id="edit_event"><div class="wrapper"></div>').appendTo('body').dialog

View File

@ -8,7 +8,7 @@ define [
'compiled/calendar/EditApptCalendarEventDialog' 'compiled/calendar/EditApptCalendarEventDialog'
'compiled/calendar/EditAppointmentGroupDetails' 'compiled/calendar/EditAppointmentGroupDetails'
'jst/calendar/editEvent' 'jst/calendar/editEvent'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jqueryui/tabs' 'jqueryui/tabs'
], ($, I18n, _, CommonEvent, EditCalendarEventDetails, EditAssignmentDetails, EditApptCalendarEventDialog, EditAppointmentGroupDetails, editEventTemplate) -> ], ($, I18n, _, CommonEvent, EditCalendarEventDetails, EditAssignmentDetails, EditApptCalendarEventDialog, EditAppointmentGroupDetails, editEventTemplate) ->

View File

@ -7,7 +7,7 @@ define [
'compiled/calendar/MessageParticipantsDialog' 'compiled/calendar/MessageParticipantsDialog'
'jst/calendar/deleteItem' 'jst/calendar/deleteItem'
'jquery.instructure_date_and_time' 'jquery.instructure_date_and_time'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_plugins' 'jquery.instructure_misc_plugins'
'vendor/jquery.ba-tinypubsub' 'vendor/jquery.ba-tinypubsub'
'vendor/jquery.spin' 'vendor/jquery.spin'

View File

@ -26,7 +26,7 @@ define [
'jquery.ajaxJSON' 'jquery.ajaxJSON'
'jquery.instructure_date_and_time' 'jquery.instructure_date_and_time'
'jquery.instructure_forms' 'jquery.instructure_forms'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_helpers' 'jquery.instructure_misc_helpers'
'jquery.disableWhileLoading' 'jquery.disableWhileLoading'
'jquery.rails_flash_notifications' 'jquery.rails_flash_notifications'

View File

@ -3,7 +3,7 @@ define [
'jst/AssignmentGroupWeightsDialog' 'jst/AssignmentGroupWeightsDialog'
'jquery.ajaxJSON' 'jquery.ajaxJSON'
'jquery.disableWhileLoading' 'jquery.disableWhileLoading'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_helpers' 'jquery.instructure_misc_helpers'
'vendor/jquery.ba-tinypubsub' 'vendor/jquery.ba-tinypubsub'
], ($, assignmentGroupWeightsDialogTemplate) -> class AssignmentGroupWeightsDialog ], ($, assignmentGroupWeightsDialogTemplate) -> class AssignmentGroupWeightsDialog

View File

@ -4,7 +4,7 @@ define [
'jst/CurveGradesDialog' 'jst/CurveGradesDialog'
'jquery.disableWhileLoading' 'jquery.disableWhileLoading'
'jquery.instructure_forms' 'jquery.instructure_forms'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_plugins' 'jquery.instructure_misc_plugins'
'compiled/jquery/fixDialogButtons' 'compiled/jquery/fixDialogButtons'
'vendor/jquery.ba-tinypubsub' 'vendor/jquery.ba-tinypubsub'

View File

@ -19,7 +19,7 @@ define [
'jst/_avatar' #needed by row_student_name 'jst/_avatar' #needed by row_student_name
'jquery.ajaxJSON' 'jquery.ajaxJSON'
'jquery.instructure_date_and_time' 'jquery.instructure_date_and_time'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_helpers' 'jquery.instructure_misc_helpers'
'jquery.instructure_misc_plugins' 'jquery.instructure_misc_plugins'
'vendor/jquery.ba-tinypubsub' 'vendor/jquery.ba-tinypubsub'

View File

@ -10,7 +10,7 @@ define [
'jst/re_upload_submissions_form' 'jst/re_upload_submissions_form'
'underscore' 'underscore'
'jquery.instructure_forms' 'jquery.instructure_forms'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_helpers' 'jquery.instructure_misc_helpers'
'jquery.instructure_misc_plugins' 'jquery.instructure_misc_plugins'
'compiled/jquery.kylemenu' 'compiled/jquery.kylemenu'

View File

@ -5,7 +5,7 @@ define [
'underscore' 'underscore'
'jquery.disableWhileLoading' 'jquery.disableWhileLoading'
'jquery.instructure_forms' 'jquery.instructure_forms'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_plugins' 'jquery.instructure_misc_plugins'
'vendor/jquery.ba-tinypubsub' 'vendor/jquery.ba-tinypubsub'
'compiled/jquery/fixDialogButtons' 'compiled/jquery/fixDialogButtons'

View File

@ -12,7 +12,7 @@ define [
'compiled/fn/preventDefault' 'compiled/fn/preventDefault'
'jquery.instructure_misc_helpers' 'jquery.instructure_misc_helpers'
'jquery.instructure_jquery_patches' # dialog 'jqueryui/dialog'
'jquery.disableWhileLoading' 'jquery.disableWhileLoading'
], (I18n, helpDialogTemplate, INST, htmlEscape, preventDefault) -> ], (I18n, helpDialogTemplate, INST, htmlEscape, preventDefault) ->

View File

@ -3,7 +3,7 @@ define [
'jquery' 'jquery'
'vendor/slickgrid' 'vendor/slickgrid'
'jquery.ajaxJSON' 'jquery.ajaxJSON'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
], (I18n, $, Slick) -> ], (I18n, $, Slick) ->
class FlavorGrid class FlavorGrid

View File

@ -19,7 +19,7 @@
define [ define [
'i18n!license_help' 'i18n!license_help'
'jquery' 'jquery'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_plugins' 'jquery.instructure_misc_plugins'
'jquery.loadingImg' 'jquery.loadingImg'
], (I18n, $) -> ], (I18n, $) ->

View File

@ -4,7 +4,6 @@
define [ define [
'jquery' 'jquery'
'vendor/slickgrid' 'vendor/slickgrid'
'jquery.instructure_jquery_patches'
'vendor/jquery.scrollTo' 'vendor/jquery.scrollTo'
], ($, Slick) -> ], ($, Slick) ->

View File

@ -1,9 +1,3 @@
###
js!requires:
- vendor/jquery-1.6.4.js
- jQuery.ajaxJSON
###
# AJAX Backoff poller # AJAX Backoff poller
# #
# Repeatedly do a given AJAX call until a condition is met or the max number # Repeatedly do a given AJAX call until a condition is met or the max number

View File

@ -19,7 +19,6 @@
define [ define [
'jquery' 'jquery'
'compiled/widget/TokenSelector' 'compiled/widget/TokenSelector'
'jquery.instructure_jquery_patches'
'jquery.instructure_misc_plugins' 'jquery.instructure_misc_plugins'
], ($, TokenSelector) -> ], ($, TokenSelector) ->

View File

@ -19,7 +19,6 @@
define [ define [
'jquery' 'jquery'
'jquery.ajaxJSON' 'jquery.ajaxJSON'
'jquery.instructure_jquery_patches'
'jquery.instructure_misc_helpers' 'jquery.instructure_misc_helpers'
'jquery.disableWhileLoading' 'jquery.disableWhileLoading'
'compiled/jquery/scrollIntoView' 'compiled/jquery/scrollIntoView'

View File

@ -1,7 +1,7 @@
define [ define [
'i18n!rubrics' 'i18n!rubrics'
'jquery' 'jquery'
'jquery.instructure_jquery_patches' # dialog 'jqueryui/dialog'
'vendor/jquery.ba-tinypubsub' 'vendor/jquery.ba-tinypubsub'
], (I18n, $) -> ], (I18n, $) ->

View File

@ -2,7 +2,7 @@ define [
'i18n!slideshow' 'i18n!slideshow'
'jquery' 'jquery'
'str/htmlEscape' 'str/htmlEscape'
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
'jquery.instructure_misc_helpers' 'jquery.instructure_misc_helpers'
], (I18n, $, htmlEscape) -> ], (I18n, $, htmlEscape) ->

View File

@ -101,7 +101,7 @@ require([
'i18nObj' /* I18n.t */, 'i18nObj' /* I18n.t */,
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* getJSON */, 'jquery.ajaxJSON' /* getJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */ 'jqueryui/dialog'
], function(I18n, $) { ], function(I18n, $) {
function testLDAP() { function testLDAP() {

View File

@ -113,7 +113,7 @@ require([
'jquery' /* $ */, 'jquery' /* $ */,
'str/htmlEscape' /* htmlEscape, /\$\.h/ */, 'str/htmlEscape' /* htmlEscape, /\$\.h/ */,
'jquery.instructure_forms' /* formSubmit */, 'jquery.instructure_forms' /* formSubmit */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.rails_flash_notifications' /* flashMessage */, 'jquery.rails_flash_notifications' /* flashMessage */,
'jquery.templateData' /* fillTemplateData */ 'jquery.templateData' /* fillTemplateData */
], function(I18n, $, htmlEscape) { ], function(I18n, $, htmlEscape) {

View File

@ -321,7 +321,7 @@ require([
'jquery.ajaxJSON' /* ajaxJSONPreparedFiles, ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSONPreparedFiles, ajaxJSON */,
'jquery.inst_tree' /* instTree */, 'jquery.inst_tree' /* instTree */,
'jquery.instructure_forms' /* getFormData */, 'jquery.instructure_forms' /* getFormData */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* fragmentChange, showIf, /\.log\(/ */, 'jquery.instructure_misc_plugins' /* fragmentChange, showIf, /\.log\(/ */,
'jquery.templateData' /* getTemplateData */, 'jquery.templateData' /* getTemplateData */,
'media_comments' /* mediaComment */, 'media_comments' /* mediaComment */,

View File

@ -37,7 +37,7 @@
<script> <script>
require([ require([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */ 'jqueryui/dialog'
], function($) { ], function($) {
$("#question_bank_select").change(function() { $("#question_bank_select").change(function() {

View File

@ -99,7 +99,7 @@ require([
'jquery' /* $ */, 'jquery' /* $ */,
'context_modules' /* prerequisites */, 'context_modules' /* prerequisites */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.loadingImg' /* loadingImg, loadingImage */, 'jquery.loadingImg' /* loadingImg, loadingImage */,
'vendor/jquery.scrollTo' /* /\.scrollTo/ */ 'vendor/jquery.scrollTo' /* /\.scrollTo/ */
], function($) { ], function($) {

View File

@ -512,7 +512,7 @@ require([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* time_field, datetime_field */, 'jquery.instructure_date_and_time' /* time_field, datetime_field */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jqueryui/progressbar' /* /\.progressbar/ */, 'jqueryui/progressbar' /* /\.progressbar/ */,
'vendor/scribd.view' /* scribd */ 'vendor/scribd.view' /* scribd */
], function(INST, I18n, $) { ], function(INST, I18n, $) {

View File

@ -3,7 +3,7 @@
require([ require([
'i18nObj' /* I18n.t */, 'i18nObj' /* I18n.t */,
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */ 'jqueryui/dialog'
], function(I18n, $) { ], function(I18n, $) {
window.addGroupCategory = function(callback) { window.addGroupCategory = function(callback) {
$("#add_category_form").dialog('close').dialog({ $("#add_category_form").dialog('close').dialog({

View File

@ -30,7 +30,7 @@
<script> <script>
require([ require([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */ 'jqueryui/dialog'
], function($) { ], function($) {
$(document).ready(function() { $(document).ready(function() {

View File

@ -264,7 +264,6 @@
baseUrl: '<%= js_base_url %>', baseUrl: '<%= js_base_url %>',
paths: { paths: {
common: 'compiled/bundles/common', common: 'compiled/bundles/common',
jquery: 'vendor/jquery-1.6.4',
jqueryui: 'vendor/jqueryui', jqueryui: 'vendor/jqueryui',
uploadify: '../flash/uploadify/jquery.uploadify.v2.1.4', uploadify: '../flash/uploadify/jquery.uploadify.v2.1.4',
use: 'vendor/use' use: 'vendor/use'

View File

@ -27,7 +27,6 @@
priority: ['common'], priority: ['common'],
paths: { paths: {
common: 'compiled/bundles/common', common: 'compiled/bundles/common',
jquery: 'vendor/jquery-1.6.4',
jqueryui: 'vendor/jqueryui', jqueryui: 'vendor/jqueryui',
uploadify: '../flash/uploadify/jquery.uploadify.v2.1.4' uploadify: '../flash/uploadify/jquery.uploadify.v2.1.4'
} }

View File

@ -39,7 +39,7 @@ require([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formErrors */, 'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */, 'jquery.instructure_misc_helpers' /* replaceTags */,
'jquery.instructure_misc_plugins' /* confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf */,
'jquery.loadingImg' /* loadingImage */, 'jquery.loadingImg' /* loadingImage */,

View File

@ -143,7 +143,7 @@ require([
'jst/quiz/move_question', 'jst/quiz/move_question',
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* formSubmit, getFormData, formErrors */, 'jquery.instructure_forms' /* formSubmit, getFormData, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */, 'jquery.instructure_misc_helpers' /* replaceTags */,
'jquery.instructure_misc_plugins' /* confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -230,7 +230,7 @@ tr.question td .number_answer.correct_answer {
require([ require([
'i18nObj' /* I18n.t */, 'i18nObj' /* I18n.t */,
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* scrollSidebar, /\$\.uniq/ */, 'jquery.instructure_misc_helpers' /* scrollSidebar, /\$\.uniq/ */,
'jquery.templateData' /* fillTemplateData, getTemplateData */ 'jquery.templateData' /* fillTemplateData, getTemplateData */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -153,7 +153,6 @@
<script type="text/javascript"> <script type="text/javascript">
require([ require([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_jquery_patches' /* /\.disabled/ */,
'jquery.instructure_misc_plugins' /* /\.log\(/ */ 'jquery.instructure_misc_plugins' /* /\.log\(/ */
], function($) { ], function($) {

View File

@ -43,7 +43,7 @@
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_date_and_time' /* time_field, datetime_field */, 'jquery.instructure_date_and_time' /* time_field, datetime_field */,
'jquery.instructure_forms' /* formSubmit */, 'jquery.instructure_forms' /* formSubmit */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* showIf */, 'jquery.instructure_misc_plugins' /* showIf */,
'jquery.loadingImg' /* loadingImage */ 'jquery.loadingImg' /* loadingImage */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -24,7 +24,7 @@ require([
'i18nObj' /* I18n.t */, 'i18nObj' /* I18n.t */,
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_forms' /* formSubmit, formErrors */, 'jquery.instructure_forms' /* formSubmit, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* showIf */ 'jquery.instructure_misc_plugins' /* showIf */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -45,7 +45,7 @@ require([
'i18nObj' /* I18n.t */, 'i18nObj' /* I18n.t */,
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_forms' /* formSubmit, formErrors */, 'jquery.instructure_forms' /* formSubmit, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* showIf */ 'jquery.instructure_misc_plugins' /* showIf */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -28,7 +28,7 @@ require([
'i18nObj' /* I18n.t */, 'i18nObj' /* I18n.t */,
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* getJSON */, 'jquery.ajaxJSON' /* getJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.rails_flash_notifications' /* flashError */, 'jquery.rails_flash_notifications' /* flashError */,
'jqueryui/progressbar' /* /\.progressbar/ */ 'jqueryui/progressbar' /* /\.progressbar/ */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -5,7 +5,7 @@ require([
'i18nObj', 'i18nObj',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jqueryui/progressbar' /* /\.progressbar/ */ 'jqueryui/progressbar' /* /\.progressbar/ */
], function(INST, I18n, $) { ], function(INST, I18n, $) {

View File

@ -113,7 +113,7 @@
require([ require([
'jquery', 'jquery',
'vendor/swfobject/swfobject', 'vendor/swfobject/swfobject',
'jquery.instructure_jquery_patches', // .dialog patch 'jqueryui/dialog',
'jquery.doc_previews' // loadDocPreview 'jquery.doc_previews' // loadDocPreview
], function($, swfobject, _docPreviews) { ], function($, swfobject, _docPreviews) {
$(document).ready(function(){ $(document).ready(function(){

View File

@ -11,7 +11,7 @@ require([
'i18nObj' /* I18n.t */, 'i18nObj' /* I18n.t */,
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */ 'jqueryui/dialog'
], function(I18n, $) { ], function(I18n, $) {
$(document).ready(function() { $(document).ready(function() {

View File

@ -20,7 +20,6 @@
// paths we have set up (matches require onfig in application.html.erb) // paths we have set up (matches require onfig in application.html.erb)
paths: { paths: {
common: 'compiled/bundles/common', common: 'compiled/bundles/common',
jquery: 'vendor/jquery-1.6.4',
jqueryui: 'vendor/jqueryui', jqueryui: 'vendor/jqueryui',
uploadify: '../flash/uploadify/jquery.uploadify.v2.1.4', uploadify: '../flash/uploadify/jquery.uploadify.v2.1.4',
use: 'vendor/use' use: 'vendor/use'
@ -52,7 +51,7 @@
'i18n', 'i18n',
'str/escapeRegex', 'str/escapeRegex',
'vendor/date', 'vendor/date',
'vendor/jquery-1.6.4', 'jquery',
'str/pluralize', 'str/pluralize',
'INST', 'INST',
'str/htmlEscape', 'str/htmlEscape',

View File

@ -4,7 +4,7 @@ define([
'jquery.ajaxJSON', // ajaxJSON 'jquery.ajaxJSON', // ajaxJSON
'jquery.instructure_date_and_time', // date_field, time_field, datetime_field, /\$\.datetime/ 'jquery.instructure_date_and_time', // date_field, time_field, datetime_field, /\$\.datetime/
'jquery.instructure_forms', // formSubmit, getFormData, validateForm 'jquery.instructure_forms', // formSubmit, getFormData, validateForm
'jquery.instructure_jquery_patches', // /\.dialog/ 'jqueryui/dialog',
'jquery.instructure_misc_helpers', // replaceTags 'jquery.instructure_misc_helpers', // replaceTags
'jquery.instructure_misc_plugins', // confirmDelete, showIf, /\.log/ 'jquery.instructure_misc_plugins', // confirmDelete, showIf, /\.log/
'jquery.loadingImg', // loadingImg, loadingImage 'jquery.loadingImg', // loadingImg, loadingImage

View File

@ -20,7 +20,7 @@ define([
'i18n!accounts.statistics', 'i18n!accounts.statistics',
'jquery', // $ 'jquery', // $
'jquery.ajaxJSON', // ajaxJSON 'jquery.ajaxJSON', // ajaxJSON
'jquery.instructure_jquery_patches', // /\.dialog/ 'jqueryui/dialog', // /\.dialog/
'jquery.instructure_misc_helpers' // replaceTags 'jquery.instructure_misc_helpers' // replaceTags
], function(I18n, $) { ], function(I18n, $) {

View File

@ -20,7 +20,7 @@ define([
'i18n!shared.aligned_outcomes', 'i18n!shared.aligned_outcomes',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.disabled/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* showIf */, 'jquery.instructure_misc_plugins' /* showIf */,
'jquery.templateData' /* fillTemplateData, getTemplateData */, 'jquery.templateData' /* fillTemplateData, getTemplateData */,
'vendor/jquery.scrollTo' /* /\.scrollTo/ */ 'vendor/jquery.scrollTo' /* /\.scrollTo/ */

View File

@ -25,7 +25,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* parseFromISO, dateString, datepicker, time_field, datetime_field, /\$\.datetime/ */, 'jquery.instructure_date_and_time' /* parseFromISO, dateString, datepicker, time_field, datetime_field, /\$\.datetime/ */,
'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formSuggestion */, 'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formSuggestion */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.disabled/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,
'jquery.loadingImg' /* loadingImg, loadingImage */, 'jquery.loadingImg' /* loadingImg, loadingImage */,

View File

@ -25,7 +25,7 @@ define([
'jquery.dropdownList' /* dropdownList */, 'jquery.dropdownList' /* dropdownList */,
'jquery.instructure_date_and_time' /* time_field, datetime_field */, 'jquery.instructure_date_and_time' /* time_field, datetime_field */,
'jquery.instructure_forms' /* formSubmit, formErrors */, 'jquery.instructure_forms' /* formSubmit, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.disabled/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */, 'jquery.instructure_misc_helpers' /* replaceTags */,
'jquery.instructure_misc_plugins' /* fragmentChange */, 'jquery.instructure_misc_plugins' /* fragmentChange */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -25,7 +25,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* parseDateTime, formatDateTime, parseFromISO, dateString, datepicker, date_field, time_field, datetime_field, /\$\.datetime/ */, 'jquery.instructure_date_and_time' /* parseDateTime, formatDateTime, parseFromISO, dateString, datepicker, date_field, time_field, datetime_field, /\$\.datetime/ */,
'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, hideErrors */, 'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, hideErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.disabled/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* encodeToHex, decodeFromHex, replaceTags, /\$\.store/ */, 'jquery.instructure_misc_helpers' /* encodeToHex, decodeFromHex, replaceTags, /\$\.store/ */,
'jquery.instructure_misc_plugins' /* .dim, confirmDelete, fragmentChange, showIf */, 'jquery.instructure_misc_plugins' /* .dim, confirmDelete, fragmentChange, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -5,7 +5,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* date_field */, 'jquery.instructure_date_and_time' /* date_field */,
'jquery.instructure_forms' /* formSubmit */, 'jquery.instructure_forms' /* formSubmit */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* .dim, showIf */, 'jquery.instructure_misc_plugins' /* .dim, showIf */,
'jquery.rails_flash_notifications' /* flashError */, 'jquery.rails_flash_notifications' /* flashError */,
'jqueryui/autocomplete' /* /\.autocomplete/ */, 'jqueryui/autocomplete' /* /\.autocomplete/ */,

View File

@ -20,7 +20,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* fillFormData, getFormData, errorBox */, 'jquery.instructure_forms' /* fillFormData, getFormData, errorBox */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* .dim, confirmDelete, fragmentChange, showIf */, 'jquery.instructure_misc_plugins' /* .dim, confirmDelete, fragmentChange, showIf */,
'jquery.templateData' /* getTemplateData */, 'jquery.templateData' /* getTemplateData */,
'vendor/jquery.scrollTo' /* /\.scrollTo/ */ 'vendor/jquery.scrollTo' /* /\.scrollTo/ */

View File

@ -4,7 +4,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* formSubmit, fillFormData */, 'jquery.instructure_forms' /* formSubmit, fillFormData */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */, 'jquery.instructure_misc_helpers' /* replaceTags */,
'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -21,7 +21,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'str/htmlEscape', 'str/htmlEscape',
'jquery.instructure_date_and_time' /* parseFromISO */, 'jquery.instructure_date_and_time' /* parseFromISO */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */ 'jqueryui/dialog'
], function(INST, I18n, $, htmlEscape) { ], function(INST, I18n, $, htmlEscape) {
INST.lockExplanation = function(data, type) { INST.lockExplanation = function(data, type) {

View File

@ -19,7 +19,7 @@ define([
'i18n!content_tags', 'i18n!content_tags',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_forms' /* formSubmit, fillFormData */, 'jquery.instructure_forms' /* formSubmit, fillFormData */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */, 'jquery.instructure_misc_helpers' /* replaceTags */,
'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange */, 'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange */,
'jquery.loadingImg' /* loadingImage */, 'jquery.loadingImg' /* loadingImage */,

View File

@ -23,7 +23,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* parseFromISO, time_field, datetime_field */, 'jquery.instructure_date_and_time' /* parseFromISO, time_field, datetime_field */,
'jquery.instructure_forms' /* formSubmit, fillFormData, formErrors, errorBox */, 'jquery.instructure_forms' /* formSubmit, fillFormData, formErrors, errorBox */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* /\$\.underscore/ */, 'jquery.instructure_misc_helpers' /* /\$\.underscore/ */,
'jquery.instructure_misc_plugins' /* .dim, confirmDelete, fragmentChange, showIf */, 'jquery.instructure_misc_plugins' /* .dim, confirmDelete, fragmentChange, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -21,7 +21,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* parseFromISO, date_field */, 'jquery.instructure_date_and_time' /* parseFromISO, date_field */,
'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formErrors */, 'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* scrollSidebar */, 'jquery.instructure_misc_helpers' /* scrollSidebar */,
'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -18,7 +18,6 @@
define([ define([
'i18n!dashboard', 'i18n!dashboard',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_jquery_patches' /* windowScrollTop */,
'jquery.instructure_misc_plugins' /* showIf */ 'jquery.instructure_misc_plugins' /* showIf */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -20,7 +20,6 @@ define([
'INST' /* INST */, 'INST' /* INST */,
'jquery' /* $ */, 'jquery' /* $ */,
'ajax_errors' /* INST.log_error */, 'ajax_errors' /* INST.log_error */,
'jquery.instructure_jquery_patches' /* /\.scrollTop/ */,
'jquery.instructure_misc_plugins' /* showIf */, 'jquery.instructure_misc_plugins' /* showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,
'jquery.scrollToVisible' /* scrollToVisible */, 'jquery.scrollToVisible' /* scrollToVisible */,

View File

@ -23,7 +23,7 @@ define([
'find_outcome', 'find_outcome',
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData */, 'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.scrollTop/, windowScrollTop */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */, 'jquery.instructure_misc_helpers' /* replaceTags */,
'jquery.instructure_misc_plugins' /* confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf */,
'jquery.loadingImg' /* loadingImage */, 'jquery.loadingImg' /* loadingImage */,

View File

@ -31,7 +31,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.inst_tree' /* instTree */, 'jquery.inst_tree' /* instTree */,
'jquery.instructure_forms' /* formSubmit, getFormData, formErrors, errorBox */, 'jquery.instructure_forms' /* formSubmit, getFormData, formErrors, errorBox */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags, scrollSidebar */, 'jquery.instructure_misc_helpers' /* replaceTags, scrollSidebar */,
'jquery.instructure_misc_plugins' /* confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf */,
'jquery.loadingImg' /* loadingImage */, 'jquery.loadingImg' /* loadingImage */,

View File

@ -2,7 +2,7 @@ define([
'i18n!external_tools', 'i18n!external_tools',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_forms' /* formSubmit, fillFormData */, 'jquery.instructure_forms' /* formSubmit, fillFormData */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf */,
'jquery.templateData' /* fillTemplateData, getTemplateData */ 'jquery.templateData' /* fillTemplateData, getTemplateData */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -2,7 +2,7 @@ define([
'i18n!find_outcome', 'i18n!find_outcome',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* truncateText */, 'jquery.instructure_misc_helpers' /* truncateText */,
'jquery.templateData' /* fillTemplateData, getTemplateData */ 'jquery.templateData' /* fillTemplateData, getTemplateData */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -23,7 +23,7 @@ define([
'str/htmlEscape', 'str/htmlEscape',
'jquery.instructure_date_and_time' /* parseFromISO, dateString, timeString, date_field, time_field, datetime_field, /\.timepicker/ */, 'jquery.instructure_date_and_time' /* parseFromISO, dateString, timeString, date_field, time_field, datetime_field, /\.timepicker/ */,
'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formErrors */, 'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags, scrollSidebar */, 'jquery.instructure_misc_helpers' /* replaceTags, scrollSidebar */,
'jquery.instructure_misc_plugins' /* ifExists, showIf */, 'jquery.instructure_misc_plugins' /* ifExists, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -27,7 +27,7 @@ define([
'jquery.inst_tree' /* instTree */, 'jquery.inst_tree' /* instTree */,
'jquery.instructure_date_and_time' /* parseFromISO */, 'jquery.instructure_date_and_time' /* parseFromISO */,
'jquery.instructure_forms' /* formSubmit, handlesHTML5Files, ajaxFileUpload, fileData, fillFormData, formErrors */, 'jquery.instructure_forms' /* formSubmit, handlesHTML5Files, ajaxFileUpload, fileData, fillFormData, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.scrollTop/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags, /\$\.underscore/ */, 'jquery.instructure_misc_helpers' /* replaceTags, /\$\.underscore/ */,
'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -28,7 +28,7 @@ define([
'jquery.dropdownList' /* dropdownList */, 'jquery.dropdownList' /* dropdownList */,
'jquery.instructure_date_and_time' /* parseFromISO */, 'jquery.instructure_date_and_time' /* parseFromISO */,
'jquery.instructure_forms' /* formSubmit, getFormData, formErrors, errorBox */, 'jquery.instructure_forms' /* formSubmit, getFormData, formErrors, errorBox */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.scrollTop/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags, /\$\.uniq/, /\$\.size/, /\$\.store/ */, 'jquery.instructure_misc_helpers' /* replaceTags, /\$\.uniq/, /\$\.size/, /\$\.store/ */,
'jquery.instructure_misc_plugins' /* fragmentChange, showIf */, 'jquery.instructure_misc_plugins' /* fragmentChange, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -3,7 +3,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* fillFormData, getFormData */, 'jquery.instructure_forms' /* fillFormData, getFormData */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* ifExists, .dim, undim, confirmDelete */, 'jquery.instructure_misc_plugins' /* ifExists, .dim, undim, confirmDelete */,
'jquery.rails_flash_notifications' /* flashError */, 'jquery.rails_flash_notifications' /* flashError */,
'jquery.templateData' /* fillTemplateData, getTemplateData */, 'jquery.templateData' /* fillTemplateData, getTemplateData */,

View File

@ -31,7 +31,7 @@ define([
'jquery.google-analytics' /* trackEvent */, 'jquery.google-analytics' /* trackEvent */,
'jquery.instructure_date_and_time' /* parseFromISO, dateString */, 'jquery.instructure_date_and_time' /* parseFromISO, dateString */,
'jquery.instructure_forms' /* formSubmit, fillFormData, formErrors */, 'jquery.instructure_forms' /* formSubmit, fillFormData, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* uniqueId, replaceTags, /\$\.uniq/, /\$\.store/, youTubeID */, 'jquery.instructure_misc_helpers' /* uniqueId, replaceTags, /\$\.uniq/, /\$\.store/, youTubeID */,
'jquery.instructure_misc_plugins' /* ifExists, .dim, confirmDelete, showIf, fillWindowWithMe */, 'jquery.instructure_misc_plugins' /* ifExists, .dim, confirmDelete, showIf, fillWindowWithMe */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -21,7 +21,7 @@ define([
'INST' /* INST */, 'INST' /* INST */,
'i18n!instructure', 'i18n!instructure',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */ 'jqueryui/dialog'
], function(INST, I18n, $) { ], function(INST, I18n, $) {
function getTld(hostname){ function getTld(hostname){

View File

@ -19,7 +19,6 @@ define([
'i18n!instructure', 'i18n!instructure',
'jquery' /* jQuery, $ */, 'jquery' /* jQuery, $ */,
'str/htmlEscape', 'str/htmlEscape',
'jquery.instructure_jquery_patches' /* windowScrollTop */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,
'vendor/date' /* Date.parse, Date.UTC, Date.today */, 'vendor/date' /* Date.parse, Date.UTC, Date.today */,
'jqueryui/datepicker' /* /\.datepicker/ */, 'jqueryui/datepicker' /* /\.datepicker/ */,

View File

@ -23,7 +23,6 @@ define([
'jquery.disableWhileLoading' /* disableWhileLoading */, 'jquery.disableWhileLoading' /* disableWhileLoading */,
'jquery.google-analytics' /* trackEvent */, 'jquery.google-analytics' /* trackEvent */,
'jquery.instructure_date_and_time' /* date_field, time_field, datetime_field */, 'jquery.instructure_date_and_time' /* date_field, time_field, datetime_field */,
'jquery.instructure_jquery_patches' /* /\.scrollTop/ */,
'jquery.instructure_misc_helpers' /* uniqueId, /\$\.uniq/ */, 'jquery.instructure_misc_helpers' /* uniqueId, /\$\.uniq/ */,
'jquery.instructure_misc_plugins' /* /\.log\(/ */, 'jquery.instructure_misc_plugins' /* /\.log\(/ */,
'jquery.rails_flash_notifications' /* flashError */, 'jquery.rails_flash_notifications' /* flashError */,

View File

@ -15,14 +15,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
define([ define(['vendor/jquery-1.7.2'], function($) {
'jquery' /* jQuery, $ */,
'vendor/jquery.scrollTo' /* /\.scrollTo/ */,
'jqueryui/dialog'
], function($) {
// have UI dialogs default to modal:true
$.widget('instructure.dialog', $.ui.dialog, { options: {modal: true} });
// This is so that if you disable an element, that it also gives it the class disabled. // This is so that if you disable an element, that it also gives it the class disabled.
// that way you can add css classes for our friend IE6. so rather than using selector:disabled, // that way you can add css classes for our friend IE6. so rather than using selector:disabled,
@ -93,5 +86,5 @@ define([
return ($.browser.safari ? $("body") : $("html")).scrollTop(); return ($.browser.safari ? $("body") : $("html")).scrollTop();
}; };
return $;
}); });

View File

@ -23,7 +23,7 @@ define([
'str/htmlEscape', 'str/htmlEscape',
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* formSuggestion */, 'jquery.instructure_forms' /* formSuggestion */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.scrollTop/, windowScrollTop */, 'jqueryui/dialog',
'vendor/jquery.ba-throttle-debounce' /* throttle */, 'vendor/jquery.ba-throttle-debounce' /* throttle */,
'vendor/jquery.scrollTo' /* /\.scrollTo/ */, 'vendor/jquery.scrollTo' /* /\.scrollTo/ */,
'vendor/jquery.store' /* /\$\.store/ */ 'vendor/jquery.store' /* /\$\.store/ */

View File

@ -19,7 +19,7 @@ define([
'i18n!instructure', 'i18n!instructure',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.scrollToVisible' /* scrollToVisible */, 'jquery.scrollToVisible' /* scrollToVisible */,
'vendor/jquery.ba-hashchange' /* hashchange */, 'vendor/jquery.ba-hashchange' /* hashchange */,
'vendor/jquery.scrollTo' /* /\.scrollTo/ */ 'vendor/jquery.scrollTo' /* /\.scrollTo/ */

3
public/javascripts/jquery.js vendored Normal file
View File

@ -0,0 +1,3 @@
define(['jquery.instructure_jquery_patches'], function($) {
return $;
});

View File

@ -21,7 +21,6 @@
define([ define([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_jquery_patches' /* /\.scrollTop/, windowScrollTop */,
'vendor/jquery.scrollTo' /* /\.scrollTo/ */ 'vendor/jquery.scrollTo' /* /\.scrollTo/ */
], function($) { ], function($) {

View File

@ -22,7 +22,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* parseFromISO */, 'jquery.instructure_date_and_time' /* parseFromISO */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* /\$\.underscore/, /\$\.titleize/ */, 'jquery.instructure_misc_helpers' /* /\$\.underscore/, /\$\.titleize/ */,
'jquery.instructure_misc_plugins' /* confirmDelete */, 'jquery.instructure_misc_plugins' /* confirmDelete */,
'jquery.loadingImg' /* loadingImage */, 'jquery.loadingImg' /* loadingImage */,

View File

@ -22,7 +22,7 @@ define([
'find_outcome', 'find_outcome',
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* formSubmit, fillFormData, formErrors */, 'jquery.instructure_forms' /* formSubmit, fillFormData, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags, /\$\.underscore/ */, 'jquery.instructure_misc_helpers' /* replaceTags, /\$\.underscore/ */,
'jquery.instructure_misc_plugins' /* confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf */,
'jquery.loadingImg' /* loadingImage */, 'jquery.loadingImg' /* loadingImage */,

View File

@ -3,7 +3,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* formSubmit */, 'jquery.instructure_forms' /* formSubmit */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* showIf */, 'jquery.instructure_misc_plugins' /* showIf */,
'jquery.templateData' /* fillTemplateData */ 'jquery.templateData' /* fillTemplateData */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -21,7 +21,7 @@ define([
'instructure-jquery.ui.draggable-patch' /* /\.draggable/ */, 'instructure-jquery.ui.draggable-patch' /* /\.draggable/ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* formSubmit, fillFormData, formErrors */, 'jquery.instructure_forms' /* formSubmit, fillFormData, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */, 'jquery.instructure_misc_helpers' /* replaceTags */,
'jquery.instructure_misc_plugins' /* confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf */,
'jquery.loadingImg' /* loadingImage */, 'jquery.loadingImg' /* loadingImage */,

View File

@ -20,7 +20,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'str/htmlEscape', 'str/htmlEscape',
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* /\$\.h/, /\$\.fileSize/ */, 'jquery.instructure_misc_helpers' /* /\$\.h/, /\$\.fileSize/ */,
'jquery.instructure_misc_plugins' /* .dim, /\.log\(/ */, 'jquery.instructure_misc_plugins' /* .dim, /\.log\(/ */,
'jqueryui/progressbar' /* /\.progressbar/ */, 'jqueryui/progressbar' /* /\.progressbar/ */,

View File

@ -20,7 +20,7 @@ define([
'i18n!message_students', 'i18n!message_students',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_forms' /* formSubmit */, 'jquery.instructure_forms' /* formSubmit */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* showIf */ 'jquery.instructure_misc_plugins' /* showIf */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -23,7 +23,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* parseFromISO */, 'jquery.instructure_date_and_time' /* parseFromISO */,
'jquery.instructure_forms' /* fillFormData, getFormData */, 'jquery.instructure_forms' /* fillFormData, getFormData */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */, 'jquery.instructure_misc_helpers' /* replaceTags */,
'jquery.instructure_misc_plugins' /* showIf */, 'jquery.instructure_misc_plugins' /* showIf */,
'jquery.rails_flash_notifications' /* flashMessage */, 'jquery.rails_flash_notifications' /* flashMessage */,

View File

@ -23,7 +23,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* parseFromISO, time_field, datetime_field */, 'jquery.instructure_date_and_time' /* parseFromISO, time_field, datetime_field */,
'jquery.instructure_forms' /* formSubmit, formErrors, errorBox */, 'jquery.instructure_forms' /* formSubmit, formErrors, errorBox */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, fragmentChange, showIf */,
'jquery.loadingImg' /* loadingImage */, 'jquery.loadingImg' /* loadingImage */,
'jquery.templateData' /* fillTemplateData */, 'jquery.templateData' /* fillTemplateData */,

View File

@ -21,7 +21,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_forms' /* formErrors */, 'jquery.instructure_forms' /* formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_plugins' /* confirmDelete */, 'jquery.instructure_misc_plugins' /* confirmDelete */,
'jquery.templateData' /* getTemplateData */ 'jquery.templateData' /* getTemplateData */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -1,7 +1,7 @@
define([ define([
'i18n!quizzes.rubric', 'i18n!quizzes.rubric',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */ 'jqueryui/dialog'
], function(I18n, $) { ], function(I18n, $) {
$(document).ready(function() { $(document).ready(function() {

View File

@ -20,7 +20,7 @@ define([
'i18n!quizzes.show', 'i18n!quizzes.show',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.instructure_date_and_time' /* dateString, time_field, datetime_field */, 'jquery.instructure_date_and_time' /* dateString, time_field, datetime_field */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* scrollSidebar */, 'jquery.instructure_misc_helpers' /* scrollSidebar */,
'jquery.instructure_misc_plugins' /* ifExists, confirmDelete */, 'jquery.instructure_misc_plugins' /* ifExists, confirmDelete */,
'message_students' /* messageStudents */ 'message_students' /* messageStudents */

View File

@ -26,7 +26,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* time_field, datetime_field */, 'jquery.instructure_date_and_time' /* time_field, datetime_field */,
'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formErrors, errorBox */, 'jquery.instructure_forms' /* formSubmit, fillFormData, getFormData, formErrors, errorBox */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags, scrollSidebar, /\$\.underscore/, truncateText */, 'jquery.instructure_misc_helpers' /* replaceTags, scrollSidebar, /\$\.underscore/, truncateText */,
'jquery.instructure_misc_plugins' /* .dim, confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* .dim, confirmDelete, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -20,7 +20,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'str/htmlEscape', 'str/htmlEscape',
'jquery.instructure_forms' /* fillFormData */, 'jquery.instructure_forms' /* fillFormData */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.scrollTop/, windowScrollTop */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* truncateText */, 'jquery.instructure_misc_helpers' /* truncateText */,
'jquery.instructure_misc_plugins' /* showIf */, 'jquery.instructure_misc_plugins' /* showIf */,
'jquery.templateData' /* fillTemplateData, getTemplateData */, 'jquery.templateData' /* fillTemplateData, getTemplateData */,

View File

@ -4,7 +4,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* time_field, datetime_field */, 'jquery.instructure_date_and_time' /* time_field, datetime_field */,
'jquery.instructure_forms' /* formSubmit, formErrors */, 'jquery.instructure_forms' /* formSubmit, formErrors */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */, 'jquery.instructure_misc_helpers' /* replaceTags */,
'jquery.instructure_misc_plugins' /* confirmDelete, showIf */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -22,7 +22,7 @@ define([
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSONFiles, ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSONFiles, ajaxJSON */,
'jquery.instructure_forms' /* getFormData, errorBox */, 'jquery.instructure_forms' /* getFormData, errorBox */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags, getUserServices, findLinkForService */, 'jquery.instructure_misc_helpers' /* replaceTags, getUserServices, findLinkForService */,
'jquery.instructure_misc_plugins' /* showIf */, 'jquery.instructure_misc_plugins' /* showIf */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -19,7 +19,7 @@ define([
'i18n!site_admin', 'i18n!site_admin',
'jquery' /* $ */, 'jquery' /* $ */,
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags */ 'jquery.instructure_misc_helpers' /* replaceTags */
], function(I18n, $) { ], function(I18n, $) {

View File

@ -27,7 +27,7 @@ define([
'jquery.ajaxJSON' /* getJSON, ajaxJSONFiles, ajaxJSON */, 'jquery.ajaxJSON' /* getJSON, ajaxJSONFiles, ajaxJSON */,
'jquery.doc_previews' /* loadDocPreview */, 'jquery.doc_previews' /* loadDocPreview */,
'jquery.instructure_date_and_time' /* parseFromISO */, 'jquery.instructure_date_and_time' /* parseFromISO */,
'jquery.instructure_jquery_patches' /* /\.dialog/, /\.scrollTop/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* replaceTags, /\$\.store/ */, 'jquery.instructure_misc_helpers' /* replaceTags, /\$\.store/ */,
'jquery.instructure_misc_plugins' /* confirmDelete, showIf, hasScrollbar */, 'jquery.instructure_misc_plugins' /* confirmDelete, showIf, hasScrollbar */,
'jquery.keycodes' /* keycodes */, 'jquery.keycodes' /* keycodes */,

View File

@ -21,7 +21,6 @@ define([
'jquery', 'jquery',
'jquery.ajaxJSON' /* ajaxJSONFiles, ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSONFiles, ajaxJSON */,
'jquery.instructure_date_and_time' /* parseFromISO */, 'jquery.instructure_date_and_time' /* parseFromISO */,
'jquery.instructure_jquery_patches' /* /\.scrollTop/ */,
'jquery.instructure_misc_plugins' /* fragmentChange, showIf */, 'jquery.instructure_misc_plugins' /* fragmentChange, showIf */,
'jquery.loadingImg' /* loadingImg, loadingImage */, 'jquery.loadingImg' /* loadingImg, loadingImage */,
'jquery.templateData' /* fillTemplateData, getTemplateData */, 'jquery.templateData' /* fillTemplateData, getTemplateData */,

View File

@ -23,7 +23,7 @@ define([
'jquery.ajaxJSON' /* ajaxJSON */, 'jquery.ajaxJSON' /* ajaxJSON */,
'jquery.instructure_date_and_time' /* friendlyDatetime, friendlyDate */, 'jquery.instructure_date_and_time' /* friendlyDatetime, friendlyDate */,
'jquery.instructure_forms' /* getFormData, errorBox */, 'jquery.instructure_forms' /* getFormData, errorBox */,
'jquery.instructure_jquery_patches' /* /\.dialog/ */, 'jqueryui/dialog',
'jquery.instructure_misc_helpers' /* scrollSidebar */, 'jquery.instructure_misc_helpers' /* scrollSidebar */,
'jquery.rails_flash_notifications' /* flashMessage */, 'jquery.rails_flash_notifications' /* flashMessage */,
'compiled/tinymce', 'compiled/tinymce',

View File

@ -37,7 +37,6 @@ define([
//'compiled/tinymce', // required, but the bundles that ACTUALLY use //'compiled/tinymce', // required, but the bundles that ACTUALLY use
// tiny can require it themselves // tiny can require it themselves
'instructure-jquery.ui.draggable-patch' /* /\.draggable/ */, 'instructure-jquery.ui.draggable-patch' /* /\.draggable/ */,
'jquery.instructure_jquery_patches' /* /\.scrollTop/ */,
'jquery.instructure_misc_helpers' /* /\$\.uniq/ */, 'jquery.instructure_misc_helpers' /* /\$\.uniq/ */,
'jquery.instructure_misc_plugins' /* /\.indicate/ */, 'jquery.instructure_misc_plugins' /* /\.indicate/ */,
'vendor/jquery.scrollTo' /* /\.scrollTo/ */, 'vendor/jquery.scrollTo' /* /\.scrollTo/ */,

View File

@ -24,7 +24,7 @@ define([
'i18n!editor', 'i18n!editor',
'jquery', 'jquery',
'str/htmlEscape', 'str/htmlEscape',
'jquery.instructure_jquery_patches', 'jqueryui/dialog',
'jquery.instructure_misc_helpers' 'jquery.instructure_misc_helpers'
], function(tinymce, I18n, $, htmlEscape) { ], function(tinymce, I18n, $, htmlEscape) {

View File

@ -19,7 +19,7 @@
define([ define([
'compiled/editor/stocktiny', 'compiled/editor/stocktiny',
'jquery', 'jquery',
'jquery.instructure_jquery_patches', 'jqueryui/dialog',
'mathquill' 'mathquill'
], function(tinymce, $) { ], function(tinymce, $) {

View File

@ -19,7 +19,7 @@
define([ define([
'compiled/editor/stocktiny', 'compiled/editor/stocktiny',
'jquery', 'jquery',
'jquery.instructure_jquery_patches' 'jqueryui/dialog'
], function(tinymce, $) { ], function(tinymce, $) {
tinymce.create('tinymce.plugins.InstructureEquella', { tinymce.create('tinymce.plugins.InstructureEquella', {

View File

@ -25,8 +25,8 @@ define([
'jquery', 'jquery',
'str/htmlEscape', 'str/htmlEscape',
'jquery.dropdownList', 'jquery.dropdownList',
'jquery.instructure_jquery_patches',
'jquery.instructure_misc_helpers', 'jquery.instructure_misc_helpers',
'jqueryui/dialog',
'jquery.instructure_misc_plugins', 'jquery.instructure_misc_plugins',
], function(tinymce, I18n, $, htmlEscape) { ], function(tinymce, I18n, $, htmlEscape) {

View File

@ -21,8 +21,8 @@ define([
'compiled/editor/stocktiny', 'compiled/editor/stocktiny',
'jquery', 'jquery',
'vendor/scribd.view', 'vendor/scribd.view',
'jquery.instructure_jquery_patches',
'jquery.instructure_misc_helpers', 'jquery.instructure_misc_helpers',
'jqueryui/dialog',
'jquery.instructure_misc_plugins', 'jquery.instructure_misc_plugins',
], function(require, tinymce, $, scribd) { ], function(require, tinymce, $, scribd) {

Some files were not shown because too many files have changed in this diff Show More