From e98aeda29ee420cdcc5e989e0e901bc68c00879c Mon Sep 17 00:00:00 2001 From: Brian Jacobel Date: Thu, 15 Dec 2016 14:15:36 -0500 Subject: [PATCH] Move sequence nav display.coffee to new js location, and remove dead code --- .eslintignore | 1 - .../sequence/{display.coffee => display.js} | 0 .../js/src/sequence/display/.gitignore | 1 - .../src/sequence/display/jquery.sequence.js | 74 ------------------- common/lib/xmodule/xmodule/seq_module.py | 3 +- lms/templates/seq_module.html | 7 -- 6 files changed, 1 insertion(+), 85 deletions(-) rename common/lib/xmodule/xmodule/js/src/sequence/{display.coffee => display.js} (100%) delete mode 100644 common/lib/xmodule/xmodule/js/src/sequence/display/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/sequence/display/jquery.sequence.js diff --git a/.eslintignore b/.eslintignore index 8ee8cc947c..7bec88e2cb 100644 --- a/.eslintignore +++ b/.eslintignore @@ -52,7 +52,6 @@ common/lib/xmodule/xmodule/js/src/html/edit.js common/lib/xmodule/xmodule/js/src/raw/edit/json.js common/lib/xmodule/xmodule/js/src/raw/edit/metadata-only.js common/lib/xmodule/xmodule/js/src/raw/edit/xml.js -common/lib/xmodule/xmodule/js/src/sequence/display.js common/lib/xmodule/xmodule/js/src/sequence/edit.js common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.js common/lib/xmodule/xmodule/js/src/vertical/edit.js diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/sequence/display.coffee rename to common/lib/xmodule/xmodule/js/src/sequence/display.js diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display/.gitignore b/common/lib/xmodule/xmodule/js/src/sequence/display/.gitignore deleted file mode 100644 index d4aa116a26..0000000000 --- a/common/lib/xmodule/xmodule/js/src/sequence/display/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!*.js diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display/jquery.sequence.js b/common/lib/xmodule/xmodule/js/src/sequence/display/jquery.sequence.js deleted file mode 100644 index 91ca3fbe53..0000000000 --- a/common/lib/xmodule/xmodule/js/src/sequence/display/jquery.sequence.js +++ /dev/null @@ -1,74 +0,0 @@ -var SequenceNav = function($element) { - var _this = this; - var $element = $element; - var $wrapper = $element.find('.sequence-list-wrapper'); - var $list = $element.find('#sequence-list'); - var $arrows = $element.find('.sequence-nav-button'); - var maxScroll = $list.width() - $wrapper.width(); - var $body = $('body'); - var listOrigin; - var mouseOrigin; - - var startDrag = function(e) { - updateWidths(); - mouseOrigin = e.pageX; - listOrigin = $list.position().left; - $body.css('-webkit-user-select', 'none'); - $body.bind('mousemove', moveDrag); - $body.bind('mouseup', stopDrag); - }; - - var moveDrag = function(e) { - var offset = e.pageX - mouseOrigin; - var targetLeft = clamp(listOrigin + offset, -maxScroll, 0); - - updateHorizontalPosition(targetLeft); - }; - - var stopDrag = function(e) { - $body.css('-webkit-user-select', 'auto'); - $body.unbind('mousemove', moveDrag); - $body.unbind('mouseup', stopDrag); - }; - - var clamp = function(val, min, max) { - if(val > max) return max; - if(val < min) return min; - return val; - }; - - var updateWidths = function(e) { - maxScroll = $list.width() - $wrapper.width(); - var targetLeft = clamp($list.position().left, -maxScroll, 0); - updateHorizontalPosition(targetLeft); - }; - - var updateHorizontalPosition = function(left) { - $list.css({ - 'left': left + 'px' - }); - }; - - var checkPosition = function(e) { - var $active = $element.find('.active'); - if(!$active[0]) { - return; - } - if($active.position().left + $active.width() > $wrapper.width() - $list.position().left) { - $list.animate({ - 'left': (-$active.position().left + $wrapper.width() - $active.width() - 10) + 'px' - }, {}); - } else if($active.position().left < -$list.position().left) { - $list.animate({ - 'left': (-$active.position().left + 10) + 'px' - }, {}); - } - }; - - $wrapper.bind('mousedown', startDrag); - $arrows.bind('click', checkPosition); - $(window).bind('resize', updateWidths); - setTimeout(function() { - checkPosition(); - }, 200); -}; diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py index 18ab86e525..ca588eee33 100644 --- a/common/lib/xmodule/xmodule/seq_module.py +++ b/common/lib/xmodule/xmodule/seq_module.py @@ -161,8 +161,7 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule): Layout module which lays out content in a temporal sequence """ js = { - 'coffee': [resource_string(__name__, 'js/src/sequence/display.coffee')], - 'js': [resource_string(__name__, 'js/src/sequence/display/jquery.sequence.js')], + 'js': [resource_string(__name__, 'js/src/sequence/display.js')], } css = { 'scss': [resource_string(__name__, 'css/sequence/display.scss')], diff --git a/lms/templates/seq_module.html b/lms/templates/seq_module.html index 47c6aac7d6..7ac6d7274a 100644 --- a/lms/templates/seq_module.html +++ b/lms/templates/seq_module.html @@ -64,10 +64,3 @@ - -