X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/89355aa0e2727373fa60c781ec6c00c31a79a7dc..16413f6ebe1bba3a070cdff3d7436ad508db8514:/apps/workbench/app/assets/javascripts/selection.js
diff --git a/apps/workbench/app/assets/javascripts/selection.js b/apps/workbench/app/assets/javascripts/selection.js
index c8ec8100ac..1e32c63564 100644
--- a/apps/workbench/app/assets/javascripts/selection.js
+++ b/apps/workbench/app/assets/javascripts/selection.js
@@ -40,7 +40,6 @@ jQuery(function($){
};
var remove_selection_click = function(e) {
- //remove_selection($(this).attr('name'));
remove_selection($(this).val());
};
@@ -50,22 +49,30 @@ jQuery(function($){
}
var update_count = function(e) {
+ var html;
+ var this_object_uuid = $('#selection-form-content').
+ closest('form').
+ find('input[name=uuid]').val();
var lst = get_selection_list();
$("#persistent-selection-count").text(lst.length);
-
if (lst.length > 0) {
- $('#persistent-selection-list').html('
Clear selections'
- +'');
+ html = ' Clear selections';
+ if (this_object_uuid.match('-j7d0g-'))
+ html += '';
+ html += ''
+ + '';
+ $('#selection-form-content').html(html);
+
for (var i = 0; i < lst.length; i++) {
- $('#persistent-selection-list > li > table').append(""
+ $('#selection-form-content > li > table').append("
"
+ ""
- + ""
+ + ""
+ " | "
+ ""
- + "" + lst[i].name + ""
+ + ""
+ " | "
+ ""
@@ -75,7 +82,7 @@ jQuery(function($){
+ " |
");
}
} else {
- $('#persistent-selection-list').html("No selections.");
+ $('#selection-form-content').html("No selections.");
}
var checkboxes = $('.persistent-selection:checkbox');
@@ -90,7 +97,7 @@ jQuery(function($){
checkboxes[i].checked = false;
}
}
-
+
$('.remove-selection').on('click', remove_selection_click);
$('#clear_selections_button').on('click', clear_selections);
};
@@ -99,7 +106,7 @@ jQuery(function($){
on('change', '.persistent-selection:checkbox', function(e) {
//console.log($(this));
//console.log($(this).val());
-
+
var inc = 0;
if ($(this).is(":checked")) {
add_selection($(this).val(), $(this).attr('friendly_name'), $(this).attr('href'), $(this).attr('friendly_type'));
@@ -111,10 +118,14 @@ jQuery(function($){
$(window).on('load storage', update_count);
+
+ $('#selection-form-content').on("click", function(e) {
+ e.stopPropagation();
+ });
});
add_form_selection_sources = null;
-select_form_sources = null;
+select_form_sources = null;
(function() {
var form_selection_sources = {};
@@ -136,16 +147,26 @@ select_form_sources = null;
if (get_selection_list) {
var lst = get_selection_list();
if (lst.length > 0) {
- ret.push({text: "--- Selections ---", value: ""});
+ var text = "― Selections ―";
+ var span = document.createElement('span');
+ span.innerHTML = text;
+ ret.push({text: span.innerHTML, value: "***invalid***"});
for (var i = 0; i < lst.length; i++) {
if (lst[i].type == type) {
- ret.push({text: lst[i].name, value: lst[i].uuid})
+ var n = lst[i].name;
+ n = n.replace(/]*>/i, "[");
+ n = n.replace(/<\/span>/i, "]");
+ ret.push({text: n, value: lst[i].uuid})
}
}
}
}
- ret.push({text: "--- Recent ---", value: ""});
+
+ var text = "― Recent ―";
+ var span = document.createElement('span');
+ span.innerHTML = text;
+ ret.push({text: span.innerHTML, value: "***invalid***"});
var t = form_selection_sources[type];
for (var key in t) {
@@ -157,4 +178,3 @@ select_form_sources = null;
return ret;
};
})();
-