From 958597ac71c2f509573073cb7fbd5c4128795cfd Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Wed, 14 Aug 2013 23:09:06 -0400
Subject: [PATCH 01/11] was getting unicode errors when exporting CB22x

---
 cms/djangoapps/contentstore/views/assets.py | 3 +++
 common/lib/xmodule/xmodule/video_module.py  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py
index 94bfa55b58..b35f00f0e2 100644
--- a/cms/djangoapps/contentstore/views/assets.py
+++ b/cms/djangoapps/contentstore/views/assets.py
@@ -348,6 +348,8 @@ def generate_export_course(request, org, course, name):
     try:
         export_to_xml(modulestore('direct'), contentstore(), loc, root_dir, name, modulestore())
     except SerializationError, e:
+        logging.exception('There was an error exporting course {0}. {1}'.format(course_module.location, unicode(e)))
+
         unit = None
         failed_item = None
         parent = None
@@ -380,6 +382,7 @@ def generate_export_course(request, org, course, name):
             })
         })
     except Exception, e:
+        logging.exception('There was an error exporting course {0}. {1}'.format(course_module.location, unicode(e)))
         return render_to_response('export.html', {
             'context_course': course_module,
             'successful_import_redirect_url': '',
diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index 407547d9bf..afa811b718 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -266,7 +266,7 @@ class VideoDescriptor(VideoFields, TabsEditingDescriptor, EmptyDataRawDescriptor
             if key in fields and fields[key].default == getattr(self, key):
                 continue
             if value:
-                xml.set(key, str(value))
+                xml.set(key, unicode(value))
 
         for source in self.html5_sources:
             ele = etree.Element('source')

From 26651a1dd7e4d9267764586cba620282eae08c3d Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Wed, 14 Aug 2013 23:35:40 -0400
Subject: [PATCH 02/11] export_to_xml() really should be definition_to_xml()
 since we'll rely on the base method that is in xml_module.py to preserve the
 correct export filesystem hierarchy.

---
 common/lib/xmodule/xmodule/video_module.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index afa811b718..c8c0bf4225 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -240,7 +240,7 @@ class VideoDescriptor(VideoFields, TabsEditingDescriptor, EmptyDataRawDescriptor
         video = cls(system, model_data)
         return video
 
-    def export_to_xml(self, resource_fs):
+    def definition_to_xml(self, resource_fs):
         """
         Returns an xml string representing this module.
         """
@@ -277,7 +277,8 @@ class VideoDescriptor(VideoFields, TabsEditingDescriptor, EmptyDataRawDescriptor
             ele = etree.Element('track')
             ele.set('src', self.track)
             xml.append(ele)
-        return etree.tostring(xml, pretty_print=True)
+        return xml
+        #return etree.tostring(xml, pretty_print=True)
 
     @staticmethod
     def _parse_youtube(data):

From 43f2c6a8e4c20bce937307de2a629534f9478de8 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Thu, 15 Aug 2013 00:28:16 -0400
Subject: [PATCH 03/11] remove commented out line

---
 common/lib/xmodule/xmodule/video_module.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index c8c0bf4225..8f5b4b4d09 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -278,7 +278,6 @@ class VideoDescriptor(VideoFields, TabsEditingDescriptor, EmptyDataRawDescriptor
             ele.set('src', self.track)
             xml.append(ele)
         return xml
-        #return etree.tostring(xml, pretty_print=True)
 
     @staticmethod
     def _parse_youtube(data):

From f27ed07305994a9cd5e0c591de77e22fbf2ac547 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Thu, 15 Aug 2013 01:04:55 -0400
Subject: [PATCH 04/11] update tests to call definition_to_xml rather than
 export_to_xml, which presumes writing to a filesystem, plus it adds a
 url_name to the attribute set. Also, on __init__ reset the 'category'
 attribute, on some code paths this can get lost. Not sure why, but this gets
 all the tests to pass.

---
 common/lib/xmodule/xmodule/tests/test_video.py | 9 +++++----
 common/lib/xmodule/xmodule/video_module.py     | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_video.py b/common/lib/xmodule/xmodule/tests/test_video.py
index 4a13d565cc..ac1ab1d247 100644
--- a/common/lib/xmodule/xmodule/tests/test_video.py
+++ b/common/lib/xmodule/xmodule/tests/test_video.py
@@ -15,6 +15,7 @@ the course, section, subsection, unit, etc.
 
 import unittest
 from . import LogicTest
+from lxml import etree
 from .import get_test_system
 from xmodule.modulestore import Location
 from xmodule.video_module import VideoDescriptor, _create_youtube_string
@@ -344,7 +345,7 @@ class VideoExportTestCase(unittest.TestCase):
         desc.track = 'http://www.example.com/track'
         desc.html5_sources = ['http://www.example.com/source.mp4', 'http://www.example.com/source.ogg']
 
-        xml = desc.export_to_xml(None)  # We don't use the `resource_fs` parameter
+        xml = desc.definition_to_xml(None)  # We don't use the `resource_fs` parameter
         expected = dedent('''\
          <video url_name="SampleProblem1" start_time="0:00:01" youtube="0.75:izygArpw-Qo,1.00:p2Q6BrNhdh8,1.25:1EeWXzPdhSA,1.50:rABDYkeK0x8" show_captions="false" end_time="0:01:00">
            <source src="http://www.example.com/source.mp4"/>
@@ -353,7 +354,7 @@ class VideoExportTestCase(unittest.TestCase):
          </video>
         ''')
 
-        self.assertEquals(expected, xml)
+        self.assertEquals(expected, etree.tostring(xml, pretty_print=True))
 
     def test_export_to_xml_empty_parameters(self):
         """Test XML export with defaults."""
@@ -361,7 +362,7 @@ class VideoExportTestCase(unittest.TestCase):
         location = Location(["i4x", "edX", "video", "default", "SampleProblem1"])
         desc = VideoDescriptor(module_system, {'location': location})
 
-        xml = desc.export_to_xml(None)
+        xml = desc.definition_to_xml(None)
         expected = '<video url_name="SampleProblem1"/>\n'
 
-        self.assertEquals(expected, xml)
+        self.assertEquals(expected, etree.tostring(xml, pretty_print=True))
diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index 8f5b4b4d09..e0fae8cdbe 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -215,6 +215,10 @@ class VideoDescriptor(VideoFields, TabsEditingDescriptor, EmptyDataRawDescriptor
             self._model_data.update(model_data)
             del self.data
 
+        # I'm not sure how, but in some lifecycles we can loose the .category attribute
+        # this needs to be investigated
+        self.category = 'video'
+
     @classmethod
     def from_xml(cls, xml_data, system, org=None, course=None):
         """

From 96b4914fef3b530f2f85cdd8aee8adfaec8ced25 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Thu, 15 Aug 2013 11:03:31 -0400
Subject: [PATCH 05/11] Make our deserializing consistent with serializing.

Also fixes problems with double-quoted strings (historical artifact).

STUD-640

Conflicts:

	common/lib/xmodule/xmodule/video_module.py
---
 .../lib/xmodule/xmodule/tests/test_video.py   | 56 +++++++++++++++++++
 common/lib/xmodule/xmodule/video_module.py    | 32 +++++++----
 common/lib/xmodule/xmodule/xml_module.py      |  5 ++
 3 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_video.py b/common/lib/xmodule/xmodule/tests/test_video.py
index ac1ab1d247..5076f39c79 100644
--- a/common/lib/xmodule/xmodule/tests/test_video.py
+++ b/common/lib/xmodule/xmodule/tests/test_video.py
@@ -264,6 +264,62 @@ class VideoDescriptorImportTestCase(unittest.TestCase):
             'data': ''
         })
 
+    def test_from_xml_double_quotes(self):
+        """
+        Make sure we can handle the double-quoted string format (which was used for exporting for
+        a few weeks).
+        """
+        module_system = DummySystem(load_error_modules=True)
+        xml_data ='''
+            <video display_name="&quot;display_name&quot;"
+                html5_sources="[&quot;source_1&quot;, &quot;source_2&quot;]"
+                show_captions="false"
+                source="&quot;http://download_video&quot;"
+                sub="&quot;html5_subtitles&quot;"
+                track="&quot;http://download_track&quot;"
+                youtube_id_0_75="&quot;OEoXaMPEzf65&quot;"
+                youtube_id_1_25="&quot;OEoXaMPEzf125&quot;"
+                youtube_id_1_5="&quot;OEoXaMPEzf15&quot;"
+                youtube_id_1_0="&quot;OEoXaMPEzf10&quot;"
+                />
+        '''
+        output = VideoDescriptor.from_xml(xml_data, module_system)
+        self.assert_attributes_equal(output, {
+            'youtube_id_0_75': 'OEoXaMPEzf65',
+            'youtube_id_1_0': 'OEoXaMPEzf10',
+            'youtube_id_1_25': 'OEoXaMPEzf125',
+            'youtube_id_1_5': 'OEoXaMPEzf15',
+            'show_captions': False,
+            'start_time': 0.0,
+            'end_time': 0.0,
+            'track': 'http://download_track',
+            'source': 'http://download_video',
+            'html5_sources': ["source_1", "source_2"],
+            'data': ''
+        })
+
+    def test_from_xml_double_quote_concatenated_youtube(self):
+        module_system = DummySystem(load_error_modules=True)
+        xml_data = '''
+            <video display_name="Test Video"
+                   youtube="1.0:&quot;p2Q6BrNhdh8&quot;,1.25:&quot;1EeWXzPdhSA&quot;">
+            </video>
+        '''
+        output = VideoDescriptor.from_xml(xml_data, module_system)
+        self.assert_attributes_equal(output, {
+            'youtube_id_0_75': '',
+            'youtube_id_1_0': 'p2Q6BrNhdh8',
+            'youtube_id_1_25': '1EeWXzPdhSA',
+            'youtube_id_1_5': '',
+            'show_captions': True,
+            'start_time': 0.0,
+            'end_time': 0.0,
+            'track': '',
+            'source': '',
+            'html5_sources': [],
+            'data': ''
+        })
+
     def test_old_video_format(self):
         """
         Test backwards compatibility with VideoModule's XML format.
diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index e0fae8cdbe..805ca48930 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -291,19 +291,19 @@ class VideoDescriptor(VideoFields, TabsEditingDescriptor, EmptyDataRawDescriptor
         XML-based courses.
         """
         ret = {'0.75': '', '1.00': '', '1.25': '', '1.50': ''}
-        if data == '':
-            return ret
+
         videos = data.split(',')
         for video in videos:
             pieces = video.split(':')
-            # HACK
-            # To elaborate somewhat: in many LMS tests, the keys for
-            # Youtube IDs are inconsistent. Sometimes a particular
-            # speed isn't present, and formatting is also inconsistent
-            # ('1.0' versus '1.00'). So it's necessary to either do
-            # something like this or update all the tests to work
-            # properly.
-            ret['%.2f' % float(pieces[0])] = pieces[1]
+            try:
+                speed = '%.2f' % float(pieces[0])  # normalize speed
+                # Handle the fact that youtube IDs got double-quoted for a period of time.
+                # Note: we pass in "VideoFields.youtube_id_1_0" so we deserialize as a String--
+                # it doesn't matter what the actual speed is for the purposes of deserializing.
+                youtube_id = VideoDescriptor._deserialize(VideoFields.youtube_id_1_0.name, pieces[1])
+                ret[speed] = youtube_id
+            except (ValueError, IndexError):
+                log.warning('Invalid YouTube ID: %s' % video)
         return ret
 
     @staticmethod
@@ -316,7 +316,6 @@ class VideoDescriptor(VideoFields, TabsEditingDescriptor, EmptyDataRawDescriptor
         model_data = {}
 
         conversions = {
-            'show_captions': json.loads,
             'start_time': VideoDescriptor._parse_time,
             'end_time': VideoDescriptor._parse_time
         }
@@ -355,10 +354,21 @@ class VideoDescriptor(VideoFields, TabsEditingDescriptor, EmptyDataRawDescriptor
                 #  Convert XML attrs into Python values.
                 if attr in conversions:
                     value = conversions[attr](value)
+                else:
+                # We export values with json.dumps (well, except for Strings, but
+                # for about a month we did it for Strings also).
+                    value = VideoDescriptor._deserialize(attr, value)
                 model_data[attr] = value
 
         return model_data
 
+    @classmethod
+    def _deserialize(cls, attr, value):
+        """
+        Handles deserializing values that may have been encoded with json.dumps.
+        """
+        return cls.get_map_for_field(attr).from_xml(value)
+
     @staticmethod
     def _parse_time(str_time):
         """Converts s in '12:34:45' format to seconds. If s is
diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index 5b8d2c8aee..b0b7f300ed 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -167,6 +167,11 @@ class XmlDescriptor(XModuleDescriptor):
 
     @classmethod
     def get_map_for_field(cls, attr):
+        """
+        Returns a serialize/deserialize AttrMap for the given field of a class.
+
+        Searches through fields defined by cls to find one named attr.
+        """
         for field in set(cls.fields + cls.lms.fields):
             if field.name == attr:
                 from_xml = lambda val: deserialize_field(field, val)

From 0acc201a2197e270389ea97fd6c3158f0955cee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Wed, 14 Aug 2013 17:37:10 -0400
Subject: [PATCH 06/11] Add test for invalid YouTube IDs strings

---
 .../lib/xmodule/xmodule/tests/test_video.py   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/common/lib/xmodule/xmodule/tests/test_video.py b/common/lib/xmodule/xmodule/tests/test_video.py
index 5076f39c79..a6a7d86510 100644
--- a/common/lib/xmodule/xmodule/tests/test_video.py
+++ b/common/lib/xmodule/xmodule/tests/test_video.py
@@ -65,6 +65,32 @@ class VideoModuleTest(LogicTest):
                                   '1.25': '',
                                   '1.50': ''})
 
+    def test_parse_youtube_invalid(self):
+        """Ensure that ids that are invalid return an empty dict"""
+
+        # invalid id
+        youtube_str = 'thisisaninvalidid'
+        output = VideoDescriptor._parse_youtube(youtube_str)
+        self.assertEqual(output, {'0.75': '',
+                                  '1.00': '',
+                                  '1.25': '',
+                                  '1.50': ''})
+        # another invalid id
+        youtube_str = ',::,:,,'
+        output = VideoDescriptor._parse_youtube(youtube_str)
+        self.assertEqual(output, {'0.75': '',
+                                  '1.00': '',
+                                  '1.25': '',
+                                  '1.50': ''})
+
+        # and another one, partially invalid
+        youtube_str = '0.75_BAD!!!,1.0:AXdE34_U,1.25:KLHF9K_Y,1.5:VO3SxfeD,'
+        output = VideoDescriptor._parse_youtube(youtube_str)
+        self.assertEqual(output, {'0.75': '',
+                                  '1.00': 'AXdE34_U',
+                                  '1.25': 'KLHF9K_Y',
+                                  '1.50': 'VO3SxfeD'})
+
     def test_parse_youtube_key_format(self):
         """
         Make sure that inconsistent speed keys are parsed correctly.

From 03608a8931b3abdc0bc752c34b205a4911e36c05 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Thu, 15 Aug 2013 11:04:48 -0400
Subject: [PATCH 07/11] have XModuleDescriptor properly ensure category is set

---
 common/lib/xmodule/xmodule/video_module.py | 4 ----
 common/lib/xmodule/xmodule/x_module.py     | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index 805ca48930..7830ff77b4 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -215,10 +215,6 @@ class VideoDescriptor(VideoFields, TabsEditingDescriptor, EmptyDataRawDescriptor
             self._model_data.update(model_data)
             del self.data
 
-        # I'm not sure how, but in some lifecycles we can loose the .category attribute
-        # this needs to be investigated
-        self.category = 'video'
-
     @classmethod
     def from_xml(cls, xml_data, system, org=None, course=None):
         """
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 3556f3f0f3..4b22ae9fe2 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -467,11 +467,11 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
         self.system = self.runtime
         if isinstance(self.location, Location):
             self.url_name = self.location.name
-            if not hasattr(self, 'category'):
+            if getattr(self, 'category', None) is None:
                 self.category = self.location.category
         elif isinstance(self.location, BlockUsageLocator):
             self.url_name = self.location.usage_id
-            if not hasattr(self, 'category'):
+            if getattr(self, 'category', None) is None:
                 raise InsufficientSpecificationError()
         else:
             raise InsufficientSpecificationError()

From 71de34fca3a8a7887fdbcd63df3471f1e8f8bbc6 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Thu, 15 Aug 2013 16:24:54 -0400
Subject: [PATCH 08/11] use same getattr pattern in the XModule constructor
 that exists in the XModuleDescriptor

---
 common/lib/xmodule/xmodule/x_module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 4b22ae9fe2..87d9413334 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -173,11 +173,11 @@ class XModule(XModuleFields, HTMLSnippet, XBlock):
             # don't need to set category as it will automatically get from descriptor
         elif isinstance(self.location, Location):
             self.url_name = self.location.name
-            if not hasattr(self, 'category'):
+            if getattr(self, 'category', None) is None:
                 self.category = self.location.category
         elif isinstance(self.location, BlockUsageLocator):
             self.url_name = self.location.usage_id
-            if not hasattr(self, 'category'):
+            if getattr(self, 'category', None) is None:
                 raise InsufficientSpecificationError()
         else:
             raise InsufficientSpecificationError()

From a66743128aa5fccf19b33a3d3da62e4a60cd1a76 Mon Sep 17 00:00:00 2001
From: Peter Fogg <pfogg@edx.org>
Date: Thu, 15 Aug 2013 17:24:03 -0400
Subject: [PATCH 09/11] Correctly seek in captions with non-1.0 speeds.

---
 common/lib/xmodule/xmodule/js/src/video/09_video_caption.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 e8a30f6e9c..5ec111219a 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
@@ -312,7 +312,7 @@ function () {
         var newIndex;
 
         if (this.videoCaption.loaded) {
-            time = Math.round(Time.convert(time, this.speed, '1.0') * 1000 + 250);
+            time = Math.round(parseInt(time, 10) * 1000);
             newIndex = this.videoCaption.search(time);
 
             if (newIndex !== void 0 && this.videoCaption.currentIndex !== newIndex) {
@@ -333,7 +333,7 @@ function () {
         var time;
 
         event.preventDefault();
-        time = Math.round(Time.convert($(event.target).data('start'), '1.0', this.speed) / 1000);
+        time = parseInt($(event.target).data('start'), 10)/1000;
 
         this.trigger('videoPlayer.onCaptionSeek', {'type': 'onCaptionSeek', 'time': time});
     }

From 4b5f77aa55ab4e1718a1e0c346799453cae97d15 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 16 Aug 2013 14:06:42 +0300
Subject: [PATCH 10/11] Added back old method of getting caption position for
 Flash video playback.

Because with speed changing the time also changes for Flash playback,
a different way to calculate the current time is needed than for HTML5
playback. I have added conditions for Flash and HTML5 video, and put
old method of calculating time for Flash.

I have tested it on the YouTube video ZwkTiUPN0mg. Both HTML5 mode and
Flash mode have proper video-captions syncing with this fix. NOTE: to view
YouTube video in Flash mode you either have to use an old browser (ex. Firefox
version 18) or hard code in source that state.currentPlayerMode = 'flash' (in
function _setPlayerMode(), file 01_initialize.js).
---
 .../xmodule/js/src/video/09_video_caption.js  | 51 ++++++++++++++++---
 1 file changed, 45 insertions(+), 6 deletions(-)

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 5ec111219a..a34f33ba4c 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
@@ -312,15 +312,34 @@ function () {
         var newIndex;
 
         if (this.videoCaption.loaded) {
-            time = Math.round(parseInt(time, 10) * 1000);
+            // Current mode === 'flash' can only be for YouTube videos. So, we
+            // don't have to also check for videoType === 'youtube'.
+            if (this.currentPlayerMode === 'flash') {
+                // Total play time changes with speed change. Also there is
+                // a 250 ms delay we have to take into account.
+                time = Math.round(
+                    Time.convert(time, this.speed, '1.0') * 1000 + 250
+                );
+            } else {
+                // Total play time remains constant when speed changes.
+                time = Math.round(parseInt(time, 10) * 1000);
+            }
+
             newIndex = this.videoCaption.search(time);
 
-            if (newIndex !== void 0 && this.videoCaption.currentIndex !== newIndex) {
+            if (
+                newIndex !== void 0 &&
+                this.videoCaption.currentIndex !== newIndex
+            ) {
                 if (this.videoCaption.currentIndex) {
-                    this.videoCaption.subtitlesEl.find('li.current').removeClass('current');
+                    this.videoCaption.subtitlesEl
+                        .find('li.current')
+                        .removeClass('current');
                 }
 
-                this.videoCaption.subtitlesEl.find("li[data-index='" + newIndex + "']").addClass('current');
+                this.videoCaption.subtitlesEl
+                    .find("li[data-index='" + newIndex + "']")
+                    .addClass('current');
 
                 this.videoCaption.currentIndex = newIndex;
 
@@ -333,9 +352,29 @@ function () {
         var time;
 
         event.preventDefault();
-        time = parseInt($(event.target).data('start'), 10)/1000;
 
-        this.trigger('videoPlayer.onCaptionSeek', {'type': 'onCaptionSeek', 'time': time});
+        // Current mode === 'flash' can only be for YouTube videos. So, we
+        // don't have to also check for videoType === 'youtube'.
+        if (this.currentPlayerMode === 'flash') {
+            // Total play time changes with speed change. Also there is
+            // a 250 ms delay we have to take into account.
+            time = Math.round(
+                Time.convert(
+                    $(event.target).data('start'), '1.0', this.speed
+                ) / 1000
+            );
+        } else {
+            // Total play time remains constant when speed changes.
+            time = parseInt($(event.target).data('start'), 10)/1000;
+        }
+
+        this.trigger(
+            'videoPlayer.onCaptionSeek',
+            {
+                'type': 'onCaptionSeek',
+                'time': time
+            }
+        );
     }
 
     function calculateOffset(element) {

From 0a59cb65989ada506a0c11337a36fe8f8aa6791f Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Thu, 15 Aug 2013 10:35:29 -0400
Subject: [PATCH 11/11] in grading, if problem cannot be created, return score
 as none

Conflicts:
	lms/envs/dev.py
---
 lms/djangoapps/courseware/grades.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index e3c40079c3..8874a5686c 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -358,6 +358,8 @@ def get_score(course_id, user, problem_descriptor, module_creator, model_data_ca
     # with the LMS, so they need to always be scored. (E.g. foldit.)
     if problem_descriptor.always_recalculate_grades:
         problem = module_creator(problem_descriptor)
+        if problem is None:
+            return (None, None)
         score = problem.get_score()
         if score is not None:
             return (score['score'], score['total'])