Skip to content

Commit b375cc0

Browse files
author
Jason White
committed
committing before merging local stash
1 parent 9bb1cb8 commit b375cc0

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/main/webapp/WEB-INF/pages/main_new.jsp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@
149149
<span class="glyphicon-class glyphicon glyphicon-circle-arrow-left" id="showPrevHintBtn" ng-click="viewPrevHint()"></span>
150150
<span class="glyphicon-class glyphicon glyphicon-circle-arrow-right" id="showNextHintBtn" ng-click="viewNextHint()"></span>
151151
<br/>
152-
{{curHint}}
152+
153+
<span id="curHintContainer"></span><!--{{curHint}}-->
153154
</div>
154155
</div>
155156
</div>

src/main/webapp/js/goatControllers.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/** Lesson Controller (includes menu stuff)
77
* prepares and updates menu topic items for the view
88
*/
9-
goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCache) {
9+
goat.controller('goatLesson', function($scope, $http, $modal, $log, $sce) { //$templateCache
1010
$scope.cookies = [];
1111
$scope.params = [];
1212
//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
128128

129129
$('.lessonHelp').hide();
130130
$('#lesson_hint_row').show();
131-
goat.utils.scrollToHelp();
131+
//goat.utils.scrollToHelp();
132+
//TODO
132133
$scope.curHint = $scope.hints[$scope.hintIndex].hint;
134+
//$scope.curHint = $sce.trustAsHtml($scope.hints[$scope.hintIndex].hint);
135+
//TODO get html binding workin in the UI ... in the meantime ...
136+
$scope.renderCurHint();
133137
$scope.manageHintButtons();
134138
};
135139

136140
$scope.viewNextHint = function() {
137141
$scope.hintIndex++;
138142
$scope.curHint = $scope.hints[$scope.hintIndex].hint;
143+
$scope.renderCurHint();
139144
$scope.manageHintButtons();
140145
};
141146

142147
$scope.viewPrevHint = function() {
143148
$scope.hintIndex--;
144149
$scope.curHint = $scope.hints[$scope.hintIndex].hint;
150+
$scope.renderCurHint();
145151
$scope.manageHintButtons();
146152
};
153+
154+
$scope.renderCurHint = function() {
155+
$('#curHintContainer').html($scope.curHint);
156+
}
147157

148158
$scope.hideHints = function() {
149159

0 commit comments

Comments
 (0)