Merge pull request openedx#431

* stv/diff/funk: Remove commented conflict markers
eduNEXT · Feb 8, 2016 · f37882a · f37882a
2 parents a68d0d2 + 762bd4c
commit f37882a
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 17 deletions.
diff --git a/common/lib/capa/capa/templates/choicegroup.html b/common/lib/capa/capa/templates/choicegroup.html
@@ -54,7 +54,6 @@
             </span>
         % endif
     </div>
-    ## TODO:FUNK % if show_correctness == "never" and (value or status not in ['unsubmitted']):
     % if show_correctness == "never" and value and status != "unsubmitted":
     <div class="capa_alert">${submitted_message}</div>
     %endif

diff --git a/common/lib/xmodule/xmodule/js/src/video/03_video_player.js b/common/lib/xmodule/xmodule/js/src/video/03_video_player.js
@@ -514,8 +514,6 @@ function (HTML5Video, Resizer) {
         }
 
         this.videoPlayer.updatePlayTime(time, duration);
-        // TODO:FUNK this.videoPlayer.updatePlayTime(time, true);
-        // TODO:FUNK this.el.trigger('seek', arguments);
 
         // the timer is stopped above; restart it.
         if (this.videoPlayer.isPlaying()) {

diff --git a/common/lib/xmodule/xmodule/js/src/video/04_video_control.js b/common/lib/xmodule/xmodule/js/src/video/04_video_control.js
@@ -148,17 +148,10 @@ function () {
     }
 
     function updateVcrVidTime(params) {
-// TODO: FUNK <<<<<<< HEAD
-//        var duration = (this.config.endTime !== null) ? this.config.endTime : params.duration;
-//        // in case endTime is accidentally specified as being greater than the video
-//        duration = Math.min(duration, params.duration);
-//        this.videoControl.vidTimeEl.html(Time.format(params.time) + ' / ' + Time.format(duration));
-// TODO: FUNK =======
         var endTime = (this.config.endTime !== null) ? this.config.endTime : params.duration;
         // in case endTime is accidentally specified as being greater than the video
         endTime = Math.min(endTime, params.duration);
         this.videoControl.vidTimeEl.html(Time.format(params.time) + ' / ' + Time.format(endTime));
-// TODO: FUNK >>>>>>> 00b75f0119b981641833240be214ef2076329747
     }
 
 });

diff --git a/common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js b/common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
@@ -238,17 +238,10 @@ function () {
         // params.duration could accidentally be construed as a floating
         // point double. Since we're displaying this number, round down
         // to nearest second
-        // TODO:FUNK <<<<<<< HEAD
-        // var duration = Math.floor(params.duration);
-        //
-        // if (this.config.endTime !== null) {
-        //     duration = Math.min(this.config.endTime, duration);
-        // TODO:FUNK =======
         var endTime = Math.floor(params.duration);
 
         if (this.config.endTime !== null) {
             endTime = Math.min(this.config.endTime, endTime);
-        // TODO:FUNK >>>>>>> 00b75f0119b981641833240be214ef2076329747
         }
 
         if (