clean up and update js

webgoat-container/src/main/resources/static/js/goatApp/controller/LessonController.js

@@ -1,6 +1,6 @@
 define(['jquery',
     'underscore',
-    'libs/backbone',
+    'backbone',
     'goatApp/model/LessonContentModel',
     'goatApp/view/LessonContentView',
     'goatApp/view/HintView',

webgoat-container/src/main/resources/static/js/goatApp/goatApp.js

@@ -1,3 +1,7 @@
+/*
+ * This JavaScript is used to load a Backbone router which is defined by GoatRouter.js
+ */
+
 define(['jquery',
         'underscore',
         'backbone',
@@ -15,10 +19,11 @@ define(['jquery',
             initApp: function () {
                 var locale = localStorage.getItem('locale') || 'en';
                 $.getJSON('service/labels.mvc', function(data) {
-                    window.polyglot = new Polyglot({phrases: data});
+                    window.polyglot = new Polyglot({phrases: data});//i18n polyglot labels
                     asyncErrorHandler.init();
-                    var goatRouter = new Router();
-                });
+                    console.log('about to create app router');//default js
+                    var goatRouter = new Router();//backbone router
+                });//jquery
 
             }
         };

webgoat-container/src/main/resources/static/js/goatApp/view/GoatRouter.js

@@ -1,6 +1,11 @@
+/*
+ * Define the libraries that are used by the GoatRouter script. All define '' names should refer to the
+ * names in the main.js require.config paths name parts.
+ * The names of the function arguments is used as the object returned from loading the specified framework.
+ */
+
 define(['jquery',
-    'libs/jquery-vuln',
-    'jqueryui',
+	'libs/jquery-vuln',
     'underscore',
     'backbone',
     'goatApp/controller/LessonController',
@@ -8,9 +13,8 @@ define(['jquery',
     'goatApp/view/LessonContentView',
     'goatApp/view/MenuView',
     'goatApp/view/TitleView'
-], function ($,
-             $vuln,
-             jqueryui,
+], function (jquery,
+             jqueryvuln,
              _,
              Backbone,
              LessonController,
@@ -20,20 +24,23 @@ define(['jquery',
              TitleView) {
 
     function getContentElement() {
-        return $('#main-content');
+        return jquery('#main-content');
     };
 
     function render(view) {
-        $('div.pages').hide();
+    	jquery('div.pages').hide();
         //TODO this works for now because we only have one page we should rewrite this a bit
         if (view != null) {
-            $('#report-card-page').show();
+        	jquery('#report-card-page').show();
         } else {
-            $('#lesson-title').show();
-            $('#lesson-page').show();
+        	jquery('#lesson-title').show();
+        	jquery('#lesson-page').show();
         }
     };
 
+    /*
+     * Definition of Goat App Router.
+     */
     var GoatAppRouter = Backbone.Router.extend({
 
          routes: {
@@ -49,8 +56,8 @@ define(['jquery',
         titleView: null,
 
         setUpCustomJS: function () {
-            webgoat.customjs.jquery = $; //passing jquery into custom js scope ... still klunky, but works for now
-            webgoat.customjs.jqueryVuln = $vuln;
+            webgoat.customjs.jquery = jquery; //passing jquery into custom js scope ... still klunky, but works for now
+            webgoat.customjs.jqueryVuln = jqueryvuln;//ui;//$vuln;
 
             // shim to support xss lesson
             webgoat.customjs.phoneHome = function (e) {
@@ -72,7 +79,11 @@ define(['jquery',
 
         },
 
+        /* 
+         * Constructor of Goat App Router invoked by goatApp.js new Router().
+         */
         initialize: function () {
+        	console.log('initialize goat app router');
             this.menuController = new MenuController({menuView: new MenuView()});
             this.titleView = new TitleView();
             this.lessonController = new LessonController({lessonContentView: new LessonContentView(), titleView: this.titleView}),

webgoat-container/src/main/resources/static/js/html5shiv.js

@@ -1,8 +0,0 @@
-/*
- HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
-a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>";
-c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
-"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
-if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);

webgoat-container/src/main/resources/static/js/libs/jquery-base.js

@@ -1,7 +1,7 @@
 // AMD (Asynchronous Module Definition) wrapper for jQuery 1.8
 define([
     // Load the jQuery source file
-    '/WebGoat/js/libs/jquery-2.2.4.min.js'
+    '/WebGoat/js/libs/jquery.min.js'
     ],
     function(){
         // Tell Require.js that this module returns a reference to jQuery

webgoat-container/src/main/resources/static/js/main.js

@@ -10,11 +10,22 @@ js/main.js << main file for require.js
 --/goatApp/controller
 */
 
+/**
+ * Main configuration for RequireJS. Referred to from Spring MVC /start.mvc using main_new.html template.
+ * baseURL is the base path of all JavaScript libraries.
+ * paths refers to the JavaScript Libraries that we want to use. A name and relative path is used. Extension .js is not required.
+ * 
+ * jquery is a library that can easily access all objects on the HTML page.
+ * jquery-ui is an UI extension on jquery and adds stuff like dialog boxes.
+ * underscore contains a library of helper methods.
+ * backbone contains models, events, key value bindings. Depends on jQuery and underscore
+ * polyglot is a tiny i18n helper library
+ */
 require.config({
   baseUrl: "js/",
   paths: {
-    jquery: 'libs/jquery-2.2.4.min',
-    jqueryui: 'libs/jquery-ui-1.10.4',
+    jquery: 'libs/jquery.min',
+    jqueryui: 'libs/jquery-ui.min',
     underscore: 'libs/underscore-min',
     backbone: 'libs/backbone-min',
     text: 'libs/text',
@@ -23,14 +34,15 @@ require.config({
   },
 
   map: {
-    'libs/jquery-base' : {'jquery':'libs/jquery-2.2.4.min'},
-    'libs/jquery-vuln' : {'jquery':'libs/jquery-2.1.4.min'}
+	    'libs/jquery-base' : {'jquery':'libs/jquery.min'},
+	    'libs/jquery-vuln' : {'jquery':'libs/jquery-2.1.4.min'}
   },
 
+
   shim: {
 	"jqueryui": {
 	  exports:"$",
-	  deps: ['libs/jquery-2.1.4.min']
+	  deps: ['libs/jquery-base']
 	},
     underscore: {
       exports: "_"
@@ -42,6 +54,16 @@ require.config({
   }
 });
 
-require(['jquery','libs/jquery-base','libs/jquery-vuln','jqueryui', 'underscore','backbone','goatApp/goatApp'], function($,jqueryBase,jqueryVuln,jqueryui,_,Backbone,Goat){
+/*
+ * Load and init the GoatApp. which is added here as a ADM asynchronous module definition.
+ */
+require([
+	'jquery',
+	'libs/jquery-base',
+	'libs/jquery-vuln',
+	'jqueryui', 
+	'underscore',
+	'backbone',
+	'goatApp/goatApp'], function($,jqueryBase,jqueryVuln,jqueryui,_,Backbone,Goat){
     Goat.initApp();
 });

webgoat-container/src/main/resources/static/js/respond.min.js

@@ -1,5 +0,0 @@
-/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
- * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
- *  */
-
-!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);

webgoat-container/src/main/resources/templates/main_new.html

@@ -7,14 +7,6 @@
     <meta http-equiv="Cache-Control" CONTENT="no-cache"/>
     <meta http-equiv="Cache-Control" CONTENT="no-store"/>
 
-    <!--[if lt IE 7]>
-    <id class="no-js lt-ie9 lt-ie8 lt-ie7"/> <![endif]-->
-    <!--[if IE 7]>
-    <id class="no-js lt-ie9 lt-ie8"/> <![endif]-->
-    <!--[if IE 8]>
-    <id class="no-js lt-ie9"/> <![endif]-->
-    <!--[if gt IE 8]><!-->
-
     <!--  CSS -->
     <link rel="shortcut icon" th:href="@{/images/favicon.ico}" type="image/x-icon"/>
 
@@ -27,16 +19,10 @@
     <!--  end of CSS -->
 
     <!-- JS -->
-
-    <script src="js/modernizr-2.6.2.min.js"></script>
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-    <script src="js/respond.min.js"></script>
-    <![endif]-->
+    <!-- <script src="js/modernizr.min.js"></script>-->
 
     <!-- Require.js used to load js asynchronously -->
-    <script src="js/libs/require.min.js" data-main="js/main.js"></script>
+    <script src="js/libs/require.min.js" data-main="js/main"></script>
     <meta http-equiv="Content-Type" content="text/id; charset=ISO-8859-1"/>
     <title>WebGoat</title>
 </head>