Fix bug: tooltips for descriptions are not shown after a board refresh

nickbe · Apr 11, 2015 · 05b1cfd · 05b1cfd
1 parent d3727e9
commit 05b1cfd
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php
@@ -27,7 +27,7 @@
 
         <?= $this->e($column['title']) ?>
 
-        <?php if (! empty($column['description'])): ?>
+        <?php if (! $not_editable && ! empty($column['description'])): ?>
             <span class="column-tooltip pull-right" title='<?= $this->e($this->markdown($column['description'])) ?>'>
                 <i class="fa fa-info-circle"></i>
             </span>

diff --git a/assets/js/app.js b/assets/js/app.js
diff --git a/assets/js/src/base.js b/assets/js/src/base.js
@@ -189,29 +189,6 @@ var Kanboard = (function() {
                 $('#board-selector').trigger('chosen:open');
             });
 
-            // Tooltip for column description
-            $(".column-tooltip").tooltip({
-                content: function() {
-                    return '<div class="markdown">' + $(this).attr("title") + '</div>';
-                },
-                position: {
-                    my: 'left-20 top',
-                    at: 'center bottom+9',
-                    using: function(position, feedback) {
-
-                        $(this).css(position);
-
-                        var arrow_pos = feedback.target.left + feedback.target.width / 2 - feedback.element.left - 20;
-
-                        $("<div>")
-                            .addClass("tooltip-arrow")
-                            .addClass(feedback.vertical)
-                            .addClass(arrow_pos == 0 ? "align-left" : "align-right")
-                            .appendTo(this);
-                    }
-                }
-            });
-
             $.datepicker.setDefaults($.datepicker.regional[$("body").data("js-lang")]);
 
             Kanboard.InitAfterAjax();
@@ -263,6 +240,29 @@ var Kanboard = (function() {
                     }
                 });
             }
+
+            // Tooltip for column description
+            $(".column-tooltip").tooltip({
+                content: function() {
+                    return '<div class="markdown">' + $(this).attr("title") + '</div>';
+                },
+                position: {
+                    my: 'left-20 top',
+                    at: 'center bottom+9',
+                    using: function(position, feedback) {
+
+                        $(this).css(position);
+
+                        var arrow_pos = feedback.target.left + feedback.target.width / 2 - feedback.element.left - 20;
+
+                        $("<div>")
+                            .addClass("tooltip-arrow")
+                            .addClass(feedback.vertical)
+                            .addClass(arrow_pos == 0 ? "align-left" : "align-right")
+                            .appendTo(this);
+                    }
+                }
+            });
         }
     };