conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
},
{
name: "Janis",
size: "1.2k",
tags: ["animation", "ui", "transitions"],
description: "A simple CSS Transitions animation framework",
url: "http://mikemctiernan.github.com/Janis/",
source: "https://github.com/MikeMcTiernan/Janis/raw/master/janis.js"
=======
},
{
name: "e... |
<<<<<<<
},
{
name: "ajax",
tags: ["ajax", "jquery"],
description: "Standalone AJAX library inspired by jQuery/zepto",
url: "https://github.com/ForbesLindesay/ajax",
source: "https://component.jit.su/ForbesLindesay/ajax/download/latest.js"
},
{
name: "parsy",
tags: ["nodejs", "options... |
<<<<<<<
url: "http://caolan.github.com/nimble/",
source: "https://github.com/caolan/nimble/raw/master/nimble.min.js"
},
{
name: "loom",
size: "0.5k",
tags: ["functional"],
description: "A simple, four method API for differential inheritance and AOP.",
url: "https://github.com/rpflorence/... |
<<<<<<<
name: "store",
github: "nbubna/store",
tags: ["localStorage", "sessionStorage", "JSON", "namespace", "API", "extensible"],
description: "A better API for using localStorage and sessionStorage.",
url: "https://github.com/nbubna/store",
source: "https://raw.github.com/nbubna/store/master/d... |
<<<<<<<
},
{
name: "Pledges",
tags: ["promise", "pledge"],
description: "A JavaScript micro-library that provides promise functionality.",
url: "https://github.com/ryansmith94/Pledges",
source: "https://raw.github.com/ryansmith94/Pledges/master/src/core.js"
=======
},
{
name: "SVGEvent... |
<<<<<<<
},
{
<<<<<<< HEAD
<<<<<<< HEAD
name: "PinkySwear.js",
tags: ["promises"],
description: "A tiny implementation of the Promises/A+ specification.",
url: "https://github.com/timjansen/pinkyswear.js",
source: "https://raw.github.com/timjansen/PinkySwear.js/master/pinkyswear.js"
},
{
... |
<<<<<<<
},
{
name: "preact",
github: "developit/preact",
tags: ["dom", "templating"],
description: "Tiny & fast Component-based Virtual DOM framework.",
url: "https://github.com/developit/preact",
source: "https://raw.githubusercontent.com/developit/preact/master/src/preact.js"
},
{
... |
<<<<<<<
},
{
name: "Maybe",
github: "alexanderjarvis/maybes",
tags: ["maybe", "functional"],
description: "Maybe is a type that wraps optional values",
url: "https://github.com/alexanderjarvis/maybe",
source: "https://raw.githubusercontent.com/alexanderjarvis/maybe/master/src/maybe.js"
====... |
<<<<<<<
},
{
name: "audio-fx",
size: "1.2k",
tags: ["audio", "games"],
description: "A HTML5 Audio Library",
url: "https://github.com/jakesgordon/javascript-audio-fx",
source: "https://raw.github.com/jakesgordon/javascript-audio-fx/master/audio-fx.min.js"
},
{
name: "swipe",
size... |
<<<<<<<
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Li... |
<<<<<<<
},
{
name: "Spine",
size: "2k",
tags: ["mvc"],
description: "MVC with real protypical inheritance, controllers, model layer and ORM, Ajax and local storage.",
url: "http://maccman.github.com/spine/"
=======
},
{
name: "Kizzy",
size: "0.6k",
tags: ["data", "storage"],
... |
<<<<<<<
},
{
name: "Hexy.js",
tags: ["color"],
description: "Converts HEX colors to RGB values and vice versa in various output formats.",
url: "http://github.com/steelsojka/Hexy.js",
source: "https://raw.github.com/steelsojka/Hexy.js/master/src/Hexy.js"
=======
},
{
name: "onDomReady"... |
<<<<<<<
name: "minivents",
github: "allouis/minivents",
tags: ["events"],
description: "A mini event library for Javascript applications",
url: "https://github.com/allouis/minivents",
source: "https://raw.github.com/allouis/minivents/master/minivents.js"
},
{
=======
name: "audioJS",
... |
<<<<<<<
},
{
name: "LogJS",
tags: ["logging", "CORS", "localStorage", "DOM"],
description: "Lightweight, extendable JavaScript logging library.",
url: "https://github.com/bfattori/LogJS",
source: "https://raw.github.com/bfattori/LogJS/master/log.js"
=======
},
{
name: "StdClassJS",
... |
<<<<<<<
{
name: "Infect.js",
github: "amwmedia/Infect.js",
tags: ["dependency injection", "DI", "dependency", "injection", "dependency-free"],
description: "Infectiously simple dependency injection for any JavaScript project",
url: "https://github.com/amwmedia/infect.js",
source: "https://raw.... |
<<<<<<<
name: "css-time.js",
github: "philbooth/css-time.js",
tags: ["css", "time", "string", "milliseconds", "convert", "conversion"],
description: "A tiny library that converts milliseconds to and from CSS time strings.",
url: "https://github.com/philbooth/css-time.js",
source: "https://raw.gi... |
<<<<<<<
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Li... |
<<<<<<<
},
{
name: "picoCSS",
size: "0.4k",
tags: ["CSS", "CSS3", "mobile"],
description: "Basic CSS DOM manipulation and animation optimized for webkit browsers(Safari, Chrome) for building mobile web apps",
url: "https://github.com/vladocar/picoCSS"
},
{
name: "H5F.js",
size: "1.8k... |
<<<<<<<
name: "Timesheet.js",
github: "sbstjn/timesheet.js",
tags: ["timesheet", "graph", "charts", "flow", "gantt", "draw"],
description: "Visualize your data with Timesheet.js",
url: "https://github.com/sbstjn/timesheet.js",
source: "https://raw.githubusercontent.com/sbstjn/timesheet.js/master... |
<<<<<<<
},
{
name: "SimpleScrollbar",
github: "buzinas/simple-scrollbar",
tags: ["scrollbar", "ui", "interface", "scroll", "custom", "lightweight"],
description: "Very simple vanilla javascript library for creating a custom scrollbar cross-browser and cross-devices",
url: "https://github.com/buz... |
<<<<<<<
source: "https://raw.githubusercontent.com/lagodiuk/decision-tree-js/master/decision-tree.js"
},
{
name: "Grapnel.js",
tags: ["grapnel", "route", "routing", "router", "hash", "anchor", "tiny", "require", "named", "parameters"],
description: "The smallest (1100 bytes gzipped!) JavaScript Rout... |
<<<<<<<
},
{
name: "Rlite",
tags: ["rlite", "route", "routing", "router", "hash", "querystring", "named", "parameters"],
description: "Tiny, simple, light-weight routing",
url: "https://github.com/chrisdavies/rlite",
source: "https://raw.githubusercontent.com/chrisdavies/rlite/master/rlite.... |
<<<<<<<
},
{
name: "color.js",
github: "brehaut/color-js",
tags: ["color", "color manipulation"],
description: "API for immutable color objects in RGB, HSV and HSL with optional alpha. Comprehensive CSS format parsing and output.",
url: "https://github.com/brehaut/color-js/",
source: "https:... |
<<<<<<<
},
{
name: "SpeculOOs",
size: "0.3k",
tags: ["language", "class"],
description: "Simple JavaScript Class notation, fully CoffeeScript compliant",
url: "https://github.com/k33g/speculoos",
source: "https://raw.github.com/k33g/speculoos/master/speculoos.js"
},
{
name: "aug",
... |
<<<<<<<
source: "https://raw.githubusercontent.com/radiosilence/xr/master/src/xr.js"
},
{
name: "SimpleScrollbar",
github: "buzinas/simple-scrollbar",
tags: ["scrollbar", "ui", "interface", "scroll", "custom", "lightweight"],
description: "Very simple vanilla javascript library for creating a cu... |
<<<<<<<
let a = this.s.map(this.s.mouseX, 0, this.s.width, this.lb * this.step, this.ub * this.step);
let b = this.s.map(this.s.mouseY, 0, this.s.height, this.ub * this.step, this.lb * this.step);
let x = a * matrix[0] + b * matrix[3];
let y = a * matrix[1] + b * matrix[4];
let z... |
<<<<<<<
class Text {
constructor(ctx, args) {
this.s = ctx;
=======
class Text extends TextBase {
constructor(args) {
super(args);
>>>>>>>
class Text extends TextBase {
constructor(ctx, args) {
super(ctx, args);
<<<<<<<
this.s.textAlign(this.s.CENTER, t... |
<<<<<<<
clearMatrix(){
const ctx = this;
const { values, channels, steps} = ctx.state;
console.log(values);
for (var i = 0; i < channels.length*steps; i++) {
values [i] = [];
}
ctx.setState({values});
}
=======
>>>>>>>
clearMatrix(){
const ctx = this;
const { values, channels, steps} =... |
<<<<<<<
duration: 8,
steps: 24,
=======
duration: 32,
steps: 32,
>>>>>>>
duration: 8,
steps: 24,
duration: 32,
steps: 32, |
<<<<<<<
=======
// Convert time expression to SS.mmm
// Expression may be absolute to timeline (hh:mm:ss.ms)
// or relative ( fraction followedd by metric ) ex: 3.4s, 5.7m
// Returns -1 if invalid
var toSeconds = function ( t_in, offset ) {
if ( !t_in ) {
return -1;
... |
<<<<<<<
searchEngine.getDescription(id, callback);
});
=======
socket.on('getContentLength', (url, callback) => {
redis.hget('mvw:contentLengthCache', url, (err, result) => {
if (result) {
callback(result);
} else {
request.head(url, (error, re... |
<<<<<<<
super(props);
this.state={
matName: "",
modelName : "Matrices",
tidalServerLink: 'localhost:3001',
steps: 12,
channels: ['d1','d2','d3', 'd4', 'd5','d6'],
timer: [],
values: {},
scCommand: '',
click : {current:null,
isActive:false},
activeMatrix: '',
s... |
<<<<<<<
const x = _.compact(_.map(vals,(v,k) => {
// gets parameters list
const getParameters = (v) => {
var param = [];
_.map(_.split(v, /[`]+/g), (p1, p2) => {
p1 = _.trim(p1);
=======
const getFinalPattern = () => {
console.log('INDEXJS ', channel, stepValue);
// channel
var k = channe... |
<<<<<<<
.default('p', 'windows,android,ios,chrome')
=======
.alias('m', 'manifest')
.default('p', 'windows,android,ios')
>>>>>>>
.default('p', 'windows,android,ios,chrome')
.alias('m', 'manifest') |
<<<<<<<
'use strict';
var utils = require('../common/utils'),
url = require('url'),
fs = require('fs'),
path = require('path'),
request = require('request'),
archiver = require('archiver'),
cloudappx = require('gulp-appx'),
log = require('loglevel');
var serviceEndpoint = 'http://cloudappx... |
<<<<<<<
|''Version''|0.6.7|
=======
|''Version''|0.6.6|
>>>>>>>
|''Version''|0.6.8|
<<<<<<<
if(isNewTiddler || !["public", "private"].contains(status)) {
var defaultValue = "public";
if(args.defaultValue) {
defaultValue = args.defaultValue[0].toLowerCase();
} else {
defaultValue = config.options.... |
<<<<<<<
// Declare JSHint globals
/*global MobileServiceClient:false */
var testData = require('../utilities/constants');
=======
var testData = require('../utilities/constants');
>>>>>>>
/*global MobileServiceClient:false */
var testData = require('../utilities/constants'); |
<<<<<<<
"arc", "arrayCopy", "asin", "atan", "atan2", "background", "beginCamera",
"beginDraw", "beginShape", "bezier", "bezierDetail", "bezierPoint",
"bezierTangent", "bezierVertex", "binary", "blend", "blendColor",
"blit_resize", "blue", "box", "breakShape", "brightness",
"camera", "ceil"... |
<<<<<<<
{ path: "stretch.pde", tags: ["3D"] },
{ path: "arc-fill-crisp.pde", tags: ["2D"], epsilonOverride: 0.07 },
=======
{ path: "mixture.pde", tags: ["3D"], knownFailureTicket: "1239" },
{ path: "mixturegrid.pde", tags: ["3D"], knownFailureTicket: "1239" },
{ path: "moveeye.pde", tags: ["3D"], epsilonOv... |
<<<<<<<
allRest = RegExp.rightContext,
rest = nextBrace(allRest, "{", "}");
className = m[1],
staticVars = m[2] || "";
allRest = allRest.slice(rest.length + 1);
=======
allRest = RegExp.rightContext,
rest = nextBrace(allRest),
className = m[1];
... |
<<<<<<<
=======
inDraw = true;
var pmouseXLastEvent = p.pmouseX,
pmouseYLastEvent = p.pmouseY;
p.pmouseX = pmouseXLastFrame;
p.pmouseY = pmouseYLastFrame;
>>>>>>>
var pmouseXLastEvent = p.pmouseX,
pmouseYLastEvent = p.pmouseY;
p.pmouseX = pmouseXLastFrame;
... |
<<<<<<<
{ path: "text-unboxed-left-bottom-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" },
{ path: "text-unboxed-center-top.pde", tags:["2D", "Text"], epsilonOverride: 0.10 }, /* See ticket #1172 */
{ path: "text-unboxed-center-top-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" },
{ path: "te... |
<<<<<<<
=======
{ path: "textWidth_comic.pde", tags:["2D"], epsilonOverride: 0.35}, /* See ticket #1172 */
{ path: "image-3d.pde", tags: ["3D"], epsilonOverride: 0.07 },
>>>>>>>
{ path: "image-3d.pde", tags: ["3D"], epsilonOverride: 0.07 }, |
<<<<<<<
var colors = {
aliceblue: "#f0f8ff",
antiquewhite: "#faebd7",
aqua: "#00ffff",
aquamarine: "#7fffd4",
azure: "#f0ffff",
beige: "#f5f5dc",
bisque: "#ffe4c4",
black: "#000000",... |
<<<<<<<
{ path: "plants.pde", tags: ["2D"] },
{ path: "alpha-transparency-mask.pde", tags: ["2D"], iterationOverride: 100 },
{ path: "tint.pde", tags: ["2D"], iterationOverride: 100 },
{ path: "point-notcrisp.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "point-crisp.pde", tags: ["2D", "Crisp"... |
<<<<<<<
return [0, 0, max];
}
saturation = (max - min) / max;
=======
return [0, 0, max*colorModeZ];
} else {
saturation = (max - min) / max;
>>>>>>>
return [0, 0, max*colorModeZ];
}
saturation = (max - min) / max; |
<<<<<<<
p.endShape = function endShape(mode){
if (vertArray.length === 0) { return; }
=======
Drawing2D.prototype.endShape = function(mode) {
// Duplicated in Drawing3D; too many variables used
>>>>>>>
Drawing2D.prototype.endShape = function(mode) {
// Duplicated in Drawing3D; too many... |
<<<<<<<
// process all <canvas>-indicated sketches
var canvasElements = document.getElementsByTagName('canvas');
var filenames;
for (var i = 0, l = canvasElements.length; i < l; i++) {
=======
/**
* Automatic initialization function.
*/
var init = function() {
var canvas = document.getEl... |
<<<<<<<
disableVertexAttribPointer(programObject3D, "aTexture");
uniformMatrix(programObject3D, "model", true, model.array());
uniformMatrix(programObject3D, "view", true, view.array());
uniformMatrix(programObject3D, "projection", true, projection.array());
=======
... |
<<<<<<<
fillStyle = "rgba( 255, 255, 255, 1 )",
currentFillColor = 0xFFFFFFFF,
isFillDirty = false,
=======
fillStyle = [1.0, 1.0, 1.0, 1.0],
>>>>>>>
fillStyle = [1.0, 1.0, 1.0, 1.0],
currentFillColor = 0xFFFFFFFF,
isFillDirty = false,
<<<<<<<
strokeSt... |
<<<<<<<
/**
* This function takes content from a canvas and turns it into an ImageData object to be used with a PImage
*
* @returns {ImageData} ImageData object to attach to a PImage (1D array of pixel data)
*
* @see PImage
*/
Drawing2D.prototype.toImageData = function(x, y,... |
<<<<<<<
// Color modes
p.RGB = 1;
p.ARGB = 2;
p.HSB = 3;
p.ALPHA = 4;
p.CMYK = 5;
// Renderers
p.P2D = 1;
p.JAVA2D = 1;
p.WEBGL = 2;
p.P3D = 2;
p.OPENGL = 2;
p.EPSILON = 0.0001;
p.MAX_FLOAT = 3.4028235e+38;
p.MIN_FLOAT = -3.4028235e+38;
p... |
<<<<<<<
* Shears a shape around the x-axis the amount specified by the angle parameter.
* Angles should be specified in radians (values from 0 to PI*2) or converted to radians
* with the radians() function. Objects are always sheared around their relative position
* to the origin and positive numbers... |
<<<<<<<
=======
// horizontal offset/alignment
if(align === p.RIGHT || align === p.CENTER) {
if (curContext.fillText) {
textWidth = curContext.measureText( str ).width;
} else if (curContext.mozDrawText) {
textWidth = curContext.mozMeasureText(... |
<<<<<<<
getUniformLocation: __empty_func__,
uniform1f: __empty_func__,
uniform2f: __empty_func__,
uniform3f: __empty_func__,
uniform4f: __empty_func__,
uniformfv: __empty_func__,
uniform2... |
<<<<<<<
vertexAttribPointer( programObject , "Vertex", 3 , boxOutlineBuffer );
if( doFill === true ) {
// fix stitching problems. (lines get occluded by triangles
// since they share the same depth values). This is not entirely
// working, but it's a start for dra... |
<<<<<<<
parsePath: function(){
this.family = PConstants.PATH;
=======
parsePath: function() {
this.family = p.PATH;
>>>>>>>
parsePath: function() {
this.family = PConstants.PATH;
<<<<<<<
this.parsePathCode(PConstants.BEZIER_VERTEX);
// x1/y1 already covered ... |
<<<<<<<
p.mouseOver = undef;
p.mouseOut = undef;
=======
p.touchStart = undef;
p.touchEnd = undef;
p.touchMove = undef;
p.touchCancel = undef;
>>>>>>>
p.mouseOver = undef;
p.mouseOut = undef;
p.touchStart = undef;
p.touchE... |
<<<<<<<
{ path: "text-defaults.pde", tags: ["2D", "Text"], epsilonOverride: 0.10 }, /* See ticket #1172 */
{ path: "text-ascent-descent.pde", tags: ["2D", "Text"], epsilonOverride: 0.09 }, /* See ticket #1172 */
{ path: "text-align.pde", tags: ["2D", "Text"], epsilonOverride: 0.14 }, /* See ticket #1172 */
{ pa... |
<<<<<<<
if (size) {
curTextSize = size;
curTextLeading = (p.textAscent() + p.textDescent()) * 1.275;
}
=======
curTextSize = size;
curContext.font = curContext.mozTextStyle = curTextSize + "px " + curTextFont.name;
>>>>>>>
if (size) {
curTextSize = size;
... |
<<<<<<<
{ path: "blend-subtract.pde", tags: ["2D","BLEND"], epsilonOverride: 0.09 },
{ path: "loadShape.pde", tags: ["2D","SVG"], epsilonOverride: 0.06 },
{ path: "loadShape2.pde", tags: ["2D","SVG"], epsilonOverride: 0.08 },
=======
{ path: "blend-subtract.pde", tags: ["2D","BLEND"], epsilonOverride: 0.10 },... |
<<<<<<<
// Unsupported Processing File and I/O operations.
(function(Processing) {
var unsupportedP5 = ("open() createOutput() createInput() BufferedReader selectFolder() " +
"dataPath() createWriter() selectOutput() beginRecord() " +
"saveStream() endRecord() s... |
<<<<<<<
}
if (obj.constructor === String) {
=======
} else if (typeof (obj) === "string") {
>>>>>>>
}
if (typeof (obj) === "string") {
<<<<<<<
if (arguments.length === 3) {
return (this.x * v + this.y * y + this.z * z);
}
if (arguments.length === 1) {
=======... |
<<<<<<<
function initTestability() {
// add data-name attributes to improve testability
$("#file_upload_dialog").parent().attr("data-name", "file_upload_dialog");
$("#locale_select_dialog").parent().attr("data-name", "locale_select_dialog");
$("button span:contains('Close')").parent().attr("data-name", ... |
<<<<<<<
=======
if (section === "help" && num === 1) {
section = !npm.config.get("usage") && "npm"
}
>>>>>>>
<<<<<<<
var sectionPath = path.resolve(__dirname, "..", "man1", section+".1")
, htmlPath = path.resolve( __dirname, "..", "html"
, "doc", section+".html" )
... |
<<<<<<<
, "unstar": "star" // same function
=======
, "apihelp" : "help"
>>>>>>>
, "unstar": "star" // same function
, "apihelp" : "help" |
<<<<<<<
portfinder.basePort = config.port
=======
const cors = require('./api/cors')
const entityRequestHandler = require('./api/entity')
const collectionRequestHandler = require('./api/collection')
>>>>>>>
const cors = require('./api/cors')
const entityRequestHandler = require('./api/entity')
const collectionRequ... |
<<<<<<<
if (options.watch) watchFile(path);
=======
// Try to watch the file if needed. watchFile takes care of duplicates.
if (options.watch) watchFile(path, null, rootPath);
var str = fs.readFileSync(path, 'utf8');
options.filename = path;
>>>>>>>
// Try to watch the file if needed. watchFi... |
<<<<<<<
var name = this.advance().val
, tag = new nodes.Tag(name);
return this.tag(tag);
},
tag: function(tag){
var dot;
tag.line = this.line();
=======
var tok = this.advance()
, tag = new nodes.Tag(tok.val);
tag.selfClosing = tok.selfClosing;
>>>>>>>
var tok = th... |
<<<<<<<
import Issue16 from './Issue16';
=======
import Issue20 from './Issue20';
>>>>>>>
import Issue16 from './Issue16';
import Issue20 from './Issue20';
<<<<<<<
<li><Link to="/issues/16">16</Link></li>
=======
<li><Link to="/issues/20">20</Link></li>
>>>>>>>
<li><Link to="/issues... |
<<<<<<<
},
keep_translation_links: function(test) {
test.expect(1);
var actual = grunt.file.readJSON( 'test/existing/11_en_US.json' );
var expected = grunt.file.readJSON( 'test/expected/11_en_US.json' );
test.deepEqual( actual, expected, 'Should equal.' );
test.done();
},
key_as_text: fu... |
<<<<<<<
if (Constructor.prototype.thaw === null) {
Constructor.prototype.thaw = new Thaw([]);
}
this.td = (td !== undefined ? td : null);
=======
if (td !== undefined && td !== null) {
this.td = td;
td.jSCell = this;
}
>>>>>>>
if (Constructor.prototype.thaw === null) {
Constructor.prototype.t... |
<<<<<<<
'es': otp.locale.Spanish,
'ca_ES': otp.locale.Catalan
=======
'ca_ES': otp.locale.Catalan,
'pt': otp.locale.Portuguese
>>>>>>>
'es': otp.locale.Spanish,
'pt': otp.locale.Portuguese |
<<<<<<<
new BabelMultiTargetPlugin({
normalizeModuleIds: true,
targets: {
modern: true,
legacy: {
additionalModules: [
'../_shared/hello.js',
],
},
},
}),
=======
new BabelMultiTargetPlugin({
normalizeModuleIds: true,
//... |
<<<<<<<
// Draw select region
if (state.cursor.get("selecting")) {
ctx.save();
let start_cursor_sy = cy - (state.cursor.get("row") - state.cursor.get("row_start")) * this._pattern_row_height;
let start_cursor_sx = this._event_left_margin;
start_cursor_sx += state.cursor.get("track_start... |
<<<<<<<
let show_payout = !is_status_expired && !is_status_done;
=======
let show_advanced_payout = isBountyOwner(result) && !is_status_expired && !is_status_done;
let show_extend_deadline = isBountyOwner(result) && !is_status_expired && !is_status_done;
>>>>>>>
let show_payout = !is_status_expired && !is_st... |
<<<<<<<
=======
};
if (isSendingETH) {
web3.eth.sendTransaction({
to: destinationAccount,
value: amountInWei,
gasPrice: web3.toHex(get_gas_price())
}, post_send_callback);
} else {
_alert({ message: gettext('You will now be asked to confirm two ... |
<<<<<<<
if (typeof ga !== 'undefined') {
ga('send', 'event', 'Saved profile onboard', 'click', 'Person');
}
=======
dataLayer.push({
'event': 'send',
'category': 'onboard',
'action': 'saved-profile-onboard'
});
>>>>>>>
... |
<<<<<<<
bountyDetails = [ bountyAmount, result[1], result[2], result[3] ];
var fromAddress = result[2];
var open = result[4];
var initialized = result[5];
var errormsg = undefined;
if (bountyAmount == 0 || open == false || initialized == false) {... |
<<<<<<<
handleHoursInput: function(input, event) {
var value = input.value,
valid = false,
newHours;
var reg = new RegExp('^([0-9]){1,2}$');
if (reg.test(value)) {
newHours = parseInt(value);
if (this.options.ho... |
<<<<<<<
$('#btn_gif').click(function(e) {
e.preventDefault();
closeBackgroundDropdown(e);
deselectGif(e);
$('#poll-button').removeClass('selected');
$('#poll_container').remove();
});
var selectedElement = null;
// handle background selection
$('.bg-thumbnail').click(function(e) {
e... |
<<<<<<<
text: gettext('Work Accepted'),
created_on: fulfillment.created_on,
age: timeDifference(new Date(result['now']), new Date(fulfillment.created_on)),
=======
text: 'Work Accepted',
age: timeDifference(new Date(result['now']), new Date(fulfillment.accepted_on)),
... |
<<<<<<<
result['p'] = work_scheme + ((result['experience_level'] ? result['experience_level'] : 'Unknown Experience Level') + ' • ');
=======
result['p'] = ((result['experience_level'] ? result['experience_level'] + ' • ' : ''));
>>>>>>>
result['p'] = work_scheme + ((result['experience_le... |
<<<<<<<
var fail_callback = function() {
message.val(the_message);
localStorage.setItem(lskey, the_message);
_alert(
{ message: gettext('An error occurred. Please try again.') },
'error'
);
};
=======
for (var i = 0; i < 5; i++) {
var val = $('#poll_container... |
<<<<<<<
global.locusReadLine = require('readline').createInterface({
input: process.stdin,
output: process.stdout,
completer: completer
});
=======
global.locusDone = true;
>>>>>>>
global.locusReadLine = require('readline').createInterface({
input: process.stdin,
output: process.stdout,
completer: comple... |
<<<<<<<
=======
PrimeFaces.csp.NONCE_VALUE = nonce;
>>>>>>>
PrimeFaces.csp.NONCE_VALUE = nonce; |
<<<<<<<
/**
* Replaces all line breaks with a Window-style line break (carriage return + line feed).
* @private
* @param {string} text Text to normalize.
* @return {string} The given text, with all line breaks replaced with carriage return + line feed.
*/
normalizeNewlines: function(te... |
<<<<<<<
import FlowProvider from './dialog/provider'
import StateManager from './dialog/state'
import DialogEngine from './dialog/engine'
import DialogProcessors from './dialog/processors'
import DialogJanitor from './dialog/janitor'
import SkillsManager from './skills'
=======
import createConversations from './co... |
<<<<<<<
init: async (bp, configurator, helpers) => {
=======
// eslint-disable-next-line no-unused-vars
init: async function(bp, configurator, helpers) {
>>>>>>>
// eslint-disable-next-line no-unused-vars
init: async (bp, configurator, helpers) => {
<<<<<<<
ready: async (bp, configurator, helpers) => {
... |
<<<<<<<
const requireExtension = (file, edition) => {
edition = edition || process.env.BOTPRESS_EDITION || DEFAULT_EDITION
=======
function requireExtension(file, edition) {
const editions = ['ultimate', 'pro', 'lite']
edition = edition ? edition : process.env.BOTPRESS_EDITION || 'lite'
file = path.normalize(... |
<<<<<<<
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
init: function(cfg) {
=======
init: function (cfg) {
>>>>>>>
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
init: functi... |
<<<<<<<
author: packageJson.author || '<no author>',
license: packageJson.license || 'AGPL-3.0-only'
=======
author: (typeof packageJson.author === 'object' ? packageJson.author.name : packageJson.author) || '<no author>',
license: packageJson.license || 'AGPL-v3.0'
>>>>>>>
author: (typ... |
<<<<<<<
function applySnapshot(state, snapshot) {
return {
...state,
currentFlow: snapshot.activeFlow,
currentFlowNode: snapshot.activeFlowNode,
flowsByName: snapshot.flowsByName
}
}
function createSnapshot(state) {
const snapshot = {
activeFlow: state.currentFlow,
activeFlowNode: state.c... |
<<<<<<<
=======
app.get('/*', (req, res) => {
const absolutePath = path.join(__dirname, 'static/index.html')
res.contentType('text/html')
res.sendFile(absolutePath)
})
app.use('/admin', express.static(path.join(__dirname, 'static/admin/index.html')))
// app.get(/^(?!\/api.*$).*/i, (req, res) =... |
<<<<<<<
downsample: OPTIONS_DOWNSAMPLE_DEFAULT,
lines: {
=======
lines: { show: false },
pie: {
>>>>>>>
lines: { show: false },
pie: {
<<<<<<<
downsample: OPTIONS_DOWNSAMPLE_DEFAULT,
lines: { show: true, lineWidth: 1, fill: 1},
=======... |
<<<<<<<
done: function(done){
=======
error: false,
done: function(done, response){
>>>>>>>
error: false,
done: function(done){ |
<<<<<<<
var util = require('util');
=======
// nbb-core
var utils = nbbpath.require('../public/js/utils');
var utils = nbbpath.require('./batch');
>>>>>>>
var util = require('util');
var batch = nbbpath.require('/src/batch');
<<<<<<<
Data.processIdsSet = function(setKey, process, options, callback) ... |
<<<<<<<
messages.forEach(([type, message, status], i) => {
let color,
typeString,
=======
messages.forEach(([type, message], i) => {
let color = 'white',
typeString = ' [unknown] ',
>>>>>>>
messages.forEach(([type, message, status], i) => {
let colo... |
<<<<<<<
data = JSON.parse(data);
=======
$('#operations-spinner').addClass('hidden');
>>>>>>>
data = JSON.parse(data);
$('#operations-spinner').addClass('hidden');
<<<<<<<
data = JSON.parse(data);
=======
$('#apps-spin... |
<<<<<<<
if (canResetPassword) {
viewModel.users[i].canEdit = true;
}
viewModel.roles[i].adminUser = $("#user-table").data("user");
=======
viewModel.users[i].adminUser = $("#user-table").data("user");
>>>>>>>
if (canR... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.