remove jquery crap

Author: hexaeder

.gitignore

@@ -17,6 +17,6 @@ benchmark/*.txt
 /docs/src/assets/.auctex-auto/
 
 # ignore downloadable assets
-/NetworkDynamicsInspector/assets/jquery.js
-/NetworkDynamicsInspector/assets/select2.css
-/NetworkDynamicsInspector/assets/select2.js
+/NetworkDynamicsInspector/assets/tomselect.css
+/NetworkDynamicsInspector/assets/tomselect.js
+/NetworkDynamicsInspector/assets/tomselect.bundled.js

NetworkDynamicsInspector/assets/node_fence.js

@@ -32,13 +32,7 @@ include("utils.jl")
 const ASSETS = joinpath(dirname(@__DIR__),"assets")
 download_assets() # download assets if not present
 
-const JQUERY = Asset(joinpath(ASSETS, "jquery.js"))
-const SELECT2_CSS = Asset(joinpath(ASSETS, "select2.css"))
-const SELECT2_JS = Asset(joinpath(ASSETS, "select2.js"))
 const APP_CSS = Asset(joinpath(ASSETS, "app.css"))
-# node fence see https://github.com/electron/electron/issues/254
-const NODE_FENCE = Asset(joinpath(ASSETS, "node_fence.js"))
-const NODE_UNFENCE = Asset(joinpath(ASSETS, "node_unfence.js"))
 const TOMSELECT_ESS = ES6Module(joinpath(ASSETS, "tomselect.js"))
 const TOMSELECT_CSS = Asset(joinpath(ASSETS, "tomselect.css"))
 const ELECTRON_JS = Asset(joinpath(ASSETS, "electron.js"))

NetworkDynamicsInspector/assets/node_unfence.js

@@ -129,9 +129,6 @@ end
 
 function download_assets()
     assets = Dict(
-        "jquery.js" => "https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js",
-        "select2.css" => "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/select2.min.css",
-        "select2.js" => "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js",
         "tomselect.css" => "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/tom-select.css",
         "tomselect.js" => "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/tom-select.complete.min.js",
     )
@@ -140,7 +137,7 @@ function download_assets()
     isempty(to_download) && return
 
     for (name, url) in to_download
-        @info "Downloading Assets: $name.."
+        # @info "Downloading Assets: $name.."
         download(url, joinpath(ASSETS, name))
     end
 end

NetworkDynamicsInspector/src/NetworkDynamicsInspector.jl

@@ -318,265 +318,6 @@ struct OptionGroup{T}
     options::Vector{T}
 end
 
-struct MultiSelect{T}
-    options::Observable{Vector{Union{T, OptionGroup{T}}}}
-    selection::Observable{Vector{T}}
-    placeholder::String
-    multi::Bool
-    option_to_string::Any
-    class::String
-    id::String
-    function MultiSelect(_options, _selection=nothing; T=Any, placeholder="", multi=true, option_to_string=repr, class="", id="")
-        options = _options isa Observable ? _options : Observable{Vector{T}}(_options)
-        selection = if isnothing(_selection)
-            Observable(T[])
-        elseif _selection isa Observable
-            @assert _selection isa Observable{Vector{T}}
-            _selection
-        else
-            Observable{Vector{T}}(_selection)
-        end
-        _class = multi ? "bonito-select2-multi" : "bonito-select2-single"
-        if class != ""
-            _class *= " " * class
-        end
-        if id == ""
-            id = gendomid("selectbox")
-        end
-        new{T}(options, selection, placeholder, multi, option_to_string, _class, id)
-    end
-end
-
-function Bonito.jsrender(session::Session, multiselect::MultiSelect)
-    # jquery = Asset("https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js")
-    # select2_css = Asset("https://cdn.jsdelivr.net/npm/[email protected]/dist/css/select2.min.css")
-    # select2_js = Asset("https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js")
-
-    # generate internal observables of js representation of options and selection
-    jsoptions = @lift options_to_jsoptions($(multiselect.options); option_to_string=multiselect.option_to_string)
-    jsselection = Observable{Vector{Int}}()
-
-    onany(jsselection) do _jssel
-        sel = jsselection_to_selection(multiselect.options[], _jssel)
-        if sel != multiselect.selection[]
-            multiselect.selection[] = sel
-        end
-        nothing
-    end
-
-    onany(multiselect.options, multiselect.selection; update=true) do _opts, _sel
-        if !multiselect.multi && length(_sel) > 1
-            deleteat!(_sel, firstindex(_sel)+1:lastindex(_sel))
-        end
-        jssel = selection_to_jsselection(_opts, _sel)
-        @debug "MS \"$(multiselect.placeholder)\": New opts or sel triggers new jsselection:" _opts _sel jssel
-
-        # filter out invalid selections
-        if any(isnothing, jssel)
-            invalid = findall(isnothing, jssel)
-            deleteat!(_sel, invalid)
-            filter!(!isnothing, jssel)
-        end
-
-        jsselection[] = jssel
-        nothing
-    end
-
-    # Create a multi-select element
-    style = Styles(
-        "width" => "100%",
-    )
-
-    select = DOM.select(
-        DOM.option();
-        multiple = multiselect.multi,
-        class=multiselect.class,
-        # name = "states[]",
-        style,
-        id=multiselect.id,
-    )
-
-    # node fence see https://github.com/electron/electron/issues/254
-    container = DOM.div(
-        NODE_FENCE,
-        JQUERY,
-        SELECT2_JS,
-        NODE_UNFENCE,
-        SELECT2_CSS,
-        select
-    )
-
-    jqdocument = Bonito.JSString(raw"$(document)")
-    jqselect = Bonito.JSString(raw"$('#"* multiselect.id * raw"')")
-
-    esc = Bonito.JSString(raw"$")
-    js_onload = js"""
-    (select) => {
-        $(jqdocument).ready(function(){
-            $jqselect.select2({
-                width: '100%',
-                placeholder: $(multiselect.placeholder)
-            });
-        });
-
-        function array_equal(a1, a2){
-            return a1.length === a2.length &&
-                    a1.every(function(val, i) { return val == a2[i]})
-        }
-
-        function updateDisplayedOptions(new_options) {
-            const jq_select = $jqselect;
-
-            // Clear previous options
-            jq_select.empty();
-
-            // Loop through each group and create optgroups
-            new_options.forEach(opt_or_group => {
-                if (opt_or_group.options === undefined) {
-                    let newOption = new Option(opt_or_group.text, opt_or_group.id, false, false);
-                    jq_select.append(newOption);
-                } else {
-                    let jq_optgroup = $esc('<optgroup>', { label: opt_or_group.label });
-
-                    opt_or_group.options.forEach(option => {
-                        let newOption = new Option(option.text, option.id, false, false);
-                        jq_optgroup.append(newOption);
-                    });
-
-                    jq_select.append(jq_optgroup);
-                }
-            });
-        }
-        updateDisplayedOptions($(jsoptions).value);
-        $(jsoptions).on(updateDisplayedOptions);
-
-        function updateDisplayedSelection(new_sel_nr) {
-            const jq_select = $jqselect
-            const new_sel = new_sel_nr.map(String);
-
-            jq_select.data('preserved-order', new_sel);
-            jq_select.val(new_sel).trigger('change');
-            select2_renderSelections();
-        }
-        updateDisplayedSelection($(jsselection).value)
-        $(jsselection).on(updateDisplayedSelection)
-
-        // Trigger update for Select2 to recognize new options
-        $jqselect.trigger('change');
-
-        // Don't reorder
-        // https://github.com/select2/select2/issues/3106#issuecomment-333341636
-        function select2_renderSelections(){
-            jq_select2 = $jqselect
-            const def_order  = jq_select2.val();
-            const pre_order  = jq_select2.data('preserved-order') || [];
-            const jq_tags    = jq_select2.next('.select2-container').find('li.select2-selection__choice');
-            const jq_tags_ul = jq_tags.first().parent()
-
-            const new_order = pre_order.map(val=>{
-                return def_order.indexOf(val);
-            });
-
-            const sortedElements = new_order.map(i => jq_tags.eq(i));
-            jq_tags_ul.append(sortedElements);
-            // console.log("Rendered selection")
-        }
-        function selectionHandler(e){
-            const jq_select2  = $esc(this);
-            const val         = e.params.data.id;
-
-            let order;
-            if ($(multiselect.multi)){
-                order = jq_select2.data('preserved-order') || [];
-            } else {
-                order = [];
-            }
-
-            switch (e.type){
-                case 'select2:select':
-                    order[ order.length ] = val;
-                    break;
-                case 'select2:unselect':
-                    let found_index = order.indexOf(val);
-                    if (found_index >= 0 )
-                        order.splice(found_index,1);
-                    break;
-            }
-
-            jq_select2.data('preserved-order', order); // store it for later
-            select2_renderSelections();
-
-            // notify julia about changed selection
-            $(jsselection).notify(order.map(Number));
-        }
-        $jqselect.on('select2:select select2:unselect', selectionHandler);
-
-        // prevent dropdown on unselect
-        // https://github.com/select2/select2/issues/3209#issuecomment-149663474
-        $jqselect.on("select2:unselect", function (evt) {
-            if (!evt.params.originalEvent) {
-                return;
-            }
-            evt.params.originalEvent.stopPropagation();
-        });
-    }
-    """
-    Bonito.onload(session, select, js_onload)
-
-    return Bonito.jsrender(session, container)
-end
-
-function options_to_jsoptions(options; option_to_string=repr)
-    jsoptions = []
-    id = 1
-    for option in options
-        if option isa OptionGroup
-            jssuboptions = []
-            for suboption in option.options
-                push!(jssuboptions, (;text=option_to_string(suboption), id=id))
-                id += 1
-            end
-            push!(jsoptions, (;label=option.label, options=jssuboptions))
-        else
-            push!(jsoptions, (;text=option_to_string(option), id=id))
-            id += 1
-        end
-    end
-    jsoptions
-end
-
-jsselection_to_selection(options, jsselection) = _jsselection_to_selection.(Ref(options), jsselection)
-function _jsselection_to_selection(options, jsselection::Int)
-    id = 1
-    for option in options
-        if option isa OptionGroup
-            for suboption in option.options
-                id == jsselection && return suboption
-                id += 1
-            end
-        else
-            id == jsselection && return option
-            id += 1
-        end
-    end
-end
-
-selection_to_jsselection(options, selection) = _selection_to_jsselection.(Ref(options), selection)
-function _selection_to_jsselection(options, selection)
-    id = 1
-    for option in options
-        if option isa OptionGroup
-            for suboption in option.options
-                suboption == selection && return id
-                id += 1
-            end
-        else
-            option == selection && return id
-            id += 1
-        end
-    end
-end
-
 struct TomSelect{T}
     options::Observable{Vector{Union{T, OptionGroup{T}}}}
     selection::Observable{Vector{T}}

NetworkDynamicsInspector/src/utils.jl

@@ -6,10 +6,11 @@ Bonito = "824d6782-a2ef-11e9-3a09-e5662e0c26f8"
 Electron = "a1bb12fb-d4d1-54b4-b10a-ee7951ef7ad3"
 ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
+ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 NetworkDynamics = "22e9dc34-2a0d-11e9-0de0-8588d035468b"
 NetworkDynamicsInspector = "0a4713f2-d58f-43f2-b63b-1b5d5ee4e65a"
-ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 WGLMakie = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
 
@@ -25,5 +26,6 @@ ExplicitImports = "1.10.1"
 Graphs = "≥0.0.1"
 NetworkDynamics = "≥0.0.1"
 NetworkDynamicsInspector = "≥0.0.1"
+SafeTestsets = "0.1.0"
 Test = "1"
 WGLMakie = "≥0.0.1"