Skip to content

Commit

Permalink
Merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlfeberhard
carlfeberhard committed Aug 7, 2015
2 parents d20add4 + 3feaedb commit ff13fb8
Show file tree
Hide file tree
Showing 143 changed files with 6,269 additions and 1,364 deletions.
4 changes: 2 additions & 2 deletions client/bower.json
View file
Expand Up @@ -9,7 +9,7 @@
"homepage": "usegalaxy.org",
"dependencies": {
"jquery": "~1.11.1",
"traceKit": "*",
"tracekit": "*",
"ravenjs": "~1.1.16",
"underscore": "~1.7.0",
"backbone": "~1.1.2",
Expand All @@ -18,7 +18,7 @@
"farbtastic": "~2.0.0-alpha.1",
"toastr": "~2.1.0",
"jQTouch": "git://github.com/senchalabs/jQTouch#~1.0.0",
"bib2json": "git://github.com/mayanklahiri/bib2json",
"bib2json": "git://github.com/galaxyproject/bib2json#galaxy",
"jquery-form": "~3.46.0",
"jquery-autocomplete": "git://github.com/dyve/jquery-autocomplete",
"select2": "~3.5.2",
Expand Down
16 changes: 8 additions & 8 deletions client/galaxy/scripts/libs/d3.js
View file
@@ -1,6 +1,6 @@
!function() {
var d3 = {
version: "3.5.5"
version: "3.5.6"
};
var d3_arraySlice = [].slice, d3_array = function(list) {
return d3_arraySlice.call(list);
Expand Down Expand Up @@ -1463,8 +1463,7 @@
function zoomended(dispatch) {
if (!--zooming) dispatch({
type: "zoomend"
});
center0 = null;
}), center0 = null;
}
function mousedowned() {
var that = this, target = d3.event.target, dispatch = event.of(that, arguments), dragged = 0, subject = d3.select(d3_window(that)).on(mousemove, moved).on(mouseup, ended), location0 = location(d3.mouse(that)), dragRestore = d3_event_dragSuppress(that);
Expand Down Expand Up @@ -1553,8 +1552,8 @@
}
function mousewheeled() {
var dispatch = event.of(this, arguments);
if (mousewheelTimer) clearTimeout(mousewheelTimer); else translate0 = location(center0 = center || d3.mouse(this)),
d3_selection_interrupt.call(this), zoomstarted(dispatch);
if (mousewheelTimer) clearTimeout(mousewheelTimer); else d3_selection_interrupt.call(this),
translate0 = location(center0 = center || d3.mouse(this)), zoomstarted(dispatch);
mousewheelTimer = setTimeout(function() {
mousewheelTimer = null;
zoomended(dispatch);
Expand Down Expand Up @@ -1699,8 +1698,9 @@
return v < 16 ? "0" + Math.max(0, v).toString(16) : Math.min(255, v).toString(16);
}
function d3_rgb_parse(format, rgb, hsl) {
format = format.toLowerCase();
var r = 0, g = 0, b = 0, m1, m2, color;
m1 = /([a-z]+)\((.*)\)/i.exec(format);
m1 = /([a-z]+)\((.*)\)/.exec(format);
if (m1) {
m2 = m1[2].split(",");
switch (m1[1]) {
Expand All @@ -1715,7 +1715,7 @@
}
}
}
if (color = d3_rgb_names.get(format.toLowerCase())) {
if (color = d3_rgb_names.get(format)) {
return rgb(color.r, color.g, color.b);
}
if (format != null && format.charAt(0) === "#" && !isNaN(color = parseInt(format.slice(1), 16))) {
Expand Down Expand Up @@ -5785,7 +5785,7 @@
}
d3.interpolators = [ function(a, b) {
var t = typeof b;
return (t === "string" ? d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) ? d3_interpolateRgb : d3_interpolateString : b instanceof d3_color ? d3_interpolateRgb : Array.isArray(b) ? d3_interpolateArray : t === "object" && isNaN(b) ? d3_interpolateObject : d3_interpolateNumber)(a, b);
return (t === "string" ? d3_rgb_names.has(b.toLowerCase()) || /^(#|rgb\(|hsl\()/i.test(b) ? d3_interpolateRgb : d3_interpolateString : b instanceof d3_color ? d3_interpolateRgb : Array.isArray(b) ? d3_interpolateArray : t === "object" && isNaN(b) ? d3_interpolateObject : d3_interpolateNumber)(a, b);
} ];
d3.interpolateArray = d3_interpolateArray;
function d3_interpolateArray(a, b) {
Expand Down
42 changes: 20 additions & 22 deletions client/galaxy/scripts/libs/farbtastic.js
View file
@@ -1,6 +1,6 @@
// Farbtastic 2.0 alpha
// Farbtastic 2.0.0-alpha.1
(function ($) {

var __debug = false;

$.fn.farbtastic = function (options) {
Expand All @@ -15,7 +15,7 @@ $.farbtastic = function (container, options) {

$._farbtastic = function (container, options) {
var fb = this;

/////////////////////////////////////////////////////

/**
Expand Down Expand Up @@ -98,7 +98,7 @@ $._farbtastic = function (container, options) {
.find('div>*').css('position', 'absolute');

// IE Fix: Recreate canvas elements with doc.createElement and excanvas.
navigator.userAgent.match(/msie/i) && $('canvas', container).each(function () {
$.browser.msie || false && $('canvas', container).each(function () {
// Fetch info.
var attr = { 'class': $(this).attr('class'), style: this.getAttribute('style') },
e = document.createElement('canvas');
Expand Down Expand Up @@ -130,7 +130,7 @@ $._farbtastic = function (container, options) {
fb.ctxOverlay = fb.cnvOverlay[0].getContext('2d');
fb.ctxMask.translate(fb.mid, fb.mid);
fb.ctxOverlay.translate(fb.mid, fb.mid);

// Draw widget base layers.
fb.drawCircle();
fb.drawMask();
Expand Down Expand Up @@ -166,7 +166,7 @@ $._farbtastic = function (container, options) {
// New color
color2 = fb.pack(fb.HSLToRGB([d2, 1, 0.5]));
if (i > 0) {
if (navigator.userAgent.match(/msie/i)) {
if ($.browser.msie || false) {
// IE's gradient calculations mess up the colors. Correct along the diagonals.
var corr = (1 + Math.min(Math.abs(Math.tan(angle1)), Math.abs(Math.tan(Math.PI / 2 - angle1)))) / n;
color1 = fb.pack(fb.HSLToRGB([d1 - 0.15 * corr, 1, 0.5]));
Expand Down Expand Up @@ -204,7 +204,7 @@ $._farbtastic = function (container, options) {
m.restore();
__debug && $('body').append('<div>drawCircle '+ (+(new Date()) - tm) +'ms');
};

/**
* Draw the saturation/luminance mask.
*/
Expand All @@ -224,9 +224,9 @@ $._farbtastic = function (container, options) {
var c = (a > 0) ? ((2 * l - 1 + a) * .5 / a) : 0;
outputPixel(x, y, c, a);
}
}
}
}

// Method #1: direct pixel access (new Canvas).
if (fb.ctxMask.getImageData) {
// Create half-resolution buffer.
Expand All @@ -246,7 +246,7 @@ $._farbtastic = function (container, options) {
fb.ctxMask.drawImage(buffer, 0, 0, sz + 1, sz + 1, -sq, -sq, sq * 2, sq * 2);
}
// Method #2: drawing commands (old Canvas).
else if (!navigator.userAgent.match(/msie/i)) {
else if (!($.browser.msie || false)) {
// Render directly at half-resolution
var sz = Math.floor(size / 2);
calculateMask(sz, sz, function (x, y, c, a) {
Expand Down Expand Up @@ -287,7 +287,7 @@ $._farbtastic = function (container, options) {
}
cache.push([c, a]);
});
}
}
__debug && $('body').append('<div>drawMask '+ (+(new Date()) - tm) +'ms');
}

Expand All @@ -313,7 +313,7 @@ $._farbtastic = function (container, options) {

// Update the overlay canvas.
fb.ctxOverlay.clearRect(-fb.mid, -fb.mid, sz, sz);
for (i in circles) {
for (var i = 0; i < circles.length; i++) {
var c = circles[i];
fb.ctxOverlay.lineWidth = c.lw;
fb.ctxOverlay.strokeStyle = c.c;
Expand All @@ -335,7 +335,7 @@ $._farbtastic = function (container, options) {

// Draw markers
fb.drawMarkers();

// Linked elements or callback
if (typeof fb.callback == 'object') {
// Set background/foreground color
Expand All @@ -349,21 +349,21 @@ $._farbtastic = function (container, options) {
if ((typeof this.value == 'string') && this.value != fb.color) {
this.value = fb.color;
}
});
}).change();
}
else if (typeof fb.callback == 'function') {
fb.callback.call(fb, fb.color);
}
}

/**
* Helper for returning coordinates relative to the center.
*/
fb.widgetCoords = function (event) {
return {
x: event.pageX - fb.offset.left - fb.mid,
x: event.pageX - fb.offset.left - fb.mid,
y: event.pageY - fb.offset.top - fb.mid
};
};
}

/**
Expand Down Expand Up @@ -426,7 +426,7 @@ $._farbtastic = function (container, options) {
fb.packDX = function (c, a) {
return '#' + fb.dec2hex(a) + fb.dec2hex(c) + fb.dec2hex(c) + fb.dec2hex(c);
};

fb.pack = function (rgb) {
var r = Math.round(rgb[0] * 255);
var g = Math.round(rgb[1] * 255);
Expand Down Expand Up @@ -496,8 +496,7 @@ $._farbtastic = function (container, options) {
options = $.extend({
width: 300,
wheelWidth: (options.width || 300) / 10,
callback: null,
color: "#808080"
callback: null
}, options);

// Initialize.
Expand All @@ -511,8 +510,7 @@ $._farbtastic = function (container, options) {
fb.linkTo(options.callback);
}
// Set to gray.
fb.setColor( "#808080" );
fb.setColor( options.color );
if (!fb.color) fb.setColor('#808080');
}

})(jQuery);

0 comments on commit ff13fb8

Please sign in to comment.