conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import {
draftMarkupToContent,
generateFontFamily,
highlightLineheight,
} from './util';
const HighlightElement = styled.p`
${elementFillContent}
${elementWithFont}
${elementWithFontColor}
${elementWithStyle}
${highlightLineheight}
margin: 0;
padding: 0;
`;
const MarginedElement = styled.span`
display: inline-block;
position: relative;
top: 0;
margin: ${({ padding: { horizontal } }) => `0 ${horizontal + 4}px`};
left: ${({ padding: { horizontal } }) => `-${horizontal + 4}px`};
`;
const Span = styled.span`
${elementWithBackgroundColor}
${elementWithStyle}
border-radius: 3px;
box-decoration-break: clone;
position: relative;
`;
const BackgroundSpan = styled(Span)`
color: transparent;
`;
const ForegroundSpan = styled(Span)`
background: none;
`;
const FillElement = styled.p`
margin: 0;
${elementFillContent}
${elementWithFont}
${elementWithBackgroundColor}
${elementWithFontColor}
${elementWithStyle}
=======
import { draftMarkupToContent, generateParagraphTextStyle } from './util';
const Element = styled.p`
${elementFillContent}
${elementWithFont}
${elementWithBackgroundColor}
${elementWithFontColor}
${elementWithTextParagraphStyle}
>>>>>>>
import {
draftMarkupToContent,
getHighlightLineheight,
generateParagraphTextStyle,
} from './util';
const HighlightElement = styled.p`
${elementFillContent}
${elementWithFont}
${elementWithFontColor}
${elementWithTextParagraphStyle}
line-height: ${({ lineHeight, verticalPadding }) =>
getHighlightLineheight(lineHeight, verticalPadding)};
margin: 0;
padding: 0;
`;
const HIGHLIGHT_MARGIN_BUFFER = 10;
const MarginedElement = styled.span`
display: inline-block;
position: relative;
top: 0;
margin: ${({ horizontalPadding, horizontalBuffer }) =>
`0 ${horizontalPadding + horizontalBuffer}px`};
left: ${({ horizontalPadding, horizontalBuffer }) =>
`-${horizontalPadding + horizontalBuffer}px`};
`;
const Span = styled.span`
${elementWithBackgroundColor}
${elementWithTextParagraphStyle}
border-radius: 3px;
box-decoration-break: clone;
position: relative;
`;
const BackgroundSpan = styled(Span)`
color: transparent;
`;
const ForegroundSpan = styled(Span)`
background: none;
`;
const FillElement = styled.p`
margin: 0;
${elementFillContent}
${elementWithFont}
${elementWithBackgroundColor}
${elementWithFontColor}
${elementWithTextParagraphStyle}
<<<<<<<
element: {
id,
bold,
content,
color,
backgroundColor,
backgroundTextMode,
fontFamily,
fontFallback,
fontSize,
fontWeight,
fontStyle,
letterSpacing,
lineHeight,
padding,
textAlign,
textDecoration,
},
=======
element: { id, bold, content, color, backgroundColor, ...rest },
>>>>>>>
element: {
id,
bold,
content,
color,
backgroundColor,
backgroundTextMode,
...rest
},
<<<<<<<
backgroundColor:
backgroundTextMode !== BACKGROUND_TEXT_MODE.NONE
? backgroundColor
: undefined,
fontFamily: generateFontFamily(fontFamily, fontFallback),
fontFallback,
fontStyle,
fontSize: dataToEditorY(fontSize),
fontWeight,
letterSpacing,
lineHeight,
padding: {
horizontal: dataToEditorX(padding.horizontal),
vertical: dataToEditorY(padding.vertical),
},
textAlign,
textDecoration,
=======
backgroundColor,
...generateParagraphTextStyle(rest, dataToEditorX, dataToEditorY),
>>>>>>>
backgroundColor,
...generateParagraphTextStyle(rest, dataToEditorX, dataToEditorY),
horizontalPadding: dataToEditorX(rest.padding.horizontal),
horizontalBuffer: dataToEditorX(HIGHLIGHT_MARGIN_BUFFER),
verticalPadding: dataToEditorX(rest.padding.vertical), |
<<<<<<<
=======
* Build the stacks from top down
*/
buildStacks: function () {
var series = this.series,
i = series.length;
if (!this.isXAxis) {
this.usePercentage = false;
while (i--) {
series[i].setStackedPoints();
}
// Loop up again to compute percent stack
if (this.usePercentage) {
for (i = 0; i < series.length; i++) {
series[i].setPercentStacks();
}
}
}
},
/**
>>>>>>> |
<<<<<<<
// lineHeight: 16,
=======
>>>>>>>
<<<<<<<
attrSetters = wrapper.attrSetters,
shadows = wrapper.shadows,
=======
shadows = this.shadows,
htmlNode = this.htmlNode,
>>>>>>>
attrSetters = wrapper.attrSetters,
shadows = wrapper.shadows,
htmlNode = wrapper.htmlNode,
<<<<<<<
negKey,
xData,
yData,
x,
y,
threshold = seriesOptions.threshold,
yDataLength,
distance,
activeYData = [],
activeCounter = 0;
// Get dataMin and dataMax for X axes
if (isXAxis) {
xData = series.xData;
dataMin = mathMin(pick(dataMin, xData[0]), mathMin.apply(math, xData));
dataMax = mathMax(pick(dataMax, xData[0]), mathMax.apply(math, xData));
// Get dataMin and dataMax for Y axes, as well as handle stacking and processed data
} else {
var isNegative,
pointStack,
key,
cropped = series.cropped,
xExtremes = series.xAxis.getExtremes(),
findPointRange,
pointRange,
j,
hasModifyValue = !!series.modifyValue;
// Handle stacking
stacking = seriesOptions.stacking;
=======
stackOption,
negKey;
if (!isXAxis) {
stacking = serie.options.stacking;
>>>>>>>
stackOption,
negKey,
xData,
yData,
x,
y,
threshold = seriesOptions.threshold,
yDataLength,
distance,
activeYData = [],
activeCounter = 0;
// Get dataMin and dataMax for X axes
if (isXAxis) {
xData = series.xData;
dataMin = mathMin(pick(dataMin, xData[0]), mathMin.apply(math, xData));
dataMax = mathMax(pick(dataMax, xData[0]), mathMax.apply(math, xData));
// Get dataMin and dataMax for Y axes, as well as handle stacking and processed data
} else {
var isNegative,
pointStack,
key,
cropped = series.cropped,
xExtremes = series.xAxis.getExtremes(),
findPointRange,
pointRange,
j,
hasModifyValue = !!series.modifyValue;
// Handle stacking
stacking = seriesOptions.stacking;
<<<<<<<
stackKey = series.type + pick(seriesOptions.stack, '');
=======
stackOption = serie.options.stack;
stackKey = serie.type + pick(stackOption, '');
>>>>>>>
stackOption = series.options.stack;
stackKey = series.type + pick(stackOption, '');
<<<<<<<
if (!stacks[key][x]) {
stacks[key][x] = new StackItem(options.stackLabels, isNegative, x);
}
stacks[key][x].setTotal(y);
// general hook, used for Highstock compare values feature
} else if (hasModifyValue) {
y = series.modifyValue(y);
}
j = y.length;
if (j) { // array, like ohlc data
while (j--) {
if (y[j] !== null) {
activeYData[activeCounter++] = y[j];
}
=======
if (!stacks[key][pointX]) {
stacks[key][pointX] = new StackItem(options.stackLabels, isNegative, pointX, stackOption);
>>>>>>>
if (!stacks[key][x]) {
stacks[key][x] = new StackItem(options.stackLabels, isNegative, x, stackOption);
}
stacks[key][x].setTotal(y);
// general hook, used for Highstock compare values feature
} else if (hasModifyValue) {
y = series.modifyValue(y);
}
j = y.length;
if (j) { // array, like ohlc data
while (j--) {
if (y[j] !== null) {
activeYData[activeCounter++] = y[j];
}
<<<<<<<
// create the label
var label = renderer.label('', 0, 0)
.attr({
padding: padding,
fill: options.backgroundColor,
'stroke-width': borderWidth,
r: options.borderRadius,
zIndex: 8
})
.css(style)
.hide()
.add()
.shadow(options.shadow);
=======
// create the elements
var group = renderer.g('tooltip')
.attr({ zIndex: 8 })
.add(),
box = renderer.rect(boxOffLeft, boxOffLeft, 0, 0, options.borderRadius, borderWidth)
.attr({
fill: options.backgroundColor,
'stroke-width': borderWidth
})
.add(group)
.shadow(options.shadow),
label = renderer.text('', padding + boxOffLeft, pInt(style.fontSize) + padding + boxOffLeft, options.useHTML)
.attr({ zIndex: 1 })
.css(style)
.add(group);
group.hide();
>>>>>>>
// create the label
var label = renderer.label('', 0, 0)
.attr({
padding: padding,
fill: options.backgroundColor,
'stroke-width': borderWidth,
r: options.borderRadius,
zIndex: 8
})
.css(style)
.hide()
.add()
.shadow(options.shadow);
<<<<<<<
version: '2.1.6'
});
=======
version: '2.1.7'
};
>>>>>>>
version: '2.1.7'
}); |
<<<<<<<
const imgProps = getMediaSizePositionProps(
=======
const imgProps = getMediaProps(
resource,
>>>>>>>
const imgProps = getMediaSizePositionProps(
resource,
<<<<<<<
const newImgProps = getMediaSizePositionProps(
=======
const newImgProps = getMediaProps(
resource,
>>>>>>>
const newImgProps = getMediaSizePositionProps(
resource, |
<<<<<<<
=======
/*= if (!build.classic) { =*/
>>>>>>>
<<<<<<<
=======
/*= } =*/
>>>>>>>
<<<<<<<
=======
/*= } =*/
>>>>>>>
<<<<<<<
cursor: 'pointer',
=======
/**
* @ignore
*/
>>>>>>>
/**
* @ignore
*/
cursor: 'pointer',
/**
* @ignore
*/
<<<<<<<
=======
/*= } =*/
>>>>>>>
<<<<<<<
=======
/*= } =*/
>>>>>>>
<<<<<<<
=======
/*= if (build.classic) { =*/
>>>>>>>
<<<<<<<
/**
* The HTML of the tooltip header line. Variables are enclosed by
* curly brackets. Available variables are `point.key`, `series.name`,
* `series.color` and other members from the `point` and `series`
* objects. The `point.key` variable contains the category name, x
* value or datetime string depending on the type of axis. For datetime
* axes, the `point.key` date format can be set using
* `tooltip.xDateFormat`.
*
* @sample {highcharts} highcharts/tooltip/footerformat/
* An HTML table in the tooltip
* @sample {highstock} highcharts/tooltip/footerformat/
* An HTML table in the tooltip
* @sample {highmaps} maps/tooltip/format/
* Format demo
*
* @type {string}
* @apioption tooltip.headerFormat
*/
headerFormat: '<span style="font-size: 10px">{point.key}</span><br/>',
/**
* The HTML of the point's line in the tooltip. Variables are enclosed
* by curly brackets. Available variables are point.x, point.y, series.
* name and series.color and other properties on the same form.
* Furthermore, `point.y` can be extended by the `tooltip.valuePrefix`
* and `tooltip.valueSuffix` variables. This can also be overridden for
* each series, which makes it a good hook for displaying units.
*
* In styled mode, the dot is colored by a class name rather
* than the point color.
*
* @sample {highcharts} highcharts/tooltip/pointformat/
* A different point format with value suffix
* @sample {highmaps} maps/tooltip/format/
* Format demo
*
* @type {string}
* @default <span style="color:{point.color}">\u25CF</span> {series.name}: <b>{point.y}</b><br/>
* @since 2.2
* @apioption tooltip.pointFormat
*/
pointFormat: '<span style="color:{point.color}">\u25CF</span> {series.name}: <b>{point.y}</b><br/>',
=======
/*= if (!build.classic) { =*/
headerFormat: '<span class="highcharts-header">{point.key}</span><br/>',
pointFormat: '<span class="highcharts-color-{point.colorIndex}">' +
'\u25CF</span> {series.name}: <span class="highcharts-strong">' +
'{point.y}</span><br/>',
/*= } else { =*/
>>>>>>>
/**
* The HTML of the tooltip header line. Variables are enclosed by
* curly brackets. Available variables are `point.key`, `series.name`,
* `series.color` and other members from the `point` and `series`
* objects. The `point.key` variable contains the category name, x
* value or datetime string depending on the type of axis. For datetime
* axes, the `point.key` date format can be set using
* `tooltip.xDateFormat`.
*
* @sample {highcharts} highcharts/tooltip/footerformat/
* An HTML table in the tooltip
* @sample {highstock} highcharts/tooltip/footerformat/
* An HTML table in the tooltip
* @sample {highmaps} maps/tooltip/format/
* Format demo
*
* @type {string}
* @apioption tooltip.headerFormat
*/
headerFormat: '<span style="font-size: 10px">{point.key}</span><br/>',
/**
* The HTML of the point's line in the tooltip. Variables are enclosed
* by curly brackets. Available variables are point.x, point.y, series.
* name and series.color and other properties on the same form.
* Furthermore, `point.y` can be extended by the `tooltip.valuePrefix`
* and `tooltip.valueSuffix` variables. This can also be overridden for
* each series, which makes it a good hook for displaying units.
*
* In styled mode, the dot is colored by a class name rather
* than the point color.
*
* @sample {highcharts} highcharts/tooltip/pointformat/
* A different point format with value suffix
* @sample {highmaps} maps/tooltip/format/
* Format demo
*
* @type {string}
* @default <span style="color:{point.color}">\u25CF</span> {series.name}: <b>{point.y}</b><br/>
* @since 2.2
* @apioption tooltip.pointFormat
*/
pointFormat: '<span style="color:{point.color}">\u25CF</span> {series.name}: <b>{point.y}</b><br/>',
<<<<<<<
=======
* The HTML of the tooltip header line. Variables are enclosed by
* curly brackets. Available variables are `point.key`, `series.name`,
* `series.color` and other members from the `point` and `series`
* objects. The `point.key` variable contains the category name, x
* value or datetime string depending on the type of axis. For datetime
* axes, the `point.key` date format can be set using
* `tooltip.xDateFormat`. To access the original point use
* `point.point`.
*
* Set an empty string to avoid header on a shared or split tooltip.
*
* @sample {highcharts} highcharts/tooltip/footerformat/
* An HTML table in the tooltip
* @sample {highstock} highcharts/tooltip/footerformat/
* An HTML table in the tooltip
* @sample {highmaps} maps/tooltip/format/
* Format demo
*/
headerFormat: '<span style="font-size: 10px">{point.key}</span><br/>',
/**
* The HTML of the point's line in the tooltip. Variables are enclosed
* by curly brackets. Available variables are point.x, point.y, series.
* name and series.color and other properties on the same form.
* Furthermore, `point.y` can be extended by the `tooltip.valuePrefix`
* and `tooltip.valueSuffix` variables. This can also be overridden for
* each series, which makes it a good hook for displaying units.
*
* Set an empty string to leave out a series from a shared or split
* tooltip.
*
* In styled mode, the dot is colored by a class name rather
* than the point color.
*
* @sample {highcharts} highcharts/tooltip/pointformat/
* A different point format with value suffix
* @sample {highmaps} maps/tooltip/format/
* Format demo
*
* @since 2.2
*/
pointFormat: '<span style="color:{point.color}">\u25CF</span> {series.name}: <b>{point.y}</b><br/>',
/**
>>>>>>>
<<<<<<<
=======
/*= if (build.classic) { =*/
>>>>>>>
<<<<<<<
=======
/*= } =*/
>>>>>>> |
<<<<<<<
=======
PRODUCT = 'Highmaps',
VERSION = '1.1.4-modified',
>>>>>>>
<<<<<<<
verticalCenter = legend.baseline - Math.round(renderer.fontMetrics(legendOptions.itemStyle.fontSize, this.legendItem).b * 0.3),
=======
verticalCenter = legend.baseline - mathRound(legend.fontMetrics.b * 0.3),
>>>>>>>
verticalCenter = legend.baseline - Math.round(legend.fontMetrics.b * 0.3),
<<<<<<<
} else {
this.minY = undefined;
this.maxY = undefined;
this.minX = undefined;
this.maxX = undefined;
=======
>>>>>>> |
<<<<<<<
negKey,
xData,
yData,
x,
y,
threshold = seriesOptions.threshold,
yDataLength,
distance,
activeYData = [],
activeCounter = 0;
// Get dataMin and dataMax for X axes
if (isXAxis) {
xData = series.xData;
dataMin = mathMin(pick(dataMin, xData[0]), mathMin.apply(math, xData));
dataMax = mathMax(pick(dataMax, xData[0]), mathMax.apply(math, xData));
// Get dataMin and dataMax for Y axes, as well as handle stacking and processed data
} else {
var isNegative,
pointStack,
key,
cropped = series.cropped,
xExtremes = series.xAxis.getExtremes(),
findPointRange,
pointRange,
j,
hasModifyValue = !!series.modifyValue;
// Handle stacking
stacking = seriesOptions.stacking;
=======
stackOption,
negKey;
if (!isXAxis) {
stacking = serie.options.stacking;
>>>>>>>
stackOption,
negKey,
xData,
yData,
x,
y,
threshold = seriesOptions.threshold,
yDataLength,
distance,
activeYData = [],
activeCounter = 0;
// Get dataMin and dataMax for X axes
if (isXAxis) {
xData = series.xData;
dataMin = mathMin(pick(dataMin, xData[0]), mathMin.apply(math, xData));
dataMax = mathMax(pick(dataMax, xData[0]), mathMax.apply(math, xData));
// Get dataMin and dataMax for Y axes, as well as handle stacking and processed data
} else {
var isNegative,
pointStack,
key,
cropped = series.cropped,
xExtremes = series.xAxis.getExtremes(),
findPointRange,
pointRange,
j,
hasModifyValue = !!series.modifyValue;
// Handle stacking
stacking = seriesOptions.stacking;
<<<<<<<
stackKey = series.type + pick(seriesOptions.stack, '');
=======
stackOption = serie.options.stack;
stackKey = serie.type + pick(stackOption, '');
>>>>>>>
stackOption = series.options.stack;
stackKey = series.type + pick(stackOption, '');
<<<<<<<
if (!stacks[key][x]) {
stacks[key][x] = new StackItem(options.stackLabels, isNegative, x);
}
stacks[key][x].setTotal(y);
// general hook, used for Highstock compare values feature
} else if (hasModifyValue) {
y = series.modifyValue(y);
}
j = y.length;
if (j) { // array, like ohlc data
while (j--) {
if (y[j] !== null) {
activeYData[activeCounter++] = y[j];
}
=======
if (!stacks[key][pointX]) {
stacks[key][pointX] = new StackItem(options.stackLabels, isNegative, pointX, stackOption);
>>>>>>>
if (!stacks[key][x]) {
stacks[key][x] = new StackItem(options.stackLabels, isNegative, x, stackOption);
}
stacks[key][x].setTotal(y);
// general hook, used for Highstock compare values feature
} else if (hasModifyValue) {
y = series.modifyValue(y);
}
j = y.length;
if (j) { // array, like ohlc data
while (j--) {
if (y[j] !== null) {
activeYData[activeCounter++] = y[j];
}
<<<<<<<
// create the label
var label = renderer.label('', 0, 0)
.attr({
padding: padding,
fill: options.backgroundColor,
'stroke-width': borderWidth,
r: options.borderRadius,
zIndex: 8
})
.css(style)
.hide()
.add()
.shadow(options.shadow);
=======
// create the elements
var group = renderer.g('tooltip')
.attr({ zIndex: 8 })
.add(),
box = renderer.rect(boxOffLeft, boxOffLeft, 0, 0, options.borderRadius, borderWidth)
.attr({
fill: options.backgroundColor,
'stroke-width': borderWidth
})
.add(group)
.shadow(options.shadow),
label = renderer.text('', padding + boxOffLeft, pInt(style.fontSize) + padding + boxOffLeft, options.useHTML)
.attr({ zIndex: 1 })
.css(style)
.add(group);
group.hide();
>>>>>>>
// create the label
var label = renderer.label('', 0, 0)
.attr({
padding: padding,
fill: options.backgroundColor,
'stroke-width': borderWidth,
r: options.borderRadius,
zIndex: 8
})
.css(style)
.hide()
.add()
.shadow(options.shadow); |
<<<<<<<
var Axis = H.Axis, Chart = H.Chart, Point = H.Point, Series = H.Series, SVGRenderer = H.SVGRenderer, seriesProto = Series.prototype, seriesInit = seriesProto.init, seriesProcessData = seriesProto.processData, pointTooltipFormatter = Point.prototype.tooltipFormatter;
=======
var Chart = H.Chart, Renderer = H.Renderer, Series = H.Series, SVGRenderer = H.SVGRenderer, VMLRenderer = H.VMLRenderer, seriesProto = Series.prototype, seriesInit = seriesProto.init, seriesProcessData = seriesProto.processData, pointTooltipFormatter = Point.prototype.tooltipFormatter;
>>>>>>>
var Chart = H.Chart, Renderer = H.Renderer, Series = H.Series, SVGRenderer = H.SVGRenderer, seriesProto = Series.prototype, seriesInit = seriesProto.init, seriesProcessData = seriesProto.processData, pointTooltipFormatter = Point.prototype.tooltipFormatter; |
<<<<<<<
module.exports = function render(input, out) {
slotTag(slotTagInput, out);
=======
module.exports = function render(input, context) {
slotTag(extend(slotTagInput, input), context);
>>>>>>>
module.exports = function render(input, out) {
slotTag(extend(slotTagInput, input), out); |
<<<<<<<
return '<script src="' + escapeXmlAttr(url) + '"></script>';
=======
return '<script type="text/javascript" src="' + escapeXmlAttr(url) + '" attrs="data.externalScriptAttrs"></script>';
>>>>>>>
return '<script src="' + escapeXmlAttr(url) + '" attrs="data.externalScriptAttrs"></script>';
<<<<<<<
return '<link rel="stylesheet" href="' + escapeXmlAttr(url) + '">';
=======
return '<link rel="stylesheet" type="text/css" href="' + escapeXmlAttr(url) + '" attrs="data.externalStyleAttrs">';
>>>>>>>
return '<link rel="stylesheet" href="' + escapeXmlAttr(url) + '" attrs="data.externalStyleAttrs">'; |
<<<<<<<
=======
>>>>>>>
<<<<<<<
output.push('<script>' + content.code + '</script>');
=======
output.push('<script type="text/javascript" attrs="data.inlineScriptAttrs" c-parse-body-text="false">' + content.code + '</script>');
>>>>>>>
output.push('<script attrs="data.inlineScriptAttrs" c-parse-body-text="false">' + content.code + '</script>');
<<<<<<<
output.push('<style>' + content.code + '</style>');
=======
output.push('<style type="text/css" attrs="data.inlineStyleAttrs" c-parse-body-text="false">' + content.code + '</style>');
>>>>>>>
output.push('<style attrs="data.inlineStyleAttrs" c-parse-body-text="false">' + content.code + '</style>'); |
<<<<<<<
var ts = require('typescript');
var logger_1 = require('./logger');
var compiler_host_1 = require('./compiler-host');
var transpiler_1 = require('./transpiler');
var type_checker_1 = require('./type-checker');
var format_errors_1 = require('./format-errors');
var utils_1 = require("./utils");
var logger = new logger_1.default({ debug: false });
function createFactory(options, _resolve, _fetch) {
options = options || {};
if (options.tsconfig) {
var tsconfig = (options.tsconfig === true) ? "tsconfig.json" : options.tsconfig;
return _resolve(tsconfig)
.then(function (tsconfigAddress) {
return _fetch(tsconfigAddress)
.then(function (tsconfigText) {
return { tsconfigAddress: tsconfigAddress, tsconfigText: tsconfigText };
});
})
.then(function (_a) {
var tsconfigAddress = _a.tsconfigAddress, tsconfigText = _a.tsconfigText;
var ts1 = ts;
var result = ts1.parseConfigFileText ?
ts1.parseConfigFileText(tsconfigAddress, tsconfigText) :
ts1.parseConfigFileTextToJson(tsconfigAddress, tsconfigText);
if (result.error) {
format_errors_1.formatErrors([result.error], logger);
throw new Error("failed to load tsconfig from " + tsconfigAddress);
}
var config = Object.assign(result.config.compilerOptions, options);
var files = result.config.files || [];
return createServices(config, _resolve, _fetch)
.then(function (services) {
var resolutions = files
.filter(function (filename) { return utils_1.isTypescriptDeclaration(filename); })
.map(function (filename) { return _resolve(filename, tsconfigAddress); });
return Promise.all(resolutions)
.then(function (resolvedFiles) {
resolvedFiles.forEach(function (resolvedFile) {
services.typeChecker.registerDeclarationFile(resolvedFile, false);
});
return services;
});
});
});
}
else {
return createServices(options, _resolve, _fetch);
}
=======
import ts from 'typescript';
import Logger from './logger';
import {CompilerHost} from './compiler-host';
import {Transpiler} from './transpiler';
import {TypeChecker} from './type-checker';
import {formatErrors} from './format-errors';
import {isTypescriptDeclaration} from "./utils";
let logger = new Logger({ debug: false });
export function createFactory(options, _resolve, _fetch) {
options = options || {};
if (options.tsconfig === true)
options.tsconfig = "tsconfig.json";
if (options.tsconfig) {
return _resolve(options.tsconfig)
.then(tsconfigAddress => {
return _fetch(tsconfigAddress)
.then(tsconfigText => {
return {tsconfigAddress, tsconfigText};
});
})
.then(({tsconfigAddress, tsconfigText}) => {
let result = ts.parseConfigFileText ? ts.parseConfigFileText(tsconfigAddress, tsconfigText) : ts.parseConfigFileTextToJson(tsconfigAddress, tsconfigText);
if (result.error) {
formatErrors([result.error], logger);
throw new Error(`failed to load tsconfig from ${tsconfigAddress}`);
}
let config = Object.assign(result.config.compilerOptions, options);
let files = result.config.files || [];
return createServices(config, _resolve, _fetch)
.then(services => {
if (!services.typeChecker) return services;
let resolutions = files
.filter(filename => isTypescriptDeclaration(filename))
.map(filename => _resolve(filename, tsconfigAddress));
return Promise.all(resolutions)
.then(resolvedFiles => {
resolvedFiles.forEach(resolvedFile => {
services.typeChecker.registerDeclarationFile(resolvedFile, false);
});
return services;
});
});
});
}
else {
return createServices(options, _resolve, _fetch);
}
>>>>>>>
var ts = require('typescript');
var logger_1 = require('./logger');
var compiler_host_1 = require('./compiler-host');
var transpiler_1 = require('./transpiler');
var type_checker_1 = require('./type-checker');
var format_errors_1 = require('./format-errors');
var utils_1 = require("./utils");
var logger = new logger_1.default({ debug: false });
function createFactory(options, _resolve, _fetch) {
options = options || {};
if (options.tsconfig) {
var tsconfig = (options.tsconfig === true) ? "tsconfig.json" : options.tsconfig;
return _resolve(tsconfig)
.then(function (tsconfigAddress) {
return _fetch(tsconfigAddress)
.then(function (tsconfigText) {
return { tsconfigAddress: tsconfigAddress, tsconfigText: tsconfigText };
});
})
.then(function (_a) {
var tsconfigAddress = _a.tsconfigAddress, tsconfigText = _a.tsconfigText;
var ts1 = ts;
var result = ts1.parseConfigFileText ?
ts1.parseConfigFileText(tsconfigAddress, tsconfigText) :
ts1.parseConfigFileTextToJson(tsconfigAddress, tsconfigText);
if (result.error) {
format_errors_1.formatErrors([result.error], logger);
throw new Error("failed to load tsconfig from " + tsconfigAddress);
}
var config = Object.assign(result.config.compilerOptions, options);
var files = result.config.files || [];
return createServices(config, _resolve, _fetch)
.then(function (services) {
if (!services.typeChecker)
return services;
var resolutions = files
.filter(function (filename) { return utils_1.isTypescriptDeclaration(filename); })
.map(function (filename) { return _resolve(filename, tsconfigAddress); });
return Promise.all(resolutions)
.then(function (resolvedFiles) {
resolvedFiles.forEach(function (resolvedFile) {
services.typeChecker.registerDeclarationFile(resolvedFile, false);
});
return services;
});
});
});
}
else {
return createServices(options, _resolve, _fetch);
} |
<<<<<<<
if (!this.isBooted)
{
return;
}
=======
// Sets `elapsed`, `elapsedMS`, `now`, `time`
>>>>>>>
if (!this.isBooted)
{
return;
}
// Sets `elapsed`, `elapsedMS`, `now`, `time` |
<<<<<<<
* @param {*} child - The child to check for the existance of the property on.
* @param {string[]} key - An array of strings that make up the property.
=======
* @param {any} child - The child to check for the existance of the property on.
* @param {array} key - An array of strings that make up the property.
>>>>>>>
* @param {any} child - The child to check for the existance of the property on.
* @param {string[]} key - An array of strings that make up the property.
<<<<<<<
* @param {function} callback - The function that will be called. Each child of the Group will be passed to it as its first parameter.
* @param {object} callbackContext - The context in which the function should be called (usually 'this').
* @param {boolean} [checkExists=false] - If set only children with exists=true will be passed to the callback, otherwise all children will be passed.
=======
* @param {function} callback - The function that will be called for each applicable child. The child will be passed as the first argument.
* @param {object} [callbackContext=undefined] - The context in which the function should be called (usually 'this').
* @param {boolean} [checkExists=false] - If set only children matching for which `exists` is true will be passed to the callback, otherwise all children will be passed.
* @param {...any} [args=(none)] - Additional arguments to pass to the callback function, after the child item.
>>>>>>>
* @param {function} callback - The function that will be called for each applicable child. The child will be passed as the first argument.
* @param {object} callbackContext - The context in which the function should be called (usually 'this').
* @param {boolean} [checkExists=false] - If set only children matching for which `exists` is true will be passed to the callback, otherwise all children will be passed.
* @param {...any} [args=(none)] - Additional arguments to pass to the callback function, after the child item.
<<<<<<<
* @param {function} callback - The function that will be called. Each child of the Group will be passed to it as its first parameter.
* @param {object} callbackContext - The context in which the function should be called (usually 'this').
=======
* @param {function} callback - The function that will be called for each applicable child. The child will be passed as the first argument.
* @param {object} [callbackContext=undefined] - The context in which the function should be called (usually 'this').
* @param {...any} [args=(none)] - Additional arguments to pass to the callback function, after the child item.
>>>>>>>
* @param {function} callback - The function that will be called for each applicable child. The child will be passed as the first argument.
* @param {object} callbackContext - The context in which the function should be called (usually 'this').
* @param {...any} [args=(none)] - Additional arguments to pass to the callback function, after the child item.
<<<<<<<
* @param {function} callback - The function that will be called. Each child of the Group will be passed to it as its first parameter.
* @param {object} callbackContext - The context in which the function should be called (usually 'this').
=======
* @param {function} callback - The function that will be called for each applicable child. The child will be passed as the first argument.
* @param {object} [callbackContext=undefined] - The context in which the function should be called (usually 'this').
* @param {...any} [args=(none)] - Additional arguments to pass to the callback function, after the child item.
>>>>>>>
* @param {function} callback - The function that will be called for each applicable child. The child will be passed as the first argument.
* @param {object} callbackContext - The context in which the function should be called (usually 'this').
* @param {...any} [args=(none)] - Additional arguments to pass to the callback function, after the child item.
<<<<<<<
* @param {function} callback - The function that will be called. Each child of the Group will be passed to it as its first parameter.
* @param {object} callbackContext - The context in which the function should be called (usually 'this').
=======
* @param {function} callback - The function that will be called for each applicable child. The child will be passed as the first argument.
* @param {object} [callbackContext=undefined] - The context in which the function should be called (usually 'this').
* @param {...any} [args=(none)] - Additional arguments to pass to the callback function, after the child item.
>>>>>>>
* @param {function} callback - The function that will be called for each applicable child. The child will be passed as the first argument.
* @param {object} callbackContext - The context in which the function should be called (usually 'this').
* @param {...any} [args=(none)] - Additional arguments to pass to the callback function, after the child item.
<<<<<<<
* @param {any} value - If child.key === this value it will be considered a match. Note that a strict comparison is used.
* @param {number} returnType - How to return the data from this method. Either Phaser.Group.RETURN_NONE, Phaser.Group.RETURN_TOTAL or Phaser.Group.RETURN_CHILD.
* @param {function} [callback=null] - Optional function that will be called on each matching child. Each child of the Group will be passed to it as its first parameter.
* @param {object} [callbackContext] - The context in which the function should be called (usually 'this').
* @return {any} Returns either a numeric total (if RETURN_TOTAL was specified) or the child object.
=======
* @param {any} value - A child matches if `child[key] === value` is true.
* @param {integer} returnType - How to iterate the childen and what to return.
* @param {function} [callback=null] - Optional function that will be called on each matching child. The matched child is supplied as the first argument.
* @param {object} [callbackContext=null] - The context in which the callback will be invoked (usually 'this').
* @param {any[]} [args=(none)] - The arguments supplied to to the callback; the first array index (argument) will be replaced with the matched child.
* @return {any} Returns either an integer (for RETURN_TOTAL), the first matched child (for RETURN_CHILD), or null.
>>>>>>>
* @param {any} value - A child matches if `child[key] === value` is true.
* @param {integer} returnType - How to iterate the childen and what to return.
* @param {function} [callback=null] - Optional function that will be called on each matching child. The matched child is supplied as the first argument.
* @param {object} [callbackContext] - The context in which the function should be called (usually 'this').
* @param {any[]} [args=(none)] - The arguments supplied to to the callback; the first array index (argument) will be replaced with the matched child.
* @return {any} Returns either an integer (for RETURN_TOTAL), the first matched child (for RETURN_CHILD), or null.
<<<<<<<
* @param {boolean} state - True or false.
* @return {any} The first child, or null if none found.
=======
* @param {boolean} [exists=true] - If true, find the first existing child; otherwise find the first non-existing child.
* @return {any} The first matching child, or null if none found.
>>>>>>>
* @param {boolean} [exists=true] - If true, find the first existing child; otherwise find the first non-existing child.
* @return {any} The first child, or null if none found.
<<<<<<<
* @return {any} The child at the top of the Group.
=======
* @return {any} The child at the top of the group.
>>>>>>>
* @return {any} The child at the top of the Group.
<<<<<<<
* @return {any} The child at the bottom of the Group.
=======
* @return {any} The child at the bottom of the group.
>>>>>>>
* @return {any} The child at the bottom of the Group.
<<<<<<<
* @param {number} startIndex - Optional offset off the front of the array. Default value is 0, or the beginning of the array.
* @param {number} length - Optional restriction on the number of values you want to randomly select from.
* @return {any} A random child of this Group.
=======
* @param {number} [startIndex=0] - Offset from the front of the front of the group (lowest child).
* @param {number} [length=(to top)] - Restriction on the number of values you want to randomly select from.
* @return {any} A random child of this group, or null if an invalid range was specified.
>>>>>>>
* @param {number} [startIndex=0] - Offset from the front of the front of the group (lowest child).
* @param {number} [length=(to top)] - Restriction on the number of values you want to randomly select from.
* @return {any} A random child of this Group.
<<<<<<<
* @param {any} child - The child to remove.
* @param {boolean} [destroy=false] - You can optionally call destroy on the child that was removed.
* @param {boolean} [silent=false] - If the silent parameter is `true` the child will not dispatch the onRemovedFromGroup event.
* @return {boolean} true if the child was removed from this Group, otherwise false.
=======
* @param {any} child - The child to remove.
* @param {boolean} [destroy=false] - If true, `destroy` will be invoked on the removed child.
* @param {boolean} [silent=false] - If true, the the child will not dispatch the `onRemovedFromGroup` event.
* @return {boolean} true if the child was removed from this group, otherwise false.
>>>>>>>
* @param {any} child - The child to remove.
* @param {boolean} [destroy=false] - If true `destroy` will be invoked on the removed child.
* @param {boolean} [silent=false] - If true the the child will not dispatch the `onRemovedFromGroup` event.
* @return {boolean} true if the child was removed from this group, otherwise false. |
<<<<<<<
else if (displayObject instanceof Phaser.Creature) {
var width = Math.abs(displayObject.width);
var height = Math.abs(displayObject.height);
=======
else if (Phaser.Creature && displayObject instanceof Phaser.Creature) {
var width = displayObject.width;
var height = displayObject.height;
>>>>>>>
else if (Phaser.Creature && displayObject instanceof Phaser.Creature) {
var width = Math.abs(displayObject.width);
var height = Math.abs(displayObject.height); |
<<<<<<<
var components = [
'Angle',
'Animation',
'AutoCull',
'Bounds',
'BringToTop',
'Crop',
'Destroy',
'FixedToCamera',
'InputEnabled',
'LifeSpan',
'LoadTexture',
'Overlap',
'Reset',
'Smoothed'
];
Phaser.Component.Core.install.call(Phaser.Image.prototype, components);
=======
Phaser.Image.prototype.preUpdateInWorld = Phaser.Component.InWorld.preUpdate;
Phaser.Image.prototype.preUpdateCore = Phaser.Component.Core.preUpdate;
>>>>>>>
var components = [
'Angle',
'Animation',
'AutoCull',
'Bounds',
'BringToTop',
'Crop',
'Destroy',
'FixedToCamera',
'InputEnabled',
'LifeSpan',
'LoadTexture',
'Overlap',
'Reset',
'Smoothed'
];
Phaser.Component.Core.install.call(Phaser.Image.prototype, components);
Phaser.Image.prototype.preUpdateInWorld = Phaser.Component.InWorld.preUpdate;
Phaser.Image.prototype.preUpdateCore = Phaser.Component.Core.preUpdate; |
<<<<<<<
* It uses a combination of tag loading (eg. Image elements) and XHR and provides progress and completion callbacks.
*
* Parallel loading is supported but must be enabled explicitly with {@link Phaser.Loader#enableParallel enableParallel}.
* Load-before behavior of parallel resources is controlled by synchronization points as discussed in {@link Phaser.Loader#withSyncPoint withSyncPoint}.
=======
* It uses a combination of Image() loading and xhr and provides progress and completion callbacks.
* Texture Atlases can be created with tools such as [Texture Packer](https://www.codeandweb.com/texturepacker/phaser) and
* [Shoebox](http://renderhjs.net/shoebox/)
>>>>>>>
*
* The loader uses a combination of tag loading (eg. Image elements) and XHR and provides progress and completion callbacks.
*
* Parallel loading is supported but must be enabled explicitly with {@link Phaser.Loader#enableParallel enableParallel}.
* Load-before behavior of parallel resources is controlled by synchronization points as discussed in {@link Phaser.Loader#withSyncPoint withSyncPoint}.
*
* Texture Atlases can be created with tools such as [Texture Packer](https://www.codeandweb.com/texturepacker/phaser) and
* [Shoebox](http://renderhjs.net/shoebox/)
<<<<<<<
* @property {boolean} _warnedAboutXDomainRequest - Control number of warnings for using XDR outside of IE 9.
=======
* @property {Phaser.Signal} onPackComplete - This event is dispatched when the asset pack manifest file has loaded and successfully added its contents to the loader queue.
>>>>>>>
* @private
* @property {boolean} _warnedAboutXDomainRequest - Control number of warnings for using XDR outside of IE 9.
<<<<<<<
this._loadedFileCount = 0;
=======
this._xdr = null;
>>>>>>>
this._loadedFileCount = 0;
<<<<<<<
* @param {string[]|string} urls - An array containing the URLs of the audio files, i.e.: [ 'jump.mp3', 'jump.ogg', 'jump.m4a' ] or a single string containing just one URL.
* @param {boolean} [autoDecode=true] - When using Web Audio the audio files can either be decoded at load time or run-time.
* They can't be played until they are decoded, but this let's you control when that happens. Decoding is a non-blocking async process.
=======
* @param {Array|string} urls - An array containing the URLs of the audio files, i.e.: [ 'jump.mp3', 'jump.ogg', 'jump.m4a' ] or a single string containing just one URL. BLOB urls are supported, but note that Phaser will not validate the audio file's type if a BLOB is provided; the user should ensure that a BLOB url is playable.
* @param {boolean} autoDecode - When using Web Audio the audio files can either be decoded at load time or run-time. They can't be played until they are decoded, but this let's you control when that happens. Decoding is a non-blocking async process.
>>>>>>>
* @param {string[]|string} urls - An array containing the URLs of the audio files, i.e.: [ 'jump.mp3', 'jump.ogg', 'jump.m4a' ] or a single string containing just one URL.
* BLOB urls are supported, but Phaser will not validate the audio file's type in this case; the program must first ensure the BLOB url is playable.
* @param {boolean} autoDecode - When using Web Audio the audio files can either be decoded at load time or run-time. They can't be played until they are decoded, but this let's you control when that happens. Decoding is a non-blocking async process.
<<<<<<<
* Add a new texture atlas ('textureatlas') to the loader. This atlas uses the JSON Array data format.
=======
* Add a new texture atlas to the loader. This atlas uses the JSON Array data format.
* Texture Atlases can be created with tools such as [Texture Packer](https://www.codeandweb.com/texturepacker/phaser) and
* [Shoebox](http://renderhjs.net/shoebox/)
>>>>>>>
* Add a new texture atlas ('textureatlas') to the loader. This atlas uses the JSON Array data format.
*
* Texture Atlases can be created with tools such as [Texture Packer](https://www.codeandweb.com/texturepacker/phaser) and
* [Shoebox](http://renderhjs.net/shoebox/)
<<<<<<<
* Add a new texture atlas ('textureatlas') to the loader. This atlas uses the JSON Hash data format.
=======
* Add a new texture atlas to the loader. This atlas uses the JSON Hash data format.
* Texture Atlases can be created with tools such as [Texture Packer](https://www.codeandweb.com/texturepacker/phaser) and
* [Shoebox](http://renderhjs.net/shoebox/)
>>>>>>>
* Add a new texture atlas ('textureatlas') to the loader. This atlas uses the JSON Hash data format.
*
* Texture Atlases can be created with tools such as [Texture Packer](https://www.codeandweb.com/texturepacker/phaser) and
* [Shoebox](http://renderhjs.net/shoebox/)
<<<<<<<
* Add a new texture atlas ('textureatlas') to the loader.
=======
* Add a new texture atlas to the loader.
* Texture Atlases can be created with tools such as [Texture Packer](https://www.codeandweb.com/texturepacker/phaser) and
* [Shoebox](http://renderhjs.net/shoebox/)
>>>>>>>
* Add a new texture atlas ('textureatlas') to the loader.
*
* Texture Atlases can be created with tools such as [Texture Packer](https://www.codeandweb.com/texturepacker/phaser) and
* [Shoebox](http://renderhjs.net/shoebox/)
<<<<<<<
this.xhrLoad(file, this.transformUrl(file.url, file), 'text', this.jsonLoadComplete);
=======
this.xhrLoad(this._fileIndex, this.baseURL + file.url, 'text', 'jsonLoadComplete', 'dataLoadError');
>>>>>>>
this.xhrLoad(file, this.transformUrl(file.url, file), 'text', this.jsonLoadComplete);
<<<<<<<
var extension = urls[i].toLowerCase();
=======
extension = urls[i].toLowerCase();
if (extension.substr(0,5) === "blob:")
{
return urls[i];
}
>>>>>>>
var url = urls[i];
// It is assumed that a direct-data URI can be played.
if (url.indexOf("blob:") === 0 || url.indexOf("data:") === 0)
{
return url;
}
var extension = url.toLowerCase();
<<<<<<<
this.xhrLoad(file, this.transformUrl(file.xmlURL, file), 'text', this.xmlLoadComplete);
=======
this.xhrLoad(this._fileIndex, this.baseURL + file.xmlURL, 'text', 'xmlLoadComplete', 'dataLoadError');
>>>>>>>
this.xhrLoad(file, this.transformUrl(file.xmlURL, file), 'text', this.xmlLoadComplete);
<<<<<<<
var data = JSON.parse(xhr.responseText);
=======
if (!this._fileList[index])
{
console.warn('Phaser.Loader jsonLoadComplete invalid index ' + index);
return;
}
var file = this._fileList[index];
if (this._xdr && this._xdr.responseText)
{
var data = JSON.parse(this._xdr.responseText);
}
else
{
var data = JSON.parse(this._xhr.responseText);
}
file.loaded = true;
>>>>>>>
var data = JSON.parse(xhr.responseText); |
<<<<<<<
// console.log('install', this);
// Always install 'Core' first
Phaser.Utils.mixinPrototype(this, Phaser.Component.Core.prototype);
=======
>>>>>>>
// Always install 'Core' first
Phaser.Utils.mixinPrototype(this, Phaser.Component.Core.prototype); |
<<<<<<<
extent = [[Infinity, -Infinity],
[Infinity, -Infinity],
[-Infinity, Infinity]];
=======
extents = [[-Infinity, Infinity],
[-Infinity, Infinity],
[-Infinity, Infinity]];
>>>>>>>
extent = [[-Infinity, Infinity],
[-Infinity, Infinity],
[-Infinity, Infinity]];
<<<<<<<
var range = d3_behavior_zoomExtent[i],
=======
var range = d3_behavior_zoomExtents[i],
r0 = range[0],
>>>>>>>
var range = d3_behavior_zoomExtent[i],
r0 = range[0],
<<<<<<<
return arguments.length === 3
? Math.max(r1 * (r1 === -Infinity ? 1 : 1 / k - 1), Math.min(range[0], x / k)) * k
: Math.max(range[0], Math.min(r1, x));
=======
if (arguments.length === 3) {
return Math.max(r1 * (r1 === Infinity ? -Infinity : 1 / k - 1),
Math.min(r0 === -Infinity ? Infinity : r0, x / k)) * k;
}
return Math.max(r0, Math.min(r1, x));
>>>>>>>
return arguments.length === 3
? Math.max(r1 * (r1 === Infinity ? -Infinity : 1 / k - 1),
Math.min(r0 === -Infinity ? Infinity : r0, x / k)) * k
: Math.max(r0, Math.min(r1, x)); |
<<<<<<<
mousedown = "mousedown.zoom",
mousemove = "mousemove.zoom",
mouseup = "mouseup.zoom",
mousewheelTimer,
touchstart = "touchstart.zoom",
touchmove = "touchmove.zoom",
touchend = "touchend.zoom",
touchtime, // time of last touchstart (to detect double-tap)
event = d3_eventDispatch(zoom, "zoomstart", "zoom", "zoomend"),
=======
center, // desired position of translate0 after zooming
event = d3_eventDispatch(zoom, "zoom"),
>>>>>>>
mousedown = "mousedown.zoom",
mousemove = "mousemove.zoom",
mouseup = "mouseup.zoom",
mousewheelTimer,
touchstart = "touchstart.zoom",
touchmove = "touchmove.zoom",
touchend = "touchend.zoom",
touchtime, // time of last touchstart (to detect double-tap)
event = d3_eventDispatch(zoom, "zoomstart", "zoom", "zoomend"),
<<<<<<<
function mousewheeled() {
var event_ = event.of(this, arguments);
if (mousewheelTimer) clearTimeout(mousewheelTimer);
else zoomstarted(event_);
mousewheelTimer = setTimeout(function() { mousewheelTimer = null; zoomended(event_); }, 50);
d3_eventPreventDefault();
if (!translate0) translate0 = location(d3.mouse(this));
=======
function mousewheel() {
var point = center || d3.mouse(this);
if (!translate0) translate0 = location(point);
>>>>>>>
function mousewheeled() {
var event_ = event.of(this, arguments);
if (mousewheelTimer) clearTimeout(mousewheelTimer);
else zoomstarted(event_);
mousewheelTimer = setTimeout(function() { mousewheelTimer = null; zoomended(event_); }, 50);
d3_eventPreventDefault();
var point = center || d3.mouse(this);
if (!translate0) translate0 = location(point);
<<<<<<<
translateTo(d3.mouse(this), translate0);
zoomed(event_);
=======
translateTo(point, translate0);
dispatch(event.of(this, arguments));
>>>>>>>
translateTo(point, translate0);
zoomed(event_); |
<<<<<<<
var transition = node[ns][id];
(transition.event || (transition.event = d3.dispatch("start", "end"))).on(type, listener);
=======
var transition = node.__transition__[id];
(transition.event || (transition.event = d3.dispatch("start", "end", "interrupt"))).on(type, listener);
>>>>>>>
var transition = node[ns][id];
(transition.event || (transition.event = d3.dispatch("start", "end", "interrupt"))).on(type, listener); |
<<<<<<<
"cardinal-open",
"cardinal-closed"
=======
"cardinal-closed",
"monotone"
>>>>>>>
"cardinal-open",
"cardinal-closed",
"monotone" |
<<<<<<<
} else if (abs(from[0] - to[0]) > ε) {
var s = (from[0] < to[0] ? 1 : -1) * π;
=======
} else if (Math.abs(from[0] - to[0]) > ε) {
var s = from[0] < to[0] ? π : -π;
>>>>>>>
} else if (abs(from[0] - to[0]) > ε) {
var s = from[0] < to[0] ? π : -π; |
<<<<<<<
extents = [[-Infinity, Infinity],
[-Infinity, Infinity],
[-Infinity, Infinity]];
=======
origin = d3_behavior_zoomOrigin([0, 0, 0]),
extent = [[-Infinity, Infinity],
[-Infinity, Infinity],
[-Infinity, Infinity]];
>>>>>>>
extent = [[-Infinity, Infinity],
[-Infinity, Infinity],
[-Infinity, Infinity]];
<<<<<<<
d3_behavior_zoomXyz = xyz;
d3_behavior_zoomExtents = extents;
d3_behavior_zoomDispatch = event.zoom.dispatch;
=======
d3_behavior_zoomXyz = xyz = origin.apply(this, arguments);
d3_behavior_zoomExtent = extent;
d3_behavior_zoomDispatch = event.zoom;
>>>>>>>
d3_behavior_zoomXyz = xyz;
d3_behavior_zoomExtent = extent;
d3_behavior_zoomDispatch = event.zoom.dispatch;
<<<<<<<
zoom.extents = function(x) {
if (!arguments.length) return extents;
extents = x == null ? (x = [-Infinity, Infinity], [x, x, x]) : x;
=======
zoom.origin = function(x) {
if (!arguments.length) return origin;
origin = x == null ? d3_behavior_zoomOrigin([0, 0, 0]) : x;
return zoom;
};
zoom.extent = function(x) {
if (!arguments.length) return extent;
extent = x == null ? Object : x;
>>>>>>>
zoom.extent = function(x) {
if (!arguments.length) return extent;
extent = x == null ? (x = [-Infinity, Infinity], [x, x, x]) : x;
<<<<<<<
function d3_behavior_zoomExtentsClamp(x, i, k) {
var range = d3_behavior_zoomExtents[i],
=======
function d3_behavior_zoomExtentsRange(x, i, k) {
var range = d3_behavior_zoomExtent[i],
>>>>>>>
function d3_behavior_zoomExtentClamp(x, i, k) {
var range = d3_behavior_zoomExtent[i], |
<<<<<<<
=======
function d3_geo_antemeridianLine(rotate, project) {
return function(lineString, context) {
d3_geo_antemeridianClipLine(rotate, project, lineString, context);
};
}
function d3_geo_antemeridianRing(rotate, project) {
return function(ring, context) {
d3_geo_antemeridianClipLine(rotate, project, ring, context);
context.closePath();
};
}
function d3_geo_antemeridianClipLine(rotate, project, lineString, context) {
if (!(n = lineString.length)) return;
var λ0, φ0, λ1, φ1, δλ, sλ0, i = 0, n, point = rotate(lineString[0]);
point = project(λ0 = point[0], φ0 = point[1]);
context.moveTo(point[0], point[1]);
while (++i < n) {
λ1 = (point = rotate(lineString[i]))[0];
φ1 = point[1];
δλ = (Math.abs(λ1 - λ0) + 2 * π) % (2 * π);
sλ0 = λ0 > 0;
if (sλ0 ^ λ1 > 0 && (δλ >= π || δλ < ε && Math.abs(Math.abs(λ0) - π) < ε)) {
φ0 = d3_geo_antemeridianIntersect(λ0, φ0, λ1, φ1);
context.lineTo((point = project(sλ0 ? π : -π, φ0))[0], point[1]);
context.moveTo((point = project(sλ0 ? -π : π, φ0))[0], point[1]);
}
context.lineTo((point = project(λ0 = λ1, φ0 = φ1))[0], point[1]);
}
}
function d3_geo_antemeridianIntersect(λ0, φ0, λ1, φ1) {
var cosφ0, cosφ1, sinλ0_λ1 = Math.sin(λ0 - λ1);
return Math.abs(sinλ0_λ1) > ε ? Math.atan((Math.sin(φ0) * (cosφ1 = Math.cos(φ1)) * Math.sin(λ1) - Math.sin(φ1) * (cosφ0 = Math.cos(φ0)) * Math.sin(λ0)) / (cosφ0 * cosφ1 * sinλ0_λ1)) : (φ0 + φ1) / 2;
}
>>>>>>> |
<<<<<<<
d3_selectionPrototype.datum = function(value) {
return arguments.length < 1
? this.property("__data__")
: this.property("__data__", value);
=======
d3_selectionPrototype.datum =
d3_selectionPrototype.map = function(value) {
return arguments.length
? this.property("__data__", value)
: this.property("__data__");
>>>>>>>
d3_selectionPrototype.datum = function(value) {
return arguments.length
? this.property("__data__", value)
: this.property("__data__"); |
<<<<<<<
var g = d3.select(this).style("pointer-events", "all").on("mousedown.brush", down),
=======
var g = d3.select(this)
.on("mousedown.brush", down)
.on("touchstart.brush", down),
>>>>>>>
var g = d3.select(this)
.style("pointer-events", "all")
.on("mousedown.brush", down)
.on("touchstart.brush", down),
<<<<<<<
var target = d3.select(d3.event.target),
resize;
=======
var target = d3.select(d3.event.target),
touches = d3.event.changedTouches;
>>>>>>>
var target = d3.select(d3.event.target),
touches = d3.event.changedTouches,
resize;
<<<<<<<
d3_svg_brushPoint = d3.svg.mouse(d3_svg_brushTarget);
=======
d3_svg_brushOffset = touches
? d3.svg.touches(d3_svg_brushTarget, touches)[0]
: d3.svg.mouse(d3_svg_brushTarget);
>>>>>>>
d3_svg_brushPoint = touches
? d3.svg.touches(d3_svg_brushTarget, touches)[0]
: d3.svg.mouse(d3_svg_brushTarget);
<<<<<<<
if (d3_svg_brushPoint) {
var mouse = d3.svg.mouse(d3_svg_brushTarget),
=======
if (d3_svg_brushOffset) {
var touches = d3.event.changedTouches,
mouse = touches
? d3.svg.touches(d3_svg_brushTarget, touches)[0]
: d3.svg.mouse(d3_svg_brushTarget),
>>>>>>>
if (d3_svg_brushPoint) {
var touches = d3.event.changedTouches,
mouse = touches
? d3.svg.touches(d3_svg_brushTarget, touches)[0]
: d3.svg.mouse(d3_svg_brushTarget), |
<<<<<<<
extent = [[Infinity, -Infinity],
[Infinity, -Infinity],
[-Infinity, Infinity]];
=======
extents = [[-Infinity, Infinity],
[-Infinity, Infinity],
[-Infinity, Infinity]];
>>>>>>>
extent = [[-Infinity, Infinity],
[-Infinity, Infinity],
[-Infinity, Infinity]];
<<<<<<<
var range = d3_behavior_zoomExtent[i],
=======
var range = d3_behavior_zoomExtents[i],
r0 = range[0],
>>>>>>>
var range = d3_behavior_zoomExtent[i],
r0 = range[0],
<<<<<<<
return arguments.length === 3
? Math.max(r1 * (r1 === -Infinity ? 1 : 1 / k - 1), Math.min(range[0], x / k)) * k
: Math.max(range[0], Math.min(r1, x));
=======
if (arguments.length === 3) {
return Math.max(r1 * (r1 === Infinity ? -Infinity : 1 / k - 1),
Math.min(r0 === -Infinity ? Infinity : r0, x / k)) * k;
}
return Math.max(r0, Math.min(r1, x));
>>>>>>>
return arguments.length === 3
? Math.max(r1 * (r1 === Infinity ? -Infinity : 1 / k - 1),
Math.min(r0 === -Infinity ? Infinity : r0, x / k)) * k
: Math.max(r0, Math.min(r1, x)); |
<<<<<<<
const Container = styled.div.attrs((props) => ({
=======
const styledTiles = css`
width: 100%;
cursor: pointer;
transition: 0.2s transform, 0.15s opacity;
border-radius: 4px;
opacity: 0;
`;
const Image = styled.img`
${styledTiles}
`;
const Video = styled.video`
${styledTiles}
object-fit: cover;
`;
const Container = styled.button.attrs((props) => ({
>>>>>>>
const Container = styled.button.attrs((props) => ({ |
<<<<<<<
stylePresets,
=======
autoAdvance,
defaultPageDuration,
>>>>>>>
stylePresets,
autoAdvance,
defaultPageDuration,
<<<<<<<
stylePresets,
=======
autoAdvance,
defaultPageDuration,
>>>>>>>
stylePresets,
autoAdvance,
defaultPageDuration, |
<<<<<<<
'ept-notifications',
=======
'ept-moderation-logs',
>>>>>>>
'ept-notifications',
'ept-moderation-logs', |
<<<<<<<
var g = d3.select(this).style("pointer-events", "all").on("mousedown.brush", down),
=======
var g = d3.select(this)
.on("mousedown.brush", down)
.on("touchstart.brush", down),
>>>>>>>
var g = d3.select(this)
.style("pointer-events", "all")
.on("mousedown.brush", down)
.on("touchstart.brush", down),
<<<<<<<
var target = d3.select(d3.event.target),
resize;
=======
var target = d3.select(d3.event.target),
touches = d3.event.changedTouches;
>>>>>>>
var target = d3.select(d3.event.target),
touches = d3.event.changedTouches,
resize;
<<<<<<<
d3_svg_brushPoint = d3.svg.mouse(d3_svg_brushTarget);
=======
d3_svg_brushOffset = touches
? d3.svg.touches(d3_svg_brushTarget, touches)[0]
: d3.svg.mouse(d3_svg_brushTarget);
>>>>>>>
d3_svg_brushPoint = touches
? d3.svg.touches(d3_svg_brushTarget, touches)[0]
: d3.svg.mouse(d3_svg_brushTarget);
<<<<<<<
if (d3_svg_brushPoint) {
var mouse = d3.svg.mouse(d3_svg_brushTarget),
=======
if (d3_svg_brushOffset) {
var touches = d3.event.changedTouches,
mouse = touches
? d3.svg.touches(d3_svg_brushTarget, touches)[0]
: d3.svg.mouse(d3_svg_brushTarget),
>>>>>>>
if (d3_svg_brushPoint) {
var touches = d3.event.changedTouches,
mouse = touches
? d3.svg.touches(d3_svg_brushTarget, touches)[0]
: d3.svg.mouse(d3_svg_brushTarget), |
<<<<<<<
=======
// MqttConnection
this.conn = new Connection(this.stream);
// Set encoding of incoming publish payloads
if (this.options.encoding) {
this.conn.setEncoding(this.options.encoding);
}
>>>>>>> |
<<<<<<<
this.streamBuilder = streamBuilder;
this._setupStream();
// MqttConnection
this.conn = new Connection(this.stream);
=======
// Set up MQTTConnection and stream event listeners
this.setStream(stream);
>>>>>>>
this.streamBuilder = streamBuilder;
this._setupStream();
// MqttConnection
this.conn = new Connection(this.stream);
<<<<<<<
// Echo connection errors
this.conn.on('error', this.emit.bind(this, 'error'));
=======
>>>>>>>
// Echo connection errors
this.conn.on('error', this.emit.bind(this, 'error'));
<<<<<<<
// Handle connack
this.conn.on('connack', function (packet) {
that._handleConnack(packet);
});
=======
>>>>>>>
// Handle connack
this.conn.on('connack', function (packet) {
that._handleConnack(packet);
});
<<<<<<<
* setup the event handlers in the inner stream.
*
* @api private
*/
MqttClient.prototype._setupStream = function() {
var that = this;
this.stream = this.streamBuilder();
// Suppress connection errors
this.stream.on('error', nop);
// Echo stream close
this.stream.on('close', this.emit.bind(this, 'close'));
// Send a connect packet on stream connect
this.stream.on('connect', function () {
that.conn.connect(that.options);
});
};
/**
=======
* setStream - create an MQTT connection and set up event listeners
*
* @param {Stream} stream - stream
* @api public
*/
MqttClient.prototype.setStream =
function(stream) {
var that = this;
var acks = ['puback', 'pubrec', 'pubcomp', 'suback', 'unsuback'];
if (this.conn) {
this.conn.removeAllListeners();
}
if (this.stream) {
this.stream.removeAllListeners();
}
// MqttConnection
this.conn = new Connection(stream);
this.stream = this.conn.stream;
// Echo connection errors
this.conn.on('error', this.emit.bind(this, 'error'));
// Suppress connection errors
this.stream.on('error', nop);
// Echo stream close
this.stream.on('close', this.emit.bind(this, 'close'));
// Send a connect packet on stream connect
this.stream.on('secureConnect', function () {
that.conn.connect(that.options);
});
this.stream.on('connect', function () {
that.conn.connect(that.options);
});
// Handle connack
this.conn.on('connack', function (packet) {
that._handleConnack(packet);
});
// Handle incoming publish
this.conn.on('publish', function (packet) {
that._handlePublish(packet);
});
// one single handleAck function
var handleAck = function (packet) {
that._handleAck(packet);
};
// Handle incoming acks
var acks = ['puback', 'pubrec', 'pubcomp', 'suback', 'unsuback'];
acks.forEach(function (event) {
that.conn.on(event, handleAck);
});
// Handle outgoing acks
this.conn.on('pubrel', function (packet) {
that._handlePubrel(packet);
});
}
/**
>>>>>>>
* setup the event handlers in the inner stream.
*
* @api private
*/
MqttClient.prototype._setupStream = function() {
var that = this;
this.stream = this.streamBuilder();
// Suppress connection errors
this.stream.on('error', nop);
// Echo stream close
this.stream.on('close', this.emit.bind(this, 'close'));
// Send a connect packet on stream connect
this.stream.on('connect', function () {
that.conn.connect(that.options);
});
this.stream.on('secureConnect', function () {
that.conn.connect(that.options);
});
};
/** |
<<<<<<<
if (opts && opts.clean === false && !opts.clientId) {
throw new Error("Missing clientId for unclean clients");
}
net_client = net.createConnection(port, host);
mqtt_client = new MqttClient(net_client, opts);
mqtt_client._reconnect = function () {
net_client.connect(port, host);
=======
builder = function() {
return net.createConnection(port, host);
>>>>>>>
if (opts && opts.clean === false && !opts.clientId) {
throw new Error("Missing clientId for unclean clients");
}
builder = function() {
return net.createConnection(port, host); |
<<<<<<<
import Hyperlink from './Hyperlink';
=======
import ReplyRequest from './ReplyRequest';
>>>>>>>
import Hyperlink from './Hyperlink';
import ReplyRequest from './ReplyRequest'; |
<<<<<<<
// browser.protocol exists only in Brave
if (browser.protocol && browser.protocol.registerStringProtocol) {
console.log('[ipfs-companion] registerStringProtocol available. Adding ipfs:// handler')
=======
// browser.protocol exists only in Brave
if (runtime.hasNativeProtocolHandler) {
console.log(`[ipfs-companion] registerStringProtocol available. Adding ipfs:// handler`)
>>>>>>>
if (runtime.hasNativeProtocolHandler) {
console.log('[ipfs-companion] registerStringProtocol available. Adding ipfs:// handler')
<<<<<<<
console.log('[ipfs-companion] registerStringProtocol not available, native protocol will not be registered', browser.protocol)
=======
console.log('[ipfs-companion] browser.protocol.registerStringProtocol not available, native protocol will not be registered')
>>>>>>>
console.log('[ipfs-companion] browser.protocol.registerStringProtocol not available, native protocol will not be registered') |
<<<<<<<
const IsIpfs = require('is-ipfs')
const { createIpfsPathValidator, safeIpfsPath, urlAtPublicGw } = require('./ipfs-path')
=======
const IpfsApi = require('ipfs-api')
const { createIpfsPathValidator, urlAtPublicGw } = require('./ipfs-path')
>>>>>>>
const { createIpfsPathValidator, urlAtPublicGw } = require('./ipfs-path')
<<<<<<<
const { initIpfsClient, destroyIpfsClient } = require('./ipfs-client')
const { createIpfsUrlProtocolHandler } = require('./ipfs-protocol')
// INIT
// ===================================================================
var ipfs // ipfs-api instance
var state // avoid redundant API reads by utilizing local cache of various states
var dnsLink
var ipfsPathValidator
var modifyRequest
=======
============================================================
var ipfs // ipfs-api instance
var state // avoid redundant API reads by utilizing local cache of various states
var dnsLink
var ipfsPathValidator
var modifyRequest
=======
const createNotifier = require('./notifier')
const createCopier = require('./copier')
const { createContextMenus, findUrlForContext } = require('./context-menus')
>>>>>>>
const { initIpfsClient, destroyIpfsClient } = require('./ipfs-client')
const { createIpfsUrlProtocolHandler } = require('./ipfs-protocol')
const createNotifier = require('./notifier')
const createCopier = require('./copier')
const { createContextMenus, findUrlForContext } = require('./context-menus')
<<<<<<<
state = window.state = initState(options)
ipfs = window.ipfs = await initIpfsClient(state)
console.log('[ipfs-companion] ipfs init complete')
=======
state = initState(options)
ipfs = initIpfsApi(options.ipfsApiUrl)
notify = createNotifier(getState)
copier = createCopier(getState, notify)
>>>>>>>
state = initState(options)
ipfs = await initIpfsClient(state)
notify = createNotifier(getState)
copier = createCopier(getState, notify)
<<<<<<<
module.exports.destroy = async function () {
clearInterval(apiStatusUpdateInterval)
apiStatusUpdateInterval = null
ipfs = null
state = null
dnsLink = null
modifyRequest = null
ipfsPathValidator = null
await destroyIpfsClient()
}
function getState () {
return state
}
function registerListeners () {
browser.webRequest.onBeforeSendHeaders.addListener(onBeforeSendHeaders, {urls: ['<all_urls>']}, ['blocking', 'requestHeaders'])
browser.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ['<all_urls>']}, ['blocking'])
browser.storage.onChanged.addListener(onStorageChange)
browser.webNavigation.onCommitted.addListener(onNavigationCommitted)
browser.tabs.onUpdated.addListener(onUpdatedTab)
browser.tabs.onActivated.addListener(onActivatedTab)
browser.runtime.onMessage.addListener(onRuntimeMessage)
browser.runtime.onConnect.addListener(onRuntimeConnect)
if (chrome && chrome.protocol && chrome.protocol.registerStringProtocol) {
console.log(`[ipfs-companion] registerStringProtocol available. Adding ipfs:// handler`)
chrome.protocol.registerStringProtocol('ipfs', createIpfsUrlProtocolHandler(() => ipfs))
} else {
console.log(`[ipfs-companion] registerStringProtocol not available`, chrome.protocol)
}
}
=======
function getState () {
return state
}
function initIpfsApi (ipfsApiUrl) {
const url = new URL(ipfsApiUrl)
return IpfsApi({host: url.hostname, port: url.port, procotol: url.protocol})
}
>>>>>>>
function getState () {
return state
}
<<<<<<<
async function sendStatusUpdateToBrowserAction () {
if (browserActionPort) {
const info = {
ipfsNodeType: state.ipfsNodeType,
peerCount: state.peerCount,
gwURLString: state.gwURLString,
pubGwURLString: state.pubGwURLString,
currentTab: await browser.tabs.query({active: true, currentWindow: true}).then(tabs => tabs[0])
=======
// PORTS (connection-based messaging)
// ===================================================================
// https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/runtime/connect
// Make a connection between different contexts inside the add-on,
// e.g. signalling between browser action popup and background page that works
// in everywhere, even in private contexts (https://github.com/ipfs/ipfs-companion/issues/243)
const browserActionPortName = 'browser-action-port'
var browserActionPort
function onRuntimeConnect (port) {
// console.log('onConnect', port)
if (port.name === browserActionPortName) {
browserActionPort = port
browserActionPort.onMessage.addListener(handleMessageFromBrowserAction)
browserActionPort.onDisconnect.addListener(() => { browserActionPort = null })
sendStatusUpdateToBrowserAction()
>>>>>>>
// PORTS (connection-based messaging)
// ===================================================================
// https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/runtime/connect
// Make a connection between different contexts inside the add-on,
// e.g. signalling between browser action popup and background page that works
// in everywhere, even in private contexts (https://github.com/ipfs/ipfs-companion/issues/243)
const browserActionPortName = 'browser-action-port'
var browserActionPort
function onRuntimeConnect (port) {
// console.log('onConnect', port)
if (port.name === browserActionPortName) {
browserActionPort = port
browserActionPort.onMessage.addListener(handleMessageFromBrowserAction)
browserActionPort.onDisconnect.addListener(() => { browserActionPort = null })
sendStatusUpdateToBrowserAction()
<<<<<<<
if (state.displayNotifications) {
browser.notifications.create({
'type': 'basic',
'iconUrl': browser.extension.getURL('icons/ipfs-logo-on.svg'),
'title': title,
'message': message
}).catch(err => console.log('[ipfs-companion] Could not create browser notification', err))
}
console.info(`[ipfs-companion] ${title}: ${message}`)
}
// contextMenus
// -------------------------------------------------------------------
const contextMenuUploadToIpfs = 'contextMenu_UploadToIpfs'
const contextMenuCopyIpfsAddress = 'panelCopy_currentIpfsAddress'
const contextMenuCopyPublicGwUrl = 'panel_copyCurrentPublicGwUrl'
try {
browser.contextMenus.create({
id: contextMenuUploadToIpfs,
title: browser.i18n.getMessage(contextMenuUploadToIpfs),
contexts: ['image', 'video', 'audio'],
documentUrlPatterns: ['<all_urls>'],
enabled: false,
onclick: addFromURL
})
browser.contextMenus.create({
id: contextMenuCopyIpfsAddress,
title: browser.i18n.getMessage(contextMenuCopyIpfsAddress),
contexts: ['page', 'image', 'video', 'audio', 'link'],
documentUrlPatterns: ['*://*/ipfs/*', '*://*/ipns/*'],
onclick: copyCanonicalAddress
})
browser.contextMenus.create({
id: contextMenuCopyPublicGwUrl,
title: browser.i18n.getMessage(contextMenuCopyPublicGwUrl),
contexts: ['page', 'image', 'video', 'audio', 'link'],
documentUrlPatterns: ['*://*/ipfs/*', '*://*/ipns/*'],
onclick: copyAddressAtPublicGw
})
} catch (err) {
console.debug('[ipfs-companion] Error creating contextMenus')
}
=======
>>>>>>>
<<<<<<<
// console.log('addFromURL.info', info)
// console.log('addFromURL.fetchOptions', fetchOptions)
const response = await fetch(srcUrl, fetchOptions)
const reader = new FileReader()
reader.onloadend = () => {
const buffer = Buffer.from(reader.result)
ipfs.files.add(buffer, uploadResultHandler)
=======
if (info.currentTab) {
info.ipfsPageActionsContext = ipfsPathValidator.isIpfsPageActionsContext(info.currentTab.url)
>>>>>>>
if (info.currentTab) {
info.ipfsPageActionsContext = ipfsPathValidator.isIpfsPageActionsContext(info.currentTab.url)
<<<<<<<
}
} catch (err) {
console.debug('[ipfs-companion] Error updating context menus')
=======
})
>>>>>>>
})
<<<<<<<
async function onStorageChange (changes, area) {
for (let key in changes) {
let change = changes[key]
if (change.oldValue !== change.newValue) {
// debug info
// console.info(`Storage key "${key}" in namespace "${area}" changed. Old value was "${change.oldValue}", new value is "${change.newValue}".`)
if (key === 'ipfsNodeType') {
state.ipfsNodeType = change.newValue
ipfs = window.ipfs = await initIpfsClient(state)
apiStatusUpdate()
} else if (key === 'ipfsApiUrl') {
state.apiURL = new URL(change.newValue)
state.apiURLString = state.apiURL.toString()
ipfs = window.ipfs = await initIpfsClient(state)
apiStatusUpdate()
} else if (key === 'ipfsApiPollMs') {
setApiStatusUpdateInterval(change.newValue)
} else if (key === 'customGatewayUrl') {
state.gwURL = new URL(change.newValue)
state.gwURLString = state.gwURL.toString()
} else if (key === 'publicGatewayUrl') {
state.pubGwURL = new URL(change.newValue)
state.pubGwURLString = state.pubGwURL.toString()
} else if (key === 'useCustomGateway') {
state.redirect = change.newValue
} else if (key === 'linkify') {
state.linkify = change.newValue
} else if (key === 'catchUnhandledProtocols') {
state.catchUnhandledProtocols = change.newValue
} else if (key === 'displayNotifications') {
state.displayNotifications = change.newValue
} else if (key === 'automaticMode') {
state.automaticMode = change.newValue
} else if (key === 'dnslink') {
state.dnslink = change.newValue
} else if (key === 'preloadAtPublicGateway') {
state.preloadAtPublicGateway = change.newValue
=======
// Public API
// (typically attached to a window variable to interact with this companion instance)
const api = {
get ipfs () {
return ipfs
},
async ipfsAddAndShow (buffer) {
let result
try {
result = await api.ipfs.add(buffer)
} catch (err) {
console.error('Failed to IPFS add', err)
notify('notify_uploadErrorTitle', 'notify_inlineErrorMsg', `${err.message}`)
throw err
>>>>>>>
// Public API
// (typically attached to a window variable to interact with this companion instance)
const api = {
get ipfs () {
return ipfs
},
async ipfsAddAndShow (buffer) {
let result
try {
result = await api.ipfs.files.add(buffer)
} catch (err) {
console.error('Failed to IPFS add', err)
notify('notify_uploadErrorTitle', 'notify_inlineErrorMsg', `${err.message}`)
throw err |
<<<<<<<
handleInput: function() {\n\
=======
handleChange: React.autoBind(function() {\n\
>>>>>>>
handleChange: function() {\n\ |
<<<<<<<
const { actions: { updateSelectedElements }, state: { currentPage } } = useStory();
const { actions: { pushTransform } } = useCanvas();
=======
const { actions: { updateSelectedElements } } = useStory();
const { actions: { pushTransform }, state: { pageSize: { width: canvasWidth, height: canvasHeight }, nodesById } } = useCanvas();
>>>>>>>
const { actions: { updateSelectedElements }, state: { currentPage } } = useStory();
const { actions: { pushTransform }, state: { pageSize: { width: canvasWidth, height: canvasHeight }, nodesById } } = useCanvas();
<<<<<<<
draggable={ actionsEnabled }
resizable={ actionsEnabled }
rotatable={ actionsEnabled }
=======
draggable={ ! selectedElement.isFill }
resizable={ ! selectedElement.isFill && ! isDragging }
rotatable={ ! selectedElement.isFill && ! isDragging }
>>>>>>>
draggable={ actionsEnabled }
resizable={ actionsEnabled && ! isDragging }
rotatable={ actionsEnabled && ! isDragging } |
<<<<<<<
chatOpen: PropTypes.boolean,
=======
network: PropTypes.string,
>>>>>>>
chatOpen: PropTypes.boolean,
network: PropTypes.string,
<<<<<<<
<Header
toggleChat={() => toggleChat(false)}
chatOpen={this.props.chatOpen}
/>
=======
<Header toggleChat={() => toggleChat(false)} />
<Notification network={this.props.network} />
>>>>>>>
<Header
toggleChat={() => toggleChat(false)}
chatOpen={this.props.chatOpen}
/>
<Header toggleChat={() => toggleChat(false)} />
<Notification network={this.props.network} /> |
<<<<<<<
=======
//const use_telegram = false //USE TELEGRAM
>>>>>>>
<<<<<<<
=======
//////////////////////////////////////////////////////////////////////////////////
// PLEASE EDIT WITH YOUR BITCOINvsALTCOINS.com KEY HERE BELOW
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
const bva_key = "replace_with_your_BvA_key"
//////////////////////////////////////////////////////////////////////////////////
>>>>>>>
<<<<<<<
=======
//////////////////////////////////////////////////////////////////////////////////
// TELEGRAM BOT
//////////////////////////////////////////////////////////////////////////////////
/*
if(use_telegram){
const telegramToken = 'replace_with_your_BOT_token' //BOT TOKEN -> ask BotFather
let telChanel = -123456789 //Replace with your Chanel ID. if needed help go uncoment LINES 723 and 724
const telBot = new TeleBot({
token: telegramToken, // Required. Telegram Bot API token.
polling: { // Optional. Use polling.
interval: 700, // Optional. How often check updates (in ms).
timeout: 0, // Optional. Update polling timeout (0 - short polling).
limit: 100, // Optional. Limits the number of updates to be retrieved.
retryTimeout: 5000, // Optional. Reconnecting timeout (in ms).
// proxy: 'http://username:[email protected]:8080' // Optional. An HTTP proxy to be used.
},
// webhook: { // Optional. Use webhook instead of polling.
// key: 'key.pem', // Optional. Private key for server.
// cert: 'cert.pem', // Optional. Public key.
// url: 'https://....', // HTTPS url to send updates to.
// host: '0.0.0.0', // Webhook server host.
// port: 443, // Server port.
// maxConnections: 40 // Optional. Maximum allowed number of simultaneous HTTPS connections to the webhook for update delivery
// },
allowedUpdates: [], // Optional. List the types of updates you want your bot to receive. Specify an empty list to receive all updates.
usePlugins: ['askUser'], // Optional. Use user plugins from pluginFolder.
pluginFolder: '../plugins/', // Optional. Plugin folder location.
pluginConfig: { // Optional. Plugin configuration.
// myPluginName: {
// data: 'my custom value'
// }
}
});
}
*/
>>>>>>>
<<<<<<<
const telBot = new TeleBot({
token: telegramToken, // Required. Telegram Bot API token.
polling: { // Optional. Use polling.
interval: 700, // Optional. How often check updates (in ms).
timeout: 0, // Optional. Update polling timeout (0 - short polling).
limit: 100, // Optional. Limits the number of updates to be retrieved.
retryTimeout: 5000, // Optional. Reconnecting timeout (in ms).
// proxy: 'http://username:[email protected]:8080' // Optional. An HTTP proxy to be used.
},
// webhook: { // Optional. Use webhook instead of polling.
// key: 'key.pem', // Optional. Private key for server.
// cert: 'cert.pem', // Optional. Public key.
// url: 'https://....', // HTTPS url to send updates to.
// host: '0.0.0.0', // Webhook server host.
// port: 443, // Server port.
// maxConnections: 40 // Optional. Maximum allowed number of simultaneous HTTPS connections to the webhook for update delivery
// },
allowedUpdates: [], // Optional. List the types of updates you want your bot to receive. Specify an empty list to receive all updates.
usePlugins: ['askUser'], // Optional. Use user plugins from pluginFolder.
pluginFolder: '../plugins/', // Optional. Plugin folder location.
pluginConfig: { // Optional. Plugin configuration.
// myPluginName: {
// data: 'my custom value'
// }
}
});
=======
/*
if(use_telegram){
// GET CHANEL ID
telBot.on('/info', async (msg) => {
let response = "Open Trades: "+ _.values(trading_pairs).length+"\n"
// response += "Chanel ID : "+msg.chat.id+"\n" //IF UNCOMENT SHOW CHANEL ID
// telChanel = msg.chat.id
return telBot.sendMessage(telChanel, response)
});
>>>>>>>
/*
const telBot = new TeleBot({
token: telegramToken, // Required. Telegram Bot API token.
polling: { // Optional. Use polling.
interval: 700, // Optional. How often check updates (in ms).
timeout: 0, // Optional. Update polling timeout (0 - short polling).
limit: 100, // Optional. Limits the number of updates to be retrieved.
retryTimeout: 5000, // Optional. Reconnecting timeout (in ms).
// proxy: 'http://username:[email protected]:8080' // Optional. An HTTP proxy to be used.
},
// webhook: { // Optional. Use webhook instead of polling.
// key: 'key.pem', // Optional. Private key for server.
// cert: 'cert.pem', // Optional. Public key.
// url: 'https://....', // HTTPS url to send updates to.
// host: '0.0.0.0', // Webhook server host.
// port: 443, // Server port.
// maxConnections: 40 // Optional. Maximum allowed number of simultaneous HTTPS connections to the webhook for update delivery
// },
allowedUpdates: [], // Optional. List the types of updates you want your bot to receive. Specify an empty list to receive all updates.
usePlugins: ['askUser'], // Optional. Use user plugins from pluginFolder.
pluginFolder: '../plugins/', // Optional. Plugin folder location.
pluginConfig: { // Optional. Plugin configuration.
// myPluginName: {
// data: 'my custom value'
// }
}
}); |
<<<<<<<
const read = require('fs').readFileSync
const resolve = require('path').resolve
const Module = require('module')
export function foo () {
=======
const stackSites = require('stack-sites')
module.exports = function foo () {
>>>>>>>
const stackSites = require('stack-sites')
module.exports = function foo () {
<<<<<<<
try {
throw new Error('on purpose')
} catch (e) {
console.log('caller', e.stack.split('\n')[2])
}
const filename = resolve('./call-foo.js')
const transform = Module._extensions['.js']
const fakeModule = {
_compile: source => {
console.log('transformed code')
console.log(source)
}
}
transform(fakeModule, filename)
}
// use: const foo = require('./foo').foo
=======
const callerSite = stackSites()[2]
console.log('My caller is %s line %d column %d',
callerSite.filename, callerSite.line, callerSite.column)
}
>>>>>>>
try {
throw new Error('on purpose')
} catch (e) {
console.log('caller', e.stack.split('\n')[2])
}
const filename = resolve('./call-foo.js')
const transform = Module._extensions['.js']
const fakeModule = {
_compile: source => {
console.log('transformed code')
console.log(source)
}
}
transform(fakeModule, filename)
const callerSite = stackSites()[2]
console.log('My caller is %s line %d column %d',
callerSite.filename, callerSite.line, callerSite.column)
}
// use: const foo = require('./foo').foo |
<<<<<<<
if (!IS_STOCK_ANDROID) {
loading.style.display = 'block';
}
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
=======
loading.show();
controls.find(`.${t.options.classPrefix}time-buffering`).show();
>>>>>>>
loading.style.display = 'block';
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
<<<<<<<
if (!IS_STOCK_ANDROID) {
loading.style.display = 'block';
}
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
=======
loading.show();
controls.find(`.${t.options.classPrefix}time-buffering`).show();
>>>>>>>
loading.style.display = 'block';
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
<<<<<<<
if (!IS_STOCK_ANDROID) {
loading.style.display = 'block';
}
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
=======
loading.show();
controls.find(`.${t.options.classPrefix}time-buffering`).show();
>>>>>>>
loading.style.display = 'block';
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block'; |
<<<<<<<
=======
*
*/
createPluginClickThrough: function createPluginClickThrough() {
var t = this;
// don't build twice
if (t.isPluginClickThroughCreated) {
return;
}
// allows clicking through the fullscreen button and controls down directly to Flash
/*
When a user puts his mouse over the fullscreen button, we disable the controls so that mouse events can go down to flash (pointer-events)
We then put a divs over the video and on either side of the fullscreen button
to capture mouse movement and restore the controls once the mouse moves outside of the fullscreen button
*/
var fullscreenIsDisabled = false,
restoreControls = function restoreControls() {
if (fullscreenIsDisabled) {
// hide the hovers
for (var i in hoverDivs) {
hoverDivs[i].hide();
}
// restore the control bar
t.fullscreenBtn.css('pointer-events', '');
t.controls.css('pointer-events', '');
// prevent clicks from pausing video
t.media.removeEventListener('click', t.clickToPlayPauseCallback);
// store for later
fullscreenIsDisabled = false;
}
},
hoverDivs = {},
hoverDivNames = ['top', 'left', 'right', 'bottom'],
positionHoverDivs = function positionHoverDivs() {
var fullScreenBtnOffsetLeft = t.fullscreenBtn.offset().left - t.container.offset().left,
fullScreenBtnOffsetTop = t.fullscreenBtn.offset().top - t.container.offset().top,
fullScreenBtnWidth = t.fullscreenBtn.outerWidth(true),
fullScreenBtnHeight = t.fullscreenBtn.outerHeight(true),
containerWidth = t.container.width(),
containerHeight = t.container.height();
for (var hover in hoverDivs) {
hover.css({ position: 'absolute', top: 0, left: 0 }); //, backgroundColor: '#f00'});
}
// over video, but not controls
hoverDivs.top.width(containerWidth).height(fullScreenBtnOffsetTop);
// over controls, but not the fullscreen button
hoverDivs.left.width(fullScreenBtnOffsetLeft).height(fullScreenBtnHeight).css({ top: fullScreenBtnOffsetTop });
// after the fullscreen button
hoverDivs.right.width(containerWidth - fullScreenBtnOffsetLeft - fullScreenBtnWidth).height(fullScreenBtnHeight).css({
top: fullScreenBtnOffsetTop,
left: fullScreenBtnOffsetLeft + fullScreenBtnWidth
});
// under the fullscreen button
hoverDivs.bottom.width(containerWidth).height(containerHeight - fullScreenBtnHeight - fullScreenBtnOffsetTop).css({ top: fullScreenBtnOffsetTop + fullScreenBtnHeight });
};
t.globalBind('resize', function () {
positionHoverDivs();
});
for (var i = 0, len = hoverDivNames.length; i < len; i++) {
hoverDivs[hoverDivNames[i]] = $('<div class="' + t.options.classPrefix + 'fullscreen-hover" />').appendTo(t.container).mouseover(restoreControls).hide();
}
// on hover, kill the fullscreen button's HTML handling, allowing clicks down to Flash
t.fullscreenBtn.on('mouseover', function () {
if (!t.isFullScreen) {
var buttonPos = t.fullscreenBtn.offset(),
containerPos = t.container.offset();
// move the button in Flash into place
t.media.positionFullscreenButton(buttonPos.left - containerPos.left, buttonPos.top - containerPos.top, false);
// allows click through
t.fullscreenBtn.css('pointer-events', 'none');
t.controls.css('pointer-events', 'none');
// restore click-to-play
t.media.addEventListener('click', t.clickToPlayPauseCallback);
// show the divs that will restore things
for (var _i = 0, total = hoverDivs.length; _i < total; _i++) {
hoverDivs[_i].show();
}
positionHoverDivs();
fullscreenIsDisabled = true;
}
});
// restore controls anytime the user enters or leaves fullscreen
t.media.addEventListener('fullscreenchange', function () {
t.isFullScreen = !t.isFullScreen;
// don't allow plugin click to pause video - messes with
// plugin's controls
if (t.isFullScreen) {
t.media.removeEventListener('click', t.clickToPlayPauseCallback);
} else {
t.media.addEventListener('click', t.clickToPlayPauseCallback);
}
restoreControls();
});
// the mouseout event doesn't work on the fullscren button, because we already killed the pointer-events
// so we use the document.mousemove event to restore controls when the mouse moves outside the fullscreen button
t.globalBind('mousemove', function (e) {
// if the mouse is anywhere but the fullsceen button, then restore it all
if (fullscreenIsDisabled) {
var fullscreenBtnPos = t.fullscreenBtn.offset();
if (e.pageY < fullscreenBtnPos.top || e.pageY > fullscreenBtnPos.top + t.fullscreenBtn.outerHeight(true) || e.pageX < fullscreenBtnPos.left || e.pageX > fullscreenBtnPos.left + t.fullscreenBtn.outerWidth(true)) {
t.fullscreenBtn.css('pointer-events', '');
t.controls.css('pointer-events', '');
fullscreenIsDisabled = false;
}
}
});
t.isPluginClickThroughCreated = true;
},
/**
>>>>>>>
<<<<<<<
(0, _dom.addClass)(player.container.querySelector('.' + t.options.classPrefix + 'captions-position'), t.options.classPrefix + 'captions-position-hover');
=======
player.container.find('.' + t.options.classPrefix + 'captions-position').addClass(t.options.classPrefix + 'captions-position-hover');
}
player.trackToLoad = -1;
player.selectedTrack = null;
player.isLoadingTrack = false;
// add to list
for (var _i2 = 0; _i2 < total; _i2++) {
var _kind = player.tracks[_i2].kind;
if (_kind === 'subtitles' || _kind === 'captions') {
player.addTrackButton(player.tracks[_i2].trackId, player.tracks[_i2].srclang, player.tracks[_i2].label);
}
>>>>>>>
(0, _dom.addClass)(player.container.querySelector('.' + t.options.classPrefix + 'captions-position'), t.options.classPrefix + 'captions-position-hover');
<<<<<<<
for (var _i14 = 0; _i14 < t.tracks.length; _i14++) {
var _track = t.tracks[_i14];
if (_track.trackId === trackId) {
=======
for (var i = 0, total = t.tracks.length; i < total; i++) {
var track = t.tracks[i];
if (track.trackId === trackId) {
>>>>>>>
for (var _i14 = 0, _total12 = t.tracks.length; _i14 < _total12; _i14++) {
var _track = t.tracks[_i14];
if (_track.trackId === trackId) {
<<<<<<<
for (var _i15 = 0, n = allElements.length; _i15 < n; _i15++) {
var attributesObj = allElements[_i15].attributes,
=======
for (var _i3 = 0, n = allElements.length; _i3 < n; _i3++) {
var attributesObj = allElements[_i3].attributes,
>>>>>>>
for (var _i15 = 0, n = allElements.length; _i15 < n; _i15++) {
var attributesObj = allElements[_i15].attributes,
<<<<<<<
allElements[_i15].parentNode.removeChild(allElements[_i15]);
=======
allElements[_i3].parentNode.removeChild(allElements[_i3]);
>>>>>>>
allElements[_i15].parentNode.removeChild(allElements[_i15]);
<<<<<<<
allElements[_i15].removeAttribute(attributes[j].name);
=======
allElements[_i3].removeAttribute(attributes[j].name);
>>>>>>>
allElements[_i15].removeAttribute(attributes[j].name);
<<<<<<<
for (; i < lines.length; i++) {
timecode = this.pattern.exec(lines[i]);
=======
for (var i = 0, total = lines.length; i < total; i++) {
timecode = this.pattern_timecode.exec(lines[i]);
>>>>>>>
for (var i = 0, total = lines.length; i < total; i++) {
timecode = this.pattern_timecode.exec(lines[i]);
<<<<<<<
_temp.text = lines.eq(i).innerHTML.trim().replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig, "<a href='$1' target='_blank'>$1</a>");
=======
_temp.text = $.trim(lines.eq(_i4).html()).replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig, "<a href='$1' target='_blank'>$1</a>");
>>>>>>>
_temp.text = lines.eq(_i17).innerHTML.trim().replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig, "<a href='$1' target='_blank'>$1</a>"); |
<<<<<<<
if (supportsMediaTag && (options.mode === 'auto' || options.mode === 'auto_plugin' || options.mode === 'native')) {
=======
if (supportsMediaTag && (options.mode === 'auto' || options.mode === 'native') && !(mejs.MediaFeatures.isBustedNativeHTTPS)) {
>>>>>>>
if (supportsMediaTag && (options.mode === 'auto' || options.mode === 'auto_plugin' || options.mode === 'native') && !(mejs.MediaFeatures.isBustedNativeHTTPS)) { |
<<<<<<<
if (t.media.rendererName !== null && t.media.rendererName.match(/(youtube|facebook)/) &&
!(player.$media.getAttribute('poster') || player.options.poster)) {
bigPlay.style.display = 'none';
=======
// if (t.options.supportVR || (t.media.rendererName !== null && t.media.rendererName.match(/(youtube|facebook)/))) {
if (t.media.rendererName !== null && ((t.media.rendererName.match(/(youtube|facebook)/) &&
!(player.$media.attr('poster') || player.options.poster)) || IS_STOCK_ANDROID)) {
bigPlay.hide();
>>>>>>>
if (t.media.rendererName !== null && ((t.media.rendererName.match(/(youtube|facebook)/) &&
!(player.$media.attr('poster') || player.options.poster)) || IS_STOCK_ANDROID)) {
bigPlay.style.display = 'none';
<<<<<<<
loading.style.display = 'block';
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
=======
if (!IS_STOCK_ANDROID) {
loading.show();
}
controls.find(`.${t.options.classPrefix}time-buffering`).show();
>>>>>>>
if (!IS_STOCK_ANDROID) {
loading.style.display = 'block';
}
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
<<<<<<<
bigPlay.style.display = 'block';
=======
if (!IS_STOCK_ANDROID) {
loading.show();
}
>>>>>>>
if (!IS_STOCK_ANDROID) {
loading.style.display = 'block';
}
bigPlay.style.display = 'block';
<<<<<<<
loading.style.display = 'block';
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
=======
if (!IS_STOCK_ANDROID) {
loading.show();
}
controls.find(`.${t.options.classPrefix}time-buffering`).show();
>>>>>>>
if (!IS_STOCK_ANDROID) {
loading.style.display = 'block';
}
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
<<<<<<<
loading.style.display = 'block';
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block';
=======
if (!IS_STOCK_ANDROID) {
loading.show();
}
controls.find(`.${t.options.classPrefix}time-buffering`).show();
>>>>>>>
if (!IS_STOCK_ANDROID) {
loading.style.display = 'block';
}
controls.querySelector(`.${t.options.classPrefix}time-buffering`).style.display = 'block'; |
<<<<<<<
const isMedia = ( type ) => {
return 'image' === type || 'video' === type;
};
const handleInsert = ( type, props ) => {
=======
const handleInsert = ( type, { width, height, ...props } ) => {
>>>>>>>
const isMedia = ( type ) => {
return 'image' === type || 'video' === type;
};
const handleInsert = ( type, { width, height, ...props } ) => { |
<<<<<<<
var i = void 0,
il = void 0,
node = null,
dashPlayer = null;
=======
var node = null,
dashPlayer = void 0;
>>>>>>>
var node = null,
dashPlayer = null;
<<<<<<<
var i = void 0,
il = void 0,
node = null,
flvPlayer = null;
=======
var node = null,
flvPlayer = void 0;
>>>>>>>
var node = null,
flvPlayer = null;
<<<<<<<
var i = void 0,
il = void 0,
hlsPlayer = null,
=======
var hlsPlayer = void 0,
>>>>>>>
var hlsPlayer = null, |
<<<<<<<
$(this).find('.mejs-sourcechooser-selector')
.removeClass('mejs-offscreen')
.attr('aria-expanded', 'true')
.attr('aria-hidden', 'false');
=======
clearTimeout(hoverTimeout);
$(this).find('.mejs-sourcechooser-selector').removeClass('mejs-offscreen');
>>>>>>>
clearTimeout(hoverTimeout);
$(this).find('.mejs-sourcechooser-selector')
.removeClass('mejs-offscreen')
.attr('aria-expanded', 'true')
.attr('aria-hidden', 'false');
<<<<<<<
$(this).find('.mejs-sourcechooser-selector')
.addClass('mejs-offscreen')
.attr('aria-expanded', 'false')
.attr('aria-hidden', 'true');
=======
var self = $(this);
hoverTimeout = setTimeout(function () {
self.find('.mejs-sourcechooser-selector').addClass('mejs-offscreen');
}, 500);
>>>>>>>
var self = $(this);
hoverTimeout = setTimeout(function () {
self.find('.mejs-sourcechooser-selector')
.removeClass('mejs-offscreen')
.attr('aria-expanded', 'true')
.attr('aria-hidden', 'false');
}, 500); |
<<<<<<<
t.timefloat.style.left = pos + 'px';
t.timefloatcurrent.innerHTML = (0, _time.secondsToTimeCode)(t.newTime, player.options.alwaysShowHours);
t.timefloat.style.display = 'block';
=======
t.timefloat.css('left', pos);
t.timefloatcurrent.html((0, _time.secondsToTimeCode)(t.newTime, player.options.alwaysShowHours, player.options.showTimecodeFrameCount, player.options.framesPerSecond, player.options.secondsDecimalLength));
t.timefloat.show();
>>>>>>>
t.timefloat.style.left = pos + 'px';
t.timefloatcurrent.innerHTML = (0, _time.secondsToTimeCode)(t.newTime, player.options.alwaysShowHours, player.options.showTimecodeFrameCount, player.options.framesPerSecond, player.options.secondsDecimalLength);
t.timefloat.style.display = 'block';
<<<<<<<
time = _document2.default.createElement('div');
=======
time = $('<div class="' + t.options.classPrefix + 'time" role="timer" aria-live="off">' + ('<span class="' + t.options.classPrefix + 'currenttime">' + (0, _time.secondsToTimeCode)(0, player.options.alwaysShowHours, player.options.showTimecodeFrameCount, player.options.framesPerSecond, player.options.secondsDecimalLength) + '</span>') + '</div>');
>>>>>>>
time = _document2.default.createElement('div');
<<<<<<<
var t = this,
currTime = controls.lastChild.querySelector('.' + t.options.classPrefix + 'currenttime');
=======
var t = this;
if (controls.children().last().find('.' + t.options.classPrefix + 'currenttime').length > 0) {
var duration = $(t.options.timeAndDurationSeparator + '<span class="' + t.options.classPrefix + 'duration">' + ((0, _time.secondsToTimeCode)(t.options.duration, t.options.alwaysShowHours, t.options.showTimecodeFrameCount, t.options.framesPerSecond, t.options.secondsDecimalLength) + '</span>'));
>>>>>>>
var t = this,
currTime = controls.lastChild.querySelector('.' + t.options.classPrefix + 'currenttime');
<<<<<<<
var duration = _document2.default.createElement('div');
duration.className = t.options.classPrefix + 'time ' + t.options.classPrefix + 'duration-container';
duration.innerHTML = '<span class="' + t.options.classPrefix + 'duration">' + ((0, _time.secondsToTimeCode)(t.options.duration, t.options.alwaysShowHours, t.options.showTimecodeFrameCount, t.options.framesPerSecond) + '</span>');
=======
var _duration = $('<div class="' + t.options.classPrefix + 'time ' + t.options.classPrefix + 'duration-container">' + ('<span class="' + t.options.classPrefix + 'duration">') + ((0, _time.secondsToTimeCode)(t.options.duration, t.options.alwaysShowHours, t.options.showTimecodeFrameCount, t.options.framesPerSecond, t.options.secondsDecimalLength) + '</span>') + '</div>');
>>>>>>>
var duration = _document2.default.createElement('div');
duration.className = t.options.classPrefix + 'time ' + t.options.classPrefix + 'duration-container';
duration.innerHTML = '<span class="' + t.options.classPrefix + 'duration">' + ((0, _time.secondsToTimeCode)(t.options.duration, t.options.alwaysShowHours, t.options.showTimecodeFrameCount, t.options.framesPerSecond, t.options.secondsDecimalLength) + '</span>');
<<<<<<<
if (t.controls.querySelector('.' + t.options.classPrefix + 'currenttime')) {
t.controls.querySelector('.' + t.options.classPrefix + 'currenttime').innerText = (0, _time.secondsToTimeCode)(currentTime, t.options.alwaysShowHours, t.options.showTimecodeFrameCount, t.options.framesPerSecond);
=======
if (t.currenttime) {
t.currenttime.html((0, _time.secondsToTimeCode)(currentTime, t.options.alwaysShowHours, t.options.showTimecodeFrameCount, t.options.framesPerSecond, t.options.secondsDecimalLength));
>>>>>>>
if (t.controls.querySelector('.' + t.options.classPrefix + 'currenttime')) {
t.controls.querySelector('.' + t.options.classPrefix + 'currenttime').innerText = (0, _time.secondsToTimeCode)(currentTime, t.options.alwaysShowHours, t.options.showTimecodeFrameCount, t.options.framesPerSecond, t.options.secondsDecimalLength); |
<<<<<<<
test("inserting an element invalidates the magnitude cache", function () {
var vector = new lunr.Vector,
elements = [4,5,6]
elements.forEach(function (el, i) { vector.insert(i, el) })
equal(vector.magnitude(), Math.sqrt(77))
vector.insert(3, 7)
equal(vector.magnitude(), Math.sqrt(126))
})
=======
test("inserted elements are kept in index order", function () {
var vector = new lunr.Vector,
elements = [6,5,4]
vector.insert(2, 4)
vector.insert(1, 5)
vector.insert(0, 6)
equal(vector.list.idx, 0)
equal(vector.list.next.idx, 1)
equal(vector.list.next.next.idx, 2)
})
>>>>>>>
test("inserting an element invalidates the magnitude cache", function () {
var vector = new lunr.Vector,
elements = [4,5,6]
elements.forEach(function (el, i) { vector.insert(i, el) })
equal(vector.magnitude(), Math.sqrt(77))
vector.insert(3, 7)
equal(vector.magnitude(), Math.sqrt(126))
})
test("inserted elements are kept in index order", function () {
var vector = new lunr.Vector,
elements = [6,5,4]
vector.insert(2, 4)
vector.insert(1, 5)
vector.insert(0, 6)
equal(vector.list.idx, 0)
equal(vector.list.next.idx, 1)
equal(vector.list.next.next.idx, 2)
}) |
<<<<<<<
var _props$params = this.props.params;
var org = _props$params.org;
var repo = _props$params.repo;
var host = window.location.origin;
var url = host + "/portal/data/" + org + "/" + repo + ".json";
return (0, _electrodeFetch.fetchJSON)(url).then(function (res) {
var meta = res.meta || {};
var usage = res.usage || [];
_this2.setState({ meta: meta, usage: usage });
try {
var demo = require("../demo-modules/" + meta.name + "/" + _electrodeUiConfig2.default.ui.demoPath);
_this2.setState({ demo: demo });
} catch (e) {
console.log("Error require demo in " + meta.name);
_this2.setState({ error: true });
=======
var _props$params = this.props.params;
var org = _props$params.org;
var repo = _props$params.repo;
var host = window.location.origin;
var url = host + "/portal/data/" + org + "/" + repo + ".json";
return (0, _electrodeFetch.fetchJSON)(url).then(function (res) {
var meta = res.meta || {};
var usage = res.usage || [];
_this2.setState({ meta: meta, usage: usage });
try {
var demo = require("../demo-modules/" + meta.name + "/demo/demo.jsx");
_this2.setState({ demo: demo });
} catch (e) {
console.log("Error require demo in " + meta.name);
_this2.setState({ error: _react2.default.createElement(
"div",
null,
"This component does not have demo."
) });
}
});
}
}, {
key: "render",
value: function render() {
var _state = this.state;
var meta = _state.meta;
var usage = _state.usage;
var demo = _state.demo;
var error = _state.error;
if (!meta.title) {
meta.title = this.props.params.repo || "[ Missing Title ]";
>>>>>>>
var _props$params = this.props.params;
var org = _props$params.org;
var repo = _props$params.repo;
var host = window.location.origin;
var url = host + "/portal/data/" + org + "/" + repo + ".json";
return (0, _electrodeFetch.fetchJSON)(url).then(function (res) {
var meta = res.meta || {};
var usage = res.usage || [];
_this2.setState({ meta: meta, usage: usage });
try {
var demo = require("../demo-modules/" + meta.name + "/" + _electrodeUiConfig2.default.ui.demoPath);
_this2.setState({ demo: demo });
} catch (e) {
console.log("Error require demo in " + meta.name);
_this2.setState({ error: true });
}
});
}
}, {
key: "render",
value: function render() {
var _state = this.state;
var meta = _state.meta;
var usage = _state.usage;
var demo = _state.demo;
var error = _state.error;
if (!meta.title) {
meta.title = this.props.params.repo || "[ Missing Title ]";
<<<<<<<
meta.version && "v" + meta.version,
usage.length > 0 && _react2.default.createElement(
"div",
null,
"This component is used in ",
usage.length,
" modules / apps.",
usage.map(function (url) {
return _react2.default.createElement(
=======
_react2.default.createElement(
"span",
{ className: "component-info" },
meta.github && _react2.default.createElement(
"div",
null,
_react2.default.createElement(
"a",
{ href: meta.github },
"View Repository on Github"
)
),
meta.name && _react2.default.createElement(
_well2.default,
{ className: "code-well", padded: true },
"npm i --save ",
meta.name
),
usage.length && _react2.default.createElement(
_revealer2.default,
{
baseHeight: 50,
buttonClosedText: "View Usage",
buttonOpenText: "Hide Usage",
defaultOpen: false,
disableClose: false,
inverse: true,
fakeLink: false,
border: false },
_react2.default.createElement(
>>>>>>>
_react2.default.createElement(
"span",
{ className: "component-info" },
meta.github && _react2.default.createElement(
"div",
null,
_react2.default.createElement(
"a",
{ href: meta.github },
"View Repository on Github"
)
),
meta.name && _react2.default.createElement(
_well2.default,
{ className: "code-well", padded: true },
"npm i --save ",
meta.name
),
usage.length && _react2.default.createElement(
_revealer2.default,
{
baseHeight: 50,
buttonClosedText: "View Usage",
buttonOpenText: "Hide Usage",
defaultOpen: false,
disableClose: false,
inverse: true,
fakeLink: false,
border: false },
_react2.default.createElement(
<<<<<<<
)
),
typeof demo !== "undefined" && demo && _react2.default.createElement(demo.default, null),
error && _react2.default.createElement(
"b",
null,
"This component does not have demo or demo does not work properly."
)
);
};
=======
),
typeof demo !== "undefined" && demo && _react2.default.createElement(demo.default, null),
error && _react2.default.createElement("error", null)
);
}
}]);
>>>>>>>
),
typeof demo !== "undefined" && demo && _react2.default.createElement(demo.default, null),
error && _react2.default.createElement(
"b",
null,
"This component does not have demo or demo does not work properly."
)
);
}
}]); |
<<<<<<<
=======
...profile,
>>>>>>> |
<<<<<<<
body${KEYBOARD_USER_SELECTOR} .mediaElement:focus > & {
=======
background-color: ${({ theme }) => rgba(theme.colors.bg.black, 0.3)};
body${KEYBOARD_USER_SELECTOR} &:focus {
>>>>>>>
background-color: ${({ theme }) => rgba(theme.colors.bg.black, 0.3)};
body${KEYBOARD_USER_SELECTOR} .mediaElement:focus > & { |
<<<<<<<
=======
base.devtool = 'cheap-source-map'
>>>>>>> |
<<<<<<<
<<<<<<< HEAD
'bootstrap': 'bootstrap-modal',
'jquery': '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min',
'jquery-ui': '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min',
=======
'bootstrap': 'bootstrap.min',
'jquery': 'jquery.min',
'jquery-ui': 'jquery-ui.min',
>>>>>>> Fixed IE container issues
=======
'bootstrap': 'bootstrap.min',
'jquery': 'jquery.min',
'jquery-ui': 'jquery-ui.min',
>>>>>>>
'bootstrap': 'bootstrap-modal',
'jquery': '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min',
'jquery-ui': '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min', |
<<<<<<<
const corePlugins = [
'styles-output', 'scripts-output', 'static-output',
'scope', 'router', 'template', 'inline-styles', 'stylus', 'module-map', 'package-config', 'update-externals',
'inline-styles-resources', 'styles', 'scripts', 'static'];
=======
var fileUtils = require("./fileUtil");
const corePlugins = ['styles-output', 'scripts-output', 'static-output', 'scope', 'router', 'template', 'inline-styles', 'stylus', 'module-map', 'package-config', 'inline-styles-resources', 'styles', 'scripts', 'static'];
>>>>>>>
const corePlugins = [
'styles-output', 'scripts-output', 'static-output',
'scope', 'router', 'template', 'inline-styles', 'stylus', 'module-map', 'package-config', 'update-externals',
'inline-styles-resources', 'styles', 'scripts', 'static'];
var fileUtils = require("./fileUtil");
<<<<<<<
var plugins = [];
var modes = []; // all registered modes
var pluginModes = {}; // map of modes and plugins scoped to the mode
var modeAll = []; // plugins that are scoped to all modes
=======
var plugins;
var modes; // all registered modes
var pluginModes; // map of modes and plugins scoped to the mode
var modeAll; // plugins that are scoped to all modes
>>>>>>>
var plugins;
var modes; // all registered modes
var pluginModes; // map of modes and plugins scoped to the mode
var modeAll; // plugins that are scoped to all modes |
<<<<<<<
this.subscriptions.add(atom.config.observe('linter-jshint.scopes', (value) => {
this.scopes = value;
}));
this.subscriptions.add(atom.config.observe('linter-jshint.executablePath', (executablePath) => {
this.executablePath = executablePath;
}));
this.subscriptions.add(
atom.config.observe('linter-jshint.disableWhenNoJshintrcFileInPath',
(disableWhenNoJshintrcFileInPath) => {
this.disableWhenNoJshintrcFileInPath = disableWhenNoJshintrcFileInPath;
},
),
);
=======
>>>>>>> |
<<<<<<<
overwrite: false,
dirmode: 'dir'
=======
overwrite: false,
force: false
>>>>>>>
overwrite: false,
force: false,
dirmode: 'dir' |
<<<<<<<
var lessPluginCleanCSS = require("less-plugin-clean-css");
var cleancss = new lessPluginCleanCSS({advanced: true});
=======
var cache = require('gulp-cached');
var uglify = require('gulp-uglify');
>>>>>>>
var lessPluginCleanCSS = require("less-plugin-clean-css");
var cleancss = new lessPluginCleanCSS({advanced: true});
var cache = require('gulp-cached');
var uglify = require('gulp-uglify');
<<<<<<<
.pipe(sourcemaps.init())
.pipe(less(
plugins: [ cleancss ]
))
.pipe(sourcemaps.write("."))
=======
.pipe(less())
.pipe(gulp.dest(path.output))
.pipe(browserSync.reload({ stream: true }));
});
gulp.task('move', function () {
return gulp.src([
'./src/**/*.json',
'./src/**/*.svg',
'./src/**/*.woff',
'./src/**/*.ttf',
'./src/**/*.png',
'./src/**/*.ico',
'./src/**/*.jpg',
'./src/**/*.eot'])
.pipe(cache('move'))
//.pipe(changed(path.output, { extension: '.json' }))
>>>>>>>
.pipe(sourcemaps.init())
.pipe(less(
plugins: [ cleancss ]
))
.pipe(sourcemaps.write("."))
.pipe(gulp.dest(path.output))
.pipe(browserSync.reload({ stream: true }));
});
gulp.task('move', function () {
return gulp.src([
'./src/**/*.json',
'./src/**/*.svg',
'./src/**/*.woff',
'./src/**/*.ttf',
'./src/**/*.png',
'./src/**/*.ico',
'./src/**/*.jpg',
'./src/**/*.eot'])
.pipe(cache('move'))
//.pipe(changed(path.output, { extension: '.json' }))
<<<<<<<
.pipe(changed(path.output, {extension: '.less'}))
.pipe(sourcemaps.init())
.pipe(less(
plugins: [ cleancss ]
))
.pipe(sourcemaps.write("."))
=======
.pipe(less())
>>>>>>>
.pipe(changed(path.output, {extension: '.less'}))
.pipe(sourcemaps.init())
.pipe(less(
plugins: [ cleancss ]
))
.pipe(sourcemaps.write(".")) |
<<<<<<<
}
// issue #373
var foo = function(a,
b){};
=======
}
// issue #350
var foo = function * () {
yield '123';
yield '456';
};
var foo = function*() {
yield '123';
yield '456';
};
>>>>>>>
}
// issue #373
var foo = function(a,
b){};
// issue #350
var foo = function * () {
yield '123';
yield '456';
};
var foo = function*() {
yield '123';
yield '456';
}; |
<<<<<<<
export * from './localizationActions';
export * from './heroStatsActions';
=======
export * from './localizationActions';
export * from './pvgnaActions';
>>>>>>>
export * from './localizationActions';
export * from './pvgnaActions';
export * from './heroStatsActions'; |
<<<<<<<
NODE_ENV: JSON.stringify(process.env.NODE_ENV),
API_HOST: JSON.stringify(process.env.API_HOST || 'https://api.opendota.com'),
=======
'process.env': {
NODE_ENV: JSON.stringify(process.env.NODE_ENV),
},
// TODO Change this to api.opendota.com when beta is GA
API_HOST: JSON.stringify(process.env.API_HOST || 'https://www.opendota.com'),
>>>>>>>
'process.env': {
NODE_ENV: JSON.stringify(process.env.NODE_ENV),
},
API_HOST: JSON.stringify(process.env.API_HOST || 'https://api.opendota.com'), |
<<<<<<<
benchmark,
ranking,
=======
getTable as table,
>>>>>>>
benchmark,
ranking,
getTable as table, |
<<<<<<<
var getUserInfo = require('./routes/getUserInfo.js');
=======
var postNoSegments = require('./routes/postNoSegments.js');
var getIsUserVIP = require('./routes/getIsUserVIP.js');
>>>>>>>
var getUserInfo = require('./routes/getUserInfo.js');
var postNoSegments = require('./routes/postNoSegments.js');
var getIsUserVIP = require('./routes/getIsUserVIP.js'); |
<<<<<<<
var warnUser = require('./routes/postWarning.js');
=======
var postSegmentShift = require('./routes/postSegmentShift.js');
>>>>>>>
var warnUser = require('./routes/postWarning.js');
var postSegmentShift = require('./routes/postSegmentShift.js');
<<<<<<<
//sent user a warning
app.post('/api/warnUser', warnUser);
=======
//get if user is a vip
app.post('/api/segmentShift', postSegmentShift);
>>>>>>>
//sent user a warning
app.post('/api/warnUser', warnUser);
//get if user is a vip
app.post('/api/segmentShift', postSegmentShift); |
<<<<<<<
'use strict';
var bluebird = require('bluebird');
var check = bluebird.method(function (website) {
var prefetch = website.$('link[rel="prefetch"]'),
dnsPrerender = website.$('link[rel="dns-prefetch"]'),
prerender = website.$('link[rel="prerender"]'),
test = {
testName: 'prefetch',
passed: false,
data: {
prefetch: false,
dnsprefetch: false,
prerender: false
}
};
if (prefetch.length > 0) {
test.passed = true;
test.data.prefetch = true;
}
if (dnsPrerender.length > 0) {
test.passed = true;
test.data.dnsprefetch = true;
}
if (prerender.length > 0) {
test.passed = true;
test.data.prerender = true;
}
return test;
});
=======
"use strict";
var Deferred = require('promised-io').Deferred;
var check = function (website) {
var deferred = new Deferred();
process.nextTick(function () {
var prefetch = website.$('link[rel~="prefetch"]'),
dnsPrerender = website.$('link[rel~="dns-prefetch"]'),
prerender = website.$('link[rel~="prerender"]'),
test = {
testName: "prefetch",
passed: false,
data: {
prefetch: false,
dnsprefetch: false,
prerender: false
}
};
if (prefetch.length > 0) {
test.passed = true;
test.data.prefetch = true;
}
if (dnsPrerender.length > 0) {
test.passed = true;
test.data.dnsprefetch = true;
}
if (prerender.length > 0) {
test.passed = true;
test.data.prerender = true;
}
deferred.resolve(test);
});
return deferred.promise;
};
>>>>>>>
'use strict';
var bluebird = require('bluebird');
var check = bluebird.method(function (website) {
var prefetch = website.$('link[rel~="prefetch"]'),
dnsPrerender = website.$('link[rel~="dns-prefetch"]'),
prerender = website.$('link[rel~="prerender"]'),
test = {
testName: 'prefetch',
passed: false,
data: {
prefetch: false,
dnsprefetch: false,
prerender: false
}
};
if (prefetch.length > 0) {
test.passed = true;
test.data.prefetch = true;
}
if (dnsPrerender.length > 0) {
test.passed = true;
test.data.dnsprefetch = true;
}
if (prerender.length > 0) {
test.passed = true;
test.data.prerender = true;
}
return test;
}); |
<<<<<<<
var check = bluebird.method(function (website) {
var next = website.$('link[rel="next"]'),
prev = website.$('link[rel="prev"]'),
test = {
testName: 'pagination',
passed: false,
data: {}
};
=======
process.nextTick(function(){
var next = website.$('link[rel~="next"]'),
prev = website.$('link[rel~="prev"]'),
test = {
testName:"pagination",
passed:false,
data: {}
};
>>>>>>>
var check = bluebird.method(function (website) {
var next = website.$('link[rel~="next"]'),
prev = website.$('link[rel~="prev"]'),
test = {
testName: 'pagination',
passed: false,
data: {}
}; |
<<<<<<<
$('.open-aboutdata-btn').on('click', queueUiCallback.bind(this, () => {
_hamburgerMenu.hide();
ga('send', 'event', 'Misc', 'about data opened');
swal('Dados', '', 'info');
swal({
title: 'Dados',
html:
` <br>
Assim como nosso <a href="https://github.com/cmdalbem/bikedeboa">código fonte</a>, nossos <b>dados também são abertos</b>!<br>
Enquanto trabalhamos em uma forma mais acessível de baixar nossos dados, acesse nossa <a href="https://github.com/dennerevaldt/bikedeboa-api">documentação da API</a> para saber como ter acesso completo a ela se você é desenvolvedor.<br>
<br>
<i>Se você já tem um mapeamento de <b>bicicletários, paraciclos e lugares amigos do ciclista</b> na sua cidade nós adoraríamos conversar contigo e encontrar uma maneira de colaborar. Se for teu caso, <a href="mailto:[email protected]">fala com a gente</a> :)</i>
`,
});
}));
=======
$('.open-guide-btn').on('click', queueUiCallback.bind(this, () => {
_hamburgerMenu.hide();
ga('send', 'event', 'Misc', 'faq opened');
setView('Guia de bicicletários', '/guia-de-bicicletarios', true);
}));
>>>>>>>
$('.open-aboutdata-btn').on('click', queueUiCallback.bind(this, () => {
_hamburgerMenu.hide();
ga('send', 'event', 'Misc', 'about data opened');
swal('Dados', '', 'info');
swal({
title: 'Dados',
html:
` <br>
Assim como nosso <a href="https://github.com/cmdalbem/bikedeboa">código fonte</a>, nossos <b>dados também são abertos</b>!<br>
Enquanto trabalhamos em uma forma mais acessível de baixar nossos dados, acesse nossa <a href="https://github.com/dennerevaldt/bikedeboa-api">documentação da API</a> para saber como ter acesso completo a ela se você é desenvolvedor.<br>
<br>
<i>Se você já tem um mapeamento de <b>bicicletários, paraciclos e lugares amigos do ciclista</b> na sua cidade nós adoraríamos conversar contigo e encontrar uma maneira de colaborar. Se for teu caso, <a href="mailto:[email protected]">fala com a gente</a> :)</i>
`,
});
$('.open-guide-btn').on('click', queueUiCallback.bind(this, () => {
_hamburgerMenu.hide();
ga('send', 'event', 'Misc', 'faq opened');
setView('Guia de bicicletários', '/guia-de-bicicletarios', true);
})); |
<<<<<<<
let _socialToken;
=======
let _centerChangedTimeout;
let _deferredPWAPrompt;
>>>>>>>
let _socialToken;
let _centerChangedTimeout;
let _deferredPWAPrompt; |
<<<<<<<
$('.open-guide-btn').on('click', queueUiCallback.bind(this, () => {
_hamburgerMenu.hide();
ga('send', 'event', 'Misc', 'faq opened');
setView('Guia de bicicletários', '/guia-de-bicicletarios', true);
}));
=======
$('.contact-btn').on('click', queueUiCallback.bind(this, () => {
_hamburgerMenu.hide();
ga('send', 'event', 'Misc', 'contact opened');
swal('Contato', '', 'info');
swal({
title: 'Contato',
html:
`<a href="mailto:[email protected]"><span class="glyphicon glyphicon-envelope"></span> [email protected]</a>`,
});
}));
>>>>>>>
$('.open-guide-btn').on('click', queueUiCallback.bind(this, () => {
_hamburgerMenu.hide();
ga('send', 'event', 'Misc', 'faq opened');
setView('Guia de bicicletários', '/guia-de-bicicletarios', true);
$('.contact-btn').on('click', queueUiCallback.bind(this, () => {
_hamburgerMenu.hide();
ga('send', 'event', 'Misc', 'contact opened');
swal('Contato', '', 'info');
swal({
title: 'Contato',
html:
`<a href="mailto:[email protected]"><span class="glyphicon glyphicon-envelope"></span> [email protected]</a>`,
});
})); |
<<<<<<<
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// Facebook ////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// Here we run a very simple test of the Graph API after login is
// successful. See statusChangeCallback() for when this call is made.
window.testAPI = () => {
console.log('Welcome! Fetching your information.... ');
FB.api('/me', {fields: "id, first_name, picture, gender"}, function(response) {
console.log(response);
let html = '';
html += `<img src="${response.picture.data.url}"/>`;
html += `<span>Bem-vind`;
if (!gender) {
html += 'e';
} else {
html += gender === 'male' ? 'o' : 'a';
}
html += `, ${response.first_name}.</span>`;
document.getElementById('login-container').innerHTML = html;
});
}
// This is called with the results from from FB.getLoginStatus().
window.statusChangeCallback = response => {
console.log('statusChangeCallback');
console.log(response);
// The response object is returned with a status field that lets the
// app know the current login status of the person.
// Full docs on the response object can be found in the documentation
// for FB.getLoginStatus().
if (response.status === 'connected') {
// Logged into your app and Facebook.
testAPI();
} else {
// The person is not logged into your app or we are unable to tell.
console.log('not logged in.');
}
}
window.checkFBLoginState = () => {
FB.getLoginStatus(function(response) {
statusChangeCallback(response);
});
}
=======
}
// Confettiful
// Production ready confetti generator, yo. By Jacob Gunnarsson.
// https://codepen.io/jacobgunnarsson/pen/pbPwga
const Confettiful = function(el) {
this.el = el;
this.containerEl = null;
this.confettiFrequency = 4;
this.confettiColors = ['#30bb6a', '#F6C913', '#FF8265', '#533FB4'];
this.confettiAnimations = ['slow', 'medium', 'fast'];
this._init();
this._start();
};
Confettiful.prototype._init = function() {
const containerEl = document.createElement('div');
const elPosition = this.el.style.position;
// if (elPosition !== 'relative' || elPosition !== 'absolute') {
// this.el.style.position = 'relative';
// }
containerEl.classList.add('confetti-container');
this.el.appendChild(containerEl);
this.containerEl = containerEl;
};
Confettiful.prototype._start = function() {
this.confettiInterval = setInterval(() => {
const confettiEl = document.createElement('div');
const confettiSize = (Math.floor(Math.random() * 3) + 7) + 'px';
const confettiBackground = this.confettiColors[Math.floor(Math.random() * this.confettiColors.length)];
const confettiLeft = (Math.floor(Math.random() * this.el.offsetWidth)) + 'px';
const confettiAnimation = this.confettiAnimations[Math.floor(Math.random() * this.confettiAnimations.length)];
confettiEl.classList.add('confetti', 'confetti--animation-' + confettiAnimation);
confettiEl.style.left = confettiLeft;
confettiEl.style.width = confettiSize;
confettiEl.style.height = confettiSize;
confettiEl.style.backgroundColor = confettiBackground;
confettiEl.removeTimeout = setTimeout(function() {
confettiEl.parentNode.removeChild(confettiEl);
}, 3000);
this.containerEl.appendChild(confettiEl);
}, 25);
};
>>>>>>>
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// Facebook ////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// Here we run a very simple test of the Graph API after login is
// successful. See statusChangeCallback() for when this call is made.
window.testAPI = () => {
console.log('Welcome! Fetching your information.... ');
FB.api('/me', {fields: "id, first_name, picture, gender"}, function(response) {
console.log(response);
let html = '';
html += `<img src="${response.picture.data.url}"/>`;
html += `<span>Bem-vind`;
if (!gender) {
html += 'e';
} else {
html += gender === 'male' ? 'o' : 'a';
}
html += `, ${response.first_name}.</span>`;
document.getElementById('login-container').innerHTML = html;
});
}
// This is called with the results from from FB.getLoginStatus().
window.statusChangeCallback = response => {
console.log('statusChangeCallback');
console.log(response);
// The response object is returned with a status field that lets the
// app know the current login status of the person.
// Full docs on the response object can be found in the documentation
// for FB.getLoginStatus().
if (response.status === 'connected') {
// Logged into your app and Facebook.
testAPI();
} else {
// The person is not logged into your app or we are unable to tell.
console.log('not logged in.');
}
}
window.checkFBLoginState = () => {
FB.getLoginStatus(function(response) {
statusChangeCallback(response);
});
}
// Confettiful
// Production ready confetti generator, yo. By Jacob Gunnarsson.
// https://codepen.io/jacobgunnarsson/pen/pbPwga
const Confettiful = function(el) {
this.el = el;
this.containerEl = null;
this.confettiFrequency = 4;
this.confettiColors = ['#30bb6a', '#F6C913', '#FF8265', '#533FB4'];
this.confettiAnimations = ['slow', 'medium', 'fast'];
this._init();
this._start();
};
Confettiful.prototype._init = function() {
const containerEl = document.createElement('div');
const elPosition = this.el.style.position;
// if (elPosition !== 'relative' || elPosition !== 'absolute') {
// this.el.style.position = 'relative';
// }
containerEl.classList.add('confetti-container');
this.el.appendChild(containerEl);
this.containerEl = containerEl;
};
Confettiful.prototype._start = function() {
this.confettiInterval = setInterval(() => {
const confettiEl = document.createElement('div');
const confettiSize = (Math.floor(Math.random() * 3) + 7) + 'px';
const confettiBackground = this.confettiColors[Math.floor(Math.random() * this.confettiColors.length)];
const confettiLeft = (Math.floor(Math.random() * this.el.offsetWidth)) + 'px';
const confettiAnimation = this.confettiAnimations[Math.floor(Math.random() * this.confettiAnimations.length)];
confettiEl.classList.add('confetti', 'confetti--animation-' + confettiAnimation);
confettiEl.style.left = confettiLeft;
confettiEl.style.width = confettiSize;
confettiEl.style.height = confettiSize;
confettiEl.style.backgroundColor = confettiBackground;
confettiEl.removeTimeout = setTimeout(function() {
confettiEl.parentNode.removeChild(confettiEl);
}, 3000);
this.containerEl.appendChild(confettiEl);
}, 25);
}; |
<<<<<<<
function tryAgain (err) {
// Only certain error messages are returned via req.flash('error', someError)
// because we shouldn't expose internal authorization errors to the user.
// We do return a generic error and the original request body.
var flashError = req.flash('error')[0];
if (err && !flashError ) {
req.flash('error', 'Error.Passport.Generic');
} else if (flashError) {
req.flash('error', flashError);
}
=======
var tryAgain = function () {
// If an error was thrown, redirect the user to the login which should
// take care of rendering the error messages.
>>>>>>>
var tryAgain = function () {
// Only certain error messages are returned via req.flash('error', someError)
// because we shouldn't expose internal authorization errors to the user.
// We do return a generic error and the original request body.
var flashError = req.flash('error')[0];
if (err && !flashError ) {
req.flash('error', 'Error.Passport.Generic');
} else if (flashError) {
req.flash('error', flashError);
}
<<<<<<<
// If an error was thrown, redirect the user to the
// login, register or disconnect action initiator view.
// These views should take care of rendering the error messages.
var action = req.param('action');
if (action === 'register') {
res.redirect('/register');
} else if (action === 'login') {
res.redirect('/login');
} else if (action === 'disconnect') {
res.redirect('back');
}
}
=======
res.redirect(req.param('action') === 'register' ? '/register' : '/login');
};
>>>>>>>
// If an error was thrown, redirect the user to the
// login, register or disconnect action initiator view.
// These views should take care of rendering the error messages.
var action = req.param('action');
if (action === 'register') {
res.redirect('/register');
} else if (action === 'login') {
res.redirect('/login');
} else if (action === 'disconnect') {
res.redirect('back');
}
};
<<<<<<<
if (err) return tryAgain(err);
=======
if (err) {
return tryAgain();
}
>>>>>>>
if (err) {
return tryAgain();
} |
<<<<<<<
hairDesc : function() { return player.Hair().Short(); },
ears : function() { return player.EarDesc(); },
=======
>>>>>>>
<<<<<<<
Text.Add("With a hungry smile, you close the distance between the two of you and cup Miranda's chin, pulling her into a passionate kiss, feeding the eager morph your [tongue]. Pleasantly your tongues wrestle for several moments as your arms pull the pair of you together, letting you feel her erection grinding against you.", parse);
=======
Text.Add("With a hungry smile, you close the distance between the two of you and cup Miranda's chin, pulling her into a passionate kiss, feeding the eager morph your [tongue]. Pleasantly, your tongues wrestle for several moments as your arms pull the pair of you together, letting you feel her erection grinding against you.", parse);
>>>>>>>
Text.Add("With a hungry smile, you close the distance between the two of you and cup Miranda's chin, pulling her into a passionate kiss, feeding the eager morph your [tongue]. Pleasantly, your tongues wrestle for several moments as your arms pull the pair of you together, letting you feel her erection grinding against you.", parse);
<<<<<<<
hairDesc : function() { return player.Hair().Short(); },
armorDesc : function() { return player.ArmorDesc(); },
buttDesc : function() { return player.Butt().Short(); },
anusDesc : function() { return player.Butt().AnalShort(); },
vagDesc : function() { return player.FirstVag().Short(); },
legsDesc : function() { return player.LegsDesc(); },
thighsDesc : function() { return player.ThighsDesc(); },
multiCockDesc : function() { return player.MultiCockDesc(); },
multiCockDesc2 : function() { return player.MultiCockDesc(allCocks); },
cockDesc : function() { return p1Cock.Short(); },
cockTip : function() { return p1Cock.TipShort(); },
ballsDesc : function() { return player.BallsDesc(); },
breastDesc : function() { return player.FirstBreastRow().Short(); },
s : player.NumCocks() > 1 ? "s" : "",
notS : player.NumCocks() > 1 ? "" : "s",
oneof : player.NumCocks() > 1 ? " one of" : "",
itThem : player.NumCocks() > 1 ? "them" : "it",
itsTheir : player.NumCocks() > 1 ? "their" : "its",
mcockDesc : function() { return miranda.FirstCock().Short(); }
=======
cocks2 : function() { return player.MultiCockDesc(allCocks); },
>>>>>>>
cocks2 : function() { return player.MultiCockDesc(allCocks); }
<<<<<<<
Text.Add("You open your mouth to grant the dobie-dick access, extending your [tongue] and gently lapping at the underside of Miranda's cock as you envelop it in your mouth. Closing your lips around the intruder, the taste of salty-sweet precum and flesh washing over your senses, you start to suckle, caressing her with your lips and tongue, bobbing your head slightly as you swallow further inches of girl-cock into your mouth.", parse);
=======
Text.Add("You open your jaws to grant the dobie-dick access, extending your [tongue] and gently lapping at the underside of Miranda's dick as you envelop it in your maw. Closing your mouth around the intruder, the taste of salty-sweet pre-cum and flesh washing over your senses, you start to suckle, caressing her with your lips and tongue, bobbing your head slightly as you swallow further inches of girl-cock into your mouth.", parse);
>>>>>>>
Text.Add("You open your jaws to grant the dobie-dick access, extending your [tongue] and gently lapping at the underside of Miranda's dick as you envelop it in your maw. Closing your mouth around the intruder, the taste of salty-sweet pre-cum and flesh washing over your senses, you start to suckle, caressing her with your lips and tongue, bobbing your head slightly as you swallow further inches of girl-cock into your mouth.", parse); |
<<<<<<<
Text.Add("[HisHer] eyes flick in surprise and more than a hint of disappointment over your [cocks][b], clearly not expecting to see such [things] on you. As [hisher] eyes find what [heshe] is after, though, [heshe] smiles in contentment.", parse);
=======
Text.Add("[HisHer] eyes flick in surprise and more than a hint of disappointment over your [cocks][balls], clearly not expecting to see such [things] on you. As [hisher] gaze finds what [heshe] is after, though, [heshe] smiles in contentment.", parse);
>>>>>>>
Text.Add("[HisHer] eyes flick in surprise and more than a hint of disappointment over your [cocks][balls], clearly not expecting to see such [things] on you. As [hisher] gaze finds what [heshe] is after, though, [heshe] smiles in contentment.", parse);
<<<<<<<
parse["l"] = player.HasLegs() ? "get on all fours" : "bend over";
Text.Add("<i>“Of course I will, now be a darling and [l] for me,</i> [heshe] says, licking [hisher] lips.", parse);
=======
Text.Add("<i>“Of course I will. Now, be a darling and get on all fours for me,</i> [heshe] says, licking [hisher] lips.", parse);
>>>>>>>
parse["l"] = player.HasLegs() ? "get on all fours" : "bend over";
Text.Add("<i>“Of course I will. Now, be a darling and [l] for me,</i> [heshe] says, licking [hisher] lips.", parse);
<<<<<<<
parse["t"] = tail ? Text.Parse("and gently stroking your [tail] with the other", parse) : "";
Text.Add("[Name] approaches you from behind, laying a hand on your [hips] [t]. Without saying a word [heshe] leans forward to kiss your lower back, trailing soft pecks along your spine as [heshe] simultaneously aligns [himher]self with your [vag].", parse);
=======
parse["tail"] = tail ? Text.Parse("and gently stroking your [tailDesc] with the other", parse) : "";
Text.Add("[Name] approaches you from behind, laying a hand on your [hips] [tail]. Without saying a word, [heshe] leans forward to kiss your lower back, trailing soft pecks along your spine as [heshe] simultaneously aligns [himher]self with your [vag].", parse);
>>>>>>>
parse["t"] = tail ? Text.Parse("and gently stroking your [tail] with the other", parse) : "";
Text.Add("[Name] approaches you from behind, laying a hand on your [hips] [t]. Without saying a word, [heshe] leans forward to kiss your lower back, trailing soft pecks along your spine as [heshe] simultaneously aligns [himher]self with your [vag].", parse);
<<<<<<<
Text.Add("<i>“So tight! Sorry my dear, I didn’t think you were a virgin,”</i> [heshe] apologizes, stroking your [t]. <i>“I promise I’ll make your first time memorable,”</i> [heshe] grins, leaning over to give your back a gentle kiss.", parse);
=======
Text.Add("<i>“So tight! Sorry, my dear, I didn’t think you were a virgin,”</i> [heshe] apologizes, stroking your [tail]. <i>“I promise I’ll make your first time memorable,”</i> [heshe] grins, leaning over to give your back a gentle kiss.", parse);
>>>>>>>
Text.Add("<i>“So tight! Sorry, my dear, I didn’t think you were a virgin,”</i> [heshe] apologizes, stroking your [t]. <i>“I promise I’ll make your first time memorable,”</i> [heshe] grins, leaning over to give your back a gentle kiss.", parse);
<<<<<<<
parse = Text.ParserPlural(parse, player.NumCocks() > 3);
Text.Add("Your [cock2Desc] rubs through the toned cheeks of her ass, poking away at the base of her flicking tail with each thrust you make. Her soft fur tickles quite pleasantly against your dick. Meanwhile, your lower [cocks2] slaps and jabs against her stomach and her thighs, completely abandoned. ", parse);
=======
Text.Add("Your [cock2Desc] rubs through the toned cheeks of her ass, poking away at the base of her flicking tail with each thrust you make. Her soft fur tickles quite pleasantly against your dick. Meanwhile, your [cocks2] slap[notS] and jab[notS] against her stomach and her thighs, completely abandoned. ", parse);
>>>>>>>
parse = Text.ParserPlural(parse, player.NumCocks() > 3);
Text.Add("Your [cock2Desc] rubs through the toned cheeks of her ass, poking away at the base of her flicking tail with each thrust you make. Her soft fur tickles quite pleasantly against your dick. Meanwhile, your lower [cocks2] slap[notS] and jab[notS] against her stomach and her thighs, completely abandoned. ", parse);
<<<<<<<
Text.Add("Grunting with mingled pleasure and effort, you keep on fucking her with all your might; you can feel it building inside of you, electricity crackling [throughInside] your [balls]. You can feel the limits of your resistance fraying with every fraction of a second, until finally they snap; with a roar of pleasure, you slam yourself inside of her to the hilt and cum, holding her as tightly as you can to ensure not a drop of it goes astray.", parse);
=======
Text.Add("Grunting with mingled pleasure and effort, you keep on fucking her with all your might; you can feel it building within you, electricity crackling [throughInside] your [ballsDesc]. You can feel the limits of your resistance fraying with every fraction of a second, until finally they snap; with a roar of pleasure, you slam yourself inside of her to the hilt and cum, holding her as tightly as you can to ensure not a drop of it goes astray.", parse);
>>>>>>>
Text.Add("Grunting with mingled pleasure and effort, you keep on fucking her with all your might; you can feel it building within you, electricity crackling [throughInside] your [balls]. You can feel the limits of your resistance fraying with every fraction of a second, until finally they snap; with a roar of pleasure, you slam yourself inside of her to the hilt and cum, holding her as tightly as you can to ensure not a drop of it goes astray.", parse);
<<<<<<<
parse["b"] = player.HasBalls() ? Text.Parse(" and your [balls] churn,", parse) : "";
Text.Add("It doesn’t take long before you feel yourself throbbing within [possessive] vagina. Pleasure surges across your body,[b] as you spill the first jet of cum within her waiting cunt.", parse);
=======
parse["balls"] = player.HasBalls() ? Text.Parse(", and your [ballsDesc] churn,", parse) : "";
Text.Add("It doesn’t take long before you feel yourself throbbing within [possessive] vagina. Pleasure surges across your body[balls] as you spill the first jet of cum within her waiting cunt.", parse);
>>>>>>>
parse["b"] = player.HasBalls() ? Text.Parse(", and your [balls] churn,", parse) : "";
Text.Add("It doesn’t take long before you feel yourself throbbing within [possessive] vagina. Pleasure surges across your body,[b] as you spill the first jet of cum within her waiting cunt.", parse);
<<<<<<<
parse["b"] = player.HasBalls() ? Text.Parse("your [balls] churn", parse) : "an electric shock course through your prostate";
Text.Add("[Name] quickly catches on to your plans, as she grips her tits and mashes them together onto your shaft. The fur of her orbs tickle you as you plaster them with your mixed fluids, groaning as you feel [b].", parse);
=======
parse["balls"] = player.HasBalls() ? Text.Parse("your [ballsDesc] churn", parse) : "an electric shock course through your prostate";
Text.Add("[Name] quickly catches on to your plans, and she grips her tits and mashes them together onto your shaft. The fur of her orbs tickle you as you plaster them with your mixed fluids, groaning as you feel [balls].", parse);
>>>>>>>
parse["b"] = player.HasBalls() ? Text.Parse("your [balls] churn", parse) : "an electric shock course through your prostate";
Text.Add("[Name] quickly catches on to your plans, and she grips her tits and mashes them together onto your shaft. The fur of her orbs tickle you as you plaster them with your mixed fluids, groaning as you feel [b].", parse); |
<<<<<<<
djng_forms_module.directive('ngModel', ['$log', function ($log) {
function restoreInputField(modelCtrl, field) {
=======
djng_forms_module.directive('ngModel', function() {
function restoreInputField(field) {
>>>>>>>
djng_forms_module.directive('ngModel', ['$log', function ($log) {
function restoreInputField(field) { |
<<<<<<<
function toType(type) {
return SCALARS[type.toLowerCase()];
}
function validProps(model) {
return _.pickBy(model.definition.properties, (prop, key) => {
let valid = true;
if (model.defintion.settings.hidden) {
valid = valid && model.definition.settings.hidden.indexOf(key) === -1;
}
return model.defintion.settings.hidden &&
model.definition.settings.hidden.indexOf(key) === -1 &&
!prop.deprecated;
});
}
=======
/**
* Filter models to return shared models only
*
* @param {Array<Model>} models all Loopback Models
* @returns {Array<Model>} list of shared models
*/
>>>>>>>
function toType(type) {
return SCALARS[type.toLowerCase()];
}
function validProps(model) {
return _.pickBy(model.definition.properties, (prop, key) => {
let valid = true;
if (model.defintion.settings.hidden) {
valid = valid && model.definition.settings.hidden.indexOf(key) === -1;
}
return model.defintion.settings.hidden &&
model.definition.settings.hidden.indexOf(key) === -1 &&
!prop.deprecated;
});
}
/**
* Filter models to return shared models only
*
* @param {Array<Model>} models all Loopback Models
* @returns {Array<Model>} list of shared models
*/ |
<<<<<<<
=======
var DEG2RAD = Math.PI / 180,
light1, light2, loader,
intersects, intersectedFace, intersectedObject,
isRotateMode = false, isMouseDown = false, start_radius = 150,
radius = start_radius, oldRadius = start_radius, newRadius = start_radius,
theta = 45, phi = 15;
var camera = new THREE.Camera( 50, window.innerWidth / window.innerHeight, 1, 20000 );
camera.target.position.y = 20;
// Background
that.scene = new THREE.Scene();
that.scene.fog = new THREE.FogExp2( 0xffffff, 0.00075 );
that.scene.fog.color.setHSV( 0.576, 0.382, 0.9 );
// Lights
var ambient = new THREE.AmbientLight( 0x221100 );
var directionalLight1 = new THREE.DirectionalLight( 0xffeedd );
var directionalLight2 = new THREE.DirectionalLight( 0xffeedd );
ambient.color.setHSV( 0, 0, 0.1 );
directionalLight1.color.setHSV( 0.088, 0, 1 );
directionalLight1.position.set( 0.8, 0.3, - 0.5 );
directionalLight1.position.normalize();
directionalLight2.color.setHSV( 0, 0, 0.564 );
directionalLight2.position.set( 0.1, 0.5, 0.2 );
directionalLight2.position.normalize();
that.scene.addLight( ambient );
that.scene.addLight( directionalLight1 );
that.scene.addLight( directionalLight2 );
initLensFlares( that, new THREE.Vector3( 0, 0, - 750 ), 60, 292 );
var loader = new THREE.SceneLoader();
loader.load( "/files/models/dunes/D_tile_1.js", function ( result ) {
for ( var i = 0, l = result.scene.objects.length; i < l; i ++ ) {
var object = result.scene.objects[ i ];
if ( object.visible ) {
object.rotation.x = - 90 * Math.PI / 180;
object.position.y = - 10;
object.position.x = 500;
object.scale.x = object.scale.y = object.scale.z = 0.1;
that.scene.addObject( object );
}
}
} );
// Renderer
var renderer;
if ( !shared.renderer ) {
renderer = new THREE.WebGLRenderer();
renderer.domElement.style.position = 'absolute';
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.setClearColor( that.scene.fog.color );
renderer.sortObjects = false;
renderer.autoClear = false;
shared.renderer = renderer;
}
domElement.appendChild( shared.renderer.domElement );
function onKeyDown( event ) {
switch ( event.keyCode ) {
case 16: isRotateMode = true; break;
// case 17: isEraseMode = true; break;
// case 18: isEraseMode = true; break;
}
}
function onKeyUp( event ) {
switch ( event.keyCode ) {
case 16: isRotateMode = false; break;
// case 17: isEraseMode = false; break;
// case 18: isEraseMode = false; break;
}
}
>>>>>>>
var DEG2RAD = Math.PI / 180,
light1, light2, loader,
intersects, intersectedFace, intersectedObject,
isRotateMode = false, isMouseDown = false, start_radius = 150,
radius = start_radius, oldRadius = start_radius, newRadius = start_radius,
theta = 45, phi = 15;
var camera = new THREE.Camera( 50, window.innerWidth / window.innerHeight, 1, 20000 );
camera.target.position.y = 20;
// Background
that.scene = new THREE.Scene();
that.scene.fog = new THREE.FogExp2( 0xffffff, 0.00075 );
that.scene.fog.color.setHSV( 0.576, 0.382, 0.9 );
// Lights
var ambient = new THREE.AmbientLight( 0x221100 );
var directionalLight1 = new THREE.DirectionalLight( 0xffeedd );
var directionalLight2 = new THREE.DirectionalLight( 0xffeedd );
ambient.color.setHSV( 0, 0, 0.1 );
directionalLight1.color.setHSV( 0.088, 0, 1 );
directionalLight1.position.set( 0.8, 0.3, - 0.5 );
directionalLight1.position.normalize();
directionalLight2.color.setHSV( 0, 0, 0.564 );
directionalLight2.position.set( 0.1, 0.5, 0.2 );
directionalLight2.position.normalize();
that.scene.addLight( ambient );
that.scene.addLight( directionalLight1 );
that.scene.addLight( directionalLight2 );
initLensFlares( that, new THREE.Vector3( 0, 0, - 750 ), 60, 292 );
var loader = new THREE.SceneLoader();
loader.load( "/files/models/dunes/D_tile_1.js", function ( result ) {
for ( var i = 0, l = result.scene.objects.length; i < l; i ++ ) {
var object = result.scene.objects[ i ];
if ( object.visible ) {
object.rotation.x = - 90 * Math.PI / 180;
object.position.y = - 10;
object.position.x = 500;
object.scale.x = object.scale.y = object.scale.z = 0.1;
that.scene.addObject( object );
}
}
} );
// Renderer
var renderer;
if ( !shared.renderer ) {
renderer = new THREE.WebGLRenderer();
renderer.domElement.style.position = 'absolute';
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.setClearColor( that.scene.fog.color );
renderer.sortObjects = false;
renderer.autoClear = false;
shared.renderer = renderer;
}
domElement.appendChild( shared.renderer.domElement );
function onKeyDown( event ) {
switch ( event.keyCode ) {
case 16: isRotateMode = true; break;
// case 17: isEraseMode = true; break;
// case 18: isEraseMode = true; break;
}
}
function onKeyUp( event ) {
switch ( event.keyCode ) {
case 16: isRotateMode = false; break;
// case 17: isEraseMode = false; break;
// case 18: isEraseMode = false; break;
}
}
<<<<<<<
objectCreator.resize( width, height );
=======
intro.resize( width, height );
camera.aspect = width / height;
camera.updateProjectionMatrix();
shared.viewportWidth = width;
shared.viewportHeight = height;
shared.renderer.setSize( width, height );
shared.renderer.domElement.style.left = '0px';
shared.renderer.domElement.style.top = '0px';
ui.resize(width, height);
>>>>>>>
intro.resize( width, height );
camera.aspect = width / height;
camera.updateProjectionMatrix();
shared.viewportWidth = width;
shared.viewportHeight = height;
shared.renderer.setSize( width, height );
shared.renderer.domElement.style.left = '0px';
shared.renderer.domElement.style.top = '0px'; |
<<<<<<<
loader.load( { model: "/files/models/soup/darkblob01.js", callback: blob01LoadedProxy } );
loader.load( { model: "/files/models/soup/darkblob02.js", callback: blob02LoadedProxy } );
loader.load( { model: "/files/models/soup/grass03.js", callback: blob03LoadedProxy } );
loader.load( { model: "/files/models/soup/grass04.js", callback: blob04LoadedProxy } );
loader.load( { model: "/files/models/soup/grass05.js", callback: blob05LoadedProxy } );
=======
loader.load( { model: "files/models/soup/darkblob01.js", callback: blob01LoadedProxy } );
>>>>>>>
loader.load( { model: "/files/models/soup/darkblob01.js", callback: blob01LoadedProxy } );
<<<<<<<
if (oldEmitterPos.length > 40) {
var pos = oldEmitterPos[40];
shared.lavatrailx = pos.x;
shared.lavatrailz = pos.z;
ROME.TrailShader.uniforms.lavaHeadPosition.value.set( pos.x, 0, -pos.z );
}
//ROME.TrailShader.uniforms.lavaHeadPosition.value.set( collisionScene.emitter.position.x, 0, -collisionScene.emitter.position.z );
=======
if (oldEmitterPos.length > 10) {
var pos = oldEmitterPos[10];
>>>>>>>
if (oldEmitterPos.length > 10) {
var pos = oldEmitterPos[10];
<<<<<<<
/* var moveDistance = (collisionScene.distance-emitterDistance)/40;
emitterDistance += moveDistance;
var zoom = emitterDistance/15;
zoom = Math.min(30, zoom);
camera.fov = 60-zoom;
camera.updateProjectionMatrix();
*/
/* TriggerUtils.effectors[ 0 ] = vectors.array[0].position.x;
TriggerUtils.effectors[ 1 ] = vectors.array[0].position.y;
TriggerUtils.effectors[ 2 ] = vectors.array[0].position.z;
*/
TriggerUtils.effectors[ 0 ] = collisionScene.emitter.position.x;
TriggerUtils.effectors[ 1 ] = collisionScene.emitter.position.y;
TriggerUtils.effectors[ 2 ] = collisionScene.emitter.position.z;
shared.prairieSoupHead.copy( collisionScene.emitter.position );
//ROME.TrailShader.uniforms.lavaHeadPosition.value.set( vectors.array[15].position.x, 0, -vectors.array[15].position.z );
//ROME.TrailShader.uniforms.lavaHeadPosition.value.set( 0, 0, 0 );
//shared.lavatrailx = vectors.array[4].position.x;
//shared.lavatrailz = vectors.array[4].position.z;
// pointlight
/* pointLight.position.x = vectors.array[0].position.x;
pointLight.position.y = vectors.array[0].position.y + 30;
pointLight.position.z = vectors.array[0].position.z;
*/
=======
//ROME.TrailShader.uniforms.lavaHeadPosition.value.set( pos.x, 0, -pos.z );
}
>>>>>>>
//ROME.TrailShader.uniforms.lavaHeadPosition.value.set( pos.x, 0, -pos.z );
} |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
waypointsA = [], waypointsB = [];
=======
waypointsA = [], waypointsB = [];
>>>>>>>
waypointsA = [], waypointsB = [];
<<<<<<<
if ( shared.debug ) {
=======
/*if ( shared.debug ) {
>>>>>>>
/*if ( shared.debug ) {
<<<<<<<
camera.animation.play( false, 0 );
=======
//camera.animation.play( false, 0 );
>>>>>>>
//camera.animation.play( false, 0 );
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
camera.position.z -= delta / 10;
if (camera.position.z < -3300) {
camera.position.z = 0;
}
>>>>>>>
camera.position.z -= delta / 10;
if (camera.position.z < -3300) {
camera.position.z = 0;
}
<<<<<<<
var camz = camera.matrixWorld.n34;
=======
/*var camz = camera.matrixWorld.n34;
>>>>>>>
/*var camz = camera.matrixWorld.n34; |
<<<<<<<
camera.lon = 100;
=======
camera = new THREE.RollCamera( 50, shared.viewportWidth / shared.viewportHeight, 1, 100000 );
camera.movementSpeed = 300;
camera.lookSpeed = 3;
camera.autoForward = true;
>>>>>>>
camera = new THREE.RollCamera( 50, shared.viewportWidth / shared.viewportHeight, 1, 100000 );
camera.movementSpeed = 300;
camera.lookSpeed = 3;
camera.autoForward = true;
<<<<<<<
THREE.AnimationHandler.update( delta );
=======
deltaSec = delta / 1000;
var current = camera.matrixWorld.getPosition();
domElement.innerHTML = current.x.toFixed( 2 ) + " " + current.y.toFixed( 2 ) + " " + current.z.toFixed( 2 );
//THREE.AnimationHandler.update( delta );
>>>>>>>
deltaSec = delta / 1000;
var current = camera.matrixWorld.getPosition();
domElement.innerHTML = current.x.toFixed( 2 ) + " " + current.y.toFixed( 2 ) + " " + current.z.toFixed( 2 );
THREE.AnimationHandler.update( delta ); |
<<<<<<<
Game, Game_ViewState, GameLibrary_Game, Game_Rating, Game_ScoreTable, Comment,
=======
Game, GameLibrary_Game, Game_Rating, Game_ScoreTable,
>>>>>>>
Game, GameLibrary_Game, Game_Rating, Game_ScoreTable, Comment,
<<<<<<<
this.scrollToPackages = scrollToPackages;
// Load comment count
Comment.fetch( 'Game', this.game.id, 1 ).then( function( commentPayload )
{
_this.commentsCount = commentPayload.count || 0;
} );
=======
this.scrollToMultiplePackages = scrollToMultiplePackages;
this.scrollToPackagePayment = scrollToPackagePayment;
>>>>>>>
this.scrollToMultiplePackages = scrollToMultiplePackages;
this.scrollToPackagePayment = scrollToPackagePayment;
// Load comment count
Comment.fetch( 'Game', this.game.id, 1 ).then( function( commentPayload )
{
_this.commentsCount = commentPayload.count || 0;
} ); |
<<<<<<<
const DummyCloud = require("../miio/Dummycloud");
const Roborock = require("../devices/Roborock");
=======
const RRMapParser = require("../RRMapParser");
const Vacuum = require("../miio/Vacuum");
const Logger = require("../Logger");
>>>>>>>
const DummyCloud = require("../miio/Dummycloud");
const Roborock = require("../devices/Roborock");
const Logger = require("../Logger");
<<<<<<<
* @param options {object}
* @param options.vacuum {Roborock} (actually a MiioVacuum, but that's not complete yet)
=======
* @param options {object}
* @param options.vacuum {Vacuum}
>>>>>>>
* @param options {object}
* @param options.vacuum {Roborock} (actually a MiioVacuum, but that's not complete yet)
<<<<<<<
* @param options.sshManager {sshManager}
* @param options.model {Model}
* @param options.cloudKey {Buffer} required to sign /gslb responses
=======
* @param options.sshManager {SSHManager}
>>>>>>>
* @param options.sshManager {SSHManager}
* @param options.model {Model}
* @param options.cloudKey {Buffer} required to sign /gslb responses |
<<<<<<<
const Model = require("./miio/Model");
const MiioSocket = require("./miio/MiioSocket");
const Viomi = require("./devices/Viomi");
const Roborock = require("./devices/Roborock");
=======
const Logger = require("./Logger");
>>>>>>>
const Model = require("./miio/Model");
const Logger = require("./Logger");
const MiioSocket = require("./miio/MiioSocket");
const Viomi = require("./devices/Viomi");
const Roborock = require("./devices/Roborock");
<<<<<<<
const deviceConfFiles =
["develop/local/device.conf", "/mnt/default/device.conf", "/etc/miio/device.conf"];
const filename = deviceConfFiles.filter(fs.existsSync)[0];
if (!filename) {
console.error("Could not find a device.conf file in ", deviceConfFiles);
} else {
try {
deviceConf = fs.readFileSync(filename);
} catch (e) {
console.warn("cannot read", filename, e);
}
=======
try {
deviceConf = fs.readFileSync("/mnt/default/device.conf");
} catch(e) {
Logger.error(e);
>>>>>>>
const deviceConfFiles =
["develop/local/device.conf", "/mnt/default/device.conf", "/etc/miio/device.conf"];
const filename = deviceConfFiles.filter(fs.existsSync)[0];
if (!filename) {
console.error("Could not find a device.conf file in ", deviceConfFiles);
} else {
try {
deviceConf = fs.readFileSync(filename);
} catch (e) {
Logger.warn("cannot read", filename, e);
}
<<<<<<<
deviceConf.toString().split(/\n/).map(line => line.split(/=/, 2)).map(([k, v]) => result[k] = v);
}
if (!result["did"] || !result["key"] || !result["model"]) {
console.error("Failed to read device.conf");
=======
const value = deviceConf.toString().match(new RegExp("^"+ key + "=(.*)$", "m"));
if(Array.isArray(value) && value[1]) {
// noinspection JSConstructorReturnsPrimitive
return value[1];
} else {
Logger.error("Failed to fetch " + key + " from device.conf");
}
} else {
Logger.error("Failed to read device.conf");
>>>>>>>
deviceConf.toString().split(/\n/).map(line => line.split(/=/, 2)).map(([k, v]) => result[k] = v);
}
if (!result["did"] || !result["key"] || !result["model"]) {
Logger.error("Failed to read device.conf"); |
<<<<<<<
const multer = require('multer');
const MiioVacuum = require("../devices/MiioVacuum");
const Roborock = require("../devices/Roborock");
=======
const multer = require("multer");
const RRMapParser = require("../RRMapParser");
const Vacuum = require("../miio/Vacuum");
>>>>>>>
const multer = require("multer");
const MiioVacuum = require("../devices/MiioVacuum");
const Roborock = require("../devices/Roborock");
<<<<<<<
req.on('end', () => {
=======
req.on("end", function() {
>>>>>>>
req.on("end", () => { |
<<<<<<<
this.log( 'insert' );
=======
// if ( this.before_save() ) {
>>>>>>>
this.log( 'insert' );
<<<<<<<
this.log( 'update' );
=======
// if ( this.before_save() ) {
>>>>>>>
this.log( 'update' );
<<<<<<<
this.log( 'find' );
=======
>>>>>>>
this.log( 'find' );
<<<<<<<
this.log( 'find_all' );
=======
>>>>>>>
this.log( 'find_all' );
<<<<<<<
this.log( 'find_by_pk' );
=======
>>>>>>>
this.log( 'find_by_pk' );
<<<<<<<
this.log( 'find_all_by_pk' );
=======
>>>>>>>
this.log( 'find_all_by_pk' );
<<<<<<<
this.log( 'find_by_attributes' );
=======
>>>>>>>
this.log( 'find_by_attributes' );
<<<<<<<
this.log( 'find_all_by_attributes' );
=======
>>>>>>>
this.log( 'find_all_by_attributes' );
<<<<<<<
this.log( 'find_by_sql' );
=======
>>>>>>>
this.log( 'find_by_sql' );
<<<<<<<
this.log( 'find_all_by_sql' );
=======
>>>>>>>
this.log( 'find_all_by_sql' );
<<<<<<<
this.log( 'update_by_pk' );
=======
>>>>>>>
this.log( 'update_by_pk' );
<<<<<<<
this.log( 'update_all' );
=======
>>>>>>>
this.log( 'update_all' );
<<<<<<<
this.log( 'update_counters' );
=======
>>>>>>>
this.log( 'update_counters' );
<<<<<<<
this.log( 'delete_by_pk' );
=======
>>>>>>>
this.log( 'delete_by_pk' );
<<<<<<<
this.log( 'delete_all' );
=======
>>>>>>>
this.log( 'delete_all' );
<<<<<<<
this.log( 'delete_all_by_attributes' );
=======
>>>>>>>
this.log( 'delete_all_by_attributes' ); |
<<<<<<<
console.info('Inserting a value...');
frisby.create('Inserting a value into a channel.')
.post(thisChannelResource, null, { body: messageText})
.addHeader("Content-Type", "text/plain")
.expectStatus(200)
.expectHeader('content-type', 'application/json')
.expectJSON('_links', {
channel: {
href: thisChannelResource
}
})
.expectJSON('_links.self', {
href: function (value) {
var regex = new RegExp("^" + thisChannelResource.replace(/\//g, "\\/").replace(/\:/g, "\\:") + "\\/[A-Z,0-9]{16}$");
expect(value).toMatch(regex);
}
})
.expectJSON({
id: function (value) {
expect(value).toMatch(/^[A-Z,0-9]{16}$/);
},
})
.afterJSON(function (result) {
var valueUrl = result['_links']['self']['href'];
console.log('Now attempting to fetch back my data from ' + valueUrl);
frisby.create('Fetching value to ensure that it was inserted.')
.get(valueUrl)
.expectStatus(200)
.expectHeader('content-type', 'text/plain')
.expectBodyContains(messageText)
.toss();
})
.inspectJSON()
.toss();
=======
console.info('Inserting a value...');
frisby.create('Inserting a value into a channel.')
.post(thisChannelResource, null, { body: messageText})
.addHeader("Content-Type", "text/plain")
.expectStatus(200)
.expectHeader('content-type', 'application/json')
.expectJSON('_links', {
channel: {
href: thisChannelResource
}
})
.expectJSON('_links.self', {
href: function (value) {
var regex = new RegExp("^" + thisChannelResource.replace(/\//g, "\\/").replace(/\:/g, "\\:") + "\\/[a-f,0-9]{8}-[a-f,0-9]{4}-[a-f,0-9]{4}-[a-f,0-9]{4}-[a-f,0-9]{12}$");
expect(value).toMatch(regex);
}
})
.expectJSON({
id: function (value) {
expect(value).toMatch(/^[a-f,0-9]{8}-[a-f,0-9]{4}-[a-f,0-9]{4}-[a-f,0-9]{4}-[a-f,0-9]{12}$/);
},
})
.afterJSON(function (result) {
var valueUrl = result['_links']['self']['href'];
console.log('Now attempting to fetch back my data from ' + valueUrl);
frisby.create('Fetching value to ensure that it was inserted.')
.get(valueUrl)
.expectStatus(200)
.expectHeader('content-type', 'text/plain')
.expectBodyContains(messageText)
.toss();
})
.inspectJSON()
.toss();
});
>>>>>>>
console.info('Inserting a value...');
frisby.create('Inserting a value into a channel.')
.post(thisChannelResource, null, { body: messageText})
.addHeader("Content-Type", "text/plain")
.expectStatus(200)
.expectHeader('content-type', 'application/json')
.expectJSON('_links', {
channel: {
href: thisChannelResource
}
})
.expectJSON('_links.self', {
href: function (value) {
var regex = new RegExp("^" + thisChannelResource.replace(/\//g, "\\/").replace(/\:/g, "\\:") + "\\/[a-f,0-9]{8}-[a-f,0-9]{4}-[a-f,0-9]{4}-[a-f,0-9]{4}-[a-f,0-9]{12}$");
expect(value).toMatch(regex);
}
})
.expectJSON({
id: function (value) {
expect(value).toMatch(/^[A-Z,0-9]{16}$/);
}
})
.afterJSON(function (result) {
var valueUrl = result['_links']['self']['href'];
console.log('Now attempting to fetch back my data from ' + valueUrl);
frisby.create('Fetching value to ensure that it was inserted.')
.get(valueUrl)
.expectStatus(200)
.expectHeader('content-type', 'text/plain')
.expectBodyContains(messageText)
.toss();
})
.inspectJSON()
.toss();
}); |
<<<<<<<
_init: function(panelManager, monitor, panel, panelBox, isSecondary) {
this.panelManager = panelManager;
this._dtpSettings = panelManager._dtpSettings;
this.panelStyle = new PanelStyle.dtpPanelStyle(panelManager._dtpSettings);
//rebuild panel when taskar-position change
this._dtpSettings.connect('changed::taskbar-position', Lang.bind(this, function() {
this.disable();
this.enable();
}));
this.monitor = monitor;
this.panel = panel;
this.panelBox = panelBox;
this.isSecondary = isSecondary;
=======
_init: function(settings) {
this._dtpSettings = settings;
this.panelStyle = new PanelStyle.dtpPanelStyle(settings);
>>>>>>>
_init: function(panelManager, monitor, panel, panelBox, isSecondary) {
this.panelManager = panelManager;
this._dtpSettings = panelManager._dtpSettings;
this.panelStyle = new PanelStyle.dtpPanelStyle(panelManager._dtpSettings);
this.monitor = monitor;
this.panel = panel;
this.panelBox = panelBox;
this.isSecondary = isSecondary;
<<<<<<<
// sync hover after a popupmenu is closed
this.taskbar.connect('menu-closed', Lang.bind(this, function(){this.container.sync_hover();}));
=======
// Since Gnome 3.8 dragging an app without having opened the overview before cause the attemp to
//animate a null target since some variables are not initialized when the viewSelector is created
if(Main.overview.viewSelector._activePage == null)
Main.overview.viewSelector._activePage = Main.overview.viewSelector._workspacesPage;
>>>>>>>
// sync hover after a popupmenu is closed
this.taskbar.connect('menu-closed', Lang.bind(this, function(){this.container.sync_hover();}));
// Since Gnome 3.8 dragging an app without having opened the overview before cause the attemp to
//animate a null target since some variables are not initialized when the viewSelector is created
if(Main.overview.viewSelector._activePage == null)
Main.overview.viewSelector._activePage = Main.overview.viewSelector._workspacesPage;
<<<<<<<
=======
for (let i = 0; i < this._dtpSettingsSignalIds.length; ++i) {
this._dtpSettings.disconnect(this._dtpSettingsSignalIds[i]);
}
>>>>>>>
for (let i = 0; i < this._dtpSettingsSignalIds.length; ++i) {
this._dtpSettings.disconnect(this._dtpSettingsSignalIds[i]);
} |
<<<<<<<
},
'sort-lines:length' () {
sortByLength(atom.workspace.getActiveTextEditor())
=======
},
'sort-lines:shuffle' () {
shuffleLines(atom.workspace.getActiveTextEditor())
>>>>>>>
},
'sort-lines:length' () {
sortByLength(atom.workspace.getActiveTextEditor())
},
'sort-lines:shuffle' () {
shuffleLines(atom.workspace.getActiveTextEditor())
<<<<<<<
}
function sortByLength (editor) {
sortTextLines(editor,
(textLines) => textLines.sort((a, b) => a.length - b.length)
)
=======
}
function shuffleLines (editor) {
sortTextLines(editor,
(textLines) => shuffle(textLines)
)
>>>>>>>
}
function sortByLength (editor) {
sortTextLines(editor,
(textLines) => textLines.sort((a, b) => a.length - b.length)
)
}
function shuffleLines (editor) {
sortTextLines(editor,
(textLines) => shuffle(textLines)
) |
<<<<<<<
const sortLinesByLength =
(callback) => runCommand('sort-lines:length', callback)
=======
const shuffleLines =
(callback) => runCommand('sort-lines:shuffle', callback)
>>>>>>>
const sortLinesByLength =
(callback) => runCommand('sort-lines:length', callback)
const shuffleLines =
(callback) => runCommand('sort-lines:shuffle', callback)
<<<<<<<
describe('by length', () => {
it('sorts the lines by length', () => {
editor.setText(
'Hydrogen\n' +
'Helium\n' +
'Lithium\n' +
'Beryllium\n' +
'Boron\n'
)
sortLinesByLength(() =>
expect(editor.getText()).toBe(
'Boron\n' +
'Helium\n' +
'Lithium\n' +
'Hydrogen\n' +
'Beryllium\n'
)
)
})
})
=======
describe('shuffling', () => {
it('shuffle lines', () => {
const originalText =
'Beryllium \n' +
'Boron \n' +
'Helium \n' +
'Hydrogen \n' +
'Lithium \n'
editor.setText(originalText)
shuffleLines(() => {
const shuffledText = editor.getText()
console.log(originalText);
console.log(shuffledText);
expect(shuffledText.split('\n').length).toEqual(originalText.split('\n').length)
expect(shuffledText).toNotBe(originalText)
})
})
})
>>>>>>>
describe('by length', () => {
it('sorts the lines by length', () => {
editor.setText(
'Hydrogen\n' +
'Helium\n' +
'Lithium\n' +
'Beryllium\n' +
'Boron\n'
)
sortLinesByLength(() =>
expect(editor.getText()).toBe(
'Boron\n' +
'Helium\n' +
'Lithium\n' +
'Hydrogen\n' +
'Beryllium\n'
)
)
})
})
describe('shuffling', () => {
it('shuffle lines', () => {
const originalText =
'Beryllium \n' +
'Boron \n' +
'Helium \n' +
'Hydrogen \n' +
'Lithium \n'
editor.setText(originalText)
shuffleLines(() => {
const shuffledText = editor.getText()
console.log(originalText);
console.log(shuffledText);
expect(shuffledText.split('\n').length).toEqual(originalText.split('\n').length)
expect(shuffledText).toNotBe(originalText)
})
})
}) |
<<<<<<<
"SUM TAB TABBED TABLE TEXTHALIGN TEXTVALIGN THEN THREADS THROW TIME TO TODRAW " +
"TOOLBAR TOP TREE TRUE TRY UNGROUP VALIGN VALUE " +
"VERTICAL VIEW WHEN WHERE WHILE WINDOW WORDFILE WORDLINK WRITE XLS XLSX XML XMLFILE XMLLINK XOR YES");
=======
"SUM TAB TABBED TABLE TEXTHALIGN TEXTVALIGN THEN THREADS TIME TO TODRAW " +
"TOOLBAR TOP TREE TRUE TRY UNGROUP UPDATE VALIGN VALUE " +
"VERTICAL VIEW WHEN WHERE WHILE WINDOW WORDFILE WORDLINK WRITE XLS XLSX XML XOR YES");
>>>>>>>
"SUM TAB TABBED TABLE TEXTHALIGN TEXTVALIGN THEN THREADS TIME TO TODRAW " +
"TOOLBAR TOP TREE TRUE TRY UNGROUP VALIGN VALUE " +
"VERTICAL VIEW WHEN WHERE WHILE WINDOW WORDFILE WORDLINK WRITE XLS XLSX XML XMLFILE XMLLINK XOR YES"); |
<<<<<<<
"CONTAINERH CONTAINERV CONTEXTMENU CSV CSVFILE CSVLINK CUSTOM CYCLES DATA DBF DEFAULT DEFAULTCOMPARE DELAY DELETE " +
"DESC DESIGN DIALOG DO DOC DOCKED DOCX DRAWROOT DROP DROPCHANGED ECHO EDIT " +
"ELSE EMAIL END EQUAL EVAL EVENTID EVENTS EXCELFILE EXCELLINK " +
=======
"CONTAINERH CONTAINERV CONTEXTFILTER CSV CSVFILE CSVLINK CUSTOM CYCLES DATA DBF DEFAULT DEFAULTCOMPARE DELAY DELETE " +
"DESC DESIGN DIALOG DO DOC DOCKED DOCKEDMODAL DOCX DRAWROOT " +
"DROP DROPCHANGED DROPSET ECHO EDIT EDITABLE EDITFORM EDITKEY " +
"ELSE EMAIL END ESCAPE EQUAL EVAL EVENTID EVENTS EXCELFILE EXCELLINK " +
>>>>>>>
"CONTAINERH CONTAINERV CONTEXTMENU CSV CSVFILE CSVLINK CUSTOM CYCLES DATA DBF DEFAULT DEFAULTCOMPARE DELAY DELETE " +
"DESC DESIGN DIALOG DO DOC DOCKED DOCX DRAWROOT DROP DROPCHANGED ECHO EDIT " +
"ELSE EMAIL END ESCAPE EQUAL EVAL EVENTID EVENTS EXCELFILE EXCELLINK " + |
<<<<<<<
"REPORTFILES REQUEST REQUIRE RESOLVE RETURN RGB RICHTEXT RIGHT ROOT " +
"ROUND RTF SCHEDULE SCROLL SEEK SELECTOR SESSION SET SETCHANGED SETDROPPED SHOW " +
=======
"REPORT REPORTFILES REQUEST REQUIRE RESOLVE RETURN RGB RICHTEXT RIGHT ROOT " +
"ROUND RTF SCHEDULE SCROLL SEEK SELECTOR SESSION SET SETCHANGED SHORTCUT SHOW SHOWDROP " +
>>>>>>>
"REPORT REPORTFILES REQUEST REQUIRE RESOLVE RETURN RGB RICHTEXT RIGHT ROOT " +
"ROUND RTF SCHEDULE SCROLL SEEK SELECTOR SESSION SET SETCHANGED SETDROPPED SHOW " + |
<<<<<<<
var affirmativeResponses = [
`Yes ${sender.firstName}, contact me because I desire this.`,
=======
let affirmativeResponses = [
'Yes ' + sender.firstName + ', contact me because I desire this.',
>>>>>>>
let affirmativeResponses = [
`Yes ${sender.firstName}, contact me because I desire this.`,
<<<<<<<
var negativeResponse = `No ${sender.firstName}, I want none of these things and want to be stagnant with my same old job and to be phased out of new opportunities.`;
=======
let negativeResponse = 'No ' + sender.firstName + ', I want none of these things and want to be stagnant with my same old job and to be phased out of new opportunities.';
>>>>>>>
let negativeResponse = `No ${sender.firstName}, I want none of these things and want to be stagnant with my same old job and to be phased out of new opportunities.`;
<<<<<<<
var senderEmailLink = `<a href="mailto:${sender.email}">${sender.email}</a>`;
elements.sender.innerHTML = `${sender.firstName} ${sender.lastName}<br>${senderEmailLink}<br>${sender.phone}`;
=======
let senderEmailLink = '<a href="mailto:' + sender.email + '">' + sender.email + '</a>';
elements.sender.innerHTML = sender.firstName + ' ' + sender.lastName + '<br>' + senderEmailLink + '<br>' + sender.phone;
>>>>>>>
let senderEmailLink = `<a href="mailto:${sender.email}">${sender.email}</a>`;
elements.sender.innerHTML = `${sender.firstName} ${sender.lastName}<br>${senderEmailLink}<br>${sender.phone}`; |
<<<<<<<
var common = require(path.normalize(__dirname + '/../../common'));
var _ = require('lodash');
=======
>>>>>>>
var _ = require('lodash'); |
<<<<<<<
<Tabs activeTab={activeTab} vertical={true}
handleTabChange={handleTabChange}>
<TabButtonList className="form-tabs-list">
<TabButton id="services" label="Services" key="services">
=======
<Tabs activeTab={activeTab} vertical={true} handleTabChange={handleTabChange}>
<TabButtonList>
<TabButton id="services" label={serviceLabel} key="services">
>>>>>>>
<Tabs activeTab={activeTab} vertical={true} handleTabChange={handleTabChange}>
<TabButtonList className="form-tabs-list">
<TabButton id="services" label={serviceLabel} key="services"> |
<<<<<<<
<SafeAreaView>
<View style={styles.loginView}>
<View style={styles.formContainer}>
<TextInput
style={styles.input_white}
onChangeText={username => this.setState({ username })}
keyboardType='email-address'
autoCorrect={false}
returnKeyType='next'
autoCapitalize='none'
underlineColorAndroid='transparent'
onSubmitEditing={() => { this.password.focus(); }}
placeholder={this.props.Accounts_EmailOrUsernamePlaceholder || 'Email or username'}
/>
<TextInput
ref={(e) => { this.password = e; }}
style={styles.input_white}
onChangeText={password => this.setState({ password })}
secureTextEntry
autoCorrect={false}
returnKeyType='done'
autoCapitalize='none'
underlineColorAndroid='transparent'
onSubmitEditing={this.submit}
placeholder={this.props.Accounts_PasswordPlaceholder || 'Password'}
/>
{this.renderTOTP()}
<TouchableOpacity style={styles.buttonContainer}>
<Text style={styles.button} onPress={this.submit}>LOGIN</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer}>
<Text style={styles.button} onPress={this.register}>REGISTER</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer} onPress={this.forgotPassword}>
<Text style={styles.button}>FORGOT MY PASSWORD</Text>
</TouchableOpacity>
{this.props.login.failure && <Text style={styles.error}>{this.props.login.error.reason}</Text>}
</View>
<Spinner visible={this.props.login.isFetching} textContent='Loading...' textStyle={{ color: '#FFF' }} />
=======
<View style={styles.loginView}>
<View style={styles.formContainer}>
<TextInput
style={styles.input_white}
onChangeText={username => this.setState({ username })}
keyboardType='email-address'
autoCorrect={false}
returnKeyType='next'
autoCapitalize='none'
underlineColorAndroid='transparent'
onSubmitEditing={() => { this.password.focus(); }}
placeholder={this.props.Accounts_EmailOrUsernamePlaceholder || 'Email or username'}
/>
<TextInput
ref={(e) => { this.password = e; }}
style={styles.input_white}
onChangeText={password => this.setState({ password })}
secureTextEntry
autoCorrect={false}
returnKeyType='done'
autoCapitalize='none'
underlineColorAndroid='transparent'
onSubmitEditing={this.submit}
placeholder={this.props.Accounts_PasswordPlaceholder || 'Password'}
/>
{this.renderTOTP()}
<TouchableOpacity
style={styles.buttonContainer}
onPress={this.submit}
>
<Text style={styles.button}>LOGIN</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer} onPress={this.register}>
<Text style={styles.button}>REGISTER</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer} onPress={this.termsService}>
<Text style={styles.button}>TERMS OF SERVICE</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer} onPress={this.privacyPolicy}>
<Text style={styles.button}>PRIVACY POLICY</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer} onPress={this.forgotPassword}>
<Text style={styles.button}>FORGOT MY PASSWORD</Text>
</TouchableOpacity>
{this.props.login.failure && <Text style={styles.error}>{this.props.login.error.reason}</Text>}
>>>>>>>
<View style={styles.loginView}>
<SafeAreaView>
<View style={styles.formContainer}>
<TextInput
style={styles.input_white}
onChangeText={username => this.setState({ username })}
keyboardType='email-address'
autoCorrect={false}
returnKeyType='next'
autoCapitalize='none'
underlineColorAndroid='transparent'
onSubmitEditing={() => { this.password.focus(); }}
placeholder={this.props.Accounts_EmailOrUsernamePlaceholder || 'Email or username'}
/>
<TextInput
ref={(e) => { this.password = e; }}
style={styles.input_white}
onChangeText={password => this.setState({ password })}
secureTextEntry
autoCorrect={false}
returnKeyType='done'
autoCapitalize='none'
underlineColorAndroid='transparent'
onSubmitEditing={this.submit}
placeholder={this.props.Accounts_PasswordPlaceholder || 'Password'}
/>
{this.renderTOTP()}
<TouchableOpacity
style={styles.buttonContainer}
onPress={this.submit}
>
<Text style={styles.button}>LOGIN</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer} onPress={this.register}>
<Text style={styles.button}>REGISTER</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer} onPress={this.termsService}>
<Text style={styles.button}>TERMS OF SERVICE</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer} onPress={this.privacyPolicy}>
<Text style={styles.button}>PRIVACY POLICY</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonContainer} onPress={this.forgotPassword}>
<Text style={styles.button}>FORGOT MY PASSWORD</Text>
</TouchableOpacity>
{this.props.login.failure && <Text style={styles.error}>{this.props.login.error.reason}</Text>} |
<<<<<<<
onPress={this.submit}
>REGISTER
</Text>
=======
>REGISTER</Text>
>>>>>>>
>REGISTER
</Text>
<<<<<<<
<TouchableOpacity style={[styles.buttonContainer, styles.registerContainer]}>
<Text
style={styles.button}
onPress={this.usernameSubmit}
>REGISTER
</Text>
=======
<TouchableOpacity
style={[styles.buttonContainer, styles.registerContainer]}
onPress={this.usernameSubmit}
>
<Text style={styles.button}>REGISTER</Text>
>>>>>>>
<TouchableOpacity
style={[styles.buttonContainer, styles.registerContainer]}
onPress={this.usernameSubmit}
>
<Text style={styles.button}>REGISTER</Text> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.