diff --git a/cms/static/cms/js/require-config.js b/cms/static/cms/js/require-config.js index f578184ca4..ee4ca7dad0 100644 --- a/cms/static/cms/js/require-config.js +++ b/cms/static/cms/js/require-config.js @@ -40,8 +40,6 @@ require.config({ "jquery.immediateDescendents": "coffee/src/jquery.immediateDescendents", "datepair": "js/vendor/timepicker/datepair", "date": "js/vendor/date", - "text": 'js/vendor/requirejs/text', - "moment": "js/vendor/moment-with-locales.min", "moment": "js/vendor/moment.min", "moment-with-locales": "js/vendor/moment-with-locales.min", "text": 'js/vendor/requirejs/text', diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py index 7cd2c615fe..a0033951f5 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml.py +++ b/common/lib/xmodule/xmodule/modulestore/xml.py @@ -917,6 +917,14 @@ class XMLModuleStore(ModuleStoreReadBase): log.warning("get_all_asset_metadata request of XML modulestore - not implemented.") return [] + def fill_in_run(self, course_key): + """ + A no-op. + + Added to simplify tests which use the XML-store directly. + """ + return course_key + class LibraryXMLModuleStore(XMLModuleStore): """ diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py index 88e9b8b0ce..6389f36df7 100644 --- a/common/lib/xmodule/xmodule/seq_module.py +++ b/common/lib/xmodule/xmodule/seq_module.py @@ -55,6 +55,7 @@ class SequenceFields(object): scope=Scope.settings, ) + class ProctoringFields(object): """ Fields that are specific to Proctored or Timed Exams @@ -120,7 +121,7 @@ class ProctoringFields(object): @XBlock.wants('credit') @XBlock.needs("user") @XBlock.needs("bookmarks") -class SequenceModule(SequenceFields, XModule): +class SequenceModule(SequenceFields, ProctoringFields, XModule): """ Layout module which lays out content in a temporal sequence """ diff --git a/common/static/js/vendor/moment.min.js b/common/static/js/vendor/moment.min.js new file mode 100644 index 0000000000..042ad7e175 --- /dev/null +++ b/common/static/js/vendor/moment.min.js @@ -0,0 +1,7 @@ +//! moment.js +//! version : 2.10.3 +//! authors : Tim Wood, Iskren Chernev, Moment.js contributors +//! license : MIT +//! momentjs.com +!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.moment=b()}(this,function(){"use strict";function a(){return Dc.apply(null,arguments)}function b(a){Dc=a}function c(a){return"[object Array]"===Object.prototype.toString.call(a)}function d(a){return a instanceof Date||"[object Date]"===Object.prototype.toString.call(a)}function e(a,b){var c,d=[];for(c=0;c0)for(c in Fc)d=Fc[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function n(b){m(this,b),this._d=new Date(+b._d),Gc===!1&&(Gc=!0,a.updateOffset(this),Gc=!1)}function o(a){return a instanceof n||null!=a&&null!=a._isAMomentObject}function p(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function q(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&p(a[d])!==p(b[d]))&&g++;return g+f}function r(){}function s(a){return a?a.toLowerCase().replace("_","-"):a}function t(a){for(var b,c,d,e,f=0;f0;){if(d=u(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&q(e,c,!0)>=b-1)break;b--}f++}return null}function u(a){var b=null;if(!Hc[a]&&"undefined"!=typeof module&&module&&module.exports)try{b=Ec._abbr,require("./locale/"+a),v(b)}catch(c){}return Hc[a]}function v(a,b){var c;return a&&(c="undefined"==typeof b?x(a):w(a,b),c&&(Ec=c)),Ec._abbr}function w(a,b){return null!==b?(b.abbr=a,Hc[a]||(Hc[a]=new r),Hc[a].set(b),v(a),Hc[a]):(delete Hc[a],null)}function x(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return Ec;if(!c(a)){if(b=u(a))return b;a=[a]}return t(a)}function y(a,b){var c=a.toLowerCase();Ic[c]=Ic[c+"s"]=Ic[b]=a}function z(a){return"string"==typeof a?Ic[a]||Ic[a.toLowerCase()]:void 0}function A(a){var b,c,d={};for(c in a)f(a,c)&&(b=z(c),b&&(d[b]=a[c]));return d}function B(b,c){return function(d){return null!=d?(D(this,b,d),a.updateOffset(this,c),this):C(this,b)}}function C(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function D(a,b,c){return a._d["set"+(a._isUTC?"UTC":"")+b](c)}function E(a,b){var c;if("object"==typeof a)for(c in a)this.set(c,a[c]);else if(a=z(a),"function"==typeof this[a])return this[a](b);return this}function F(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.lengthb;b++)Mc[d[b]]?d[b]=Mc[d[b]]:d[b]=H(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function J(a,b){return a.isValid()?(b=K(b,a.localeData()),Lc[b]||(Lc[b]=I(b)),Lc[b](a)):a.localeData().invalidDate()}function K(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Kc.lastIndex=0;d>=0&&Kc.test(a);)a=a.replace(Kc,c),Kc.lastIndex=0,d-=1;return a}function L(a,b,c){_c[a]="function"==typeof b?b:function(a){return a&&c?c:b}}function M(a,b){return f(_c,a)?_c[a](b._strict,b._locale):new RegExp(N(a))}function N(a){return a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}).replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function O(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),"number"==typeof b&&(d=function(a,c){c[b]=p(a)}),c=0;cd;d++){if(e=h([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}}function V(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),R(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function W(b){return null!=b?(V(this,b),a.updateOffset(this,!0),this):C(this,"Month")}function X(){return R(this.year(),this.month())}function Y(a){var b,c=a._a;return c&&-2===j(a).overflow&&(b=c[cd]<0||c[cd]>11?cd:c[dd]<1||c[dd]>R(c[bd],c[cd])?dd:c[ed]<0||c[ed]>24||24===c[ed]&&(0!==c[fd]||0!==c[gd]||0!==c[hd])?ed:c[fd]<0||c[fd]>59?fd:c[gd]<0||c[gd]>59?gd:c[hd]<0||c[hd]>999?hd:-1,j(a)._overflowDayOfYear&&(bd>b||b>dd)&&(b=dd),j(a).overflow=b),a}function Z(b){a.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+b)}function $(a,b){var c=!0,d=a+"\n"+(new Error).stack;return g(function(){return c&&(Z(d),c=!1),b.apply(this,arguments)},b)}function _(a,b){kd[a]||(Z(b),kd[a]=!0)}function aa(a){var b,c,d=a._i,e=ld.exec(d);if(e){for(j(a).iso=!0,b=0,c=md.length;c>b;b++)if(md[b][1].exec(d)){a._f=md[b][0]+(e[6]||" ");break}for(b=0,c=nd.length;c>b;b++)if(nd[b][1].exec(d)){a._f+=nd[b][0];break}d.match(Yc)&&(a._f+="Z"),ta(a)}else a._isValid=!1}function ba(b){var c=od.exec(b._i);return null!==c?void(b._d=new Date(+c[1])):(aa(b),void(b._isValid===!1&&(delete b._isValid,a.createFromInputFallback(b))))}function ca(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function da(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function ea(a){return fa(a)?366:365}function fa(a){return a%4===0&&a%100!==0||a%400===0}function ga(){return fa(this.year())}function ha(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=Aa(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function ia(a){return ha(a,this._week.dow,this._week.doy).week}function ja(){return this._week.dow}function ka(){return this._week.doy}function la(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function ma(a){var b=ha(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")}function na(a,b,c,d,e){var f,g,h=da(a,0,1).getUTCDay();return h=0===h?7:h,c=null!=c?c:e,f=e-h+(h>d?7:0)-(e>h?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:ea(a-1)+g}}function oa(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function pa(a,b,c){return null!=a?a:null!=b?b:c}function qa(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function ra(a){var b,c,d,e,f=[];if(!a._d){for(d=qa(a),a._w&&null==a._a[dd]&&null==a._a[cd]&&sa(a),a._dayOfYear&&(e=pa(a._a[bd],d[bd]),a._dayOfYear>ea(e)&&(j(a)._overflowDayOfYear=!0),c=da(e,0,a._dayOfYear),a._a[cd]=c.getUTCMonth(),a._a[dd]=c.getUTCDate()),b=0;3>b&&null==a._a[b];++b)a._a[b]=f[b]=d[b];for(;7>b;b++)a._a[b]=f[b]=null==a._a[b]?2===b?1:0:a._a[b];24===a._a[ed]&&0===a._a[fd]&&0===a._a[gd]&&0===a._a[hd]&&(a._nextDay=!0,a._a[ed]=0),a._d=(a._useUTC?da:ca).apply(null,f),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[ed]=24)}}function sa(a){var b,c,d,e,f,g,h;b=a._w,null!=b.GG||null!=b.W||null!=b.E?(f=1,g=4,c=pa(b.GG,a._a[bd],ha(Aa(),1,4).year),d=pa(b.W,1),e=pa(b.E,1)):(f=a._locale._week.dow,g=a._locale._week.doy,c=pa(b.gg,a._a[bd],ha(Aa(),f,g).year),d=pa(b.w,1),null!=b.d?(e=b.d,f>e&&++d):e=null!=b.e?b.e+f:f),h=na(c,d,e,g,f),a._a[bd]=h.year,a._dayOfYear=h.dayOfYear}function ta(b){if(b._f===a.ISO_8601)return void aa(b);b._a=[],j(b).empty=!0;var c,d,e,f,g,h=""+b._i,i=h.length,k=0;for(e=K(b._f,b._locale).match(Jc)||[],c=0;c0&&j(b).unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),k+=d.length),Mc[f]?(d?j(b).empty=!1:j(b).unusedTokens.push(f),Q(f,d,b)):b._strict&&!d&&j(b).unusedTokens.push(f);j(b).charsLeftOver=i-k,h.length>0&&j(b).unusedInput.push(h),j(b).bigHour===!0&&b._a[ed]<=12&&b._a[ed]>0&&(j(b).bigHour=void 0),b._a[ed]=ua(b._locale,b._a[ed],b._meridiem),ra(b),Y(b)}function ua(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&12>b&&(b+=12),d||12!==b||(b=0),b):b}function va(a){var b,c,d,e,f;if(0===a._f.length)return j(a).invalidFormat=!0,void(a._d=new Date(0/0));for(e=0;ef)&&(d=f,c=b));g(a,c||b)}function wa(a){if(!a._d){var b=A(a._i);a._a=[b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],ra(a)}}function xa(a){var b,e=a._i,f=a._f;return a._locale=a._locale||x(a._l),null===e||void 0===f&&""===e?l({nullInput:!0}):("string"==typeof e&&(a._i=e=a._locale.preparse(e)),o(e)?new n(Y(e)):(c(f)?va(a):f?ta(a):d(e)?a._d=e:ya(a),b=new n(Y(a)),b._nextDay&&(b.add(1,"d"),b._nextDay=void 0),b))}function ya(b){var f=b._i;void 0===f?b._d=new Date:d(f)?b._d=new Date(+f):"string"==typeof f?ba(b):c(f)?(b._a=e(f.slice(0),function(a){return parseInt(a,10)}),ra(b)):"object"==typeof f?wa(b):"number"==typeof f?b._d=new Date(f):a.createFromInputFallback(b)}function za(a,b,c,d,e){var f={};return"boolean"==typeof c&&(d=c,c=void 0),f._isAMomentObject=!0,f._useUTC=f._isUTC=e,f._l=c,f._i=a,f._f=b,f._strict=d,xa(f)}function Aa(a,b,c,d){return za(a,b,c,d,!1)}function Ba(a,b){var d,e;if(1===b.length&&c(b[0])&&(b=b[0]),!b.length)return Aa();for(d=b[0],e=1;ea&&(a=-a,c="-"),c+F(~~(a/60),2)+b+F(~~a%60,2)})}function Ha(a){var b=(a||"").match(Yc)||[],c=b[b.length-1]||[],d=(c+"").match(td)||["-",0,0],e=+(60*d[1])+p(d[2]);return"+"===d[0]?e:-e}function Ia(b,c){var e,f;return c._isUTC?(e=c.clone(),f=(o(b)||d(b)?+b:+Aa(b))-+e,e._d.setTime(+e._d+f),a.updateOffset(e,!1),e):Aa(b).local();return c._isUTC?Aa(b).zone(c._offset||0):Aa(b).local()}function Ja(a){return 15*-Math.round(a._d.getTimezoneOffset()/15)}function Ka(b,c){var d,e=this._offset||0;return null!=b?("string"==typeof b&&(b=Ha(b)),Math.abs(b)<16&&(b=60*b),!this._isUTC&&c&&(d=Ja(this)),this._offset=b,this._isUTC=!0,null!=d&&this.add(d,"m"),e!==b&&(!c||this._changeInProgress?$a(this,Va(b-e,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?e:Ja(this)}function La(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}function Ma(a){return this.utcOffset(0,a)}function Na(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(Ja(this),"m")),this}function Oa(){return this._tzm?this.utcOffset(this._tzm):"string"==typeof this._i&&this.utcOffset(Ha(this._i)),this}function Pa(a){return a=a?Aa(a).utcOffset():0,(this.utcOffset()-a)%60===0}function Qa(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function Ra(){if(this._a){var a=this._isUTC?h(this._a):Aa(this._a);return this.isValid()&&q(this._a,a.toArray())>0}return!1}function Sa(){return!this._isUTC}function Ta(){return this._isUTC}function Ua(){return this._isUTC&&0===this._offset}function Va(a,b){var c,d,e,g=a,h=null;return Fa(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(g={},b?g[b]=a:g.milliseconds=a):(h=ud.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:p(h[dd])*c,h:p(h[ed])*c,m:p(h[fd])*c,s:p(h[gd])*c,ms:p(h[hd])*c}):(h=vd.exec(a))?(c="-"===h[1]?-1:1,g={y:Wa(h[2],c),M:Wa(h[3],c),d:Wa(h[4],c),h:Wa(h[5],c),m:Wa(h[6],c),s:Wa(h[7],c),w:Wa(h[8],c)}):null==g?g={}:"object"==typeof g&&("from"in g||"to"in g)&&(e=Ya(Aa(g.from),Aa(g.to)),g={},g.ms=e.milliseconds,g.M=e.months),d=new Ea(g),Fa(a)&&f(a,"_locale")&&(d._locale=a._locale),d}function Wa(a,b){var c=a&&parseFloat(a.replace(",","."));return(isNaN(c)?0:c)*b}function Xa(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function Ya(a,b){var c;return b=Ia(b,a),a.isBefore(b)?c=Xa(a,b):(c=Xa(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function Za(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(_(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=Va(c,d),$a(this,e,a),this}}function $a(b,c,d,e){var f=c._milliseconds,g=c._days,h=c._months;e=null==e?!0:e,f&&b._d.setTime(+b._d+f*d),g&&D(b,"Date",C(b,"Date")+g*d),h&&V(b,C(b,"Month")+h*d),e&&a.updateOffset(b,g||h)}function _a(a){var b=a||Aa(),c=Ia(b,this).startOf("day"),d=this.diff(c,"days",!0),e=-6>d?"sameElse":-1>d?"lastWeek":0>d?"lastDay":1>d?"sameDay":2>d?"nextDay":7>d?"nextWeek":"sameElse";return this.format(this.localeData().calendar(e,this,Aa(b)))}function ab(){return new n(this)}function bb(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=o(a)?a:Aa(a),+this>+a):(c=o(a)?+a:+Aa(a),c<+this.clone().startOf(b))}function cb(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=o(a)?a:Aa(a),+a>+this):(c=o(a)?+a:+Aa(a),+this.clone().endOf(b)a?Math.ceil(a):Math.floor(a)}function gb(a,b,c){var d,e,f=Ia(a,this),g=6e4*(f.utcOffset()-this.utcOffset());return b=z(b),"year"===b||"month"===b||"quarter"===b?(e=hb(this,f),"quarter"===b?e/=3:"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:fb(e)}function hb(a,b){var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),f=a.clone().add(e,"months");return 0>b-f?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)}function ib(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")}function jb(){var a=this.clone().utc();return 0b;b++)if(this._weekdaysParse[b]||(c=Aa([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b}function Mb(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=Hb(a,this.localeData()),this.add(a-b,"d")):b}function Nb(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function Ob(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)}function Pb(a,b){G(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})}function Qb(a,b){return b._meridiemParse}function Rb(a){return"p"===(a+"").toLowerCase().charAt(0)}function Sb(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function Tb(a){G(0,[a,3],0,"millisecond")}function Ub(){return this._isUTC?"UTC":""}function Vb(){return this._isUTC?"Coordinated Universal Time":""}function Wb(a){return Aa(1e3*a)}function Xb(){return Aa.apply(null,arguments).parseZone()}function Yb(a,b,c){var d=this._calendar[a];return"function"==typeof d?d.call(b,c):d}function Zb(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b}function $b(){return this._invalidDate}function _b(a){return this._ordinal.replace("%d",a)}function ac(a){return a}function bc(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)}function cc(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)}function dc(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b;this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function ec(a,b,c,d){var e=x(),f=h().set(d,b);return e[c](f,a)}function fc(a,b,c,d,e){if("number"==typeof a&&(b=a,a=void 0),a=a||"",null!=b)return ec(a,b,c,e);var f,g=[];for(f=0;d>f;f++)g[f]=ec(a,f,c,e);return g}function gc(a,b){return fc(a,b,"months",12,"month")}function hc(a,b){return fc(a,b,"monthsShort",12,"month")}function ic(a,b){return fc(a,b,"weekdays",7,"day")}function jc(a,b){return fc(a,b,"weekdaysShort",7,"day")}function kc(a,b){return fc(a,b,"weekdaysMin",7,"day")}function lc(){var a=this._data;return this._milliseconds=Rd(this._milliseconds),this._days=Rd(this._days),this._months=Rd(this._months),a.milliseconds=Rd(a.milliseconds),a.seconds=Rd(a.seconds),a.minutes=Rd(a.minutes),a.hours=Rd(a.hours),a.months=Rd(a.months),a.years=Rd(a.years),this}function mc(a,b,c,d){var e=Va(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()}function nc(a,b){return mc(this,a,b,1)}function oc(a,b){return mc(this,a,b,-1)}function pc(){var a,b,c,d=this._milliseconds,e=this._days,f=this._months,g=this._data,h=0;return g.milliseconds=d%1e3,a=fb(d/1e3),g.seconds=a%60,b=fb(a/60),g.minutes=b%60,c=fb(b/60),g.hours=c%24,e+=fb(c/24),h=fb(qc(e)),e-=fb(rc(h)),f+=fb(e/30),e%=30,h+=fb(f/12),f%=12,g.days=e,g.months=f,g.years=h,this}function qc(a){return 400*a/146097}function rc(a){return 146097*a/400}function sc(a){var b,c,d=this._milliseconds;if(a=z(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+12*qc(b),"month"===a?c:c/12;switch(b=this._days+Math.round(rc(this._months/12)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 1440*b+d/6e4;case"second":return 86400*b+d/1e3;case"millisecond":return Math.floor(864e5*b)+d;default:throw new Error("Unknown unit "+a)}}function tc(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*p(this._months/12)}function uc(a){return function(){return this.as(a)}}function vc(a){return a=z(a),this[a+"s"]()}function wc(a){return function(){return this._data[a]}}function xc(){return fb(this.days()/7)}function yc(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function zc(a,b,c){var d=Va(a).abs(),e=fe(d.as("s")),f=fe(d.as("m")),g=fe(d.as("h")),h=fe(d.as("d")),i=fe(d.as("M")),j=fe(d.as("y")),k=e0,k[4]=c,yc.apply(null,k)}function Ac(a,b){return void 0===ge[a]?!1:void 0===b?ge[a]:(ge[a]=b,!0)}function Bc(a){var b=this.localeData(),c=zc(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function Cc(){var a=he(this.years()),b=he(this.months()),c=he(this.days()),d=he(this.hours()),e=he(this.minutes()),f=he(this.seconds()+this.milliseconds()/1e3),g=this.asSeconds();return g?(0>g?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"}var Dc,Ec,Fc=a.momentProperties=[],Gc=!1,Hc={},Ic={},Jc=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g,Kc=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Lc={},Mc={},Nc=/\d/,Oc=/\d\d/,Pc=/\d{3}/,Qc=/\d{4}/,Rc=/[+-]?\d{6}/,Sc=/\d\d?/,Tc=/\d{1,3}/,Uc=/\d{1,4}/,Vc=/[+-]?\d{1,6}/,Wc=/\d+/,Xc=/[+-]?\d+/,Yc=/Z|[+-]\d\d:?\d\d/gi,Zc=/[+-]?\d+(\.\d{1,3})?/,$c=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,_c={},ad={},bd=0,cd=1,dd=2,ed=3,fd=4,gd=5,hd=6;G("M",["MM",2],"Mo",function(){return this.month()+1}),G("MMM",0,0,function(a){return this.localeData().monthsShort(this,a)}),G("MMMM",0,0,function(a){return this.localeData().months(this,a)}),y("month","M"),L("M",Sc),L("MM",Sc,Oc),L("MMM",$c),L("MMMM",$c),O(["M","MM"],function(a,b){b[cd]=p(a)-1}),O(["MMM","MMMM"],function(a,b,c,d){var e=c._locale.monthsParse(a,d,c._strict);null!=e?b[cd]=e:j(c).invalidMonth=a});var id="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),jd="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),kd={};a.suppressDeprecationWarnings=!1;var ld=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,md=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],nd=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],od=/^\/?Date\((\-?\d+)/i;a.createFromInputFallback=$("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),G(0,["YY",2],0,function(){return this.year()%100}),G(0,["YYYY",4],0,"year"),G(0,["YYYYY",5],0,"year"),G(0,["YYYYYY",6,!0],0,"year"),y("year","y"),L("Y",Xc),L("YY",Sc,Oc),L("YYYY",Uc,Qc),L("YYYYY",Vc,Rc),L("YYYYYY",Vc,Rc),O(["YYYY","YYYYY","YYYYYY"],bd),O("YY",function(b,c){c[bd]=a.parseTwoDigitYear(b)}),a.parseTwoDigitYear=function(a){return p(a)+(p(a)>68?1900:2e3)};var pd=B("FullYear",!1);G("w",["ww",2],"wo","week"),G("W",["WW",2],"Wo","isoWeek"),y("week","w"),y("isoWeek","W"),L("w",Sc),L("ww",Sc,Oc),L("W",Sc),L("WW",Sc,Oc),P(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=p(a)});var qd={dow:0,doy:6};G("DDD",["DDDD",3],"DDDo","dayOfYear"),y("dayOfYear","DDD"),L("DDD",Tc),L("DDDD",Pc),O(["DDD","DDDD"],function(a,b,c){c._dayOfYear=p(a)}),a.ISO_8601=function(){};var rd=$("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(){var a=Aa.apply(null,arguments);return this>a?this:a}),sd=$("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(){var a=Aa.apply(null,arguments);return a>this?this:a});Ga("Z",":"),Ga("ZZ",""),L("Z",Yc),L("ZZ",Yc),O(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Ha(a)});var td=/([\+\-]|\d\d)/gi;a.updateOffset=function(){};var ud=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,vd=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;Va.fn=Ea.prototype;var wd=Za(1,"add"),xd=Za(-1,"subtract");a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ";var yd=$("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)});G(0,["gg",2],0,function(){return this.weekYear()%100}),G(0,["GG",2],0,function(){return this.isoWeekYear()%100}),Ab("gggg","weekYear"),Ab("ggggg","weekYear"),Ab("GGGG","isoWeekYear"),Ab("GGGGG","isoWeekYear"),y("weekYear","gg"),y("isoWeekYear","GG"),L("G",Xc),L("g",Xc),L("GG",Sc,Oc),L("gg",Sc,Oc),L("GGGG",Uc,Qc),L("gggg",Uc,Qc),L("GGGGG",Vc,Rc),L("ggggg",Vc,Rc),P(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=p(a)}),P(["gg","GG"],function(b,c,d,e){c[e]=a.parseTwoDigitYear(b)}),G("Q",0,0,"quarter"),y("quarter","Q"),L("Q",Nc),O("Q",function(a,b){b[cd]=3*(p(a)-1)}),G("D",["DD",2],"Do","date"),y("date","D"),L("D",Sc),L("DD",Sc,Oc),L("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),O(["D","DD"],dd),O("Do",function(a,b){b[dd]=p(a.match(Sc)[0],10)});var zd=B("Date",!0);G("d",0,"do","day"),G("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),G("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),G("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),G("e",0,0,"weekday"),G("E",0,0,"isoWeekday"),y("day","d"),y("weekday","e"),y("isoWeekday","E"),L("d",Sc),L("e",Sc),L("E",Sc),L("dd",$c),L("ddd",$c),L("dddd",$c),P(["dd","ddd","dddd"],function(a,b,c){var d=c._locale.weekdaysParse(a);null!=d?b.d=d:j(c).invalidWeekday=a}),P(["d","e","E"],function(a,b,c,d){b[d]=p(a)});var Ad="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Bd="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Cd="Su_Mo_Tu_We_Th_Fr_Sa".split("_");G("H",["HH",2],0,"hour"),G("h",["hh",2],0,function(){return this.hours()%12||12}),Pb("a",!0),Pb("A",!1),y("hour","h"),L("a",Qb),L("A",Qb),L("H",Sc),L("h",Sc),L("HH",Sc,Oc),L("hh",Sc,Oc),O(["H","HH"],ed),O(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),O(["h","hh"],function(a,b,c){b[ed]=p(a),j(c).bigHour=!0});var Dd=/[ap]\.?m?\.?/i,Ed=B("Hours",!0);G("m",["mm",2],0,"minute"),y("minute","m"),L("m",Sc),L("mm",Sc,Oc),O(["m","mm"],fd);var Fd=B("Minutes",!1);G("s",["ss",2],0,"second"),y("second","s"),L("s",Sc),L("ss",Sc,Oc),O(["s","ss"],gd);var Gd=B("Seconds",!1);G("S",0,0,function(){return~~(this.millisecond()/100)}),G(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),Tb("SSS"),Tb("SSSS"),y("millisecond","ms"),L("S",Tc,Nc),L("SS",Tc,Oc),L("SSS",Tc,Pc),L("SSSS",Wc),O(["S","SS","SSS","SSSS"],function(a,b){b[hd]=p(1e3*("0."+a))});var Hd=B("Milliseconds",!1);G("z",0,0,"zoneAbbr"),G("zz",0,0,"zoneName");var Id=n.prototype;Id.add=wd,Id.calendar=_a,Id.clone=ab,Id.diff=gb,Id.endOf=sb,Id.format=kb,Id.from=lb,Id.fromNow=mb,Id.to=nb,Id.toNow=ob,Id.get=E,Id.invalidAt=zb,Id.isAfter=bb,Id.isBefore=cb,Id.isBetween=db,Id.isSame=eb,Id.isValid=xb,Id.lang=yd,Id.locale=pb,Id.localeData=qb,Id.max=sd,Id.min=rd,Id.parsingFlags=yb,Id.set=E,Id.startOf=rb,Id.subtract=xd,Id.toArray=wb,Id.toDate=vb,Id.toISOString=jb,Id.toJSON=jb,Id.toString=ib,Id.unix=ub,Id.valueOf=tb,Id.year=pd,Id.isLeapYear=ga,Id.weekYear=Cb,Id.isoWeekYear=Db,Id.quarter=Id.quarters=Gb,Id.month=W,Id.daysInMonth=X,Id.week=Id.weeks=la,Id.isoWeek=Id.isoWeeks=ma,Id.weeksInYear=Fb,Id.isoWeeksInYear=Eb,Id.date=zd,Id.day=Id.days=Mb,Id.weekday=Nb,Id.isoWeekday=Ob,Id.dayOfYear=oa,Id.hour=Id.hours=Ed,Id.minute=Id.minutes=Fd,Id.second=Id.seconds=Gd,Id.millisecond=Id.milliseconds=Hd,Id.utcOffset=Ka,Id.utc=Ma,Id.local=Na,Id.parseZone=Oa,Id.hasAlignedHourOffset=Pa,Id.isDST=Qa,Id.isDSTShifted=Ra,Id.isLocal=Sa,Id.isUtcOffset=Ta,Id.isUtc=Ua,Id.isUTC=Ua,Id.zoneAbbr=Ub,Id.zoneName=Vb,Id.dates=$("dates accessor is deprecated. Use date instead.",zd),Id.months=$("months accessor is deprecated. Use month instead",W),Id.years=$("years accessor is deprecated. Use year instead",pd),Id.zone=$("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",La);var Jd=Id,Kd={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},Ld={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM D, YYYY LT"},Md="Invalid date",Nd="%d",Od=/\d{1,2}/,Pd={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour", +hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},Qd=r.prototype;Qd._calendar=Kd,Qd.calendar=Yb,Qd._longDateFormat=Ld,Qd.longDateFormat=Zb,Qd._invalidDate=Md,Qd.invalidDate=$b,Qd._ordinal=Nd,Qd.ordinal=_b,Qd._ordinalParse=Od,Qd.preparse=ac,Qd.postformat=ac,Qd._relativeTime=Pd,Qd.relativeTime=bc,Qd.pastFuture=cc,Qd.set=dc,Qd.months=S,Qd._months=id,Qd.monthsShort=T,Qd._monthsShort=jd,Qd.monthsParse=U,Qd.week=ia,Qd._week=qd,Qd.firstDayOfYear=ka,Qd.firstDayOfWeek=ja,Qd.weekdays=Ib,Qd._weekdays=Ad,Qd.weekdaysMin=Kb,Qd._weekdaysMin=Cd,Qd.weekdaysShort=Jb,Qd._weekdaysShort=Bd,Qd.weekdaysParse=Lb,Qd.isPM=Rb,Qd._meridiemParse=Dd,Qd.meridiem=Sb,v("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===p(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),a.lang=$("moment.lang is deprecated. Use moment.locale instead.",v),a.langData=$("moment.langData is deprecated. Use moment.localeData instead.",x);var Rd=Math.abs,Sd=uc("ms"),Td=uc("s"),Ud=uc("m"),Vd=uc("h"),Wd=uc("d"),Xd=uc("w"),Yd=uc("M"),Zd=uc("y"),$d=wc("milliseconds"),_d=wc("seconds"),ae=wc("minutes"),be=wc("hours"),ce=wc("days"),de=wc("months"),ee=wc("years"),fe=Math.round,ge={s:45,m:45,h:22,d:26,M:11},he=Math.abs,ie=Ea.prototype;ie.abs=lc,ie.add=nc,ie.subtract=oc,ie.as=sc,ie.asMilliseconds=Sd,ie.asSeconds=Td,ie.asMinutes=Ud,ie.asHours=Vd,ie.asDays=Wd,ie.asWeeks=Xd,ie.asMonths=Yd,ie.asYears=Zd,ie.valueOf=tc,ie._bubble=pc,ie.get=vc,ie.milliseconds=$d,ie.seconds=_d,ie.minutes=ae,ie.hours=be,ie.days=ce,ie.weeks=xc,ie.months=de,ie.years=ee,ie.humanize=Bc,ie.toISOString=Cc,ie.toString=Cc,ie.toJSON=Cc,ie.locale=pb,ie.localeData=qb,ie.toIsoString=$("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Cc),ie.lang=yd,G("X",0,0,"unix"),G("x",0,0,"valueOf"),L("x",Xc),L("X",Zc),O("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),O("x",function(a,b,c){c._d=new Date(p(a))}),a.version="2.10.3",b(Aa),a.fn=Jd,a.min=Ca,a.max=Da,a.utc=h,a.unix=Wb,a.months=gc,a.isDate=d,a.locale=v,a.invalid=l,a.duration=Va,a.isMoment=o,a.weekdays=ic,a.parseZone=Xb,a.localeData=x,a.isDuration=Fa,a.monthsShort=hc,a.weekdaysMin=kc,a.defineLocale=w,a.weekdaysShort=jc,a.normalizeUnits=z,a.relativeTimeThreshold=Ac;var je=a;return je}); diff --git a/common/test/acceptance/pages/lms/courseware_search.py b/common/test/acceptance/pages/lms/courseware_search.py index 7574fa19de..2b62ec669d 100644 --- a/common/test/acceptance/pages/lms/courseware_search.py +++ b/common/test/acceptance/pages/lms/courseware_search.py @@ -12,11 +12,12 @@ class CoursewareSearchPage(CoursePage): url_path = "courseware/" search_bar_selector = '#courseware-search-bar' + search_results_selector = '.courseware-results' @property def search_results(self): """ search results list showing """ - return self.q(css='.courseware-results') + return self.q(css=self.search_results_selector) def is_browser_on_page(self): """ did we find the search bar in the UI """ @@ -30,6 +31,7 @@ class CoursewareSearchPage(CoursePage): """ execute the search """ self.q(css=self.search_bar_selector + ' [type="submit"]').click() self.wait_for_ajax() + self.wait_for_element_visibility(self.search_results_selector, 'Search results are visible') def search_for_term(self, text): """ diff --git a/common/test/acceptance/tests/lms/test_bookmarks.py b/common/test/acceptance/tests/lms/test_bookmarks.py index ca773e7620..5b6d226d97 100644 --- a/common/test/acceptance/tests/lms/test_bookmarks.py +++ b/common/test/acceptance/tests/lms/test_bookmarks.py @@ -207,14 +207,13 @@ class BookmarksTest(BookmarksTestMixin): self.assertEqual(self.bookmarks_page.get_current_page_number(), current_page_number) self.assertEqual(self.bookmarks_page.get_total_pages, total_pages) - def _navigate_and_verify_bookmarks_list(self, bookmarks_count): + def _navigate_to_bookmarks_list(self): """ Navigates and verifies the bookmarks list page. """ self.bookmarks_page.click_bookmarks_button() self.assertTrue(self.bookmarks_page.results_present()) self.assertEqual(self.bookmarks_page.results_header_text(), 'MY BOOKMARKS') - self.assertEqual(self.bookmarks_page.count(), bookmarks_count) def _verify_breadcrumbs(self, num_units, modified_name=None): """ @@ -310,6 +309,9 @@ class BookmarksTest(BookmarksTestMixin): self._test_setup() self._bookmark_units(2) + self._navigate_to_bookmarks_list() + self._verify_breadcrumbs(num_units=2) + self._verify_pagination_info( bookmark_count_on_current_page=2, header_text='Showing 1-2 out of 2 total', @@ -319,9 +321,6 @@ class BookmarksTest(BookmarksTestMixin): total_pages=1 ) - self._navigate_and_verify_bookmarks_list(bookmarks_count=2) - self._verify_breadcrumbs(num_units=2) - # get usage ids for units xblocks = self.course_fixture.get_nested_xblocks(category="vertical") xblock_usage_ids = [xblock.locator for xblock in xblocks] @@ -329,7 +328,7 @@ class BookmarksTest(BookmarksTestMixin): for index in range(2): self.bookmarks_page.click_bookmarked_block(index) self.courseware_page.wait_for_page() - self.assertTrue(self.courseware_page.active_usage_id() in xblock_usage_ids) + self.assertIn(self.courseware_page.active_usage_id(), xblock_usage_ids) self.courseware_page.visit().wait_for_page() self.bookmarks_page.click_bookmarks_button() @@ -352,11 +351,11 @@ class BookmarksTest(BookmarksTestMixin): self._test_setup(num_chapters=1) self._bookmark_units(num_units=1) - self._navigate_and_verify_bookmarks_list(bookmarks_count=1) + self._navigate_to_bookmarks_list() self._verify_breadcrumbs(num_units=1) LogoutPage(self.browser).visit() - AutoAuthPage( + LmsAutoAuthPage( self.browser, username=self.USERNAME, email=self.EMAIL, @@ -368,10 +367,10 @@ class BookmarksTest(BookmarksTestMixin): self.update_and_publish_block_display_name(modified_name) LogoutPage(self.browser).visit() - AutoAuthPage(self.browser, username=self.USERNAME, email=self.EMAIL, course_id=self.course_id).visit() + LmsAutoAuthPage(self.browser, username=self.USERNAME, email=self.EMAIL, course_id=self.course_id).visit() self.courseware_page.visit() - self._navigate_and_verify_bookmarks_list(bookmarks_count=1) + self._navigate_to_bookmarks_list() self._verify_breadcrumbs(num_units=1, modified_name=modified_name) def test_unreachable_bookmark(self): @@ -387,15 +386,15 @@ class BookmarksTest(BookmarksTestMixin): When I click on deleted bookmark Then I should navigated to 404 page """ - self._test_setup() - self._bookmark_units(2) + self._test_setup(num_chapters=1) + self._bookmark_units(1) self._delete_section(0) - self._navigate_and_verify_bookmarks_list(bookmarks_count=2) + self._navigate_to_bookmarks_list() self._verify_pagination_info( - bookmark_count_on_current_page=2, - header_text='Showing 1-2 out of 2 total', + bookmark_count_on_current_page=1, + header_text='Showing 1 out of 1 total', previous_button_enabled=False, next_button_enabled=False, current_page_number=1, @@ -418,7 +417,7 @@ class BookmarksTest(BookmarksTestMixin): """ self._test_setup(11) self._bookmark_units(11) - self._navigate_and_verify_bookmarks_list(bookmarks_count=11) + self._navigate_to_bookmarks_list() self._verify_pagination_info( bookmark_count_on_current_page=10, diff --git a/common/test/acceptance/tests/lms/test_lms_courseware.py b/common/test/acceptance/tests/lms/test_lms_courseware.py index 79e0934aa6..4c9d0d8a02 100644 --- a/common/test/acceptance/tests/lms/test_lms_courseware.py +++ b/common/test/acceptance/tests/lms/test_lms_courseware.py @@ -68,14 +68,6 @@ class CoursewareTest(UniqueCourseTest): self.problem_page = ProblemPage(self.browser) self.assertEqual(self.problem_page.problem_name, 'TEST PROBLEM 1') - def _change_problem_release_date_in_studio(self): - """ - - """ - self.course_outline.q(css=".subsection-header-actions .configure-button").first.click() - self.course_outline.q(css="#start_date").fill("01/01/2030") - self.course_outline.q(css=".action-save").first.click() - def _create_breadcrumb(self, index): """ Create breadcrumb """ return ['Test Section {}'.format(index), 'Test Subsection {}'.format(index), 'Test Problem {}'.format(index)] @@ -105,9 +97,6 @@ class CoursewareTest(UniqueCourseTest): # Set release date for subsection in future. self.course_outline.change_problem_release_date_in_studio() - # Wait for 2 seconds to save new date. - time.sleep(2) - # Logout and login as a student. LogoutPage(self.browser).visit() self._auto_auth(self.USERNAME, self.EMAIL, False) @@ -117,6 +106,23 @@ class CoursewareTest(UniqueCourseTest): # Problem name should be "TEST PROBLEM 2". self.assertEqual(self.problem_page.problem_name, 'TEST PROBLEM 2') + def test_course_tree_breadcrumb(self): + """ + Scenario: Correct course tree breadcrumb is shown. + + Given that I am a registered user + And I visit my courseware page + Then I should see correct course tree breadcrumb + """ + self.courseware_page.visit() + + xblocks = self.course_fix.get_nested_xblocks(category="problem") + for index in range(1, len(xblocks) + 1): + self.course_nav.go_to_section('Test Section {}'.format(index), 'Test Subsection {}'.format(index)) + courseware_page_breadcrumb = self.courseware_page.breadcrumb + expected_breadcrumb = self._create_breadcrumb(index) # pylint: disable=no-member + self.assertEqual(courseware_page_breadcrumb, expected_breadcrumb) + class ProctoredExamTest(UniqueCourseTest): """ @@ -262,23 +268,6 @@ class ProctoredExamTest(UniqueCourseTest): self.courseware_page.start_timed_exam() self.assertTrue(self.courseware_page.is_timer_bar_present) - def test_course_tree_breadcrumb(self): - """ - Scenario: Correct course tree breadcrumb is shown. - - Given that I am a registered user - And I visit my courseware page - Then I should see correct course tree breadcrumb - """ - self.courseware_page.visit() - - xblocks = self.course_fix.get_nested_xblocks(category="problem") - for index in range(1, len(xblocks) + 1): - self.course_nav.go_to_section('Test Section {}'.format(index), 'Test Subsection {}'.format(index)) - courseware_page_breadcrumb = self.courseware_page.breadcrumb - expected_breadcrumb = self._create_breadcrumb(index) - self.assertEqual(courseware_page_breadcrumb, expected_breadcrumb) - def test_time_allotted_field_is_not_visible_with_none_exam(self): """ Given that I am a staff member diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index 7da184f657..5c1cca18f3 100644 --- a/lms/djangoapps/courseware/views.py +++ b/lms/djangoapps/courseware/views.py @@ -419,6 +419,10 @@ def _index_bulk_op(request, course_key, chapter, section, position): studio_url = get_studio_url(course, 'course') + language_preference = get_user_preference(request.user, LANGUAGE_KEY) + if not language_preference: + language_preference = settings.LANGUAGE_CODE + context = { 'csrf': csrf(request)['csrf_token'], 'accordion': render_accordion(user, request, course, chapter, section, field_data_cache), diff --git a/lms/djangoapps/teams/static/teams/js/spec/views/team_card_spec.js b/lms/djangoapps/teams/static/teams/js/spec/views/team_card_spec.js index 4f5ff49c49..748efa02b6 100644 --- a/lms/djangoapps/teams/static/teams/js/spec/views/team_card_spec.js +++ b/lms/djangoapps/teams/static/teams/js/spec/views/team_card_spec.js @@ -1,8 +1,9 @@ define(['jquery', 'underscore', + 'moment-with-locales', 'teams/js/views/team_card', 'teams/js/models/team'], - function ($, _, TeamCardView, Team) { + function ($, _, moment, TeamCardView, Team) { 'use strict'; describe('TeamCardView', function () { @@ -35,6 +36,7 @@ define(['jquery', }; beforeEach(function () { + moment.locale('en'); view = createTeamCardView(); view.render(); }); diff --git a/lms/envs/common.py b/lms/envs/common.py index 5cd8420d46..e622fe1199 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1176,7 +1176,6 @@ courseware_js = ( for pth in ['courseware', 'histogram', 'navigation'] ] + ['js/' + pth + '.js' for pth in ['ajax-error']] + - ['js/bookmarks/main.js'] + sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/modules/**/*.js')) ) @@ -1910,7 +1909,6 @@ INSTALLED_APPS = ( # Bookmarks 'openedx.core.djangoapps.bookmarks', - 'bookmarks', # programs support 'openedx.core.djangoapps.programs', diff --git a/lms/static/js/bookmarks/bookmarks_factory.js b/lms/static/js/bookmarks/bookmarks_factory.js new file mode 100644 index 0000000000..d8f444b26c --- /dev/null +++ b/lms/static/js/bookmarks/bookmarks_factory.js @@ -0,0 +1,12 @@ +;(function (define) { + 'use strict'; + define([ + 'js/bookmarks/views/bookmarks_list_button' + ], + function(BookmarksListButton) { + return function() { + return new BookmarksListButton(); + }; + } + ); +}).call(this, define || RequireJS.define); diff --git a/lms/static/js/bookmarks/collections/bookmarks.js b/lms/static/js/bookmarks/collections/bookmarks.js index 1fe7197244..33a3b6f993 100644 --- a/lms/static/js/bookmarks/collections/bookmarks.js +++ b/lms/static/js/bookmarks/collections/bookmarks.js @@ -8,8 +8,13 @@ PagingCollection.prototype.initialize.call(this); this.url = options.url; - this.server_api.course_id = function () { return encodeURIComponent(options.course_id); }; - this.server_api.fields = function () { return encodeURIComponent('display_name,path'); }; + this.server_api = _.extend( + { + course_id: function () { return encodeURIComponent(options.course_id); }, + fields : function () { return encodeURIComponent('display_name,path'); } + }, + PagingCollection.prototype.server_api + ); delete this.server_api.sort_order; // Sort order is not specified for the Bookmark API }, diff --git a/lms/static/js/bookmarks/main.js b/lms/static/js/bookmarks/main.js deleted file mode 100644 index 9e4c90fafe..0000000000 --- a/lms/static/js/bookmarks/main.js +++ /dev/null @@ -1,7 +0,0 @@ -RequireJS.require([ - 'js/bookmarks/views/bookmarks_list_button' -], function (BookmarksListButton) { - 'use strict'; - - return new BookmarksListButton(); -}); diff --git a/lms/static/js/bookmarks/views/bookmark_button.js b/lms/static/js/bookmarks/views/bookmark_button.js index 8e21441937..cd31d8e275 100644 --- a/lms/static/js/bookmarks/views/bookmark_button.js +++ b/lms/static/js/bookmarks/views/bookmark_button.js @@ -1,7 +1,7 @@ ;(function (define, undefined) { 'use strict'; - define(['gettext', 'jquery', 'underscore', 'backbone', 'js/views/message'], - function (gettext, $, _, Backbone, MessageView) { + define(['gettext', 'jquery', 'underscore', 'backbone', 'js/views/message_banner'], + function (gettext, $, _, Backbone, MessageBannerView) { return Backbone.View.extend({ @@ -81,9 +81,8 @@ showError: function() { if (!this.messageView) { - this.messageView = new MessageView({ - el: $('.coursewide-message-banner'), - templateId: '#message_banner-tpl' + this.messageView = new MessageBannerView({ + el: $('.message-banner') }); } this.messageView.showMessage(this.errorMessage, this.errorIcon); diff --git a/lms/static/js/bookmarks/views/bookmarks_list.js b/lms/static/js/bookmarks/views/bookmarks_list.js index 6bcdbe464b..33927be2f4 100644 --- a/lms/static/js/bookmarks/views/bookmarks_list.js +++ b/lms/static/js/bookmarks/views/bookmarks_list.js @@ -1,8 +1,11 @@ ;(function (define, undefined) { 'use strict'; define(['gettext', 'jquery', 'underscore', 'backbone', 'logger', 'moment', - 'common/js/components/views/paging_header', 'common/js/components/views/paging_footer'], - function (gettext, $, _, Backbone, Logger, _moment, PagingHeaderView, PagingFooterView) { + 'common/js/components/views/paging_header', 'common/js/components/views/paging_footer', + 'text!templates/bookmarks/bookmarks-list.underscore' + ], + function (gettext, $, _, Backbone, Logger, _moment, + PagingHeaderView, PagingFooterView, BookmarksListTemplate) { var moment = _moment || window.moment; @@ -24,7 +27,7 @@ }, initialize: function (options) { - this.template = _.template($('#bookmarks-list-tpl').text()); + this.template = _.template(BookmarksListTemplate); this.loadingMessageView = options.loadingMessageView; this.errorMessageView = options.errorMessageView; this.langCode = $(this.el).data('langCode'); diff --git a/lms/static/js/bookmarks/views/bookmarks_list_button.js b/lms/static/js/bookmarks/views/bookmarks_list_button.js index ee83fea819..1398ae1e0f 100644 --- a/lms/static/js/bookmarks/views/bookmarks_list_button.js +++ b/lms/static/js/bookmarks/views/bookmarks_list_button.js @@ -1,8 +1,8 @@ ;(function (define, undefined) { 'use strict'; define(['gettext', 'jquery', 'underscore', 'backbone', 'js/bookmarks/views/bookmarks_list', - 'js/bookmarks/collections/bookmarks', 'js/views/message'], - function (gettext, $, _, Backbone, BookmarksListView, BookmarksCollection, MessageView) { + 'js/bookmarks/collections/bookmarks', 'js/views/message_banner'], + function (gettext, $, _, Backbone, BookmarksListView, BookmarksCollection, MessageBannerView) { return Backbone.View.extend({ @@ -26,8 +26,8 @@ this.bookmarksListView = new BookmarksListView( { collection: bookmarksCollection, - loadingMessageView: new MessageView({el: $(this.loadingMessageElement)}), - errorMessageView: new MessageView({el: $(this.errorMessageElement)}) + loadingMessageView: new MessageBannerView({el: $(this.loadingMessageElement)}), + errorMessageView: new MessageBannerView({el: $(this.errorMessageElement)}) } ); }, diff --git a/lms/static/js/fixtures/bookmarks/bookmark_button.html b/lms/static/js/fixtures/bookmarks/bookmark_button.html index 76aa6428a3..31f325f237 100644 --- a/lms/static/js/fixtures/bookmarks/bookmark_button.html +++ b/lms/static/js/fixtures/bookmarks/bookmark_button.html @@ -1,5 +1,5 @@ -
+
diff --git a/lms/static/js/search/course/main.js b/lms/static/js/search/course/main.js deleted file mode 100644 index 310eb0e042..0000000000 --- a/lms/static/js/search/course/main.js +++ /dev/null @@ -1,22 +0,0 @@ -RequireJS.require([ - 'jquery', - 'backbone', - 'js/search/course/search_app', - 'js/search/base/routers/search_router', - 'js/search/course/views/search_form', - 'js/search/base/collections/search_collection', - 'js/search/course/views/search_results_view' -], function ($, Backbone, SearchApp, SearchRouter, CourseSearchForm, SearchCollection, CourseSearchResultsView) { - 'use strict'; - - var courseId = $('.courseware-results').data('courseId'); - var app = new SearchApp( - courseId, - SearchRouter, - CourseSearchForm, - SearchCollection, - CourseSearchResultsView - ); - Backbone.history.start(); - -}); diff --git a/lms/static/js/spec/bookmarks/bookmark_button_view_spec.js b/lms/static/js/spec/bookmarks/bookmark_button_view_spec.js index 199aa86017..ad04b44646 100644 --- a/lms/static/js/spec/bookmarks/bookmark_button_view_spec.js +++ b/lms/static/js/spec/bookmarks/bookmark_button_view_spec.js @@ -68,7 +68,8 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers }; var requests = AjaxHelpers.requests(this); - _.each([[addBookmarkedData, removeBookmarkData], [removeBookmarkData, addBookmarkedData]], function(actionsData) { + var bookmarkedData = [[addBookmarkedData, removeBookmarkData], [removeBookmarkData, addBookmarkedData]]; + _.each(bookmarkedData, function(actionsData) { var firstActionData = actionsData[0]; var secondActionData = actionsData[1]; @@ -110,13 +111,14 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers expect(secondActionData.event).toHaveBeenTriggeredOn(bookmarkButtonView.$el); verifyBookmarkButtonState(bookmarkButtonView, firstActionData.bookmarked); + bookmarkButtonView.undelegateEvents(); }); }); it("shows an error message for HTTP 500", function () { var requests = AjaxHelpers.requests(this), - $messageBanner = $('.coursewide-message-banner'), + $messageBanner = $('.message-banner'), bookmarkButtonView = createBookmarkButtonView(false); bookmarkButtonView.$el.click(); diff --git a/lms/static/js/spec/bookmarks/bookmarks_list_view_spec.js b/lms/static/js/spec/bookmarks/bookmarks_list_view_spec.js index 2f102dac7f..e2ae7ab9d8 100644 --- a/lms/static/js/spec/bookmarks/bookmarks_list_view_spec.js +++ b/lms/static/js/spec/bookmarks/bookmarks_list_view_spec.js @@ -20,7 +20,7 @@ define(['backbone', loadFixtures('js/fixtures/bookmarks/bookmarks.html'); TemplateHelpers.installTemplates( [ - 'templates/message_view', + 'templates/fields/message_banner', 'templates/bookmarks/bookmarks-list' ] ); diff --git a/lms/static/js/spec/main.js b/lms/static/js/spec/main.js index 64e690eca5..5e8fb7413f 100644 --- a/lms/static/js/spec/main.js +++ b/lms/static/js/spec/main.js @@ -66,8 +66,6 @@ '_split': 'js/split', 'mathjax_delay_renderer': 'coffee/src/mathjax_delay_renderer', 'MathJaxProcessor': 'coffee/src/customwmd', - 'moment': 'xmodule_js/common_static/js/src/moment', - 'moment': 'xmodule_js/common_static/js/vendor/moment-with-locales.min', // Manually specify LMS files that are not converted to RequireJS 'history': 'js/vendor/history', @@ -75,7 +73,6 @@ 'js/vendor/jquery.qubit': 'js/vendor/jquery.qubit', 'js/utils/navigation': 'js/utils/navigation', - // Backbone classes loaded explicitly until they are converted to use RequireJS 'js/models/notification': 'js/models/notification', 'js/views/file_uploader': 'js/views/file_uploader', @@ -94,7 +91,7 @@ 'js/bookmarks/views/bookmarks_list_button': 'js/bookmarks/views/bookmarks_list_button', 'js/bookmarks/views/bookmarks_list': 'js/bookmarks/views/bookmarks_list', 'js/bookmarks/views/bookmark_button': 'js/bookmarks/views/bookmark_button', - 'js/views/message': 'js/views/message', + 'js/views/message_banner': 'js/views/message_banner', // edxnotes 'annotator_1.2.9': 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min', @@ -744,11 +741,9 @@ 'lms/include/teams/js/spec/views/topics_spec.js', 'lms/include/teams/js/spec/views/team_profile_header_actions_spec.js', 'lms/include/js/spec/financial-assistance/financial_assistance_form_view_spec.js', - 'lms/include/teams/js/spec/views/team_join_spec.js' - 'lms/include/js/spec/discovery/discovery_spec.js', - 'lms/include/js/spec/ccx/schedule_spec.js', 'lms/include/js/spec/bookmarks/bookmarks_list_view_spec.js', - 'lms/include/js/spec/bookmarks/bookmark_button_view_spec.js' + 'lms/include/js/spec/bookmarks/bookmark_button_view_spec.js', + 'lms/include/js/spec/views/message_banner_spec.js' ]); }).call(this, requirejs, define); diff --git a/lms/static/js/spec/search/search_spec.js b/lms/static/js/spec/search/search_spec.js index 1e23e0849c..975a1c25ad 100644 --- a/lms/static/js/spec/search/search_spec.js +++ b/lms/static/js/spec/search/search_spec.js @@ -361,90 +361,20 @@ define([ expect($('.search-button')).toBeVisible(); } - function rendersSearchResults () { - var searchResults = [{ - location: ['section', 'subsection', 'unit'], - url: '/some/url/to/content', - content_type: 'text', - course_name: '', - excerpt: 'this is a short excerpt' - }]; - this.collection.set(searchResults); - this.collection.latestModelsCount = 1; - this.collection.totalCount = 1; - - this.resultsView.render(); - expect(this.resultsView.$el.find('ol')[0]).toExist(); - expect(this.resultsView.$el.find('li').length).toEqual(1); - expect(this.resultsView.$el).toContainHtml('Search Results'); - expect(this.resultsView.$el).toContainHtml('this is a short excerpt'); - - this.collection.set(searchResults); - this.collection.totalCount = 2; - this.resultsView.renderNext(); - expect(this.resultsView.$el.find('.search-count')).toContainHtml('2'); - expect(this.resultsView.$el.find('li').length).toEqual(2); - } - - function showsMoreResultsLink () { - this.collection.totalCount = 123; - this.collection.hasNextPage = function () { return true; }; - this.resultsView.render(); - expect(this.resultsView.$el.find('a.search-load-next')[0]).toExist(); - - this.collection.totalCount = 123; - this.collection.hasNextPage = function () { return false; }; - this.resultsView.render(); - expect(this.resultsView.$el.find('a.search-load-next')[0]).not.toExist(); - } - - function triggersNextPageEvent () { - var onNext = jasmine.createSpy('onNext'); - this.resultsView.on('next', onNext); - this.collection.totalCount = 123; - this.collection.hasNextPage = function () { return true; }; - this.resultsView.render(); - this.resultsView.$el.find('a.search-load-next').click(); - expect(onNext).toHaveBeenCalled(); - } - - function showsLoadMoreSpinner () { - this.collection.totalCount = 123; - this.collection.hasNextPage = function () { return true; }; - this.resultsView.render(); - expect(this.resultsView.$el.find('a.search-load-next .icon')).toBeHidden(); - this.resultsView.loadNext(); - // toBeVisible does not work with inline - expect(this.resultsView.$el.find('a.search-load-next .icon')).toHaveCss({ 'display': 'inline' }); - this.resultsView.renderNext(); - expect(this.resultsView.$el.find('a.search-load-next .icon')).toBeHidden(); - } - - function beforeEachHelper(SearchResultsView) { - appendSetFixtures( - '
' + - '
' + - '
' + - '
' - ); - - TemplateHelpers.installTemplates([ - 'templates/search/course_search_item', - 'templates/search/dashboard_search_item', - 'templates/search/course_search_results', - 'templates/search/dashboard_search_results', - 'templates/search/search_list', - 'templates/search/search_loading', - 'templates/search/search_error' - ]); - - var MockCollection = Backbone.Collection.extend({ - hasNextPage: function () {}, - latestModelsCount: 0, - pageSize: 20, - latestModels: function () { - return SearchCollection.prototype.latestModels.apply(this, arguments); - } + describe('CourseSearchForm', function () { + beforeEach(function () { + loadFixtures('js/fixtures/search/course_search_form.html'); + this.form = new CourseSearchForm(); + this.onClear = jasmine.createSpy('onClear'); + this.onSearch = jasmine.createSpy('onSearch'); + this.form.on('clear', this.onClear); + this.form.on('search', this.onSearch); + }); + it('trims input string', trimsInputString); + it('handles calls to doSearch', doesSearch); + it('triggers a search event and changes to active state', triggersSearchEvent); + it('clears search when clicking on cancel button', clearsSearchOnCancel); + it('clears search when search box is empty', clearsSearchOnEmpty); }); describe('DashSearchForm', function () { @@ -557,12 +487,12 @@ define([ function beforeEachHelper(SearchResultsView) { appendSetFixtures( - '
' + + '
' + '
' + '
' + '
' ); - + TemplateHelpers.installTemplates([ 'templates/search/course_search_item', 'templates/search/dashboard_search_item', @@ -573,12 +503,6 @@ define([ 'templates/search/search_error' ]); - var courseId = 'a/b/c'; - CourseSearchFactory(courseId); - spyOn(Backbone.history, 'navigate'); - this.$contentElement = $('#course-content'); - this.$searchResults = $('.courseware-results'); - var MockCollection = Backbone.Collection.extend({ hasNextPage: function () {}, latestModelsCount: 0, @@ -749,7 +673,7 @@ define([ beforeEach(function () { loadFixtures('js/fixtures/search/course_search_form.html'); appendSetFixtures( - '
' + + '
' + '
' ); loadTemplates.call(this); @@ -758,7 +682,7 @@ define([ CourseSearchFactory(courseId); spyOn(Backbone.history, 'navigate'); this.$contentElement = $('#course-content'); - this.$searchResults = $('#courseware-search-results'); + this.$searchResults = $('.courseware-results'); }); it('shows loading message on search', showsLoadingMessage); @@ -825,4 +749,4 @@ define([ }); }); -}); +}); \ No newline at end of file diff --git a/lms/static/js/spec/student_profile/learner_profile_factory_spec.js b/lms/static/js/spec/student_profile/learner_profile_factory_spec.js index dbfa7a329c..638a51d48c 100644 --- a/lms/static/js/spec/student_profile/learner_profile_factory_spec.js +++ b/lms/static/js/spec/student_profile/learner_profile_factory_spec.js @@ -8,7 +8,7 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers 'js/student_profile/views/learner_profile_view', 'js/student_profile/views/learner_profile_fields', 'js/student_profile/views/learner_profile_factory', - 'js/views/message' + 'js/views/message_banner' ], function (Backbone, $, _, AjaxHelpers, TemplateHelpers, Helpers, LearnerProfileHelpers, FieldViews, UserAccountModel, UserPreferencesModel, LearnerProfileView, LearnerProfileFields, LearnerProfilePage) { diff --git a/lms/static/js/spec/student_profile/learner_profile_fields_spec.js b/lms/static/js/spec/student_profile/learner_profile_fields_spec.js index 7aad46dab0..694171335c 100644 --- a/lms/static/js/spec/student_profile/learner_profile_fields_spec.js +++ b/lms/static/js/spec/student_profile/learner_profile_fields_spec.js @@ -2,10 +2,10 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers 'js/spec/student_account/helpers', 'js/student_account/models/user_account_model', 'js/student_profile/views/learner_profile_fields', - 'js/views/message' + 'js/views/message_banner' ], function (Backbone, $, _, AjaxHelpers, TemplateHelpers, Helpers, UserAccountModel, LearnerProfileFields, - MessageView) { + MessageBannerView) { 'use strict'; describe("edx.user.LearnerProfileFields", function () { @@ -31,9 +31,8 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers accountSettingsModel.url = Helpers.USER_ACCOUNTS_API_URL; - var messageView = new MessageView({ - el: $('.message-banner'), - templateId: '#message_banner-tpl' + var messageView = new MessageBannerView({ + el: $('.message-banner') }); return new LearnerProfileFields.ProfileImageFieldView({ diff --git a/lms/static/js/spec/student_profile/learner_profile_view_spec.js b/lms/static/js/spec/student_profile/learner_profile_view_spec.js index fae4f3d95d..45cee672da 100644 --- a/lms/static/js/spec/student_profile/learner_profile_view_spec.js +++ b/lms/static/js/spec/student_profile/learner_profile_view_spec.js @@ -7,11 +7,11 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers 'js/student_profile/views/learner_profile_fields', 'js/student_profile/views/learner_profile_view', 'js/student_account/views/account_settings_fields', - 'js/views/message' + 'js/views/message_banner' ], function (Backbone, $, _, AjaxHelpers, TemplateHelpers, Helpers, LearnerProfileHelpers, FieldViews, UserAccountModel, AccountPreferencesModel, LearnerProfileFields, LearnerProfileView, - AccountSettingsFieldViews, MessageView) { + AccountSettingsFieldViews, MessageBannerView) { 'use strict'; describe("edx.user.LearnerProfileView", function () { @@ -45,9 +45,8 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers accountSettingsPageUrl: '/account/settings/' }); - var messageView = new MessageView({ - el: $('.message-banner'), - templateId: '#message_banner-tpl' + var messageView = new MessageBannerView({ + el: $('.message-banner') }); var profileImageFieldView = new LearnerProfileFields.ProfileImageFieldView({ diff --git a/lms/static/js/spec/views/message_banner_spec.js b/lms/static/js/spec/views/message_banner_spec.js index 4ab039893e..109902aace 100644 --- a/lms/static/js/spec/views/message_banner_spec.js +++ b/lms/static/js/spec/views/message_banner_spec.js @@ -1,46 +1,28 @@ -define(['backbone', 'jquery', 'underscore', 'js/views/message', 'js/common_helpers/template_helpers' +define(['backbone', 'jquery', 'underscore', + 'common/js/spec_helpers/template_helpers', 'js/views/message_banner' ], - function (Backbone, $, _, MessageView, TemplateHelpers) { + function (Backbone, $, _, TemplateHelpers, MessageBannerView) { 'use strict'; - describe("MessageView", function () { - - var messageEl = '.message-banner'; + describe("MessageBannerView", function () { beforeEach(function () { setFixtures('
'); TemplateHelpers.installTemplate("templates/fields/message_banner"); - TemplateHelpers.installTemplate("templates/message_view"); }); - var createMessageView = function (messageContainer, templateId) { - return new MessageView({ - el: $(messageContainer), - templateId: templateId + it('renders message correctly', function() { + var messageSelector = '.message-banner'; + var messageView = new MessageBannerView({ + el: $(messageSelector) }); - }; - - it('renders correctly with the /fields/message_banner template', function() { - var messageView = createMessageView(messageSelector, '#message_banner-tpl'); messageView.showMessage('I am message view'); - expect($(messageEl).text().trim()).toBe('I am message view'); + // Verify error message + expect($(messageSelector).text().trim()).toBe('I am message view'); messageView.hideMessage(); - expect($(messageEl).text().trim()).toBe(''); - }); - - it('renders correctly with the /message_view template', function() { - var messageView = createMessageView(messageEl, '#message-tpl'); - var icon = ''; - - messageView.showMessage('I am message view', icon); - - expect($(messageEl).text().trim()).toBe('I am message view'); - expect($(messageEl).html()).toContain(icon); - - messageView.hideMessage(); - expect($(messageEl).text().trim()).toBe(''); + expect($(messageSelector).text().trim()).toBe(''); }); }); }); diff --git a/lms/static/js/student_profile/views/learner_profile_factory.js b/lms/static/js/student_profile/views/learner_profile_factory.js index 614b6b6ca4..a727532ce0 100644 --- a/lms/static/js/student_profile/views/learner_profile_factory.js +++ b/lms/static/js/student_profile/views/learner_profile_factory.js @@ -8,10 +8,10 @@ 'js/student_profile/views/learner_profile_fields', 'js/student_profile/views/learner_profile_view', 'js/student_account/views/account_settings_fields', - 'js/views/message', + 'js/views/message_banner', 'string_utils' ], function (gettext, $, _, Backbone, Logger, AccountSettingsModel, AccountPreferencesModel, FieldsView, - LearnerProfileFieldsView, LearnerProfileView, AccountSettingsFieldViews, MessageView) { + LearnerProfileFieldsView, LearnerProfileView, AccountSettingsFieldViews, MessageBannerView) { return function (options) { @@ -36,9 +36,8 @@ var editable = options.own_profile ? 'toggle' : 'never'; - var messageView = new MessageView({ - el: $('.message-banner'), - templateId: '#message_banner-tpl' + var messageView = new MessageBannerView({ + el: $('.message-banner') }); var accountPrivacyFieldView = new LearnerProfileFieldsView.AccountPrivacyFieldView({ diff --git a/lms/static/js/verify_student/photocapture.js b/lms/static/js/verify_student/photocapture.js deleted file mode 100644 index d60fdf3e99..0000000000 --- a/lms/static/js/verify_student/photocapture.js +++ /dev/null @@ -1,356 +0,0 @@ -var onVideoFail = function(e) { - if(e === 'NO_DEVICES_FOUND') { - $('#no-webcam').show(); - $('#face_capture_button').hide(); - $('#photo_id_capture_button').hide(); - } - else { - console.log('Failed to get camera access!', e); - } -}; - -// Returns true if we are capable of video capture (regardless of whether the -// user has given permission). -function initVideoCapture() { - window.URL = window.URL || window.webkitURL; - navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || - navigator.mozGetUserMedia || navigator.msGetUserMedia; - return !(navigator.getUserMedia === undefined); -} - -var submitReverificationPhotos = function() { - // add photos to the form - $('').attr({ - type: 'hidden', - name: 'face_image', - value: $("#face_image")[0].src, - }).appendTo("#reverify_form"); - $('').attr({ - type: 'hidden', - name: 'photo_id_image', - value: $("#photo_id_image")[0].src, - }).appendTo("#reverify_form"); - - $("#reverify_form").submit(); - -}; - -var submitMidcourseReverificationPhotos = function() { - $('').attr({ - type: 'hidden', - name: 'face_image', - value: $("#face_image")[0].src, - }).appendTo("#reverify_form"); - $("#reverify_form").submit(); -}; - -function showSubmissionError() { - if (xhr.status === 400) { - $('#order-error .copy p').html(xhr.responseText); - } - $('#order-error').show(); - $("html, body").animate({ scrollTop: 0 }); -} - -function submitForm(data) { - for (prop in data) { - $('').attr({ - type: 'hidden', - name: prop, - value: data[prop] - }).appendTo('#pay_form'); - } - $("#pay_form").submit(); -} - -function refereshPageMessage() { - $('#photo-error').show(); - $("html, body").animate({ scrollTop: 0 }); -} - -var submitToPaymentProcessing = function() { - $(".payment-button").addClass('is-disabled').attr('aria-disabled', true); - var contribution_input = $("input[name='contribution']:checked"); - var contribution = 0; - if(contribution_input.attr('id') == 'contribution-other') { - contribution = $("input[name='contribution-other-amt']").val(); - } - else { - contribution = contribution_input.val(); - } - var course_id = $("input[name='course_id']").val(); - $.ajax({ - url: "/verify_student/create_order", - type: 'POST', - data: { - "course_id" : course_id, - "contribution": contribution, - "face_image" : $("#face_image")[0].src, - "photo_id_image" : $("#photo_id_image")[0].src - }, - success:function(data) { - if (data.success) { - submitForm(data); - } else { - refereshPageMessage(); - } - }, - error:function() { - $(".payment-button").removeClass('is-disabled').attr('aria-disabled', false); - showSubmissionError(); - } - }); -}; - -function doResetButton(resetButton, captureButton, approveButton, nextButtonNav, nextLink) { - approveButton.removeClass('approved'); - nextButtonNav.addClass('is-not-ready'); - nextLink.attr('href', "#"); - - captureButton.show(); - resetButton.hide(); - approveButton.hide(); -} - -function doApproveButton(approveButton, nextButtonNav, nextLink) { - nextButtonNav.removeClass('is-not-ready'); - approveButton.addClass('approved'); - nextLink.attr('href', "#next"); -} - -function doSnapshotButton(captureButton, resetButton, approveButton) { - captureButton.hide(); - resetButton.show(); - approveButton.show(); -} - -function submitNameChange(event) { - event.preventDefault(); - $("#lean_overlay").fadeOut(200); - $("#edit-name").css({ 'display' : 'none' }); - var full_name = $('input[name="name"]').val(); - var xhr = $.post( - "/change_name", - { - "new_name" : full_name, - "rationale": "Want to match ID for ID Verified Certificates." - }, - function() { - $('#full-name').html(full_name); - } - ) - .fail(function(jqXhr) { - $('.message-copy').html(jqXhr.responseText); - }); - -} - -function initSnapshotHandler(names, hasHtml5CameraSupport) { - var name = names.pop(); - if (name == undefined) { - return; - } - - var video = $('#' + name + '_video'); - var canvas = $('#' + name + '_canvas'); - var image = $('#' + name + "_image"); - var captureButton = $("#" + name + "_capture_button"); - var resetButton = $("#" + name + "_reset_button"); - var approveButton = $("#" + name + "_approve_button"); - var nextButtonNav = $("#" + name + "_next_button_nav"); - var nextLink = $("#" + name + "_next_link"); - var flashCapture = $("#" + name + "_flash"); - - var ctx = null; - if (hasHtml5CameraSupport) { - ctx = canvas[0].getContext('2d'); - } - - var localMediaStream = null; - - function snapshot(event) { - if (hasHtml5CameraSupport) { - if (localMediaStream) { - ctx.drawImage(video[0], 0, 0); - image[0].src = canvas[0].toDataURL('image/png'); - } - else { - return false; - } - video[0].pause(); - } - else { - if (flashCapture[0].cameraAuthorized()) { - image[0].src = flashCapture[0].snap(); - } - else { - return false; - } - } - - doSnapshotButton(captureButton, resetButton, approveButton); - return false; - } - - function reset() { - image[0].src = ""; - - if (hasHtml5CameraSupport) { - video[0].play(); - } - else { - flashCapture[0].reset(); - } - - doResetButton(resetButton, captureButton, approveButton, nextButtonNav, nextLink); - return false; - } - - function approve() { - doApproveButton(approveButton, nextButtonNav, nextLink); - return false; - } - - // Initialize state for this picture taker - captureButton.show(); - resetButton.hide(); - approveButton.hide(); - nextButtonNav.addClass('is-not-ready'); - nextLink.attr('href', "#"); - - // Connect event handlers... - video.click(snapshot); - captureButton.click(snapshot); - resetButton.click(reset); - approveButton.click(approve); - - // If it's flash-based, we can just immediate initialize the next one. - // If it's HTML5 based, we have to do it in the callback from getUserMedia - // so that Firefox doesn't eat the second request. - if (hasHtml5CameraSupport) { - navigator.getUserMedia({video: true}, function(stream) { - video[0].src = window.URL.createObjectURL(stream); - localMediaStream = stream; - - // We do this in a recursive call on success because Firefox seems to - // simply eat the request if you stack up two on top of each other before - // the user has a chance to approve the first one. - // - // This appears to be necessary for older versions of Firefox (before 28). - // For more info, see https://github.com/edx/edx-platform/pull/3053 - initSnapshotHandler(names, hasHtml5CameraSupport); - }, onVideoFail); - } - else { - initSnapshotHandler(names, hasHtml5CameraSupport); - } - -} - -function browserHasFlash() { - var hasFlash = false; - try { - var fo = new ActiveXObject('ShockwaveFlash.ShockwaveFlash'); - if(fo) hasFlash = true; - } catch(e) { - if(navigator.mimeTypes["application/x-shockwave-flash"] != undefined) hasFlash = true; - } - return hasFlash; -} - -function objectTagForFlashCamera(name) { - // detect whether or not flash is available - if(browserHasFlash()) { - // I manually update this to have ?v={2,3,4, etc} to avoid caching of flash - // objects on local dev. - return ''; - } - else { - // display a message informing the user to install flash - $('#no-flash').show(); - } -} - -function waitForFlashLoad(func, flash_object) { - if(!flash_object.hasOwnProperty('percentLoaded') || flash_object.percentLoaded() < 100){ - setTimeout(function() { - waitForFlashLoad(func, flash_object); - }, - 50); - } - else { - func(flash_object); - } -} - -$(document).ready(function() { - $(".carousel-nav").addClass('sr'); - $(".payment-button").click(function(){ - analytics.pageview("Payment Form"); - submitToPaymentProcessing(); - }); - - $("#reverify_button").click(function() { - submitReverificationPhotos(); - }); - - $("#midcourse_reverify_button").click(function() { - submitMidcourseReverificationPhotos(); - }); - - // prevent browsers from keeping this button checked - $("#confirm_pics_good").prop("checked", false); - $("#confirm_pics_good").change(function() { - $(".payment-button").toggleClass('disabled'); - $("#reverify_button").toggleClass('disabled'); - $("#midcourse_reverify_button").toggleClass('disabled'); - }); - - - // add in handlers to add/remove the correct classes to the body - // when moving between steps - $('#face_next_link').click(function(){ - analytics.pageview("Capture ID Photo"); - $('#photo-error').hide(); - $('body').addClass('step-photos-id').removeClass('step-photos-cam'); - }); - - $('#photo_id_next_link').click(function(){ - analytics.pageview("Review Photos"); - $('body').addClass('step-review').removeClass('step-photos-id'); - }); - - // set up edit information dialog - $('#edit-name div[role="alert"]').hide(); - $('#edit-name .action-save').click(submitNameChange); - - var hasHtml5CameraSupport = initVideoCapture(); - - // If HTML5 WebRTC capture is not supported, we initialize jpegcam - if (!hasHtml5CameraSupport) { - $("#face_capture_div").html(objectTagForFlashCamera("face_flash")); - $("#photo_id_capture_div").html(objectTagForFlashCamera("photo_id_flash")); - // wait for the flash object to be loaded and then check for a camera - if(browserHasFlash()) { - waitForFlashLoad(function(flash_object) { - if(!flash_object.hasOwnProperty('hasCamera')){ - onVideoFail('NO_DEVICES_FOUND'); - } - }, $('#face_flash')[0]); - } - } - - analytics.pageview("Capture Face Photo"); - initSnapshotHandler(["photo_id", "face"], hasHtml5CameraSupport); - - $('a[rel="external"]').attr({ - title: gettext('This link will open in a new browser window/tab'), - target: '_blank' - }); - -}); diff --git a/lms/static/js/views/message.js b/lms/static/js/views/message_banner.js similarity index 81% rename from lms/static/js/views/message.js rename to lms/static/js/views/message_banner.js index 714ae2d2fd..867fbbba99 100644 --- a/lms/static/js/views/message.js +++ b/lms/static/js/views/message_banner.js @@ -17,17 +17,15 @@ if (_.isUndefined(this.message) || _.isNull(this.message)) { this.$el.html(''); } else { - this.$el.html(this.template({ - message: this.message, - icon: this.icon - })); + this.$el.html(_.template(messageBannerTemplate, _.extend(this.options, { + message: this.message + }))); } return this; }, - showMessage: function (message, icon) { + showMessage: function (message) { this.message = message; - this.icon = icon; this.render(); }, diff --git a/lms/static/js_test.yml b/lms/static/js_test.yml index 5c231b6cb0..0958b68d93 100644 --- a/lms/static/js_test.yml +++ b/lms/static/js_test.yml @@ -62,7 +62,6 @@ lib_paths: - xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js - xmodule_js/common_static/js/test/i18n.js - xmodule_js/common_static/js/vendor/date.js - - xmodule_js/common_static/js/vendor/moment-with-locales.min.js - xmodule_js/common_static/js/vendor/moment.min.js - xmodule_js/common_static/js/vendor/moment-with-locales.min.js - xmodule_js/common_static/common/js/utils/edx.utils.validate.js @@ -117,7 +116,6 @@ fixture_paths: - support/templates - js/fixtures/bookmarks - templates/bookmarks - - templates/message_view.underscore requirejs: paths: diff --git a/lms/static/lms/js/build.js b/lms/static/lms/js/build.js index b74cd161a6..75ccb6964e 100644 --- a/lms/static/lms/js/build.js +++ b/lms/static/lms/js/build.js @@ -33,6 +33,7 @@ 'teams/js/teams_tab_factory', 'support/js/certificates_factory', 'support/js/enrollment_factory', + 'js/bookmarks/bookmarks_factory' ]), /** diff --git a/lms/static/require-config-lms.js b/lms/static/require-config-lms.js deleted file mode 100644 index caee0ac59b..0000000000 --- a/lms/static/require-config-lms.js +++ /dev/null @@ -1,168 +0,0 @@ -;(function (require, define) { - var paths = {}, config; - - // jquery, underscore, gettext, URI, tinymce, or jquery.tinymce may already - // have been loaded and we do not want to load them a second time. Check if - // it is the case and use the global var instead. - if (window.jQuery) { - define("jquery", [], function() {return window.jQuery;}); - } else { - paths.jquery = "js/vendor/jquery.min"; - } - if (window._) { - define("underscore", [], function() {return window._;}); - } else { - paths.jquery = "js/vendor/underscore-min"; - } - if (window.gettext) { - define("gettext", [], function() {return window.gettext;}); - } else { - paths.gettext = "/i18n"; - } - if (window.Logger) { - define("logger", [], function() {return window.Logger;}); - } else { - paths.logger = "js/src/logger"; - } - if (window.URI) { - define("URI", [], function() {return window.URI;}); - } else { - paths.URI = "js/vendor/URI.min"; - } - if (window.tinymce) { - define('tinymce', [], function() {return window.tinymce;}); - } else { - paths.tinymce = "js/vendor/tinymce/js/tinymce/tinymce.full.min"; - } - if (window.jquery && window.jquery.tinymce) { - define("jquery.tinymce", [], function() {return window.jquery.tinymce;}); - } else { - paths.tinymce = "js/vendor/tinymce/js/tinymce/jquery.tinymce.min"; - } - - config = { - // NOTE: baseUrl has been previously set in lms/static/templates/main.html - waitSeconds: 60, - paths: { - "annotator_1.2.9": "js/vendor/edxnotes/annotator-full.min", - "date": "js/vendor/date", - "text": 'js/vendor/requirejs/text', - "backbone": "js/vendor/backbone-min", - "backbone-super": "js/vendor/backbone-super", - "backbone.paginator": "js/vendor/backbone.paginator.min", - "underscore.string": "js/vendor/underscore.string.min", - // Files needed by OVA - "annotator": "js/vendor/ova/annotator-full", - "annotator-harvardx": "js/vendor/ova/annotator-full-firebase-auth", - "video.dev": "js/vendor/ova/video.dev", - "vjs.youtube": 'js/vendor/ova/vjs.youtube', - "rangeslider": 'js/vendor/ova/rangeslider', - "share-annotator": 'js/vendor/ova/share-annotator', - "richText-annotator": 'js/vendor/ova/richText-annotator', - "reply-annotator": 'js/vendor/ova/reply-annotator', - "grouping-annotator": 'js/vendor/ova/grouping-annotator', - "tags-annotator": 'js/vendor/ova/tags-annotator', - "diacritic-annotator": 'js/vendor/ova/diacritic-annotator', - "flagging-annotator": 'js/vendor/ova/flagging-annotator', - "jquery-Watch": 'js/vendor/ova/jquery-Watch', - "openseadragon": 'js/vendor/ova/openseadragon', - "osda": 'js/vendor/ova/OpenSeaDragonAnnotation', - "ova": 'js/vendor/ova/ova', - "catch": 'js/vendor/ova/catch/js/catch', - "handlebars": 'js/vendor/ova/catch/js/handlebars-1.1.2', - "moment": "js/vendor/moment-with-locales.min" - // end of files needed by OVA - }, - shim: { - "annotator_1.2.9": { - deps: ["jquery"], - exports: "Annotator" - }, - "date": { - exports: "Date" - }, - "jquery": { - exports: "$" - }, - "underscore": { - exports: "_" - }, - "backbone": { - deps: ["underscore", "jquery"], - exports: "Backbone" - }, - "backbone.paginator": { - deps: ["backbone"], - exports: "Backbone.Paginator" - }, - "backbone-super": { - deps: ["backbone"] - }, - "logger": { - exports: "Logger" - }, - // Needed by OVA - "video.dev": { - exports:"videojs" - }, - "vjs.youtube": { - deps: ["video.dev"] - }, - "rangeslider": { - deps: ["video.dev"] - }, - "annotator": { - exports: "Annotator" - }, - "annotator-harvardx":{ - deps: ["annotator"] - }, - "share-annotator": { - deps: ["annotator"] - }, - "richText-annotator": { - deps: ["annotator", "tinymce"] - }, - "reply-annotator": { - deps: ["annotator"] - }, - "tags-annotator": { - deps: ["annotator"] - }, - "diacritic-annotator": { - deps: ["annotator"] - }, - "flagging-annotator": { - deps: ["annotator"] - }, - "grouping-annotator": { - deps: ["annotator"] - }, - "ova": { - exports: "ova", - deps: [ - "annotator", "annotator-harvardx", "video.dev", "vjs.youtube", "rangeslider", "share-annotator", - "richText-annotator", "reply-annotator", "tags-annotator", "flagging-annotator", - "grouping-annotator", "diacritic-annotator", "jquery-Watch", "catch", "handlebars", "URI" - ] - }, - "osda": { - exports: "osda", - deps: [ - "annotator", "annotator-harvardx", "video.dev", "vjs.youtube", "rangeslider", "share-annotator", - "richText-annotator", "reply-annotator", "tags-annotator", "flagging-annotator", - "grouping-annotator", "diacritic-annotator", "openseadragon", "jquery-Watch", "catch", "handlebars", - "URI" - ] - } - // End of needed by OVA - } - }; - - for (var key in paths) { - if ({}.hasOwnProperty.call(paths, key)) { - config.paths[key] = paths[key]; - } - } - require.config(config); -}).call(this, require || RequireJS.require, define || RequireJS.define); diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 648afa28a4..2b64753d47 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -25,12 +25,6 @@ ${page_title_breadcrumbs(course_name())} <%block name="header_extras"> -% for template_name in ["message_banner"]: - -% endfor - % for template_name in ["image-modal"]: -% endfor - -% for template_name in ["message_view"]: - -% endfor - <%block name="headextra"> @@ -92,11 +74,15 @@ ${page_title_breadcrumbs(course_name())} <%static:js group='discussion'/> % if settings.FEATURES.get('ENABLE_COURSEWARE_SEARCH'): <%static:require_module module_name="js/search/course/course_search_factory" class_name="CourseSearchFactory"> - var courseId = $('#courseware-search-results').data('courseId'); + var courseId = $('.courseware-results').data('courseId'); CourseSearchFactory(courseId); % endif + <%static:require_module module_name="js/bookmarks/bookmarks_factory" class_name="BookmarksFactory"> + BookmarksFactory(); + + <%include file="../discussion/_js_body_dependencies.html" /> % if staff_access: <%include file="xqa_interface.html"/> @@ -131,7 +117,7 @@ ${fragment.foot_html()} -
+
% if default_tab: <%include file="/courseware/course_navigation.html" /> @@ -144,17 +130,6 @@ ${fragment.foot_html()} % if disable_accordion is UNDEFINED or not disable_accordion:
- % if settings.FEATURES.get('ENABLE_COURSEWARE_SEARCH'): -