From 4fc9fe2150690c04d4d6071994126a05b250379b Mon Sep 17 00:00:00 2001 From: Sebastian Kapust Date: Wed, 13 Jun 2018 04:48:13 +0200 Subject: [PATCH 1/2] Fix target update for rule collection builder after input selection --- client/galaxy/scripts/mvc/ui/ui-rules-edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/galaxy/scripts/mvc/ui/ui-rules-edit.js b/client/galaxy/scripts/mvc/ui/ui-rules-edit.js index 9d6c3330a58..b4d781eeffb 100644 --- a/client/galaxy/scripts/mvc/ui/ui-rules-edit.js +++ b/client/galaxy/scripts/mvc/ui/ui-rules-edit.js @@ -115,7 +115,7 @@ var View = Backbone.View.extend({ // update refreshDefinition: function(input_def) { - self.target = input_def.target; + this.target = input_def.target; // refresh this._refresh(); }, From a937bc5539414624fe42c49607416f14dadd425b Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 11 Sep 2018 11:22:02 -0400 Subject: [PATCH 2/2] Client build. --- static/scripts/bundled/libs.bundled.js | 2 +- static/scripts/mvc/ui/ui-rules-edit.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/scripts/bundled/libs.bundled.js b/static/scripts/bundled/libs.bundled.js index e761e50047c..8d2e241909c 100644 --- a/static/scripts/bundled/libs.bundled.js +++ b/static/scripts/bundled/libs.bundled.js @@ -72,7 +72,7 @@ this.get("accessible")||this.set("state",s.default.NOT_VIEWABLE),this.urls=this. * jQuery Migrate - v1.4.1 - 2016-05-19 * Copyright jQuery Foundation and other contributors */ -return r&&(s.length<4&&i("jQuery.fn.attr( props, pass ) is deprecated"),t&&!d.test(u)&&(a?n in a:e.isFunction(e.fn[n])))?e(t)[n](o):("type"===n&&void 0!==o&&c.test(t.nodeName)&&t.parentNode&&i("Can't change the 'type' of an input or button in IE 6/7/8"),!e.attrHooks[l]&&h.test(l)&&(e.attrHooks[l]={get:function(t,n){var i,o=e.prop(t,n);return!0===o||"boolean"!=typeof o&&(i=t.getAttributeNode(n))&&!1!==i.nodeValue?n.toLowerCase():void 0},set:function(t,n,i){var o;return!1===n?e.removeAttr(t,i):(o=e.propFix[i]||i,o in t&&(t[o]=!0),t.setAttribute(i,i.toLowerCase())),i}},f.test(l)&&i("jQuery.fn.attr('"+l+"') might use property instead of attribute")),s.call(e,t,n,o))},e.attrHooks.value={get:function(e,t){var n=(e.nodeName||"").toLowerCase();return"button"===n?l.apply(this,arguments):("input"!==n&&"option"!==n&&i("jQuery.fn.attr('value') no longer gets properties"),t in e?e.value:null)},set:function(e,t){var n=(e.nodeName||"").toLowerCase();if("button"===n)return u.apply(this,arguments);"input"!==n&&"option"!==n&&i("jQuery.fn.attr('value', val) no longer sets properties"),e.value=t}};var p,m,g=e.fn.init,v=e.find,y=e.parseJSON,_=/^\s*)([^>]*)$/;e.fn.init=function(t,n,o){var r,a;return t&&"string"==typeof t&&!e.isPlainObject(n)&&(r=C.exec(e.trim(t)))&&r[0]&&(_.test(t)||i("$(html) HTML strings must start with '<' character"),r[3]&&i("$(html) HTML text after last tag is ignored"),"#"===r[0].charAt(0)&&(i("HTML string cannot start with a '#' character"),e.error("JQMIGRATE: Invalid selector string (XSS)")),n&&n.context&&n.context.nodeType&&(n=n.context),e.parseHTML)?g.call(this,e.parseHTML(r[2],n&&n.ownerDocument||n||document,!0),n,o):(a=g.apply(this,arguments),t&&void 0!==t.selector?(a.selector=t.selector,a.context=t.context):(a.selector="string"==typeof t?t:"",t&&(a.context=t.nodeType?t:n||document)),a)},e.fn.init.prototype=e.fn,e.find=function(e){var t=Array.prototype.slice.call(arguments);if("string"==typeof e&&b.test(e))try{document.querySelector(e)}catch(n){e=e.replace(w,function(e,t,n,i){return"["+t+n+'"'+i+'"]'});try{document.querySelector(e),i("Attribute selector with '#' must be quoted: "+t[0]),t[0]=e}catch(e){i("Attribute selector with '#' was not fixed: "+t[0])}}return v.apply(this,t)};var T;for(T in v)Object.prototype.hasOwnProperty.call(v,T)&&(e.find[T]=v[T]);e.parseJSON=function(e){return e?y.apply(this,arguments):(i("jQuery.parseJSON requires a valid JSON string"),null)},e.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e.browser||(p=e.uaMatch(navigator.userAgent),m={},p.browser&&(m[p.browser]=!0,m.version=p.version),m.chrome?m.webkit=!0:m.webkit&&(m.safari=!0),e.browser=m),o(e,"browser",e.browser,"jQuery.browser is deprecated"),e.boxModel=e.support.boxModel="CSS1Compat"===document.compatMode,o(e,"boxModel",e.boxModel,"jQuery.boxModel is deprecated"),o(e.support,"boxModel",e.support.boxModel,"jQuery.support.boxModel is deprecated"),e.sub=function(){function t(e,n){return new t.fn.init(e,n)}e.extend(!0,t,this),t.superclass=this,t.fn=t.prototype=this(),t.fn.constructor=t,t.sub=this.sub,t.fn.init=function(i,o){var r=e.fn.init.call(this,i,o,n);return r instanceof t?r:t(r)},t.fn.init.prototype=t.fn;var n=t(document);return i("jQuery.sub() is deprecated"),t},e.fn.size=function(){return i("jQuery.fn.size() is deprecated; use the .length property"),this.length};var S=!1;e.swap&&e.each(["height","width","reliableMarginRight"],function(t,n){var i=e.cssHooks[n]&&e.cssHooks[n].get;i&&(e.cssHooks[n].get=function(){var e;return S=!0,e=i.apply(this,arguments),S=!1,e})}),e.swap=function(e,t,n,o){var r,a,s={};S||i("jQuery.swap() is undocumented and deprecated");for(a in t)s[a]=e.style[a],e.style[a]=t[a];r=n.apply(e,o||[]);for(a in t)e.style[a]=s[a];return r},e.ajaxSetup({converters:{"text json":e.parseJSON}});var k=e.fn.data;e.fn.data=function(t){var n,o,r=this[0];return!r||"events"!==t||1!==arguments.length||(n=e.data(r,t),o=e._data(r,t),void 0!==n&&n!==o||void 0===o)?k.apply(this,arguments):(i("Use of jQuery.fn.data('events') is deprecated"),o)};var M=/\/(java|ecma)script/i;e.clean||(e.clean=function(t,n,o,r){n=n||document,n=!n.nodeType&&n[0]||n,n=n.ownerDocument||n,i("jQuery.clean() is deprecated");var a,s,l,u,c=[];if(e.merge(c,e.buildFragment(t,n).childNodes),o)for(l=function(e){if(!e.type||M.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):o.appendChild(e)},a=0;null!=(s=c[a]);a++)e.nodeName(s,"script")&&l(s)||(o.appendChild(s),void 0!==s.getElementsByTagName&&(u=e.grep(e.merge([],s.getElementsByTagName("script")),l),c.splice.apply(c,[a+1,0].concat(u)),a+=u.length));return c});var E=e.event.add,x=e.event.remove,O=e.event.trigger,L=e.fn.toggle,D=e.fn.live,R=e.fn.die,A=e.fn.load,H="ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",P=new RegExp("\\b(?:"+H+")\\b"),j=/(?:^|\s)hover(\.\S+|)\b/,N=function(t){return"string"!=typeof t||e.event.special.hover?t:(j.test(t)&&i("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'"),t&&t.replace(j,"mouseenter$1 mouseleave$1"))};e.event.props&&"attrChange"!==e.event.props[0]&&e.event.props.unshift("attrChange","attrName","relatedNode","srcElement"),e.event.dispatch&&o(e.event,"handle",e.event.dispatch,"jQuery.event.handle is undocumented and deprecated"),e.event.add=function(e,t,n,o,r){e!==document&&P.test(t)&&i("AJAX events should be attached to document: "+t),E.call(this,e,N(t||""),n,o,r)},e.event.remove=function(e,t,n,i,o){x.call(this,e,N(t)||"",n,i,o)},e.each(["load","unload","error"],function(t,n){e.fn[n]=function(){var e=Array.prototype.slice.call(arguments,0);return"load"===n&&"string"==typeof e[0]?A.apply(this,e):(i("jQuery.fn."+n+"() is deprecated"),e.splice(0,0,n),arguments.length?this.bind.apply(this,e):(this.triggerHandler.apply(this,e),this))}}),e.fn.toggle=function(t,n){if(!e.isFunction(t)||!e.isFunction(n))return L.apply(this,arguments);i("jQuery.fn.toggle(handler, handler...) is deprecated");var o=arguments,r=t.guid||e.guid++,a=0,s=function(n){var i=(e._data(this,"lastToggle"+t.guid)||0)%a;return e._data(this,"lastToggle"+t.guid,i+1),n.preventDefault(),o[i].apply(this,arguments)||!1};for(s.guid=r;a● {{prefix}}{{y}}{{suffix}}')},bar:{barColor:"#3366cc",negBarColor:"#f44",stackedBarColor:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],zeroColor:void 0,nullColor:void 0,zeroAxis:!0,barWidth:4,barSpacing:1,chartRangeMax:void 0,chartRangeMin:void 0,chartRangeClip:!1,colorMap:void 0,tooltipFormat:new i('● {{prefix}}{{value}}{{suffix}}')},tristate:{barWidth:4,barSpacing:1,posBarColor:"#6f6",negBarColor:"#f44",zeroBarColor:"#999",colorMap:{},tooltipFormat:new i('● {{value:map}}'),tooltipValueLookups:{map:{"-1":"Loss",0:"Draw",1:"Win"}}},discrete:{lineHeight:"auto",thresholdColor:void 0,thresholdValue:0,chartRangeMax:void 0,chartRangeMin:void 0,chartRangeClip:!1,tooltipFormat:new i("{{prefix}}{{value}}{{suffix}}")},bullet:{targetColor:"#f33",targetWidth:3,performanceColor:"#33f",rangeColors:["#d3dafe","#a8b6ff","#7f94ff"],base:void 0,tooltipFormat:new i("{{fieldkey:fields}} - {{value}}"),tooltipValueLookups:{fields:{r:"Range",p:"Performance",t:"Target"}}},pie:{offset:0,sliceColors:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],borderWidth:0,borderColor:"#000",tooltipFormat:new i('● {{value}} ({{percent.1}}%)')},box:{raw:!1,boxLineColor:"#000",boxFillColor:"#cdf",whiskerColor:"#000",outlierLineColor:"#333",outlierFillColor:"#fff",medianColor:"#f00",showOutliers:!0,outlierIQR:1.5,spotRadius:1.5,target:void 0,targetColor:"#4a2",chartRangeMax:void 0,chartRangeMin:void 0,tooltipFormat:new i("{{field:fields}}: {{value}}"),tooltipFormatFieldlistKey:"field",tooltipValueLookups:{fields:{lq:"Lower Quartile",med:"Median",uq:"Upper Quartile",lo:"Left Outlier",ro:"Right Outlier",lw:"Left Whisker",rw:"Right Whisker"}}}}},E='.jqstooltip { position: absolute;left: 0px;top: 0px;visibility: hidden;background: rgb(0, 0, 0) transparent;background-color: rgba(0,0,0,0.6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";color: white;font: 10px arial, san serif;text-align: left;white-space: nowrap;padding: 5px;border: 1px solid white;z-index: 10000;}.jqsfield { color: white;font: 10px arial, san serif;text-align: left;}',n=function(){var t,n;return t=function(){this.init.apply(this,arguments)},arguments.length>1?(arguments[0]?(t.prototype=e.extend(new arguments[0],arguments[arguments.length-1]),t._super=arguments[0].prototype):t.prototype=arguments[arguments.length-1],arguments.length>2&&(n=Array.prototype.slice.call(arguments,1,-1),n.unshift(t.prototype),e.extend.apply(e,n))):t.prototype=arguments[0],t.prototype.cls=t,t},e.SPFormatClass=i=n({fre:/\{\{([\w.]+?)(:(.+?))?\}\}/g,precre:/(\w+)\.(\d+)/,init:function(e,t){this.format=e,this.fclass=t},render:function(e,t,n){var i,o,r,a,s,l=this,u=e;return this.format.replace(this.fre,function(){var e;return o=arguments[1],r=arguments[3],i=l.precre.exec(o),i?(s=i[2],o=i[1]):s=!1,void 0===(a=u[o])?"":r&&t&&t[r]?(e=t[r],e.get?t[r].get(a)||a:t[r][a]||a):(d(a)&&(a=n.get("numberFormatter")?n.get("numberFormatter")(a):m(a,s,n.get("numberDigitGroupCount"),n.get("numberDigitGroupSep"),n.get("numberDecimalMark"))),a)})}}),e.spformat=function(e,t){return new i(e,t)},o=function(e,t,n){return en?n:e},r=function(e,t){var n;return 2===t?(n=s.floor(e.length/2),e.length%2?e[n]:(e[n-1]+e[n])/2):e.length%2?(n=(e.length*t+t)/4,n%1?(e[s.floor(n)]+e[s.floor(n)-1])/2:e[n-1]):(n=(e.length*t+2)/4,n%1?(e[s.floor(n)]+e[s.floor(n)-1])/2:e[n-1])},l=function(e){var t;switch(e){case"undefined":e=void 0;break;case"null":e=null;break;case"true":e=!0;break;case"false":e=!1;break;default:t=parseFloat(e),e==t&&(e=t)}return e},u=function(e){var t,n=[];for(t=e.length;t--;)n[t]=l(e[t]);return n},c=function(e,t){var n,i,o=[];for(n=0,i=e.length;n0;s-=i)t.splice(s,0,o);return t.join("")},h=function(e,t,n){var i;for(i=t.length;i--;)if((!n||null!==t[i])&&t[i]!==e)return!1;return!0},p=function(t){return e.isArray(t)?t:[t]},f=function(e){var t;a.createStyleSheet?a.createStyleSheet().cssText=e:(t=a.createElement("style"),t.type="text/css",a.getElementsByTagName("head")[0].appendChild(t),t["string"==typeof a.body.style.WebkitAppearance?"innerText":"innerHTML"]=e)},e.fn.simpledraw=function(t,n,i,o){var r,s;if(i&&(r=this.data("_jqs_vcanvas")))return r;if(!1===e.fn.sparkline.canvas)return!1;if(void 0===e.fn.sparkline.canvas){var l=a.createElement("canvas");if(l.getContext&&l.getContext("2d"))e.fn.sparkline.canvas=function(e,t,n,i){return new D(e,t,n,i)};else{if(!a.namespaces||a.namespaces.v)return e.fn.sparkline.canvas=!1,!1;a.namespaces.add("v","urn:schemas-microsoft-com:vml","#default#VML"),e.fn.sparkline.canvas=function(e,t,n,i){return new R(e,t,n)}}}return void 0===t&&(t=e(this).innerWidth()),void 0===n&&(n=e(this).innerHeight()),r=e.fn.sparkline.canvas(t,n,this,o),s=e(this).data("_jqs_mhandler"),s&&s.registerCanvas(r),r},e.fn.cleardraw=function(){var e=this.data("_jqs_vcanvas");e&&e.reset()},e.RangeMapClass=g=n({init:function(e){var t,n,i=[];for(t in e)e.hasOwnProperty(t)&&"string"==typeof t&&t.indexOf(":")>-1&&(n=t.split(":"),n[0]=0===n[0].length?-1/0:parseFloat(n[0]),n[1]=0===n[1].length?1/0:parseFloat(n[1]),n[2]=e[t],i.push(n));this.map=e,this.rangelist=i||!1},get:function(e){var t,n,i,o=this.rangelist;if(void 0!==(i=this.map[e]))return i;if(o)for(t=o.length;t--;)if(n=o[t],n[0]<=e&&n[1]>=e)return n[2]}}),e.range_map=function(e){return new g(e)},v=n({init:function(t,n){var i=e(t);this.$el=i,this.options=n,this.currentPageX=0,this.currentPageY=0,this.el=t,this.splist=[],this.tooltip=null,this.over=!1,this.displayTooltips=!n.get("disableTooltips"),this.highlightEnabled=!n.get("disableHighlight")},registerSparkline:function(e){this.splist.push(e),this.over&&this.updateDisplay()},registerCanvas:function(t){var n=e(t.canvas);this.canvas=t,this.$canvas=n,n.mouseenter(e.proxy(this.mouseenter,this)),n.mouseleave(e.proxy(this.mouseleave,this)),n.click(e.proxy(this.mouseclick,this))},reset:function(e){this.splist=[],this.tooltip&&e&&(this.tooltip.remove(),this.tooltip=void 0)},mouseclick:function(t){var n=e.Event("sparklineClick");n.originalEvent=t,n.sparklines=this.splist,this.$el.trigger(n)},mouseenter:function(t){e(a.body).unbind("mousemove.jqs"),e(a.body).bind("mousemove.jqs",e.proxy(this.mousemove,this)),this.over=!0,this.currentPageX=t.pageX,this.currentPageY=t.pageY,this.currentEl=t.target,!this.tooltip&&this.displayTooltips&&(this.tooltip=new y(this.options),this.tooltip.updatePosition(t.pageX,t.pageY)),this.updateDisplay()},mouseleave:function(){e(a.body).unbind("mousemove.jqs");var t,n,i=this.splist,o=i.length,r=!1;for(this.over=!1,this.currentEl=null,this.tooltip&&(this.tooltip.remove(),this.tooltip=null),n=0;n