conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
// this.subHeader.focus();
// document.getElementsByClassName('js-subheader-column')[0].childNodes[0].focus();
// document.getElementsByClassName('js-subheader-column')[0].focus();
windowType && dataId && dispatch(getRelatedDocuments(windowType, dataId)).then((response) => {
... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
handleChange = (e, property) => {
// const {dispatch, tabId, rowId, isModal, relativeDocId, precision} = this.props;
// let currRowId = rowId;
// if(!this.validatePrecision(e.target.value)){
// return;
// }
... |
<<<<<<<
const {textValue} = this.state;
=======
>>>>>>>
const {textValue} = this.state; |
<<<<<<<
if (list.length > 0) {
let openDropdownState = {};
=======
if (list.length > 0) {
let openDropdownState = {};
if (this.openDropdown && (list.length > 1)) {
this.openDropdown = false;
openDropdownState.isOpen = t... |
<<<<<<<
this.table = null;
=======
this.supportAttribute = false;
>>>>>>>
this.table = null;
this.supportAttribute = false; |
<<<<<<<
componentDidMount() {
// document.activeElement.getElementsByClassName('input-field')[0].focus();
}
renderWidget = (widgetType, fields, windowType, dataId, type, data, rowId, tabId, icon) => {
=======
renderWidget = (widgetType, fields, windowType, dataId, type, data, rowId,... |
<<<<<<<
patchAll,
=======
getRowsData
>>>>>>>
patchAll,
getRowsData |
<<<<<<<
if (indentSupported && rowData.get(`${tabId}`)) {
rowsData = getRowsData(rowData.get(`${tabId}`));
=======
if (indentSupported && rowData.get(`${tabid}`).size) {
rowsData = getRowsData(rowData.get(`${tabid}`));
>>>>>>>
if (indentSupported && rowData.get(`${tabId}`).size) {
rowsD... |
<<<<<<<
type Options = {
checkConstraints: boolean,
fireTriggers: boolean,
keepNulls: boolean,
lockTable: boolean
};
type Column = {
type: Object,
name: string,
value: null,
output: boolean,
length?: number,
precision?: number,
scale?: number,
objName: string,
nullable: boolean
};
type Colum... |
<<<<<<<
View: require('./view'),
Notebook: require('./notebook'),
Inspector: require('./inspector'),
Cell: require('./cells/cell'),
CodeCell: require('./cells/code'),
TextCell: require('./cells/text'),
EditorCell: require('./cells/editor'),
ResultCell: require('./cells/result')
=====... |
<<<<<<<
},
{
affirmation: "A champion is defined not by their wins but how they can recover when they fall.",
source: "unkown",
author: "Serena Williams"
=======
},
{
affirmation: "Every decision I make is the right one for me.",
source: "www.louisehay.com/affirmations/",
author: "Loui... |
<<<<<<<
},
{
affirmation: "Every decision I make is the right one for me.",
source: "www.louisehay.com/affirmations/",
author: "Louise Hay"
},
{
affirmations: "My life is joyously balanced with Work and Play.",
source: "https://www.louisehay.com/affirmations/",
author: "Louise Hay"
},
... |
<<<<<<<
/**
* Morphism curried function.
* @param {Map<string, any>} schema
* @param {} items
* @param {} type
*/
export default function Morphism(schema, items, type) {
const transformItems = customizer => input => {
if(input === undefined){
return undefined;
}
if(Array... |
<<<<<<<
autoUpdater.logger = require('electron-log');
autoUpdater.logger.transports.file.level = 'info';
autoUpdater.autoDownload = false;
app.setAsDefaultProtocolClient('deskfiler');
=======
if (!app.isDefaultProtocolClient('deskfiler')) {
app.setAsDefaultProtocolClient('deskfiler');
}
>>>>>>>
autoUpdater.logge... |
<<<<<<<
var style = MapCSS.restyle()({}, zoom, "canvas")['default'];
=======
var style = restyle({}, zoom, "canvas", "canvas")['default'];
>>>>>>>
var style = MapCSS.restyle()({}, zoom, "canvas", "canvas")['default']; |
<<<<<<<
=======
this._invertYAxe(data)
>>>>>>>
this._invertYAxe(data)
<<<<<<<
=======
_invertYAxe: function(data) {
var type, coordinates, tileSize = data.granularity;
for (var i = 0; i < data.features.length; i++) {
coordinates = data.features[... |
<<<<<<<
this.notes = notes;
=======
this.notes = [
'kk',
'sn',
'hh',
'ho',
'A',
'F#',
'E',
'C#',
];
this.storeRecord = record => storeRecord(record);
>>>>>>>
this.notes = notes;
this.storeRecord = record => storeRecord(record); |
<<<<<<<
/**
* Math Definition
*/
const TWO_PI = Math.PI * 2;
const cos = Math.cos;
const sin = Math.sin;
/**
* like range function in lodash
* @param {number} n [description]
* @return {Array} [description]
*/
function range(n) {
return Array.from(Array(n).keys());
}
=======
function range(n) {
return Ar... |
<<<<<<<
for (var i = 1; i < 10; i++) {
tracer._select(i);
logger._print(' LIS[' + i + '] = ' + LIS[i]);
for (var j = 0; j < i; j++) {
tracer._notify(j)._wait();
tracer._denotify(j);
if (A[i] > A[j] && LIS[i] < LIS[j] + 1) {
LIS[i] = LIS[j] + 1;
logger._print('... |
<<<<<<<
if (params.capture.transform) {
let transformedVal = evil(params.capture.transform).call(context.vars);
context.vars[params.capture.as] = transformedVal;
debug('transformed value =', context.vars[params.capture.as]);
}
=======
debug... |
<<<<<<<
=======
const _ = require('lodash');
const core = require('artillery-core');
const runner = core.runner;
const Stats = core.stats;
>>>>>>>
<<<<<<<
let runner = createRunner(result.script,
result.payload,
{ environment: options.environment... |
<<<<<<<
test('Capture and save to attribute of an Object in context.vars - JSON', (t) => {
const fn = path.resolve(__dirname, './scripts/captures3.json');
const script = require(fn);
const data = fs.readFileSync(path.join(__dirname, 'pets.csv'));
csv(data, function(err, parsedData) {
if (err) {
t.fail... |
<<<<<<<
var blockMode = false;
ast = ast || [{}, 'stylesheet'];
=======
var usageData = false;
>>>>>>>
var blockMode = false;
var usageData = false;
ast = ast || [{}, 'stylesheet'];
<<<<<<<
if (ast[1] !== 'stylesheet') {
blockMode = true;
ast = [null, 'stylesheet',
... |
<<<<<<<
=======
const logger = require('../../utils/logger');
const coreUtils = require('../../utils/core.js');
>>>>>>>
const coreUtils = require('../../utils/core.js');
<<<<<<<
const getKnownSender = function (transaction, cb) {
knowledge.getKnownAddress(transaction.senderId, (err, data) => {
transaction.kno... |
<<<<<<<
if (_.size(body.data) > 0) {
const block = coreResponseMapper(body.data[0]);
=======
if (body && _.size(body.data) > 0) {
const block = [body.data[0]].map(coreResponseMapper)[0];
>>>>>>>
if (body && _.size(body.data) > 0) {
const block = coreResponseMapper(body.data[0]); |
<<<<<<<
vm.txs = { results: resp.data.transactions.slice(0, 19) };
=======
let removedTx;
if (resp.data.transactions.length > limit - 1) {
removedTx = resp.data.transactions.splice(-1, 1);
}
vm.txs = { results: resp.data.transactions };
>>>>>>>
vm.txs = { results: resp.data.transactions... |
<<<<<<<
logger.info(req.originalUrl);
try {
decodeURIComponent(req.path);
} catch (err) {
logger.info(err);
return res.redirect('/');
}
if (req.originalUrl.split('/')[1] !== 'api') {
return next();
}
if (req.originalUrl === undefined) {
=======
logger.info(req.originalUrl);
if (req.originalUrl ==... |
<<<<<<<
import 'angular-sanitize';
=======
import 'angular-cookies';
// import 'babel-polyfill';
>>>>>>>
import 'angular-sanitize';
import 'angular-cookies';
<<<<<<<
import '../components/information-banner';
=======
import '../components/cookies-banner';
>>>>>>>
import '../components/information-banner';
import... |
<<<<<<<
const NS_ERROR_UCONV_NOCONV = 0x80500001;
=======
>>>>>>>
<<<<<<<
function convertToUnicode (text, charset) {
if (null === unicodeConverter) {
unicodeConverter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
createInstance(Ci.nsIScriptableUnicodeConverter);
... |
<<<<<<<
expect(slimer.version.minor).toEqual(9);
expect(slimer.version.patch).toEqual(0);
=======
expect(slimer.version.minor).toEqual(8);
expect(slimer.version.patch).toEqual(1);
>>>>>>>
expect(slimer.version.minor).toEqual(9);
expect(slimer.ve... |
<<<<<<<
slug
=======
environmentAliases {
id
name
slug
}
>>>>>>>
environmentAliases {
id
name
... |
<<<<<<<
self.events = new mongo.Collection(client, options.eventsCollectionName);
self.events.ensureIndex({ aggregateId: 1, streamRevision: 1 },
=======
self.events = self.db.collection(options.eventsCollectionName);
self.events.ensureIndex({ streamId: 1, aggregateId: 1, aggregate: 1, ... |
<<<<<<<
=======
console.log("aaaa", process.cwd() + "/statis.json");
await fs.writeFile(process.cwd() + "/.statis.json", JSON.stringify(stats.toJson()));
>>>>>>> |
<<<<<<<
function filter(chunk, context, bodies, params, filterCheck) {
var actual,
expected;
params = params || {};
=======
// Utility method: to invoke the given filter operation such as eq/gt etc
function filter(chunk, context, bodies, params, filterOp) {
var params = params || {},
body = bodies.b... |
<<<<<<<
name: "sep",
=======
name: "idx",
tests: [
{
name: "idx helper with no body",
source: '{#n}{@idx/}{.} {/n}',
context: { n: ["Mick", "Tom", "Bob"] },
expected: "Mick Tom Bob ",
message: "idx helper with no body should not render"
},
{... |
<<<<<<<
return async function (data) {
=======
return async function(data) {
let fn = await fnReady;
>>>>>>>
return async function (data) {
let fn = await fnReady; |
<<<<<<<
// this.userExtensionMap = {};
=======
this.useGitIgnore = true;
>>>>>>>
this.useGitIgnore = true;
// this.userExtensionMap = {}; |
<<<<<<<
test("getAllGlobalData() with config globalData", async t => {
let dataObj = new TemplateData("./test/stubs/");
dataObj._setConfig({
...dataObj.config,
globalData: {
example: () => {
return "one";
},
example2: async () => {
return "two";
},
example3: "s... |
<<<<<<<
=======
await this.config.events.emit("beforeWatch");
>>>>>>> |
<<<<<<<
return this.configOverride || require("./Config").getConfig();
=======
if (!this._config) {
this._config = config.getConfig();
}
return this._config;
>>>>>>>
return this.configOverride || require("./Config").getConfig();
<<<<<<<
get keyMap() {
return EleventyExtensionMap._get... |
<<<<<<<
TemplateWriter.getFileIgnores = function(inputDir) {
let ignorePath = TemplatePath.normalize(inputDir + "/.eleventyignore");
=======
TemplateWriter.getFileIgnores = function(baseDir) {
debug("Getting ignored files in .eleventyignore");
let ignorePath = TemplatePath.normalize(baseDir + "/.eleventyignore"... |
<<<<<<<
strictFilters: false
=======
strict_filters: false,
>>>>>>>
strictFilters: false,
<<<<<<<
render: async function(scope, hash) {
let argArray = await Liquid.parseArguments(
_t.argLexer,
this.args,
scope,
this.liquid
... |
<<<<<<<
callback(obj);
});
};
exports.messageRxd = function(api, event) {
switch (event.body) {
case exports.commandPrefix + 'shutdown':
var shutdownResponses = ['Good Night', 'I don\'t blame you.', 'There you are.', 'Please.... No, Noooo!'];
var index = Math.floor(Math.random() * shutdownResponses.length)... |
<<<<<<<
=======
p.switchDrawingTextureState = function (state) {
if (state == this.drawingTexture) {
return;
}
var gl = this.context;
var shader;
if (state) {
if (this.filterType == "col... |
<<<<<<<
* @param hideObject {number} 表示是否隐藏对象。如果值为 true，则表示没有绘制对象本身，只有阴影是可见的。默认值为 false（显示对象）。
* @version Egret 2.4
* @platform Web,Native
=======
* @version Egret 3.1.4
* @platform Web
>>>>>>>
* @param hideObject {number} 表示是否隐藏对象。如果值为 true，则表示没有绘制对象本身，只有阴影是可见的。... |
<<<<<<<
/**
* @private
*/
_this.$tintRGB = 0;
=======
_this._tintRGB = 0;
/*
* inspired by pixi.js
*/
_this.sortDirty = false;
_this._zIndex = 0;
_this._lastSortedIndex = 0;
... |
<<<<<<<
{ "v": "5.2.30", command: Upgrade_5_2_30 }
=======
{ "v": "5.2.25", command: Upgrade_5_2_25 },
>>>>>>>
{ "v": "5.2.25", command: Upgrade_5_2_25 }
<<<<<<<
var Upgrade_5_2_30 = /** @class */ (function () {
function Upgrade... |
<<<<<<<
/**
* 转换成base64字符串，如果图片（或者包含的图片）跨域，则返回null
* @param type 转换的类型，如: "image/png","image/jpeg"
*/
p.toDataURL = function (type, encoderOptions) {
return this.surface.toDataURL(type, encoderOptions);
};
/**
... |
<<<<<<<
<ColumnContainer>
<ElementStyle
{...getElementStyleProps(element)}
style={{ width: "100%", display: "flex", flexDirection: "column" }}
>
<ConnectedElement elementId={element.id}>
{({ id, path, type, elements }) =... |
<<<<<<<
=======
Matrix.prototype.$getSkewX = function () {
if (this.d < 0) {
return Math.atan2(this.d, this.c) + (PI / 2);
}
else {
return Math.atan2(this.d, this.c) - (PI / 2);
}
};
>>>>>>>
<<<<<<<
Rectangle.pro... |
<<<<<<<
return NativeRenderTextureRenderContext;
})(egret.HashObject);
native.NativeRenderTextureRenderContext = NativeRenderTextureRenderContext;
egret.registerClass(NativeRenderTextureRenderContext,'egret.native.NativeRenderTextureRenderContext');
=======
return Nativ... |
<<<<<<<
=======
//console.log(doc);
>>>>>>>
<<<<<<<
if(typeof timeline !== 'undefined'){
timeline.addItem({
'start': date,
'end': '', // end is optional
'content': content+'<br>',
'editable':false
});
}
=======
timeline.addItem({
'start': date,... |
<<<<<<<
=======
import i18nPlugins from "webiny-api-i18n/plugins";
>>>>>>>
<<<<<<<
import formPlugins from "webiny-api-forms/plugins";
=======
import headlessPlugins from "webiny-api-headless/plugins";
>>>>>>>
import gtmPlugins from "webiny-api-google-tag-manager";
<<<<<<<
=======
apiPlugins,
i18nPlug... |
<<<<<<<
function Linter (opts) {
var self = this
if (!(self instanceof Linter)) return new Linter(opts)
opts = opts || {}
self.cmd = opts.cmd || 'standard'
self.eslintConfig = defaults(opts.eslintConfig, {
reset: true,
useEslintrc: false
})
if (!self.eslintConfig) {
throw new Error('No eslintC... |
<<<<<<<
var TMP = path.join(__dirname, '..', 'tmp')
var STANDARD = path.join(__dirname, 'lib', 'standard-cmd.js')
=======
var GIT = 'git'
var STANDARD = path.join(__dirname, '..', 'bin', 'cmd.js')
var TMP = path.join(__dirname, '..', 'tmp')
var PARALLEL_LIMIT = Math.min(os.cpus().length * 1.5)
>>>>>>>
var GIT = 'gi... |
<<<<<<<
hotKeyEnabled: true,
mouseIsActive: false
}
=======
hotKeyEnabled: true
},
favorites: []
>>>>>>>
hotKeyEnabled: true,
mouseIsActive: false
},
favorites: []
<<<<<<<
this.onMouseMove = this.onMouseMove.bind(this);
=======
this.add... |
<<<<<<<
export default function getValue({
=======
/**
* get value
* @export
* @param {Object} {
* fields,
* value,
* coinunit
* }
* @param {String} label
* @param {Number} [index=0]
* @return {Number}
*/
export default function getValue ({
>>>>>>>
/**
* get value
* @export
* @param {Object} {
*... |
<<<<<<<
* @license RequireJS 0.14.5+ Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
=======
* @license RequireJS 0.15.0+ Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
>>>>>>>
* @license RequireJS 0.15.0+ Copyright (c) 2010, The Dojo Foundation All Rights Reserved.
<<<<<<<
var ver... |
<<<<<<<
reflux: 'libs/reflux/dist/reflux',
dataio: '/data.io',
=======
_dataio: '/data.io',
>>>>>>>
reflux: 'libs/reflux/dist/reflux',
_dataio: '/data.io', |
<<<<<<<
var parentName = (node.getParent() && node.getParent().getValue()) ?
node.getParent().getValue().name :
'';
=======
var parentPath = (node.getParent() && node.getParent().getValue())
? node.getParent().getValue().path
... |
<<<<<<<
var commonJSHeader = (['',
'__INJECT_NS__.INTERNAL.execute.__FUNCTION_ID__ = function() {',
' with (window) {',
' __INJECT_NS__.INTERNAL.modules.__FUNCTION_ID__ = __INJECT_NS__.INTERNAL.createModule("__MODULE_ID__", "__MODULE_URI__");',
' __INJECT_NS__.INTERNAL.execs.__FUNCTION_ID__ = function() {'... |
<<<<<<<
it("should receive an event with circular object", function(done)
{
const Obj = function()
{
this.one = "one"
this.two = "two"
this.ref = this
}
server.emit("circularUpdate", new Obj())
... |
<<<<<<<
menuItem.position.setY((currentHeight)-(menuHeight/2)+(size/2)); // MATH?
menuItem.position.setX(menuItem.geometry.boundingSphere.radius*-0.5);
menuItem.menuItemSelectCallback = items[items.length-i-1].action || null;
menuItem.theRoomYouWillJoin = items[items.length-i-1].room;
menu... |
<<<<<<<
"./client/game/classes/s.Enemies.js",
=======
"./client/game/classes/s.Bot.js",
>>>>>>>
"./client/game/classes/s.Bot.js",
"./client/game/classes/s.Enemies.js", |
<<<<<<<
=======
const Defs = {};
/**
* @typedef {{
* basePatchNum: (string|number),
* patchNum: (number),
* }}
*/
Defs.patchRange;
/**
* @typedef {{
* url: string,
* fetchOptions: (Object|null|undefined),
* anonymizedUrl: (string|undefined),
* }}
*/
Defs.Fet... |
<<<<<<<
this.socket.on( 'sync', this.makeTrigger( 'sync'));
=======
this.socket.on('bot retrieval', this.makeTrigger( 'bot retrieval' ));
this.socket.on('bot positions', this.makeTrigger( 'bot positions' ));
>>>>>>>
this.socket.on( 'sync', this.makeTrigger( 'sync'));
... |
<<<<<<<
=======
=== Start of Comms Handlers ==========*/
// console.log(typeof this);
// // Bind functions
// this.bind(this.handleFire);
// this.bind(this.handleJoin);
// this.bind(this.handleLeave);
// this.bind(this.handleMove);
// this.bind(this.handleEnemyFire);
// this.bind(this.handleHit);
//... |
<<<<<<<
construct: function () {
this.quat = new THREE.Quaternion();
=======
toString: 'oculus',
construct: function (options) {
this.quat = new THREE.Quaternion();
>>>>>>>
toString: 'oculus',
construct: function (options) {
this.quat = new THREE.Quaternion();
<<<<<<<
this.compensationX = ... |
<<<<<<<
io.sockets.socket(target.hostPlayer).emit("bot retrieval");
=======
>>>>>>>
io.sockets.socket(target.hostPlayer).emit("bot retrieval");
<<<<<<<
=======
// ************************************************************************ //
baseFire: function (socket, packet) {
socket... |
<<<<<<<
sources: [{
src: `${episodeState.vlink}/${episodeName}.mp4`,
type: 'video/mp4'
}],
poster: '',
=======
sources: [
{
src: `${episodeState.vlink}/${episodeName}.mp4`,
type: 'video/mp4',
},
... |
<<<<<<<
import { Attributes, NonComposedEvents } from "dom-expressions";
import VoidElements from "./VoidElements";
=======
import { Attributes, NonComposedEvents, SVGElements } from 'dom-expressions';
import VoidElements from './VoidElements';
>>>>>>>
import { Attributes, NonComposedEvents, SVGElements } from "dom-... |
<<<<<<<
var defaultColorPattern = ['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728', '#9467bd', '#8c564b', '#e377c2', '#7f7f7f', '#bcbd22', '#17becf'], //same as d3.scale.category10()
color = generateColor(__data_colors, notEmpty(__color_pattern) ? __color_pattern : defaultColorPattern, __data_color),
... |
<<<<<<<
constructor(name: string, attributesContainer: EntityAttributesContainer, entity: Class<File>) {
super(name, attributesContainer, entity, "ref");
=======
constructor(name: string, attributesContainer: EntityAttributesContainer) {
super(name, attributesContainer, File, "ref", () => {
... |
<<<<<<<
import Patterns from './patterns.js'
export default function Commander (terminal) {
this.patterns = new Patterns(terminal)
=======
function Commander (terminal) {
>>>>>>>
export default function Commander (terminal) { |
<<<<<<<
// TODO: this should probably be in visualizer_ui instead
var searchForm = $('#search_form');
var searchFormSubmit = function(evt) {
dispatcher.post('hideForm', [searchForm]);
var _searchtype= $('#search_type').val();
var _searchtext = $('#search_text').val();
v... |
<<<<<<<
var spanDesc = spanTypes[span.type];
var bgColor = ((spanDesc && spanDesc.bgColor) ||
(spanTypes.SPAN_DEFAULT &&
spanTypes.SPAN_DEFAULT.bgColor) || '#ffffff');
if (bgColor == "hidden") {
span.hidden = true;
... |
<<<<<<<
=======
// partially duplicate marking of annotator note comments
if (comment[1] == "AnnotatorNotes") {
span.annotatorNotes = comment[2];
}
>>>>>>>
<<<<<<<
tmp = -tmp;
}
=======
tmp = -tmp;
}
>>>>>>>
... |
<<<<<<<
// unfocus all elements to prevent focus being kept after
// hiding them
spanForm.parent().find('*').blur();
=======
spanOptions.attributes = $.toJSON(attributes);
>>>>>>>
// unfocus all elements to prevent focus being kept after
// hiding them
... |
<<<<<<<
aria-label="Add a new to-do item"
placeholder="Add a to-do..."
=======
id="new-todo"
>>>>>>>
aria-label="Add a new to-do item"
placeholder="Add a to-do..."
id="new-todo" |
<<<<<<<
function connectDomainSocket_p(sockName, socketPath, interval, timeout,
shouldStop) {
=======
function connect_p(host, port, interval, timeout, shouldContinue) {
>>>>>>>
function connectDomainSocket_p(sockName, socketPath, interval, timeout,
shouldContinue) {
<<<<<<<
' with name ' + soc... |
<<<<<<<
function launchWorker_p(appSpec, listenPort, logFilePath, workerId) {
=======
function launchWorker_p(appSpec, socketPath, logFilePath) {
>>>>>>>
function launchWorker_p(appSpec, socketPath, logFilePath, workerId) {
<<<<<<<
var worker = new AppWorker(appSpec, listenPort, logStream, workerId);
=======... |
<<<<<<<
var ECDSA = bitcore.ECDSA;
var Hash = bitcore.Hash;
var Keypair = bitcore.Keypair;
var PrivateKey = bitcore.PrivateKey;
var PublicKey = bitcore.PublicKey;
=======
var ECDSA = bitcore.crypto.ECDSA;
var Hash = bitcore.crypto.Hash;
var Privkey = bitcore.Privkey;
var Pubkey = bitcore.Pubkey;
>>>>>>>
var ECDSA = ... |
<<<<<<<
=======
var SecureRandom = require('../SecureRandom');
var Curve = require('../Curve');
>>>>>>>
var SecureRandom = require('../SecureRandom');
var Curve = require('../Curve');
<<<<<<<
var eck = new ECKey(this.private.toString('hex'));
eck.setCompressed(this.compressed);
this.public = new Buffer(eck.ge... |
<<<<<<<
var dataUnspent = JSON.parse(fs.readFileSync('test/data/unspent.json'));
var dataUnspentSign = JSON.parse(fs.readFileSync('test/data/unspentSign.json'));
=======
var dataSigCanonical = JSON.parse(fs.readFileSync('test/data/sig_canonical.json'));
var dataSigNonCanonical = JSON.parse(fs.readFileSync('test/dat... |
<<<<<<<
var ECDSA = bitcore.ECDSA;
var Hash = bitcore.Hash;
var Keypair = bitcore.Keypair;
var PrivateKey = bitcore.PrivateKey;
var PublicKey = bitcore.PublicKey;
=======
var ECDSA = bitcore.crypto.ECDSA;
var Hash = bitcore.crypto.Hash;
var Privkey = bitcore.Privkey;
var Pubkey = bitcore.Pubkey;
>>>>>>>
var ECDSA = ... |
<<<<<<<
var ECDSA = bitcore.ECDSA;
var Hash = bitcore.Hash;
var Keypair = bitcore.Keypair;
var PrivateKey = bitcore.PrivateKey;
var PublicKey = bitcore.PublicKey;
=======
var ECDSA = bitcore.crypto.ECDSA;
var Hash = bitcore.crypto.Hash;
var Privkey = bitcore.Privkey;
var Pubkey = bitcore.Pubkey;
>>>>>>>
var ECDSA = ... |
<<<<<<<
var isTrigger = this.asPoint ? this._isTriggerByPoint.bind(this, this.getBorderedAxis()) :
this._isTriggerByRect.bind(this, angular.element(this.dnd.el).dndClientRect());
=======
var axis = this.getBorderedAxis(), x = axis.x, y = axis.y, asPoint = this.asPoi... |
<<<<<<<
var options = {
=======
// [START build_service]
var gcloud = require('gcloud');
var datastore = gcloud.datastore({
>>>>>>>
// [START build_service]
var gcloud = require('gcloud');
var options = {
<<<<<<<
};
if (keyFile) {
options.keyFilename = keyFile;
}
var datastore = gcloud.datastore(options);
===... |
<<<<<<<
HOST = HOST.trim()
if(HOST.endsWith("/")) HOST = HOST.slice(0, -1);
=======
console.log("NODEACTYL WARNING: There has been a COMPLETE rewrite of Nodeactyl, Please review our new documentation at: https://nodeactyl.elliotfrost.xyz/v/v2.0.0-english/ Alternativly if you need further assistance ask for help i... |
<<<<<<<
var core = require('../../core'),
blurFactor = 1 / 7000;
var fs = require('fs');
=======
var core = require('../../core');
>>>>>>>
var core = require('../../core');
var fs = require('fs');
<<<<<<<
fs.readFileSync(__dirname + '/blurX.frag', 'utf8'),
=======
require('fs').readFileSync(__... |
<<<<<<<
baseTexture = new PIXI.BaseTexture(image);
baseTexture.imageUrl = imageUrl;
=======
baseTexture = new PIXI.BaseTexture(image, scaleMode);
>>>>>>>
baseTexture = new PIXI.BaseTexture(image, scaleMode);
baseTexture.imageUrl = imageUrl; |
<<<<<<<
if(position)
{
displayObject.worldTransform[2] = position.x;
displayObject.worldTransform[5] -= position.y;
}
=======
>>>>>>>
if(position)
{
displayObject.worldTransform[2] = position.x;
displayObject.worldTransform[5] -= position.y;
}
<<<<<<<
PIXI.RenderTexture.prototype.renderCan... |
<<<<<<<
//TODO break this out into a texture manager...
var gl = PIXI.gl;
if(!texture._glTexture)
{
texture._glTexture = gl.createTexture();
}
if(texture.hasLoaded)
{
gl.bindTexture(gl.TEXTURE_2D, texture._glTexture);
gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true);
gl.texImage2D(gl.TEXTURE_... |
<<<<<<<
premultipliedAlpha:!!transparent,
stencil:true,
preserveDrawingBuffer: preserveDrawingBuffer
=======
premultipliedAlpha:!!transparent && transparent !== 'notMultiplied',
stencil:true
>>>>>>>
premultipliedAlpha:!!transparent && transparent !== 'notMultiplied',
... |
<<<<<<<
touchEvent.globalX = touchData.global.x = ( (touchEvent.clientX - rect.left) * (this.target.width / rect.width) ) / this.resolution;
touchEvent.globalY = touchData.global.y = ( (touchEvent.clientY - rect.top) * (this.target.height / rect.height) ) / this.resolution;
if (navigator.isCoc... |
<<<<<<<
class Filter extends Shader
=======
export default class Filter
>>>>>>>
export default class Filter extends Shader
<<<<<<<
=======
this.uniformData = uniforms || extractUniformsFromSrc(this.vertexSrc, this.fragmentSrc, 'projectionMatrix|uSampler');
/**
* An object containing the ... |
<<<<<<<
displayObject.worldTransform = PIXI.RenderTexture.tempMatrix;
=======
displayObject.worldTransform = PIXI.identityMatrix;//this.identityMatrix;
>>>>>>>
displayObject.worldTransform = PIXI.RenderTexture.tempMatrix;
<<<<<<<
displayObject.worldTransform = PIXI.RenderTexture.tempMatrix;
=======... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
super();
=======
/**
* the current WebGL drawing context
*
* @member {WebGLRenderingContext}
*/
this.gl = gl;
>>>>>>>
super();
<<<<<<<
/*
* @member {Uint16Array} An array containing the indices of the vertices
=======
... |
<<<<<<<
* @param width=800 {Number} the width of the canvas view
* @param height=600 {Number} the height of the canvas view
* @param [options] {Object} The optional renderer parameters
* @param [options.view] {HTMLCanvasElement} the canvas to use as a view, optional
* @param [options.transparent=false] {Boolean} ... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.