conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
var trace = getJSDUserStack(context);
Firebug.Console.log(trace, context, "stackTrace");
return Console.getDefaultReturnValue(win);
=======
var unwrapped = Wrapper.unwrapObject(win);
unwrapped.top._firebugStackTrace = "console-tracer";
debugger;
delete u... |
<<<<<<<
function(Obj, FBTrace, Firebug, Domplate, FirebugReps, Locale, Wrapper, Url, StackFrame, Events,
Css, Dom, Str, ProfilerEngine) {
=======
function(Module, Rep, Obj, Firebug, Domplate, FirebugReps, Locale, Wrapper, Url, StackFrame,
Events, Css, Dom, Str, FBS) {
>>>>>>>
function(Module, Rep, Obj, FBTra... |
<<<<<<<
function(Obj, Firebug, Domplate, Locale, Events, Wrapper, Dom, Css, Str, Arr, Persist,
BreakpointGroup) {
=======
function(Rep, Obj, Firebug, Domplate, Locale, Events, Wrapper, Dom, Css, Str, Arr, Persist) {
>>>>>>>
function(Rep, Obj, Firebug, Domplate, Locale, Events, Wrapper, Dom, Css, Str, Arr, Persis... |
<<<<<<<
"firebug/debugger/breakpoints/breakpointConditionEditor",
=======
"firebug/net/timeInfoTip",
"firebug/js/breakpoint",
>>>>>>>
"firebug/debugger/breakpoints/breakpointConditionEditor",
"firebug/net/timeInfoTip",
<<<<<<<
Arr, System, Menu, NetUtils, NetProgress, CSSInfoTip, ConditionEd... |
<<<<<<<
=======
"firebug/chrome/panelNotification",
"firebug/js/breakpoint",
>>>>>>>
"firebug/chrome/panelNotification",
<<<<<<<
Arr, System, Menu, NetUtils, NetProgress, CSSInfoTip, ConditionEditor, TimeInfoTip) {
=======
Arr, System, Menu, NetUtils, NetProgress, CSSInfoTip, TimeInfoTip,
... |
<<<<<<<
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;
var Trace = FBTrace.to("DBG_PROFILER");
var TraceError = FBTrace.to("DBG_ERRORS");
=======
var {domplate, TAG, DIV, SPAN, TD, TR, TH, TABLE, THEAD, TBODY, P, UL, LI, A} = Domplate;
const Cc = Components.classes;
const Ci... |
<<<<<<<
/*jshint esnext:true, curly:false */
/*global FBTrace:1, Components:1, Proxy:1, define:1 */
=======
/*global define:1, Components:1, Proxy:1 */
>>>>>>>
/*global define:1, Components:1, Proxy:1 */
<<<<<<<
=======
"firebug/lib/trace",
"firebug/lib/wrapper",
>>>>>>>
"firebug/lib/trace",
"fir... |
<<<<<<<
if (typeof object === "undefined")
return 1000;
else if (object instanceof SourceLink)
=======
else if (object instanceof SourceLink.SourceLink)
>>>>>>>
else if (object instanceof SourceLink) |
<<<<<<<
=======
properties.push(new InspectorInterface.StringInput({
title: 'Volume',
isActiveFn: function () {
return selectionInfo.dataType === 'sound' && selectionInfo.numObjects === 1;
},
getValueFn: function () {
return selectionInfo.object.volume;
... |
<<<<<<<
describe("Register custom keyword", function () {
it("function called", function () {
var schema = {
customKeyword: "A"
};
var data = {};
tv4.defineKeyword('customKeyword', function () {
return "Custom failure";
});
var result = tv4.validateMultiple(data, schema, false, true);
assert.... |
<<<<<<<
var ValidatorContext = function (parent, collectMultiple, checkRecursive) {
=======
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf?redirectlocale=en-US&redirectslug=JavaScript%2FReference%2FGlobal_Objects%2FArray%2FindexOf
if (!Array.prototype.indexOf) {
Ar... |
<<<<<<<
var path = require("path")
var fs = require("fs")
var helpers = require('../helpers')
var minify = require('minify')
var browserify = require('browserify')
var through = require('through')
=======
var path = require("path")
var fs = require("fs")
var helpers = require('../helpe... |
<<<<<<<
function hook_entity_post_render_content(entity) { }
/**
* Called after a form element is assembled. Use it to alter a form element.
*/
//function hook_form_element_alter(form, element, variables) { }
=======
function hook_entity_post_render_content(entity) {}
/**
* Called after drupalgap_image_path() a... |
<<<<<<<
}else if(currentJson.type === 'data'){
currentJson.content = {
=======
}else if(currentJson.$type === 'data'){
currentJson.expr = {
>>>>>>>
}else if(currentJson.$type === 'data'){
currentJson.content = { |
<<<<<<<
Cloud.use(route, bodyParser.urlencoded({extended: false, limit: '40mb'}));
Cloud.use(route, bodyParser.json({limit: '40mb'}));
Cloud.use(route, bodyParser.text({limit: '40mb'}));
=======
Cloud.use(route, timeout(TIMEOUT));
Cloud.use(route, bodyParser.urlencoded({extended: false}));
Clo... |
<<<<<<<
var pageInitData = utils.surroundByTryCatch(
function(pageObj, webviewId) {
utils.info("Update view with init data");
var ext = {};
ext.webviewId = webviewId,
ext.enablePullUpRefresh = pageObj.hasOwnProperty("onReachBottom");
var params = {
data: {
data: pageObj.data,
... |
<<<<<<<
import json from 'rollup-plugin-json'
import path from 'path'
import { fileURLToPath } from 'url'
const __dirname = path.dirname(fileURLToPath(import.meta.url))
=======
import { terser } from 'rollup-plugin-terser'
>>>>>>>
import { terser } from 'rollup-plugin-terser'
import json from 'rollup-plugin-json'
i... |
<<<<<<<
workerUrl: null,
=======
workerPath: null,
preview: null
>>>>>>>
workerUrl: null,
preview: null,
<<<<<<<
const { workerUrl } = this.props
=======
const { workerPath: workerUrl, preview } = this.props
>>>>>>>
const { workerUrl, preview } = this.props
<<<<<<<
workerUrl: P... |
<<<<<<<
import SliderRail from './sliderRail'
import { ReaderContext } from '@/context'
=======
>>>>>>>
import SliderRail from './sliderRail'
<<<<<<<
render() {
const { max, bufferProgress, reversed } = this.props
const domain = [1, max]
const { values } = this.state
if (max == 1) return null
... |
<<<<<<<
const { autoHideControls, allowFullScreen, mangaMode } = opts
=======
// Set default value in context state
// Nore: unsure about this, probably not a good idea, please fix it!
const { autoHideControls, allowFullScreen } = opts
>>>>>>>
// Set default value in context state
// Nore: ... |
<<<<<<<
case 'light/get_balances':
var addresses = params;
if (conf.bLight)
return sendErrorResponse(ws, tag, "I'm light myself, can't serve you");
if (ws.bOutbound)
return sendErrorResponse(ws, tag, "light clients have to be inbound");
if (!addresses)
return sendErrorResponse(ws, tag, "no par... |
<<<<<<<
=======
var VERSION = 3;
>>>>>>> |
<<<<<<<
var formulaParser = require('./formula/index');
var Decimal = require('decimal.js');
var dataFeeds = require('./data_feeds.js');
=======
var evalFormulaBB = process.browser ? null : require('./formula/index'+'');
var BigNumber = require('bignumber.js');
>>>>>>>
var formulaParser = process.browser ? null : re... |
<<<<<<<
if (!common.isChakraEngine) {
// V8 options
expect('--abort-on-uncaught-exception', 'B\n');
}
=======
>>>>>>>
<<<<<<<
if (!common.isChakraEngine) {
// V8 options
expect('--max_old_space_size=0', 'B\n');
}
=======
// V8 options
expect('--abort-on-uncaught-exception', 'B\n');
expect('--abort_on_un... |
<<<<<<<
common.engineSpecificMessage({
v8: 'PromiseSubclass { <pending> }',
chakracore: 'PromiseSubclass {}'
}));
=======
'PromiseSubclass [Promise] { <pending> }');
>>>>>>>
common.engine... |
<<<<<<<
if (!common.isChakraEngine) {
expect('--icu-data-dir=_d', 'B\n');
=======
>>>>>>>
if (!common.isChakraEngine) { |
<<<<<<<
}
].filter((v) => !common.engineSpecificMessage(v)));
=======
},
// Newline within template string maintains whitespace.
{ client: client_unix, send: '`foo \n`',
expect: prompt_multiline + '\'foo \\n\'\n' + prompt_unix },
// Whitespace is not evaluated.
{ client: client_unix, ... |
<<<<<<<
var crypto= require("crypto");
=======
var dns = require('dns');
>>>>>>>
var crypto= require("crypto");
var dns = require('dns');
<<<<<<<
if (this.forceClose) this.forceClose(e);
=======
self.destroy(e);
>>>>>>>
if (this.forceClose) this.forceClose(e);
self.destroy(e);
<<<<<<<
... |
<<<<<<<
if (!common.isChakraEngine) {
/* eslint-disable no-undef */
common.allowGlobals(externalizeString, isOneByteString, x);
{
const expected = 'ümlaut eins'; // Must be a unique string.
externalizeString(expected);
assert.strictEqual(true, isOneByteString(expected));
const fd = fs.openSync(f... |
<<<<<<<
const { isSelected, isInRange, isPassive, isStartEdge, isEndEdge } = this.props;
=======
const { isSelected, isInRange, isPassive, dayMoment, isToday } = this.props;
>>>>>>>
const { isSelected, isInRange, isPassive, isStartEdge, isEndEdge, dayMoment, isToday } = this.props;
<<<<<<<
const hov... |
<<<<<<<
/**
* Converts commands that use var and function <name>() to use the
* local exports.context when evaled. This provides a local context
* on the REPL.
*
* @param {String} cmd The cmd to convert.
* @return {String} The converted command.
*/
// TODO(princejwesley): Remove it prior to v8.0.0 release
// Re... |
<<<<<<<
assert.equal(util.inspect({a: function() {}}), common.engineSpecificMessage({
v8: '{ a: [Function] }',
chakracore: '{ a: [Function: a] }'
}));
=======
assert.equal(util.inspect({a: function() {}}), '{ a: [Function: a] }');
>>>>>>>
assert.equal(util.inspect({a: function() {}}), '{ a: [Function: a] }');
... |
<<<<<<<
var common = require('../common');
var assert = require('assert');
var util = require('util');
=======
require('../common');
const assert = require('assert');
const util = require('util');
>>>>>>>
const common = require('../common');
const assert = require('assert');
const util = require('util'); |
<<<<<<<
if (common.isLinux && ['arm', 'x64', 'mips'].includes(process.arch)) {
// PerfJitLogger is only implemented in Linux.
expect('--perf-prof', 'B\n');
}
=======
if (common.isLinux && ['arm', 'x64'].includes(process.arch)) {
// PerfJitLogger is only implemented in Linux.
expect('--perf-prof', 'B\n... |
<<<<<<<
var expectedFuncToString = common.engineSpecificMessage({
v8 : "{ foo: 'bar', inspect: [Function] }\n",
chakracore : "{ foo: 'bar', inspect: [Function: inspect] }\n"
});
console._stderr = process.stdout;
=======
global.process.stderr.write = function(string) {
errStrings.push(string);
};
>>>>>>>
glob... |
<<<<<<<
if (common.isChakraEngine) {
// Skip on ChakraCore due to TypedArray .length JIT bug
// (see this issue: https://github.com/Microsoft/ChakraCore/issues/2319)
const err = new RangeError('Index out of range');
err.code = 'ERR_INDEX_OUT_OF_RANGE';
throw err;
}
const buf = new Buffer('w00t... |
<<<<<<<
const pending = new Promise(common.noop);
assert.strictEqual(util.inspect(pending), common.engineSpecificMessage({
v8: 'Promise { <pending> }',
chakracore: 'Promise {}'
}));
=======
const pending = new Promise(() => {});
assert.strictEqual(util.inspect(pending), 'Promise { <pending> }');
>>... |
<<<<<<<
if (common.isChakraEngine) {
console.log('1..0 # Skipped: This test is disabled for chakra engine ' +
'because debugger support is not implemented yet.');
return;
}
=======
const DELAY = common.platformTimeout(200);
>>>>>>>
if (common.isChakraEngine) {
console.log('1..0 # Skipped: This test is disa... |
<<<<<<<
common.engineSpecificMessage({
v8: 'PromiseSubclass { <pending> }',
chakracore: 'PromiseSubclass {}'
}));
=======
'PromiseSubclass { <pending> }');
assert.strictEqual(
util.inspect({ a: { b: new ... |
<<<<<<<
expect: 'undefined\r\n' + prompt_unix,
chakracore: 'skip' },
=======
expect: 'undefined\n' + prompt_unix },
>>>>>>>
expect: 'undefined\n' + prompt_unix },
chakracore: 'skip' }, |
<<<<<<<
// Skip for chakra engine as debugger support not yet present
if (!common.isChakraEngine) {
// test for Array constructor in different context
{
const Debug = require('vm').runInDebugContext('Debug');
const map = new Map();
map.set(1, 2);
const mirror = Debug.MakeMirror(map.entries(), true);... |
<<<<<<<
// number of pending user-supplied write callbacks
// this must be 0 before 'finish' can be emitted
this.pendingcb = 0;
// emit prefinish if the only thing we're waiting for is _write cbs
// This is relevant for synchronous Transform streams
this.prefinished = false;
// Internal, used in net.js... |
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: In strict mode code, functions can only be declared at top level or immediately within another function/,
chakracore: /^SyntaxError: Syntax error/})
},
=======
expect: /^SyntaxError: In strict mode code, functions can on... |
<<<<<<<
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Unexpected end of input/,
chakracore: /^SyntaxError: Expected '}'/})
},
=======
expect: /\bSyntaxError: Unexpected end of input/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Unexpe... |
<<<<<<<
var common = require('../common');
var assert = require('assert');
var v8 = require('v8');
var vm = require('vm');
=======
require('../common');
const assert = require('assert');
const v8 = require('v8');
const vm = require('vm');
>>>>>>>
const common = require('../common');
const assert = require('assert');... |
<<<<<<<
assert.equal(util.inspect({}), '{}');
assert.equal(util.inspect({a: 1}), '{ a: 1 }');
assert.equal(util.inspect({a: function() {}}), common.engineSpecificMessage({
v8: '{ a: [Function: a] }',
chakracore: '{ a: [Function: a] }'
}));
assert.equal(util.inspect({a: 1, b: 2}), '{ a: 1, b: 2 }');
assert.equal(uti... |
<<<<<<<
assert.strictEqual(inspect(new BigUint64Array([0n])), 'BigUint64Array [ 0n ]');
`);
}
=======
assert.strictEqual(inspect(new BigUint64Array([0n])), 'BigUint64Array [ 0n ]');
// Verify non-enumerable keys get escaped.
{
const obj = {};
Object.defineProperty(obj, 'Non\nenumerable\tkey', { value: true });... |
<<<<<<<
expect: common.engineSpecificMessage({
v8: /\bSyntaxError: Unexpected end of input/,
chakracore: /^SyntaxError: Expected '}'/ })
},
=======
expect: /^SyntaxError: Unexpected end of input/ },
>>>>>>>
expect: common.engineSpecificMessage({
v8: /^SyntaxError: Unexpe... |
<<<<<<<
// for chakra i18n is enabled
var enablei18n = common.engineSpecificMessage({
v8: process.config.variables.v8_enable_i18n_support,
chakracore: true
});
=======
let enablei18n = process.config.variables.v8_enable_i18n_support;
>>>>>>>
// for chakra i18n is enabled
let enablei18n = common.engineSpecificMe... |
<<<<<<<
if (common.isChakraEngine) {
console.log('1..0 # Skipped: This test is disabled for chakra engine.');
return;
}
=======
// Note: changing V8 flags after an isolate started is not guaranteed to work.
// Specifically here, V8 may cache compiled scripts between the flip of the
// flag. We use a different sc... |
<<<<<<<
var index = stack.lastIndexOf(this);
if (index !== -1)
stack.splice(index);
else
stack.length = 0;
_domain_flag[0] = stack.length;
=======
stack.splice(index);
>>>>>>>
stack.splice(index);
_domain_flag[0] = stack.length; |
<<<<<<<
nonHostChars = ['%', '/', '?', ';', '#'].concat(autoEscape),
nonAuthChars = ['/', '@', '?', '#'].concat(delims),
=======
nonHostChars = ['%', '/', '?', ';', '#']
.concat(unwise).concat(autoEscape),
hostEndingChars = ['/', '?', '#'],
>>>>>>>
nonHostChars = ['%', '/', '?', ';', '#'].c... |
<<<<<<<
};
exports.engineSpecificMessage = function(messageObject) {
var jsEngine = process.jsEngine || 'v8'; //default is 'v8'
return messageObject[jsEngine];
=======
};
exports.busyLoop = function busyLoop(time) {
var startTime = Timer.now();
var stopTime = startTime + time;
while (Timer.now() < stopTim... |
<<<<<<<
var binding = require('./build/Release/binding');
} catch (e) {
=======
var binding = require(`./build/${common.buildType}/binding`);
} catch {
>>>>>>>
var binding = require(`./build/${common.buildType}/binding`);
} catch (e) {
<<<<<<<
napi_binding = require('./build/Release/napi_binding');
} catch ... |
<<<<<<<
// Skip for chakra engine as debugger support not yet present
if (!common.isChakraEngine) {
// test for Array constructor in different context
{
const Debug = vm.runInDebugContext('Debug');
const map = new Map();
map.set(1, 2);
const mirror = Debug.MakeMirror(map.entries(), true);
const ... |
<<<<<<<
const gtocMD = fs.readFileSync(gtocPath, 'utf8').replace(/^<!--[\s\S]*?-->/gm, '');
const gtocHTML = marked(gtocMD).replace(
/<a href="(.*?)"/g,
(all, href) => `<a class="nav-${href.replace('.html', '')
.replace(/\W+/g, '-')}" href="${href}"`
);
=======
const gtocMD =... |
<<<<<<<
var _props4 = this.props;
var range = _props4.range;
var onlyClasses = _props4.onlyClasses;
var minDate = _props4.minDate;
var maxDate = _props4.maxDate;
=======
var range = this.props.range;
>>>>>>>
var _props4 = this.props;
var range = _props4.range;
va... |
<<<<<<<
if (!common.isChakraEngine) {
assert.throws(
() => {
testHandleScope.NewScopeEscapeTwice();
},
Error);
}
=======
testHandleScope.NewScopeEscapeTwice();
>>>>>>>
if (!common.isChakraEngine) {
testHandleScope.NewScopeEscapeTwice();
} |
<<<<<<<
assert.equal(e.message, common.engineSpecificMessage({
v8: 'Array buffer allocation failed',
chakracore: 'Invalid offset/length when creating typed array'
}));
=======
assert.strictEqual(e.message, 'Array buffer allocation failed');
>>>>>>>
assert.strictEqual(e.message, common.engineSpecificM... |
<<<<<<<
function checkBadPath(err, response) {
assert(err instanceof SyntaxError, 'Expected SyntaxError');
assert(
common.engineSpecificMessage({
v8: /Unexpected token/,
chakracore: /JSON\.parse Error: Invalid character at position:1/
}).test(err.message),
'Unexpected message: ' + err.messag... |
<<<<<<<
const trace_mgr = require('trace_mgr'); //ENABLE_TTD
=======
var errors;
function lazyErrors() {
if (!errors)
errors = require('internal/errors');
return errors;
}
>>>>>>>
const trace_mgr = require('trace_mgr'); //ENABLE_TTD
var errors;
function lazyErrors() {
if (!errors)
errors = require('... |
<<<<<<<
NativeModule.require('trace_mgr'); //ENABLE_TTD;
=======
NativeModule.require('internal/inspector_async_hook').setup();
>>>>>>>
NativeModule.require('internal/inspector_async_hook').setup();
NativeModule.require('trace_mgr'); //ENABLE_TTD; |
<<<<<<<
const { range, minDate, maxDate, format } = this.props;
=======
const { range, onlyClasses } = this.props;
>>>>>>>
const { range, minDate, maxDate, format, onlyClasses } = this.props;
<<<<<<<
isPassive = { isPassive || isOutsideMinMax }
=======
onlyClasses = { onlyClasses... |
<<<<<<<
this.duration = this.model.time.playing && (this.time - this.time_1 > 0) ? this.model.time.speed : 0;
this.year.setText(this.timeFormatter(this.time));
//this.yearEl.text(this.timeFormatter(this.time));
=======
this.duration = this.model.time.playing && (this.time - this.time_1 > 0) ? this.mod... |
<<<<<<<
calendar : 'rdr-Calendar',
dateRange : 'rdr-DateRange',
predefinedRanges : 'rdr-PredefinedRanges',
predefinedRangesItem : 'rdr-PredefinedRangesItem',
predefinedRangesItemActive : 'rdr-PredefinedRangesItemActive',
monthAndYear : 'rdr-Mo... |
<<<<<<<
/* VIZABI - http://www.gapminder.org - 2015-06-24 */
=======
/* VIZABI - http://www.gapminder.org - 2015-06-24 */
>>>>>>>
/* VIZABI - http://www.gapminder.org - 2015-06-24 */
<<<<<<<
}.call(this));
=======
}.call(this));
>>>>>>>
}.call(this));
<<<<<<<
}.call(this));
=======
}.call(this));
>>>>>... |
<<<<<<<
var compileTime = grunt.template.today("UTC:dd/mm/yyyy HH:MM:ss") + " UTC",
=======
const compileTime = grunt.template.today("dd/mm/yyyy HH:MM:ss") + " UTC",
>>>>>>>
const compileTime = grunt.template.today("UTC:dd/mm/yyyy HH:MM:ss") + " UTC", |
<<<<<<<
// globalObject: "this"
=======
filename: chunkData => {
return chunkData.chunk.name === "main" ? "assets/[name].js": "[name].js";
},
globalObject: "this"
>>>>>>>
... |
<<<<<<<
Kinetic.Node.addGettersSetters(Kinetic.Node, ['x', 'y', 'scale', 'detectionType', 'rotation', 'alpha', 'name', 'id', 'offset', 'draggable', 'dragConstraint', 'dragBounds', 'dragBoundFunc', 'listening']);
=======
Kinetic.Node.addGettersSetters(Kinetic.Node, ['x', 'y', 'scale', 'rotation', 'opacity', 'name', 'i... |
<<<<<<<
dev: ["build/dev/*", "src/core/config/MetaConfig.js"],
prod: ["build/prod/*", "src/core/config/MetaConfig.js"],
test: ["build/test/*", "src/core/config/MetaConfig.js"],
node: ["build/node/*", "src/core/config/MetaConfig.js"],
docs: ["docs/*", "!docs/*.... |
<<<<<<<
module: "Default",
description: "Rotates each byte to the right by the number of bits specified. Currently only supports 8-bit values.",
=======
description: "Rotates each byte to the right by the number of bits specified, optionally carrying the excess bits over to the next byte. Curr... |
<<<<<<<
import "./tests/operations/NetBIOS.js";
=======
import "./tests/operations/OTP.js";
>>>>>>>
import "./tests/operations/NetBIOS.js";
import "./tests/operations/OTP.js"; |
<<<<<<<
import "./tests/operations/CharEnc.js";
=======
import "./tests/operations/Code.js";
>>>>>>>
import "./tests/operations/CharEnc.js";
import "./tests/operations/Code.js"; |
<<<<<<<
var emojiNumber = 1352 // 1335(from all categories) + 17(custom)
=======
var emojiNumber = 1343 // 1326(from all categories) + 17(custom)
>>>>>>>
var emojiNumber = 1356 // 1335(from all categories) + 17(custom)
<<<<<<<
people: 232,
animals_and_nature: 161,
=======
people: 236,
animals_and_nature: ... |
<<<<<<<
food_and_drink: 98,
activity: 95,
=======
food_and_drink: 105,
activity: 89,
>>>>>>>
food_and_drink: 105,
activity: 95, |
<<<<<<<
{ keyword: 'Maybe',
source: 'https://www.monster.com/career-advice/article/7-words-that-make-you-sound-less-confident-in-emails-0916',
message: 'By adding \"maybe"\ to your sentence, it makes it seem like you aren\'t confident in your answer/suggestion. Say what you mean. If you mean no, say no... |
<<<<<<<
'use strict';
/* 3rd party module */
var libxml2js = require('libxml-to-js');
var libxmljs = require('libxmljs');
var mime = require('mime-magic');
=======
/* Load the dependencies */
var dependencies = require('./dependencies.js');
var xmlDep = require(dependencies.xml);
var mimeDep = require(dependencies.m... |
<<<<<<<
this.getInternal()._debug(fct, clb);
this._callFilters('before'+ucfirst(fct));
=======
this.getInternal()._debug(fct);
this._callFilters('before'+$.ucfirst(fct));
>>>>>>>
this.getInternal()._debug(fct, clb);
this._callFilters('before'+$.ucfirst(fct)); |
<<<<<<<
_this.prepareIgnoreRegExps();
indicator.updateLanguageState();
=======
indicator.updateStatusBarIndicator();
>>>>>>>
_this.prepareIgnoreRegExps();
indicator.updateStatusBarIndicator();
<<<<<<<
try {
// Convert the JSON o... |
<<<<<<<
var imageUrl = computed(image, (id) => api.blob.sync.url(id))
var content = h('GatheringCard', [
h('div.title', [
h('a', {
href: msg.key
}, title),
h('button', {
'ev-click': send(api.gathering.sheet.edit, msg.key)
}, 'Edit Detai... |
<<<<<<<
comment: '3.2.0'
=======
comment: '0.9.2',
installedVersion: '0.9.0'
>>>>>>>
comment: '3.2.0',
installedVersion: '3.2.0'
<<<<<<<
comment: '4.2.0'
=======
comment: '3.2.6',
installedVersion: '3.2.6'
>>>>>>>
comment: '4.3.0',
installedVersion: '4.1.1'
<<<<<<<
comment: '4.17.19'
====... |
<<<<<<<
* Date: Aug 14 2012
=======
* Date: Aug 22 2012
>>>>>>>
* Date: Aug 23 2012
<<<<<<<
Kinetic.Node.addGettersSetters(Kinetic.Node, ['x', 'y', 'scale', 'detectionType', 'rotation', 'alpha', 'name', 'id', 'offset', 'draggable', 'dragConstraint', 'dragBounds', 'dragBoundFunc', 'listening']);
=======
Kinetic... |
<<<<<<<
const util = require('../util')
const querystring = require('querystring')
=======
var util = require('../util')
var querystring = require('querystring')
const jsesc = require('jsesc')
const quote = str => jsesc(str, { quotes: 'single' })
>>>>>>>
const util = require('../util')
const querystring = require('... |
<<<<<<<
var moment = require('moment');
=======
var tp = require('./templatePath.js');
>>>>>>>
var moment = require('moment');
var tp = require('./templatePath.js'); |
<<<<<<<
import { TextLineSpacingBehaviourMap } from '../Text'
import { TextAlignmentMap } from '../../style/Text'
=======
import { TextAlignmentMap, TextLineSpacingBehaviourMap } from '../Text'
>>>>>>>
import { TextLineSpacingBehaviourMap } from '../Text'
import { TextAlignmentMap } from '../../style/Text'
<<<<<<<
... |
<<<<<<<
import { isNativeObject } from 'util'
=======
import util from 'util'
import { isNativeObject } from '../dom/utils'
>>>>>>>
import util from 'util' |
<<<<<<<
})
SymbolMaster.define('overrides', {
get() {
// undefined when immutable
if (!this._object.overrideProperies) {
return undefined
}
const overrideProperies = this._object.overrideProperies()
const overrides = toArray(this._object.availableOverrides())
// recursively find the ov... |
<<<<<<<
filename: 'SketchAPI.js',
library: 'SketchAPI',
=======
filename: OUTPUT_FILE,
library: 'sketch',
>>>>>>>
filename: 'SketchAPI.js',
library: 'sketch', |
<<<<<<<
})
test('should change the exportFormats', () => {
const group = new Group()
expect(group.exportFormats).toEqual([])
group.exportFormats = [
{
size: '2x',
suffix: '@2x',
},
]
expect(group.exportFormats.map(e => e.toJSON())).toEqual([
{
type: 'ExportFormat',
fileFo... |
<<<<<<<
}, 'to throw exception',
"expected Error({ message: 'foo' }) to equal Error({ message: 'bar' })\n" +
"\n" +
"Error({\n" +
" message: 'foo' // should equal 'bar'\n" +
" ... |
<<<<<<<
if (
typeof navigator === 'undefined' ||
!/phantom/i.test(navigator.userAgent)
) {
it('should give up', () => {
return expect(
function() {
return expect(function() {
try {
throw new Error('argh');
} catch (err) ... |
<<<<<<<
testBoth('watching an object value then unwatching should restore old value', function(get, set) {
=======
test("accessing a watched unknown property triggers call to unknownProperty", function(){
var unknownPropertyWasCalled = false;
var watchedPropertyName = 'foo'
var obj = {
unknownProperty: f... |
<<<<<<<
set(this, 'router', router);
}
=======
set(this, 'stateManager', router);
>>>>>>>
set(this, 'router', router); |
<<<<<<<
import { EventDispatcher, jQueryDisabled } from 'ember-views';
=======
>>>>>>>
import { jQueryDisabled } from 'ember-views';
<<<<<<<
=======
>>>>>>>
<<<<<<<
moduleFor('custom EventDispatcher subclass with #setup', class extends RenderingTest {
constructor() {
super();
let dispatcher = t... |
<<<<<<<
import { isArray } from "ember-metal/utils";
=======
import CollectionView from "ember-views/views/collection_view";
import { isArray } from "ember-runtime/utils";
>>>>>>>
import { isArray } from "ember-runtime/utils"; |
<<<<<<<
import isEnabled from 'ember-metal/features';
import Component from 'ember-views/components/component';
=======
import Component from 'ember-views/views/component';
>>>>>>>
import Component from 'ember-views/components/component'; |
<<<<<<<
QUnit.test('implementing `render` allows pushing into a string buffer', function() {
expect(1);
registry.register('component:non-block', Component.extend({
render(buffer) {
buffer.push('<span id="zomg">Whoop!</span>');
}
}));
expectAssertion(function() {
appendView... |
<<<<<<<
this.visit('/');
assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
assert.equal(this.$('#self-link.active').length, 1, 'The self-link was rendered with active class');
assert.equal(this.$('#about-link:not(.active)').length, 1, 'The other link was rendered without activ... |
<<<<<<<
import Layout from './containers/Layout';
import './App.css';
=======
import AppContainer from './containers/App';
>>>>>>>
import Layout from './containers/Layout'; |
<<<<<<<
if (outputMode !== 'html') {
const filename = `./${assetSaver.getFilenamePrefix({url: address})}.report.html`;
=======
// If pretty printing to the command line, also output the html report.
if (outputMode === Printer.OUTPUT_MODE.pretty) {
const filename = './' + assetSaver.g... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.