Update Turbolinks, load additional assets only on request, fix JS

Signed-off-by: Sebastian Serth <Sebastian.Serth@student.hpi.de>
2018-09-30 11:19:38 +02:00
parent a77a006e8d
commit 15b1670511
48 changed files with 566 additions and 82 deletions
--- a/app/views/admin/dashboard/show.html.slim
+++ b/app/views/admin/dashboard/show.html.slim
@@ -1,3 +1,10 @@
+- content_for :head do
+  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
+     Otherwise, the global variable `vis` might be uninitialized in the assets (race condition)
+  meta name='turbolinks-visit-control' content='reload'
+  = javascript_include_tag(asset_path('vis.min.js', type: :javascript))
+  = stylesheet_link_tag(asset_path('vis.min.css', type: :stylesheet))
+
 h1 = t('breadcrumbs.dashboard.show')

 h2 Version
--- a/app/views/application/_navigation.html.slim
+++ b/app/views/application/_navigation.html.slim
@@ -6,7 +6,7 @@
        span.caret
      ul.dropdown-menu role='menu'
        - if current_user.admin?
-          li = link_to(t('breadcrumbs.dashboard.show'), admin_dashboard_path)
+          li = link_to(t('breadcrumbs.dashboard.show'), admin_dashboard_path, 'data-turbolinks' => "false")
          li = link_to(t('breadcrumbs.statistics.show'), statistics_path)
          li.divider
        = render('navigation_submenu', title: t('activerecord.models.exercise.other'),
--- a/app/views/execution_environments/statistics.html.slim
+++ b/app/views/execution_environments/statistics.html.slim
@@ -14,7 +14,7 @@ h1 = @execution_environment
        - if wts then average_time = wts["average_time"] else 0
        - if wts then stddev_time = wts["stddev_time"] else 0
        tr
-          td = link_to exercise.title, controller: "exercises", action: "statistics", id: exercise.id
+          td = link_to exercise.title, controller: "exercises", action: "statistics", id: exercise.id, 'data-turbolinks' => "false"
          td = us["users"]
          td = us["average_score"].to_f.round(4)
          td = us["maximum_score"].to_f.round(2)
--- a/app/views/exercise_collections/_form.html.slim
+++ b/app/views/exercise_collections/_form.html.slim
@@ -23,7 +23,7 @@
            td
              span.fa.fa-bars
            td = item.exercise.title
-            td = link_to(t('shared.show'), item.exercise)
+            td = link_to(t('shared.show'), item.exercise, 'data-turbolinks' => "false")
            td
              a.remove-exercise href='#' = t('shared.destroy')
  .hidden
--- a/app/views/exercise_collections/show.html.slim
+++ b/app/views/exercise_collections/show.html.slim
@@ -25,4 +25,4 @@ h4 = t('activerecord.attributes.exercise_collections.exercises')
          td = link_to(exercise.title, exercise)
          td = link_to_if(exercise.execution_environment && policy(exercise.execution_environment).show?, exercise.execution_environment, exercise.execution_environment)
          td = exercise.user.name
-          td = link_to(t('shared.statistics'), statistics_exercise_path(exercise))
+          td = link_to(t('shared.statistics'), statistics_exercise_path(exercise), 'data-turbolinks' => "false")
--- a/app/views/exercises/index.html.slim
+++ b/app/views/exercises/index.html.slim
@@ -36,7 +36,7 @@ h1 = Exercise.model_name.human(count: 2)
          td.public data-value=exercise.public? = symbol_for(exercise.public?)
          td = link_to(t('shared.edit'), edit_exercise_path(exercise)) if policy(exercise).edit?
          td = link_to(t('.implement'), implement_exercise_path(exercise)) if policy(exercise).implement?
-          td = link_to(t('shared.statistics'), statistics_exercise_path(exercise)) if policy(exercise).statistics?
+          td = link_to(t('shared.statistics'), statistics_exercise_path(exercise), 'data-turbolinks' => "false") if policy(exercise).statistics?

          td
            .btn-group
@@ -44,7 +44,7 @@ h1 = Exercise.model_name.human(count: 2)
              span.caret
              span.sr-only Toggle Dropdown
              ul.dropdown-menu.pull-right role="menu"
-                li = link_to(t('shared.show'), exercise) if policy(exercise).show?
+                li = link_to(t('shared.show'), exercise, 'data-turbolinks' => "false") if policy(exercise).show?
                li = link_to(t('activerecord.models.user_exercise_feedback.other'), feedback_exercise_path(exercise)) if policy(exercise).feedback?
                li = link_to(t('shared.destroy'), exercise, data: {confirm: t('shared.confirm_destroy')}, method: :delete) if policy(exercise).destroy?
                li = link_to(t('.clone'), clone_exercise_path(exercise), data: {confirm: t('shared.confirm_destroy')}, method: :post) if policy(exercise).clone?
--- a/app/views/exercises/show.html.slim
+++ b/app/views/exercises/show.html.slim
@@ -1,6 +1,9 @@
 - content_for :head do
-  = javascript_include_tag('http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js')
-  = stylesheet_link_tag('http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css')
+  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
+     Otherwise, code might not be highlighted correctly (race condition)
+  meta name='turbolinks-visit-control' content='reload'
+  = javascript_include_tag(asset_path('highlight.min.js', type: :javascript))
+  = stylesheet_link_tag(asset_path('highlight-default.css', type: :stylesheet))

 h1
  = @exercise
--- a/app/views/exercises/statistics.html.slim
+++ b/app/views/exercises/statistics.html.slim
@@ -1,4 +1,8 @@
-script src="http://labratrevenge.com/d3-tip/javascripts/d3.tip.v0.6.3.js"
+- content_for :head do
+  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
+     Otherwise, code might not be highlighted correctly (race condition)
+  meta name='turbolinks-visit-control' content='reload'
+  = javascript_include_tag(asset_path('d3-tip.js', type: :javascript))
 h1 = @exercise

 = row(label: '.participants', value: @exercise.users.distinct.count)
@@ -32,8 +36,8 @@ h1 = @exercise
    .graph-functions
    div#chart_1
    hr
-    /div#chart_2
-    /hr
+    div#chart_2
+    hr
  .table-responsive
    table.table.table-striped.sortable
      thead
--- a/app/views/proxy_exercises/index.html.slim
+++ b/app/views/proxy_exercises/index.html.slim
@@ -27,7 +27,7 @@ h1 = ProxyExercise.model_name.human(count: 2)
              span.caret
              span.sr-only Toggle Dropdown
              ul.dropdown-menu.pull-right role="menu"
-                li = link_to(t('shared.show'), proxy_exercise) if policy(proxy_exercise).show?
+                li = link_to(t('shared.show'), proxy_exercise, 'data-turbolinks' => "false") if policy(proxy_exercise).show?
                li = link_to(t('shared.destroy'), proxy_exercise, data: {confirm: t('shared.confirm_destroy')}, method: :delete) if policy(proxy_exercise).destroy?
                li = link_to(t('.clone'), clone_proxy_exercise_path(proxy_exercise), data: {confirm: t('shared.confirm_destroy')}, method: :post) if policy(proxy_exercise).clone?

--- a/app/views/proxy_exercises/show.html.slim
+++ b/app/views/proxy_exercises/show.html.slim
@@ -1,6 +1,9 @@
 - content_for :head do
-  = javascript_include_tag('http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js')
-  = stylesheet_link_tag('http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css')
+  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
+     Otherwise, code might not be highlighted correctly (race condition)
+  meta name='turbolinks-visit-control' content='reload'
+  = javascript_include_tag(asset_path('highlight.min.js', type: :javascript))
+  = stylesheet_link_tag(asset_path('highlight-default.css', type: :stylesheet))

 h1
  = @proxy_exercise.title
--- a/app/views/statistics/activity_history.html.slim
+++ b/app/views/statistics/activity_history.html.slim
@@ -1,3 +1,10 @@
+- content_for :head do
+  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
+     Otherwise, the global variable `vis` might be uninitialized in the assets (race condition)
+  meta name='turbolinks-visit-control' content='reload'
+  = javascript_include_tag(asset_path('vis.min.js', type: :javascript))
+  = stylesheet_link_tag(asset_path('vis.min.css', type: :stylesheet))
+
 .group
  .title
    h1 = t("statistics.graphs.#{resource}_activity")
--- a/app/views/statistics/graphs.html.slim
+++ b/app/views/statistics/graphs.html.slim
@@ -1,3 +1,10 @@
+- content_for :head do
+  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
+     Otherwise, the global variable `vis` might be uninitialized in the assets (race condition)
+  meta name='turbolinks-visit-control' content='reload'
+  = javascript_include_tag(asset_path('vis.min.js', type: :javascript))
+  = stylesheet_link_tag(asset_path('vis.min.css', type: :stylesheet))
+
 .group
  .title
    h1 = t('.user_activity')
--- a/app/views/submissions/index.html.slim
+++ b/app/views/submissions/index.html.slim
@@ -6,7 +6,7 @@ h1 = Submission.model_name.human(count: 2)
    = f.collection_select(:exercise_id_eq, Exercise.with_submissions, :id, :title, class: 'form-control', prompt: t('activerecord.attributes.submission.exercise'))
  .form-group
    = f.label(:cause_eq, t('activerecord.attributes.submission.cause'), class: 'sr-only')
-    = f.select(:cause_eq, Submission.all.map(&:cause).uniq.sort, class: 'form-control', prompt: t('activerecord.attributes.submission.cause'))
+    = f.select(:cause_eq, Submission.select(:cause).distinct.map(&:cause).sort, class: 'form-control', prompt: t('activerecord.attributes.submission.cause'))

 .table-responsive
  table.table