From 15b113b6572e72a50440e439c5b97e0353213a59 Mon Sep 17 00:00:00 2001 From: Afzal Wali Date: Tue, 3 May 2016 17:48:53 +0500 Subject: [PATCH 1/5] Bumped the proctoring version. --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index a2f097facf..802e3238af 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -90,7 +90,7 @@ git+https://github.com/edx/xblock-utils.git@v1.0.2#egg=xblock-utils==1.0.2 -e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5 git+https://github.com/edx/edx-user-state-client.git@1.0.1#egg=edx-user-state-client==1.0.1 git+https://github.com/edx/xblock-lti-consumer.git@v1.0.6#egg=xblock-lti-consumer==1.0.6 -git+https://github.com/edx/edx-proctoring.git@0.12.16#egg=edx-proctoring==0.12.16 +git+https://github.com/edx/edx-proctoring.git@0.12.17#egg=edx-proctoring==0.12.17 # Third Party XBlocks -e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga From 0723b98283f7d9f59757941dcaa39150fe24e305 Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Tue, 3 May 2016 13:53:35 -0400 Subject: [PATCH 2/5] AC-452 removing unnecessary and incorrect aria-label --- common/lib/xmodule/xmodule/js/src/video/09_video_caption.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js b/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js index 52f4ccf8c1..e44b7397dc 100644 --- a/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js +++ b/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js @@ -759,7 +759,7 @@ self.subtitlesEl.find('.transcript-end') .text(gettext('End of transcript. Skip to the start.')); - self.container.find('.menu-container .control') + self.container.find('.menu-container .language-menu') .attr('aria-label', gettext('Language: Press the UP arrow key to enter the language menu then use UP and DOWN arrow keys to navigate language options. Press ENTER to change to the selected language.')); // jshint ignore:line self.container.find('.menu-container .control .control-text') From 1d49dd9d49662c68cb3837edda1ea5263dccb543 Mon Sep 17 00:00:00 2001 From: Brian Jacobel Date: Wed, 4 May 2016 10:28:38 -0400 Subject: [PATCH 3/5] JS tests no longer use js-test-tool --- docs/en_us/internal/testing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en_us/internal/testing.rst b/docs/en_us/internal/testing.rst index 286a516a6b..b372e465c0 100644 --- a/docs/en_us/internal/testing.rst +++ b/docs/en_us/internal/testing.rst @@ -349,8 +349,8 @@ To debug these tests on devstack in a local browser: Note: the port is also output to the console that you ran the tests from if you find that easier. -These paver commands call through to a custom test runner. For more -info, see `js-test-tool `__. +These paver commands call through to Karma. For more +info, see `karma-runner.github.io `__. Running Bok Choy Acceptance Tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From df32d2a130cd29c38e9be1885c0792f094f5d83d Mon Sep 17 00:00:00 2001 From: Brian Jacobel Date: Wed, 4 May 2016 10:34:59 -0400 Subject: [PATCH 4/5] Path update for Karma debug runner --- docs/en_us/internal/testing.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/en_us/internal/testing.rst b/docs/en_us/internal/testing.rst index b372e465c0..ec86638db2 100644 --- a/docs/en_us/internal/testing.rst +++ b/docs/en_us/internal/testing.rst @@ -341,8 +341,7 @@ To run JavaScript tests in a browser, run these commands. To debug these tests on devstack in a local browser: * first run the appropriate test_js_dev command from above which will open a browser using XQuartz - * open the same URL in your browser but change the IP address to 192.168.33.10, e.g. - http://192.168.33.10:TEST_PORT/suite/cms + * open http://192.168.33.10:9876/debug.html in your host system's browser of choice * this will run all the tests and show you the results including details of any failures * you can click on an individually failing test and/or suite to re-run it by itself * you can now use the browser's developer tools to debug as you would any other JavaScript code From b1f715690ab1742163d78f2e44c18e1864ff4b5f Mon Sep 17 00:00:00 2001 From: cahrens Date: Wed, 4 May 2016 13:28:06 -0400 Subject: [PATCH 5/5] Fix incorrect truncation issue. TNL-4238 --- .../src/discussion/views/discussion_thread_list_view.coffee | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index 502d4e377e..4e4ece3d2d 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -337,8 +337,6 @@ if Backbone? fitName: (name) -> @maxNameWidth = @$(".forum-nav-browse").width() - - parseInt(@$(".forum-nav-browse").css("padding-left")) - - parseInt(@$(".forum-nav-browse").css("padding-right")) - @$(".forum-nav-browse .icon").outerWidth(true) - @$(".forum-nav-browse-drop-arrow").outerWidth(true) width = @getNameWidth(name)