[ARVADOS] updated: 78960aaf35ce8270fb2243be35a6d0ed11e2f9f5
git at public.curoverse.com
git at public.curoverse.com
Wed Dec 3 18:46:30 EST 2014
Summary of changes:
.../app/assets/javascripts/selection.js.erb | 39 +---------------------
apps/workbench/app/helpers/application_helper.rb | 2 --
2 files changed, 1 insertion(+), 40 deletions(-)
via 78960aaf35ce8270fb2243be35a6d0ed11e2f9f5 (commit)
from a2b994514a6743a055116f9362c303db66f480b5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 78960aaf35ce8270fb2243be35a6d0ed11e2f9f5
Author: radhika <radhika at radhika>
Date: Wed Dec 3 18:45:45 2014 -0500
4525: remove select_form_sources function
diff --git a/apps/workbench/app/assets/javascripts/selection.js.erb b/apps/workbench/app/assets/javascripts/selection.js.erb
index 0eb1fb1..d1e3452 100644
--- a/apps/workbench/app/assets/javascripts/selection.js.erb
+++ b/apps/workbench/app/assets/javascripts/selection.js.erb
@@ -2,6 +2,7 @@
//= require jquery_ujs
/** Javascript for selection. */
+form_selection_sources = {};
jQuery(function($){
$(document).
@@ -15,7 +16,6 @@ jQuery(function($){
});
add_form_selection_sources = null;
-select_form_sources = null;
(function() {
var form_selection_sources = {};
@@ -30,43 +30,6 @@ select_form_sources = null;
}
}
};
-
- select_form_sources = function(type) {
- var ret = [];
-
- if (get_selection_list) {
- var lst = get_selection_list();
- if (lst.length > 0) {
- 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) {
- var n = lst[i].name;
- n = n.replace(/<span[^>]*>/i, "[");
- n = n.replace(/<\/span>/i, "]");
- ret.push({text: n, value: lst[i].uuid})
- }
- }
- }
- }
-
- 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) {
- if (t.hasOwnProperty(key)) {
- var obj = t[key];
- ret.push({text: obj.name, value: obj.uuid})
- }
- }
- return ret;
- };
})();
function dispatch_selection_action() {
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index c8c4ccc..6f7b57a 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -385,8 +385,6 @@ module ApplicationHelper
lt += raw("add_form_selection_sources(#{selectables.to_json});\n")
end
- lt += raw("$('[data-name=\"#{dn}\"]').editable({source: function() { return select_form_sources('#{dataclass}'); } });\n")
-
lt += raw("</script>")
lt
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list