Merge branch 'tooltip_contents' into dev

resources/static/dialog/resources/tooltip.js

@@ -45,7 +45,7 @@ BrowserID.Tooltip = (function() {
   function createTooltip(el) {
       var contents = el.html();
       var template = $("#templateTooltip").html();
-      _.templatesettings = {
+      _.templateSettings = {
           interpolate : /\{\{(.+?)\}\}/g
       };
       var tooltip = $(_.template(template, {
@@ -89,7 +89,6 @@ BrowserID.Tooltip = (function() {
       positionTooltip(tooltip, target);
 
       animateTooltip(tooltip, function() {
-        console.log("close tooltip");
         if (tooltip) {
           tooltip.remove();
           tooltip = null;

resources/static/test/qunit.html

@@ -70,7 +70,7 @@
     </script>
 
     <script type="text/html" id="templateTooltip">
-      <div class="tooltip">
+      <div class="tooltip" id="createdTooltip">
         {{ contents }}
       </div>
     </script>

resources/static/test/qunit/resources/tooltip_unit_test.js

@@ -52,7 +52,6 @@ steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/tooltip", func
     var startTime = new Date().getTime();
 
     tooltip.showTooltip("#shortTooltip", function() {
-      console.log("calling tooltip back");
       var endTime = new Date().getTime();
       var diff = endTime - startTime;
       ok(2000 <= diff && diff <= 3000, diff + " - minimum of 2 seconds, max of 3 seconds");
@@ -60,6 +59,11 @@ steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/tooltip", func
       start();
     });
 
+    var el = $("#createdTooltip");
+    equal(el.length, 1, "one tooltip created");
+    var contents = el.html() || "";
+    equal(contents.indexOf("contents") === -1, true, "contents have been replaced");
+
     stop();
   });