conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
var font = new Font('My Family', 'n4'),
TARGET_SIZE = new Size(3, 3),
FALLBACK_SIZE_A = new Size(1, 1),
FALLBACK_SIZE_B = new Size(2, 2),
LAST_RESORT_SIZE = new Size(4, 4),
=======
var fontFamily = 'My Family',
fontDescription = 'n4',
TARGET_SIZE = 3,
... |
<<<<<<<
FontWatcher.prototype.watch = function(fonts, fontTestStrings, last) {
if (fonts.length === 0 && last) {
=======
FontWatcher.prototype.watchFonts = function(fonts,
fontTestStrings, fontWatchRunnerCtor, last) {
var length = fonts.length;
if (length === 0 && last) {
>>>>>>>
FontWatcher... |
<<<<<<<
if (cellView) {
if (!cellView.model.isLink()) {
if (cellView.$box.css('z-index') < z.index) {
cellView.$box.css('z-index', ++z.index);
}
=======
if (cellView && !cellView.model.isLink()) {
if (cellView.$box.css('z-i... |
<<<<<<<
// Install toolchain
async.series([
ensurePythonIsAvailable,
extractVirtualEnv,
makeVenvDirectory,
ensureInternetConnection,
installApio,
apioInstallSystem,
apioInstallScon... |
<<<<<<<
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
import Typeahead from './Forms/Typeahead';
import Toggles from './Forms/Toggles';
import Editor from './Forms/Editor';
import DatePicker from './Forms/DatePicker';
import Dropzone from './Forms/Dropzone';
=======
import Selects from... |
<<<<<<<
import { SidebarTopA } from './../Sidebar/SidebarTopA'
import { SidebarBottomA } from './../Sidebar/SidebarBottomA'
import { LogoThemed } from './../LogoThemed/LogoThemed';
=======
import { SidebarTop } from './../Sidebar/SidebarTop'
import { SidebarBottom } from './../Sidebar/SidebarBottom'
>>>>>>>
import {... |
<<<<<<<
<SidebarMenu.Item title="Wizard" to='/forms/wizard' />
<SidebarMenu.Item title="Text Mask" to='/forms/text-mask' />
<SidebarMenu.Item title="Typeahead" to='/forms/typeahead' />
<SidebarMenu.Item title="Toggles" to='/forms/toggles' />
<SidebarMenu.Item ... |
<<<<<<<
import { SidebarTop } from './parts/SidebarTop'
import { SidebarBottom } from './parts/SidebarBottom'
=======
import { LogoThemed } from './../LogoThemed/LogoThemed';
import { SidebarTop } from './../Sidebar/SidebarTop'
import { SidebarBottom } from './../Sidebar/SidebarBottom'
>>>>>>>
import { LogoThemed ... |
<<<<<<<
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
import Typeahead from './Forms/Typeahead';
import Toggles from './Forms/Toggles';
=======
import Editor from './Forms/Editor';
>>>>>>>
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
import Typeahead f... |
<<<<<<<
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
=======
import Typeahead from './Forms/Typeahead';
>>>>>>>
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
import Typeahead from './Forms/Typeahead';
<<<<<<<
<Route component={ Wizard } pa... |
<<<<<<<
storage_month(month: Date): EnvironmentStorageMonth
hits_month(month: Date): EnviornmentHitsMonth
lagoon_route: String
lagoon_routes: String
monitoring_urls: String
=======
storageMonth(month: Date): EnvironmentStorageMonth
hitsMonth(month: Date): EnviornmentHitsMonth
>>>>>>>
... |
<<<<<<<
const addNotificationMicrosoftTeams = async (root, { input }, { sqlClient, hasPermission }) => {
await hasPermission('notification', 'add');
const prep = prepare(
sqlClient,
'CALL CreateNotificationMicrosoftTeams(:name, :webhook)',
);
const rows = await query(sqlClient, prep(input));
const m... |
<<<<<<<
<SidebarMenu.Item title="Notifications" to='/interface/notifications' />
<SidebarMenu.Item title="Crop Image" to='/interface/crop-image' />
<SidebarMenu.Item title="Drag & Drop Elements" to='/interface/drag-and-drop-elements' />
=======
<SidebarMenu.Item tit... |
<<<<<<<
middleware: [],
strict: true
=======
findOneAndUpdate: true,
middleware: []
>>>>>>>
middleware: [],
strict: true
findOneAndUpdate: true, |
<<<<<<<
const properties = source._decodeUnboundProperties();
expect(properties.cartodb_id[0]).toEqual(0);
=======
const properties = source._decodeProperties();
expect(properties.cartodb_id[0]).toEqual(-0);
>>>>>>>
c... |
<<<<<<<
import IdentityCodec from '../codecs/Identity';
=======
import { FP32_DESIGNATED_NULL_VALUE } from './viz/expressions/constants';
>>>>>>>
import IdentityCodec from '../codecs/Identity';
import { FP32_DESIGNATED_NULL_VALUE } from './viz/expressions/constants'; |
<<<<<<<
// we want to limit production environments, without making it configurable currently
var productionEnvironmentsLimit = 2
// we want to make sure we can deploy the `production` env, and also the env defined as standby
if (
environments.project.productionEnvironment === branchNam... |
<<<<<<<
this.decodedGeom = decoder.decodeGeom(this.type, this.geom);
this.numVertex = type === 'point' ? size * 3 : this.decodedGeom.vertices.length / 2;
=======
this.decodedGeom = decodeGeom(this.type, this.geom);
this.numVertex = type === 'point' ? size : this.decodedGeom.vertices.le... |
<<<<<<<
updateProject: ({ permissions: { projects } }, { id, patch }) =>
knex('project')
=======
updateProject: (input) => {
const { id, patch } = input;
const ret = knex('project')
>>>>>>>
updateProject: ({ id, patch }) =>
knex('project')
<<<<<<<
.whereIn('id', projects)
.update(... |
<<<<<<<
const source = new carto.source.GeoJSON(sources['points']);
const viz = new carto.Viz(`
color: ramp(top(@prop, @num), PRISM)
width: 50
@prop: $cat
@num: 2
`);
=======
const source = new carto.source.GeoJSON(sources['points3']);
const viz = new carto.Viz('color: ramp(top($cat, @num), PRISM), wi... |
<<<<<<<
resetViewportAgg(metadata) {
if (!this.viewportFeature) {
=======
_resetViewportAgg(metadata) {
if (!this._FeatureProxy) {
>>>>>>>
resetViewportAgg(metadata) {
if (!this._FeatureProxy) { |
<<<<<<<
=======
const Queries = {
addOrUpdateEnvironment,
addOrUpdateEnvironmentStorage,
getEnvironmentByName,
getEnvironmentByOpenshiftProjectName,
getEnvironmentHoursMonthByEnvironmentId,
getEnvironmentStorageByEnvironmentId,
getEnvironmentStorageMonthByEnvironmentId,
getEnvironmentHitsMonthByEnviro... |
<<<<<<<
class Tri {
constructor(gl) {
compileProgram.call(this, gl, rendererGLSL.tris.VS, rendererGLSL.tris.FS);
this.vertexPositionAttribute = gl.getAttribLocation(this.program, 'vertexPosition');
this.featureIdAttr = gl.getAttribLocation(this.program, 'featureID');
this.vertexScale... |
<<<<<<<
import CartoValidationError, { CartoValidationTypes as cvt } from '../../../../errors/carto-validation-error';
=======
import ListTransform from '../ListTransform';
>>>>>>>
import ListTransform from '../ListTransform';
import CartoValidationError, { CartoValidationTypes as cvt } from '../../../../errors/cart... |
<<<<<<<
import * as schema from '../../schema';
=======
import Property from './property';
import { checkInstance, checkType } from './utils';
>>>>>>>
import * as schema from '../../schema';
import Property from './property';
import { checkInstance, checkType } from './utils';
<<<<<<<
this._aggName = ag... |
<<<<<<<
describe('.eval', () => {
const fakeMetadata = {
columns: [{
type: 'category',
name: 'category',
categoryNames: ['cat0', 'cat1', 'cat2']
}],
categoryIDs: {
'cat0': 0,
'cat1': 1,
... |
<<<<<<<
const response = await getSQL(q, conf);
=======
const response = await fetch(`${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(q));
>>>>>>>
const response = await getSQL(q, conf);
<<<<<<<
const response = await getSQL(q, conf);
=======
const response = await... |
<<<<<<<
return this.dataframes.filter(df => df.active && df.numVertex);
=======
this.dataframes = this.dataframes.filter(df => !df.freed);
return this.dataframes.filter(df => df.active);
>>>>>>>
this.dataframes = this.dataframes.filter(df => !df.freed);
return this.dataframes.... |
<<<<<<<
* @IGNOREproperty {Order} order - rendering order of the features, only applicable to points
* @property {number} resolution - resolution of the property-aggregation functions, only applicable to points. Default resolution is 1. Custom values must be greater than 0 and lower than 256. A resolution of N means ... |
<<<<<<<
// The geom will be an array of coordinates in this case`
export function decodeGeom(geomType, geom) {
if (geomType == 'point') {
=======
// The geom will be an array of coordinates in this case
export function decodeGeom (geomType, geom) {
if (geomType === 'point') {
>>>>>>>
// The geom will be an a... |
<<<<<<<
const DEFAULT_SYMBOL_EXPRESSION = () => { const expr = s.FALSE; expr._default = true; return expr; };
const DEFAULT_SYMBOLPLACEMENT_EXPRESSION = () => s.BOTTOM;
=======
const DEFAULT_RESOLUTION = () => 1;
>>>>>>>
const DEFAULT_SYMBOL_EXPRESSION = () => { const expr = s.FALSE; expr._default = true; return exp... |
<<<<<<<
MICROSOFTTEAMS
=======
EMAIL
>>>>>>>
MICROSOFTTEAMS
EMAIL
<<<<<<<
union Notification = NotificationRocketChat | NotificationSlack | NotificationMicrosoftTeams
=======
union Notification = NotificationRocketChat | NotificationSlack | NotificationEmail
>>>>>>>
union Notification = Not... |
<<<<<<<
if (mix.type != 'float') {
throw new Error(`Blending cannot be performed by '${mix.type}'`);
}
if (__WEBPACK_IMPORTED_MODULE_1__schema__["b" /* checkschemaMatch */](a.schema, b.schema)) {
=======
if (__WEBPACK_IMPORTED_MODULE_1__schema__["b" /* checkSchemaMatch */](a.schema, b.schema))... |
<<<<<<<
lowerCaseFunctions.center = functions.CENTER;
lowerCaseFunctions.bottom = functions.BOTTOM;
=======
lowerCaseFunctions.pi = functions.PI;
lowerCaseFunctions.e = functions.E;
>>>>>>>
lowerCaseFunctions.center = functions.CENTER;
lowerCaseFunctions.bottom = functions.BOTTOM;
lowerCaseFunctions.pi = functions.P... |
<<<<<<<
import { runViewportAggregations } from './viz/expressions/aggregation/viewport/ViewportAggCalculator';
=======
import { GEOMETRY_TYPE } from '../utils/geometry';
>>>>>>>
import { runViewportAggregations } from './viz/expressions/aggregation/viewport/ViewportAggCalculator';
import { GEOMETRY_TYPE } from '../... |
<<<<<<<
if (Math.random() > 0.999) {
console.log(metadataPropertyName, name, this.value.expr);
}
=======
this.value._preDraw(drawMetadata, gl);
>>>>>>>
<<<<<<<
if (Math.random() > 0.99) {
console.log(`percentile${this.percentile}`, name... |
<<<<<<<
* @param {Number|number} value - Numeric expression that is going to be tested against the [lowerLimit, upperLimit] range
* @param {Number|number} lowerLimit - Numeric expression with the lower limit of the range
* @param {Number|number} upperLimit - Numeric expression with the upper limit of the range
* @... |
<<<<<<<
// Note the required 1 on 1 relationship between layer & viz
throw new CartoValidationError(`${cvt.INCORRECT_VALUE} The given Viz object is already bound to another layer. Vizs cannot be shared between different layers.`);
=======
// Not the required 1 on 1 relationship bet... |
<<<<<<<
_updateDrawMetadata(drawMetadata){
const column = drawMetadata.columns.find(c => c.name == this.property.name);
=======
_preDraw(drawMetadata, gl) {
const name = this._getColumnName();
const column = drawMetadata.columns.find(c => c.name === name);
>>>>>>>
... |
<<<<<<<
let colorValues = new Uint8Array(4 * width);
const metaColumn = this._meta.columns.find(c => c.name == this.property.name);
metaColumn.categoryNames.map((name, i) => {
=======
let pixels = new Uint8Array(4 * width);
const metaColumn = this._meta.prop... |
<<<<<<<
}
);
catFields.map((name, i) => fieldMap[name] = i);
numFields.map((name, i) => fieldMap[name] = i + catFields.length);
dateFields.map((name, i) => fieldMap[name] = i + catFields.length + numFields.length);
=======
... |
<<<<<<<
viewportAABB.minx -= vizOffset[0] * widthScale;
viewportAABB.maxx -= vizOffset[0] * widthScale;
viewportAABB.miny -= vizOffset[1] * widthScale;
viewportAABB.maxy -= vizOffset[1] * widthScale;
=======
viewportAABB = {
minx: viewportAAB... |
<<<<<<<
if (renderLayer.type === 'point') {
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
} else {
// lines & polygon (antialiasing)
=======
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
gl.vi... |
<<<<<<<
import { RGB, RGBA } from './expressions/rgb';
import { HSV, HSVA } from './expressions/hsv';
import { HSL, HSLA } from './expressions/hsl';
import NamedColor from './expressions/named-color';
=======
import {RGB, RGBA} from './expressions/rgb';
import {HSV, HSVA} from './expressions/hsv';
import {HSL, HSLA}... |
<<<<<<<
const featureClassCache = new Map();
=======
const AABBTestResults = {
INSIDE: 1,
OUTSIDE: -1,
INTERSECTS: 0
};
>>>>>>>
const featureClassCache = new Map();
const AABBTestResults = {
INSIDE: 1,
OUTSIDE: -1,
INTERSECTS: 0
};
<<<<<<<
const feature = new this._cls(index, thi... |
<<<<<<<
validateStaticTypeErrors('opacity', ['number']);
validateStaticTypeErrors('opacity', ['number', 'number']);
=======
validateStaticTypeErrors('opacity', ['float']);
validateDynamicTypeErrors('opacity', ['float', 'float']);
>>>>>>>
validateStaticTypeErrors('opacity', ['n... |
<<<<<<<
properties[name][i] = this._metadata.decode(name, f.properties[name]);
=======
const numericValue = Number(f.properties[name]);
properties[name][i] = Number.isNaN(numericValue)
? Number.MIN_SAFE_INTEGER
: numericValue;
... |
<<<<<<<
// window.ieShivDebug = true;
// uncomment above if you want to test
(function(exports) {
=======
(function (exports) {
>>>>>>>
(function (exports) {
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
=======
}
>>>>>>>
} |
<<<<<<<
// Sample Testacular configuration file, that contain pretty much all the available options
// It's used for running client tests on Travis (http://travis-ci.org/#!/vojtajina/testacular)
// Most of the options can be overriden by cli arguments (see testacular --help)
// base path, that will be used to resolv... |
<<<<<<<
let context = { bakerPath: env_address };
await connector.ready(context);
=======
try {
await connector.ready();
} catch (error) {
console.error(chalk.red(` => ${error}`));
process.exit(1);
}
>>>>>>>
let context = { bakerPath: env_address };
try {
a... |
<<<<<<<
=======
test('class prefix', async function(assert) {
assert.expect(1);
await render(hbs`<SelectBox::SelectedOptions @classNamePrefix="foo" />`);
assert
.dom('.foo__selected-options')
.exists({ count: 1 }, 'can override the class prefix');
});
test('data component attribute',... |
<<<<<<<
=======
test('class prefix attr', async function(assert) {
assert.expect(9);
await render(hbs`
<SelectBox @classNamePrefix="foo" as |sb|>
<sb.Input />
<sb.SelectedOptions>
<sb.SelectedOption />
</sb.SelectedOptions>
<sb.Options>
<sb.Group>
... |
<<<<<<<
=======
test('class prefix', async function(assert) {
assert.expect(2);
await render(hbs`<NativeSelectBox @classNamePrefix="foo" />`);
assert.dom('.foo').exists({ count: 1 }, 'can override the class prefix');
await render(hbs`
<NativeSelectBox @classNamePrefix="foo" as |sb|>
... |
<<<<<<<
import { Select, Card, Stack, Button, ButtonGroup } from "@shopify/polaris";
=======
import { Select, Card, Stack, Button, ButtonGroup, RangeSlider } from "@shopify/polaris";
import {
bandpassFilter,
epoch,
fft,
sliceFFT,
powerByBand
} from "@neurosity/pipes";
import {Subject} from "rxjs";
import { ... |
<<<<<<<
=======
// let delta = 0;
// let theta = 0;
>>>>>>>
<<<<<<<
=======
// let gamma = 0;
>>>>>>>
<<<<<<<
alpha = Math.floor((props.alpha/5) * p.width);
beta = Math.floor((props.beta/2) * p.height);
=======
// delta = Math.floor(props.delta);
// theta = Math.floor(100*props.theta)... |
<<<<<<<
,bg: 'Помпа'
=======
,ro: 'Pompă'
>>>>>>>
,bg: 'Помпа'
,ro: 'Pompă'
<<<<<<<
,de: 'Sensor-Alter'
,bg: 'Възраст на сензора'
=======
,de: 'Sensora-Alter'
,ro: 'Vechimea senzorului'
>>>>>>>
,de: 'Sensor-Alter'
,bg: 'Възраст на сензора'
,ro: 'V... |
<<<<<<<
env.settings.enable.should.containEql('pushover');
=======
env.enable.should.containEql('pushover');
env.extendedSettings.pushover.apiToken.should.equal('abc12345');
>>>>>>>
env.settings.enable.should.containEql('pushover');
env.extendedSettings.pushover.apiToken.should.equal('abc12345');... |
<<<<<<<
if (!isTimeAgoAlarmType(currentAlarmType)) {
bg_title = alarmMessage + ': ' + generateTitle();
}
} else if (browserSettings.customTitle) {
$('.customTitle').text(browserSettings.customTitle);
=======
} else if (currentAnnouncement) {
announcementInProgress = Date.now() ... |
<<<<<<<
,he: 'חובה לאפשר רמה בזלית זמנית כדי לרות דוח זה'
=======
,bg: 'временните базали трябва да са показани за да се покаже тази това'
,he: 'חובה לאפשר רמה בזלית זמנית כדי לרות דוח זה'
>>>>>>>
,he: 'חובה לאפשר רמה בזלית זמנית כדי לרות דוח זה'
,bg: 'временните базали трябва да са показа... |
<<<<<<<
, de: 'Oberes Ziel'
=======
, tr: 'Hedef Üst'
>>>>>>>
, de: 'Oberes Ziel'
, tr: 'Hedef Üst'
<<<<<<<
, de: 'Unteres Ziel'
=======
, tr: 'Hedef Alt'
>>>>>>>
, de: 'Unteres Ziel'
, tr: 'Hedef Alt'
<<<<<<<
, de: 'Abgebrochen'
=======
, tr: 'İptal edildi'
>... |
<<<<<<<
'alexaLoopForecast': {
bg: 'According to the loop forecast you are expected to be %1 over the next %2'
, cs: 'Podle přepovědi smyčky je očekávána glykémie %1 během následujících %2'
, en: 'According to the loop forecast you are expected to be %1 over the next %2'
, hr: 'According to ... |
<<<<<<<
renderer.addBasals(client);
renderer.addTreatmentProfiles(client);
=======
>>>>>>>
renderer.addTreatmentProfiles(client); |
<<<<<<<
var units = require('./units')();
=======
var ObjectID = require('mongodb').ObjectID;
>>>>>>>
var units = require('./units')();
var ObjectID = require('mongodb').ObjectID; |
<<<<<<<
,it: 'Tempo in fluttuazione'
=======
,ru: 'время флуктуаций'
>>>>>>>
,it: 'Tempo in fluttuazione'
,ru: 'время флуктуаций'
<<<<<<<
,it: 'Tempo in rapida fluttuazione'
=======
,ru: 'время быстрых флуктуаций'
>>>>>>>
,it: 'Tempo in rapida fluttuazione'
,ru: 'в... |
<<<<<<<
var latestSGV,
=======
var retrospectivePredictor = true,
latestSGV,
errorCode,
>>>>>>>
var latestSGV,
errorCode,
<<<<<<<
var futureOpacity = d3.scale.linear( )
.domain([TWENTY_FIVE_MINS_IN_MS, SIXTY_MINS_IN_MS])
.range([0.8, 0.1]);
=======
//TO... |
<<<<<<<
cs: 'Energie [kJ]'
,de: 'Energie [kJ]'
,fi: 'Energia [kJ]'
,es: 'Energía [Kj]'
,fr: 'Énergie [kJ]'
,ro: 'Energie [g]'
,ru: 'энергетика'
,it: 'Energia [kJ]'
},
'Clock Views': {
fi: 'Kellonäkymä'
,es: 'Vista del reloj'
,fr: 'Vue H... |
<<<<<<<
const rnInstall = await reactNative.install({ name })
=======
const rnInstall = await reactNative.install({ name, skipJest: true, version: REACT_NATIVE_VERSION })
>>>>>>>
const rnInstall = await reactNative.install({ name, version: REACT_NATIVE_VERSION }) |
<<<<<<<
function remove (_id, fn) {
api( ).remove({ '_id': new ObjectID(_id) }, fn);
ctx.bus.emit('data-received');
}
function save (obj, fn) {
obj._id = new ObjectID(obj._id);
prepareData(obj);
api().save(obj, fn);
ctx.bus.emit('data-received');
}
=======
function query_for (op... |
<<<<<<<
=======
client.utils = require('../utils')({
settings: client.settings
, language: language
});
//After plugins are initialized with browser settings;
browserSettings.loadAndWireForm();
>>>>>>>
client.utils = require('../utils')({
settings: client.settings
, language: language
}... |
<<<<<<<
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
=======
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
>>>>>>>
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
sandb... |
<<<<<<<
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports,... |
<<<<<<<
{ type: 'console' }
=======
{ type: "stdout" }
>>>>>>>
{ type: 'stdout' }
<<<<<<<
let appenders = {};
=======
>>>>>>>
let appenders = {};
<<<<<<<
function doesLevelEntryContainsLogger(levelCategory, loggerCategory) {
const normalizedLevelCategory = normalizeCategory(levelCategory);
con... |
<<<<<<<
const sandbox = require('@log4js-node/sandboxed-module');
=======
const childProcess = require('child_process');
const sandbox = require('sandboxed-module');
>>>>>>>
const childProcess = require('child_process');
const sandbox = require('@log4js-node/sandboxed-module'); |
<<<<<<<
module.exports.configure = configure;
=======
function shutdown(cb) {
let completed = 0;
let error;
const complete = (err) => {
error = error || err;
completed++; // eslint-disable-line no-plusplus
if (completed >= openFiles.length) {
cb(error);
}
};
if (!openFiles.length) {
... |
<<<<<<<
const sandbox = require('@log4js-node/sandboxed-module');
=======
const sandbox = require('sandboxed-module');
const appender = require('../../lib/appenders/logFaces-HTTP');
>>>>>>>
const sandbox = require('@log4js-node/sandboxed-module');
const appender = require('../../lib/appenders/logFaces-HTTP'); |
<<<<<<<
const defaultTokens = [];
defaultTokens.push({ token: ':url', replacement: req.originalUrl });
defaultTokens.push({ token: ':protocol', replacement: req.protocol });
defaultTokens.push({ token: ':hostname', replacement: req.hostname });
defaultTokens.push({ token: ':method', replacement: req.method })... |
<<<<<<<
`${path.join(mainPath, '../../node_modules/tap/node_modules/nyc/bin/cheese')}`
] = testAppender('correct', result);
const sandboxedLog4js = sandbox.require('../../lib/log4js', sandboxConfig);
=======
`${path.join(mainPath, '../../node_modules/nyc/bin/cheese')}`
] = testAppender('correc... |
<<<<<<<
$("#editEntryButton").off("click");
$("#editEntryButton").click(editTestCaseModalSaveHandler);
=======
>>>>>>>
$("#editEntryButton").off("click");
$("#editEntryButton").click(editTestCaseModalSaveHandler);
<<<<<<<
=======
var jqxhr = $.post("UpdateTestCase2", formEdit.serialize());
... |
<<<<<<<
BEST.scene('creative:twitter', {
=======
const Tweets = [
{
imageURL: "assets/images/users/1.png",
displayName: "Opbeat",
userName: "@opbeat",
tweetContent: "Slack + Opbeat = ❤️ - Native @SlackHQ integration is here! <span class='tweet-link'>https://opbeat.com/blog/posts/be... |
<<<<<<<
router.get("/project/:slug/ajax_rpm", main.ajax_rpm);
=======
router.get("/teams", main.teams);
>>>>>>>
router.get("/project/:slug/ajax_rpm", main.ajax_rpm);
router.get("/teams", main.teams); |
<<<<<<<
router.get("/project/:slug/ajax_rpm", main.ajax_rpm);
=======
// error handler after that
router.use(function (err, req, res, cb) {
if (err.subject == "Unauthorized") {
requirejs(["views/signup_view"], safe.trap(cb, function (view) {
res.status(401);
res.renderX({view:vie... |
<<<<<<<
=======
{name:"stats",require:"./modules/statsapi.js"},
{name:"newrelic_server",require:"./modules/newrelic_agent"},
{name:"getsentry_server",require:"./modules/getsentry_agent"},
>>>>>>>
{name:"stats",require:"./modules/statsapi.js"}, |
<<<<<<<
router.use(function (err, req, res, next) {
switch (true) {
case err.subject == "Login required":
res.redirect('/web/signup')
break;
case err.subject == "Access forbidden":
res.redirect('/web/')
break;
}
self.errHandler(err);
})
=======
>>>>>>>
<<<<<<<
... |
<<<<<<<
create_add_task_dialog = function(entity_id){
=======
create_create_task_dialog = function(taskable_entity_id){
>>>>>>>
create_create_task_dialog = function(entity_id){
<<<<<<<
href: '/add/task/' + entity_id,
=======
href: '/create/task/' + taskable_... |
<<<<<<<
this.fd = fs.openSync(this.localPath, 0);
this.uploadedSize = 0;
this.networkParentDirPath = networkParentDirPath;
=======
this.networkParentDirPath = networkParentDirPath[ networkParentDirPath.length - 1 ] === '/' ?
networkParentDirPath : networkParentDirPath + '/';
>>>>>>>
this.... |
<<<<<<<
function handleJoiningRaftNetwork(options, cb){
=======
function joinRaftNetwork(config, cb){
console.log('[*] Starting new network...')
let seqFunction = async.seq(
util.ClearDirectories,
util.CreateDirectories,
util.GetNewGethAccount,
displayGethAccount,
util.GenerateNodeKey,
... |
<<<<<<<
Template.registerHelper('stoneIconPath', stoneIconPath);
export function setChartTheme(name) {
if (Highcharts.theme[name]) {
const themeOptions = Highcharts.theme[name];
const defaultOptions = Highcharts.getOptions();
for (const prop in defaultOptions) {
if (typeof defaultOptions[prop] !==... |
<<<<<<<
$(".paymentForm").hide();
$(".paymentButton").show();
$(".paymentButton").click(function(){
$(".paymentButton").slideUp();
$(".paymentForm").slideDown();
return false;
});
$(".reclaimButton").click(tapiriik.PaymentReclaimDialogLinkClicked);
=======
if (tapiriik.User !== undefined) {
for (var i... |
<<<<<<<
var pc = []; // hold local peerconnection statuses
window.pc = pc;
const pcmap = new Map(); // A map of all peer ids to their peerconnections.
window.pcmap = pcmap;
=======
const pcMap = new Map(); // A map of all peer ids to their peerconnections.
>>>>>>>
const pcMap = new Map(); // A map of all peer ids to... |
<<<<<<<
import Comment from './demos/Comment'
=======
import Pulldown from './demos/Pulldown'
import Pullup from './demos/Pullup'
const FastClick = require('fastclick')
FastClick.attach(document.body)
>>>>>>>
import Comment from './demos/Comment'
import Pulldown from './demos/Pulldown'
import Pullup from './demos/P... |
<<<<<<<
.get('/products/studio', (_, res) => res.render('products/studio'))
// .get('/pro/teams', (_, res) => res.render('pro/teams'))
.get('/products/enterprise-core', (_, res) => res.render('products/enterprise-core'))
=======
.get('/pro/teams', (_, res) => res.render('pro/teams'))
>>>>>>>
// .get('/pro... |
<<<<<<<
const GPUPicker = require('./three/GPUPickers/GPUPicker')
const IKHelper = require('./three/IkHelper')
=======
>>>>>>>
const GPUPicker = require('./three/GPUPickers/GPUPicker')
const IKHelper = require('./three/IkHelper')
<<<<<<<
const ikHelper = useRef(null)
const getIkHelper = () => {
if(ikHelper.... |
<<<<<<<
//console.log('scene objects changed, updating controls')
=======
// console.log('scene objects changed, updating controls')
>>>>>>>
<<<<<<<
let closest = null
=======
>>>>>>>
let closest = null
<<<<<<<
useEffect(() => {
camera = scene.children.find(child => child.us... |
<<<<<<<
import { useExportToGltf, loadCameraModel } from '../../../hooks/use-export-to-gltf'
=======
import useSaveToStoryboarder from '../../hooks/use-save-to-storyboarder'
import { useExportToGltf } from '../../../hooks/use-export-to-gltf'
>>>>>>>
import { useExportToGltf, loadCameraModel } from '../../../hooks/us... |
<<<<<<<
{
navigator.getGamepads()[controller.userData.gamepad.index] &&
navigator.getGamepads()[controller.userData.gamepad.index].hand === (switchHand ? 'left' : 'right') &&
<group>
<Controls
gltf={resources.controlsGlt... |
<<<<<<<
const [poseSelector, setPoseSelector] = useState(false)
=======
const [helpToggle, setHelpToggle] = useState(false)
const [helpSlide, setHelpSlide] = useState(0)
>>>>>>>
const [poseSelector, setPoseSelector] = useState(false)
const [helpToggle, setHelpToggle] = useState(false)
const [helpSlide, s... |
<<<<<<<
let poleConstraints = this.chainObjects[i].poleConstraint;
if(poleConstraints != null)
{
let poleTarget = poleConstraints.poleTarget;
let polePosition = poleConstraints.poleTarget.mesh.position;
let targetPosition = new THREE.Ve... |
<<<<<<<
const dragInfo = useRef({prev: [0, 0], current: [0, 0]})
=======
const fakeCamera = useRef()
>>>>>>>
const dragInfo = useRef({prev: [0, 0], current: [0, 0]})
const fakeCamera = useRef() |
<<<<<<<
return <group
=======
return skinnedMesh ? (
<group
//visible={false}
>>>>>>>
return <group
//visible={false}
<<<<<<<
{
skinnedMesh && (
<group
ref={object}
bonesHelper={bonesHelper ? bonesHelper : null}
userData={{
... |
<<<<<<<
import ObjectRotationControl from '../shared/IK/objects/ObjectRotationControl'
=======
import RemoteProvider from "./components/RemoteProvider"
import RemoteClients from "./components/RemoteClients"
import XRClient from "./components/Three/XRClient"
>>>>>>>
import ObjectRotationControl from '../shared/IK/obj... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.