diff -r 5cc429500a11 -r 08e2513dbc2f src_js/iconolab-bundle/src/main.js --- a/src_js/iconolab-bundle/src/main.js Tue Jun 05 13:56:20 2018 +0200 +++ b/src_js/iconolab-bundle/src/main.js Wed Jun 06 16:21:54 2018 +0200 @@ -1,8 +1,6 @@ -import 'expose?Vue!vue/dist/vue' -import "expose?jQuery!jquery" -import "expose?$!jquery" +import Vue from 'vue/dist/vue.min' +import $ from 'jquery' -import VueResource from 'vue-resource' import Typeahead from './components/typeahead/Typeahead.vue' import Cutout from './components/cutout' import Zoomview from './components/zoomview/Zoomview.vue' @@ -13,39 +11,42 @@ import Editor from './components/editor' import ColorButtons from './components/tagform/ColorButtons.vue' import TagList from './components/tagform/TagList.vue' +import 'bootstrap' +import 'vue-resource' const Diff = require('diff') -Vue.config.ignoredElements = ["mask"]; +Vue.config.ignoredElements = ['mask'] + var iconolab = { - Cutout : Cutout, - JsDiff: Diff, - JsonDiff: jsondiffpatch, - CollectionSelector: CollectionSelector, - VueComponents : { - Typeahead: Typeahead, - MergeTool: MergeTool, - Zoomview: Zoomview, - DiffViewer: DiffViewer, - Editor: Editor, - ColorButtons: ColorButtons, - TagList: TagList - } -}; + Cutout: Cutout, + JsDiff: Diff, + JsonDiff: jsondiffpatch, + CollectionSelector: CollectionSelector, + VueComponents: { + Typeahead: Typeahead, + MergeTool: MergeTool, + Zoomview: Zoomview, + DiffViewer: DiffViewer, + Editor: Editor, + ColorButtons: ColorButtons, + TagList: TagList + } +} -Vue.component('color-buttons', ColorButtons); -Vue.component('image-annotator', Editor.Canvas); -Vue.component('annotation-form', Editor.AnnotationForm); -Vue.component('annotation-list', Editor.AnnotationList); -Vue.component('comment-list', Editor.CommentList); +Vue.component('color-buttons', ColorButtons) +Vue.component('image-annotator', Editor.Canvas) +Vue.component('annotation-form', Editor.AnnotationForm) +Vue.component('annotation-list', Editor.AnnotationList) +Vue.component('comment-list', Editor.CommentList) -$('.table-clickable').each(function() { - var selector = $(this).data('selector'); - $(this).find('tr').on('click', function(e) { - var href = $(this).find(selector).attr('href'); - window.location.replace(href); - }); +$('.table-clickable').each(function () { + var selector = $(this).data('selector') + $(this).find('tr').on('click', function (e) { + var href = $(this).find(selector).attr('href') + window.location.replace(href) + }) }) if (!window.iconolab) { - window.iconolab = iconolab; + window.iconolab = iconolab }