From b375cc091fc4a0d384be6ed23babab3b4a47333c Mon Sep 17 00:00:00 2001 From: Jason White Date: Mon, 15 Sep 2014 09:35:39 -0400 Subject: [PATCH] committing before merging local stash --- src/main/webapp/WEB-INF/pages/main_new.jsp | 3 ++- src/main/webapp/js/goatControllers.js | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/pages/main_new.jsp b/src/main/webapp/WEB-INF/pages/main_new.jsp index 5b1f68b56..286d2e5f9 100644 --- a/src/main/webapp/WEB-INF/pages/main_new.jsp +++ b/src/main/webapp/WEB-INF/pages/main_new.jsp @@ -149,7 +149,8 @@
- {{curHint}} + + diff --git a/src/main/webapp/js/goatControllers.js b/src/main/webapp/js/goatControllers.js index 8af941dc6..e472509f5 100644 --- a/src/main/webapp/js/goatControllers.js +++ b/src/main/webapp/js/goatControllers.js @@ -6,7 +6,7 @@ /** Lesson Controller (includes menu stuff) * prepares and updates menu topic items for the view */ -goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCache) { +goat.controller('goatLesson', function($scope, $http, $modal, $log, $sce) { //$templateCache $scope.cookies = []; $scope.params = []; //TODO: implement via separate promise and use config for menu (goat.data.loadMenuData()) @@ -128,22 +128,32 @@ goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCac $('.lessonHelp').hide(); $('#lesson_hint_row').show(); - goat.utils.scrollToHelp(); + //goat.utils.scrollToHelp(); + //TODO $scope.curHint = $scope.hints[$scope.hintIndex].hint; + //$scope.curHint = $sce.trustAsHtml($scope.hints[$scope.hintIndex].hint); + //TODO get html binding workin in the UI ... in the meantime ... + $scope.renderCurHint(); $scope.manageHintButtons(); }; $scope.viewNextHint = function() { $scope.hintIndex++; $scope.curHint = $scope.hints[$scope.hintIndex].hint; + $scope.renderCurHint(); $scope.manageHintButtons(); }; $scope.viewPrevHint = function() { $scope.hintIndex--; $scope.curHint = $scope.hints[$scope.hintIndex].hint; + $scope.renderCurHint(); $scope.manageHintButtons(); }; + + $scope.renderCurHint = function() { + $('#curHintContainer').html($scope.curHint); + } $scope.hideHints = function() {