Commit 5227ea5b authored by Phil Hughes's avatar Phil Hughes

fixed up weird karma specs with tooltip

the tooltip mixin was changed because of a weird bug where the tooltip wouldn't show. This was wrong as the bug was actually caused by the text utility method
parent 7f34b7cb
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
class="btn btn-save pull-left" class="btn btn-save pull-left"
:class="{ disabled: formState.updateLoading || !isSubmitEnabled }" :class="{ disabled: formState.updateLoading || !isSubmitEnabled }"
type="submit" type="submit"
:disabled="updateLoading || !isSubmitEnabled" :disabled="formState.updateLoading || !isSubmitEnabled"
@click.prevent="updateIssuable"> @click.prevent="updateIssuable">
Save changes Save changes
<i <i
......
...@@ -170,7 +170,7 @@ gl.text.init = function(form) { ...@@ -170,7 +170,7 @@ gl.text.init = function(form) {
}); });
}; };
gl.text.removeListeners = function(form) { gl.text.removeListeners = function(form) {
return $('.js-md', form).off(); return $('.js-md', form).off('click');
}; };
gl.text.humanize = function(string) { gl.text.humanize = function(string) {
return string.charAt(0).toUpperCase() + string.replace(/_/g, ' ').slice(1); return string.charAt(0).toUpperCase() + string.replace(/_/g, ' ').slice(1);
......
export default { export default {
mounted() { mounted() {
this.$nextTick(() => {
$(this.$refs.tooltip).tooltip(); $(this.$refs.tooltip).tooltip();
});
}, },
updated() { updated() {
this.$nextTick(() => {
$(this.$refs.tooltip).tooltip('fixTitle'); $(this.$refs.tooltip).tooltip('fixTitle');
});
}, },
beforeDestroy() { beforeDestroy() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment