cleaning up

bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy

@@ -140,7 +140,6 @@ class PresentationService {
 		
 		if (presDir.exists()) {
 			File pres = new File(presDir.getAbsolutePath() + File.separatorChar + testUploadedPresentation)
-			log.warn "\n\n333 " + pres.toString();
 			if (pres.exists()) {
 				UploadedPresentation uploadedPres = new UploadedPresentation(testConferenceMock, testRoomMock, testPresentationName);
 				uploadedPres.setUploadedFile(pres);

labs/meteor-client/client/globals.coffee

@@ -124,7 +124,7 @@ Handlebars.registerHelper "getShapesForSlide", ->
   currentSlide = Meteor.Slides.findOne({"presentationId": presentationId, "slide.current": true})
   # try to reuse the lines above
   Meteor.Shapes.find({whiteboardId: currentSlide?.slide?.id}).fetch()
- 
+
 # Starts the entire logout procedure.
 # meeting: the meeting the user is in
 # the user's userId

labs/meteor-client/client/views/whiteboard/slide.coffee

@@ -21,18 +21,13 @@ Template.slide.helpers
 
 #### SHAPE ####
 Template.shape.rendered = ->
-  # @data is the shape object
-  shape = @data
-
-  shapeType = shape.shape?.shape?.type
-  data2 = shape.shape?.shape # TODO change some of these!!
+  # @data is the shape object coming from the {{#each}} in the html file
+  shapeInfo = @data.shape?.shape
+  shapeType = shapeInfo?.type
 
   for num in [0..3] # the coordinates must be in the range 0 to 1
-    data2.points[num] = data2.points[num] / 100
+    shapeInfo.points[num] = shapeInfo.points[num] / 100
 
   wpm = Template.slide.whiteboardPaperModel
-  wpm.makeShape(shapeType, data2)
-  wpm.updateShape(shapeType, data2)
-
-
-
+  wpm.makeShape(shapeType, shapeInfo)
+  wpm.updateShape(shapeType, shapeInfo)