= speedEntries.length-1 ?
+ return speedEntries.eq(index >= speedEntries.length - 1 ?
0 :
index + 1);
};
- beforeEach(function () {
+ beforeEach(function() {
state = jasmine.initializePlayer();
videoTracks = $('li.video-tracks');
container = videoTracks.children('div.a11y-menu-container');
@@ -104,7 +104,7 @@
spyOn($.fn, 'focus').and.callThrough();
});
- it('open/close the menu on mouseenter/mouseleave', function () {
+ it('open/close the menu on mouseenter/mouseleave', function() {
container.mouseenter();
expect(container).toHaveClass('open');
container.mouseleave();
@@ -112,72 +112,72 @@
});
it('do not close the menu on mouseleave if a menu item has ' +
- 'focus', function () {
+ 'focus', function() {
// Open menu. Focus is on last menu item.
container.trigger(keyPressEvent(KEY.ENTER));
container.mouseenter().mouseleave();
expect(container).toHaveClass('open');
});
- it('close the menu on click', function () {
+ it('close the menu on click', function() {
container.mouseenter().click();
expect(container).not.toHaveClass('open');
});
- it('close the menu on outside click', function () {
+ it('close the menu on outside click', function() {
container.trigger(keyPressEvent(KEY.ENTER));
$(window).click();
expect(container).not.toHaveClass('open');
});
- it('open the menu on ENTER keydown', function () {
+ it('open the menu on ENTER keydown', function() {
container.trigger(keyPressEvent(KEY.ENTER));
expect(container).toHaveClass('open');
expect(menuItemsLinks.last().focus).toHaveBeenCalled();
});
- it('open the menu on SPACE keydown', function () {
+ it('open the menu on SPACE keydown', function() {
container.trigger(keyPressEvent(KEY.SPACE));
expect(container).toHaveClass('open');
expect(menuItemsLinks.last().focus).toHaveBeenCalled();
});
- it('open the menu on UP keydown', function () {
+ it('open the menu on UP keydown', function() {
container.trigger(keyPressEvent(KEY.UP));
expect(container).toHaveClass('open');
expect(menuItemsLinks.last().focus).toHaveBeenCalled();
});
- it('close the menu on ESCAPE keydown', function () {
+ it('close the menu on ESCAPE keydown', function() {
container.trigger(keyPressEvent(KEY.ESCAPE));
expect(container).not.toHaveClass('open');
});
it('UP and DOWN keydown function as expected on menu items',
- function () {
+ function() {
// Iterate through list in both directions and check if
// things wrap up correctly.
- var lastEntry = menuItemsLinks.length-1, i;
+ var lastEntry = menuItemsLinks.length - 1, i;
// First open menu
- container.trigger(keyPressEvent(KEY.UP));
+ container.trigger(keyPressEvent(KEY.UP));
// Iterate with UP key until we have looped.
- for (i = lastEntry; i >= 0; i--) {
- menuItemsLinks.eq(i).trigger(keyPressEvent(KEY.UP));
- }
+ for (i = lastEntry; i >= 0; i--) {
+ menuItemsLinks.eq(i).trigger(keyPressEvent(KEY.UP));
+ }
// Iterate with DOWN key until we have looped.
- for (i = 0; i <= lastEntry; i++) {
- menuItemsLinks.eq(i).trigger(keyPressEvent(KEY.DOWN));
- }
+ for (i = 0; i <= lastEntry; i++) {
+ menuItemsLinks.eq(i).trigger(keyPressEvent(KEY.DOWN));
+ }
// Test if each element has been called twice.
- expect($.fn.focus.calls.count())
- .toEqual(2*menuItemsLinks.length+1);
- });
+ expect($.fn.focus.calls.count())
+ .toEqual(2 * menuItemsLinks.length + 1);
+ });
- it('ESC keydown on menu item closes menu', function () {
+ it('ESC keydown on menu item closes menu', function() {
// First open menu. Focus is on last speed entry.
container.trigger(keyPressEvent(KEY.UP));
menuItemsLinks.last().trigger(keyPressEvent(KEY.ESCAPE));
@@ -189,12 +189,12 @@
});
it('ENTER keydown on menu item selects its data and closes menu',
- function () {
+ function() {
// First open menu.
- container.trigger(keyPressEvent(KEY.UP));
+ container.trigger(keyPressEvent(KEY.UP));
// Focus on '.txt'
- menuItemsLinks.eq(0).focus();
- menuItemsLinks.eq(0).trigger(keyPressEvent(KEY.ENTER));
+ menuItemsLinks.eq(0).focus();
+ menuItemsLinks.eq(0).trigger(keyPressEvent(KEY.ENTER));
// Menu is closed, focus has been returned to container
// and file format is '.txt'.
@@ -204,15 +204,15 @@
.toHaveClass('active');
expect($('.speeds p.active')).toHaveHtml('1.50x');
*/
- });
+ });
it('SPACE keydown on menu item selects its data and closes menu',
- function () {
+ function() {
// First open menu.
- container.trigger(keyPressEvent(KEY.UP));
+ container.trigger(keyPressEvent(KEY.UP));
// Focus on '.txt'
- menuItemsLinks.eq(0).focus();
- menuItemsLinks.eq(0).trigger(keyPressEvent(KEY.SPACE));
+ menuItemsLinks.eq(0).focus();
+ menuItemsLinks.eq(0).trigger(keyPressEvent(KEY.SPACE));
// Menu is closed, focus has been returned to container
// and file format is '.txt'.
@@ -222,11 +222,11 @@
.toHaveClass('active');
expect($('.speeds p.active')).toHaveHtml('1.50x');
*/
- });
+ });
// TO DO? No such behavior implemented.
xit('TAB + SHIFT keydown on speed entry closes menu and gives ' +
- 'focus to Play/Pause control', function () {
+ 'focus to Play/Pause control', function() {
// First open menu. Focus is on last speed entry.
speedControl.trigger(keyPressEvent(KEY.UP));
speedEntries.last().trigger(tabBackPressEvent());
@@ -239,7 +239,7 @@
// TO DO? No such behavior implemented.
xit('TAB keydown on speed entry closes menu and gives focus ' +
- 'to Volume control', function () {
+ 'to Volume control', function() {
// First open menu. Focus is on last speed entry.
speedControl.trigger(keyPressEvent(KEY.UP));
speedEntries.last().trigger(tabForwardPressEvent());
@@ -253,9 +253,9 @@
});
// TODO
- xdescribe('change file format', function () {
- describe('when new file format is not the same', function () {
- beforeEach(function () {
+ xdescribe('change file format', function() {
+ describe('when new file format is not the same', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoSpeedControl.setSpeed(1.0);
spyOn(state.videoPlayer, 'onSpeedChange').and.callThrough();
@@ -263,7 +263,7 @@
$('li[data-speed="0.75"] .speed-link').click();
});
- it('trigger speedChange event', function () {
+ it('trigger speedChange event', function() {
expect(state.videoPlayer.onSpeedChange).toHaveBeenCalled();
expect(state.videoSpeedControl.currentSpeed).toEqual(0.75);
});
@@ -271,14 +271,14 @@
});
// TODO
- xdescribe('onSpeedChange', function () {
- beforeEach(function () {
+ xdescribe('onSpeedChange', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
$('li[data-speed="1.0"] .speed-link').addClass('active');
state.videoSpeedControl.setSpeed(0.75);
});
- it('set the new speed as active', function () {
+ it('set the new speed as active', function() {
expect($('.video_speeds li[data-speed="1.0"]'))
.not.toHaveClass('active');
expect($('.video_speeds li[data-speed="0.75"]'))
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_bumper_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_bumper_spec.js
index f6db02602d..badfb7b6ce 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_bumper_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_bumper_spec.js
@@ -1,15 +1,15 @@
-(function (WAIT_TIMEOUT) {
+(function(WAIT_TIMEOUT) {
'use strict';
- describe('VideoBumper', function () {
+ describe('VideoBumper', function() {
var state, oldOTBD, waitForPlaying;
- waitForPlaying = function (state, done) {
- jasmine.waitUntil(function () {
+ waitForPlaying = function(state, done) {
+ jasmine.waitUntil(function() {
return state.el.hasClass('is-playing');
}).done(done);
};
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice').and.returnValue(null);
@@ -18,7 +18,7 @@
jasmine.clock().install();
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
state.storage.clear();
if (state.bumperState && state.bumperState.videoPlayer) {
@@ -31,39 +31,39 @@
jasmine.clock().uninstall();
});
- it('can render the bumper video', function () {
+ it('can render the bumper video', function() {
expect($('.is-bumper')).toExist();
});
- it('can show the main video on error', function (done) {
+ it('can show the main video on error', function(done) {
state.el.triggerHandler('error');
jasmine.clock().tick(20);
expect($('.is-bumper')).not.toExist();
waitForPlaying(state, done);
});
- it('can show the main video once bumper ends', function (done) {
+ it('can show the main video once bumper ends', function(done) {
state.el.trigger('ended');
jasmine.clock().tick(20);
expect($('.is-bumper')).not.toExist();
waitForPlaying(state, done);
});
- it('can show the main video on skip', function (done) {
+ it('can show the main video on skip', function(done) {
state.bumperState.videoBumper.skip();
jasmine.clock().tick(20);
expect($('.is-bumper')).not.toExist();
waitForPlaying(state, done);
});
- it('can stop the bumper video playing if it is too long', function (done) {
+ it('can stop the bumper video playing if it is too long', function(done) {
state.el.trigger('timeupdate', [state.bumperState.videoBumper.maxBumperDuration + 1]);
jasmine.clock().tick(20);
expect($('.is-bumper')).not.toExist();
waitForPlaying(state, done);
});
- it('can save appropriate states correctly on ended', function () {
+ it('can save appropriate states correctly on ended', function() {
var saveState = jasmine.createSpy('saveState');
state.bumperState.videoSaveStatePlugin.saveState = saveState;
state.el.trigger('ended');
@@ -72,7 +72,7 @@
bumper_last_view_date: true});
});
- it('can save appropriate states correctly on skip', function () {
+ it('can save appropriate states correctly on skip', function() {
var saveState = jasmine.createSpy('saveState');
state.bumperState.videoSaveStatePlugin.saveState = saveState;
state.bumperState.videoBumper.skip();
@@ -82,7 +82,7 @@
bumper_last_view_date: true});
});
- it('can save appropriate states correctly on error', function () {
+ it('can save appropriate states correctly on error', function() {
var saveState = jasmine.createSpy('saveState');
state.bumperState.videoSaveStatePlugin.saveState = saveState;
state.el.triggerHandler('error');
@@ -92,7 +92,7 @@
bumper_last_view_date: true});
});
- it('can save appropriate states correctly on skip and do not show again', function () {
+ it('can save appropriate states correctly on skip and do not show again', function() {
var saveState = jasmine.createSpy('saveState');
state.bumperState.videoSaveStatePlugin.saveState = saveState;
state.bumperState.videoBumper.skipAndDoNotShowAgain();
@@ -102,7 +102,7 @@
bumper_last_view_date: true, bumper_do_not_show_again: true});
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
state.bumperState.videoBumper.destroy();
expect(state.videoBumper).toBeUndefined();
});
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
index 5d85be2551..1ebff4a5fb 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
@@ -1,11 +1,11 @@
-(function (undefined) {
- describe('VideoCaption', function () {
+(function(undefined) {
+ describe('VideoCaption', function() {
var state, oldOTBD;
- var parseIntAttribute = function (element, attrName) {
+ var parseIntAttribute = function(element, attrName) {
return parseInt(element.attr(attrName));
};
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice')
.and.returnValue(null);
@@ -13,7 +13,7 @@
$.fn.scrollTo.calls.reset();
});
- afterEach(function () {
+ afterEach(function() {
// `source` tags should be removed to avoid memory leak bug that we
// had before. Removing of `source` tag, not `video` tag, stops
// loading video source and clears the memory.
@@ -25,22 +25,20 @@
window.onTouchBasedDevice = oldOTBD;
});
- describe('constructor', function () {
-
- describe('always', function () {
-
- beforeEach(function () {
+ describe('constructor', function() {
+ describe('always', function() {
+ beforeEach(function() {
spyOn($, 'ajaxWithPrefix').and.callThrough();
});
- it('create the transcript element', function () {
+ it('create the transcript element', function() {
state = jasmine.initializePlayer();
expect($('.video')).toContainElement('.subtitles');
});
-
+
it('has appropriate lang attributes', function() {
state = jasmine.initializePlayer();
-
+
$('.video .toggle-captions').trigger('click');
expect($('.video .subtitles-menu')).toHaveAttrs({
@@ -51,12 +49,12 @@
});
});
- it('add transcript control to video player', function () {
+ it('add transcript control to video player', function() {
state = jasmine.initializePlayer();
expect($('.video')).toContainElement('.toggle-transcript');
});
- it('add ARIA attributes to transcript control', function () {
+ it('add ARIA attributes to transcript control', function() {
state = jasmine.initializePlayer();
var captionControl = $('.toggle-transcript');
expect(captionControl).toHaveAttrs({
@@ -70,12 +68,12 @@
expect($('.video')).toContainElement('.closed-captions');
});
- it('fetch the transcript in HTML5 mode', function (done) {
+ it('fetch the transcript in HTML5 mode', function(done) {
state = jasmine.initializePlayer();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.loaded;
- }).then(function () {
+ }).then(function() {
expect($.ajaxWithPrefix).toHaveBeenCalledWith({
url: '/transcript/translation/en',
notifyOnError: false,
@@ -88,14 +86,14 @@
}).always(done);
});
- it('fetch the transcript in Flash mode', function (done) {
+ it('fetch the transcript in Flash mode', function(done) {
state = jasmine.initializePlayerYouTube();
spyOn(state, 'isFlashMode').and.returnValue(true);
state.videoCaption.fetchCaption();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.loaded;
- }).then(function () {
+ }).then(function() {
expect($.ajaxWithPrefix).toHaveBeenCalledWith({
url: '/transcript/translation/en',
notifyOnError: false,
@@ -110,12 +108,12 @@
}).always(done);
});
- it('fetch the transcript in Youtube mode', function (done) {
+ it('fetch the transcript in Youtube mode', function(done) {
state = jasmine.initializePlayerYouTube();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.loaded;
- }).then(function () {
+ }).then(function() {
expect($.ajaxWithPrefix).toHaveBeenCalledWith({
url: '/transcript/translation/en',
notifyOnError: false,
@@ -130,24 +128,23 @@
}).always(done);
});
- it('bind the mouse movement', function () {
+ it('bind the mouse movement', function() {
state = jasmine.initializePlayer();
expect($('.subtitles-menu')).toHandle('mouseover');
expect($('.subtitles-menu')).toHandle('mouseout');
expect($('.subtitles-menu')).toHandle('mousemove');
expect($('.subtitles-menu')).toHandle('mousewheel');
expect($('.subtitles-menu')).toHandle('DOMMouseScroll');
- });
+ });
- it('bind the scroll', function () {
+ it('bind the scroll', function() {
state = jasmine.initializePlayer();
expect($('.subtitles-menu'))
.toHandleWith('scroll', state.videoControl.showControls);
- });
-
+ });
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
spyOn($, 'ajaxWithPrefix');
state = jasmine.initializePlayer();
var plugin = state.videoCaption;
@@ -169,13 +166,12 @@
});
describe('renderCaptions', function() {
-
describe('is rendered', function() {
var KEY = $.ui.keyCode,
- keyPressEvent = function(key) {
- return $.Event('keydown', { keyCode: key });
- };
+ keyPressEvent = function(key) {
+ return $.Event('keydown', {keyCode: key});
+ };
it('toggles the captions on control click', function() {
state = jasmine.initializePlayer();
@@ -215,16 +211,15 @@
});
});
- describe('renderLanguageMenu', function () {
-
- describe('is rendered', function () {
+ describe('renderLanguageMenu', function() {
+ describe('is rendered', function() {
var KEY = $.ui.keyCode,
- keyPressEvent = function(key) {
- return $.Event('keydown', { keyCode: key });
- };
+ keyPressEvent = function(key) {
+ return $.Event('keydown', {keyCode: key});
+ };
- it('if languages more than 1', function () {
+ it('if languages more than 1', function() {
state = jasmine.initializePlayer();
var transcripts = state.config.transcriptLanguages,
langCodes = _.keys(transcripts),
@@ -244,7 +239,7 @@
});
});
- it('when clicking on link with new language', function () {
+ it('when clicking on link with new language', function() {
state = jasmine.initializePlayer();
var Caption = state.videoCaption,
link = $('.langs-list li[data-lang-code="de"] .control-lang');
@@ -269,7 +264,7 @@
expect(link).toHaveAttr('aria-pressed', 'true');
});
- it('when clicking on link with current language', function () {
+ it('when clicking on link with current language', function() {
state = jasmine.initializePlayer();
var Caption = state.videoCaption,
link = $('.langs-list li[data-lang-code="en"] .control-lang');
@@ -288,7 +283,7 @@
expect(link).toHaveAttr('aria-pressed', 'true');
});
- it('open the language toggle on hover', function () {
+ it('open the language toggle on hover', function() {
state = jasmine.initializePlayer();
$('.lang').mouseenter();
expect($('.lang')).toHaveClass('is-opened');
@@ -314,10 +309,10 @@
});
});
- describe('is not rendered', function () {
- it('if just 1 language', function () {
+ describe('is not rendered', function() {
+ it('if just 1 language', function() {
state = jasmine.initializePlayer(null, {
- 'transcriptLanguages': {"en": "English"}
+ 'transcriptLanguages': {'en': 'English'}
});
expect($('.langs-list')).not.toExist();
@@ -327,20 +322,20 @@
});
});
- describe('when on a non touch-based device', function () {
- beforeEach(function (done) {
+ describe('when on a non touch-based device', function() {
+ beforeEach(function(done) {
state = jasmine.initializePlayer();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.rendered;
}).then(done);
});
- it('render the transcript', function () {
+ it('render the transcript', function() {
var captionsData = jasmine.stubbedCaption,
- items = $('.subtitles li[data-index]');
+ items = $('.subtitles li[data-index]');
- _.each(captionsData.text, function (text, index) {
+ _.each(captionsData.text, function(text, index) {
var item = items.eq(index);
expect(parseIntAttribute(item, 'data-index')).toEqual(index);
@@ -350,7 +345,7 @@
});
});
- it('add a padding element to transcript', function () {
+ it('add a padding element to transcript', function() {
expect($('.subtitles li:first').hasClass('spacing'))
.toBe(true);
expect($('.subtitles li:last').hasClass('spacing'))
@@ -358,7 +353,7 @@
});
- it('bind all the transcript link', function () {
+ it('bind all the transcript link', function() {
var handlerList = ['captionMouseOverOut', 'captionClick',
'captionMouseDown', 'captionFocus', 'captionBlur',
'captionKeyDown'
@@ -368,68 +363,66 @@
spyOn(state.videoCaption, handler);
});
$('.subtitles li[data-index]').each(
- function (index, link) {
+ function(index, link) {
+ $(link).trigger('mouseover');
+ expect(state.videoCaption.captionMouseOverOut).toHaveBeenCalled();
+ state.videoCaption.captionMouseOverOut.calls.reset();
+ $(link).trigger('mouseout');
+ expect(state.videoCaption.captionMouseOverOut).toHaveBeenCalled();
- $(link).trigger('mouseover');
- expect(state.videoCaption.captionMouseOverOut).toHaveBeenCalled();
+ $(this).click();
+ expect(state.videoCaption.captionClick).toHaveBeenCalled();
- state.videoCaption.captionMouseOverOut.calls.reset();
- $(link).trigger('mouseout');
- expect(state.videoCaption.captionMouseOverOut).toHaveBeenCalled();
+ $(this).trigger('mousedown');
+ expect(state.videoCaption.captionMouseDown).toHaveBeenCalled();
- $(this).click();
- expect(state.videoCaption.captionClick).toHaveBeenCalled();
+ $(this).trigger('focus');
+ expect(state.videoCaption.captionFocus).toHaveBeenCalled();
- $(this).trigger('mousedown');
- expect(state.videoCaption.captionMouseDown).toHaveBeenCalled();
+ $(this).trigger('blur');
+ expect(state.videoCaption.captionBlur).toHaveBeenCalled();
- $(this).trigger('focus');
- expect(state.videoCaption.captionFocus).toHaveBeenCalled();
-
- $(this).trigger('blur');
- expect(state.videoCaption.captionBlur).toHaveBeenCalled();
-
- $(this).trigger('keydown');
- expect(state.videoCaption.captionKeyDown).toHaveBeenCalled();
- });
+ $(this).trigger('keydown');
+ expect(state.videoCaption.captionKeyDown).toHaveBeenCalled();
+ });
});
- it('set rendered to true', function (done) {
+ it('set rendered to true', function(done) {
state = jasmine.initializePlayer();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.rendered;
- }).then(function () {
+ }).then(function() {
expect(state.videoCaption.rendered).toBeTruthy();
}).always(done);
});
});
- describe('when on a touch-based device', function () {
- beforeEach(function () {
+ describe('when on a touch-based device', function() {
+ beforeEach(function() {
window.onTouchBasedDevice.and.returnValue(['iPad']);
state = jasmine.initializePlayer();
$.fn.scrollTo.calls.reset();
});
- it('show explanation message', function () {
+ it('show explanation message', function() {
expect($('.subtitles .subtitles-menu li')).toHaveText(
'Transcript will be displayed when you start playing the video.'
);
});
- it('show transcript on play', function (done) {
+ it('show transcript on play', function(done) {
state.el.trigger('play');
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.rendered;
- }).then(function () {
+ }).then(function() {
var captionsData = jasmine.stubbedCaption,
- items = $('.subtitles li[data-index]');
+ items = $('.subtitles li[data-index]');
- _.each(captionsData.text, function (text, index) {
+ _.each(captionsData.text, function(text, index) {
var item = items.eq(index);
expect(parseIntAttribute(item, 'data-index')).toEqual(index);
@@ -440,20 +433,20 @@
}).always(done);
});
- it('does not set rendered to true', function () {
+ it('does not set rendered to true', function() {
expect(state.videoCaption.rendered).toBeFalsy();
});
});
- describe('when no transcripts file was specified', function () {
- beforeEach(function () {
+ describe('when no transcripts file was specified', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer('video_all.html', {
'sub': '',
- 'transcriptLanguages': {},
+ 'transcriptLanguages': {}
});
});
- it('transcript panel is not shown', function () {
+ it('transcript panel is not shown', function() {
expect(state.videoCaption.languageChooserEl).toBeHidden();
});
});
@@ -461,12 +454,12 @@
var originalClearTimeout;
- describe('mouse movement', function () {
- beforeEach(function (done) {
+ describe('mouse movement', function() {
+ beforeEach(function(done) {
jasmine.clock().install();
state = jasmine.initializePlayer();
jasmine.clock().tick(50);
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.rendered;
}).then(done);
@@ -475,19 +468,19 @@
window.clearTimeout = jasmine.createSpy().and.callFake(originalClearTimeout);
});
- afterEach(function () {
+ afterEach(function() {
window.clearTimeout = originalClearTimeout;
jasmine.clock().uninstall();
});
- describe('when cursor is outside of the transcript box', function () {
- it('does not set freezing timeout', function () {
+ describe('when cursor is outside of the transcript box', function() {
+ it('does not set freezing timeout', function() {
expect(state.videoCaption.frozen).toBeFalsy();
});
});
- describe('when cursor is in the transcript box', function () {
- beforeEach(function () {
+ describe('when cursor is in the transcript box', function() {
+ beforeEach(function() {
spyOn(state.videoCaption, 'onMouseLeave');
$(window).trigger(jQuery.Event('mousemove'));
jasmine.clock().tick(state.config.captionsFreezeTime);
@@ -495,20 +488,20 @@
jasmine.clock().tick(state.config.captionsFreezeTime);
});
- it('set the freezing timeout', function () {
+ it('set the freezing timeout', function() {
expect(state.videoCaption.frozen).not.toBeFalsy();
expect(state.videoCaption.onMouseLeave).toHaveBeenCalled();
});
- describe('when the cursor is moving', function () {
- it('reset the freezing timeout', function () {
+ describe('when the cursor is moving', function() {
+ it('reset the freezing timeout', function() {
$('.subtitles-menu').trigger(jQuery.Event('mousemove'));
expect(window.clearTimeout).toHaveBeenCalled();
});
});
- describe('when the mouse is scrolling', function () {
- it('reset the freezing timeout', function () {
+ describe('when the mouse is scrolling', function() {
+ it('reset the freezing timeout', function() {
$('.subtitles-menu').trigger(jQuery.Event('mousewheel'));
expect(window.clearTimeout).toHaveBeenCalled();
});
@@ -517,57 +510,56 @@
describe(
'when cursor is moving out of the transcript box',
- function () {
-
- beforeEach(function () {
- state.videoCaption.frozen = 100;
- $.fn.scrollTo.calls.reset();
- });
-
- describe('always', function () {
- beforeEach(function () {
- $('.subtitles-menu').trigger(jQuery.Event('mouseout'));
+ function() {
+ beforeEach(function() {
+ state.videoCaption.frozen = 100;
+ $.fn.scrollTo.calls.reset();
});
- it('reset the freezing timeout', function () {
- expect(window.clearTimeout).toHaveBeenCalledWith(100);
+ describe('always', function() {
+ beforeEach(function() {
+ $('.subtitles-menu').trigger(jQuery.Event('mouseout'));
+ });
+
+ it('reset the freezing timeout', function() {
+ expect(window.clearTimeout).toHaveBeenCalledWith(100);
+ });
+
+ it('unfreeze the transcript', function() {
+ expect(state.videoCaption.frozen).toBeNull();
+ });
});
- it('unfreeze the transcript', function () {
- expect(state.videoCaption.frozen).toBeNull();
- });
- });
-
- describe('when the player is playing', function () {
- beforeEach(function () {
- state.videoCaption.playing = true;
- $('.subtitles-menu li[data-index]:first')
+ describe('when the player is playing', function() {
+ beforeEach(function() {
+ state.videoCaption.playing = true;
+ $('.subtitles-menu li[data-index]:first')
.addClass('current');
- $('.subtitles-menu').trigger(jQuery.Event('mouseout'));
+ $('.subtitles-menu').trigger(jQuery.Event('mouseout'));
+ });
+
+ it('scroll the transcript', function() {
+ expect($.fn.scrollTo).toHaveBeenCalled();
+ });
});
- it('scroll the transcript', function () {
- expect($.fn.scrollTo).toHaveBeenCalled();
+ describe('when the player is not playing', function() {
+ beforeEach(function() {
+ state.videoCaption.playing = false;
+ $('.subtitles-menu').trigger(jQuery.Event('mouseout'));
+ });
+
+ it('does not scroll the transcript', function() {
+ expect($.fn.scrollTo).not.toHaveBeenCalled();
+ });
});
});
-
- describe('when the player is not playing', function () {
- beforeEach(function () {
- state.videoCaption.playing = false;
- $('.subtitles-menu').trigger(jQuery.Event('mouseout'));
- });
-
- it('does not scroll the transcript', function () {
- expect($.fn.scrollTo).not.toHaveBeenCalled();
- });
- });
- });
});
- describe('fetchCaption', function () {
+ describe('fetchCaption', function() {
var Caption, msg;
- beforeEach(function () {
+ beforeEach(function() {
state = jasmine.initializePlayer();
Caption = state.videoCaption;
spyOn($, 'ajaxWithPrefix').and.callThrough();
@@ -578,7 +570,7 @@
spyOn(state, 'youtubeId').and.returnValue('Z5KLxerq05Y');
});
- it('show transcript on language change', function () {
+ it('show transcript on language change', function() {
Caption.loaded = true;
Caption.fetchCaption();
@@ -588,7 +580,7 @@
msg = 'use cookie to show/hide transcripts if they have not been ' +
'loaded yet';
- it(msg, function () {
+ it(msg, function() {
Caption.loaded = false;
state.hide_captions = false;
Caption.fetchCaption();
@@ -605,7 +597,7 @@
expect(Caption.hideCaptions).toHaveBeenCalledWith(true, false);
});
- it('on success: on touch devices', function () {
+ it('on success: on touch devices', function() {
state.isTouch = true;
Caption.loaded = false;
Caption.fetchCaption();
@@ -619,7 +611,7 @@
msg = 'on success: change language on touch devices when ' +
'transcripts have not been rendered yet';
- it(msg, function () {
+ it(msg, function() {
state.isTouch = true;
Caption.loaded = true;
Caption.rendered = false;
@@ -632,7 +624,7 @@
expect(Caption.loaded).toBeTruthy();
});
- it('on success: re-render on touch devices', function () {
+ it('on success: re-render on touch devices', function() {
state.isTouch = true;
Caption.loaded = true;
Caption.rendered = true;
@@ -645,7 +637,7 @@
expect(Caption.loaded).toBeTruthy();
});
- it('on success: rendered correct', function () {
+ it('on success: rendered correct', function() {
Caption.loaded = false;
Caption.fetchCaption();
@@ -656,7 +648,7 @@
expect(Caption.loaded).toBeTruthy();
});
- it('on success: re-rendered correct', function () {
+ it('on success: re-rendered correct', function() {
Caption.loaded = true;
Caption.rendered = true;
Caption.fetchCaption();
@@ -669,9 +661,9 @@
});
msg = 'on error: transcripts are hidden if there are no transcripts';
- it(msg, function () {
+ it(msg, function() {
spyOn(Caption, 'fetchAvailableTranslations');
- $.ajax.and.callFake(function (settings) {
+ $.ajax.and.callFake(function(settings) {
_.result(settings, 'error');
});
@@ -687,10 +679,10 @@
msg = 'on error: for Html5 player an attempt to fetch transcript ' +
'with youtubeId if there are no additional transcripts';
- it(msg, function () {
+ it(msg, function() {
spyOn(Caption, 'fetchAvailableTranslations');
spyOn(Caption, 'fetchCaption').and.callThrough();
- $.ajax.and.callFake(function (settings) {
+ $.ajax.and.callFake(function(settings) {
_.result(settings, 'error');
});
@@ -701,7 +693,7 @@
expect(Caption.fetchAvailableTranslations).not.toHaveBeenCalled();
expect($.ajaxWithPrefix.calls.mostRecent().args[0].data)
- .toEqual({'videoId':'Z5KLxerq05Y'});
+ .toEqual({'videoId': 'Z5KLxerq05Y'});
expect(Caption.hideCaptions.calls.mostRecent().args)
.toEqual([true, false]);
expect(Caption.fetchCaption.calls.mostRecent().args[0]).toEqual(true);
@@ -710,7 +702,7 @@
msg = 'on success: when fetchCaption called with fetch_with_youtubeId to ' +
'get transcript with youtubeId for html5';
- it(msg, function () {
+ it(msg, function() {
spyOn(Caption, 'fetchAvailableTranslations');
spyOn(Caption, 'fetchCaption').and.callThrough();
@@ -722,7 +714,7 @@
expect(Caption.fetchAvailableTranslations).not.toHaveBeenCalled();
expect($.ajaxWithPrefix.calls.mostRecent().args[0].data)
- .toEqual({'videoId':'Z5KLxerq05Y'});
+ .toEqual({'videoId': 'Z5KLxerq05Y'});
expect(Caption.hideCaptions).toHaveBeenCalledWith(false);
expect(Caption.fetchCaption.calls.mostRecent().args[0]).toEqual(true);
expect(Caption.fetchCaption.calls.count()).toEqual(1);
@@ -730,15 +722,15 @@
msg = 'on error: fetch available translations if there are ' +
'additional transcripts';
- it(msg, function () {
+ it(msg, function() {
$.ajax
- .and.callFake(function (settings) {
+ .and.callFake(function(settings) {
_.result(settings, 'error');
});
state.config.transcriptLanguages = {
'en': 'English',
- 'uk': 'Ukrainian',
+ 'uk': 'Ukrainian'
};
spyOn(Caption, 'fetchAvailableTranslations');
@@ -749,10 +741,10 @@
});
});
- describe('fetchAvailableTranslations', function () {
+ describe('fetchAvailableTranslations', function() {
var Caption, msg;
- beforeEach(function () {
+ beforeEach(function() {
state = jasmine.initializePlayer();
Caption = state.videoCaption;
spyOn($, 'ajaxWithPrefix').and.callThrough();
@@ -761,7 +753,7 @@
spyOn(Caption, 'renderLanguageMenu');
});
- it('request created with correct parameters', function () {
+ it('request created with correct parameters', function() {
Caption.fetchAvailableTranslations();
expect($.ajaxWithPrefix).toHaveBeenCalledWith({
@@ -773,7 +765,7 @@
});
msg = 'on succes: language menu is rendered if translations available';
- it(msg, function () {
+ it(msg, function() {
state.config.transcriptLanguages = {
'en': 'English',
'uk': 'Ukrainian',
@@ -794,7 +786,7 @@
});
msg = 'on succes: language menu isn\'t rendered if translations unavailable';
- it(msg, function () {
+ it(msg, function() {
state.config.transcriptLanguages = {
'en': 'English',
'ru': 'Russian'
@@ -808,8 +800,8 @@
});
msg = 'on error: transcripts are hidden if there are no transcript';
- it(msg, function () {
- $.ajax.and.callFake(function (settings) {
+ it(msg, function() {
+ $.ajax.and.callFake(function(settings) {
_.result(settings, 'error');
});
Caption.fetchAvailableTranslations();
@@ -820,73 +812,73 @@
});
});
- describe('play', function () {
- describe('when the transcript was not rendered', function () {
- beforeEach(function (done) {
+ describe('play', function() {
+ describe('when the transcript was not rendered', function() {
+ beforeEach(function(done) {
window.onTouchBasedDevice.and.returnValue(['iPad']);
state = jasmine.initializePlayer();
state.videoCaption.play();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.rendered;
- }).then(function(){
+ }).then(function() {
done();
});
});
- it('render the transcript', function () {
+ it('render the transcript', function() {
var captionsData;
captionsData = jasmine.stubbedCaption;
$('.subtitles li[data-index]').each(
- function (index, item) {
- expect(parseIntAttribute($(item), 'data-index')).toEqual(index);
- expect(parseIntAttribute($(item), 'data-start')).toEqual(captionsData.start[index]);
- expect($(item).attr('tabindex')).toEqual('0');
- expect($(item).text().trim()).toEqual(captionsData.text[index]);
- });
+ function(index, item) {
+ expect(parseIntAttribute($(item), 'data-index')).toEqual(index);
+ expect(parseIntAttribute($(item), 'data-start')).toEqual(captionsData.start[index]);
+ expect($(item).attr('tabindex')).toEqual('0');
+ expect($(item).text().trim()).toEqual(captionsData.text[index]);
+ });
});
- it('add a padding element to transcript', function () {
+ it('add a padding element to transcript', function() {
expect($('.subtitles li:first')).toHaveClass('spacing');
expect($('.subtitles li:last')).toHaveClass('spacing');
});
- it('set rendered to true', function () {
+ it('set rendered to true', function() {
expect(state.videoCaption.rendered).toBeTruthy();
});
- it('set playing to true', function () {
+ it('set playing to true', function() {
expect(state.videoCaption.playing).toBeTruthy();
});
});
});
- describe('pause', function () {
- beforeEach(function () {
+ describe('pause', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoCaption.playing = true;
state.videoCaption.pause();
});
- it('set playing to false', function () {
+ it('set playing to false', function() {
expect(state.videoCaption.playing).toBeFalsy();
});
});
- describe('updatePlayTime', function () {
- beforeEach(function (done) {
+ describe('updatePlayTime', function() {
+ beforeEach(function(done) {
state = jasmine.initializePlayer();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.rendered;
}).then(done);
});
- describe('when the video speed is 1.0x', function () {
- it('search the caption based on time', function () {
+ describe('when the video speed is 1.0x', function() {
+ it('search the caption based on time', function() {
state.videoCaption.updatePlayTime(25.000);
expect(state.videoCaption.currentIndex).toEqual(5);
@@ -898,8 +890,8 @@
});
});
- describe('when the video speed is not 1.0x', function () {
- it('search the transcript based on 1.0x speed', function () {
+ describe('when the video speed is not 1.0x', function() {
+ it('search the transcript based on 1.0x speed', function() {
state.videoCaption.updatePlayTime(25.000);
expect(state.videoCaption.currentIndex).toEqual(5);
@@ -918,34 +910,34 @@
});
});
- describe('when the index is not the same', function () {
- beforeEach(function () {
+ describe('when the index is not the same', function() {
+ beforeEach(function() {
state.videoCaption.currentIndex = 1;
$('.subtitles li[data-index=5]').addClass('current');
state.videoCaption.updatePlayTime(25.000);
});
- it('deactivate the previous transcript', function () {
+ it('deactivate the previous transcript', function() {
expect($('.subtitles li[data-index=1]'))
.not.toHaveClass('current');
});
- it('activate new transcript', function () {
+ it('activate new transcript', function() {
expect($('.subtitles li[data-index=5]'))
.toHaveClass('current');
});
- it('save new index', function () {
+ it('save new index', function() {
expect(state.videoCaption.currentIndex).toEqual(5);
});
- it('scroll transcript to new position', function () {
+ it('scroll transcript to new position', function() {
expect($.fn.scrollTo).toHaveBeenCalled();
});
});
- describe('when the index is the same', function () {
- it('does not change current subtitle', function () {
+ describe('when the index is the same', function() {
+ it('does not change current subtitle', function() {
state.videoCaption.currentIndex = 1;
$('.subtitles li[data-index=3]').addClass('current');
state.videoCaption.updatePlayTime(15.000);
@@ -955,21 +947,21 @@
});
});
- describe('resize', function () {
- beforeEach(function (done) {
+ describe('resize', function() {
+ beforeEach(function(done) {
state = jasmine.initializePlayer();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.rendered;
- }).then(function () {
+ }).then(function() {
videoControl = state.videoControl;
$('.subtitles li[data-index=1]').addClass('current');
state.videoCaption.onResize();
}).always(done);
});
- describe('set the height of transcript container', function () {
- it('when transcript button is enabled', function () {
+ describe('set the height of transcript container', function() {
+ it('when transcript button is enabled', function() {
var realHeight = parseInt(
$('.subtitles').css('maxHeight'), 10
),
@@ -980,7 +972,7 @@
expect(realHeight).toBeCloseTo(shouldBeHeight, 2);
});
- it('when transcript button is disabled ', function () {
+ it('when transcript button is disabled ', function() {
var realHeight, videoWrapperHeight, progressSliderHeight,
controlHeight, shouldBeHeight;
@@ -1001,7 +993,7 @@
});
});
- it('set the height of transcript spacing', function () {
+ it('set the height of transcript spacing', function() {
var firstSpacing, lastSpacing;
firstSpacing = Math.abs(parseInt(
@@ -1017,25 +1009,25 @@
.toBeLessThan(1);
});
- it('scroll transcript to new position', function () {
+ it('scroll transcript to new position', function() {
expect($.fn.scrollTo).toHaveBeenCalled();
});
});
- xdescribe('scrollCaption', function () {
- beforeEach(function () {
- runs(function () {
+ xdescribe('scrollCaption', function() {
+ beforeEach(function() {
+ runs(function() {
state = jasmine.initializePlayer();
});
- waitsFor(function () {
+ waitsFor(function() {
return state.videoCaption.rendered;
}, 'Transcripts are not rendered', WAIT_TIMEOUT);
});
- describe('when frozen', function () {
- it('does not scroll the transcript', function () {
- runs(function () {
+ describe('when frozen', function() {
+ it('does not scroll the transcript', function() {
+ runs(function() {
state.videoCaption.frozen = true;
$('.subtitles li[data-index=1]').addClass('current');
state.videoCaption.scrollCaption();
@@ -1044,25 +1036,25 @@
});
});
- describe('when not frozen', function () {
- beforeEach(function () {
- runs(function () {
+ describe('when not frozen', function() {
+ beforeEach(function() {
+ runs(function() {
state.videoCaption.frozen = false;
});
});
- describe('when there is no current transcript', function () {
- it('does not scroll the transcript', function () {
- runs(function () {
+ describe('when there is no current transcript', function() {
+ it('does not scroll the transcript', function() {
+ runs(function() {
state.videoCaption.scrollCaption();
expect($.fn.scrollTo).not.toHaveBeenCalled();
});
});
});
- describe('when there is a current transcript', function () {
- it('scroll to current transcript', function () {
- runs(function () {
+ describe('when there is a current transcript', function() {
+ it('scroll to current transcript', function() {
+ runs(function() {
$('.subtitles li[data-index=1]').addClass('current');
state.videoCaption.scrollCaption();
expect($.fn.scrollTo).toHaveBeenCalled();
@@ -1072,13 +1064,13 @@
});
});
- xdescribe('seekPlayer', function () {
- beforeEach(function () {
- runs(function () {
+ xdescribe('seekPlayer', function() {
+ beforeEach(function() {
+ runs(function() {
state = jasmine.initializePlayer();
});
- waitsFor(function () {
+ waitsFor(function() {
var duration = state.videoPlayer.duration(),
isRendered = state.videoCaption.rendered;
@@ -1086,9 +1078,9 @@
}, 'Transcripts are not rendered', WAIT_TIMEOUT);
});
- describe('when the video speed is 1.0x', function () {
- it('trigger seek event with the correct time', function () {
- runs(function () {
+ describe('when the video speed is 1.0x', function() {
+ it('trigger seek event with the correct time', function() {
+ runs(function() {
state.videoSpeedControl.currentSpeed = '1.0';
$('.subtitles li[data-start="14910"]').trigger('click');
expect(state.videoPlayer.currentTime).toEqual(14.91);
@@ -1096,9 +1088,9 @@
});
});
- describe('when the video speed is not 1.0x', function () {
- it('trigger seek event with the correct time', function () {
- runs(function () {
+ describe('when the video speed is not 1.0x', function() {
+ it('trigger seek event with the correct time', function() {
+ runs(function() {
state.videoSpeedControl.currentSpeed = '0.75';
$('.subtitles li[data-start="14910"]').trigger('click');
expect(state.videoPlayer.currentTime).toEqual(14.91);
@@ -1107,52 +1099,52 @@
});
describe('when the player type is Flash at speed 0.75x',
- function () {
- it('trigger seek event with the correct time', function () {
- runs(function () {
- state.videoSpeedControl.currentSpeed = '0.75';
- state.currentPlayerMode = 'flash';
- $('.subtitles li[data-start="14910"]').trigger('click');
- expect(state.videoPlayer.currentTime).toEqual(15);
+ function() {
+ it('trigger seek event with the correct time', function() {
+ runs(function() {
+ state.videoSpeedControl.currentSpeed = '0.75';
+ state.currentPlayerMode = 'flash';
+ $('.subtitles li[data-start="14910"]').trigger('click');
+ expect(state.videoPlayer.currentTime).toEqual(15);
+ });
});
});
- });
});
- describe('toggle', function () {
- beforeEach(function () {
+ describe('toggle', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
$('.subtitles li[data-index=1]').addClass('current');
});
- describe('when the transcript is visible', function () {
- beforeEach(function () {
+ describe('when the transcript is visible', function() {
+ beforeEach(function() {
state.el.removeClass('closed');
state.videoCaption.toggle(jQuery.Event('click'));
});
- it('hide the transcript', function () {
+ it('hide the transcript', function() {
expect(state.el).toHaveClass('closed');
});
});
- describe('when the transcript is hidden', function () {
- beforeEach(function () {
+ describe('when the transcript is hidden', function() {
+ beforeEach(function() {
state.el.addClass('closed');
state.videoCaption.toggle(jQuery.Event('click'));
jasmine.clock().install();
});
- afterEach(function () {
+ afterEach(function() {
jasmine.clock().uninstall();
});
- it('show the transcript', function () {
+ it('show the transcript', function() {
expect(state.el).not.toHaveClass('closed');
});
// Test turned off due to flakiness (11/25/13)
- xit('scroll the transcript', function () {
+ xit('scroll the transcript', function() {
// After transcripts are shown, and the video plays for a
// bit.
jasmine.clock().tick(1000);
@@ -1161,53 +1153,53 @@
// position. When they advance, the list scrolls. The
// current transcript position should be constantly
// visible.
- runs(function () {
+ runs(function() {
expect($.fn.scrollTo).toHaveBeenCalled();
});
});
});
});
- describe('transcript accessibility', function () {
- beforeEach(function (done) {
+ describe('transcript accessibility', function() {
+ beforeEach(function(done) {
state = jasmine.initializePlayer();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.videoCaption.rendered;
}).then(done);
});
- describe('when getting focus through TAB key', function () {
- beforeEach(function () {
+ describe('when getting focus through TAB key', function() {
+ beforeEach(function() {
state.videoCaption.isMouseFocus = false;
$('.subtitles li[data-index=0]').trigger(
jQuery.Event('focus')
);
});
- it('shows an outline around the transcript', function () {
+ it('shows an outline around the transcript', function() {
expect($('.subtitles li[data-index=0]'))
.toHaveClass('focused');
});
- it('has automatic scrolling disabled', function () {
+ it('has automatic scrolling disabled', function() {
expect(state.videoCaption.autoScrolling).toBe(false);
});
});
- describe('when loosing focus through TAB key', function () {
- beforeEach(function () {
+ describe('when loosing focus through TAB key', function() {
+ beforeEach(function() {
$('.subtitles li[data-index=0]').trigger(
jQuery.Event('blur')
);
});
- it('does not show an outline around the transcript', function () {
+ it('does not show an outline around the transcript', function() {
expect($('.subtitles li[data-index=0]'))
.not.toHaveClass('focused');
});
- it('has automatic scrolling enabled', function () {
+ it('has automatic scrolling enabled', function() {
expect(state.videoCaption.autoScrolling).toBe(true);
});
});
@@ -1215,60 +1207,57 @@
describe(
'when same transcript gets the focus through mouse after ' +
'having focus through TAB key',
- function () {
-
- beforeEach(function () {
- state.videoCaption.isMouseFocus = false;
- $('.subtitles li[data-index=0]')
+ function() {
+ beforeEach(function() {
+ state.videoCaption.isMouseFocus = false;
+ $('.subtitles li[data-index=0]')
.trigger(jQuery.Event('focus'));
- $('.subtitles li[data-index=0]')
+ $('.subtitles li[data-index=0]')
.trigger(jQuery.Event('mousedown'));
- });
+ });
- it('does not show an outline around it', function () {
- expect($('.subtitles li[data-index=0]'))
+ it('does not show an outline around it', function() {
+ expect($('.subtitles li[data-index=0]'))
.not.toHaveClass('focused');
- });
+ });
- it('has automatic scrolling enabled', function () {
- expect(state.videoCaption.autoScrolling).toBe(true);
+ it('has automatic scrolling enabled', function() {
+ expect(state.videoCaption.autoScrolling).toBe(true);
+ });
});
- });
describe(
'when a second transcript gets focus through mouse after ' +
'first had focus through TAB key',
- function () {
+ function() {
+ var subDataLiIdx__0, subDataLiIdx__1;
- var subDataLiIdx__0, subDataLiIdx__1;
+ beforeEach(function() {
+ subDataLiIdx__0 = $('.subtitles li[data-index=0]');
+ subDataLiIdx__1 = $('.subtitles li[data-index=1]');
- beforeEach(function () {
- subDataLiIdx__0 = $('.subtitles li[data-index=0]');
- subDataLiIdx__1 = $('.subtitles li[data-index=1]');
+ state.videoCaption.isMouseFocus = false;
- state.videoCaption.isMouseFocus = false;
+ subDataLiIdx__0.trigger(jQuery.Event('focus'));
+ subDataLiIdx__0.trigger(jQuery.Event('blur'));
- subDataLiIdx__0.trigger(jQuery.Event('focus'));
- subDataLiIdx__0.trigger(jQuery.Event('blur'));
+ state.videoCaption.isMouseFocus = true;
- state.videoCaption.isMouseFocus = true;
+ subDataLiIdx__1.trigger(jQuery.Event('mousedown'));
+ });
- subDataLiIdx__1.trigger(jQuery.Event('mousedown'));
+ it('does not show an outline around the first', function() {
+ expect(subDataLiIdx__0).not.toHaveClass('focused');
+ });
+
+ it('does not show an outline around the second', function() {
+ expect(subDataLiIdx__1).not.toHaveClass('focused');
+ });
+
+ it('has automatic scrolling enabled', function() {
+ expect(state.videoCaption.autoScrolling).toBe(true);
+ });
});
-
- it('does not show an outline around the first', function () {
- expect(subDataLiIdx__0).not.toHaveClass('focused');
- });
-
- it('does not show an outline around the second', function () {
- expect(subDataLiIdx__1).not.toHaveClass('focused');
- });
-
- it('has automatic scrolling enabled', function () {
- expect(state.videoCaption.autoScrolling).toBe(true);
- });
- });
});
});
-
}).call(this);
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_context_menu_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_context_menu_spec.js
index ef4b20bccb..35db0439f7 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_context_menu_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_context_menu_spec.js
@@ -1,10 +1,10 @@
-(function () {
+(function() {
'use strict';
- describe('Video Context Menu', function () {
+ describe('Video Context Menu', function() {
var state, openMenu, keyPressEvent, openSubmenuMouse, openSubmenuKeyboard, closeSubmenuMouse,
closeSubmenuKeyboard, menu, menuItems, menuSubmenuItem, submenu, submenuItems, overlay, playButton;
- openMenu = function () {
+ openMenu = function() {
var container = $('.video');
container.find('video').trigger('contextmenu');
menu = container.children('.contextmenu');
@@ -20,42 +20,42 @@
return $.Event('keydown', {keyCode: key});
};
- openSubmenuMouse = function (menuSubmenuItem) {
+ openSubmenuMouse = function(menuSubmenuItem) {
menuSubmenuItem.mouseover();
jasmine.clock().tick(200);
expect(menuSubmenuItem).toHaveClass('is-opened');
};
- openSubmenuKeyboard = function (menuSubmenuItem, keyCode) {
+ openSubmenuKeyboard = function(menuSubmenuItem, keyCode) {
menuSubmenuItem.focus().trigger(keyPressEvent(keyCode || $.ui.keyCode.RIGHT));
expect(menuSubmenuItem).toHaveClass('is-opened');
expect(menuSubmenuItem.children().last().children().first()).toBeFocused();
};
- closeSubmenuMouse = function (menuSubmenuItem) {
+ closeSubmenuMouse = function(menuSubmenuItem) {
menuSubmenuItem.mouseleave();
jasmine.clock().tick(200);
expect(menuSubmenuItem).not.toHaveClass('is-opened');
};
- closeSubmenuKeyboard = function (menuSubmenuItem) {
+ closeSubmenuKeyboard = function(menuSubmenuItem) {
menuSubmenuItem.children().first().focus().trigger(keyPressEvent($.ui.keyCode.LEFT));
expect(menuSubmenuItem).not.toHaveClass('is-opened');
expect(menuSubmenuItem).toBeFocused();
};
- beforeEach(function () {
+ beforeEach(function() {
jasmine.clock().install();
// $.cookie is mocked, make sure we have a state with an unmuted volume.
$.cookie.and.returnValue('100');
jasmine.addMatchers({
- toHaveCorrectLabels: function () {
+ toHaveCorrectLabels: function() {
return {
- compare: function (actual, labelsList) {
+ compare: function(actual, labelsList) {
return {
- pass: _.difference(labelsList, _.map(actual, function (item) {
- return $(item).text();
- })).length === 0
+ pass: _.difference(labelsList, _.map(actual, function(item) {
+ return $(item).text();
+ })).length === 0
};
}
};
@@ -63,7 +63,7 @@
});
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
_.result(state.storage, 'clear');
_.result($('video').data('contextmenu'), 'destroy');
@@ -71,8 +71,8 @@
jasmine.clock().uninstall();
});
- describe('constructor', function () {
- it('the structure should be created on first `contextmenu` call', function () {
+ describe('constructor', function() {
+ it('the structure should be created on first `contextmenu` call', function() {
state = jasmine.initializePlayer();
expect(menu).not.toExist();
openMenu();
@@ -98,12 +98,12 @@
expect(_.size(submenuItems.filter('.is-selected'))).toBe(1);
});
- it('add ARIA attributes to menu, menu items, submenu and submenu items', function () {
+ it('add ARIA attributes to menu, menu items, submenu and submenu items', function() {
state = jasmine.initializePlayer();
openMenu();
// Menu and its items.
expect(menu).toHaveAttr('role', 'menu');
- menuItems.each(function () {
+ menuItems.each(function() {
expect($(this)).toHaveAttrs({
'aria-selected': 'false',
'role': 'menuitem'
@@ -118,69 +118,69 @@
// Submenu and its items.
expect(submenu).toHaveAttr('role', 'menu');
- submenuItems.each(function () {
+ submenuItems.each(function() {
expect($(this)).toHaveAttr('role', 'menuitem');
expect($(this)).toHaveAttr('aria-selected');
});
});
- it('is not used by Youtube type of video player', function () {
+ it('is not used by Youtube type of video player', function() {
state = jasmine.initializePlayer('video.html');
expect($('video, iframe')).not.toHaveData('contextmenu');
});
});
- describe('methods:', function () {
- beforeEach(function () {
+ describe('methods:', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
openMenu();
});
- it('menu can be destroyed successfully', function () {
+ it('menu can be destroyed successfully', function() {
var menuitemEvents = ['click', 'keydown', 'contextmenu', 'mouseover'],
menuEvents = ['keydown', 'contextmenu', 'mouseleave', 'mouseover'];
menu.data('menu').destroy();
expect(menu).not.toBeInDOM();
expect(overlay).not.toBeInDOM();
- _.each(menuitemEvents, function (eventName) {
+ _.each(menuitemEvents, function(eventName) {
expect(menuItems.first()).not.toHandle(eventName);
- })
- _.each(menuEvents, function (eventName) {
+ });
+ _.each(menuEvents, function(eventName) {
expect(menuSubmenuItem).not.toHandle(eventName);
- })
- _.each(menuEvents, function (eventName) {
+ });
+ _.each(menuEvents, function(eventName) {
expect(menu).not.toHandle(eventName);
- })
+ });
expect($('video')).not.toHandle('contextmenu');
expect($('video')).not.toHaveData('contextmenu');
});
- it('can change label for the submenu', function () {
+ it('can change label for the submenu', function() {
expect(menuSubmenuItem.children('span')).toHaveText('Speed');
menuSubmenuItem.data('menu').setLabel('New Name');
expect(menuSubmenuItem.children('span')).toHaveText('New Name');
});
- it('can change label for the menuitem', function () {
+ it('can change label for the menuitem', function() {
expect(menuItems.first()).toHaveText('Play');
menuItems.first().data('menu').setLabel('Pause');
expect(menuItems.first()).toHaveText('Pause');
});
});
- describe('when video is right-clicked', function () {
- beforeEach(function () {
+ describe('when video is right-clicked', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
openMenu();
});
- it('context menu opens', function () {
+ it('context menu opens', function() {
expect(menu).toHaveClass('is-opened');
expect(overlay).toBeInDOM();
});
- it('mouseover and mouseleave behave as expected', function () {
+ it('mouseover and mouseleave behave as expected', function() {
openSubmenuMouse(menuSubmenuItem);
expect(menuSubmenuItem).toHaveClass('is-opened');
closeSubmenuMouse(menuSubmenuItem);
@@ -189,28 +189,28 @@
expect(submenuItems.eq(1)).toBeFocused();
});
- it('mouse left-clicking outside of the context menu will close it', function () {
+ it('mouse left-clicking outside of the context menu will close it', function() {
// Left-click outside of open menu, for example on Play button
playButton.click();
expect(menu).not.toHaveClass('is-opened');
expect(overlay).not.toBeInDOM();
});
- it('mouse right-clicking outside of video will close it', function () {
+ it('mouse right-clicking outside of video will close it', function() {
// Right-click outside of open menu for example on Play button
playButton.trigger('contextmenu');
expect(menu).not.toHaveClass('is-opened');
expect(overlay).not.toBeInDOM();
});
- it('mouse right-clicking inside video but outside of context menu will not close it', function () {
+ it('mouse right-clicking inside video but outside of context menu will not close it', function() {
spyOn(menu.data('menu'), 'pointInContainerBox').and.returnValue(true);
overlay.trigger('contextmenu');
expect(menu).toHaveClass('is-opened');
expect(overlay).toBeInDOM();
});
- it('mouse right-clicking inside video but outside of context menu will close submenus', function () {
+ it('mouse right-clicking inside video but outside of context menu will close submenus', function() {
spyOn(menu.data('menu'), 'pointInContainerBox').and.returnValue(true);
openSubmenuMouse(menuSubmenuItem);
expect(menuSubmenuItem).toHaveClass('is-opened');
@@ -218,14 +218,14 @@
expect(menuSubmenuItem).not.toHaveClass('is-opened');
});
- it('mouse left/right-clicking behaves as expected on play/pause menu item', function () {
+ it('mouse left/right-clicking behaves as expected on play/pause menu item', function() {
var menuItem = menuItems.first();
spyOn(state.videoPlayer, 'isPlaying');
- spyOn(state.videoPlayer, 'play').and.callFake(function () {
+ spyOn(state.videoPlayer, 'play').and.callFake(function() {
state.videoPlayer.isPlaying.and.returnValue(true);
state.el.trigger('play');
});
- spyOn(state.videoPlayer, 'pause').and.callFake(function () {
+ spyOn(state.videoPlayer, 'pause').and.callFake(function() {
state.videoPlayer.isPlaying.and.returnValue(false);
state.el.trigger('pause');
});
@@ -245,7 +245,7 @@
expect(menuItem).toHaveText('Pause');
});
- it('mouse left/right-clicking behaves as expected on mute/unmute menu item', function () {
+ it('mouse left/right-clicking behaves as expected on mute/unmute menu item', function() {
var menuItem = menuItems.eq(1);
// Left-click on mute
menuItem.click();
@@ -267,7 +267,7 @@
expect(menuItem).toHaveText('Mute');
});
- it('mouse left/right-clicking behaves as expected on go to Exit full browser menu item', function () {
+ it('mouse left/right-clicking behaves as expected on go to Exit full browser menu item', function() {
var menuItem = menuItems.eq(2);
// Left-click on Fill browser
menuItem.click();
@@ -289,7 +289,7 @@
expect(menuItem).toHaveText('Fill browser');
});
- it('mouse left/right-clicking behaves as expected on speed submenu item', function () {
+ it('mouse left/right-clicking behaves as expected on speed submenu item', function() {
// Set speed to 0.75x
state.videoSpeedControl.setSpeed('0.75');
// Left-click on second submenu speed (1.0x)
@@ -318,70 +318,70 @@
});
});
- describe('Keyboard interactions', function () {
- beforeEach(function () {
+ describe('Keyboard interactions', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
openMenu();
});
- it('focus the first item of the just opened menu on UP keydown', function () {
+ it('focus the first item of the just opened menu on UP keydown', function() {
menu.trigger(keyPressEvent($.ui.keyCode.UP));
expect(menuSubmenuItem).toBeFocused();
});
- it('focus the last item of the just opened menu on DOWN keydown', function () {
+ it('focus the last item of the just opened menu on DOWN keydown', function() {
menu.trigger(keyPressEvent($.ui.keyCode.DOWN));
expect(menuItems.first()).toBeFocused();
});
- it('open the submenu on ENTER keydown', function () {
+ it('open the submenu on ENTER keydown', function() {
openSubmenuKeyboard(menuSubmenuItem, $.ui.keyCode.ENTER);
expect(menuSubmenuItem).toHaveClass('is-opened');
expect(submenuItems.first()).toBeFocused();
});
- it('open the submenu on SPACE keydown', function () {
+ it('open the submenu on SPACE keydown', function() {
openSubmenuKeyboard(menuSubmenuItem, $.ui.keyCode.SPACE);
expect(menuSubmenuItem).toHaveClass('is-opened');
expect(submenuItems.first()).toBeFocused();
});
- it('open the submenu on RIGHT keydown', function () {
+ it('open the submenu on RIGHT keydown', function() {
openSubmenuKeyboard(menuSubmenuItem, $.ui.keyCode.RIGHT);
expect(menuSubmenuItem).toHaveClass('is-opened');
expect(submenuItems.first()).toBeFocused();
});
- it('close the menu on ESCAPE keydown', function () {
+ it('close the menu on ESCAPE keydown', function() {
menu.trigger(keyPressEvent($.ui.keyCode.ESCAPE));
expect(menu).not.toHaveClass('is-opened');
expect(overlay).not.toBeInDOM();
});
- it('close the submenu on ESCAPE keydown', function () {
+ it('close the submenu on ESCAPE keydown', function() {
openSubmenuKeyboard(menuSubmenuItem);
menuSubmenuItem.trigger(keyPressEvent($.ui.keyCode.ESCAPE));
expect(menuSubmenuItem).not.toHaveClass('is-opened');
expect(overlay).not.toBeInDOM();
});
- it('close the submenu on LEFT keydown on submenu items', function () {
+ it('close the submenu on LEFT keydown on submenu items', function() {
closeSubmenuKeyboard(menuSubmenuItem);
});
- it('do nothing on RIGHT keydown on submenu item', function () {
+ it('do nothing on RIGHT keydown on submenu item', function() {
submenuItems.eq(1).focus().trigger(keyPressEvent($.ui.keyCode.RIGHT)); // Mute
// Is still focused.
expect(submenuItems.eq(1)).toBeFocused();
});
- it('do nothing on TAB keydown on menu item', function () {
+ it('do nothing on TAB keydown on menu item', function() {
submenuItems.eq(1).focus().trigger(keyPressEvent($.ui.keyCode.TAB)); // Mute
// Is still focused.
expect(submenuItems.eq(1)).toBeFocused();
});
- it('UP and DOWN keydown function as expected on menu/submenu items', function () {
+ it('UP and DOWN keydown function as expected on menu/submenu items', function() {
menuItems.eq(0).focus(); // Play
expect(menuItems.eq(0)).toBeFocused();
menuItems.eq(0).trigger(keyPressEvent($.ui.keyCode.DOWN));
@@ -403,7 +403,7 @@
expect(menuItems.eq(0)).toBeFocused(); // Play
});
- it('current item is still focused if all siblings are hidden', function () {
+ it('current item is still focused if all siblings are hidden', function() {
menuItems.eq(0).focus(); // Play
expect(menuItems.eq(0)).toBeFocused(); // hide all siblings
menuItems.eq(0).siblings().hide();
@@ -413,7 +413,7 @@
expect(menuItems.eq(0)).toBeFocused();
});
- it('ENTER keydown on menu/submenu item selects its data and closes menu', function () {
+ it('ENTER keydown on menu/submenu item selects its data and closes menu', function() {
menuItems.eq(2).focus().trigger(keyPressEvent($.ui.keyCode.ENTER)); // Fullscreen
expect(menuItems.eq(2)).toHaveClass('is-selected');
expect(menuItems.eq(2).siblings()).not.toHaveClass('is-selected');
@@ -421,7 +421,7 @@
expect(menuItems.eq(2)).toHaveText('Exit full browser');
});
- it('SPACE keydown on menu/submenu item selects its data and closes menu', function () {
+ it('SPACE keydown on menu/submenu item selects its data and closes menu', function() {
submenuItems.eq(2).focus().trigger(keyPressEvent($.ui.keyCode.SPACE)); // 1.25x
expect(submenuItems.eq(2)).toHaveClass('is-selected');
expect(submenuItems.eq(2).siblings()).not.toHaveClass('is-selected');
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_control_spec.js
index eb47c399ab..e96d74d092 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_control_spec.js
@@ -1,29 +1,29 @@
-(function (WAIT_TIMEOUT) {
+(function(WAIT_TIMEOUT) {
'use strict';
- describe('VideoControl', function () {
+ describe('VideoControl', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice').and.returnValue(null);
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
state.storage.clear();
state.videoPlayer.destroy();
window.onTouchBasedDevice = oldOTBD;
});
- describe('constructor', function () {
- beforeEach(function () {
+ describe('constructor', function() {
+ beforeEach(function() {
window.VideoState = {};
state = jasmine.initializePlayer();
});
- it('render the video controls', function () {
+ it('render the video controls', function() {
expect($('.video-controls')).toContainElement(
[
'.slider',
@@ -38,479 +38,479 @@
});
});
- describe('constructor with start-time', function () {
+ describe('constructor with start-time', function() {
it(
'saved position is 0, timer slider and VCR set to start-time',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- savedVideoPosition: 0
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ savedVideoPosition: 0
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+
+
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
+ return isFinite(duration) && duration > 0 && isFinite(state.videoPlayer.startTime);
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:10 / 1:00');
+
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(10);
+ }).always(done);
});
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
-
-
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 && isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:10 / 1:00');
-
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(10);
- }).always(done);
- });
it(
'saved position is after start-time, ' +
'timer slider and VCR set to saved position',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- savedVideoPosition: 15
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ savedVideoPosition: 15
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:15 / 1:00');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:15 / 1:00');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(15);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(15);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
it(
'saved position is negative, ' +
'timer slider and VCR set to start-time',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- savedVideoPosition: -15
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ savedVideoPosition: -15
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:10 / 1:00');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:10 / 1:00');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(10);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(10);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
it(
'saved position is not a number, ' +
'timer slider and VCR set to start-time',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- savedVideoPosition: 'a'
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ savedVideoPosition: 'a'
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:10 / 1:00');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:10 / 1:00');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(10);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(10);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
it(
'saved position is greater than end-time, ' +
'timer slider and VCR set to start-time',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- savedVideoPosition: 10000
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ savedVideoPosition: 10000
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:10 / 1:00');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:10 / 1:00');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(10);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(10);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
});
- describe('constructor with end-time', function () {
+ describe('constructor with end-time', function() {
it(
'saved position is 0, timer slider and VCR set to 0:00 ' +
'and ending at specified end-time',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- end: 20,
- savedVideoPosition: 0
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ end: 20,
+ savedVideoPosition: 0
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:00 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:00 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(0);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(0);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
it(
'saved position is after start-time, ' +
'timer slider and VCR set to saved position',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- end: 20,
- savedVideoPosition: 15
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ end: 20,
+ savedVideoPosition: 15
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:15 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:15 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(15);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(15);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
// TODO: Fix!
it(
'saved position is negative, timer slider and VCR set to 0:00',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- end: 20,
- savedVideoPosition: -15
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ end: 20,
+ savedVideoPosition: -15
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:00 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:00 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(0);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(0);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
it(
'saved position is not a number, ' +
'timer slider and VCR set to 0:00',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- end: 20,
- savedVideoPosition: 'a'
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ end: 20,
+ savedVideoPosition: 'a'
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:00 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:00 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(0);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(0);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
// TODO: Fix!
it(
'saved position is greater than end-time, ' +
'timer slider and VCR set to 0:00',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- end: 20,
- savedVideoPosition: 10000
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ end: 20,
+ savedVideoPosition: 10000
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:00 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:00 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(0);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(0);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
});
- describe('constructor with start-time and end-time', function () {
+ describe('constructor with start-time and end-time', function() {
it(
'saved position is 0, timer slider and VCR set to appropriate start and end times',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- end: 20,
- savedVideoPosition: 0
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ end: 20,
+ savedVideoPosition: 0
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:10 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:10 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(10);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(10);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
it(
'saved position is after start-time, ' +
'timer slider and VCR set to saved position',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- end: 20,
- savedVideoPosition: 15
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ end: 20,
+ savedVideoPosition: 15
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:15 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:15 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(15);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(15);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
it(
'saved position is negative, ' +
'timer slider and VCR set to start-time',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- end: 20,
- savedVideoPosition: -15
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ end: 20,
+ savedVideoPosition: -15
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:10 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:10 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(10);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(10);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
it(
'saved position is not a number, ' +
'timer slider and VCR set to start-time',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- end: 20,
- savedVideoPosition: 'a'
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ end: 20,
+ savedVideoPosition: 'a'
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:10 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:10 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(10);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(10);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
it(
'saved position is greater than end-time, ' +
'timer slider and VCR set to start-time',
- function (done)
+ function(done)
{
- var duration, sliderEl, expectedValue;
+ var duration, sliderEl, expectedValue;
- window.VideoState = {};
- state = jasmine.initializePlayer({
- start: 10,
- end: 20,
- savedVideoPosition: 10000
- });
- sliderEl = state.videoProgressSlider.slider;
- spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+ window.VideoState = {};
+ state = jasmine.initializePlayer({
+ start: 10,
+ end: 20,
+ savedVideoPosition: 10000
+ });
+ sliderEl = state.videoProgressSlider.slider;
+ spyOn(state.videoPlayer, 'duration').and.returnValue(60);
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return isFinite(duration) && duration > 0 &&
+ return isFinite(duration) && duration > 0 &&
isFinite(state.videoPlayer.startTime);
- }).then(function () {
- expectedValue = $('.video-controls').find('.vidtime');
- expect(expectedValue).toHaveText('0:10 / 0:20');
+ }).then(function() {
+ expectedValue = $('.video-controls').find('.vidtime');
+ expect(expectedValue).toHaveText('0:10 / 0:20');
- expectedValue = sliderEl.slider('option', 'value');
- expect(expectedValue).toBe(10);
+ expectedValue = sliderEl.slider('option', 'value');
+ expect(expectedValue).toBe(10);
- state.storage.clear();
- }).always(done);
- });
+ state.storage.clear();
+ }).always(done);
+ });
});
- it('show', function () {
+ it('show', function() {
var controls;
state = jasmine.initializePlayer();
controls = state.el.find('.video-controls');
@@ -520,19 +520,19 @@
expect(controls).not.toHaveClass('is-hidden');
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
state = jasmine.initializePlayer();
state.videoControl.destroy();
expect(state.videoControl).toBeUndefined();
});
- it('can focus the first control', function (done) {
+ it('can focus the first control', function(done) {
var btnPlay;
state = jasmine.initializePlayer({focusFirstControl: true});
btnPlay = state.el.find('.video-controls .play');
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.el.hasClass('is-initialized');
- }).then(function () {
+ }).then(function() {
expect(btnPlay).toBeFocused();
}).always(done);
});
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_events_bumper_plugin_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_events_bumper_plugin_spec.js
index 4a0f1177e2..2ffdcf1c07 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_events_bumper_plugin_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_events_bumper_plugin_spec.js
@@ -1,10 +1,10 @@
-(function (undefined) {
+(function(undefined) {
'use strict';
- describe('VideoPlayer Events Bumper plugin', function () {
+ describe('VideoPlayer Events Bumper plugin', function() {
var Logger = window.Logger;
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice')
@@ -17,7 +17,7 @@
spyOn(state.bumperState.videoEventsBumperPlugin, 'getDuration').and.returnValue(20);
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
window.onTouchBasedDevice = oldOTBD;
state.storage.clear();
@@ -29,7 +29,7 @@
}
});
- it('can emit "edx.video.bumper.loaded" event', function () {
+ it('can emit "edx.video.bumper.loaded" event', function() {
state.el.trigger('ready');
expect(Logger.log).toHaveBeenCalledWith('edx.video.bumper.loaded', {
host_component_id: 'id',
@@ -39,7 +39,7 @@
});
});
- it('can emit "edx.video.bumper.played" event', function () {
+ it('can emit "edx.video.bumper.played" event', function() {
state.el.trigger('play');
expect(Logger.log).toHaveBeenCalledWith('edx.video.bumper.played', {
host_component_id: 'id',
@@ -50,7 +50,7 @@
});
});
- it('can emit "edx.video.bumper.stopped" event', function () {
+ it('can emit "edx.video.bumper.stopped" event', function() {
state.el.trigger('ended');
expect(Logger.log).toHaveBeenCalledWith('edx.video.bumper.stopped', {
host_component_id: 'id',
@@ -71,7 +71,7 @@
});
});
- it('can emit "edx.video.bumper.skipped" event', function () {
+ it('can emit "edx.video.bumper.skipped" event', function() {
state.el.trigger('skip', [false]);
expect(Logger.log).toHaveBeenCalledWith('edx.video.bumper.skipped', {
host_component_id: 'id',
@@ -82,7 +82,7 @@
});
});
- it('can emit "edx.video.bumper.dismissed" event', function () {
+ it('can emit "edx.video.bumper.dismissed" event', function() {
state.el.trigger('skip', [true]);
expect(Logger.log).toHaveBeenCalledWith('edx.video.bumper.dismissed', {
host_component_id: 'id',
@@ -93,7 +93,7 @@
});
});
- it('can emit "edx.video.bumper.transcript.menu.shown" event', function () {
+ it('can emit "edx.video.bumper.transcript.menu.shown" event', function() {
state.el.trigger('language_menu:show');
expect(Logger.log).toHaveBeenCalledWith('edx.video.bumper.transcript.menu.shown', {
host_component_id: 'id',
@@ -103,7 +103,7 @@
});
});
- it('can emit "edx.video.bumper.transcript.menu.hidden" event', function () {
+ it('can emit "edx.video.bumper.transcript.menu.hidden" event', function() {
state.el.trigger('language_menu:hide');
expect(Logger.log).toHaveBeenCalledWith('edx.video.bumper.transcript.menu.hidden', {
host_component_id: 'id',
@@ -113,7 +113,7 @@
});
});
- it('can emit "edx.video.bumper.transcript.shown" event', function () {
+ it('can emit "edx.video.bumper.transcript.shown" event', function() {
state.el.trigger('captions:show');
expect(Logger.log).toHaveBeenCalledWith('edx.video.bumper.transcript.shown', {
host_component_id: 'id',
@@ -124,7 +124,7 @@
});
});
- it('can emit "edx.video.bumper.transcript.hidden" event', function () {
+ it('can emit "edx.video.bumper.transcript.hidden" event', function() {
state.el.trigger('captions:hide');
expect(Logger.log).toHaveBeenCalledWith('edx.video.bumper.transcript.hidden', {
host_component_id: 'id',
@@ -135,7 +135,7 @@
});
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
var plugin = state.bumperState.videoEventsBumperPlugin;
spyOn($.fn, 'off').and.callThrough();
plugin.destroy();
@@ -153,5 +153,4 @@
});
});
});
-
}).call(this);
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js
index 92a967ff3c..27d260c931 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js
@@ -1,9 +1,9 @@
-(function (undefined) {
+(function(undefined) {
'use strict';
- describe('VideoPlayer Events plugin', function () {
+ describe('VideoPlayer Events plugin', function() {
var state, oldOTBD, Logger = window.Logger;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice')
@@ -14,7 +14,7 @@
spyOn(state.videoEventsPlugin, 'getCurrentTime').and.returnValue(10);
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
window.onTouchBasedDevice = oldOTBD;
state.storage.clear();
@@ -23,7 +23,7 @@
}
});
- it('can emit "load_video" event', function () {
+ it('can emit "load_video" event', function() {
state.el.trigger('ready');
expect(Logger.log).toHaveBeenCalledWith('load_video', {
id: 'id',
@@ -31,7 +31,7 @@
});
});
- it('can emit "play_video" event when emitPlayVideoEvent is true', function () {
+ it('can emit "play_video" event when emitPlayVideoEvent is true', function() {
state.videoEventsPlugin.emitPlayVideoEvent = true;
state.el.trigger('play');
expect(Logger.log).toHaveBeenCalledWith('play_video', {
@@ -42,13 +42,13 @@
expect(state.videoEventsPlugin.emitPlayVideoEvent).toBeFalsy();
});
- it('can not emit "play_video" event when emitPlayVideoEvent is false', function () {
+ it('can not emit "play_video" event when emitPlayVideoEvent is false', function() {
state.videoEventsPlugin.emitPlayVideoEvent = false;
state.el.trigger('play');
expect(Logger.log).not.toHaveBeenCalled();
});
- it('can emit "pause_video" event', function () {
+ it('can emit "pause_video" event', function() {
state.el.trigger('pause');
expect(Logger.log).toHaveBeenCalledWith('pause_video', {
id: 'id',
@@ -58,7 +58,7 @@
expect(state.videoEventsPlugin.emitPlayVideoEvent).toBeTruthy();
});
- it('can emit "speed_change_video" event', function () {
+ it('can emit "speed_change_video" event', function() {
state.el.trigger('speedchange', ['2.0', '1.0']);
expect(Logger.log).toHaveBeenCalledWith('speed_change_video', {
id: 'id',
@@ -69,7 +69,7 @@
});
});
- it('can emit "seek_video" event', function () {
+ it('can emit "seek_video" event', function() {
state.el.trigger('seek', [1, 0, 'any']);
expect(Logger.log).toHaveBeenCalledWith('seek_video', {
id: 'id',
@@ -80,7 +80,7 @@
});
});
- it('can emit "stop_video" event', function () {
+ it('can emit "stop_video" event', function() {
state.el.trigger('ended');
expect(Logger.log).toHaveBeenCalledWith('stop_video', {
id: 'id',
@@ -99,7 +99,7 @@
expect(state.videoEventsPlugin.emitPlayVideoEvent).toBeTruthy();
});
- it('can emit "skip_video" event', function () {
+ it('can emit "skip_video" event', function() {
state.el.trigger('skip', [false]);
expect(Logger.log).toHaveBeenCalledWith('skip_video', {
id: 'id',
@@ -108,7 +108,7 @@
});
});
- it('can emit "do_not_show_again_video" event', function () {
+ it('can emit "do_not_show_again_video" event', function() {
state.el.trigger('skip', [true]);
expect(Logger.log).toHaveBeenCalledWith('do_not_show_again_video', {
id: 'id',
@@ -117,7 +117,7 @@
});
});
- it('can emit "edx.video.language_menu.shown" event', function () {
+ it('can emit "edx.video.language_menu.shown" event', function() {
state.el.trigger('language_menu:show');
expect(Logger.log).toHaveBeenCalledWith('edx.video.language_menu.shown', {
id: 'id',
@@ -125,7 +125,7 @@
});
});
- it('can emit "edx.video.language_menu.hidden" event', function () {
+ it('can emit "edx.video.language_menu.hidden" event', function() {
state.el.trigger('language_menu:hide');
expect(Logger.log).toHaveBeenCalledWith('edx.video.language_menu.hidden', {
id: 'id',
@@ -134,7 +134,7 @@
});
});
- it('can emit "show_transcript" event', function () {
+ it('can emit "show_transcript" event', function() {
state.el.trigger('transcript:show');
expect(Logger.log).toHaveBeenCalledWith('show_transcript', {
id: 'id',
@@ -143,7 +143,7 @@
});
});
- it('can emit "hide_transcript" event', function () {
+ it('can emit "hide_transcript" event', function() {
state.el.trigger('transcript:hide');
expect(Logger.log).toHaveBeenCalledWith('hide_transcript', {
id: 'id',
@@ -152,7 +152,7 @@
});
});
- it('can emit "edx.video.closed_captions.shown" event', function () {
+ it('can emit "edx.video.closed_captions.shown" event', function() {
state.el.trigger('captions:show');
expect(Logger.log).toHaveBeenCalledWith('edx.video.closed_captions.shown', {
id: 'id',
@@ -161,7 +161,7 @@
});
});
- it('can emit "edx.video.closed_captions.hidden" event', function () {
+ it('can emit "edx.video.closed_captions.hidden" event', function() {
state.el.trigger('captions:hide');
expect(Logger.log).toHaveBeenCalledWith('edx.video.closed_captions.hidden', {
id: 'id',
@@ -170,7 +170,7 @@
});
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
var plugin = state.videoEventsPlugin;
spyOn($.fn, 'off').and.callThrough();
state.videoEventsPlugin.destroy();
@@ -193,5 +193,4 @@
});
});
});
-
}).call(this);
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_focus_grabber_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_focus_grabber_spec.js
index 8d465b15a9..8a9a10410a 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_focus_grabber_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_focus_grabber_spec.js
@@ -1,8 +1,8 @@
-(function (undefined) {
- describe('Video FocusGrabber', function () {
+(function(undefined) {
+ describe('Video FocusGrabber', function() {
var state;
- beforeEach(function () {
+ beforeEach(function() {
// https://github.com/pivotal/jasmine/issues/184
//
// This is a known issue. jQuery animations depend on setTimeout
@@ -24,7 +24,7 @@
spyOn(state.focusGrabber, 'enableFocusGrabber').and.callThrough();
});
- afterEach(function () {
+ afterEach(function() {
// Turn jQuery animations back on.
jQuery.fx.off = true;
state.storage.clear();
@@ -33,22 +33,21 @@
it(
'check existence of focus grabber elements and their position',
- function () {
-
- var firstFGEl = state.el.find('.focus_grabber.first'),
- lastFGEl = state.el.find('.focus_grabber.last'),
- tcWrapperEl = state.el.find('.tc-wrapper');
+ function() {
+ var firstFGEl = state.el.find('.focus_grabber.first'),
+ lastFGEl = state.el.find('.focus_grabber.last'),
+ tcWrapperEl = state.el.find('.tc-wrapper');
// Existence check.
- expect(firstFGEl.length).toBe(1);
- expect(lastFGEl.length).toBe(1);
+ expect(firstFGEl.length).toBe(1);
+ expect(lastFGEl.length).toBe(1);
// Position check.
- expect(firstFGEl.index() + 1).toBe(tcWrapperEl.index());
- expect(lastFGEl.index() - 1).toBe(tcWrapperEl.index());
- });
+ expect(firstFGEl.index() + 1).toBe(tcWrapperEl.index());
+ expect(lastFGEl.index() - 1).toBe(tcWrapperEl.index());
+ });
- it('from the start, focus grabbers are disabled', function () {
+ it('from the start, focus grabbers are disabled', function() {
expect(state.focusGrabber.elFirst.attr('tabindex')).toBe('-1');
expect(state.focusGrabber.elLast.attr('tabindex')).toBe('-1');
});
@@ -56,24 +55,22 @@
it(
'when first focus grabber is focused "mousemove" event is ' +
'triggered, grabbers are disabled',
- function () {
+ function() {
+ state.focusGrabber.elFirst.triggerHandler('focus');
- state.focusGrabber.elFirst.triggerHandler('focus');
-
- expect('mousemove').toHaveBeenTriggeredOn(state.el);
- expect(state.focusGrabber.disableFocusGrabber).toHaveBeenCalled();
- });
+ expect('mousemove').toHaveBeenTriggeredOn(state.el);
+ expect(state.focusGrabber.disableFocusGrabber).toHaveBeenCalled();
+ });
it(
'when last focus grabber is focused "mousemove" event is ' +
'triggered, grabbers are disabled',
- function () {
+ function() {
+ state.focusGrabber.elLast.triggerHandler('focus');
- state.focusGrabber.elLast.triggerHandler('focus');
-
- expect('mousemove').toHaveBeenTriggeredOn(state.el);
- expect(state.focusGrabber.disableFocusGrabber).toHaveBeenCalled();
- });
+ expect('mousemove').toHaveBeenTriggeredOn(state.el);
+ expect(state.focusGrabber.disableFocusGrabber).toHaveBeenCalled();
+ });
// Disabled on 18.11.2013 due to flakiness on local dev machine.
//
@@ -85,8 +82,8 @@
//
// TODO: Most likely, focusGrabber will be disabled in the future. This
// test could become unneeded in the future.
- xit('after controls hide focus grabbers are enabled', function () {
- runs(function () {
+ xit('after controls hide focus grabbers are enabled', function() {
+ runs(function() {
// Captions should not be "sticky" for the autohide mechanism
// to work.
state.videoCaption.hideCaptions(true);
@@ -100,7 +97,7 @@
// that there is clearly no race conditions for our expect below.
waits(state.videoControl.fadeOutTimeout + 100);
- runs(function () {
+ runs(function() {
expect(
state.focusGrabber.enableFocusGrabber
).toHaveBeenCalled();
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_full_screen_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_full_screen_spec.js
index 1bb36c82b4..57930adbfe 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_full_screen_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_full_screen_spec.js
@@ -1,32 +1,32 @@
-(function () {
+(function() {
'use strict';
- describe('VideoFullScreen', function () {
+ describe('VideoFullScreen', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice').and.returnValue(null);
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
state.storage.clear();
state.videoPlayer.destroy();
window.onTouchBasedDevice = oldOTBD;
});
- describe('constructor', function () {
- beforeEach(function () {
+ describe('constructor', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
});
- it('renders the fullscreen control', function () {
+ it('renders the fullscreen control', function() {
expect($('.add-fullscreen')).toExist();
expect(state.videoFullScreen.fullScreenState).toBe(false);
});
- it('correctly adds ARIA attributes to fullscreen control', function () {
+ it('correctly adds ARIA attributes to fullscreen control', function() {
var fullScreenControl = $('.add-fullscreen');
expect(fullScreenControl).toHaveAttrs({
@@ -34,7 +34,7 @@
});
});
- it('correctly triggers the event handler to toggle fullscreen mode', function () {
+ it('correctly triggers the event handler to toggle fullscreen mode', function() {
spyOn(state.videoFullScreen, 'exit');
spyOn(state.videoFullScreen, 'enter');
@@ -47,7 +47,7 @@
expect(state.videoFullScreen.exit).toHaveBeenCalled();
});
- it('correctly updates ARIA on state change', function () {
+ it('correctly updates ARIA on state change', function() {
var fullScreenControl = $('.add-fullscreen');
fullScreenControl.click();
expect(fullScreenControl).toHaveAttrs({
@@ -59,7 +59,7 @@
});
});
- it('correctly can out of fullscreen by pressing esc', function () {
+ it('correctly can out of fullscreen by pressing esc', function() {
spyOn(state.videoCommands, 'execute');
var esc = $.Event('keyup');
esc.keyCode = 27;
@@ -68,23 +68,23 @@
expect(state.videoCommands.execute).toHaveBeenCalledWith('toggleFullScreen');
});
- it('can update video dimensions on state change', function () {
+ it('can update video dimensions on state change', function() {
state.el.trigger('fullscreen', [true]);
expect(state.resizer.setMode).toHaveBeenCalledWith('both');
state.el.trigger('fullscreen', [false]);
expect(state.resizer.setMode).toHaveBeenCalledWith('width');
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
state.videoFullScreen.destroy();
expect($('.add-fullscreen')).not.toExist();
expect(state.videoFullScreen).toBeUndefined();
});
});
- it('Controls height is actual on switch to fullscreen', function () {
- spyOn($.fn, 'height').and.callFake(function (val) {
- return _.isUndefined(val) ? 100: this;
+ it('Controls height is actual on switch to fullscreen', function() {
+ spyOn($.fn, 'height').and.callFake(function(val) {
+ return _.isUndefined(val) ? 100 : this;
});
state = jasmine.initializePlayer();
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_play_pause_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_play_pause_control_spec.js
index dcb1fd4968..be592422f5 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_play_pause_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_play_pause_control_spec.js
@@ -1,9 +1,9 @@
-(function () {
+(function() {
'use strict';
- describe('VideoPlayPauseControl', function () {
+ describe('VideoPlayPauseControl', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice').and.returnValue(null);
@@ -12,31 +12,31 @@
spyOn(state.videoSaveStatePlugin, 'saveState');
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
state.storage.clear();
state.videoPlayer.destroy();
window.onTouchBasedDevice = oldOTBD;
});
- it('can render the control', function () {
+ it('can render the control', function() {
expect($('.video_control.play')).toExist();
});
- it('add ARIA attributes to play control', function () {
+ it('add ARIA attributes to play control', function() {
expect($('.video_control.play')).toHaveAttrs({
'aria-disabled': 'false'
});
});
- it('can update ARIA state on play', function () {
+ it('can update ARIA state on play', function() {
state.el.trigger('play');
expect($('.video_control.pause')).toHaveAttrs({
'aria-disabled': 'false'
});
});
- it('can update ARIA state on video ends', function () {
+ it('can update ARIA state on video ends', function() {
state.el.trigger('play');
state.el.trigger('ended');
expect($('.video_control.play')).toHaveAttrs({
@@ -44,17 +44,17 @@
});
});
- it('can update state on pause', function () {
+ it('can update state on pause', function() {
state.el.trigger('pause');
expect(state.videoSaveStatePlugin.saveState).toHaveBeenCalledWith(true);
});
- it('can start video playing on click', function () {
+ it('can start video playing on click', function() {
$('.video_control.play').click();
expect(state.videoCommands.execute).toHaveBeenCalledWith('togglePlayback');
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
state.videoPlayPauseControl.destroy();
expect(state.videoPlayPauseControl).toBeUndefined();
});
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_play_placeholder_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_play_placeholder_spec.js
index 4532742dee..5871d47a35 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_play_placeholder_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_play_placeholder_spec.js
@@ -1,9 +1,9 @@
-(function () {
+(function() {
'use strict';
- describe('VideoPlayPlaceholder', function () {
+ describe('VideoPlayPlaceholder', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice').and.returnValue(['iPad']);
@@ -12,7 +12,7 @@
spyOn(state.videoCommands, 'execute');
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
state.storage.clear();
state.videoPlayer.destroy();
@@ -39,12 +39,12 @@
}
];
- beforeEach(function () {
+ beforeEach(function() {
jasmine.stubRequests();
spyOn(window.YT, 'Player').and.callThrough();
});
- it ('works correctly on calling proper methods', function () {
+ it('works correctly on calling proper methods', function() {
var btnPlay;
state = jasmine.initializePlayer();
@@ -67,14 +67,14 @@
});
});
- $.each(cases, function (index, data) {
+ $.each(cases, function(index, data) {
var message = [
(data.isShown) ? 'is' : 'is not',
' shown on',
data.name
].join('');
- it(message, function () {
+ it(message, function() {
var btnPlay;
window.onTouchBasedDevice.and.returnValue(data.isTouch);
@@ -89,61 +89,61 @@
});
});
- $.each(['iPad', 'Android'], function (index, device) {
+ $.each(['iPad', 'Android'], function(index, device) {
it(
'is shown on paused video on ' + device +
' in HTML5 player',
- function ()
+ function()
{
- var btnPlay;
+ var btnPlay;
- window.onTouchBasedDevice.and.returnValue([device]);
- state = jasmine.initializePlayer();
- btnPlay = state.el.find('.btn-play');
+ window.onTouchBasedDevice.and.returnValue([device]);
+ state = jasmine.initializePlayer();
+ btnPlay = state.el.find('.btn-play');
- state.el.trigger('play');
- state.el.trigger('pause');
- expect(btnPlay).not.toHaveClass('is-hidden');
- });
+ state.el.trigger('play');
+ state.el.trigger('pause');
+ expect(btnPlay).not.toHaveClass('is-hidden');
+ });
it(
'is hidden on playing video on ' + device +
' in HTML5 player',
- function ()
+ function()
{
- var btnPlay;
+ var btnPlay;
- window.onTouchBasedDevice.and.returnValue([device]);
- state = jasmine.initializePlayer();
- btnPlay = state.el.find('.btn-play');
+ window.onTouchBasedDevice.and.returnValue([device]);
+ state = jasmine.initializePlayer();
+ btnPlay = state.el.find('.btn-play');
- state.el.trigger('play');
- expect(btnPlay).toHaveClass('is-hidden');
- });
+ state.el.trigger('play');
+ expect(btnPlay).toHaveClass('is-hidden');
+ });
it(
'is hidden on paused video on ' + device +
' in YouTube player',
- function ()
+ function()
{
- var btnPlay;
+ var btnPlay;
- window.onTouchBasedDevice.and.returnValue([device]);
- state = jasmine.initializePlayerYouTube();
- btnPlay = state.el.find('.btn-play');
+ window.onTouchBasedDevice.and.returnValue([device]);
+ state = jasmine.initializePlayerYouTube();
+ btnPlay = state.el.find('.btn-play');
- state.el.trigger('play');
- state.el.trigger('pause');
- expect(btnPlay).toHaveClass('is-hidden');
- });
+ state.el.trigger('play');
+ state.el.trigger('pause');
+ expect(btnPlay).toHaveClass('is-hidden');
+ });
});
- it('starts play the video on click', function () {
+ it('starts play the video on click', function() {
$('.btn-play').click();
expect(state.videoCommands.execute).toHaveBeenCalledWith('play');
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
state.videoPlayPlaceholder.destroy();
expect(state.videoPlayPlaceholder).toBeUndefined();
});
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_play_skip_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_play_skip_control_spec.js
index 479de984ba..f22fc3dba0 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_play_skip_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_play_skip_control_spec.js
@@ -1,9 +1,9 @@
-(function () {
+(function() {
'use strict';
- describe('VideoPlaySkipControl', function () {
+ describe('VideoPlaySkipControl', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice').and.returnValue(null);
@@ -12,7 +12,7 @@
spyOn(state.bumperState.videoCommands, 'execute');
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
state.storage.clear();
if (state.bumperState && state.bumperState.videoPlayer) {
@@ -24,29 +24,29 @@
}
});
- it('can render the control', function () {
+ it('can render the control', function() {
expect($('.video_control.play')).toBeInDOM();
});
- it('can update state on play', function () {
+ it('can update state on play', function() {
state.el.trigger('play');
expect($('.video_control.play')).not.toBeInDOM();
expect($('.video_control.skip')).toBeInDOM();
});
- it('can start video playing on click', function () {
+ it('can start video playing on click', function() {
$('.video_control.play').click();
expect(state.bumperState.videoCommands.execute).toHaveBeenCalledWith('play');
});
- it('can skip the video on click', function () {
+ it('can skip the video on click', function() {
state.el.trigger('play');
spyOn(state.bumperState.videoPlayer, 'isPlaying').and.returnValue(true);
$('.video_control.skip').first().click();
expect(state.bumperState.videoCommands.execute).toHaveBeenCalledWith('skip');
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
var plugin = state.bumperState.videoPlaySkipControl,
el = plugin.el;
spyOn($.fn, 'off').and.callThrough();
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
index f5f15ba133..7588db9ba4 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
@@ -1,23 +1,23 @@
-(function (requirejs, require, define, undefined) {
-'use strict';
+(function(requirejs, require, define, undefined) {
+ 'use strict';
-require(
+ require(
['video/03_video_player.js'],
-function (VideoPlayer) {
- describe('VideoPlayer', function () {
+function(VideoPlayer) {
+ describe('VideoPlayer', function() {
var state, oldOTBD, empty_arguments;
- (function () {
+ (function() {
empty_arguments = arguments;
})();
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice')
.and.returnValue(null);
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
window.onTouchBasedDevice = oldOTBD;
window.Video.previousState = null;
@@ -29,40 +29,40 @@ function (VideoPlayer) {
}
});
- describe('constructor', function () {
- describe('always', function () {
- beforeEach(function () {
+ describe('constructor', function() {
+ describe('always', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
});
- it('instanticate current time to zero', function () {
+ it('instanticate current time to zero', function() {
expect(state.videoPlayer.currentTime).toEqual(0);
});
- it('set the element', function () {
+ it('set the element', function() {
expect(state.el).toHaveId('video_id');
});
- it('create video control', function () {
+ it('create video control', function() {
expect(state.videoControl).toBeDefined();
expect(state.videoControl.el).toHaveClass('video-controls');
});
- it('create video caption', function () {
+ it('create video caption', function() {
expect(state.videoCaption).toBeDefined();
expect(state.speed).toEqual('1.50');
expect(state.config.transcriptTranslationUrl)
.toEqual('/transcript/translation/__lang__');
});
- it('create video speed control', function () {
+ it('create video speed control', function() {
expect(state.videoSpeedControl).toBeDefined();
expect(state.videoSpeedControl.el).toHaveClass('speeds');
expect(state.speed).toEqual('1.50');
});
- it('create video progress slider', function () {
+ it('create video progress slider', function() {
expect(state.videoProgressSlider).toBeDefined();
expect(state.videoProgressSlider.el).toHaveClass('slider');
});
@@ -73,7 +73,7 @@ function (VideoPlayer) {
// previous version of Video.
});
- it('create Youtube player', function () {
+ it('create Youtube player', function() {
var events;
jasmine.stubRequests();
@@ -82,10 +82,10 @@ function (VideoPlayer) {
state.videoEl = $('video, iframe');
events = {
- onReady: state.videoPlayer.onReady,
- onStateChange: state.videoPlayer.onStateChange,
+ onReady: state.videoPlayer.onReady,
+ onStateChange: state.videoPlayer.onStateChange,
onPlaybackQualityChange: state.videoPlayer.onPlaybackQualityChange,
- onError: state.videoPlayer.onError
+ onError: state.videoPlayer.onError
};
expect(YT.Player).toHaveBeenCalledWith('id', {
@@ -104,7 +104,7 @@ function (VideoPlayer) {
});
});
- it('create Flash player', function () {
+ it('create Flash player', function() {
var player;
spyOn($.fn, 'trigger');
@@ -138,9 +138,9 @@ function (VideoPlayer) {
// available globally. It is defined within the scope of Require
// JS.
- describe('when on a touch based device', function () {
- $.each(['iPad', 'Android'], function (index, device) {
- it('create video volume control on' + device, function () {
+ describe('when on a touch based device', function() {
+ $.each(['iPad', 'Android'], function(index, device) {
+ it('create video volume control on' + device, function() {
window.onTouchBasedDevice.and.returnValue([device]);
state = jasmine.initializePlayer();
@@ -151,23 +151,23 @@ function (VideoPlayer) {
});
});
- describe('when not on a touch based device', function () {
+ describe('when not on a touch based device', function() {
var oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
});
- it('controls are in paused state', function () {
+ it('controls are in paused state', function() {
expect(state.videoPlayer.isPlaying()).toBe(false);
});
});
});
- describe('onReady', function () {
- beforeEach(function () {
+ describe('onReady', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
@@ -175,24 +175,24 @@ function (VideoPlayer) {
state.videoPlayer.onReady();
});
- it('autoplay the first video', function () {
+ it('autoplay the first video', function() {
expect(state.videoPlayer.play).not.toHaveBeenCalled();
});
- it('invalid endTime is reset to null', function () {
+ it('invalid endTime is reset to null', function() {
expect(state.videoPlayer.endTime).toBe(null);
});
});
- describe('onReady YouTube', function () {
- beforeEach(function () {
+ describe('onReady YouTube', function() {
+ beforeEach(function() {
state = jasmine.initializePlayerYouTube();
state.videoEl = $('video, iframe');
});
- it('multiple speeds and flash mode, change back to html5 mode', function () {
+ it('multiple speeds and flash mode, change back to html5 mode', function() {
var playbackRates = state.videoPlayer.player.getAvailablePlaybackRates();
state.currentPlayerMode = 'flash';
@@ -202,9 +202,9 @@ function (VideoPlayer) {
});
});
- describe('onStateChange Youtube', function(){
- describe('when the video is ended', function () {
- beforeEach(function () {
+ describe('onStateChange Youtube', function() {
+ describe('when the video is ended', function() {
+ beforeEach(function() {
state = jasmine.initializePlayerYouTube();
state.videoEl = $('video, iframe');
@@ -214,20 +214,20 @@ function (VideoPlayer) {
});
});
- it('pause the video control', function () {
+ it('pause the video control', function() {
expect($('.video_control')).toHaveClass('play');
});
- it('trigger pause and ended events', function () {
+ it('trigger pause and ended events', function() {
expect($.fn.trigger).toHaveBeenCalledWith('pause', empty_arguments);
expect($.fn.trigger).toHaveBeenCalledWith('ended', empty_arguments);
});
});
});
- describe('onStateChange', function () {
- describe('when the video is unstarted', function () {
- beforeEach(function () {
+ describe('onStateChange', function() {
+ describe('when the video is unstarted', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
spyOn($.fn, 'trigger').and.callThrough();
@@ -237,19 +237,19 @@ function (VideoPlayer) {
});
});
- it('pause the video control', function () {
+ it('pause the video control', function() {
expect($('.video_control')).toHaveClass('play');
});
- it('pause the video caption', function () {
+ it('pause the video caption', function() {
expect($.fn.trigger).toHaveBeenCalledWith('pause', empty_arguments);
});
});
- describe('when the video is playing', function () {
+ describe('when the video is playing', function() {
var oldState;
- beforeEach(function () {
+ beforeEach(function() {
// Create the first instance of the player.
state = jasmine.initializePlayer();
oldState = state;
@@ -269,26 +269,26 @@ function (VideoPlayer) {
});
});
- it('set update interval', function () {
+ it('set update interval', function() {
expect(window.setInterval).toHaveBeenCalledWith(
state.videoPlayer.update, 200
);
expect(state.videoPlayer.updateInterval).toEqual(100);
});
- it('play the video control', function () {
+ it('play the video control', function() {
expect($('.video_control')).toHaveClass('pause');
});
- it('play the video caption', function () {
+ it('play the video caption', function() {
expect($.fn.trigger).toHaveBeenCalledWith('play', empty_arguments);
});
});
- describe('when the video is paused', function () {
+ describe('when the video is paused', function() {
var currentUpdateIntrval;
- beforeEach(function () {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
@@ -305,21 +305,21 @@ function (VideoPlayer) {
});
});
- it('clear update interval', function () {
+ it('clear update interval', function() {
expect(state.videoPlayer.updateInterval).toBeUndefined();
});
- it('pause the video control', function () {
+ it('pause the video control', function() {
expect($('.video_control')).toHaveClass('play');
});
- it('pause the video caption', function () {
+ it('pause the video caption', function() {
expect($.fn.trigger).toHaveBeenCalledWith('pause', empty_arguments);
});
});
- describe('when the video is ended', function () {
- beforeEach(function () {
+ describe('when the video is ended', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
@@ -329,45 +329,45 @@ function (VideoPlayer) {
});
});
- it('pause the video control', function () {
+ it('pause the video control', function() {
expect($('.video_control')).toHaveClass('play');
});
- it('pause the video caption', function () {
+ it('pause the video caption', function() {
expect($.fn.trigger).toHaveBeenCalledWith('ended', empty_arguments);
});
});
});
- describe('onSeek Youtube', function(){
- beforeEach(function () {
+ describe('onSeek Youtube', function() {
+ beforeEach(function() {
state = jasmine.initializePlayerYouTube();
state.videoEl = $('video, iframe');
});
- describe('when the video is playing', function () {
- beforeEach(function(){
- state.videoPlayer.onStateChange({
- data: YT.PlayerState.PLAYING
- });
- });
+ describe('when the video is playing', function() {
+ beforeEach(function() {
+ state.videoPlayer.onStateChange({
+ data: YT.PlayerState.PLAYING
+ });
+ });
- it('Video has started playing', function () {
- expect($('.video_control')).toHaveClass('pause');
- });
+ it('Video has started playing', function() {
+ expect($('.video_control')).toHaveClass('pause');
+ });
- it('seek the player', function () {
- state.videoPlayer.seekTo(10);
- expect(state.videoPlayer.currentTime).toBe(10);
- });
- });
+ it('seek the player', function() {
+ state.videoPlayer.seekTo(10);
+ expect(state.videoPlayer.currentTime).toBe(10);
+ });
+ });
});
- describe('onSeek', function () {
- beforeEach(function () {
+ describe('onSeek', function() {
+ beforeEach(function() {
// jasmine.Clock can't be used to fake out debounce with newer versions of underscore
- spyOn(_, 'debounce').and.callFake(function (func) {
- return function () {
+ spyOn(_, 'debounce').and.callFake(function(func) {
+ return function() {
func.apply(this, arguments);
};
});
@@ -376,8 +376,8 @@ function (VideoPlayer) {
spyOn(state.videoPlayer, 'duration').and.returnValue(120);
});
- describe('when the video is playing', function () {
- beforeEach(function (done) {
+ describe('when the video is playing', function() {
+ beforeEach(function(done) {
state.videoPlayer.play();
jasmine.waitUntil(function() {
@@ -386,7 +386,7 @@ function (VideoPlayer) {
});
- it('call runTimer in seekTo on player', function () {
+ it('call runTimer in seekTo on player', function() {
spyOn(state.videoPlayer, 'stopTimer').and.callThrough();
spyOn(state.videoPlayer, 'runTimer').and.callThrough();
state.videoPlayer.seekTo(10);
@@ -395,44 +395,44 @@ function (VideoPlayer) {
expect(state.videoPlayer.runTimer).toHaveBeenCalled();
});
- it('seek the player', function () {
+ it('seek the player', function() {
spyOn(state.videoPlayer.player, 'seekTo').and.callThrough();
state.videoProgressSlider.onSlide(
- jQuery.Event('slide'), { value: 30 }
+ jQuery.Event('slide'), {value: 30}
);
expect(state.videoPlayer.currentTime).toBe(30);
expect(state.videoPlayer.player.seekTo).toHaveBeenCalledWith(30, true);
});
- it('call updatePlayTime on player', function () {
+ it('call updatePlayTime on player', function() {
spyOn(state.videoPlayer, 'updatePlayTime').and.callThrough();
state.videoProgressSlider.onSlide(
- jQuery.Event('slide'), { value: 30 }
+ jQuery.Event('slide'), {value: 30}
);
expect(state.videoPlayer.currentTime).toBe(30);
expect(state.videoPlayer.updatePlayTime).toHaveBeenCalledWith(30, true);
});
});
- it('when the player is not playing: set the current time', function () {
+ it('when the player is not playing: set the current time', function() {
state.videoProgressSlider.onSlide(
- jQuery.Event('slide'), { value: 20 }
+ jQuery.Event('slide'), {value: 20}
);
state.videoPlayer.pause();
expect(state.videoPlayer.currentTime).toBe(20);
state.videoProgressSlider.onSlide(
- jQuery.Event('slide'), { value: 10 }
+ jQuery.Event('slide'), {value: 10}
);
expect(state.videoPlayer.currentTime).toBe(10);
});
- describe('when the video is not playing', function () {
- beforeEach(function () {
+ describe('when the video is not playing', function() {
+ beforeEach(function() {
spyOn(state.videoPlayer, 'setPlaybackRate')
.and.callThrough();
});
- it('video has a correct speed', function () {
+ it('video has a correct speed', function() {
state.speed = '2.0';
state.videoPlayer.onPlay();
expect(state.videoPlayer.setPlaybackRate)
@@ -444,26 +444,26 @@ function (VideoPlayer) {
});
});
- describe('onVolumeChange', function () {
- beforeEach(function () {
+ describe('onVolumeChange', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoPlayer.onReady();
state.videoEl = $('video, iframe');
});
- it('set the volume on player', function () {
+ it('set the volume on player', function() {
spyOn(state.videoPlayer.player, 'setVolume');
state.videoPlayer.onVolumeChange(60);
expect(state.videoPlayer.player.setVolume)
.toHaveBeenCalledWith(60);
});
- describe('when the video is not playing', function () {
- beforeEach(function () {
+ describe('when the video is not playing', function() {
+ beforeEach(function() {
state.videoPlayer.player.setVolume('1');
});
- it('video has a correct volume', function () {
+ it('video has a correct volume', function() {
spyOn(state.videoPlayer.player, 'setVolume');
state.videoVolumeControl.volume = 26;
state.el.trigger('play');
@@ -473,8 +473,8 @@ function (VideoPlayer) {
});
});
- describe('update', function () {
- beforeEach(function () {
+ describe('update', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
@@ -484,44 +484,44 @@ function (VideoPlayer) {
describe(
'when the current time is unavailable from the player',
- function ()
+ function()
{
- beforeEach(function () {
- state.videoPlayer.player.getCurrentTime = function () {
- return NaN;
- };
- state.videoPlayer.update();
- });
+ beforeEach(function() {
+ state.videoPlayer.player.getCurrentTime = function() {
+ return NaN;
+ };
+ state.videoPlayer.update();
+ });
- it('does not trigger updatePlayTime event', function () {
- expect(state.videoPlayer.updatePlayTime)
+ it('does not trigger updatePlayTime event', function() {
+ expect(state.videoPlayer.updatePlayTime)
.not.toHaveBeenCalled();
+ });
});
- });
describe(
'when the current time is available from the player',
- function ()
+ function()
{
- beforeEach(function () {
- state.videoPlayer.player.getCurrentTime = function () {
- return 60;
- };
- state.videoPlayer.update();
- });
+ beforeEach(function() {
+ state.videoPlayer.player.getCurrentTime = function() {
+ return 60;
+ };
+ state.videoPlayer.update();
+ });
- it('trigger updatePlayTime event', function () {
- expect(state.videoPlayer.updatePlayTime)
+ it('trigger updatePlayTime event', function() {
+ expect(state.videoPlayer.updatePlayTime)
.toHaveBeenCalledWith(60);
+ });
});
- });
});
// Disabled 1/13/14 due to flakiness observed in master
- xdescribe('update with start & end time', function () {
+ xdescribe('update with start & end time', function() {
var START_TIME = 1, END_TIME = 2;
- beforeEach(function () {
+ beforeEach(function() {
state = jasmine.initializePlayer(
{
start: START_TIME,
@@ -539,41 +539,41 @@ function (VideoPlayer) {
it(
'video is paused on first endTime, start & end time are reset',
- function (done)
+ function(done)
{
- var duration;
+ var duration;
- state.videoProgressSlider.notifyThroughHandleEnd.calls.reset();
- state.videoPlayer.pause.calls.reset();
- state.videoPlayer.play();
+ state.videoProgressSlider.notifyThroughHandleEnd.calls.reset();
+ state.videoPlayer.pause.calls.reset();
+ state.videoPlayer.play();
- jasmine.waitUntil(function () {
- duration = Math.round(state.videoPlayer.currentTime);
- return state.videoPlayer.pause.calls.count() === 1;
- }).then(function () {
- expect(state.videoPlayer.startTime).toBe(0);
- expect(state.videoPlayer.endTime).toBe(null);
+ jasmine.waitUntil(function() {
+ duration = Math.round(state.videoPlayer.currentTime);
+ return state.videoPlayer.pause.calls.count() === 1;
+ }).then(function() {
+ expect(state.videoPlayer.startTime).toBe(0);
+ expect(state.videoPlayer.endTime).toBe(null);
- expect(duration).toBe(END_TIME);
+ expect(duration).toBe(END_TIME);
- expect(state.videoProgressSlider.notifyThroughHandleEnd)
+ expect(state.videoProgressSlider.notifyThroughHandleEnd)
.toHaveBeenCalledWith({end: true});
- }).always(done);
- });
+ }).always(done);
+ });
});
- describe('updatePlayTime', function () {
- beforeEach(function () {
+ describe('updatePlayTime', function() {
+ beforeEach(function() {
state = jasmine.initializePlayerYouTube();
state.videoEl = $('video, iframe');
spyOn(state.videoCaption, 'updatePlayTime').and.callThrough();
spyOn(state.videoProgressSlider, 'updatePlayTime').and.callThrough();
});
- it('update the video playback time', function (done) {
+ it('update the video playback time', function(done) {
var duration = 0;
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
duration = state.videoPlayer.duration();
if (duration > 0) {
@@ -581,7 +581,7 @@ function (VideoPlayer) {
}
return false;
- }).then(function () {
+ }).then(function() {
state.videoPlayer.goToStartTime = false;
state.videoPlayer.updatePlayTime(60);
@@ -589,10 +589,10 @@ function (VideoPlayer) {
}).always(done);
});
- it('update the playback time on caption', function (done) {
- jasmine.waitUntil(function () {
+ it('update the playback time on caption', function(done) {
+ jasmine.waitUntil(function() {
return state.videoPlayer.duration() > 0;
- }, 1000).then(function () {
+ }, 1000).then(function() {
state.videoPlayer.goToStartTime = false;
state.videoPlayer.updatePlayTime(60);
@@ -601,14 +601,14 @@ function (VideoPlayer) {
}).always(done);
});
- it('update the playback time on progress slider', function (done) {
+ it('update the playback time on progress slider', function(done) {
var duration = 0;
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
duration = state.videoPlayer.duration();
return duration > 0;
- }, 1000).then(function () {
+ }, 1000).then(function() {
state.videoPlayer.goToStartTime = false;
state.videoPlayer.updatePlayTime(60);
@@ -624,65 +624,65 @@ function (VideoPlayer) {
// Disabled 1/13/14 due to flakiness observed in master
xdescribe(
'updatePlayTime when start & end times are defined',
- function ()
+ function()
{
- var START_TIME = 1,
- END_TIME = 2;
+ var START_TIME = 1,
+ END_TIME = 2;
- beforeEach(function () {
- state = jasmine.initializePlayer(
- {
- start: START_TIME,
- end: END_TIME
- }
+ beforeEach(function() {
+ state = jasmine.initializePlayer(
+ {
+ start: START_TIME,
+ end: END_TIME
+ }
);
- state.videoEl = $('video, iframe');
+ state.videoEl = $('video, iframe');
- spyOn(state.videoPlayer, 'updatePlayTime').and.callThrough();
- spyOn(state.videoPlayer.player, 'seekTo').and.callThrough();
- spyOn(state.videoProgressSlider, 'updateStartEndTimeRegion')
+ spyOn(state.videoPlayer, 'updatePlayTime').and.callThrough();
+ spyOn(state.videoPlayer.player, 'seekTo').and.callThrough();
+ spyOn(state.videoProgressSlider, 'updateStartEndTimeRegion')
.and.callThrough();
- });
+ });
- it(
+ it(
'when duration becomes available, updatePlayTime() is called',
- function (done)
+ function(done)
{
- var duration;
+ var duration;
- expect(state.videoPlayer.initialSeekToStartTime).toBeTruthy();
- expect(state.videoPlayer.seekToStartTimeOldSpeed).toBe('void');
+ expect(state.videoPlayer.initialSeekToStartTime).toBeTruthy();
+ expect(state.videoPlayer.seekToStartTimeOldSpeed).toBe('void');
- state.videoPlayer.play();
+ state.videoPlayer.play();
- jasmine.waitUntil(function () {
- duration = state.videoPlayer.duration();
+ jasmine.waitUntil(function() {
+ duration = state.videoPlayer.duration();
- return state.videoPlayer.isPlaying() &&
+ return state.videoPlayer.isPlaying() &&
state.videoPlayer.initialSeekToStartTime === false;
- }).then(function () {
- expect(state.videoPlayer.startTime).toBe(START_TIME);
- expect(state.videoPlayer.endTime).toBe(END_TIME);
+ }).then(function() {
+ expect(state.videoPlayer.startTime).toBe(START_TIME);
+ expect(state.videoPlayer.endTime).toBe(END_TIME);
- expect(state.videoPlayer.player.seekTo)
+ expect(state.videoPlayer.player.seekTo)
.toHaveBeenCalledWith(START_TIME);
- expect(state.videoProgressSlider.updateStartEndTimeRegion)
+ expect(state.videoProgressSlider.updateStartEndTimeRegion)
.toHaveBeenCalledWith({duration: duration});
- expect(state.videoPlayer.seekToStartTimeOldSpeed)
+ expect(state.videoPlayer.seekToStartTimeOldSpeed)
.toBe(state.speed);
- }).always(done);
+ }).always(done);
+ });
});
- });
- describe('updatePlayTime with invalid endTime', function () {
- beforeEach(function () {
+ describe('updatePlayTime with invalid endTime', function() {
+ beforeEach(function() {
state = {
el: $('#video_id'),
videoPlayer: {
- duration: function () {
+ duration: function() {
// The video will be 60 seconds long.
return 60;
},
@@ -690,7 +690,7 @@ function (VideoPlayer) {
startTime: undefined,
endTime: undefined,
player: {
- seekTo: function () {}
+ seekTo: function() {}
},
figureOutStartEndTime: jasmine.createSpy(),
figureOutStartingTime: jasmine.createSpy().and.returnValue(0)
@@ -706,35 +706,35 @@ function (VideoPlayer) {
endTime: 10000
},
currentPlayerMode: 'html5',
- trigger: function () {},
+ trigger: function() {},
browserIsFirefox: false,
isFlashMode: jasmine.createSpy().and.returnValue(false)
};
});
});
- describe('toggleFullScreen', function () {
- describe('when the video player is not full screen', function () {
- beforeEach(function () {
+ describe('toggleFullScreen', function() {
+ describe('when the video player is not full screen', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
spyOn($.fn, 'trigger').and.callThrough();
$('.add-fullscreen').click();
});
- it('add the video-fullscreen class', function () {
+ it('add the video-fullscreen class', function() {
expect(state.el).toHaveClass('video-fullscreen');
});
- it('tell VideoCaption to resize', function () {
+ it('tell VideoCaption to resize', function() {
expect($.fn.trigger).toHaveBeenCalledWith('fullscreen', [true]);
expect(state.resizer.setMode).toHaveBeenCalledWith('both');
expect(state.resizer.delta.substract).toHaveBeenCalled();
});
});
- describe('when the video player already full screen', function () {
- beforeEach(function () {
+ describe('when the video player already full screen', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
spyOn($.fn, 'trigger').and.callThrough();
@@ -745,11 +745,11 @@ function (VideoPlayer) {
$('.add-fullscreen').click();
});
- it('remove the video-fullscreen class', function () {
+ it('remove the video-fullscreen class', function() {
expect(state.el).not.toHaveClass('video-fullscreen');
});
- it('tell VideoCaption to resize', function () {
+ it('tell VideoCaption to resize', function() {
expect($.fn.trigger).toHaveBeenCalledWith('fullscreen', [false]);
expect(state.resizer.setMode)
.toHaveBeenCalledWith('width');
@@ -758,8 +758,8 @@ function (VideoPlayer) {
});
});
- describe('duration', function () {
- beforeEach(function () {
+ describe('duration', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
@@ -768,13 +768,13 @@ function (VideoPlayer) {
state.videoPlayer.duration();
});
- it('delegate to the player', function () {
+ it('delegate to the player', function() {
expect(state.videoPlayer.player.getDuration).toHaveBeenCalled();
});
});
- describe('getDuration', function () {
- beforeEach(function () {
+ describe('getDuration', function() {
+ beforeEach(function() {
// We need to make sure that metadata is returned via an AJAX
// request. Without the jasmine.stubRequests() below we will
// get the error:
@@ -793,15 +793,15 @@ function (VideoPlayer) {
state.videoPlayer.player.getDuration.and.returnValue(0);
});
- it('getDuration is called as a fall-back', function () {
+ it('getDuration is called as a fall-back', function() {
state.videoPlayer.duration();
expect(state.getDuration).toHaveBeenCalled();
});
});
- describe('volume', function () {
- beforeEach(function () {
+ describe('volume', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoEl = $('video, iframe');
@@ -809,33 +809,33 @@ function (VideoPlayer) {
spyOn(state.videoPlayer.player, 'getVolume').and.callThrough();
});
- it('set the player volume', function () {
+ it('set the player volume', function() {
var expectedValue = 60,
- realValue;
+ realValue;
state.videoPlayer.player.setVolume(60);
- realValue = Math.round(state.videoPlayer.player.getVolume()*100);
+ realValue = Math.round(state.videoPlayer.player.getVolume() * 100);
expect(realValue).toEqual(expectedValue);
});
});
- describe('on Touch devices', function () {
- it('`is-touch` class name is added to container', function () {
+ describe('on Touch devices', function() {
+ it('`is-touch` class name is added to container', function() {
$.each(
['iPad', 'Android', 'iPhone'],
- function (index, device)
+ function(index, device)
{
- window.onTouchBasedDevice.and.returnValue([device]);
- state = jasmine.initializePlayer();
+ window.onTouchBasedDevice.and.returnValue([device]);
+ state = jasmine.initializePlayer();
- state.videoEl = $('video, iframe');
+ state.videoEl = $('video, iframe');
- expect(state.el).toHaveClass('is-touch');
- });
+ expect(state.el).toHaveClass('is-touch');
+ });
});
- it('modules are not initialized on iPhone', function () {
+ it('modules are not initialized on iPhone', function() {
window.onTouchBasedDevice.and.returnValue(['iPhone']);
state = jasmine.initializePlayer();
@@ -846,16 +846,16 @@ function (VideoPlayer) {
state.videoSpeedControl, state.videoVolumeControl
];
- $.each(modules, function (index, module) {
+ $.each(modules, function(index, module) {
expect(module).toBeUndefined();
});
});
- $.each(['iPad', 'Android'], function (index, device) {
+ $.each(['iPad', 'Android'], function(index, device) {
var message = 'controls become visible after playing starts ' +
'on ' + device;
- it(message, function (done) {
+ it(message, function(done) {
var controls;
window.onTouchBasedDevice.and.returnValue([device]);
@@ -864,17 +864,17 @@ function (VideoPlayer) {
state.videoEl = $('video, iframe');
controls = state.el.find('.video-controls');
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
return state.el.hasClass('is-initialized');
- }).then(function () {
+ }).then(function() {
expect(controls).toHaveClass('is-hidden');
state.videoPlayer.play();
- jasmine.waitUntil(function () {
+ jasmine.waitUntil(function() {
// Firefox does not return duration for videos until they have reached the end.
// var duration = state.videoPlayer.duration();
// return duration > 0 && state.videoPlayer.isPlaying();
return state.videoPlayer.isPlaying();
- }).then(function () {
+ }).then(function() {
expect(controls).not.toHaveClass('is-hidden');
}).always(done);
});
@@ -882,8 +882,8 @@ function (VideoPlayer) {
});
});
- describe('onSpeedChange', function () {
- beforeEach(function () {
+ describe('onSpeedChange', function() {
+ beforeEach(function() {
state = {
el: $(document),
speed: '1.50',
@@ -899,14 +899,14 @@ function (VideoPlayer) {
};
});
- describe('always', function () {
- it('convert the current time to the new speed', function () {
+ describe('always', function() {
+ it('convert the current time to the new speed', function() {
state.isFlashMode.and.returnValue(true);
VideoPlayer.prototype.onSpeedChange.call(state, '0.75', false);
expect(state.videoPlayer.currentTime).toBe('120.000');
});
- it('set video speed to the new speed', function () {
+ it('set video speed to the new speed', function() {
VideoPlayer.prototype.onSpeedChange.call(state, '0.75', false);
expect(state.setSpeed).toHaveBeenCalledWith('0.75');
expect(state.videoPlayer.setPlaybackRate)
@@ -915,8 +915,8 @@ function (VideoPlayer) {
});
});
- describe('setPlaybackRate', function () {
- beforeEach(function () {
+ describe('setPlaybackRate', function() {
+ beforeEach(function() {
state = {
youtubeId: jasmine.createSpy().and.returnValue('videoId'),
isFlashMode: jasmine.createSpy().and.returnValue(false),
@@ -938,7 +938,7 @@ function (VideoPlayer) {
};
});
- it('in Flash mode and video is playing', function () {
+ it('in Flash mode and video is playing', function() {
state.isFlashMode.and.returnValue(true);
state.isHtml5Mode.and.returnValue(false);
state.videoPlayer.isPlaying.and.returnValue(true);
@@ -948,7 +948,7 @@ function (VideoPlayer) {
.toHaveBeenCalledWith('videoId', 60);
});
- it('in Flash mode and video not started', function () {
+ it('in Flash mode and video not started', function() {
state.isFlashMode.and.returnValue(true);
state.isHtml5Mode.and.returnValue(false);
state.videoPlayer.isPlaying.and.returnValue(false);
@@ -964,13 +964,13 @@ function (VideoPlayer) {
.toHaveBeenCalledWith('videoId', 60);
});
- it('in HTML5 mode', function () {
+ it('in HTML5 mode', function() {
state.isYoutubeType.and.returnValue(false);
VideoPlayer.prototype.setPlaybackRate.call(state, '0.75');
expect(state.videoPlayer.player.setPlaybackRate).toHaveBeenCalledWith('0.75');
});
- it('Youtube video in FF, with new speed equal 1.0', function () {
+ it('Youtube video in FF, with new speed equal 1.0', function() {
state.browserIsFirefox = true;
state.videoPlayer.isPlaying.and.returnValue(false);
@@ -982,5 +982,4 @@ function (VideoPlayer) {
});
});
});
-
}(RequireJS.requirejs, RequireJS.require, RequireJS.define));
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_poster_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_poster_spec.js
index d2505a11c7..88e4554524 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_poster_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_poster_spec.js
@@ -1,16 +1,16 @@
-(function (WAIT_TIMEOUT) {
+(function(WAIT_TIMEOUT) {
'use strict';
- describe('VideoPoster', function () {
+ describe('VideoPoster', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice').and.returnValue(null);
state = jasmine.initializePlayer('video_with_bumper.html');
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
state.storage.clear();
if (state.bumperState && state.bumperState.videoPlayer) {
@@ -22,19 +22,19 @@
window.onTouchBasedDevice = oldOTBD;
});
- it('can render the poster', function () {
+ it('can render the poster', function() {
expect($('.poster')).toExist();
expect($('.btn-play')).toExist();
});
- it('can start playing the video on click', function (done) {
+ it('can start playing the video on click', function(done) {
$('.btn-play').click();
jasmine.waitUntil(function() {
return state.el.hasClass('is-playing');
}).done(done);
});
- it('destroy itself on "play" event', function () {
+ it('destroy itself on "play" event', function() {
$('.btn-play').click();
expect($('.poster')).not.toExist();
});
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js
index a9032669ab..1f3d5f728d 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js
@@ -1,29 +1,29 @@
-(function (undefined) {
- describe('VideoProgressSlider', function () {
+(function(undefined) {
+ describe('VideoProgressSlider', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice')
.and.returnValue(null);
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
window.onTouchBasedDevice = oldOTBD;
state.storage.clear();
state.videoPlayer.destroy();
});
- describe('constructor', function () {
- describe('on a non-touch based device', function () {
- beforeEach(function () {
+ describe('constructor', function() {
+ describe('on a non-touch based device', function() {
+ beforeEach(function() {
spyOn($.fn, 'slider').and.callThrough();
state = jasmine.initializePlayer();
});
- it('build the slider', function () {
+ it('build the slider', function() {
expect($('.slider')).toContain(state.videoProgressSlider.slider);
expect($.fn.slider).toHaveBeenCalledWith({
range: 'min',
@@ -34,12 +34,12 @@
});
});
- it('build the seek handle', function () {
+ it('build the seek handle', function() {
expect($('.ui-slider-handle'))
.toContain(state.videoProgressSlider.handle);
});
- it('add ARIA attributes to time control', function () {
+ it('add ARIA attributes to time control', function() {
var timeControl = $('div.slider > .progress-handle');
expect(timeControl).toHaveAttrs({
@@ -52,9 +52,8 @@
});
});
- describe('on a touch-based device', function () {
- it('does not build the slider on iPhone', function () {
-
+ describe('on a touch-based device', function() {
+ it('does not build the slider on iPhone', function() {
window.onTouchBasedDevice.and.returnValue(['iPhone']);
state = jasmine.initializePlayer();
@@ -64,8 +63,8 @@
// We can't expect $.fn.slider not to have been called,
// because sliders are used in other parts of Video.
});
- $.each(['iPad', 'Android'], function (index, device) {
- it('build the slider on ' + device, function () {
+ $.each(['iPad', 'Android'], function(index, device) {
+ it('build the slider on ' + device, function() {
window.onTouchBasedDevice.and.returnValue([device]);
state = jasmine.initializePlayer();
@@ -76,21 +75,21 @@
});
});
- describe('play', function () {
- beforeEach(function () {
+ describe('play', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
});
- describe('when the slider was already built', function () {
+ describe('when the slider was already built', function() {
var spy;
- beforeEach(function () {
+ beforeEach(function() {
spy = spyOn(state.videoProgressSlider, 'buildSlider');
spy.and.callThrough();
state.videoPlayer.play();
});
- it('does not build the slider', function () {
+ it('does not build the slider', function() {
expect(spy.calls.count()).toEqual(0);
});
});
@@ -98,25 +97,25 @@
// Currently, the slider is not rebuilt if it does not exist.
});
- describe('updatePlayTime', function () {
- beforeEach(function () {
+ describe('updatePlayTime', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
});
- describe('when frozen', function () {
- beforeEach(function () {
+ describe('when frozen', function() {
+ beforeEach(function() {
spyOn($.fn, 'slider').and.callThrough();
state.videoProgressSlider.frozen = true;
state.videoProgressSlider.updatePlayTime(20, 120);
});
- it('does not update the slider', function () {
+ it('does not update the slider', function() {
expect($.fn.slider).not.toHaveBeenCalled();
});
});
- describe('when not frozen', function () {
- beforeEach(function () {
+ describe('when not frozen', function() {
+ beforeEach(function() {
spyOn($.fn, 'slider').and.callThrough();
state.videoProgressSlider.frozen = false;
state.videoProgressSlider.updatePlayTime({
@@ -125,27 +124,27 @@
});
});
- it('update the max value of the slider', function () {
+ it('update the max value of the slider', function() {
expect($.fn.slider).toHaveBeenCalledWith(
'option', 'max', 120
);
});
- it('update current value of the slider', function () {
+ it('update current value of the slider', function() {
expect($.fn.slider).toHaveBeenCalledWith(
'option', 'value', 20
);
});
- it('required aria values updated', function () {
+ it('required aria values updated', function() {
expect(state.videoProgressSlider.handle.attr('aria-valuenow')).toBe('20');
expect(state.videoProgressSlider.handle.attr('aria-valuemax')).toBe('120');
});
});
});
- describe('onSlide', function () {
- beforeEach(function () {
+ describe('onSlide', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
spyOn($.fn, 'slider').and.callThrough();
@@ -153,27 +152,26 @@
});
// Disabled 12/30/13 due to flakiness in master
- xit('freeze the slider', function () {
+ xit('freeze the slider', function() {
state.videoProgressSlider.onSlide(
- jQuery.Event('slide'), { value: 20 }
+ jQuery.Event('slide'), {value: 20}
);
expect(state.videoProgressSlider.frozen).toBeTruthy();
});
// Disabled 12/30/13 due to flakiness in master
- xit('trigger seek event', function () {
+ xit('trigger seek event', function() {
state.videoProgressSlider.onSlide(
- jQuery.Event('slide'), { value: 20 }
+ jQuery.Event('slide'), {value: 20}
);
expect(state.videoPlayer.onSlideSeek).toHaveBeenCalled();
});
});
- describe('onStop', function () {
-
- beforeEach(function () {
+ describe('onStop', function() {
+ beforeEach(function() {
jasmine.clock().install();
state = jasmine.initializePlayer();
@@ -181,32 +179,32 @@
spyOn(state.videoPlayer, 'onSlideSeek').and.callThrough();
});
- afterEach(function () {
+ afterEach(function() {
jasmine.clock().uninstall();
});
// Disabled 12/30/13 due to flakiness in master
- xit('freeze the slider', function () {
+ xit('freeze the slider', function() {
state.videoProgressSlider.onStop(
- jQuery.Event('stop'), { value: 20 }
+ jQuery.Event('stop'), {value: 20}
);
expect(state.videoProgressSlider.frozen).toBeTruthy();
});
// Disabled 12/30/13 due to flakiness in master
- xit('trigger seek event', function () {
+ xit('trigger seek event', function() {
state.videoProgressSlider.onStop(
- jQuery.Event('stop'), { value: 20 }
+ jQuery.Event('stop'), {value: 20}
);
expect(state.videoPlayer.onSlideSeek).toHaveBeenCalled();
});
// Disabled 12/30/13 due to flakiness in master
- xit('set timeout to unfreeze the slider', function () {
+ xit('set timeout to unfreeze the slider', function() {
state.videoProgressSlider.onStop(
- jQuery.Event('stop'), { value: 20 }
+ jQuery.Event('stop'), {value: 20}
);
jasmine.clock().tick(200);
@@ -215,31 +213,31 @@
});
});
- it('getRangeParams' , function () {
+ it('getRangeParams', function() {
var testCases = [
- {
- startTime: 10,
- endTime: 20,
- duration: 150
- },
- {
- startTime: 90,
- endTime: 100,
- duration: 100
- },
- {
- startTime: 0,
- endTime: 200,
- duration: 200
- }
- ];
+ {
+ startTime: 10,
+ endTime: 20,
+ duration: 150
+ },
+ {
+ startTime: 90,
+ endTime: 100,
+ duration: 100
+ },
+ {
+ startTime: 0,
+ endTime: 200,
+ duration: 200
+ }
+ ];
state = jasmine.initializePlayer();
- $.each(testCases, function (index, testCase) {
- var step = 100/testCase.duration,
- left = testCase.startTime*step,
- width = testCase.endTime*step - left,
+ $.each(testCases, function(index, testCase) {
+ var step = 100 / testCase.duration,
+ left = testCase.startTime * step,
+ width = testCase.endTime * step - left,
expectedParams = {
left: left + '%',
width: width + '%'
@@ -252,8 +250,8 @@
});
});
- describe('notifyThroughHandleEnd', function () {
- beforeEach(function () {
+ describe('notifyThroughHandleEnd', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
spyOnEvent(state.videoProgressSlider.handle, 'focus');
@@ -261,7 +259,7 @@
.and.callThrough();
});
- it('params.end = true', function () {
+ it('params.end = true', function() {
state.videoProgressSlider.notifyThroughHandleEnd({end: true});
expect(state.videoProgressSlider.handle.attr('title'))
@@ -272,7 +270,7 @@
);
});
- it('params.end = false', function () {
+ it('params.end = false', function() {
state.videoProgressSlider.notifyThroughHandleEnd({end: false});
expect(state.videoProgressSlider.handle.attr('title'))
@@ -283,18 +281,17 @@
);
});
- it('is called when video plays', function (done) {
+ it('is called when video plays', function(done) {
state.videoPlayer.play();
jasmine.waitUntil(function() {
return state.videoPlayer.isPlaying();
}).done(function() {
expect(state.videoProgressSlider.notifyThroughHandleEnd).toHaveBeenCalledWith({end: false});
}).always(done);
-
});
});
- it('getTimeDescription', function () {
+ it('getTimeDescription', function() {
var cases = {
'0': '0 seconds',
'1': '1 second',
@@ -304,7 +301,7 @@
'121': '2 minutes 1 second',
'3670': '1 hour 1 minute 10 seconds',
- '21541': '5 hours 59 minutes 1 second',
+ '21541': '5 hours 59 minutes 1 second'
},
getTimeDescription;
@@ -317,13 +314,11 @@
});
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
state = jasmine.initializePlayer();
state.videoProgressSlider.destroy();
expect(state.videoProgressSlider).toBeUndefined();
expect($('.slider')).toBeEmpty();
});
-
});
-
}).call(this);
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js
index 251c59e8fa..5ddbe7274c 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js
@@ -1,8 +1,8 @@
-(function (undefined) {
- describe('VideoQualityControl', function () {
+(function(undefined) {
+ describe('VideoQualityControl', function() {
var state, qualityControl, videoPlayer, player;
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
if (state.storage) {
state.storage.clear();
@@ -10,34 +10,34 @@
state.videoPlayer.destroy();
});
- describe('constructor, YouTube mode', function () {
- beforeEach(function () {
- state = jasmine.initializePlayerYouTube();
+ describe('constructor, YouTube mode', function() {
+ beforeEach(function() {
+ state = jasmine.initializePlayerYouTube();
qualityControl = state.videoQualityControl;
videoPlayer = state.videoPlayer;
player = videoPlayer.player;
// Define empty methods in YouTube stub
player.quality = 'large';
- player.setPlaybackQuality.and.callFake(function (quality){
+ player.setPlaybackQuality.and.callFake(function(quality) {
player.quality = quality;
});
});
it('contains the quality control and is initially hidden',
- function () {
- expect(qualityControl.el).toHaveClass(
+ function() {
+ expect(qualityControl.el).toHaveClass(
'quality-control is-hidden'
);
- });
+ });
- it('add ARIA attributes to quality control', function () {
+ it('add ARIA attributes to quality control', function() {
expect(qualityControl.el).toHaveAttrs({
'aria-disabled': 'false'
});
});
- it('bind the quality control', function () {
+ it('bind the quality control', function() {
expect(qualityControl.el).toHandleWith('click',
qualityControl.toggleQuality
);
@@ -45,7 +45,7 @@
expect(state.el).toHandle('play');
});
- it('calls fetchAvailableQualities only once', function () {
+ it('calls fetchAvailableQualities only once', function() {
expect(player.getAvailableQualityLevels.calls.count())
.toEqual(0);
@@ -56,30 +56,30 @@
.toEqual(1);
});
- it('initializes with a quality equal to large', function () {
+ it('initializes with a quality equal to large', function() {
videoPlayer.onPlay();
expect(player.setPlaybackQuality).toHaveBeenCalledWith('large');
});
it('shows the quality control on play if HD is available',
- function () {
- videoPlayer.onPlay();
+ function() {
+ videoPlayer.onPlay();
- expect(qualityControl.el).not.toHaveClass('is-hidden');
- });
+ expect(qualityControl.el).not.toHaveClass('is-hidden');
+ });
it('leaves quality control hidden on play if HD is not available',
- function () {
- player.getAvailableQualityLevels.and.returnValue(
+ function() {
+ player.getAvailableQualityLevels.and.returnValue(
['large', 'medium', 'small']
);
- videoPlayer.onPlay();
- expect(qualityControl.el).toHaveClass('is-hidden');
- });
+ videoPlayer.onPlay();
+ expect(qualityControl.el).toHaveClass('is-hidden');
+ });
- it('switch to HD if it is available', function () {
+ it('switch to HD if it is available', function() {
videoPlayer.onPlay();
qualityControl.quality = 'large';
@@ -93,27 +93,27 @@
});
it('quality control is active if HD is available',
- function () {
- player.getAvailableQualityLevels.and.returnValue(
+ function() {
+ player.getAvailableQualityLevels.and.returnValue(
['highres', 'hd1080', 'hd720']
);
- qualityControl.quality = 'highres';
+ qualityControl.quality = 'highres';
- videoPlayer.onPlay();
- expect(qualityControl.el).toHaveClass('active');
- });
+ videoPlayer.onPlay();
+ expect(qualityControl.el).toHaveClass('active');
+ });
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
state.videoQualityControl.destroy();
expect(state.videoQualityControl).toBeUndefined();
expect($('.quality-control')).not.toExist();
});
});
- describe('constructor, HTML5 mode', function () {
- it('does not contain the quality control', function () {
- state = jasmine.initializePlayer();
+ describe('constructor, HTML5 mode', function() {
+ it('does not contain the quality control', function() {
+ state = jasmine.initializePlayer();
expect(state.el.find('.quality-control').length).toBe(0);
});
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_save_state_plugin_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_save_state_plugin_spec.js
index 42cdc1dcc8..75fec2555f 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_save_state_plugin_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_save_state_plugin_spec.js
@@ -1,9 +1,9 @@
-(function (undefined) {
+(function(undefined) {
'use strict';
- describe('VideoPlayer Save State plugin', function () {
+ describe('VideoPlayer Save State plugin', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice')
@@ -15,8 +15,7 @@
spyOn(state.storage, 'setItem');
});
- afterEach(function () {
-
+ afterEach(function() {
$('source').remove();
window.onTouchBasedDevice = oldOTBD;
state.storage.clear();
@@ -25,7 +24,7 @@
}
});
- describe('saveState function', function () {
+ describe('saveState function', function() {
var videoPlayerCurrentTime, newCurrentTime, speed;
// We make sure that `currentTime` is a float. We need to test
@@ -41,12 +40,12 @@
newCurrentTime = 5.4;
speed = '0.75';
- beforeEach(function () {
+ beforeEach(function() {
state.videoPlayer.currentTime = videoPlayerCurrentTime;
spyOn(window.Time, 'formatFull').and.callThrough();
});
- it('data is not an object, async is true', function () {
+ it('data is not an object, async is true', function() {
itSpec({
asyncVal: true,
speedVal: undefined,
@@ -58,7 +57,7 @@
});
});
- it('data contains speed, async is false', function () {
+ it('data contains speed, async is false', function() {
itSpec({
asyncVal: false,
speedVal: speed,
@@ -72,7 +71,7 @@
});
});
- it('data contains float position, async is true', function () {
+ it('data contains float position, async is true', function() {
itSpec({
asyncVal: true,
speedVal: undefined,
@@ -86,7 +85,7 @@
});
});
- it('data contains speed and rounded position, async is false', function () {
+ it('data contains speed and rounded position, async is false', function() {
itSpec({
asyncVal: false,
speedVal: speed,
@@ -102,7 +101,7 @@
});
});
- it('data contains empty object, async is true', function () {
+ it('data contains empty object, async is true', function() {
itSpec({
asyncVal: true,
speedVal: undefined,
@@ -112,7 +111,7 @@
});
});
- it('data contains position 0, async is true', function () {
+ it('data contains position 0, async is true', function() {
itSpec({
asyncVal: true,
speedVal: undefined,
@@ -127,11 +126,11 @@
});
function itSpec(value) {
- var asyncVal = value.asyncVal,
- speedVal = value.speedVal,
+ var asyncVal = value.asyncVal,
+ speedVal = value.speedVal,
positionVal = value.positionVal,
- data = value.data,
- ajaxData = value.ajaxData;
+ data = value.data,
+ ajaxData = value.ajaxData;
state.videoSaveStatePlugin.saveState(asyncVal, data);
@@ -162,7 +161,7 @@
}
});
- it('can save state on speed change', function () {
+ it('can save state on speed change', function() {
state.el.trigger('speedchange', ['2.0']);
expect($.ajax).toHaveBeenCalledWith({
url: state.config.saveStateUrl,
@@ -173,7 +172,7 @@
});
});
- it('can save state on page unload', function () {
+ it('can save state on page unload', function() {
$.ajax.calls.reset();
state.videoSaveStatePlugin.onUnload();
expect($.ajax).toHaveBeenCalledWith({
@@ -185,7 +184,7 @@
});
});
- it('can save state on pause', function () {
+ it('can save state on pause', function() {
state.el.trigger('pause');
expect($.ajax).toHaveBeenCalledWith({
url: state.config.saveStateUrl,
@@ -196,12 +195,12 @@
});
});
- it('can save state on language change', function () {
+ it('can save state on language change', function() {
state.el.trigger('language_menu:change', ['ua']);
expect(state.storage.setItem).toHaveBeenCalledWith('language', 'ua');
});
- it('can save youtube availability', function () {
+ it('can save youtube availability', function() {
$.ajax.calls.reset();
// Test the cases where we shouldn't send anything at all -- client
@@ -236,7 +235,7 @@
});
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
var plugin = state.videoSaveStatePlugin;
spyOn($.fn, 'off').and.callThrough();
state.videoSaveStatePlugin.destroy();
@@ -252,5 +251,4 @@
expect($.fn.off).toHaveBeenCalledWith('unload', plugin.onUnload);
});
});
-
}).call(this);
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_skip_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_skip_control_spec.js
index 2438dce8a2..91cd34dd21 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_skip_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_skip_control_spec.js
@@ -1,9 +1,9 @@
-(function () {
+(function() {
'use strict';
- describe('VideoSkipControl', function () {
+ describe('VideoSkipControl', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine
.createSpy('onTouchBasedDevice').and.returnValue(null);
@@ -12,7 +12,7 @@
spyOn(state.bumperState.videoCommands, 'execute').and.callThrough();
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
state.storage.clear();
if (state.bumperState && state.bumperState.videoPlayer) {
@@ -24,13 +24,13 @@
window.onTouchBasedDevice = oldOTBD;
});
- it('can render the control when video starts playing', function () {
+ it('can render the control when video starts playing', function() {
expect($('.skip-control')).not.toExist();
state.el.trigger('play');
expect($('.skip-control')).toExist();
});
- it('can skip the video on click', function () {
+ it('can skip the video on click', function() {
spyOn(state.bumperState.videoBumper, 'skipAndDoNotShowAgain');
state.el.trigger('play');
$('.skip-control').click();
@@ -38,7 +38,7 @@
expect(state.bumperState.videoBumper.skipAndDoNotShowAgain).toHaveBeenCalled();
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
state.bumperState.videoPlaySkipControl.destroy();
expect(state.bumperState.videoPlaySkipControl).toBeUndefined();
});
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
index f73b1f3c59..7359be0371 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
@@ -1,28 +1,28 @@
-(function (undefined) {
+(function(undefined) {
'use strict';
- describe('VideoSpeedControl', function () {
+ describe('VideoSpeedControl', function() {
var state, oldOTBD;
- beforeEach(function () {
+ beforeEach(function() {
oldOTBD = window.onTouchBasedDevice;
window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice')
.and.returnValue(null);
});
- afterEach(function () {
+ afterEach(function() {
$('source').remove();
window.onTouchBasedDevice = oldOTBD;
state.storage.clear();
state.videoPlayer.destroy();
});
- describe('constructor', function () {
- describe('always', function () {
- beforeEach(function () {
+ describe('constructor', function() {
+ describe('always', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
});
- it('add the video speed control to player', function () {
+ it('add the video speed control to player', function() {
var secondaryControls = $('.secondary-controls'),
li = secondaryControls.find('.video-speeds li');
@@ -35,7 +35,7 @@
);
expect(li.length).toBe(state.speeds.length);
- $.each(li.toArray().reverse(), function (index, link) {
+ $.each(li.toArray().reverse(), function(index, link) {
expect($(link).attr('data-speed')).toEqual(state.speeds[index]);
expect($(link).find('.speed-option').text()).toBe(
state.speeds[index] + 'x'
@@ -44,9 +44,9 @@
});
});
- describe('when running on touch based device', function () {
- $.each(['iPad', 'Android'], function (index, device) {
- it('is not rendered on' + device, function () {
+ describe('when running on touch based device', function() {
+ $.each(['iPad', 'Android'], function(index, device) {
+ it('is not rendered on' + device, function() {
window.onTouchBasedDevice.and.returnValue([device]);
state = jasmine.initializePlayer();
@@ -55,7 +55,7 @@
});
});
- describe('when running on non-touch based device', function () {
+ describe('when running on non-touch based device', function() {
var speedControl, speedEntries, speedButton, speedsContainer,
KEY = $.ui.keyCode,
@@ -63,7 +63,7 @@
return $.Event('keydown', {keyCode: key});
};
- beforeEach(function () {
+ beforeEach(function() {
state = jasmine.initializePlayer();
speedControl = $('.speeds');
speedButton = $('.speed-button');
@@ -72,67 +72,67 @@
});
it('open/close the speed menu on mouseenter/mouseleave',
- function () {
- speedControl.mouseenter();
- expect(speedControl).toHaveClass('is-opened');
- speedControl.mouseleave();
- expect(speedControl).not.toHaveClass('is-opened');
- });
+ function() {
+ speedControl.mouseenter();
+ expect(speedControl).toHaveClass('is-opened');
+ speedControl.mouseleave();
+ expect(speedControl).not.toHaveClass('is-opened');
+ });
it('do not close the speed menu on mouseleave if a speed ' +
- 'entry has focus', function () {
+ 'entry has focus', function() {
// Open speed meenu. Focus is on last speed entry.
speedControl.trigger(keyPressEvent(KEY.ENTER));
speedControl.mouseenter().mouseleave();
expect(speedControl).toHaveClass('is-opened');
});
- it('close the speed menu on outside click', function () {
+ it('close the speed menu on outside click', function() {
speedControl.trigger(keyPressEvent(KEY.ENTER));
$(window).click();
expect(speedControl).not.toHaveClass('is-opened');
});
- it('open the speed menu on ENTER keydown', function () {
+ it('open the speed menu on ENTER keydown', function() {
speedControl.trigger(keyPressEvent(KEY.ENTER));
expect(speedControl).toHaveClass('is-opened');
expect(speedEntries.last()).toBeFocused();
});
- it('open the speed menu on SPACE keydown', function () {
+ it('open the speed menu on SPACE keydown', function() {
speedControl.trigger(keyPressEvent(KEY.SPACE));
expect(speedControl).toHaveClass('is-opened');
expect(speedEntries.last()).toBeFocused();
});
- it('open the speed menu on UP keydown', function () {
+ it('open the speed menu on UP keydown', function() {
speedControl.trigger(keyPressEvent(KEY.UP));
expect(speedControl).toHaveClass('is-opened');
expect(speedEntries.last()).toBeFocused();
});
- it('close the speed menu on ESCAPE keydown', function () {
+ it('close the speed menu on ESCAPE keydown', function() {
speedControl.trigger(keyPressEvent(KEY.ESCAPE));
expect(speedControl).not.toHaveClass('is-opened');
});
it('UP and DOWN keydown function as expected on speed entries',
- function () {
- var speed_0_75 = speedEntries.filter(':contains("0.75x")'),
- speed_1_0 = speedEntries.filter(':contains("1.0x")');
+ function() {
+ var speed_0_75 = speedEntries.filter(':contains("0.75x")'),
+ speed_1_0 = speedEntries.filter(':contains("1.0x")');
// First open menu
- speedControl.trigger(keyPressEvent(KEY.UP));
- expect(speed_0_75).toBeFocused();
+ speedControl.trigger(keyPressEvent(KEY.UP));
+ expect(speed_0_75).toBeFocused();
- speed_0_75.trigger(keyPressEvent(KEY.UP));
- expect(speed_1_0).toBeFocused();
+ speed_0_75.trigger(keyPressEvent(KEY.UP));
+ expect(speed_1_0).toBeFocused();
- speed_1_0.trigger(keyPressEvent(KEY.DOWN));
- expect(speed_0_75).toBeFocused();
- });
+ speed_1_0.trigger(keyPressEvent(KEY.DOWN));
+ expect(speed_0_75).toBeFocused();
+ });
- it('ESC keydown on speed entry closes menu', function () {
+ it('ESC keydown on speed entry closes menu', function() {
// First open menu. Focus is on last speed entry.
speedControl.trigger(keyPressEvent(KEY.UP));
speedEntries.last().trigger(keyPressEvent(KEY.ESCAPE));
@@ -144,53 +144,53 @@
});
it('ENTER keydown on speed entry selects speed and closes menu',
- function () {
+ function() {
// First open menu.
- speedControl.trigger(keyPressEvent(KEY.UP));
+ speedControl.trigger(keyPressEvent(KEY.UP));
// Focus on 1.50x speed
- speedEntries.eq(0).focus();
- speedEntries.eq(0).trigger(keyPressEvent(KEY.ENTER));
+ speedEntries.eq(0).focus();
+ speedEntries.eq(0).trigger(keyPressEvent(KEY.ENTER));
// Menu is closed, focus has been returned to speed
// control and video speed is 1.50x.
- expect(speedButton).toBeFocused();
- expect($('.video-speeds li[data-speed="1.50"]'))
+ expect(speedButton).toBeFocused();
+ expect($('.video-speeds li[data-speed="1.50"]'))
.toHaveClass('is-active');
- expect($('.speeds .value')).toHaveHtml('1.50x');
- });
+ expect($('.speeds .value')).toHaveHtml('1.50x');
+ });
it('SPACE keydown on speed entry selects speed and closes menu',
- function () {
+ function() {
// First open menu.
- speedControl.trigger(keyPressEvent(KEY.UP));
+ speedControl.trigger(keyPressEvent(KEY.UP));
// Focus on 1.50x speed
- speedEntries.eq(0).focus();
- speedEntries.eq(0).trigger(keyPressEvent(KEY.SPACE));
+ speedEntries.eq(0).focus();
+ speedEntries.eq(0).trigger(keyPressEvent(KEY.SPACE));
// Menu is closed, focus has been returned to speed
// control and video speed is 1.50x.
- expect(speedButton).toBeFocused();
- expect($('.video-speeds li[data-speed="1.50"]'))
+ expect(speedButton).toBeFocused();
+ expect($('.video-speeds li[data-speed="1.50"]'))
.toHaveClass('is-active');
- expect($('.speeds .value')).toHaveHtml('1.50x');
- });
+ expect($('.speeds .value')).toHaveHtml('1.50x');
+ });
});
});
- describe('changeVideoSpeed', function () {
+ describe('changeVideoSpeed', function() {
// This is an unnecessary test. The internal browser API, and
// YouTube API detect (and do not do anything) if there is a
// request for a speed that is already set.
//
// describe("when new speed is the same") ...
- describe('when new speed is not the same', function () {
- beforeEach(function () {
+ describe('when new speed is not the same', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
state.videoSpeedControl.setSpeed(1.0);
});
- it('trigger speedChange event', function () {
+ it('trigger speedChange event', function() {
spyOnEvent(state.el, 'speedchange');
$('li[data-speed="0.75"] .speed-option').click();
@@ -200,14 +200,14 @@
});
});
- describe('onSpeedChange', function () {
- beforeEach(function () {
+ describe('onSpeedChange', function() {
+ beforeEach(function() {
state = jasmine.initializePlayer();
$('li[data-speed="1.0"]').addClass('is-active').attr('aria-pressed', 'true');
state.videoSpeedControl.setSpeed(0.75);
});
- it('set the new speed as active', function () {
+ it('set the new speed as active', function() {
expect($('li[data-speed="1.0"]')).not.toHaveClass('is-active');
expect($('li[data-speed="1.0"] .speed-option').attr('aria-pressed')).not.toEqual('true');
@@ -218,7 +218,7 @@
});
});
- it('can destroy itself', function () {
+ it('can destroy itself', function() {
state = jasmine.initializePlayer();
state.videoSpeedControl.destroy();
expect(state.videoSpeedControl).toBeUndefined();
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_storage_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_storage_spec.js
index 8cbe133dbb..1de049649d 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_storage_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_storage_spec.js
@@ -1,24 +1,24 @@
-(function (requirejs, require, define, undefined) {
-require(
+(function(requirejs, require, define, undefined) {
+ require(
['video/00_video_storage.js'],
-function (VideoStorage) {
- describe('VideoStorage', function () {
+function(VideoStorage) {
+ describe('VideoStorage', function() {
var namespace = 'test_storage',
id = 'video_id';
- afterEach(function () {
+ afterEach(function() {
VideoStorage(namespace, id).clear();
});
- describe('initialize', function () {
- it('with namespace and id', function () {
+ describe('initialize', function() {
+ it('with namespace and id', function() {
var storage = VideoStorage(namespace, id);
expect(window[namespace]).toBeDefined();
expect(window[namespace][id]).toBeDefined();
});
- it('without namespace and id', function () {
+ it('without namespace and id', function() {
spyOn(Number.prototype, 'toString').and.returnValue('0.abcdedg');
var storage = VideoStorage();
@@ -27,10 +27,10 @@ function (VideoStorage) {
});
});
- describe('methods: ', function () {
+ describe('methods: ', function() {
var data, storage;
- beforeEach(function () {
+ beforeEach(function() {
data = {
item_2: 'value_2'
};
@@ -42,7 +42,7 @@ function (VideoStorage) {
storage = VideoStorage(namespace, id);
});
- it('setItem', function () {
+ it('setItem', function() {
var expected = $.extend(true, {}, data, {item_4: 'value_4'});
expected[id]['item_3'] = 'value_3';
@@ -51,7 +51,7 @@ function (VideoStorage) {
expect(window[namespace]).toEqual(expected);
});
- it('getItem', function () {
+ it('getItem', function() {
var data = window[namespace],
getItem = storage.getItem;
@@ -60,7 +60,7 @@ function (VideoStorage) {
expect(getItem('item_3')).toBeUndefined();
});
- it('removeItem', function () {
+ it('removeItem', function() {
var data = window[namespace],
removeItem = storage.removeItem;
@@ -70,7 +70,7 @@ function (VideoStorage) {
expect(data['item_2']).toBeUndefined();
});
- it('clear', function () {
+ it('clear', function() {
var expected = {};
expected[id] = {};
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_volume_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_volume_control_spec.js
index 21037c2d9c..0ffb35f363 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_volume_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_volume_control_spec.js
@@ -1,328 +1,325 @@
-(function () {
-'use strict';
-describe('VideoVolumeControl', function () {
- var state, oldOTBD, volumeControl;
+(function() {
+ 'use strict';
+ describe('VideoVolumeControl', function() {
+ var state, oldOTBD, volumeControl;
- var KEY = $.ui.keyCode,
+ var KEY = $.ui.keyCode,
- keyPressEvent = function(key) {
- return $.Event('keydown', { keyCode: key });
- };
+ keyPressEvent = function(key) {
+ return $.Event('keydown', {keyCode: key});
+ };
- beforeEach(function () {
- oldOTBD = window.onTouchBasedDevice;
- window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice')
+ beforeEach(function() {
+ oldOTBD = window.onTouchBasedDevice;
+ window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice')
.and.returnValue(null);
- });
+ });
- afterEach(function () {
- $('source').remove();
- window.onTouchBasedDevice = oldOTBD;
- state.storage.clear();
- state.videoPlayer.destroy();
- });
+ afterEach(function() {
+ $('source').remove();
+ window.onTouchBasedDevice = oldOTBD;
+ state.storage.clear();
+ state.videoPlayer.destroy();
+ });
- it('Volume level has correct value even if cookie is broken', function () {
- $.cookie.and.returnValue('broken_cookie');
- state = jasmine.initializePlayer();
- volumeControl = state.videoVolumeControl;
- expect(volumeControl.volume).toEqual(100);
- });
-
- describe('constructor', function () {
- beforeEach(function () {
- spyOn($.fn, 'slider').and.callThrough();
- $.cookie.and.returnValue('75');
+ it('Volume level has correct value even if cookie is broken', function() {
+ $.cookie.and.returnValue('broken_cookie');
state = jasmine.initializePlayer();
volumeControl = state.videoVolumeControl;
- });
-
- it('initialize volume to 75%', function () {
- expect(volumeControl.volume).toEqual(75);
- });
-
- it('render the volume control', function () {
- expect($('.volume')).toExist();
- });
-
- it('create the slider', function () {
- expect($.fn.slider.calls.argsFor(2)).toEqual([{
- orientation: 'vertical',
- range: 'min',
- min: 0,
- max: 100,
- slide: jasmine.any(Function)
- }]);
- expect($.fn.slider).toHaveBeenCalledWith(
- 'value', volumeControl.volume
- );
- });
-
- it('add ARIA attributes to live region', function () {
- var liveRegion = $('.video-live-region');
-
- expect(liveRegion).toHaveAttrs({
- 'aria-live': 'polite'
- });
- });
-
- it('add ARIA attributes to volume control', function () {
- var button = $('.volume .control');
-
- expect(button).toHaveAttrs({
- 'aria-disabled': 'false'
- });
- });
-
- it('bind the volume control', function () {
- var button = $('.volume .control');
-
- expect(button).toHandle('keydown');
- expect(button).toHandle('mousedown');
- expect($('.volume')).not.toHaveClass('is-opened');
-
- $('.volume').mouseenter();
- expect($('.volume')).toHaveClass('is-opened');
-
- $('.volume').mouseleave();
- expect($('.volume')).not.toHaveClass('is-opened');
- });
- });
-
- describe('setVolume', function () {
- beforeEach(function () {
- state = jasmine.initializePlayer();
- volumeControl = state.videoVolumeControl;
-
- jasmine.addMatchers({
- assertLiveRegionState: function () {
- return {
- compare: function (actual, volume, expectation) {
- var region = $('.video-live-region');
-
- var getExpectedText = function (text) {
- return text + ' Volume.';
- };
-
- actual.setVolume(volume, true, true);
- return {
- pass: region.text() === getExpectedText(expectation)
- };
-
- }
- };
- }
- });
- });
-
- it('update is not called, if new volume equals current', function () {
- volumeControl.volume = 60;
- spyOn(volumeControl, 'updateSliderView');
- volumeControl.setVolume(60, false, true);
- expect(volumeControl.updateSliderView).not.toHaveBeenCalled();
- });
-
- it('volume is changed on sliding', function () {
- volumeControl.onSlideHandler(null, {value: 99});
- expect(volumeControl.volume).toBe(99);
- });
-
- describe('when the new volume is more than 0', function () {
- beforeEach(function () {
- volumeControl.setVolume(60, false, true);
- });
-
- it('set the player volume', function () {
- expect(volumeControl.volume).toEqual(60);
- });
-
- it('remove muted class', function () {
- expect($('.volume')).not.toHaveClass('is-muted');
- });
- });
-
- describe('when the new volume is more than 0, but was 0', function () {
- it('remove muted class', function () {
- volumeControl.setVolume(0, false, true);
- expect($('.volume')).toHaveClass('is-muted');
- state.el.trigger('volumechange', [20]);
- expect($('.volume')).not.toHaveClass('is-muted');
- });
- });
-
- describe('when the new volume is 0', function () {
- beforeEach(function () {
- volumeControl.setVolume(0, false, true);
- });
-
- it('set the player volume', function () {
- expect(volumeControl.volume).toEqual(0);
- });
-
- it('add muted class', function () {
- expect($('.volume')).toHaveClass('is-muted');
- });
- });
-
- it('when the new volume is Muted', function () {
- expect(volumeControl).assertLiveRegionState(0, 'Muted');
- });
-
- it('when the new volume is in ]0,20]', function () {
- expect(volumeControl).assertLiveRegionState(10, 'Very low');
- });
-
- it('when the new volume is in ]20,40]', function () {
- expect(volumeControl).assertLiveRegionState(30, 'Low');
- });
-
- it('when the new volume is in ]40,60]', function () {
- expect(volumeControl).assertLiveRegionState(50, 'Average');
- });
-
- it('when the new volume is in ]60,80]', function () {
- expect(volumeControl).assertLiveRegionState(70, 'Loud');
- });
-
- it('when the new volume is in ]80,100[', function () {
- expect(volumeControl).assertLiveRegionState(90, 'Very loud');
- });
-
- it('when the new volume is Maximum', function () {
- expect(volumeControl).assertLiveRegionState(100, 'Maximum');
- });
- });
-
- describe('increaseVolume', function () {
-
- beforeEach(function () {
- state = jasmine.initializePlayer();
- volumeControl = state.videoVolumeControl;
- });
-
- it('volume is increased correctly', function () {
- var button = $('.volume .control');
- volumeControl.volume = 60;
-
- // adjust the volume
- button.focus();
- button.trigger(keyPressEvent(KEY.UP));
- expect(volumeControl.volume).toEqual(80);
- });
-
- it('volume level is not changed if it is already max', function () {
- volumeControl.volume = 100;
- volumeControl.increaseVolume();
expect(volumeControl.volume).toEqual(100);
});
- });
- describe('decreaseVolume', function () {
+ describe('constructor', function() {
+ beforeEach(function() {
+ spyOn($.fn, 'slider').and.callThrough();
+ $.cookie.and.returnValue('75');
+ state = jasmine.initializePlayer();
+ volumeControl = state.videoVolumeControl;
+ });
- beforeEach(function () {
- state = jasmine.initializePlayer();
- volumeControl = state.videoVolumeControl;
+ it('initialize volume to 75%', function() {
+ expect(volumeControl.volume).toEqual(75);
+ });
+
+ it('render the volume control', function() {
+ expect($('.volume')).toExist();
+ });
+
+ it('create the slider', function() {
+ expect($.fn.slider.calls.argsFor(2)).toEqual([{
+ orientation: 'vertical',
+ range: 'min',
+ min: 0,
+ max: 100,
+ slide: jasmine.any(Function)
+ }]);
+ expect($.fn.slider).toHaveBeenCalledWith(
+ 'value', volumeControl.volume
+ );
+ });
+
+ it('add ARIA attributes to live region', function() {
+ var liveRegion = $('.video-live-region');
+
+ expect(liveRegion).toHaveAttrs({
+ 'aria-live': 'polite'
+ });
+ });
+
+ it('add ARIA attributes to volume control', function() {
+ var button = $('.volume .control');
+
+ expect(button).toHaveAttrs({
+ 'aria-disabled': 'false'
+ });
+ });
+
+ it('bind the volume control', function() {
+ var button = $('.volume .control');
+
+ expect(button).toHandle('keydown');
+ expect(button).toHandle('mousedown');
+ expect($('.volume')).not.toHaveClass('is-opened');
+
+ $('.volume').mouseenter();
+ expect($('.volume')).toHaveClass('is-opened');
+
+ $('.volume').mouseleave();
+ expect($('.volume')).not.toHaveClass('is-opened');
+ });
});
- it('volume is decreased correctly', function () {
- var button = $('.volume .control');
- volumeControl.volume = 60;
+ describe('setVolume', function() {
+ beforeEach(function() {
+ state = jasmine.initializePlayer();
+ volumeControl = state.videoVolumeControl;
+
+ jasmine.addMatchers({
+ assertLiveRegionState: function() {
+ return {
+ compare: function(actual, volume, expectation) {
+ var region = $('.video-live-region');
+
+ var getExpectedText = function(text) {
+ return text + ' Volume.';
+ };
+
+ actual.setVolume(volume, true, true);
+ return {
+ pass: region.text() === getExpectedText(expectation)
+ };
+ }
+ };
+ }
+ });
+ });
+
+ it('update is not called, if new volume equals current', function() {
+ volumeControl.volume = 60;
+ spyOn(volumeControl, 'updateSliderView');
+ volumeControl.setVolume(60, false, true);
+ expect(volumeControl.updateSliderView).not.toHaveBeenCalled();
+ });
+
+ it('volume is changed on sliding', function() {
+ volumeControl.onSlideHandler(null, {value: 99});
+ expect(volumeControl.volume).toBe(99);
+ });
+
+ describe('when the new volume is more than 0', function() {
+ beforeEach(function() {
+ volumeControl.setVolume(60, false, true);
+ });
+
+ it('set the player volume', function() {
+ expect(volumeControl.volume).toEqual(60);
+ });
+
+ it('remove muted class', function() {
+ expect($('.volume')).not.toHaveClass('is-muted');
+ });
+ });
+
+ describe('when the new volume is more than 0, but was 0', function() {
+ it('remove muted class', function() {
+ volumeControl.setVolume(0, false, true);
+ expect($('.volume')).toHaveClass('is-muted');
+ state.el.trigger('volumechange', [20]);
+ expect($('.volume')).not.toHaveClass('is-muted');
+ });
+ });
+
+ describe('when the new volume is 0', function() {
+ beforeEach(function() {
+ volumeControl.setVolume(0, false, true);
+ });
+
+ it('set the player volume', function() {
+ expect(volumeControl.volume).toEqual(0);
+ });
+
+ it('add muted class', function() {
+ expect($('.volume')).toHaveClass('is-muted');
+ });
+ });
+
+ it('when the new volume is Muted', function() {
+ expect(volumeControl).assertLiveRegionState(0, 'Muted');
+ });
+
+ it('when the new volume is in ]0,20]', function() {
+ expect(volumeControl).assertLiveRegionState(10, 'Very low');
+ });
+
+ it('when the new volume is in ]20,40]', function() {
+ expect(volumeControl).assertLiveRegionState(30, 'Low');
+ });
+
+ it('when the new volume is in ]40,60]', function() {
+ expect(volumeControl).assertLiveRegionState(50, 'Average');
+ });
+
+ it('when the new volume is in ]60,80]', function() {
+ expect(volumeControl).assertLiveRegionState(70, 'Loud');
+ });
+
+ it('when the new volume is in ]80,100[', function() {
+ expect(volumeControl).assertLiveRegionState(90, 'Very loud');
+ });
+
+ it('when the new volume is Maximum', function() {
+ expect(volumeControl).assertLiveRegionState(100, 'Maximum');
+ });
+ });
+
+ describe('increaseVolume', function() {
+ beforeEach(function() {
+ state = jasmine.initializePlayer();
+ volumeControl = state.videoVolumeControl;
+ });
+
+ it('volume is increased correctly', function() {
+ var button = $('.volume .control');
+ volumeControl.volume = 60;
// adjust the volume
- button.focus();
- button.trigger(keyPressEvent(KEY.DOWN));
- expect(volumeControl.volume).toEqual(40);
+ button.focus();
+ button.trigger(keyPressEvent(KEY.UP));
+ expect(volumeControl.volume).toEqual(80);
+ });
+
+ it('volume level is not changed if it is already max', function() {
+ volumeControl.volume = 100;
+ volumeControl.increaseVolume();
+ expect(volumeControl.volume).toEqual(100);
+ });
});
- it('volume level is not changed if it is already min', function () {
- volumeControl.volume = 0;
- volumeControl.decreaseVolume();
- expect(volumeControl.volume).toEqual(0);
- });
- });
+ describe('decreaseVolume', function() {
+ beforeEach(function() {
+ state = jasmine.initializePlayer();
+ volumeControl = state.videoVolumeControl;
+ });
- describe('toggleMute', function () {
- beforeEach(function () {
- state = jasmine.initializePlayer();
- volumeControl = state.videoVolumeControl;
- });
-
- describe('when the current volume is more than 0', function () {
- beforeEach(function () {
+ it('volume is decreased correctly', function() {
+ var button = $('.volume .control');
volumeControl.volume = 60;
- volumeControl.button.trigger('mousedown');
+
+ // adjust the volume
+ button.focus();
+ button.trigger(keyPressEvent(KEY.DOWN));
+ expect(volumeControl.volume).toEqual(40);
});
- it('save the previous volume', function () {
- expect(volumeControl.storedVolume).toEqual(60);
- });
-
- it('set the player volume', function () {
+ it('volume level is not changed if it is already min', function() {
+ volumeControl.volume = 0;
+ volumeControl.decreaseVolume();
expect(volumeControl.volume).toEqual(0);
});
});
- describe('when the current volume is 0', function () {
- beforeEach(function () {
- volumeControl.volume = 0;
- volumeControl.storedVolume = 60;
- volumeControl.button.trigger('mousedown');
+ describe('toggleMute', function() {
+ beforeEach(function() {
+ state = jasmine.initializePlayer();
+ volumeControl = state.videoVolumeControl;
});
- it('set the player volume to previous volume', function () {
+ describe('when the current volume is more than 0', function() {
+ beforeEach(function() {
+ volumeControl.volume = 60;
+ volumeControl.button.trigger('mousedown');
+ });
+
+ it('save the previous volume', function() {
+ expect(volumeControl.storedVolume).toEqual(60);
+ });
+
+ it('set the player volume', function() {
+ expect(volumeControl.volume).toEqual(0);
+ });
+ });
+
+ describe('when the current volume is 0', function() {
+ beforeEach(function() {
+ volumeControl.volume = 0;
+ volumeControl.storedVolume = 60;
+ volumeControl.button.trigger('mousedown');
+ });
+
+ it('set the player volume to previous volume', function() {
+ expect(volumeControl.volume).toEqual(60);
+ });
+ });
+ });
+
+ describe('keyDownHandler', function() {
+ beforeEach(function() {
+ state = jasmine.initializePlayer();
+ volumeControl = state.videoVolumeControl;
+ });
+
+ var assertVolumeIsNotChanged = function(eventObject) {
+ volumeControl.volume = 60;
+ state.el.trigger(jQuery.Event('keydown', eventObject));
expect(volumeControl.volume).toEqual(60);
+ };
+
+ it('nothing happens if ALT+keyUp are pushed down', function() {
+ assertVolumeIsNotChanged({
+ keyCode: KEY.UP,
+ altKey: true
+ });
+ });
+
+ it('nothing happens if SHIFT+keyUp are pushed down', function() {
+ assertVolumeIsNotChanged({
+ keyCode: KEY.UP,
+ shiftKey: true
+ });
+ });
+
+ it('nothing happens if SHIFT+keyDown are pushed down', function() {
+ assertVolumeIsNotChanged({
+ keyCode: KEY.DOWN,
+ shiftKey: true
+ });
+ });
+ });
+
+ describe('keyDownButtonHandler', function() {
+ beforeEach(function() {
+ state = jasmine.initializePlayer();
+ volumeControl = state.videoVolumeControl;
+ });
+
+ it('nothing happens if ALT+ENTER are pushed down', function() {
+ var isMuted = volumeControl.getMuteStatus();
+ $('.volume .control').trigger(jQuery.Event('keydown', {
+ keyCode: KEY.ENTER,
+ altKey: true
+ }));
+ expect(volumeControl.getMuteStatus()).toEqual(isMuted);
});
});
});
-
- describe('keyDownHandler', function () {
- beforeEach(function () {
- state = jasmine.initializePlayer();
- volumeControl = state.videoVolumeControl;
- });
-
- var assertVolumeIsNotChanged = function (eventObject) {
- volumeControl.volume = 60;
- state.el.trigger(jQuery.Event("keydown", eventObject));
- expect(volumeControl.volume).toEqual(60);
- };
-
- it('nothing happens if ALT+keyUp are pushed down', function () {
- assertVolumeIsNotChanged({
- keyCode: KEY.UP,
- altKey: true
- });
- });
-
- it('nothing happens if SHIFT+keyUp are pushed down', function () {
- assertVolumeIsNotChanged({
- keyCode: KEY.UP,
- shiftKey: true
- });
- });
-
- it('nothing happens if SHIFT+keyDown are pushed down', function () {
- assertVolumeIsNotChanged({
- keyCode: KEY.DOWN,
- shiftKey: true
- });
- });
- });
-
- describe('keyDownButtonHandler', function () {
- beforeEach(function () {
- state = jasmine.initializePlayer();
- volumeControl = state.videoVolumeControl;
- });
-
- it('nothing happens if ALT+ENTER are pushed down', function () {
- var isMuted = volumeControl.getMuteStatus();
- $('.volume .control').trigger(jQuery.Event("keydown", {
- keyCode: KEY.ENTER,
- altKey: true
- }));
- expect(volumeControl.getMuteStatus()).toEqual(isMuted);
- });
- });
-});
}).call(this);
diff --git a/common/lib/xmodule/xmodule/js/spec/xmodule_spec.js b/common/lib/xmodule/xmodule/js/spec/xmodule_spec.js
index 35f21c401f..8dd3efdf16 100644
--- a/common/lib/xmodule/xmodule/js/spec/xmodule_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/xmodule_spec.js
@@ -1,14 +1,14 @@
-(function () {
+(function() {
'use strict';
- describe('XBlockToXModuleShim', function () {
- describe('definition', function () {
- it('XBlockToXModuleShim is defined, and is a function', function () {
+ describe('XBlockToXModuleShim', function() {
+ describe('definition', function() {
+ it('XBlockToXModuleShim is defined, and is a function', function() {
expect($.isFunction(XBlockToXModuleShim)).toBe(true);
});
});
- describe('implementation', function () {
+ describe('implementation', function() {
var el,
videoModule = {
'module': 'video_module'
@@ -18,7 +18,7 @@
removeNone,
removeVideo;
- beforeEach(function () {
+ beforeEach(function() {
el = $('
');
if (window.None) {
@@ -47,7 +47,7 @@
spyOnEvent($(document), 'XModule.loaded.display');
});
- afterEach(function () {
+ afterEach(function() {
el = null;
if (removeNone) {
@@ -58,14 +58,14 @@
}
});
- it('if element module is of type None, nothing happens', function () {
+ it('if element module is of type None, nothing happens', function() {
el.data('type', 'None');
expect(XBlockToXModuleShim(null, el)).toBeUndefined();
expect(window.None).not.toHaveBeenCalled();
});
- it('if element module is of type Video, Video module constructor is called', function () {
+ it('if element module is of type Video, Video module constructor is called', function() {
el.data('type', 'Video');
expect(XBlockToXModuleShim(null, el)).toEqual(videoModule);
@@ -75,7 +75,7 @@
expect('XModule.loaded.display').not.toHaveBeenTriggeredOn(document);
});
- it('if element has class "xmodule_edit"', function () {
+ it('if element has class "xmodule_edit"', function() {
el.data('type', 'Video')
.addClass('xmodule_edit');
XBlockToXModuleShim(null, el);
@@ -84,7 +84,7 @@
expect('XModule.loaded.display').not.toHaveBeenTriggeredOn($(document));
});
- it('if element has class "xmodule_display"', function () {
+ it('if element has class "xmodule_display"', function() {
el.data('type', 'Video')
.addClass('xmodule_display');
XBlockToXModuleShim(null, el);
@@ -93,7 +93,7 @@
expect(displayCallback).toHaveBeenCalledWith(jasmine.any($.Event), el, videoModule);
});
- it('if element has classes "xmodule_edit", and "xmodule_display"', function () {
+ it('if element has classes "xmodule_edit", and "xmodule_display"', function() {
el.data('type', 'Video')
.addClass('xmodule_edit')
.addClass('xmodule_display');
@@ -102,7 +102,7 @@
expect('XModule.loaded.display').toHaveBeenTriggeredOn($(document));
});
- it('element is of an unknown Module type, console.error() is called if it is defined', function () {
+ it('element is of an unknown Module type, console.error() is called if it is defined', function() {
var oldConsole = window.console;
if (window.console && window.console.error) {
@@ -121,9 +121,9 @@
window.console = oldConsole;
});
- it('element is of an unknown Module type, JavaScript throws if console.error() is not defined', function () {
+ it('element is of an unknown Module type, JavaScript throws if console.error() is not defined', function() {
var oldConsole = window.console,
- testFunction = function () {
+ testFunction = function() {
return XBlockToXModuleShim(null, el);
};
@@ -140,55 +140,55 @@
});
});
- describe('XModule.Descriptor', function () {
- describe('definition', function () {
- it('XModule is defined, and is a plain object', function () {
+ describe('XModule.Descriptor', function() {
+ describe('definition', function() {
+ it('XModule is defined, and is a plain object', function() {
expect($.isPlainObject(XModule)).toBe(true);
});
- it('XModule.Descriptor is defined, and is a function', function () {
+ it('XModule.Descriptor is defined, and is a function', function() {
expect($.isFunction(XModule.Descriptor)).toBe(true);
});
- it('XModule.Descriptor has a complete prototype', function () {
+ it('XModule.Descriptor has a complete prototype', function() {
expect($.isFunction(XModule.Descriptor.prototype.onUpdate)).toBe(true);
expect($.isFunction(XModule.Descriptor.prototype.update)).toBe(true);
expect($.isFunction(XModule.Descriptor.prototype.save)).toBe(true);
});
});
- describe('implementation', function () {
+ describe('implementation', function() {
var el, obj, callback, length;
// This is a dummy callback.
- callback = function () {
+ callback = function() {
var x = 1;
return x + 1;
};
- beforeEach(function () {
+ beforeEach(function() {
el = 'dummy object';
obj = new XModule.Descriptor(el);
spyOn(obj, 'save').and.callThrough();
});
- afterEach(function () {
+ afterEach(function() {
el = null;
obj = null;
length = undefined;
});
- it('Descriptor is a proper constructor function', function () {
+ it('Descriptor is a proper constructor function', function() {
expect(obj.hasOwnProperty('element')).toBe(true);
expect(obj.element).toBe(el);
expect(obj.hasOwnProperty('update')).toBe(true);
});
- it('Descriptor.onUpdate called for the first time', function () {
+ it('Descriptor.onUpdate called for the first time', function() {
expect(obj.hasOwnProperty('callbacks')).toBe(false);
obj.onUpdate(callback);
expect(obj.hasOwnProperty('callbacks')).toBe(true);
@@ -199,7 +199,7 @@
expect(obj.callbacks[length - 1]).toBe(callback);
});
- it('Descriptor.onUpdate called for Nth time', function () {
+ it('Descriptor.onUpdate called for Nth time', function() {
// In this test it doesn't matter what obj.callbacks
// consists of.
obj.callbacks = ['test1', 'test2', 'test3'];
@@ -211,13 +211,13 @@
expect(obj.callbacks[length - 1]).toBe(callback);
});
- it('Descriptor.save returns a blank object', function () {
+ it('Descriptor.save returns a blank object', function() {
// NOTE: In the future the implementation of .save()
// method may change!
expect(obj.save()).toEqual({});
});
- it('Descriptor.update triggers all callbacks with whatever .save() returns', function () {
+ it('Descriptor.update triggers all callbacks with whatever .save() returns', function() {
var callback1 = jasmine.createSpy('callback1'),
callback2 = jasmine.createSpy('callback2'),
testValue = 'test 123';
diff --git a/common/lib/xmodule/xmodule/js/src/capa/imageinput.js b/common/lib/xmodule/xmodule/js/src/capa/imageinput.js
index 1e182cba8d..b5f53366e8 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/imageinput.js
+++ b/common/lib/xmodule/xmodule/js/src/capa/imageinput.js
@@ -13,7 +13,7 @@
* ~ Chinese Proverb
*/
-window.ImageInput = (function ($, undefined) {
+window.ImageInput = (function($, undefined) {
var ImageInput = ImageInputConstructor;
ImageInput.prototype = {
diff --git a/common/lib/xmodule/xmodule/js/src/capa/schematic.js b/common/lib/xmodule/xmodule/js/src/capa/schematic.js
index 9daacca8c5..d0cb25c5e5 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/schematic.js
+++ b/common/lib/xmodule/xmodule/js/src/capa/schematic.js
@@ -85,7 +85,7 @@ var cktsim = (function() {
this.abstol = new Array(this.N);
this.solution = new Array(this.N);
this.rhs = new Array(this.N);
- for (var i = this.N - 1; i >= 0; --i) {
+ for (var i = this.N - 1; i >= 0; --i) {
this.soln_max[i] = 0.0;
this.abstol[i] = this.ntypes[i] == T_VOLTAGE ? v_abstol : i_abstol;
this.solution[i] = 0.0;
@@ -97,7 +97,7 @@ var cktsim = (function() {
this.devices[i].load_linear(this)
}
- // Check for voltage source loops.
+ // Check for voltage source loops.
var n_vsrc = this.voltage_sources.length;
if (n_vsrc > 0) { // At least one voltage source
var GV = mat_make(n_vsrc, this.N); // Loop check
@@ -110,11 +110,11 @@ var cktsim = (function() {
if (rGV < n_vsrc) {
alert('Warning!!! Circuit has a voltage source loop or a source or current probe shorted by a wire, please remove the source or the wire causing the short.');
alert('Warning!!! Simulator might produce meaningless results or no result with illegal circuits.');
- return false;
+ return false;
}
}
}
- return true;
+ return true;
}
// load circuit from JSON netlist (see schematic.js)
@@ -209,7 +209,7 @@ var cktsim = (function() {
if (this.ntypes[i] == T_VOLTAGE)
abssum_rhs += Math.abs(rhs[i]);
- if ((iter > 0) && (use_limiting == false) && (abssum_old < abssum_rhs)) {
+ if ((iter > 0) && (use_limiting == false) && (abssum_old < abssum_rhs)) {
// Old rhsnorm was better, undo last iter and turn on limiting
for (var i = this.N - 1; i >= 0; --i)
soln[i] -= d_sol[i];
@@ -222,7 +222,7 @@ var cktsim = (function() {
// If norm going down for ten iters, stop limiting
if (abssum_rhs < abssum_old)
down_count += 1;
- else
+ else
down_count = 0;
if (down_count > 10) {
use_limiting = false;
@@ -230,14 +230,14 @@ var cktsim = (function() {
}
// Update norm of rhs
- abssum_old = abssum_rhs;
+ abssum_old = abssum_rhs;
}
// Update the worst case abssum for comparison.
if ((iter == 0) || (abssum_rhs > abssum_compare))
abssum_compare = abssum_rhs;
- // Check residue convergence, but loosely, and give up
+ // Check residue convergence, but loosely, and give up
// on last iteration
if ( (iter < (maxiters - 1)) &&
(abssum_rhs > (res_check_abs+res_check_rel*abssum_compare)))
@@ -263,7 +263,7 @@ var cktsim = (function() {
}
if (converged == true) {
- for (var i = this.N - 1; i >= 0; --i)
+ for (var i = this.N - 1; i >= 0; --i)
if (Math.abs(soln[i]) > this.soln_max[i])
this.soln_max[i] = Math.abs(soln[i]);
return iter+1;
@@ -338,7 +338,7 @@ var cktsim = (function() {
mat_v_mult(ckt.C, soln, ckt.q, 1.0);
// -rhs = c - dqdt
for (var i = ckt.N-1; i >= 0; --i) {
- var dqdt = ckt.alpha0*ckt.q[i] + ckt.alpha1*ckt.oldq[i] +
+ var dqdt = ckt.alpha0*ckt.q[i] + ckt.alpha1*ckt.oldq[i] +
ckt.alpha2*ckt.old2q[i];
rhs[i] = ckt.beta0[i]*ckt.c[i] + ckt.beta1[i]*ckt.oldc[i] - dqdt;
}
@@ -386,7 +386,7 @@ var cktsim = (function() {
lte_step_ratio = Math.min(lte_step_ratio, max_growth_factor);
if (lte_step_ratio > 1.2) /* Increase timestep due to lte. */
new_step = (ckt.time - ckt.oldt) * lte_step_ratio / 1.2;
- else
+ else
new_step = (ckt.time - ckt.oldt);
new_step = Math.min(new_step, ckt.max_step);
}
@@ -398,9 +398,9 @@ var cktsim = (function() {
no_dc = false;
if ((this.diddc == false) && (no_dc == false)) {
if (this.dc() == undefined) { // DC failed, realloc mats and vects.
- alert('DC failed, trying transient analysis from zero.');
+ alert('DC failed, trying transient analysis from zero.');
this.finalized = false; // Reset the finalization.
- if (this.finalize() == false)
+ if (this.finalize() == false)
return undefined;
}
}
@@ -438,7 +438,7 @@ var cktsim = (function() {
// Non-algebraic variables and probe variables get lte
this.ltecheck = new Array(this.N);
- for (var i = N; i >= 0; --i)
+ for (var i = N; i >= 0; --i)
this.ltecheck[i] = (this.ar[i] == 0);
for (var name in this.node_map) {
@@ -478,10 +478,10 @@ var cktsim = (function() {
this.old3sol[i] = this.solution[i];
this.old2sol[i] = this.solution[i];
this.oldsol[i] = this.solution[i];
- this.old3q[i] = this.q[i];
- this.old2q[i] = this.q[i];
- this.oldq[i] = this.q[i];
- this.oldc[i] = this.c[i];
+ this.old3q[i] = this.q[i];
+ this.old2q[i] = this.q[i];
+ this.oldq[i] = this.q[i];
+ this.oldc[i] = this.c[i];
}
var beta0,beta1;
@@ -506,8 +506,8 @@ var cktsim = (function() {
this.old2t = this.oldt - (tstart-this.oldt)
this.oldt = tstart - (this.time - this.oldt);
this.time = tstart;
- beta0 = 1.0;
- beta1 = 0.0;
+ beta0 = 1.0;
+ beta1 = 0.0;
} else { // Take a regular step
// Save the time, and rotate time wheel
response[this.N].push(this.time);
@@ -525,7 +525,7 @@ var cktsim = (function() {
// Use trap (average old and new crnts.
beta0 = 0.5;
- beta1 = 0.5;
+ beta1 = 0.5;
}
// For trap rule, turn off current avging for algebraic eqns
@@ -547,24 +547,24 @@ var cktsim = (function() {
this.beta0[i] = 1.0;
this.beta1[i] = 0.0;
}
- }
+ }
// Use Newton to compute the solution.
var iterations = this.find_solution(load_tran,max_tran_iters);
// If NR succeeds and stepsize is at min, accept and newstep=maxgrowth*minstep.
// Else if Newton Fails, shrink step by a factor and try again
// Else LTE picks new step, if bigger accept current step and go on.
- if ((iterations != undefined) &&
+ if ((iterations != undefined) &&
(step_index <= 0 || (this.time-this.oldt) < (1+reltol)*this.min_step)) {
if (step_index > 0) new_step = time_step_increase_factor*this.min_step;
break;
} else if (iterations == undefined) { // NR nonconvergence, shrink by factor
- this.time = this.oldt +
+ this.time = this.oldt +
(this.time - this.oldt)/nr_step_decrease_factor;
} else { // Check the LTE and shrink step if needed.
new_step = pick_step(this, step_index);
if (new_step < (1.0 - reltol)*(this.time - this.oldt)) {
- this.time = this.oldt + new_step; // Try again
+ this.time = this.oldt + new_step; // Try again
}
else
break; // LTE okay, new_step for next step
@@ -687,7 +687,7 @@ var cktsim = (function() {
this.devices.push(d);
d.name = name;
if (name) {
- if (this.device_map[name] === undefined)
+ if (this.device_map[name] === undefined)
this.device_map[name] = d;
else {
alert('Warning: two circuit elements share the same name ' + name);
@@ -793,8 +793,8 @@ var cktsim = (function() {
//
// Support for creating conductance and capacitance matrices associated with
// modified nodal analysis (unknowns are node voltages and inductor and voltage
- // source currents).
- // The linearized circuit is written as
+ // source currents).
+ // The linearized circuit is written as
// C d/dt x = G x + rhs
// x - vector of node voltages and element currents
// rhs - vector of source values
@@ -870,10 +870,10 @@ var cktsim = (function() {
// Allocate an NxM matrix
function mat_make(N,M) {
- var mat = new Array(N);
- for (var i = N - 1; i >= 0; --i) {
+ var mat = new Array(N);
+ for (var i = N - 1; i >= 0; --i) {
mat[i] = new Array(M);
- for (var j = M - 1; j >= 0; --j) {
+ for (var j = M - 1; j >= 0; --j) {
mat[i][j] = 0.0;
}
}
@@ -1009,7 +1009,7 @@ var cktsim = (function() {
// now eliminate this column for all subsequent rows
for (var i = row + 1; i < Nr; i++) {
temp = M[i][col]/M[row][col]; // multiplier for current row
- if (temp != 0) // subtract
+ if (temp != 0) // subtract
for (var j = col; j < Nc; j++) M[i][j] -= M[row][j]*temp;
}
// Now move on to the next row
@@ -1021,7 +1021,7 @@ var cktsim = (function() {
return the_rank;
}
- // Solve Mx=b and return vector x using R^TQ^T factorization.
+ // Solve Mx=b and return vector x using R^TQ^T factorization.
// Multiplication by R^T implicit, should be null-space free soln.
// M should have the extra column!
// Almost everything is in-lined for speed, sigh.
@@ -1038,7 +1038,7 @@ var cktsim = (function() {
var mat_scale = 0; // Sets the scale for comparison to zero.
var max_nonzero_row = Nr-1; // Assumes M nonsingular.
- for (var row = 0; row < Nr; row++) {
+ for (var row = 0; row < Nr; row++) {
// Find largest row with largest 2-norm
var max_row = row;
var maxsumsq = 0;
@@ -1077,7 +1077,7 @@ var cktsim = (function() {
for (var rowp = row + 1; rowp < Nr; rowp++) { // Update.
var Mrp = M[rowp];
var inner = 0;
- for (var col = Nc-2; col >= 0; --col) // Project
+ for (var col = Nc-2; col >= 0; --col) // Project
inner += Mr[col]*Mrp[col];
for (var col = Nc-1; col >= 0; --col) // Ortho (rhs also)
Mrp[col] -= inner *Mr[col];
@@ -1122,7 +1122,7 @@ var cktsim = (function() {
// if no value found, generate a small conductance to gnd
// otherwise swap current row with pivot row
- if (max_v == 0) M[col][col] = eps;
+ if (max_v == 0) M[col][col] = eps;
else {
temp = M[col];
M[col] = M[max_col];
@@ -1588,12 +1588,12 @@ var cktsim = (function() {
// Source voltage added to b.
VSource.prototype.load_dc = function(ckt,soln,rhs) {
- ckt.add_to_rhs(this.branch,this.src.dc,rhs);
+ ckt.add_to_rhs(this.branch,this.src.dc,rhs);
}
// Load time-dependent value for voltage source for tran
VSource.prototype.load_tran = function(ckt,soln,rhs,time) {
- ckt.add_to_rhs(this.branch,this.src.value(time),rhs);
+ ckt.add_to_rhs(this.branch,this.src.value(time),rhs);
}
// return time of next breakpoint for the device
@@ -1756,7 +1756,7 @@ var cktsim = (function() {
Capacitor.prototype.constructor = Capacitor;
Capacitor.prototype.load_linear = function(ckt) {
- // MNA stamp for capacitance matrix
+ // MNA stamp for capacitance matrix
ckt.add_capacitance(this.n1,this.n2,this.value);
}
@@ -1808,7 +1808,7 @@ var cktsim = (function() {
///////////////////////////////////////////////////////////////////////////////
//
- // Simple Voltage-Controlled Voltage Source Op Amp model
+ // Simple Voltage-Controlled Voltage Source Op Amp model
//
///////////////////////////////////////////////////////////////////////////////
@@ -1900,7 +1900,7 @@ var cktsim = (function() {
gmgs *= vds;
}
ckt.add_to_rhs(d,-ids,rhs); // current flows into the drain
- ckt.add_to_rhs(s, ids,rhs); // and out the source
+ ckt.add_to_rhs(s, ids,rhs); // and out the source
ckt.add_conductance(d,s,gds);
ckt.add_to_G(s,s, gmgs);
ckt.add_to_G(d,s,-gmgs);
@@ -1939,7 +1939,7 @@ var cktsim = (function() {
// Copyright (C) 2011 Massachusetts Institute of Technology
-// add schematics to a document with
+// add schematics to a document with
//
//
//
@@ -2786,7 +2786,7 @@ schematic = (function() {
if (ckt === null) return;
var results = ckt.ac(npts,fstart,fstop,ac_source_name);
- if (typeof results == 'string')
+ if (typeof results == 'string')
this.message(results);
else {
var x_values = results['_frequencies_'];
@@ -2913,7 +2913,7 @@ schematic = (function() {
var results = ckt.tran(ckt.parse_number(sch.tran_npts), 0,
ckt.parse_number(sch.tran_tstop), probe_names, false);
- if (typeof results == 'string')
+ if (typeof results == 'string')
sch.message(results);
else {
if (sch.submit_analyses != undefined) {
@@ -3885,7 +3885,7 @@ schematic = (function() {
child = document.createElement('img');
label = document.createElement('span');
hidden = document.createElement('span');
-
+
tool.style.backgroundImage = 'none';
tool.setAttribute('title', tip);
label.innerHTML = tip;
@@ -4173,7 +4173,7 @@ schematic = (function() {
if (x == x_min) {
c.moveTo(temp,top_margin);
c.lineTo(temp,end);
- } else
+ } else
c.dashedLineTo(temp,top_margin,temp,end,grid_pattern);
c.stroke();
@@ -4219,7 +4219,7 @@ schematic = (function() {
if (y == y_min) {
c.moveTo(left_margin,temp);
c.lineTo(left_margin + pwidth,temp);
- } else
+ } else
c.dashedLineTo(left_margin,temp,left_margin + pwidth,temp,grid_pattern);
c.stroke();
@@ -5137,7 +5137,7 @@ schematic = (function() {
this.location = nx + ',' + ny;
// add ourselves to the connection list for the new location
- if (parent.sch)
+ if (parent.sch)
parent.sch.update_connection_point(this,old_location);
}
@@ -6069,7 +6069,7 @@ schematic = (function() {
var first = true;
var value = '';
for (var label in fields) {
- if (label == 'name')
+ if (label == 'name')
c.properties['name'] = fields['name'].value;
else if (label == 'value') {
// if unknown source type
@@ -6115,7 +6115,7 @@ schematic = (function() {
this.draw_text(c,'\u2588\u2588\u2588',-8,8,4,annotation_size,element_style);
c.globalAlpha = 1.0;
- // display the element current
+ // display the element current
var i = engineering_notation(v,2) + 'A';
this.draw_text(c,i,-3,5,5,annotation_size,annotation_style);
// draw arrow for current
@@ -6193,4 +6193,4 @@ schematic = (function() {
'component_slider': component_slider
}
return module;
- }());
+}());
diff --git a/common/lib/xmodule/xmodule/js/src/collapsible.js b/common/lib/xmodule/xmodule/js/src/collapsible.js
index e86f30deaf..73d737f098 100644
--- a/common/lib/xmodule/xmodule/js/src/collapsible.js
+++ b/common/lib/xmodule/xmodule/js/src/collapsible.js
@@ -1,4 +1,4 @@
-(function (undefined) {
+(function(undefined) {
'use strict';
// [module Collapsible]
@@ -35,14 +35,14 @@
short_custom = el.find('.shortform-custom');
// Set up each one individually.
- short_custom.each(function (index, elt) {
+ short_custom.each(function(index, elt) {
var close_text, open_text;
open_text = $(elt).data('open-text');
close_text = $(elt).data('close-text');
- $(elt).append("
" + open_text + "");
+ $(elt).append("
" + open_text + '');
- $(elt).find('.full-custom').click(function (event) {
+ $(elt).find('.full-custom').click(function(event) {
Collapsible.toggleFull(event, open_text, close_text);
});
});
@@ -51,8 +51,8 @@
el.find('.collapsible header + section').hide();
// Set up triggers.
- el.find('.full').click(function (event) {
- Collapsible.toggleFull(event, "See full output", "Hide output");
+ el.find('.full').click(function(event) {
+ Collapsible.toggleFull(event, 'See full output', 'Hide output');
});
el.find('.collapsible header a').click(Collapsible.toggleHint);
}
diff --git a/common/lib/xmodule/xmodule/js/src/html/imageModal.js b/common/lib/xmodule/xmodule/js/src/html/imageModal.js
index 5577c57410..e9288bd37d 100644
--- a/common/lib/xmodule/xmodule/js/src/html/imageModal.js
+++ b/common/lib/xmodule/xmodule/js/src/html/imageModal.js
@@ -1,110 +1,108 @@
var setupFullScreenModal = function() {
-
// Setup full screen image modal.
// Executed from HTMLModule in display.js.
- $("a.modal-content").each(function() {
- var smallImageObject = $(this).children();
- var largeImageSRC = $(this).attr('href');
-
+ $('a.modal-content').each(function() {
+ var smallImageObject = $(this).children();
+ var largeImageSRC = $(this).attr('href');
+
// if contents of zoomable link is image and large image link exists: setup modal
- if (smallImageObject.is('img') && largeImageSRC) {
- var data = {
- "smallHTML": $(this).html(),
- "largeALT": smallImageObject.attr('alt'),
- "largeSRC": largeImageSRC
- };
- var html = _.template($("#image-modal-tpl").text())(data);
- $(this).replaceWith(html);
- }
- });
- $('.wrapper-modal-image .image-wrapper img').each(function() {
- var draggie = new Draggabilly(this, {containment: true});
- draggie.disable();
- $(this).closest('.image-modal').data("draggie", draggie);
- });
+ if (smallImageObject.is('img') && largeImageSRC) {
+ var data = {
+ 'smallHTML': $(this).html(),
+ 'largeALT': smallImageObject.attr('alt'),
+ 'largeSRC': largeImageSRC
+ };
+ var html = _.template($('#image-modal-tpl').text())(data);
+ $(this).replaceWith(html);
+ }
+ });
+ $('.wrapper-modal-image .image-wrapper img').each(function() {
+ var draggie = new Draggabilly(this, {containment: true});
+ draggie.disable();
+ $(this).closest('.image-modal').data('draggie', draggie);
+ });
// Opening and closing image modal on clicks
- $(".wrapper-modal-image .image-link").click(function() {
- $(this).siblings(".image-modal").addClass('image-is-fit-to-screen');
- $('body').css('overflow', 'hidden');
- });
-
+ $('.wrapper-modal-image .image-link').click(function() {
+ $(this).siblings('.image-modal').addClass('image-is-fit-to-screen');
+ $('body').css('overflow', 'hidden');
+ });
+
// variable to detect when modal is being "hovered".
// Done this way as jquery doesn't support the :hover psudo-selector as expected.
- var imageModalImageHover = false;
- $(".wrapper-modal-image .image-content img, .wrapper-modal-image .image-content .image-controls").hover(function() {
- imageModalImageHover = true;
- }, function() {
- imageModalImageHover = false;
- });
-
+ var imageModalImageHover = false;
+ $('.wrapper-modal-image .image-content img, .wrapper-modal-image .image-content .image-controls').hover(function() {
+ imageModalImageHover = true;
+ }, function() {
+ imageModalImageHover = false;
+ });
+
// prevent image control button links from scrolling
- $(".modal-ui-icon").click(function(event) {
- event.preventDefault();
- });
-
- //Define function to close modal
- function closeModal(imageModal) {
- imageModal.removeClass('image-is-fit-to-screen').removeClass('image-is-zoomed');
- $(".wrapper-modal-image .image-content .image-controls .modal-ui-icon.action-zoom-in").removeClass('is-disabled').attr('aria-disabled', false);
- $(".wrapper-modal-image .image-content .image-controls .modal-ui-icon.action-zoom-out").addClass('is-disabled').attr('aria-disabled', true);
- var currentDraggie = imageModal.data("draggie");
- currentDraggie.disable();
- $('body').css('overflow', 'auto');
- }
-
- // Click outside of modal to close it.
- $(".wrapper-modal-image .image-modal").click(function() {
- if (!imageModalImageHover){
- closeModal($(this));
+ $('.modal-ui-icon').click(function(event) {
+ event.preventDefault();
+ });
+
+ // Define function to close modal
+ function closeModal(imageModal) {
+ imageModal.removeClass('image-is-fit-to-screen').removeClass('image-is-zoomed');
+ $('.wrapper-modal-image .image-content .image-controls .modal-ui-icon.action-zoom-in').removeClass('is-disabled').attr('aria-disabled', false);
+ $('.wrapper-modal-image .image-content .image-controls .modal-ui-icon.action-zoom-out').addClass('is-disabled').attr('aria-disabled', true);
+ var currentDraggie = imageModal.data('draggie');
+ currentDraggie.disable();
+ $('body').css('overflow', 'auto');
}
- });
-
+
+ // Click outside of modal to close it.
+ $('.wrapper-modal-image .image-modal').click(function() {
+ if (!imageModalImageHover) {
+ closeModal($(this));
+ }
+ });
+
// Click close icon to close modal.
- $(".wrapper-modal-image .image-content .action-remove").click(function() {
- closeModal($(this).closest(".image-modal"));
- });
+ $('.wrapper-modal-image .image-content .action-remove').click(function() {
+ closeModal($(this).closest('.image-modal'));
+ });
// zooming image in modal and allow it to be dragged
// Make sure it always starts zero position for below calcs to work
- $(".wrapper-modal-image .image-content .image-controls .modal-ui-icon").click(function() {
- if (!$(this).hasClass('is-disabled')) {
- var mask = $(this).closest(".image-content");
-
- var imageModal = $(this).closest(".image-modal");
- var img = imageModal.find("img");
- var currentDraggie = imageModal.data("draggie");
-
- if ($(this).hasClass('action-zoom-in')) {
- imageModal.removeClass('image-is-fit-to-screen').addClass('image-is-zoomed');
-
- var imgWidth = img.width();
- var imgHeight = img.height();
-
- var imgContainerOffsetLeft = imgWidth - mask.width();
- var imgContainerOffsetTop = imgHeight - mask.height();
- var imgContainerWidth = imgWidth + imgContainerOffsetLeft;
- var imgContainerHeight = imgHeight + imgContainerOffsetTop;
-
+ $('.wrapper-modal-image .image-content .image-controls .modal-ui-icon').click(function() {
+ if (!$(this).hasClass('is-disabled')) {
+ var mask = $(this).closest('.image-content');
+
+ var imageModal = $(this).closest('.image-modal');
+ var img = imageModal.find('img');
+ var currentDraggie = imageModal.data('draggie');
+
+ if ($(this).hasClass('action-zoom-in')) {
+ imageModal.removeClass('image-is-fit-to-screen').addClass('image-is-zoomed');
+
+ var imgWidth = img.width();
+ var imgHeight = img.height();
+
+ var imgContainerOffsetLeft = imgWidth - mask.width();
+ var imgContainerOffsetTop = imgHeight - mask.height();
+ var imgContainerWidth = imgWidth + imgContainerOffsetLeft;
+ var imgContainerHeight = imgHeight + imgContainerOffsetTop;
+
// Set the width and height of the image's container so that the dimensions are equal to the image dimensions + view area dimensions to limit dragging
// Set image container top and left to center image at load.
- img.parent().css({
- left: -imgContainerOffsetLeft,
- top: -imgContainerOffsetTop,
- width: imgContainerWidth,
- height: imgContainerHeight
- });
- img.css({top: imgContainerOffsetTop / 2, left: imgContainerOffsetLeft / 2});
-
- currentDraggie.enable();
-
- } else if ($(this).hasClass('action-zoom-out')) {
- imageModal.removeClass('image-is-zoomed').addClass('image-is-fit-to-screen');
-
- currentDraggie.disable();
- }
-
- $(".wrapper-modal-image .image-content .image-controls .modal-ui-icon").toggleClass('is-disabled').attr('aria-disabled', $(this).hasClass('is-disabled'));
- }
- });
+ img.parent().css({
+ left: -imgContainerOffsetLeft,
+ top: -imgContainerOffsetTop,
+ width: imgContainerWidth,
+ height: imgContainerHeight
+ });
+ img.css({top: imgContainerOffsetTop / 2, left: imgContainerOffsetLeft / 2});
+
+ currentDraggie.enable();
+ } else if ($(this).hasClass('action-zoom-out')) {
+ imageModal.removeClass('image-is-zoomed').addClass('image-is-fit-to-screen');
+
+ currentDraggie.disable();
+ }
+
+ $('.wrapper-modal-image .image-content .image-controls .modal-ui-icon').toggleClass('is-disabled').attr('aria-disabled', $(this).hasClass('is-disabled'));
+ }
+ });
};
diff --git a/common/lib/xmodule/xmodule/js/src/lti/lti.js b/common/lib/xmodule/xmodule/js/src/lti/lti.js
index a1212671ab..408cca9012 100644
--- a/common/lib/xmodule/xmodule/js/src/lti/lti.js
+++ b/common/lib/xmodule/xmodule/js/src/lti/lti.js
@@ -1,4 +1,4 @@
-(function () {
+(function() {
'use strict';
/**
* This function will process all the attributes from the DOM element passed, taking all of
@@ -8,25 +8,23 @@
* @constructor
* @param {jQuery} element DOM element with the lti container.
*/
- this.LTI = function (element) {
+ this.LTI = function(element) {
var dataAttrs = $(element).find('.lti').data(),
askToSendUsername = (dataAttrs.askToSendUsername === 'True'),
askToSendEmail = (dataAttrs.askToSendEmail === 'True');
// When the lti button is clicked, provide users the option to
// accept or reject sending their information to a third party
- $(element).on('click', '.link_lti_new_window', function () {
- if(askToSendUsername && askToSendEmail) {
- return confirm(gettext("Click OK to have your username and e-mail address sent to a 3rd party application.\n\nClick Cancel to return to this page without sending your information."));
+ $(element).on('click', '.link_lti_new_window', function() {
+ if (askToSendUsername && askToSendEmail) {
+ return confirm(gettext('Click OK to have your username and e-mail address sent to a 3rd party application.\n\nClick Cancel to return to this page without sending your information.'));
} else if (askToSendUsername) {
- return confirm(gettext("Click OK to have your username sent to a 3rd party application.\n\nClick Cancel to return to this page without sending your information."));
+ return confirm(gettext('Click OK to have your username sent to a 3rd party application.\n\nClick Cancel to return to this page without sending your information.'));
} else if (askToSendEmail) {
- return confirm(gettext("Click OK to have your e-mail address sent to a 3rd party application.\n\nClick Cancel to return to this page without sending your information."));
+ return confirm(gettext('Click OK to have your e-mail address sent to a 3rd party application.\n\nClick Cancel to return to this page without sending your information.'));
} else {
return true;
}
});
-
};
-
}).call(this);
diff --git a/common/lib/xmodule/xmodule/js/src/poll/poll.js b/common/lib/xmodule/xmodule/js/src/poll/poll.js
index a2ccbc7c03..ea29c84336 100644
--- a/common/lib/xmodule/xmodule/js/src/poll/poll.js
+++ b/common/lib/xmodule/xmodule/js/src/poll/poll.js
@@ -1,5 +1,5 @@
-window.Poll = function (el) {
- RequireJS.require(['PollMain'], function (PollMain) {
+window.Poll = function(el) {
+ RequireJS.require(['PollMain'], function(PollMain) {
new PollMain(el);
});
};
diff --git a/common/lib/xmodule/xmodule/js/src/poll/poll_main.js b/common/lib/xmodule/xmodule/js/src/poll/poll_main.js
index 13542899b4..18b34c4cef 100644
--- a/common/lib/xmodule/xmodule/js/src/poll/poll_main.js
+++ b/common/lib/xmodule/xmodule/js/src/poll/poll_main.js
@@ -1,56 +1,55 @@
-(function (requirejs, require, define) {
-define('PollMain', [], function () {
+(function(requirejs, require, define) {
+ define('PollMain', [], function() {
+ PollMain.prototype = {
-PollMain.prototype = {
+ 'showAnswerGraph': function(poll_answers, total) {
+ var _this, totalValue;
-'showAnswerGraph': function (poll_answers, total) {
- var _this, totalValue;
+ totalValue = parseFloat(total);
+ if (isFinite(totalValue) === false) {
+ return;
+ }
- totalValue = parseFloat(total);
- if (isFinite(totalValue) === false) {
- return;
- }
+ _this = this;
- _this = this;
+ $.each(poll_answers, function(index, value) {
+ var numValue, percentValue;
- $.each(poll_answers, function (index, value) {
- var numValue, percentValue;
+ numValue = parseFloat(value);
+ if (isFinite(numValue) === false) {
+ return;
+ }
- numValue = parseFloat(value);
- if (isFinite(numValue) === false) {
- return;
- }
+ percentValue = (numValue / totalValue) * 100.0;
- percentValue = (numValue / totalValue) * 100.0;
+ _this.answersObj[index].statsEl.show();
+ _this.answersObj[index].numberEl.html('' + value + ' (' + percentValue.toFixed(1) + '%)');
+ _this.answersObj[index].percentEl.css({
+ 'width': '' + percentValue.toFixed(1) + '%'
+ });
+ });
+ },
- _this.answersObj[index].statsEl.show();
- _this.answersObj[index].numberEl.html('' + value + ' (' + percentValue.toFixed(1) + '%)');
- _this.answersObj[index].percentEl.css({
- 'width': '' + percentValue.toFixed(1) + '%'
- });
- });
-},
-
-'submitAnswer': function (answer, answerObj) {
- var _this;
+ 'submitAnswer': function(answer, answerObj) {
+ var _this;
// Make sure that the user can answer a question only once.
- if (this.questionAnswered === true) {
- return;
- }
- this.questionAnswered = true;
+ if (this.questionAnswered === true) {
+ return;
+ }
+ this.questionAnswered = true;
- _this = this;
+ _this = this;
- console.log('submit answer');
+ console.log('submit answer');
- answerObj.buttonEl.addClass('answered');
+ answerObj.buttonEl.addClass('answered');
// Send the data to the server as an AJAX request. Attach a callback that will
// be fired on server's response.
- $.postWithPrefix(
- _this.ajax_url + '/' + answer, {},
- function (response) {
+ $.postWithPrefix(
+ _this.ajax_url + '/' + answer, {},
+ function(response) {
console.log('success! response = ');
console.log(response);
@@ -62,29 +61,28 @@ PollMain.prototype = {
// Initialize Conditional constructors.
if (_this.wrapperSectionEl !== null) {
- $(_this.wrapperSectionEl).find('.xmodule_ConditionalModule').each(function (index, value) {
+ $(_this.wrapperSectionEl).find('.xmodule_ConditionalModule').each(function(index, value) {
new window.Conditional(value, _this.id.replace(/^poll_/, ''));
});
}
}
);
-
-}, // End-of: 'submitAnswer': function (answer, answerEl) {
+ }, // End-of: 'submitAnswer': function (answer, answerEl) {
-'submitReset': function () {
- var _this;
+ 'submitReset': function() {
+ var _this;
- _this = this;
+ _this = this;
- console.log('submit reset');
+ console.log('submit reset');
// Send the data to the server as an AJAX request. Attach a callback that will
// be fired on server's response.
- $.postWithPrefix(
+ $.postWithPrefix(
this.ajax_url + '/' + 'reset_poll',
{},
- function (response) {
+ function(response) {
console.log('success! response = ');
console.log(response);
@@ -103,200 +101,200 @@ PollMain.prototype = {
// Initialize Conditional constructors. We will specify the third parameter as 'true'
// notifying the constructor that this is a reset operation.
if (_this.wrapperSectionEl !== null) {
- $(_this.wrapperSectionEl).find('.xmodule_ConditionalModule').each(function (index, value) {
+ $(_this.wrapperSectionEl).find('.xmodule_ConditionalModule').each(function(index, value) {
new window.Conditional(value, _this.id.replace(/^poll_/, ''));
});
}
}
);
-}, // End-of: 'submitAnswer': function (answer, answerEl) {
+ }, // End-of: 'submitAnswer': function (answer, answerEl) {
-'postInit': function () {
- var _this;
+ 'postInit': function() {
+ var _this;
// Access this object inside inner functions.
- _this = this;
+ _this = this;
- if (
+ if (
(this.jsonConfig.poll_answer.length > 0) &&
(this.jsonConfig.answers.hasOwnProperty(this.jsonConfig.poll_answer) === false)
) {
- this.questionEl.append(
+ this.questionEl.append(
'
Error!
' +
'
XML data format changed. List of answers was modified, but poll data was not updated.
'
);
- return;
- }
+ return;
+ }
// Get the DOM id of the question.
- this.id = this.questionEl.attr('id');
+ this.id = this.questionEl.attr('id');
// Get the URL to which we will post the users answer to the question.
- this.ajax_url = this.questionEl.data('ajax-url');
+ this.ajax_url = this.questionEl.data('ajax-url');
- this.questionHtmlMarkup = $('
').html(this.jsonConfig.question).text();
- this.questionEl.append(this.questionHtmlMarkup);
+ this.questionHtmlMarkup = $('
').html(this.jsonConfig.question).text();
+ this.questionEl.append(this.questionHtmlMarkup);
// When the user selects and answer, we will set this flag to true.
- this.questionAnswered = false;
+ this.questionAnswered = false;
- this.answersObj = {};
- this.shortVersion = true;
+ this.answersObj = {};
+ this.shortVersion = true;
- $.each(this.jsonConfig.answers, function (index, value) {
- if (value.length >= 18) {
- _this.shortVersion = false;
- }
- });
+ $.each(this.jsonConfig.answers, function(index, value) {
+ if (value.length >= 18) {
+ _this.shortVersion = false;
+ }
+ });
- $.each(this.jsonConfig.answers, function (index, value) {
- var answer;
+ $.each(this.jsonConfig.answers, function(index, value) {
+ var answer;
- answer = {};
+ answer = {};
- _this.answersObj[index] = answer;
+ _this.answersObj[index] = answer;
- answer.el = $('
');
+ answer.el = $('
');
- answer.questionEl = $('
');
- answer.buttonEl = $('
');
- answer.textEl = $('
');
- answer.questionEl.append(answer.buttonEl);
- answer.questionEl.append(answer.textEl);
+ answer.questionEl = $('
');
+ answer.buttonEl = $('
');
+ answer.textEl = $('
');
+ answer.questionEl.append(answer.buttonEl);
+ answer.questionEl.append(answer.textEl);
- answer.el.append(answer.questionEl);
+ answer.el.append(answer.questionEl);
- answer.statsEl = $('
');
- answer.barEl = $('
');
- answer.percentEl = $('
');
- answer.barEl.append(answer.percentEl);
- answer.numberEl = $('
');
- answer.statsEl.append(answer.barEl);
- answer.statsEl.append(answer.numberEl);
+ answer.statsEl = $('
');
+ answer.barEl = $('
');
+ answer.percentEl = $('
');
+ answer.barEl.append(answer.percentEl);
+ answer.numberEl = $('
');
+ answer.statsEl.append(answer.barEl);
+ answer.statsEl.append(answer.numberEl);
- answer.statsEl.hide();
+ answer.statsEl.hide();
- answer.el.append(answer.statsEl);
+ answer.el.append(answer.statsEl);
- answer.textEl.html(value);
+ answer.textEl.html(value);
- if (_this.shortVersion === true) {
- $.each(answer, function (index, value) {
- if (value instanceof jQuery) {
- value.addClass('short');
+ if (_this.shortVersion === true) {
+ $.each(answer, function(index, value) {
+ if (value instanceof jQuery) {
+ value.addClass('short');
+ }
+ });
+ }
+
+ answer.el.appendTo(_this.questionEl);
+
+ answer.textEl.on('click', function() {
+ _this.submitAnswer(index, answer);
+ });
+
+ answer.buttonEl.on('click', function() {
+ _this.submitAnswer(index, answer);
+ });
+
+ if (index === _this.jsonConfig.poll_answer) {
+ answer.buttonEl.addClass('answered');
+ _this.questionAnswered = true;
+ }
+ });
+
+ console.log(this.jsonConfig.reset);
+
+ if ((typeof this.jsonConfig.reset === 'string') && (this.jsonConfig.reset.toLowerCase() === 'true')) {
+ this.canReset = true;
+
+ this.resetButton = $('
Change your vote
');
+
+ if (this.questionAnswered === false) {
+ this.resetButton.hide();
+ }
+
+ this.resetButton.appendTo(this.questionEl);
+
+ this.resetButton.on('click', function() {
+ _this.submitReset();
+ });
+ } else {
+ this.canReset = false;
}
- });
- }
-
- answer.el.appendTo(_this.questionEl);
-
- answer.textEl.on('click', function () {
- _this.submitAnswer(index, answer);
- });
-
- answer.buttonEl.on('click', function () {
- _this.submitAnswer(index, answer);
- });
-
- if (index === _this.jsonConfig.poll_answer) {
- answer.buttonEl.addClass('answered');
- _this.questionAnswered = true;
- }
- });
-
- console.log(this.jsonConfig.reset);
-
- if ((typeof this.jsonConfig.reset === 'string') && (this.jsonConfig.reset.toLowerCase() === 'true')) {
- this.canReset = true;
-
- this.resetButton = $('
Change your vote
');
-
- if (this.questionAnswered === false) {
- this.resetButton.hide();
- }
-
- this.resetButton.appendTo(this.questionEl);
-
- this.resetButton.on('click', function () {
- _this.submitReset();
- });
- } else {
- this.canReset = false;
- }
// If it turns out that the user already answered the question, show the answers graph.
- if (this.questionAnswered === true) {
- this.showAnswerGraph(this.jsonConfig.poll_answers, this.jsonConfig.total);
- }
-} // End-of: 'postInit': function () {
-}; // End-of: PollMain.prototype = {
+ if (this.questionAnswered === true) {
+ this.showAnswerGraph(this.jsonConfig.poll_answers, this.jsonConfig.total);
+ }
+ } // End-of: 'postInit': function () {
+ }; // End-of: PollMain.prototype = {
-return PollMain;
+ return PollMain;
-function PollMain(el) {
- var _this;
+ function PollMain(el) {
+ var _this;
- this.questionEl = $(el).find('.poll_question');
- if (this.questionEl.length !== 1) {
+ this.questionEl = $(el).find('.poll_question');
+ if (this.questionEl.length !== 1) {
// We require one question DOM element.
- console.log('ERROR: PollMain constructor requires one question DOM element.');
+ console.log('ERROR: PollMain constructor requires one question DOM element.');
- return;
- }
+ return;
+ }
// Just a safety precussion. If we run this code more than once, multiple 'click' callback handlers will be
// attached to the same DOM elements. We don't want this to happen.
- if (this.questionEl.attr('poll_main_processed') === 'true') {
- console.log(
+ if (this.questionEl.attr('poll_main_processed') === 'true') {
+ console.log(
'ERROR: PolMain JS constructor was called on a DOM element that has already been processed once.'
);
- return;
- }
+ return;
+ }
// This element was not processed earlier.
// Make sure that next time we will not process this element a second time.
- this.questionEl.attr('poll_main_processed', 'true');
+ this.questionEl.attr('poll_main_processed', 'true');
// Access this object inside inner functions.
- _this = this;
+ _this = this;
// DOM element which contains the current poll along with any conditionals. By default we assume that such
// element is not present. We will try to find it.
- this.wrapperSectionEl = null;
+ this.wrapperSectionEl = null;
- (function (tempEl, c1) {
- while (tempEl.tagName.toLowerCase() !== 'body') {
- tempEl = $(tempEl).parent()[0];
- c1 += 1;
+ (function(tempEl, c1) {
+ while (tempEl.tagName.toLowerCase() !== 'body') {
+ tempEl = $(tempEl).parent()[0];
+ c1 += 1;
- if (
+ if (
(tempEl.tagName.toLowerCase() === 'div') &&
($(tempEl).data('block-type') === 'wrapper')
) {
- _this.wrapperSectionEl = tempEl;
+ _this.wrapperSectionEl = tempEl;
- break;
- } else if (c1 > 50) {
+ break;
+ } else if (c1 > 50) {
// In case something breaks, and we enter an endless loop, a sane
// limit for loop iterations.
- break;
- }
- }
- }($(el)[0], 0));
+ break;
+ }
+ }
+ }($(el)[0], 0));
- try {
- this.jsonConfig = JSON.parse(this.questionEl.children('.poll_question_div').html());
+ try {
+ this.jsonConfig = JSON.parse(this.questionEl.children('.poll_question_div').html());
- $.postWithPrefix(
- '' + this.questionEl.data('ajax-url') + '/' + 'get_state', {},
- function (response) {
+ $.postWithPrefix(
+ '' + this.questionEl.data('ajax-url') + '/' + 'get_state', {},
+ function(response) {
_this.jsonConfig.poll_answer = response.poll_answer;
_this.jsonConfig.total = response.total;
- $.each(response.poll_answers, function (index, value) {
+ $.each(response.poll_answers, function(index, value) {
_this.jsonConfig.poll_answers[index] = value;
});
@@ -306,18 +304,17 @@ function PollMain(el) {
}
);
- return;
- } catch (err) {
- console.log(
+ return;
+ } catch (err) {
+ console.log(
'ERROR: Invalid JSON config for poll ID "' + this.id + '".',
'Error messsage: "' + err.message + '".'
);
- return;
- }
-} // End-of: function PollMain(el) {
-
-}); // End-of: define('PollMain', [], function () {
+ return;
+ }
+ } // End-of: function PollMain(el) {
+ }); // End-of: define('PollMain', [], function () {
// End-of: (function (requirejs, require, define) {
}(RequireJS.requirejs, RequireJS.require, RequireJS.define));
diff --git a/common/lib/xmodule/xmodule/js/src/time.js b/common/lib/xmodule/xmodule/js/src/time.js
index ab6580e388..2373768e9f 100644
--- a/common/lib/xmodule/xmodule/js/src/time.js
+++ b/common/lib/xmodule/xmodule/js/src/time.js
@@ -1,4 +1,4 @@
-(function (undefined) {
+(function(undefined) {
'use strict';
this.Time = {
diff --git a/common/lib/xmodule/xmodule/js/src/video/00_async_process.js b/common/lib/xmodule/xmodule/js/src/video/00_async_process.js
index faffff7ca0..0461045a9f 100644
--- a/common/lib/xmodule/xmodule/js/src/video/00_async_process.js
+++ b/common/lib/xmodule/xmodule/js/src/video/00_async_process.js
@@ -1,9 +1,9 @@
-(function (define) {
-define(
+(function(define) {
+ define(
'video/00_async_process.js',
[],
function() {
-"use strict";
+ 'use strict';
/**
* Provides convenient way to process big amount of data without UI blocking.
*
@@ -13,7 +13,7 @@ function() {
* certain type bound to the collection, queued or not, have finished.
*/
var AsyncProcess = {
- array: function (list, process) {
+ array: function(list, process) {
if (!_.isArray(list)) {
return $.Deferred().reject().promise();
}
@@ -28,11 +28,11 @@ function() {
index = 0,
len = list.length;
- var getCurrentTime = function () {
+ var getCurrentTime = function() {
return (new Date()).getTime();
};
- var handler = function () {
+ var handler = function() {
var start = getCurrentTime();
do {
diff --git a/common/lib/xmodule/xmodule/js/src/video/00_component.js b/common/lib/xmodule/xmodule/js/src/video/00_component.js
index 5c3e1d1004..1f72ef72f0 100644
--- a/common/lib/xmodule/xmodule/js/src/video/00_component.js
+++ b/common/lib/xmodule/xmodule/js/src/video/00_component.js
@@ -1,7 +1,7 @@
-(function (define) {
-'use strict';
-define('video/00_component.js', [],
-function () {
+(function(define) {
+ 'use strict';
+ define('video/00_component.js', [],
+function() {
/**
* Creates a new object with the specified prototype object and properties.
* @param {Object} o The object which should be the prototype of the
@@ -10,10 +10,10 @@ function () {
* @throws {TypeError, Error}
* @return {Object}
*/
- var inherit = Object.create || (function () {
- var F = function () {};
+ var inherit = Object.create || (function() {
+ var F = function() {};
- return function (o) {
+ return function(o) {
if (arguments.length > 1) {
throw Error('Second argument not supported');
}
@@ -36,7 +36,7 @@ function () {
* @constructor
* @return {jquery Promise}
*/
- var Component = function () {
+ var Component = function() {
if ($.isFunction(this.initialize)) {
return this.initialize.apply(this, arguments);
}
@@ -49,9 +49,9 @@ function () {
* the prototype.
* @return {Object}
*/
- Component.extend = function (protoProps, staticProps) {
+ Component.extend = function(protoProps, staticProps) {
var Parent = this,
- Child = function () {
+ Child = function() {
if ($.isFunction(this.initialize)) {
return this.initialize.apply(this, arguments);
}
diff --git a/common/lib/xmodule/xmodule/js/src/video/00_i18n.js b/common/lib/xmodule/xmodule/js/src/video/00_i18n.js
index ba9f1f27db..c923a9be9e 100644
--- a/common/lib/xmodule/xmodule/js/src/video/00_i18n.js
+++ b/common/lib/xmodule/xmodule/js/src/video/00_i18n.js
@@ -1,6 +1,6 @@
-(function (define) {
-'use strict';
-define(
+(function(define) {
+ 'use strict';
+ define(
'video/00_i18n.js',
[],
function() {
diff --git a/common/lib/xmodule/xmodule/js/src/video/00_iterator.js b/common/lib/xmodule/xmodule/js/src/video/00_iterator.js
index c6980b29ac..39bb19bb9b 100644
--- a/common/lib/xmodule/xmodule/js/src/video/00_iterator.js
+++ b/common/lib/xmodule/xmodule/js/src/video/00_iterator.js
@@ -1,21 +1,21 @@
-(function (define) {
-define(
+(function(define) {
+ define(
'video/00_iterator.js',
[],
function() {
-"use strict";
+ 'use strict';
/**
* Provides convenient way to work with iterable data.
* @exports video/00_iterator.js
* @constructor
* @param {array} list Array to be iterated.
*/
- var Iterator = function (list) {
- this.list = list;
- this.index = 0;
- this.size = this.list.length;
- this.lastIndex = this.list.length - 1;
- };
+ var Iterator = function(list) {
+ this.list = list;
+ this.index = 0;
+ this.size = this.list.length;
+ this.lastIndex = this.list.length - 1;
+ };
Iterator.prototype = {
@@ -25,7 +25,7 @@ function() {
* @param {numebr} index
* @return {boolean}
*/
- _isValid: function (index) {
+ _isValid: function(index) {
return _.isNumber(index) && index < this.size && index >= 0;
},
@@ -34,12 +34,12 @@ function() {
* @param {number} [index] Updates current position.
* @return {any}
*/
- next: function (index) {
+ next: function(index) {
if (!(this._isValid(index))) {
index = this.index;
}
- this.index = (index >= this.lastIndex) ? 0: index + 1;
+ this.index = (index >= this.lastIndex) ? 0 : index + 1;
return this.list[this.index];
},
@@ -49,12 +49,12 @@ function() {
* @param {number} [index] Updates current position.
* @return {any}
*/
- prev: function (index) {
+ prev: function(index) {
if (!(this._isValid(index))) {
index = this.index;
}
- this.index = (index < 1) ? this.lastIndex: index - 1;
+ this.index = (index < 1) ? this.lastIndex : index - 1;
return this.list[this.index];
},
@@ -63,7 +63,7 @@ function() {
* Returns last element in the list.
* @return {any}
*/
- last: function () {
+ last: function() {
return this.list[this.lastIndex];
},
@@ -71,7 +71,7 @@ function() {
* Returns first element in the list.
* @return {any}
*/
- first: function () {
+ first: function() {
return this.list[0];
},
@@ -79,7 +79,7 @@ function() {
* Returns `true` if current position is last for the iterator.
* @return {boolean}
*/
- isEnd: function () {
+ isEnd: function() {
return this.index === this.lastIndex;
}
};
diff --git a/common/lib/xmodule/xmodule/js/src/video/00_resizer.js b/common/lib/xmodule/xmodule/js/src/video/00_resizer.js
index f0c1debcd0..d477c593f5 100644
--- a/common/lib/xmodule/xmodule/js/src/video/00_resizer.js
+++ b/common/lib/xmodule/xmodule/js/src/video/00_resizer.js
@@ -1,11 +1,9 @@
-(function (requirejs, require, define) {
-
-define(
+(function(requirejs, require, define) {
+ define(
'video/00_resizer.js',
[],
-function () {
-
- var Resizer = function (params) {
+function() {
+ var Resizer = function(params) {
var defaults = {
container: window,
element: null,
@@ -21,7 +19,7 @@ function () {
mode = null,
config;
- var initialize = function (params) {
+ var initialize = function(params) {
if (!config) {
config = defaults;
}
@@ -37,7 +35,7 @@ function () {
return module;
};
- var getData = function () {
+ var getData = function() {
var container = $(config.container),
containerWidth = container.width() + delta.width,
containerHeight = container.height() + delta.height,
@@ -47,11 +45,11 @@ function () {
elementRatio = config.elementRatio;
if (!containerRatio) {
- containerRatio = containerWidth/containerHeight;
+ containerRatio = containerWidth / containerHeight;
}
if (!elementRatio) {
- elementRatio = element.width()/element.height();
+ elementRatio = element.width() / element.height();
}
return {
@@ -63,25 +61,25 @@ function () {
};
};
- var align = function () {
+ var align = function() {
var data = getData();
switch (mode) {
- case 'height':
+ case 'height':
+ alignByHeightOnly();
+ break;
+
+ case 'width':
+ alignByWidthOnly();
+ break;
+
+ default:
+ if (data.containerRatio >= data.elementRatio) {
alignByHeightOnly();
- break;
-
- case 'width':
+ } else {
alignByWidthOnly();
- break;
-
- default:
- if (data.containerRatio >= data.elementRatio) {
- alignByHeightOnly();
- } else {
- alignByWidthOnly();
- }
- break;
+ }
+ break;
}
fireCallbacks();
@@ -89,35 +87,35 @@ function () {
return module;
};
- var alignByWidthOnly = function () {
+ var alignByWidthOnly = function() {
var data = getData(),
- height = data.containerWidth/data.elementRatio;
+ height = data.containerWidth / data.elementRatio;
data.element.css({
'height': height,
'width': data.containerWidth,
- 'top': 0.5*(data.containerHeight - height),
+ 'top': 0.5 * (data.containerHeight - height),
'left': 0
});
return module;
};
- var alignByHeightOnly = function () {
+ var alignByHeightOnly = function() {
var data = getData(),
- width = data.containerHeight*data.elementRatio;
+ width = data.containerHeight * data.elementRatio;
data.element.css({
'height': data.containerHeight,
- 'width': data.containerHeight*data.elementRatio,
+ 'width': data.containerHeight * data.elementRatio,
'top': 0,
- 'left': 0.5*(data.containerWidth - width)
+ 'left': 0.5 * (data.containerWidth - width)
});
return module;
};
- var setMode = function (param) {
+ var setMode = function(param) {
if (_.isString(param)) {
mode = param;
align();
@@ -126,13 +124,13 @@ function () {
return module;
};
- var setElement = function (element) {
+ var setElement = function(element) {
config.element = element;
return module;
};
- var addCallback = function (func) {
+ var addCallback = function(func) {
if ($.isFunction(func)) {
callbacksList.push(func);
} else {
@@ -142,9 +140,9 @@ function () {
return module;
};
- var addOnceCallback = function (func) {
+ var addOnceCallback = function(func) {
if ($.isFunction(func)) {
- var decorator = function () {
+ var decorator = function() {
func();
removeCallback(func);
};
@@ -157,19 +155,19 @@ function () {
return module;
};
- var fireCallbacks = function () {
+ var fireCallbacks = function() {
$.each(callbacksList, function(index, callback) {
- callback();
+ callback();
});
};
- var removeCallbacks = function () {
+ var removeCallbacks = function() {
callbacksList.length = 0;
return module;
};
- var removeCallback = function (func) {
+ var removeCallback = function(func) {
var index = $.inArray(func, callbacksList);
if (index !== -1) {
@@ -177,13 +175,13 @@ function () {
}
};
- var resetDelta = function () {
+ var resetDelta = function() {
delta['height'] = delta['width'] = 0;
return module;
};
- var addDelta = function (value, side) {
+ var addDelta = function(value, side) {
if (_.isNumber(value) && _.isNumber(delta[side])) {
delta[side] += value;
}
@@ -191,7 +189,7 @@ function () {
return module;
};
- var substractDelta = function (value, side) {
+ var substractDelta = function(value, side) {
if (_.isNumber(value) && _.isNumber(delta[side])) {
delta[side] -= value;
}
@@ -199,7 +197,7 @@ function () {
return module;
};
- var destroy = function () {
+ var destroy = function() {
var data = getData();
data.element.css({
'height': '', 'width': '', 'top': '', 'left': ''
@@ -235,5 +233,4 @@ function () {
return Resizer;
});
-
}(RequireJS.requirejs, RequireJS.require, RequireJS.define));
diff --git a/common/lib/xmodule/xmodule/js/src/video/00_sjson.js b/common/lib/xmodule/xmodule/js/src/video/00_sjson.js
index d5163d9a00..954313c278 100644
--- a/common/lib/xmodule/xmodule/js/src/video/00_sjson.js
+++ b/common/lib/xmodule/xmodule/js/src/video/00_sjson.js
@@ -1,20 +1,19 @@
-(function (define) {
-
-define(
+(function(define) {
+ define(
'video/00_sjson.js',
[],
function() {
-"use strict";
+ 'use strict';
- var Sjson = function (data) {
+ var Sjson = function(data) {
var sjson = {
start: data.start.concat(),
text: data.text.concat()
},
module = {};
- var getter = function (propertyName) {
- return function () {
+ var getter = function(propertyName) {
+ return function() {
return sjson[propertyName];
};
};
@@ -23,7 +22,7 @@ function() {
var getCaptions = getter('text');
- var size = function () {
+ var size = function() {
return sjson.text.length;
};
@@ -40,11 +39,11 @@ function() {
// Else, search the unfiltered list.
if (typeof startTime !== 'undefined' &&
typeof endTime !== 'undefined') {
- results = filter(startTime, endTime);
- start = results.start;
- max = results.captions.length - 1;
+ results = filter(startTime, endTime);
+ start = results.start;
+ max = results.captions.length - 1;
} else {
- start = getStartTimes();
+ start = getStartTimes();
}
while (min < max) {
index = Math.ceil((max + min) / 2);
@@ -59,7 +58,7 @@ function() {
}
return min;
- };
+ }
function filter(start, end) {
/* filters captions that occur between inputs
@@ -79,7 +78,7 @@ function() {
var captions = getCaptions();
if (startTimes.length !== captions.length) {
- console.warn("video caption and start time arrays do not match in length");
+ console.warn('video caption and start time arrays do not match in length');
}
// if end is null, then it's been set to
diff --git a/common/lib/xmodule/xmodule/js/src/video/00_video_storage.js b/common/lib/xmodule/xmodule/js/src/video/00_video_storage.js
index 7b1f38a6c6..5b226e5f43 100644
--- a/common/lib/xmodule/xmodule/js/src/video/00_video_storage.js
+++ b/common/lib/xmodule/xmodule/js/src/video/00_video_storage.js
@@ -1,17 +1,16 @@
-(function (requirejs, require, define) {
-
-define(
+(function(requirejs, require, define) {
+ define(
'video/00_video_storage.js',
[],
function() {
- "use strict";
+ 'use strict';
/**
* Provides convenient way to store key value pairs.
*
* @param {string} namespace Namespace that is used to store data.
* @return {object} VideoStorage API.
*/
- var VideoStorage = function (namespace, id) {
+ var VideoStorage = function(namespace, id) {
/**
* Adds new value to the storage or rewrites existent.
*
@@ -20,7 +19,7 @@ function() {
* @param {boolean} instanceSpecific Data with this flag will be added
* to instance specific storage.
*/
- var setItem = function (name, value, instanceSpecific) {
+ var setItem = function(name, value, instanceSpecific) {
if (name) {
if (instanceSpecific) {
window[namespace][id][name] = value;
@@ -40,7 +39,7 @@ function() {
* If the given key does not exist in the list
* associated with the object then this method must return null.
*/
- var getItem = function (name, instanceSpecific) {
+ var getItem = function(name, instanceSpecific) {
if (instanceSpecific) {
return window[namespace][id][name];
} else {
@@ -55,7 +54,7 @@ function() {
* @param {boolean} instanceSpecific Data with this flag will be added
* to instance specific storage.
*/
- var removeItem = function (name, instanceSpecific) {
+ var removeItem = function(name, instanceSpecific) {
if (instanceSpecific) {
delete window[namespace][id][name];
} else {
@@ -67,7 +66,7 @@ function() {
* Empties the storage.
*
*/
- var clear = function () {
+ var clear = function() {
window[namespace] = {};
window[namespace][id] = {};
};
diff --git a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js b/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
index ac59870d88..679b6d42c9 100644
--- a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
+++ b/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
@@ -10,12 +10,11 @@
* @module Initialize
*/
-(function (requirejs, require, define) {
-
-define(
+(function(requirejs, require, define) {
+ define(
'video/01_initialize.js',
['video/03_video_player.js', 'video/00_i18n.js', 'moment'],
-function (VideoPlayer, i18n, moment) {
+function(VideoPlayer, i18n, moment) {
var moment = moment || window.moment;
/**
* @function
@@ -27,11 +26,11 @@ function (VideoPlayer, i18n, moment) {
* available via this object.
* @param {DOM element} element Container of the entire Video DOM element.
*/
- var Initialize = function (state, element) {
- _makeFunctionsPublic(state);
+ var Initialize = function(state, element) {
+ _makeFunctionsPublic(state);
- state.initialize(element)
- .done(function () {
+ state.initialize(element)
+ .done(function() {
if (state.isYoutubeType()) {
state.parseSpeed();
}
@@ -44,7 +43,7 @@ function (VideoPlayer, i18n, moment) {
}
_initializeModules(state, i18n)
- .done(function () {
+ .done(function() {
// On iPad ready state occurs just after start playing.
// We hide controls before video starts playing.
if (/iPad|Android/i.test(state.isTouch[0])) {
@@ -60,30 +59,30 @@ function (VideoPlayer, i18n, moment) {
state.el.trigger('initialize', arguments);
});
});
- },
+ },
- methodsDict = {
- bindTo: bindTo,
- fetchMetadata: fetchMetadata,
- getCurrentLanguage: getCurrentLanguage,
- getDuration: getDuration,
- getPlayerMode: getPlayerMode,
- getVideoMetadata: getVideoMetadata,
- initialize: initialize,
- isHtml5Mode: isHtml5Mode,
- isFlashMode: isFlashMode,
- isYoutubeType: isYoutubeType,
- parseSpeed: parseSpeed,
- parseYoutubeStreams: parseYoutubeStreams,
- setPlayerMode: setPlayerMode,
- setSpeed: setSpeed,
- speedToString: speedToString,
- trigger: trigger,
- youtubeId: youtubeId,
- loadHtmlPlayer: loadHtmlPlayer,
- loadYoutubePlayer: loadYoutubePlayer,
- loadYouTubeIFrameAPI: loadYouTubeIFrameAPI
- },
+ methodsDict = {
+ bindTo: bindTo,
+ fetchMetadata: fetchMetadata,
+ getCurrentLanguage: getCurrentLanguage,
+ getDuration: getDuration,
+ getPlayerMode: getPlayerMode,
+ getVideoMetadata: getVideoMetadata,
+ initialize: initialize,
+ isHtml5Mode: isHtml5Mode,
+ isFlashMode: isFlashMode,
+ isYoutubeType: isYoutubeType,
+ parseSpeed: parseSpeed,
+ parseYoutubeStreams: parseYoutubeStreams,
+ setPlayerMode: setPlayerMode,
+ setSpeed: setSpeed,
+ speedToString: speedToString,
+ trigger: trigger,
+ youtubeId: youtubeId,
+ loadHtmlPlayer: loadHtmlPlayer,
+ loadYoutubePlayer: loadYoutubePlayer,
+ loadYouTubeIFrameAPI: loadYouTubeIFrameAPI
+ },
_youtubeApiDeferred = null,
_oldOnYouTubeIframeAPIReady;
@@ -130,7 +129,7 @@ function (VideoPlayer, i18n, moment) {
if (state.videoType === 'youtube') {
state.youtubeApiAvailable = false;
- onYTApiReady = function () {
+ onYTApiReady = function() {
console.log('[Video info]: YouTube API is available and is loaded.');
if (state.htmlPlayerLoaded) { return; }
@@ -162,10 +161,10 @@ function (VideoPlayer, i18n, moment) {
//
// If this global function is already defined, we store it first, and make
// sure that it gets executed when our Deferred object is resolved.
- setupOnYouTubeIframeAPIReady = function () {
+ setupOnYouTubeIframeAPIReady = function() {
_oldOnYouTubeIframeAPIReady = window.onYouTubeIframeAPIReady || undefined;
- window.onYouTubeIframeAPIReady = function () {
+ window.onYouTubeIframeAPIReady = function() {
window.onYouTubeIframeAPIReady.resolve();
};
@@ -194,7 +193,7 @@ function (VideoPlayer, i18n, moment) {
// Attach a callback to our Deferred object to be called once the
// YouTube API loads.
- window.onYouTubeIframeAPIReady.done(function () {
+ window.onYouTubeIframeAPIReady.done(function() {
window.YT.ready(onYTApiReady);
});
}
@@ -209,7 +208,7 @@ function (VideoPlayer, i18n, moment) {
function _waitForYoutubeApi(state) {
console.log('[Video info]: Starting to wait for YouTube API to load.');
- window.setTimeout(function () {
+ window.setTimeout(function() {
// If YouTube API will load OK, it will run `onYouTubeIframeAPIReady`
// callback, which will set `state.youtubeApiAvailable` to `true`.
// If something goes wrong at this stage, `state.youtubeApiAvailable` is
@@ -222,7 +221,6 @@ function (VideoPlayer, i18n, moment) {
}
state.el.trigger('youtube_availability', [state.youtubeApiAvailable]);
}, state.config.ytTestTimeout);
-
}
function loadYouTubeIFrameAPI(scriptTag) {
@@ -337,7 +335,7 @@ function (VideoPlayer, i18n, moment) {
} else if ($.isPlainObject(module)) {
return module;
}
- });
+ });
$.when.apply(null, modulesList)
.done(dfd.resolve);
@@ -346,101 +344,101 @@ function (VideoPlayer, i18n, moment) {
}
function _getConfiguration(data, storage) {
- var isBoolean = function (value) {
- var regExp = /^true$/i;
- return regExp.test(value.toString());
- },
+ var isBoolean = function(value) {
+ var regExp = /^true$/i;
+ return regExp.test(value.toString());
+ },
// List of keys that will be extracted form the configuration.
- extractKeys = [],
+ extractKeys = [],
// Compatibility keys used to change names of some parameters in
// the final configuration.
- compatKeys = {
- 'start': 'startTime',
- 'end': 'endTime'
- },
+ compatKeys = {
+ 'start': 'startTime',
+ 'end': 'endTime'
+ },
// Conversions used to pre-process some configuration data.
- conversions = {
- 'showCaptions': isBoolean,
- 'autoplay': isBoolean,
- 'autohideHtml5': isBoolean,
- 'savedVideoPosition': function (value) {
- return storage.getItem('savedVideoPosition', true) ||
+ conversions = {
+ 'showCaptions': isBoolean,
+ 'autoplay': isBoolean,
+ 'autohideHtml5': isBoolean,
+ 'savedVideoPosition': function(value) {
+ return storage.getItem('savedVideoPosition', true) ||
Number(value) ||
0;
- },
- 'speed': function (value) {
- return storage.getItem('speed', true) || value;
- },
- 'generalSpeed': function (value) {
- return storage.getItem('general_speed') ||
+ },
+ 'speed': function(value) {
+ return storage.getItem('speed', true) || value;
+ },
+ 'generalSpeed': function(value) {
+ return storage.getItem('general_speed') ||
value ||
'1.0';
- },
- 'transcriptLanguage': function (value) {
- return storage.getItem('language') ||
+ },
+ 'transcriptLanguage': function(value) {
+ return storage.getItem('language') ||
value ||
'en';
- },
- 'ytTestTimeout': function (value) {
- value = parseInt(value, 10);
-
- if (!isFinite(value)) {
- value = 1500;
- }
-
- return value;
- },
- 'startTime': function (value) {
- value = parseInt(value, 10);
- if (!isFinite(value) || value < 0) {
- return 0;
- }
-
- return value;
- },
- 'endTime': function (value) {
- value = parseInt(value, 10);
-
- if (!isFinite(value) || value === 0) {
- return null;
- }
-
- return value;
- }
},
- config = {};
+ 'ytTestTimeout': function(value) {
+ value = parseInt(value, 10);
- data = _.extend({
- startTime: 0,
- endTime: null,
- sub: '',
- streams: ''
- }, data);
+ if (!isFinite(value)) {
+ value = 1500;
+ }
- $.each(data, function(option, value) {
- // Extract option that is in `extractKeys`.
- if ($.inArray(option, extractKeys) !== -1) {
- return;
+ return value;
+ },
+ 'startTime': function(value) {
+ value = parseInt(value, 10);
+ if (!isFinite(value) || value < 0) {
+ return 0;
+ }
+
+ return value;
+ },
+ 'endTime': function(value) {
+ value = parseInt(value, 10);
+
+ if (!isFinite(value) || value === 0) {
+ return null;
+ }
+
+ return value;
}
+ },
+ config = {};
+
+ data = _.extend({
+ startTime: 0,
+ endTime: null,
+ sub: '',
+ streams: ''
+ }, data);
+
+ $.each(data, function(option, value) {
+ // Extract option that is in `extractKeys`.
+ if ($.inArray(option, extractKeys) !== -1) {
+ return;
+ }
// Change option name to key that is in `compatKeys`.
- if (compatKeys[option]) {
- option = compatKeys[option];
- }
+ if (compatKeys[option]) {
+ option = compatKeys[option];
+ }
// Pre-process data.
- if (conversions[option]) {
- if (_.isFunction(conversions[option])) {
- value = conversions[option].call(this, value);
- } else {
- throw new TypeError(option + ' is not a function.');
- }
+ if (conversions[option]) {
+ if (_.isFunction(conversions[option])) {
+ value = conversions[option].call(this, value);
+ } else {
+ throw new TypeError(option + ' is not a function.');
}
- config[option] = value;
- });
+ }
+ config[option] = value;
+ });
- return config;
- }
+ return config;
+ }
// ***************************************************************
// Public functions start here.
@@ -456,7 +454,6 @@ function (VideoPlayer, i18n, moment) {
function bindTo(methodsDict, obj, context, rewrite) {
$.each(methodsDict, function(name, method) {
if (_.isFunction(method)) {
-
if (_.isUndefined(rewrite)) {
rewrite = true;
}
@@ -480,7 +477,6 @@ function (VideoPlayer, i18n, moment) {
}
function loadHtmlPlayer() {
-
// When the youtube link doesn't work for any reason
// (for example, firewall) any
// alternate sources should automatically play.
@@ -563,10 +559,8 @@ function (VideoPlayer, i18n, moment) {
_setConfigurations(this);
if (!(_parseYouTubeIDs(this))) {
-
// If we do not have YouTube ID's, try parsing HTML5 video sources.
if (!_prepareHTML5Video(this)) {
-
__dfd__.reject();
// Non-YouTube sources were not found either.
return __dfd__.promise();
@@ -623,7 +617,7 @@ function (VideoPlayer, i18n, moment) {
this.videos = {};
- _.each(youtubeStreams.split(/,/), function (video) {
+ _.each(youtubeStreams.split(/,/), function(video) {
var speed;
video = video.split(/:/);
speed = this.speedToString(video[0]);
@@ -645,8 +639,8 @@ function (VideoPlayer, i18n, moment) {
this.metadata = {};
- metadataXHRs = _.map(this.videos, function (url, speed) {
- return self.getVideoMetadata(url, function (data) {
+ metadataXHRs = _.map(this.videos, function(url, speed) {
+ return self.getVideoMetadata(url, function(data) {
if (data.items.length > 0) {
var metaDataItem = data.items[0];
self.metadata[metaDataItem.id] = metaDataItem.contentDetails;
@@ -654,7 +648,7 @@ function (VideoPlayer, i18n, moment) {
});
});
- $.when.apply(this, metadataXHRs).done(function () {
+ $.when.apply(this, metadataXHRs).done(function() {
self.el.trigger('metadata_received');
// Not only do we trigger the "metadata_received" event, we also
@@ -664,7 +658,6 @@ function (VideoPlayer, i18n, moment) {
// cases when some code will subscribe to the "metadata_received"
// event after it has been triggered.
self.youtubeMetadataReceived = true;
-
});
}
@@ -715,7 +708,7 @@ function (VideoPlayer, i18n, moment) {
function youtubeId(speed) {
var currentSpeed = this.isFlashMode() ? this.speed : '1.0';
- return this.videos[speed] ||
+ return this.videos[speed] ||
this.videos[currentSpeed] ||
this.videos['1.0'];
}
@@ -836,5 +829,4 @@ function (VideoPlayer, i18n, moment) {
return true;
}
});
-
}(RequireJS.requirejs, RequireJS.require, RequireJS.define));
diff --git a/common/lib/xmodule/xmodule/js/src/video/025_focus_grabber.js b/common/lib/xmodule/xmodule/js/src/video/025_focus_grabber.js
index 65b85efebc..b3e47e13cc 100644
--- a/common/lib/xmodule/xmodule/js/src/video/025_focus_grabber.js
+++ b/common/lib/xmodule/xmodule/js/src/video/025_focus_grabber.js
@@ -25,14 +25,13 @@
* ~ Zen saying
*/
-(function (requirejs, require, define) {
-
+(function(requirejs, require, define) {
// FocusGrabber module.
-define(
+ define(
'video/025_focus_grabber.js',
[],
-function () {
- return function (state) {
+function() {
+ return function(state) {
var dfd = $.Deferred();
state.focusGrabber = {};
@@ -75,7 +74,7 @@ function () {
// When the video container element receives programmatic focus, then
// on un-focus ('blur' event) we should trigger a 'mousemove' event so
// as to reveal autohidden controls.
- state.el.on('blur', function () {
+ state.el.on('blur', function() {
state.el.trigger('mousemove');
});
}
diff --git a/common/lib/xmodule/xmodule/js/src/video/02_html5_video.js b/common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
index 4a6c6096b4..93759ee468 100644
--- a/common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
+++ b/common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
@@ -13,16 +13,15 @@
* @module HTML5Video
*/
-(function (requirejs, require, define) {
-
-define(
+(function(requirejs, require, define) {
+ define(
'video/02_html5_video.js',
[],
-function () {
+function() {
var HTML5Video = {};
- HTML5Video.Player = (function () {
- Player.prototype.callStateChangeCallback = function () {
+ HTML5Video.Player = (function() {
+ Player.prototype.callStateChangeCallback = function() {
if ($.isFunction(this.config.events.onStateChange)) {
this.config.events.onStateChange({
data: this.playerState
@@ -30,11 +29,11 @@ function () {
}
};
- Player.prototype.pauseVideo = function () {
+ Player.prototype.pauseVideo = function() {
this.video.pause();
};
- Player.prototype.seekTo = function (value) {
+ Player.prototype.seekTo = function(value) {
if (
typeof value === 'number' &&
value <= this.video.duration &&
@@ -44,29 +43,29 @@ function () {
}
};
- Player.prototype.setVolume = function (value) {
+ Player.prototype.setVolume = function(value) {
if (typeof value === 'number' && value <= 100 && value >= 0) {
this.video.volume = value * 0.01;
}
};
- Player.prototype.getCurrentTime = function () {
+ Player.prototype.getCurrentTime = function() {
return this.video.currentTime;
};
- Player.prototype.playVideo = function () {
+ Player.prototype.playVideo = function() {
this.video.play();
};
- Player.prototype.getPlayerState = function () {
+ Player.prototype.getPlayerState = function() {
return this.playerState;
};
- Player.prototype.getVolume = function () {
+ Player.prototype.getVolume = function() {
return this.video.volume;
};
- Player.prototype.getDuration = function () {
+ Player.prototype.getDuration = function() {
if (isNaN(this.video.duration)) {
return 0;
}
@@ -74,7 +73,7 @@ function () {
return this.video.duration;
};
- Player.prototype.setPlaybackRate = function (value) {
+ Player.prototype.setPlaybackRate = function(value) {
var newSpeed;
newSpeed = parseFloat(value);
@@ -86,15 +85,15 @@ function () {
}
};
- Player.prototype.getAvailablePlaybackRates = function () {
+ Player.prototype.getAvailablePlaybackRates = function() {
return [0.75, 1.0, 1.25, 1.5];
};
- Player.prototype._getLogs = function () {
+ Player.prototype._getLogs = function() {
return this.logs;
};
- Player.prototype.showErrorMessage = function () {
+ Player.prototype.showErrorMessage = function() {
this.el
.find('.video-player div')
.addClass('hidden')
@@ -110,13 +109,13 @@ function () {
});
};
- Player.prototype.onError = function (event) {
+ Player.prototype.onError = function(event) {
if ($.isFunction(this.config.events.onError)) {
this.config.events.onError();
}
};
- Player.prototype.destroy = function () {
+ Player.prototype.destroy = function() {
this.video.removeEventListener('loadedmetadata', this.onLoadedMetadata, false);
this.video.removeEventListener('play', this.onPlay, false);
this.video.removeEventListener('playing', this.onPlaying, false);
@@ -131,29 +130,29 @@ function () {
this.videoEl.remove();
};
- Player.prototype.onLoadedMetadata = function () {
+ Player.prototype.onLoadedMetadata = function() {
this.playerState = HTML5Video.PlayerState.PAUSED;
if ($.isFunction(this.config.events.onReady)) {
this.config.events.onReady(null);
}
};
- Player.prototype.onPlay = function () {
+ Player.prototype.onPlay = function() {
this.playerState = HTML5Video.PlayerState.BUFFERING;
this.callStateChangeCallback();
};
- Player.prototype.onPlaying = function () {
+ Player.prototype.onPlaying = function() {
this.playerState = HTML5Video.PlayerState.PLAYING;
this.callStateChangeCallback();
};
- Player.prototype.onPause = function () {
+ Player.prototype.onPause = function() {
this.playerState = HTML5Video.PlayerState.PAUSED;
this.callStateChangeCallback();
};
- Player.prototype.onEnded = function () {
+ Player.prototype.onEnded = function() {
this.playerState = HTML5Video.PlayerState.ENDED;
this.callStateChangeCallback();
};
@@ -242,16 +241,16 @@ function () {
// Create HTML markup for individual sources of the HTML5