Merge pull request #9 from misfir3/master

Initial cut-over of backbone port
This commit is contained in:
misfir3
2015-07-13 08:55:20 -04:00
50 changed files with 12428 additions and 344 deletions

View File

@ -551,7 +551,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
* return "*.do"-styled paths.</p>
*/
protected String getPath() {
return "attack";
return "#attack";
}
/**
@ -563,13 +563,9 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
StringBuffer link = new StringBuffer();
// mvc update:
link.append(getPath()).append("?");
link.append(WebSession.SCREEN);
link.append("=");
link.append(getPath()).append("/");
link.append(getScreenId());
link.append("&");
link.append(WebSession.MENU);
link.append("=");
link.append("/");
link.append(getCategory().getRanking());
return link.toString();
}

View File

@ -198,9 +198,9 @@ public abstract class Screen {
// hook all the links
public String getContent() {
String makeAllAjax = "<script>goat.utils.makeFormsAjax();goat.utils.ajaxifyAttackHref();</script>";
//String makeAllAjax = "<script>goat.utils.makeFormsAjax();goat.utils.ajaxifyAttackHref();</script>";
// need to do this here as some of the lessons render forms after submission of an ajax form
return (content == null) ? "" : content.toString() + makeAllAjax;
return (content == null) ? "" : content.toString();// + makeAllAjax;
}
/**