updated js dependencies and fixed performance problems

ParkerICI · Jul 5, 2018 · bd44d55 · bd44d55
1 parent 9b259d9
commit bd44d55
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 23 deletions.
diff --git a/inst/shinyGUI/app.R b/inst/shinyGUI/app.R
@@ -1,7 +1,10 @@
 
 ui <- navbarPage("SCAFFoLD",
-    header = list(tags$head(tags$script(src = "d3.min.js")),
-        tags$head(tags$script(src = "https://cdnjs.cloudflare.com/ajax/libs/pixi.js/4.7.1/pixi.js")),
+    header = list(tags$head(tags$script(src = "d3-scale.min.js")),
+        tags$head(tags$script(src = "d3-interpolate.min.js")),
+        tags$head(tags$script(src = "d3-array.min.js")),
+        tags$head(tags$script(src = "d3-color.min.js")),
+        tags$head(tags$script(src = "pixi.min.js")),
         tags$head(tags$script(src = "pixigraph.js")),
         tags$head(tags$script(src = "shinyoutputbindings.js")),
         singleton(tags$head(tags$link(rel = 'stylesheet', type = 'text/css', href = 'graph.css')))

diff --git a/inst/shinyGUI/server/tab_graph.R b/inst/shinyGUI/server/tab_graph.R
@@ -357,15 +357,6 @@ observeEvent(input$graphui_toggle_cluster_labels, {
     }
 )
 
-
-#output$graphui_plot_title = renderPrint({
-#    if(!is.null(input$graphui_selected_cluster) && input$graphui_selected_cluster != "")
-#        sprintf("Plotting cluster %s", input$graphui_selected_cluster)
-#})
-
-
-
-
 observe({
     if(!is.null(input$graphui_reset_colors) && input$graphui_reset_colors != 0)
     {

diff --git a/inst/shinyGUI/www/d3-array.min.js b/inst/shinyGUI/www/d3-array.min.js
diff --git a/inst/shinyGUI/www/d3-color.min.js b/inst/shinyGUI/www/d3-color.min.js