conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
if(game) {
return typeof(game.winner) !== 'undefined' && game.winner === 'self';
}
return false;
};
=======
//console.log('chessMove');
>>>>>>>
if(game) {
return typeof(game.winner) !== 'undefined' && game.winner === 'self';
}
return false;
};
<<<<<<<
=======
/*
//console.log(chessMove);
//console.log('from: ' + chessMove.from);
//console.log('to: ' + chessMove.to);
*/
var fromW = highlight.playerWhite[chessMove.from];
var toW = highlight.playerWhite[chessMove.to];
var fromB = highlight.playerBlack[chessMove.from];
var toB = highlight.playerBlack[chessMove.to];
/*
//console.log('fromW: ', fromW, ' toW: ', toW);
//console.log('fromW: ', fromB, ' toW: ', toB);
*/
>>>>>>>
<<<<<<<
=======
//console.log('chessMove !== null');
>>>>>>>
<<<<<<<
if (chess.turn() === 'b' && game.self.color === 'white') {
offerDraw();
}
if (chess.turn() === 'w' && game.self.color === 'black') {
offerDraw();
}
=======
games.offerDraw(game);
>>>>>>>
if (chess.turn() === 'b' && game.self.color === 'white') {
games.offerDraw(game);
}
if (chess.turn() === 'w' && game.self.color === 'black') {
games.offerDraw(game);
}
<<<<<<<
if (chess.turn() === 'b' && game.self.color === 'white') {
offerDraw();
}
if (chess.turn() === 'w' && game.self.color === 'black') {
offerDraw();
}
=======
games.offerDraw(game);
>>>>>>>
if (chess.turn() === 'b' && game.self.color === 'white') {
games.offerDraw(game);
}
if (chess.turn() === 'w' && game.self.color === 'black') {
games.offerDraw(game);
}
<<<<<<<
=======
// ToDo: set 'danger' color for king
//console.log('css');
>>>>>>>
<<<<<<<
// Update game information
let gamer;
if (chess.turn() === 'w') {
gamer = 'white';
} else {
gamer = 'black';
}
updateGameInfo('Next player is ' + gamer + '.', false);
=======
}*/
>>>>>>>
// Update game information
let gamer;
if (chess.turn() === 'w') {
gamer = 'white';
} else {
gamer = 'black';
}
updateGameInfo('Next player is ' + gamer + '.', false); |
<<<<<<<
var fileStatusCache_1 = require("../fileStatusCache");
=======
var json2dtsCommands_1 = require("./json2dtsCommands");
>>>>>>>
var fileStatusCache_1 = require("../fileStatusCache");
var json2dtsCommands_1 = require("./json2dtsCommands"); |
<<<<<<<
.callsFake(() => ({ then: (f) => f('function code') }));
// Mock call to getFunctionContent when retrieving the requirements text
=======
.callsFake(() => ({ then: (f) => f(fs.readFileSync(handlerFile).toString()) }));
// Mock call to getFunctionContent when retrieving the requirements text
>>>>>>>
.callsFake(() => ({ then: (f) => f(fs.readFileSync(handlerFile).toString()) }));
// Mock call to getFunctionContent when retrieving the requirements text
<<<<<<<
.callsFake(() => ({ catch: () => ({ then: (f) => f(null) }) }));
sinon.stub(kubelessDeploy, 'waitForDeployment');
=======
.callsFake(() => ({ catch: () => ({ then: (f) => {
if (fs.existsSync(depsFile)) {
return f(fs.readFileSync(depsFile).toString());
}
return f(null);
} }) })
);
>>>>>>>
.callsFake(() => ({ catch: () => ({ then: (f) => {
if (fs.existsSync(depsFile)) {
return f(fs.readFileSync(depsFile).toString());
}
return f(null);
} }) })
);
sinon.stub(kubelessDeploy, 'waitForDeployment'); |
<<<<<<<
// Add the rename view
const { renameView } = renameView_1.attach();
const { semanticView } = semanticView_1.attach();
const { fileSymbolsView } = symbolsViewMain_1.attach();
const statusPanel = statusPanel_1.StatusPanel.create();
statusBar.addRightTile({
item: statusPanel,
priority: statusPriority,
});
subscriptions.add(statusPanel);
const errorPusher = new errorPusher_1.ErrorPusher();
errorPusher.setUnusedAsInfo(atom.config.get("atom-typescript.unusedAsInfo"));
subscriptions.add(atom.config.onDidChange("atom-typescript.unusedAsInfo", (val) => {
errorPusher.setUnusedAsInfo(val.newValue);
}));
codefixProvider.errorPusher = errorPusher;
codefixProvider.getTypescriptBuffer = getTypescriptBuffer;
exports.clientResolver.on("pendingRequestsChange", () => {
const pending = lodash_2.flatten(lodash_2.values(exports.clientResolver.clients).map(cl => cl.pending));
statusPanel.setPending(pending);
});
if (linter) {
errorPusher.setLinter(linter);
exports.clientResolver.on("diagnostics", ({ type, filePath, diagnostics }) => {
errorPusher.setErrors(type, filePath, diagnostics);
});
=======
const files = [];
for (const p of panes.sort((a, b) => a.activeAt - b.activeAt)) {
if (p.filePath && p.isTypescript && p.client === p.client) {
files.push(p.filePath);
}
>>>>>>>
const files = [];
for (const p of panes.sort((a, b) => a.activeAt - b.activeAt)) {
if (p.filePath && p.isTypescript && p.client === p.client) {
files.push(p.filePath);
}
<<<<<<<
renameView,
semanticView,
fileSymbolsView,
=======
onSave,
>>>>>>>
onSave,
<<<<<<<
exports.config = {
unusedAsInfo: {
title: "Show unused values with severity info",
description: "Show unused values with severity 'info' instead of 'error'",
type: "boolean",
default: true,
},
showSemanticView: {
title: "Show semantic view",
description: "Show semantic view (outline) for typescript content",
type: "boolean",
default: false,
},
};
function getProjectConfigPath(sourcePath) {
return tslib_1.__awaiter(this, void 0, void 0, function* () {
const client = yield exports.clientResolver.get(sourcePath);
const result = yield client.executeProjectInfo({ needFileNameList: false, file: sourcePath });
return result.body.configFileName;
=======
async function getProjectConfigPath(sourcePath) {
const client = await exports.clientResolver.get(sourcePath);
const result = await client.executeProjectInfo({
needFileNameList: false,
file: sourcePath,
>>>>>>>
async function getProjectConfigPath(sourcePath) {
const client = await exports.clientResolver.get(sourcePath);
const result = await client.executeProjectInfo({
needFileNameList: false,
file: sourcePath,
},
showSemanticView: {
title: "Show semantic view",
description: "Show semantic view (outline) for typescript content",
type: "boolean",
default: false, |
<<<<<<<
var rimraf = require('rimraf'); // rimraf used to set number of retries for deleting files in use
//var del = require('del'); // del used to delete entire folders with the exception of specific files
=======
var exec = require("child_process").execSync;
>>>>>>>
var rimraf = require('rimraf'); // rimraf used to set number of retries for deleting files in use
//var del = require('del'); // del used to delete entire folders with the exception of specific files
var exec = require("child_process").execSync; |
<<<<<<<
if (_.isEmpty(functionService) || _.isEmpty(fDesc)) {
reject(`Unable to find information for ${f}`);
} else {
const fIngress = _.find(ingressInfo.items, item => (
item.metadata.labels && item.metadata.labels.function === f
));
let url = null;
if (fIngress && !_.isEmpty(fIngress.status.loadBalancer.ingress)) {
url = `${fIngress.status.loadBalancer.ingress[0].ip}` +
`${fIngress.spec.rules[0].http.paths[0].path}`;
}
const service = {
name: functionService.metadata.name,
ip: functionService.spec.clusterIP,
type: functionService.spec.type,
ports: functionService.spec.ports,
selfLink: functionService.metadata.selfLink,
uid: functionService.metadata.uid,
timestamp: functionService.metadata.creationTimestamp,
};
const func = {
name: f,
url,
handler: fDesc.spec.handler,
runtime: fDesc.spec.runtime,
topic: fDesc.spec.topic,
type: fDesc.spec.type,
deps: fDesc.spec.deps,
annotations: fDesc.annotations,
labels: fDesc.labels,
selfLink: fDesc.metadata.selfLink,
uid: fDesc.metadata.uid,
timestamp: fDesc.metadata.creationTimestamp,
};
message += this.formatMessage(
service,
func,
_.defaults({}, options, { color: true })
);
counter++;
if (counter === _.keys(this.serverless.service.functions).length) {
this.serverless.cli.consoleLog(message);
resolve(message);
}
=======
if (_.isEmpty(functionService)) {
this.serverless.cli.consoleLog(
`Not found any information about the function "${f}"`
);
} else {
const fIngress = _.find(ingressInfo.items, item => (
item.metadata.labels && item.metadata.labels.function === f
));
let url = null;
if (fIngress) {
url = `${fIngress.status.loadBalancer.ingress[0].ip || 'API_URL'}` +
`${fIngress.spec.rules[0].http.paths[0].path}`;
}
const service = {
name: functionService.metadata.name,
ip: functionService.spec.clusterIP,
type: functionService.spec.type,
ports: functionService.spec.ports,
selfLink: functionService.metadata.selfLink,
uid: functionService.metadata.uid,
timestamp: functionService.metadata.creationTimestamp,
};
const func = {
name: f,
url,
handler: fDesc.spec.handler,
runtime: fDesc.spec.runtime,
topic: fDesc.spec.topic,
type: fDesc.spec.type,
deps: fDesc.spec.deps,
annotations: fDesc.annotations,
labels: fDesc.labels,
selfLink: fDesc.metadata.selfLink,
uid: fDesc.metadata.uid,
timestamp: fDesc.metadata.creationTimestamp,
};
message += this.formatMessage(
service,
func,
_.defaults({}, options, { color: true })
);
}
counter++;
if (counter === _.keys(this.serverless.service.functions).length) {
if (!_.isEmpty(message)) {
this.serverless.cli.consoleLog(message);
}
resolve(message);
>>>>>>>
if (_.isEmpty(functionService) || _.isEmpty(fDesc)) {
this.serverless.cli.consoleLog(
`Not found any information about the function "${f}"`
);
} else {
const fIngress = _.find(ingressInfo.items, item => (
item.metadata.labels && item.metadata.labels.function === f
));
let url = null;
if (fIngress) {
url = `${fIngress.status.loadBalancer.ingress[0].ip || 'API_URL'}` +
`${fIngress.spec.rules[0].http.paths[0].path}`;
}
const service = {
name: functionService.metadata.name,
ip: functionService.spec.clusterIP,
type: functionService.spec.type,
ports: functionService.spec.ports,
selfLink: functionService.metadata.selfLink,
uid: functionService.metadata.uid,
timestamp: functionService.metadata.creationTimestamp,
};
const func = {
name: f,
url,
handler: fDesc.spec.handler,
runtime: fDesc.spec.runtime,
topic: fDesc.spec.topic,
type: fDesc.spec.type,
deps: fDesc.spec.deps,
annotations: fDesc.annotations,
labels: fDesc.labels,
selfLink: fDesc.metadata.selfLink,
uid: fDesc.metadata.uid,
timestamp: fDesc.metadata.creationTimestamp,
};
message += this.formatMessage(
service,
func,
_.defaults({}, options, { color: true })
);
}
counter++;
if (counter === _.keys(this.serverless.service.functions).length) {
if (!_.isEmpty(message)) {
this.serverless.cli.consoleLog(message);
}
resolve(message); |
<<<<<<<
curveAmount: {value: 0.65, min: 0, max: 1, automatable: false, type: FLOAT},
algorithmIndex: {value: 0, automatable: false, type: INT},
bypass: {value: true, automatable: false, type: BOOLEAN}
=======
curveAmount: {value: 1, min: 0, max: 1, automatable: false, type: FLOAT},
algorithmIndex: {value: 4, automatable: false, type: INT}
>>>>>>>
curveAmount: {value: 0.65, min: 0, max: 1, automatable: false, type: FLOAT},
algorithmIndex: {value: 0, automatable: false, type: INT},
bypass: {value: true, automatable: false, type: BOOLEAN}
<<<<<<<
Tuna.prototype.Phaser = function(properties) {
if (!properties) {
properties = this.getDefaults();
}
this.input = userContext.createGainNode();
this.splitter = this.activateNode = userContext.createChannelSplitter(2);
this.filtersL = [];
this.filtersR = [];
this.feedbackGainNodeL = userContext.createGainNode();
this.feedbackGainNodeR = userContext.createGainNode();
this.merger = userContext.createChannelMerger(2);
this.filteredSignal = userContext.createGainNode();
this.output = userContext.createGainNode();
this.lfoL = new userInstance.LFO({target: this.filtersL, callback: this.callback});
this.lfoR = new userInstance.LFO({target: this.filtersR, callback: this.callback});
var i = this.stage;
while(i--) {
this.filtersL[i] = userContext.createBiquadFilter();
this.filtersR[i] = userContext.createBiquadFilter();
this.filtersL[i].type = 7;
this.filtersR[i].type = 7;
};
this.input.connect(this.splitter);
this.input.connect(this.output);
this.splitter.connect(this.filtersL[0], 0, 0);
this.splitter.connect(this.filtersR[0], 1, 0);
this.connectInOrder(this.filtersL);
this.connectInOrder(this.filtersR);
this.filtersL[this.stage - 1].connect(this.feedbackGainNodeL);
this.filtersL[this.stage - 1].connect(this.merger, 0, 0);
this.filtersR[this.stage - 1].connect(this.feedbackGainNodeR);
this.filtersR[this.stage - 1].connect(this.merger, 0, 1);
this.feedbackGainNodeL.connect(this.filtersL[0]);
this.feedbackGainNodeR.connect(this.filtersR[0]);
this.merger.connect(this.output);
this.rate = properties.rate || this.defaults.rate.value;
this.baseModulationFrequency = properties.baseModulationFrequency || this.defaults.baseModulationFrequency.value;
this.depth = properties.depth || this.defaults.depth.value;
this.feedback = properties.feedback || this.defaults.feedback.value;
this.stereoPhase = properties.stereoPhase || this.defaults.stereoPhase.value;
this.lfoL.activate(true);
this.lfoR.activate(true);
this.bypass = false;
};
Tuna.prototype.Phaser.prototype = Object.create (Super, {
name: {value: "Phaser"},
stage: {value: 4},
defaults: {
value: {
frequency: {value: 5, min: 0, max: 8, automatable: false, type: FLOAT},
rate: {value: 8, min: 0, max: 8, automatable: false, type: FLOAT},
depth: {value: 0.3, min: 0, max: 1, automatable: false, type: FLOAT},
feedback: {value: 0.2, min: 0, max: 1, automatable: false, type: FLOAT},
stereoPhase: {value: 30, min: 0, max: 180, automatable: false, type: FLOAT},
baseModulationFrequency: {value: 1500, min: 500, max: 1500, automatable: false, type: FLOAT}
}
},
callback: {
value: function(filters, value) {
for (var stage = 0; stage < 4; stage++) {
filters[stage].frequency.value = value;
}
}
},
depth: {
get: function () {return this._depth},
set: function(value) {
this._depth = value;
this.lfoL.oscillation = this._baseModulationFrequency * this._depth;
this.lfoR.oscillation = this._baseModulationFrequency * this._depth;
}
},
rate: {
get: function () {return this._rate},
set: function(value) {
this._rate = value;
this.lfoL.frequency = this._rate;
this.lfoR.frequency = this._rate;
}
},
baseModulationFrequency: {
enumerable: true,
get: function () {return this._baseModulationFrequency},
set: function (value) {
this._baseModulationFrequency = value;
this.lfoL.offset = this._baseModulationFrequency;
this.lfoR.offset = this._baseModulationFrequency;
this._depth = this._depth;
}
},
feedback: {
get: function () {return this._feedback},
set: function (value) {
this._feedback = value;
this.feedbackGainNodeL.gain.value = this._feedback;
this.feedbackGainNodeR.gain.value = this._feedback;
}
},
stereoPhase: {
get: function () {return this._stereoPhase},
set: function (value) {
this._stereoPhase = value;
var newPhase = this.lfoL._phase + this._stereoPhase * Math.PI / 180;
newPhase = fmod(newPhase, 2 * Math.PI);
this.lfoR._phase = newPhase;
}
}
});
Tuna.prototype.Tremolo = function(properties) {
if (!properties) {
properties = this.getDefaults();
}
this.input = userContext.createGainNode()
this.splitter = this.activateNode = userContext.createChannelSplitter(2),
this.amplitudeL = userContext.createGainNode(),
this.amplitudeR = userContext.createGainNode(),
this.merger = userContext.createChannelMerger(2),
this.output = userContext.createGainNode();
this.lfoL = new userInstance.LFO({target: this.amplitudeL.gain, callback: pipe});
this.lfoR = new userInstance.LFO({target: this.amplitudeR.gain, callback: pipe});
this.input.connect(this.splitter);
this.splitter.connect(this.amplitudeL, 0);
this.splitter.connect(this.amplitudeR, 1);
this.amplitudeL.connect(this.merger, 0, 0);
this.amplitudeR.connect(this.merger, 0, 1);
this.merger.connect(this.output);
this.rate = properties.rate || this.defaults.rate.value;
this.intensity = properties.intensity || this.defaults.intensity.value;
this.stereoPhase = properties.stereoPhase || this.defaults.stereoPhase.value;
this.lfoL.offset = 1 - (this.intensity / 2);
this.lfoR.offset = 1 - (this.intensity / 2);
this.lfoL.phase = this.stereoPhase * Math.PI / 180;
this.lfoL.activate(true);
this.lfoR.activate(true);
this.bypass = false;
};
Tuna.prototype.Tremolo.prototype = Object.create(Super, {
name: {value: "Tremolo"},
defaults: {
value: {
frequency: {value: 1.5, min: 0.1, max: 11, automatable: false, type: FLOAT},
intensity: {value: 0.3, min: 0, max: 1, automatable: false, type: FLOAT},
stereoPhase: {value: 0, min: 0, max: 180, automatable: false, type: FLOAT},
rate: {value: 5, min: 0.1, max: 11, automatable: false, type: FLOAT}
}
},
intensity: {
enumerable: true,
get: function () {return this._intensity},
set: function (value) {
this._intensity = value;
this.lfoL.offset = this._intensity / 2;
this.lfoR.offset = this._intensity / 2;
this.lfoL.oscillation = this._intensity;
this.lfoR.oscillation = this._intensity;
}
},
rate: {
enumerable: true,
get: function () {return this._rate},
set: function (value) {
this._rate = value;
this.lfoL.frequency = this._rate;
this.lfoR.frequency = this._rate;
}
},
stereoPhase: {
enumerable: true,
get: function () {return this._rate},
set: function (value) {
this._stereoPhase = value;
var newPhase = this.lfoL._phase + this._stereoPhase * Math.PI / 180;
newPhase = fmod(newPhase, 2 * Math.PI);
this.lfoR.phase = newPhase;
}
},
});
=======
>>>>>>>
<<<<<<<
Tuna.prototype.LFO = function (properties) {
//Instantiate AudioNode
this.output = userContext.createJavaScriptNode(256, 1, 1);
this.activateNode = userContext.destination;
//Set Properties
this.frequency = properties.frequency || this.defaults.frequency.value;
this.offset = properties.offset || this.defaults.offset.value;
this.oscillation = properties.oscillation || this.defaults.oscillation.value;
this.phase = properties.phase || this.defaults.phase.value;
this.target = properties.target || {};
this.output.onaudioprocess = this.callback(properties.callback || function () {});
this.bypass = false;
}
Tuna.prototype.LFO.prototype = Object.create(Super, {
name: {value: "LFO"},
bufferSize: {value: 256},
sampleRate: {value: 44100},
defaults: {
value: {
frequency: {value: 1, min: 0, max: 20, automatable: false, type: FLOAT},
offset: {value: 0.85, min: 0, max: 22049, automatable: false, type: FLOAT},
oscillation: {value: 0.3, min: -22050, max: 22050, automatable: false, type: FLOAT},
phase: {value: 0, min: 0, max: 2 * Math.PI, automatable: false, type: FLOAT}
}
},
frequency: {
get: function () {return this._frequency},
set: function (value) {
this._frequency = value;
this._phaseInc = 2 * Math.PI * this._frequency * this.bufferSize / this.sampleRate;
}
},
offset: {
get: function () {return this._offset},
set: function (value) {
this._offset = value;
}
},
oscillation: {
get: function () {return this._oscillation},
set: function (value) {
this._oscillation = value;
}
},
phase: {
get: function () {return this._phase},
set: function (value) {
this._phase = value;
}
},
target: {
get: function () {return this._target},
set: function (value) {
this._target = value;
}
},
activate: {
//OSKAR: what's this?
value: function (doActivate) {
if(!doActivate) {
this.output.disconnect(userContext.destination);
} else {
this.output.connect(userContext.destination);
}
}
},
callback: {
value: function (callback) {
var that = this;
return function () {
that._phase += that._phaseInc;
if (that._phase > 2 * Math.PI) {
that._phase = 0;
}
callback(that._target, that._offset + that._oscillation * Math.sin(that._phase));
}
}
}
});
=======
>>>>>>> |
<<<<<<<
this.eventListeners = {};
this.attached = false;
=======
delete this.eventListeners;
for (let observerName in Recorder.mutationObservers) {
const observer = Recorder.mutationObservers[observerName];
observer.disconnect();
}
>>>>>>>
for (let observerName in Recorder.mutationObservers) {
const observer = Recorder.mutationObservers[observerName];
observer.disconnect();
}
this.eventListeners = {};
this.attached = false; |
<<<<<<<
this.window = window
this.eventListeners = {}
this.attached = false
=======
this.window = window;
this.eventListeners = {};
this.attached = false;
this.recordingState = {};
>>>>>>>
this.window = window
this.eventListeners = {}
this.attached = false
this.recordingState = {}
<<<<<<<
const eventInfo = this.parseEventKey(eventKey)
const eventName = eventInfo.eventName
const capture = eventInfo.capture
const handlers = Recorder.eventHandlers[eventKey]
this.eventListeners[eventKey] = []
for (let i = 0; i < handlers.length; i++) {
this.window.document.addEventListener(eventName, handlers[i], capture)
this.eventListeners[eventKey].push(handlers[i])
=======
const eventInfo = this.parseEventKey(eventKey);
const eventName = eventInfo.eventName;
const capture = eventInfo.capture;
const handlers = Recorder.eventHandlers[eventKey];
this.eventListeners[eventKey] = [];
for (let i = 0 ; i < handlers.length ; i++) {
this.window.document.addEventListener(eventName, handlers[i].bind(this), capture);
this.eventListeners[eventKey].push(handlers[i]);
>>>>>>>
const eventInfo = this.parseEventKey(eventKey)
const eventName = eventInfo.eventName
const capture = eventInfo.capture
const handlers = Recorder.eventHandlers[eventKey]
this.eventListeners[eventKey] = []
for (let i = 0; i < handlers.length; i++) {
this.window.document.addEventListener(
eventName,
handlers[i].bind(this),
capture
)
this.eventListeners[eventKey].push(handlers[i])
<<<<<<<
this.attached = true
addRecordingIndicator()
=======
this.attached = true;
this.recordingState = {
typeTarget: undefined,
typeLock: 0,
focusTarget: null,
focusValue: null,
tempValue: null,
preventType: false,
preventClickTwice: false,
preventClick: false,
enterTarget: null,
enterValue: null,
tabCheck: null
};
attachInputListeners(this.recordingState);
addRecordingIndicator();
>>>>>>>
this.attached = true
this.recordingState = {
typeTarget: undefined,
typeLock: 0,
focusTarget: null,
focusValue: null,
tempValue: null,
preventType: false,
preventClickTwice: false,
preventClick: false,
enterTarget: null,
enterValue: null,
tabCheck: null,
}
attachInputListeners(this.recordingState)
addRecordingIndicator()
<<<<<<<
this.eventListeners = {}
this.attached = false
removeRecordingIndicator()
}
=======
this.eventListeners = {};
this.attached = false;
removeRecordingIndicator();
detachInputListeners(this.recordingState);
};
>>>>>>>
this.eventListeners = {}
this.attached = false
removeRecordingIndicator()
detachInputListeners(this.recordingState)
} |
<<<<<<<
@observable completedWelcome = false;
=======
@observable pauseNotificationSent = false;
>>>>>>>
@observable completedWelcome = false;
@observable pauseNotificationSent = false; |
<<<<<<<
export const isProduction = process.env.NODE_ENV === "production";
export function calculateFrameIndex(indicatorIndex, targetFrameIndex) {
if (indicatorIndex < 0) return targetFrameIndex;
return (indicatorIndex < targetFrameIndex) ? targetFrameIndex - 1 : targetFrameIndex;
}
=======
export const isProduction = process.env.NODE_ENV === "production";
export const isStaging = process.env.NODE_ENV === "staging";
>>>>>>>
export const isProduction = process.env.NODE_ENV === "production";
export function calculateFrameIndex(indicatorIndex, targetFrameIndex) {
if (indicatorIndex < 0) return targetFrameIndex;
return (indicatorIndex < targetFrameIndex) ? targetFrameIndex - 1 : targetFrameIndex;
}
export const isStaging = process.env.NODE_ENV === "staging"; |
<<<<<<<
PNotify.prototype.options.styling = "bootstrap3";
=======
console.debug("Loading Game");
>>>>>>>
PNotify.prototype.options.styling = "bootstrap3";
console.debug("Loading Game"); |
<<<<<<<
posva: 'https://www.github.com/posva/donate',
=======
riyadhalnur: 'https://www.paypal.me/riyadhalnur',
>>>>>>>
posva: 'https://www.github.com/posva/donate',
riyadhalnur: 'https://www.paypal.me/riyadhalnur', |
<<<<<<<
litomore: 'https://www.paypal.me/LitoMore',
loghorn: 'https://www.paypal.me/Loghorn',
=======
limonte: 'https://www.patreon.com/limonte',
litomore: 'https://paypal.me/LitoMore',
lmangani: 'https://bunq.me/qxip',
loghorn: 'https://paypal.me/Loghorn',
lukechilds: 'https://blockchair.com/bitcoin/address/1LukeQU5jwebXbMLDVydeH4vFSobRV9rkj',
>>>>>>>
litomore: 'https://www.paypal.me/LitoMore',
loghorn: 'https://www.paypal.me/Loghorn',
lmangani: 'https://bunq.me/qxip',
lukechilds: 'https://blockchair.com/bitcoin/address/1LukeQU5jwebXbMLDVydeH4vFSobRV9rkj', |
<<<<<<<
this.interstellar.save(data);
=======
this.spaceship.save(data);
>>>>>>>
this.interstellar.save(data);
this.spaceship.save(data);
<<<<<<<
this.interstellar.load(data);
=======
this.spaceship.load(data);
>>>>>>>
this.interstellar.load(data);
this.spaceship.load(data);
<<<<<<<
instance.notifyOffline = function() {
this.activeNotifications.success = new PNotify({
title: "Offline Gains",
text: "You've been offline for " + Game.utils.getFullTimeDisplay((new Date().getTime() - lastFixedUpdate)/1000, true),
type: 'info',
animation: 'fade',
animate_speed: 'fast',
addclass: "stack-bottomright",
stack: this.noticeStack
});
};
instance.removeExcess = function(array, id){
var check = false;
for(var i = array.length; i > 0 ; i--){
if(array[i] === id){
if(check === false){
check = true;
}
else{
check = true;
array.splice(i, 1);
}
}
}
}
=======
>>>>>>>
instance.notifyOffline = function() {
this.activeNotifications.success = new PNotify({
title: "Offline Gains",
text: "You've been offline for " + Game.utils.getFullTimeDisplay((new Date().getTime() - lastFixedUpdate)/1000, true),
type: 'info',
animation: 'fade',
animate_speed: 'fast',
addclass: "stack-bottomright",
stack: this.noticeStack
});
};
instance.removeExcess = function(array, id){
var check = false;
for(var i = array.length; i > 0 ; i--){
if(array[i] === id){
if(check === false){
check = true;
}
else{
check = true;
array.splice(i, 1);
}
}
}
} |
<<<<<<<
Foxtrick.util.time.setMidnight(joinedDate);
var seasonDate = Foxtrick.util.time.addDaysToDate(joinedDate, DAYS_IN_SEASON + 1);
=======
var seasonDate = Foxtrick.util.time.addDaysToDate(joinedDate, DAYS_IN_SEASON);
Foxtrick.util.time.setMidnight(seasonDate);
>>>>>>>
Foxtrick.util.time.setMidnight(joinedDate);
var seasonDate = Foxtrick.util.time.addDaysToDate(joinedDate, DAYS_IN_SEASON); |
<<<<<<<
=======
var value = Foxtrick.Math.hsToFloat(num, true);
>>>>>>> |
<<<<<<<
pref("extensions.foxtrick.prefs.copyratings.teams", "both");
pref("extensions.foxtrick.prefs.version", "0.17.9");
=======
pref("extensions.foxtrick.prefs.version", "0.17.0");
>>>>>>>
pref("extensions.foxtrick.prefs.version", "0.17.9"); |
<<<<<<<
=======
loadToolbarItem: function() {
try {
this.generalButton = this.ToolbarItem.create(
'<toolbarbutton id="foxtrick-toolbar-button" ' +
'type="menu" ' +
'label="Foxtrick" ' +
'tooltiptext="Foxtrick" ' +
'context="foxtrick-menu" ' +
'class="' + this.ToolbarItem.BASIC_ITEM_CLASS +
' foxtrick-toolbar-item">' +
'<menupopup id="foxtrick-menu">' +
'<menuitem id="foxtrick-toolbar-preferences"/>' +
'<menuitem id="foxtrick-toolbar-deactivate" type="checkbox" ' +
'autocheck="true"/>' +
'<menuitem id="foxtrick-toolbar-clearCache" />' +
'<menuitem id="foxtrick-toolbar-highlight" type="checkbox" ' +
'autocheck="true"/>' +
'<menuitem id="foxtrick-toolbar-translationKeys" type="checkbox" ' +
'autocheck="true"/>' +
'</menupopup>' +
'</toolbarbutton>',
this.owner.document.getElementById('nav-bar')
);
}
catch (e) {
dump('Foxtrick error: Toolbar button init ' + e + '\n');
Cu.reportError('Foxtrick error: Toolbar button init ' + e);
}
},
>>>>>>> |
<<<<<<<
if (newSkillInfo && !isYouth) {
let { years, days } = player.age;
let htmsInput = Object.assign({ years, days }, player.skills);
let [htmsAbility, htmsPotential] = Foxtrick.modules.HTMSPoints.calc(htmsInput);
let tuple = { htmsAbility, htmsPotential };
Object.assign(player, tuple);
/** @type {PsicoTSIPrediction} */
let psico = Foxtrick.modules.PsicoTSI.getPrediction(player);
player.psicoTSI = psico.formAvg;
}
=======
>>>>>>>
<<<<<<<
let texts = [
'OwnerNotes', // README: youth only for some reason
=======
var texts = [
'OwnerNotes',
>>>>>>>
let texts = [
'OwnerNotes',
<<<<<<<
if (node('ArrivalDate')) {
// README: youth only for some reason
xPlayer.joinedSince = xml.time('ArrivalDate', playerNode);
=======
if (newSkillInfo && !isYouth) {
var htmsInput = {
years: player.age.years,
days: player.age.days,
};
Foxtrick.mergeAll(htmsInput, player.skills);
var htmsResult = Foxtrick.modules['HTMSPoints'].calc(htmsInput);
player.htmsAbility = htmsResult[0];
player.htmsPotential = htmsResult[1];
// psicoWage requires isAbroad!
let psico = Foxtrick.modules.PsicoTSI.getPrediction(player, currencyRate);
player.psicoTSI = psico.formAvg;
player.psicoWage = psico.wageLow;
>>>>>>>
if (newSkillInfo && !isYouth) {
let { years, days } = player.age;
let htmsInput = Object.assign({ years, days }, player.skills);
// TODO type check
let [htmsAbility, htmsPotential] = Foxtrick.modules.HTMSPoints.calc(htmsInput);
let tuple = { htmsAbility, htmsPotential };
Object.assign(player, tuple);
// psicoWage requires isAbroad!
/** @type {PsicoTSIPrediction} */
let psico = Foxtrick.modules.PsicoTSI.getPrediction(player, currencyRate);
player.psicoTSI = psico.formAvg;
player.psicoWage = psico.wageLow;
<<<<<<<
let trainerData = node('TrainerData');
=======
player.salaryBase = player.isAbroad ? player.salary / WAGE_Q : player.salary;
}
var trainerData = node('TrainerData');
>>>>>>>
player.salaryBase = player.isAbroad ? player.salary / WAGE_Q : player.salary;
}
let trainerData = node('TrainerData');
<<<<<<<
* @param {Player[]} playerList Array<Player>
* @param {PlayerKey} property
* @return {boolean}
=======
* @param {Array} playerList Array<Player>
* @param {string} property
* @return {boolean}
>>>>>>>
* @param {Player[]} playerList Array<Player>
* @param {PlayerKey} property
* @return {boolean}
<<<<<<<
return Foxtrick.any(player => typeof player[property] !== 'undefined', playerList);
=======
return Foxtrick.any(function(player) {
let val = player[property];
switch (typeof val) {
case 'undefined': return false;
case 'string': return !!val.trim().length;
case 'number': return !Number.isNaN(val) && val != 0;
default: return val != null;
}
}, playerList);
>>>>>>>
return Foxtrick.any((player) => {
let val = player[property];
switch (typeof val) {
case 'undefined': return false;
case 'string': return !!val.trim().length;
case 'number': return !Number.isNaN(val) && val != 0;
default: return val != null;
}
}, playerList); |
<<<<<<<
* page may be Array
*
* @param {document} doc
* @param {PAGE|PAGE[]} page
* @return {Boolean}
=======
* @param {document} doc
* @param {string|Array} page
* @return {boolean}
>>>>>>>
* page may be Array
*
* @param {document} doc
* @param {PAGE|PAGE[]} page
* @return {boolean} |
<<<<<<<
var MS_IN_DAY = 24 * 60 * 60 * 1000;
var DAYS_IN_SEASON = 112;
var AGE_TITLE = Foxtrick.L10n.getString('TransferComparePlayers.transferAge');
=======
var DAYS_IN_SEASON = Foxtrick.util.time.DAYS_IN_SEASON;
var MSECS_IN_DAY = Foxtrick.util.time.MSECS_IN_DAY;
>>>>>>>
var MSECS_IN_DAY = Foxtrick.util.time.MSECS_IN_DAY;
var DAYS_IN_SEASON = Foxtrick.util.time.DAYS_IN_SEASON;
var AGE_TITLE = Foxtrick.L10n.getString('TransferComparePlayers.transferAge');
<<<<<<<
var diffDays = (fetchDate.getTime() - refDate.getTime()) / MS_IN_DAY;
=======
var diffDays = (fetchDate.getTime() - refDate.getTime()) / MSECS_IN_DAY;
>>>>>>>
var diffDays = (fetchDate.getTime() - refDate.getTime()) / MSECS_IN_DAY;
<<<<<<<
=======
for (var i = 1; i < ct; i++) {
if (i < ct - 1) {
var next = Foxtrick.trimnum(hTable.rows[i].cells[3].textContent);
var last = Foxtrick.trimnum(hTable.rows[i + 1].cells[3].textContent);
var percentage = doc.createElement('span');
var dif;
>>>>>>> |
<<<<<<<
=======
var time = doc.getElementById('time');
>>>>>>>
<<<<<<<
localTime = Foxtrick.makeFeaturedElement(localTime, module);
=======
>>>>>>>
<<<<<<<
var toggleDisplay = function() {
Foxtrick.Prefs.setBool('module.LocalTime.local',
!Foxtrick.Prefs.getBool('module.LocalTime.local'));
=======
/** @type {Listener<HTMLElement, MouseEvent>} */
var toggleDisplay = function() {
let local = Foxtrick.Prefs.getBool('module.LocalTime.local');
Foxtrick.Prefs.setBool('module.LocalTime.local', !local);
>>>>>>>
/** @type {Listener<HTMLElement, MouseEvent>} */
var toggleDisplay = function() {
let local = Foxtrick.Prefs.getBool('module.LocalTime.local');
Foxtrick.Prefs.setBool('module.LocalTime.local', !local);
<<<<<<<
module.updatePage(doc);
=======
// eslint-disable-next-line no-invalid-this
module.updatePage(this.ownerDocument);
>>>>>>>
// eslint-disable-next-line no-invalid-this
module.updatePage(this.ownerDocument);
<<<<<<<
// updates all dates within the page
/** @param {document} doc */
=======
/**
* updates all dates within the page
* @param {document} doc
*/
>>>>>>>
/**
* updates all dates within the page
* @param {document} doc
*/
<<<<<<<
/** @type {NodeListOf<HTMLElement>} */
let els = mainBody.querySelectorAll('.date');
var dates = [...els];
=======
/** @type {NodeListOf<HTMLElement>} */
let col = mainBody.querySelectorAll('.date');
>>>>>>>
/** @type {NodeListOf<HTMLElement>} */
let col = mainBody.querySelectorAll('.date');
<<<<<<<
dates = Foxtrick.filter(function(n) {
return Foxtrick.util.time.hasTime(n.textContent);
}, dates);
var isLocalDate = n => n.dataset.localTime;
var localDates = Foxtrick.filter(isLocalDate, dates);
var userDates = Foxtrick.filter(n => !isLocalDate(n), dates);
=======
var dates = [...col].filter(n => Foxtrick.util.time.hasTime(n.textContent));
/**
* @param {HTMLElement} el
* @return {boolean}
*/
var isLocalDate = el => !!el.dataset.localTime;
let localDates = dates.filter(isLocalDate);
let userDates = dates.filter(n => !isLocalDate(n));
>>>>>>>
var dates = [...col].filter(n => Foxtrick.util.time.hasTime(n.textContent));
/**
* @param {HTMLElement} el
* @return {boolean}
*/
var isLocalDate = el => !!el.dataset.localTime;
let localDates = dates.filter(isLocalDate);
let userDates = dates.filter(n => !isLocalDate(n));
<<<<<<<
Foxtrick.forEach(function(date) {
=======
for (let date of userDates) {
>>>>>>>
for (let date of userDates) {
<<<<<<<
let localDate = Foxtrick.util.time.toLocal(doc, userDate);
=======
let localDate = Foxtrick.util.time.toLocal(doc, userDate);
let ddl = date.querySelector('.ft-deadline');
>>>>>>>
let localDate = Foxtrick.util.time.toLocal(doc, userDate);
let ddl = date.querySelector('.ft-deadline');
<<<<<<<
=======
if (ddl)
date.appendChild(ddl);
>>>>>>>
if (ddl)
date.appendChild(ddl);
<<<<<<<
date.dataset.userDate = userDate.getTime().toString();
}, userDates);
=======
date.dataset.userDate = userDate.getTime();
}
>>>>>>>
date.dataset.userDate = String(userDate.getTime());
}
<<<<<<<
Foxtrick.forEach(function(date) {
let timestamp = new Date();
let time = parseInt(date.dataset.userDate, 10) || timestamp.getTime();
timestamp.setTime(time);
=======
for (let date of localDates) {
let timestamp = new Date(Number(date.dataset.userDate));
let ddl = date.querySelector('.ft-deadline');
>>>>>>>
for (let date of localDates) {
let timestamp = new Date(Number(date.dataset.userDate));
let ddl = date.querySelector('.ft-deadline'); |
<<<<<<<
* @template {HTMLElement} E
* @param {E} node
* @param {any} module // TODO module type
* @return {E}
=======
* @template {HTMLElement} E
* @param {E} node
* @param {object} module
* @return {E}
>>>>>>>
* @template {HTMLElement} E
* @param {E} node
* @param {any} module // TODO module type
* @return {E}
<<<<<<<
* Because types /sigh
* @template {Element} E
* @param {E} el
* @param {boolean} [deep]
* @return {E}
*/
Foxtrick.cloneElement = function(el, deep) {
return /** @type {E} */ (el.cloneNode(deep));
};
/**
=======
* Because types /sigh
* @template {Element|DocumentFragment} E
* @param {E} el
* @param {boolean} [deep]
* @return {E}
*/
Foxtrick.cloneElement = function(el, deep) {
return /** @type {E} */ (el.cloneNode(deep));
};
/**
>>>>>>>
* Because types /sigh
* @template {Element|DocumentFragment} E
* @param {E} el
* @param {boolean} [deep]
* @return {E}
*/
Foxtrick.cloneElement = function(el, deep) {
return /** @type {E} */ (el.cloneNode(deep));
};
/**
<<<<<<<
if (!el.hasAttribute('tabindex'))
el.setAttribute('tabindex', '0');
if (!el.hasAttribute('role'))
el.setAttribute('role', 'button');
return Foxtrick.listen(el, 'click', listener, useCapture);
=======
Foxtrick.clickTarget(el);
return Foxtrick.listen(el, 'click', listener, useCapture);
};
/**
* Sets tabindex=0 and role=button if these attributes have no value.
*
* Uses wrappers for elements with important accessibility semantics.
*
* ! This does more harm than good on 'delegated' listeners
*
* @param {Element} el
*/
Foxtrick.clickTarget = function(el) {
/**
* @param {Element} e
* @return {Element}
*/
const wrapContents = (e) => {
let span = e.ownerDocument.createElement('span');
Foxtrick.append(span, [...e.childNodes]);
return e.appendChild(span);
};
/**
* @param {Element} e
* @return {Element}
*/
const wrapElement = (e) => {
let span = e.ownerDocument.createElement('span');
e.parentElement.replaceChild(span, e);
span.appendChild(e);
return span;
};
/* eslint-disable no-magic-numbers */
/** @type {Record<string, function(Element):void>} */
const ROLES_CBS = {
h1: wrapContents,
h2: wrapContents,
h3: wrapContents,
h4: wrapContents,
h5: wrapContents,
h6: wrapContents,
td: wrapContents,
th: wrapContents,
img: wrapElement,
input: null,
};
/* eslint-enable no-magic-numbers */
let target = null;
let tag = el.tagName.toLowerCase();
if (tag in ROLES_CBS) {
let role = ROLES_CBS[tag];
if (typeof role == 'function')
target = role(el);
}
else {
target = el;
}
if (!target)
return;
if (!target.hasAttribute('tabindex'))
target.setAttribute('tabindex', '0');
if (!target.hasAttribute('role'))
target.setAttribute('role', 'button');
>>>>>>>
Foxtrick.clickTarget(el);
return Foxtrick.listen(el, 'click', listener, useCapture);
};
/**
* Sets tabindex=0 and role=button if these attributes have no value.
*
* Uses wrappers for elements with important accessibility semantics.
*
* ! This does more harm than good on 'delegated' listeners
*
* @param {Element} el
*/
Foxtrick.clickTarget = function(el) {
/**
* @param {Element} e
* @return {Element}
*/
const wrapContents = (e) => {
let span = e.ownerDocument.createElement('span');
Foxtrick.append(span, [...e.childNodes]);
return e.appendChild(span);
};
/**
* @param {Element} e
* @return {Element}
*/
const wrapElement = (e) => {
let span = e.ownerDocument.createElement('span');
e.parentElement.replaceChild(span, e);
span.appendChild(e);
return span;
};
/* eslint-disable no-magic-numbers */
/** @type {Record<string, function(Element):void>} */
const ROLES_CBS = {
h1: wrapContents,
h2: wrapContents,
h3: wrapContents,
h4: wrapContents,
h5: wrapContents,
h6: wrapContents,
td: wrapContents,
th: wrapContents,
img: wrapElement,
input: null,
};
/* eslint-enable no-magic-numbers */
let target = null;
let tag = el.tagName.toLowerCase();
if (tag in ROLES_CBS) {
let role = ROLES_CBS[tag];
if (typeof role == 'function')
target = role(el);
}
else {
target = el;
}
if (!target)
return;
if (!target.hasAttribute('tabindex'))
target.setAttribute('tabindex', '0');
if (!target.hasAttribute('role'))
target.setAttribute('role', 'button');
<<<<<<<
* @template {keyof HTMLElementEventMap} E
*
* @param {T} el
* @param {E} type event type
* @param {Listener<T,HTMLEvent<E>>} listener
* @param {boolean} [useCapture]
* @return {function():void} remove wrapped listener
=======
* @template {keyof HTMLElementEventMap} E
*
* @param {T} el
* @param {E} evType event type
* @param {Listener<T,HTMLEvent<E>>} listener
* @param {boolean} [useCapture]
* @return {function():void} remove wrapped listener
>>>>>>>
* @template {keyof HTMLElementEventMap} E
*
* @param {T} el
* @param {E} evType event type
* @param {Listener<T,HTMLEvent<E>>} listener
* @param {boolean} [useCapture]
* @return {function():void} remove wrapped listener
<<<<<<<
=======
/** @type {boolean|Promise|void} */
let ret;
try {
ret = listener.call(this, ev);
}
catch (e) {
Foxtrick.log(e);
}
>>>>>>>
<<<<<<<
// @ts-ignore
el.addEventListener(type, listen, useCapture);
// @ts-ignore
return () => el.removeEventListener(type, listen, useCapture);
=======
/*
README: since TS 3.5 union type checking became 'smarter' and errors here
since addEventListener API is contravariant (dumb) here,
it will not accept a callback requiring a more specific Event
we know better however, since we actually type-check the evType argument
*/
let cb = /** @type {EventListener} */ (listen);
el.addEventListener(evType, cb, useCapture);
return () => el.removeEventListener(evType, cb, useCapture);
>>>>>>>
/*
README: since TS 3.5 union type checking became 'smarter' and errors here
since addEventListener API is contravariant (dumb) here,
it will not accept a callback requiring a more specific Event
we know better however, since we actually type-check the evType argument
*/
let cb = /** @type {EventListener} */ (listen);
el.addEventListener(evType, cb, useCapture);
return () => el.removeEventListener(evType, cb, useCapture);
<<<<<<<
* @param {number} specNum {Integer}
* @param {any} [features] image attributes // TODO constrain
=======
* @param {number} specNum {Integer}
* @param {object} [features] image attributes
>>>>>>>
* @param {number} specNum {Integer}
* @param {any} [features] image attributes // TODO constrain
<<<<<<<
}, features);
=======
};
Object.assign(opts, features);
>>>>>>>
}, features);
<<<<<<<
* @typedef {(this:T,ev:E)=>boolean|Promise<any>|void} Listener<T,E>
*/
/**
* @template {keyof HTMLElementEventMap} E
* @typedef {HTMLElementEventMap[E]} HTMLEvent<E>
=======
* @typedef {(this:T,ev:E)=>boolean|Promise|void} Listener<T,E>
*/
/**
* @template {keyof HTMLElementEventMap} E
* @typedef {HTMLElementEventMap[E]} HTMLEvent<E>
>>>>>>>
* @typedef {(this:T,ev:E)=>boolean|Promise<any>|void} Listener<T,E>
*/
/**
* @template {keyof HTMLElementEventMap} E
* @typedef {HTMLElementEventMap[E]} HTMLEvent<E> |
<<<<<<<
let pn = header.parentNode;
pn.replaceChild(div, header);
return true;
}, allDivs);
let allLinks = ownBoxBody.querySelectorAll('a');
let containers = Foxtrick.map(function(link) {
let linkContainer = doc.createElement('span');
Foxtrick.addClass(linkContainer, 'ft-link-span');
linkContainer.appendChild(link);
let key = link.dataset.key;
let moduleName = link.dataset.module;
if (key && moduleName) {
let delLink = doc.createElement('span');
delLink.className = 'ft_actionicon foxtrickRemove';
delLink.setAttribute('aria-label', delLink.title = l10nRemoveTitle);
Foxtrick.onClick(delLink, Foxtrick.util.links.delStdLink);
let img = doc.createElement('img');
delLink.appendChild(img);
linkContainer.appendChild(delLink);
=======
showLinks: function(doc, ownBoxBody, linkSet) {
try {
var ownBoxId = 'ft-links-box';
var box = doc.getElementById(ownBoxId);
if (!box)
return;
var div = box.firstChild;
Foxtrick.removeClass(div, 'ft-expander-unexpanded');
Foxtrick.addClass(div, 'ft-expander-expanded');
var foxtrickRemove = ownBoxBody.getElementsByClassName('foxtrickRemove');
for (var i = 0; i < foxtrickRemove.length; ++i) {
Foxtrick.toggleClass(foxtrickRemove[i], 'hidden');
>>>>>>>
let pn = header.parentNode;
pn.replaceChild(div, header);
return true;
}, allDivs);
let allLinks = ownBoxBody.querySelectorAll('a');
let containers = Foxtrick.map(function(link) {
let linkContainer = doc.createElement('span');
Foxtrick.addClass(linkContainer, 'ft-link-span');
linkContainer.appendChild(link);
let key = link.dataset.key;
let moduleName = link.dataset.module;
if (key && moduleName) {
let delLink = doc.createElement('span');
delLink.className = 'ft_actionicon foxtrickRemove';
delLink.setAttribute('aria-label', delLink.title = l10nRemoveTitle);
Foxtrick.onClick(delLink, Foxtrick.util.links.delStdLink);
let img = doc.createElement('img');
delLink.appendChild(img);
linkContainer.appendChild(delLink);
<<<<<<<
let adder = o.hasNewSidebar ? Foxtrick.Pages.Match : Foxtrick;
// eslint-disable-next-line no-magic-numbers
let wrapper = adder.addBoxToSidebar(doc, HEADER, box, -20);
wrapper.id = 'ft-links-box';
=======
var adder = o.hasNewSidebar ? Foxtrick.Pages.Match : Foxtrick;
var wrapper = adder.addBoxToSidebar(doc, HEADER, box, -20);
if (wrapper)
wrapper.id = 'ft-links-box';
>>>>>>>
let adder = o.hasNewSidebar ? Foxtrick.Pages.Match : Foxtrick;
// eslint-disable-next-line no-magic-numbers
let wrapper = adder.addBoxToSidebar(doc, HEADER, box, -20);
if (wrapper)
wrapper.id = 'ft-links-box'; |
<<<<<<<
let l = lang || Foxtrick.Prefs.getString('htLanguage');
let json = Foxtrick.L10n.htLanguagesJSON[l].language;
let array = json[query.category];
=======
if (!lang) {
Foxtrick.error('missing lang');
return null;
}
var json = Foxtrick.L10n.htLanguagesJSON[lang].language;
var array = json[query.category];
>>>>>>>
let l = lang || Foxtrick.Prefs.getString('htLanguage');
let json = Foxtrick.L10n.htLanguagesJSON[l].language;
let array = json[query.category];
<<<<<<<
let league = Foxtrick.XMLData.League[leagueId];
ret = league.Country.CountryName || league.EnglishName; // HTI
=======
var league = Foxtrick.XMLData.League[leagueId];
ret = league.LeagueName;
>>>>>>>
let league = Foxtrick.XMLData.League[leagueId];
ret = league.LeagueName;
<<<<<<<
let l10n = lang || Foxtrick.Prefs.getString('htLanguage');
let json = Foxtrick.L10n.htLanguagesJSON[l10n].language;
=======
if (!lang)
lang = Foxtrick.Prefs.getString('htLanguage');
if (!lang)
throw new Error('missing lang');
var json = Foxtrick.L10n.htLanguagesJSON[lang].language;
>>>>>>>
let l10n = lang || Foxtrick.Prefs.getString('htLanguage');
if (!l10n)
throw new Error('missing lang');
var json = Foxtrick.L10n.htLanguagesJSON[l10n].language; |
<<<<<<<
var animations = {
fadeIn: function(element){
element.addClass('visible animate-fade-in');
},
fadeOut: function(element){
element.removeClass('animate-fade-in')
.addClass('animate-fade-out');
setTimeout(function(){
element.removeClass('animate-fade-out visible');
}, 230);
}
};
=======
>>>>>>> |
<<<<<<<
=======
// DB
var db = require('./lib/db');
>>>>>>>
<<<<<<<
consumerKey = process.env.DBOX_KEY,
consumerSecret = process.env.DBOX_SECRET,
dropboxClients = {};
=======
OAuth = require('oauth').OAuth;
>>>>>>>
consumerKey = process.env.DBOX_KEY,
consumerSecret = process.env.DBOX_SECRET,
dropboxClients = {};
<<<<<<<
// We don't need the extended features right now.
app.use(require('body-parser').urlencoded({extended: false}));
app.use(require('cookie-parser')());
=======
app.use(express.bodyParser());
app.use(express.cookieParser());
// TODO: Use some other session store, ideally an encrypted cookie.
app.use(express.session({store: new express.session.MemoryStore(), secret: '3891jasl', cookie: {path: '/', httpOnly: true, maxAge: 2592000000}}));
>>>>>>>
// We don't need the extended features right now.
app.use(require('body-parser').urlencoded({extended: false}));
app.use(require('cookie-parser')());
app.use(require('cookie-session')({
secret: process.env.SESSION_SECRET || 'secret',
maxAge: 2592000000,
path: '/'
}));
<<<<<<<
// Routes
app.post('/save', function(req, res) {
var code = req.body.code,
id = req.body.id || Math.random().toString(36).substring(2, 8),
version = req.body.version || 'stable',
tempSrc = __dirname + '/src/' + id + '.ly';
db.scores.save({id: id, code: code, version: version}, function(err, revision) {
res.send({id: id, revision: revision});
});
//db.log({action: 'save', ip: ipAddr(req), id: id, version: version});
=======
app.get('/dropbox_metadata', function(req, res) {
var dropbox = dropboxClients[req.session.uid] || (dropboxClients[req.session.uid] = new DropboxClient({
consumerKey: consumerKey,
consumerSecret: consumerSecret,
accessToken: req.session.accessToken,
accessTokenSecret: req.session.accessTokenSecret,
sandbox: true
}));
dropbox.getMetadata(req.query.path || '/', {}, function(err, response) {
res.send(response);
});
});
app.get('/dropbox_file', function(req, res) {
var dropbox = dropboxClients[req.session.uid] || (dropboxClients[req.session.uid] = new DropboxClient({
consumerKey: consumerKey,
consumerSecret: consumerSecret,
accessToken: req.session.accessToken,
accessTokenSecret: req.session.accessTokenSecret,
sandbox: true
}));
dropbox.getFile(req.query.path, {}, function(err, body, response) {
res.send(body, response.statusCode);
});
});
app.post('/dropbox_save', function(req, res) {
var dropbox = dropboxClients[req.session.uid] || (dropboxClients[req.session.uid] = new DropboxClient({
consumerKey: consumerKey,
consumerSecret: consumerSecret,
accessToken: req.session.accessToken,
accessTokenSecret: req.session.accessTokenSecret,
sandbox: true
}));
dropbox.putFile(req.body.path, req.body.contents, 'text/lilypond', function(err, response) {
res.send(response, response.statusCode);
});
});
// Routes
app.get('/js/*', function(req, res, next) {
next();
});
app.get('/css/*', function(req, res, next) {
next();
});
app.get('/favicon.ico', function(req, res, next) {
next();
});
app.post('/save', function(req, res) {
var code = req.body.code,
id = req.body.id || Math.random().toString(36).substring(2, 8),
revision = req.body.revision || 1,
version = req.body.version || 'stable',
tempSrc = __dirname + '/src/' + id + '.ly';
db.scores.save(id+':'+revision, code, version, function(err) {
if (err) {
return res.send(err, 500);
}
res.send({id: id, revision: revision});
>>>>>>>
app.get('/dropbox_metadata', function(req, res) {
var dropbox = dropboxClients[req.session.uid] || (dropboxClients[req.session.uid] = new DropboxClient({
consumerKey: consumerKey,
consumerSecret: consumerSecret,
accessToken: req.session.accessToken,
accessTokenSecret: req.session.accessTokenSecret,
sandbox: true
}));
dropbox.getMetadata(req.query.path || '/', {}, function(err, response) {
res.send(response);
});
});
app.get('/dropbox_file', function(req, res) {
var dropbox = dropboxClients[req.session.uid] || (dropboxClients[req.session.uid] = new DropboxClient({
consumerKey: consumerKey,
consumerSecret: consumerSecret,
accessToken: req.session.accessToken,
accessTokenSecret: req.session.accessTokenSecret,
sandbox: true
}));
dropbox.getFile(req.query.path, {}, function(err, body, response) {
res.send(body, response.statusCode);
});
});
app.post('/dropbox_save', function(req, res) {
var dropbox = dropboxClients[req.session.uid] || (dropboxClients[req.session.uid] = new DropboxClient({
consumerKey: consumerKey,
consumerSecret: consumerSecret,
accessToken: req.session.accessToken,
accessTokenSecret: req.session.accessTokenSecret,
sandbox: true
}));
dropbox.putFile(req.body.path, req.body.contents, 'text/lilypond', function(err, response) {
res.send(response, response.statusCode);
});
});
app.post('/save', function(req, res) {
var code = req.body.code,
id = req.body.id || Math.random().toString(36).substring(2, 8),
revision = req.body.revision || 1,
version = req.body.version || 'stable',
tempSrc = __dirname + '/src/' + id + '.ly';
db.scores.save(id+':'+revision, code, version, function(err) {
if (err) {
return res.send(err, 500);
}
res.send({id: id, revision: revision}); |
<<<<<<<
await click('[data-test-toggle-left-edge]');
await animationsSettled();
assert.equal(currentURL(), `/cards/${cardPath}`);
=======
assert.dom('[data-test-library-button]').isDisabled();
assert.dom('[data-test-catalog-button]').isDisabled();
>>>>>>>
await click('[data-test-toggle-left-edge]');
await animationsSettled();
assert.equal(currentURL(), `/cards/${cardPath}`);
assert.dom('[data-test-library-button]').isDisabled();
assert.dom('[data-test-catalog-button]').isDisabled();
<<<<<<<
await visit(`/`);
=======
await visit(`/cards`);
assert.equal(currentURL(), `/cards`);
await waitFor('[data-test-toggle-left-edge]');
>>>>>>>
await visit(`/cards`); |
<<<<<<<
=======
import { inject as service } from '@ember/service';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';
>>>>>>>
<<<<<<<
=======
@service router;
@service cardstackSession;
@tracked isSelected = false;
@tracked contextMenuOpen = false;
>>>>>>>
@tracked isSelected = false;
@tracked contextMenuOpen = false;
<<<<<<<
@(task(function*() {
this.isolatedCss = yield this.args.card.loadFeature('isolated-css');
}).drop())
loadCss;
=======
get cardJson() {
if (!this.args.card) {
return null;
}
return JSON.stringify(this.args.card.json, null, 2);
}
@action
setSelected(bool) {
this.isSelected = bool;
if (!bool) {
// When the card header is closed, we need to set the context menu to closed as well.
// Otherwise, when you hover over the card again, you will see the context menu
// without clicking on the ... button
this.contextMenuOpen = false;
}
}
@action
setContextMenu(bool) {
this.contextMenuOpen = bool;
}
>>>>>>>
@(task(function*() {
this.isolatedCss = yield this.args.card.loadFeature('isolated-css');
}).drop())
loadCss;
@action
setSelected(bool) {
this.isSelected = bool;
if (!bool) {
// When the card header is closed, we need to set the context menu to closed as well.
// Otherwise, when you hover over the card again, you will see the context menu
// without clicking on the ... button
this.contextMenuOpen = false;
}
}
@action
setContextMenu(bool) {
this.contextMenuOpen = bool;
} |
<<<<<<<
=======
this.model.set('isNew', false);
this.model.set('hasDirtyFields', true);
>>>>>>>
<<<<<<<
test('"draft" status is displayed for new model', async function (assert) {
this.set('model', this.store.createRecord('location', { city: 'Portland' }));
await render(hbs`{{cs-version-control model=model enabled=true}}`);
assert.dom('[data-test-cs-version-control-dropdown-option-status]').hasText('draft');
});
test('"published" status is displayed for clean model', async function (assert) {
this.model.set('hasDirtyFields', false);
await render(hbs`{{cs-version-control model=model enabled=true}}`);
assert.dom('[data-test-cs-version-control-dropdown-option-status]').hasText('published');
});
test('"edited" status is displayed for dirty model', async function (assert) {
this.model.set('hasDirtyFields', true);
await render(hbs`{{cs-version-control model=model enabled=true}}`);
assert.dom('[data-test-cs-version-control-dropdown-option-status]').hasText('edited');
});
=======
>>>>>>> |
<<<<<<<
import { modelType } from '@cardstack/rendering/helpers/cs-model-type';
import { assign } from "@ember/polyfills";
=======
import moment from 'moment';
>>>>>>>
import { modelType } from '@cardstack/rendering/helpers/cs-model-type';
import { assign } from "@ember/polyfills";
import moment from 'moment'; |
<<<<<<<
async teardown() {
for (let source of this.dataSources.values()) {
await source.teardown();
}
}
// derives a new schema by adding, updating, or removing one model.
applyChange(type, id, model) {
if (!this.schemaLoader.ownTypes().includes(type)) {
// not a schema model, so we are unchanged.
return this;
=======
// derives a new schema by adding, updating, or removing
// models. Takes a list of { type, id, document } objects. A null document
// means deletion.
applyChanges(changes) {
let models = this._originalModels;
for (let change of changes) {
let { type, id, document } = change;
if (!this.schemaLoader.ownTypes().includes(type)) {
// not a schema model, so we can ignore it
continue;
}
models = models.filter(m => m.type !== type || m.id !== id);
if (document) {
models.push(document);
}
>>>>>>>
async teardown() {
for (let source of this.dataSources.values()) {
await source.teardown();
}
}
// derives a new schema by adding, updating, or removing
// models. Takes a list of { type, id, document } objects. A null document
// means deletion.
applyChanges(changes) {
let models = this._originalModels;
for (let change of changes) {
let { type, id, document } = change;
if (!this.schemaLoader.ownTypes().includes(type)) {
// not a schema model, so we can ignore it
continue;
}
models = models.filter(m => m.type !== type || m.id !== id);
if (document) {
models.push(document);
} |
<<<<<<<
chats: './modules/chats.js',
chatrooms: './modules/chatrooms.js',
states: './modules/states.js',
node: './modules/node.js',
=======
chats: './modules/chats.js',
states: './modules/states.js',
>>>>>>>
chats: './modules/chats.js',
chatrooms: './modules/chatrooms.js',
states: './modules/states.js',
node: './modules/node.js',
chats: './modules/chats.js',
states: './modules/states.js',
<<<<<<<
accounts: { http: './api/http/accounts.js' },
blocks: { http: './api/http/blocks.js' },
dapps: { http: './api/http/dapps.js' },
chats: { http: './api/http/chats.js' },
chatrooms: { http: './api/http/chatrooms.js' },
states: { http: './api/http/states.js' },
node: { http: './api/http/node.js' },
delegates: { http: './api/http/delegates.js' },
loader: { http: './api/http/loader.js' },
multisignatures: { http: './api/http/multisignatures.js' },
peers: { http: './api/http/peers.js' },
server: { http: './api/http/server.js' },
signatures: { http: './api/http/signatures.js' },
transactions: { http: './api/http/transactions.js' },
transport: { http: './api/http/transport.js' }
=======
accounts: {
http: './api/http/accounts.js'
},
blocks: {
http: './api/http/blocks.js'
},
dapps: {
http: './api/http/dapps.js'
},
chats: {
http: './api/http/chats.js'
},
states: {
http: './api/http/states.js'
},
delegates: {
http: './api/http/delegates.js'
},
loader: {
http: './api/http/loader.js'
},
multisignatures: {
http: './api/http/multisignatures.js'
},
peers: {
http: './api/http/peers.js'
},
server: {
http: './api/http/server.js'
},
signatures: {
http: './api/http/signatures.js'
},
transactions: {
http: './api/http/transactions.js'
},
transport: {
http: './api/http/transport.js'
}
>>>>>>>
accounts: { http: './api/http/accounts.js' },
blocks: { http: './api/http/blocks.js' },
dapps: { http: './api/http/dapps.js' },
chats: { http: './api/http/chats.js' },
chatrooms: { http: './api/http/chatrooms.js' },
states: { http: './api/http/states.js' },
node: { http: './api/http/node.js' },
delegates: { http: './api/http/delegates.js' },
loader: { http: './api/http/loader.js' },
multisignatures: { http: './api/http/multisignatures.js' },
peers: { http: './api/http/peers.js' },
server: { http: './api/http/server.js' },
signatures: { http: './api/http/signatures.js' },
transactions: { http: './api/http/transactions.js' },
transport: { http: './api/http/transport.js' }
<<<<<<<
packageJson: function (cb) {
cb(null, packageJson);
},
=======
packageJson: function (cb) {
cb(null, packageJson);
},
>>>>>>>
packageJson: function (cb) {
cb(null, packageJson);
}, |
<<<<<<<
var eventName = 'on' + changeCase.pascalCase(topic);
=======
// executes the each module onBind function
>>>>>>>
var eventName = 'on' + changeCase.pascalCase(topic);
// executes the each module onBind function |
<<<<<<<
// FIXME: We should check for errors here?
// Perform backward tick on rounds
// WARNING: DB_WRITE
modules.rounds.backwardTick(oldLastBlock, previousBlock, function () {
// Delete last block from blockchain
// WARNING: Db_WRITE
=======
if (err) {
// Fatal error, memory tables will be inconsistent
library.logger.error('Failed to undo transactions', err);
return process.exit(0);
}
modules.rounds.backwardTick(oldLastBlock, previousBlock, function (err) {
if (err) {
// Fatal error, memory tables will be inconsistent
library.logger.error('Failed to perform backwards tick', err);
return process.exit(0);
}
>>>>>>>
if (err) {
// Fatal error, memory tables will be inconsistent
library.logger.error('Failed to undo transactions', err);
return process.exit(0);
}
// Perform backward tick on rounds
// WARNING: DB_WRITE
modules.rounds.backwardTick(oldLastBlock, previousBlock, function (err) {
if (err) {
// Fatal error, memory tables will be inconsistent
library.logger.error('Failed to perform backwards tick', err);
return process.exit(0);
}
// Delete last block from blockchain
// WARNING: Db_WRITE
<<<<<<<
// When client is not loaded, is syncing or round is ticking
// Do not receive new blocks as client is not ready
if (!__private.loaded || modules.loader.syncing() || modules.rounds.ticking()) {
library.logger.debug('Client not ready to receive block', block.id);
return;
}
// Execute in sequence via sequence
=======
>>>>>>>
// Execute in sequence via sequence
<<<<<<<
// Initial check if new block looks fine
=======
// When client is not loaded, is syncing or round is ticking
// Do not receive new blocks as client is not ready
if (!__private.loaded || modules.loader.syncing() || modules.rounds.ticking()) {
library.logger.debug('Client not ready to receive block', block.id);
return setImmediate(cb);
}
>>>>>>>
// When client is not loaded, is syncing or round is ticking
// Do not receive new blocks as client is not ready
if (!__private.loaded || modules.loader.syncing() || modules.rounds.ticking()) {
library.logger.debug('Client not ready to receive block', block.id);
return setImmediate(cb);
} |
<<<<<<<
function allScopes(scope) {
const result = [];
while (scope) {
result.push(scope);
scope = scope.parent;
}
return result;
}
const hoistCallArgumentsVisitor = {
Function(path) {
path.skip();
const bodyPath = path.get("body");
if (bodyPath.node.body.length === 0) {
path.replaceWith(helperReference(this, path, "_empty"));
return;
}
const scopes = [];
const pathScopes = allScopes(path.scope.parent);
bodyPath.traverse({
Identifier(identifierPath) {
if (identifierSearchesScope(identifierPath)) {
const binding = identifierPath.scope.getBinding(identifierPath.node.name);
if (binding && binding.scope && pathScopes.includes(binding.scope)) {
scopes.push(binding.scope);
}
}
}
});
let scope = path.scope.getProgramParent()
let ancestry = [scope];
for (let otherScope of scopes) {
if (!ancestry.includes(otherScope)) {
scope = otherScope;
ancestry = ancestry.concat(allScopes(otherScope));
}
}
if (!ancestry.includes(path.scope.parent)) {
const identifier = path.scope.generateUidIdentifierBasedOnNode(path.node, "temp");
scope.push({ id: identifier, init: path.node });
path.replaceWith(identifier);
}
}
};
function hoistCallArguments(state, path) {
if (path.isCallExpression() && path.node.callee._helperName) {
path.traverse(hoistCallArgumentsVisitor, state);
}
}
function relocateTail(state, awaitExpression, statementNode, target, temporary, exitIdentifier, exitCheck, directExpression) {
=======
function relocateTail(state, awaitExpression, statementNode, target, additionalConstantNames, temporary, exitCheck, directExpression) {
>>>>>>>
function allScopes(scope) {
const result = [];
while (scope) {
result.push(scope);
scope = scope.parent;
}
return result;
}
const hoistCallArgumentsVisitor = {
Function(path) {
path.skip();
const bodyPath = path.get("body");
if (bodyPath.node.body.length === 0) {
path.replaceWith(helperReference(this.state, path, "_empty"));
return;
}
const scopes = [];
const pathScopes = allScopes(path.scope.parent);
bodyPath.traverse({
Identifier(identifierPath) {
if (identifierSearchesScope(identifierPath)) {
if (this.additionalConstantNames.indexOf(identifierPath.node.name) !== -1) {
scopes.push(path.scope.parent);
} else {
const binding = identifierPath.scope.getBinding(identifierPath.node.name);
if (binding && binding.scope && pathScopes.includes(binding.scope)) {
scopes.push(binding.scope);
}
}
}
}
}, this);
let scope = path.scope.getProgramParent()
let ancestry = [scope];
for (let otherScope of scopes) {
if (!ancestry.includes(otherScope)) {
scope = otherScope;
ancestry = ancestry.concat(allScopes(otherScope));
}
}
if (!ancestry.includes(path.scope.parent)) {
const identifier = path.scope.generateUidIdentifierBasedOnNode(path.node, "temp");
scope.push({ id: identifier, init: path.node });
path.replaceWith(identifier);
}
}
};
function hoistCallArguments(state, path, additionalConstantNames) {
if (path.isCallExpression() && path.node.callee._helperName) {
path.traverse(hoistCallArgumentsVisitor, { state, additionalConstantNames });
}
}
function relocateTail(state, awaitExpression, statementNode, target, additionalConstantNames, temporary, exitCheck, directExpression) {
<<<<<<<
const relocatedBlocks = [];
const awaitBlocks = [];
const originalAwaitPath = awaitPath;
=======
>>>>>>>
<<<<<<<
let defaultIndex;
testPaths.forEach((testPath, i) => {
if (testPath.node) {
testPath.replaceWith(rewriteFunctionNode(pluginState, parent, functionize(testPath.node), state.exitIdentifier, true));
} else {
defaultIndex = i;
}
});
const cases = parent.get("cases").map(casePath => ({
test: casePath.node.test,
consequent: casePath.node.consequent,
caseExits: pathsReturnOrThrow(casePath),
caseBreaks: pathsBreak(casePath),
breakIdentifiers: replaceReturnsAndBreaks(casePath, state.exitIdentifier),
}));
relocatedBlocks.push({
relocate() {
let resultIdentifier;
if (!explicitExits.all && explicitExits.any) {
resultIdentifier = path.scope.generateUidIdentifier("result");
}
const caseNodes = types.arrayExpression(cases.map(caseItem => {
const args = [];
if (caseItem.test) {
args.push(caseItem.test);
} else if (caseItem.consequent.length) {
args.push(voidExpression());
}
if (caseItem.consequent.length) {
const useBreakIdentifier = !caseItem.caseBreaks.all && caseItem.caseBreaks.any;
args.push(types.functionExpression(null, [], blockStatement(removeUnnecessaryReturnStatements(caseItem.consequent))));
if (!caseItem.caseExits.any && !caseItem.caseBreaks.any) {
args.push(helperReference(pluginState, parent, "_empty"));
} else if (!(caseItem.caseExits.all || caseItem.caseBreaks.all)) {
const breakCheck = buildBreakExitCheck(caseItem.caseExits.any ? state.exitIdentifier : null, caseItem.breakIdentifiers);
if (breakCheck) {
args.push(types.functionExpression(null, [], types.blockStatement([returnStatement(breakCheck)])));
}
}
}
return types.arrayExpression(args);
}));
const switchCall = types.callExpression(helperReference(pluginState, parent, "_switch"), [discriminant.node, caseNodes]);
relocateTail(pluginState, switchCall, null, label ? parent.parentPath : parent, resultIdentifier, state.exitIdentifier, !explicitExits.all && explicitExits.any ? state.exitIdentifier : undefined);
},
path: parent,
});
=======
const init = parent.get("init");
if (init.node) {
parent.insertBefore(init.node);
}
const forIdentifier = path.scope.generateUidIdentifier("for");
const bodyFunction = rewriteAsyncNode(pluginState, parent, types.functionExpression(null, [], blockStatement(parent.node.body)), additionalConstantNames, exitIdentifier);
const testFunction = unwrapReturnCallWithEmptyArguments(testExpression || voidExpression(), path.scope, additionalConstantNames);
const updateFunction = unwrapReturnCallWithEmptyArguments(updateExpression || voidExpression(), path.scope, additionalConstantNames);
const loopCall = isDoWhile ? types.callExpression(helperReference(pluginState, parent, "_do"), [bodyFunction, testFunction]) : types.callExpression(helperReference(pluginState, parent, "_for"), [testFunction, updateFunction, bodyFunction]);
let resultIdentifier = null;
if (explicitExits.any) {
resultIdentifier = path.scope.generateUidIdentifier("result");
additionalConstantNames.push(resultIdentifier.name);
}
relocateTail(pluginState, loopCall, null, parent, additionalConstantNames, resultIdentifier, exitIdentifier);
>>>>>>>
const init = parent.get("init");
if (init.node) {
parent.insertBefore(init.node);
}
const forIdentifier = path.scope.generateUidIdentifier("for");
const bodyFunction = rewriteAsyncNode(pluginState, parent, types.functionExpression(null, [], blockStatement(parent.node.body)), additionalConstantNames, exitIdentifier);
const testFunction = unwrapReturnCallWithEmptyArguments(testExpression || voidExpression(), path.scope, additionalConstantNames);
const updateFunction = unwrapReturnCallWithEmptyArguments(updateExpression || voidExpression(), path.scope, additionalConstantNames);
const loopCall = isDoWhile ? types.callExpression(helperReference(pluginState, parent, "_do"), [bodyFunction, testFunction]) : types.callExpression(helperReference(pluginState, parent, "_for"), [testFunction, updateFunction, bodyFunction]);
let resultIdentifier = null;
if (explicitExits.any) {
resultIdentifier = path.scope.generateUidIdentifier("result");
additionalConstantNames.push(resultIdentifier.name);
}
relocateTail(pluginState, loopCall, null, parent, additionalConstantNames, resultIdentifier, exitIdentifier);
<<<<<<<
awaitPath = parent;
} while (awaitPath !== path);
for (const block of awaitBlocks.reverse().concat(relocatedBlocks.reverse())) {
block.relocate();
=======
>>>>>>> |
<<<<<<<
bounceDelay = opt.smoothScroll ? opt.scrollDuration : 0;
setTimeout(function() {
utils.addClass(el, bounceDirection);
}, bounceDelay);
// Then remove it
setTimeout(function() {
utils.removeClass(el, bounceDirection);
}, bounceDelay + 2000); // bounce lasts 2 seconds
=======
/*
if (bounce) {
bounceDelay = opt.smoothScroll ? opt.scrollDuration : 0;
setTimeout(function() {
utils.addClass(el, bounceDirection);
}, bounceDelay);
// Then remove it
setTimeout(function() {
utils.removeClass(el, bounceDirection);
}, bounceDelay + flipDuration); // bounce lasts 2 seconds
}
*/
>>>>>>>
<<<<<<<
utils.invokeCallbacks('start', [currTour.id, currStepNum]);
=======
if (currStepNum === 0 && !currSubstepNum) {
utils.invokeCallbacks('start', [currTour.id]);
}
this.showStep(currStepNum, currSubstepNum);
bubble = getBubble();
>>>>>>>
utils.invokeCallbacks('start', [currTour.id, currStepNum]);
this.showStep(currStepNum, currSubstepNum);
bubble = getBubble();
<<<<<<<
delay = utils.valOrDefault(step.delay, 0),
=======
self = this,
>>>>>>>
delay = utils.valOrDefault(step.delay, 0),
self = this,
<<<<<<<
setTimeout(function() {
bubble.renderStep(step, stepIdx, substepIdx, isLast, adjustWindowScroll);
bubble.show();
}, delay);
=======
bubble.renderStep(step, stepIdx, substepIdx, isLast, function() {
// when done adjusting window scroll, call bubble.show()
adjustWindowScroll(function() {
bubble.show.call(bubble);
});
});
>>>>>>>
setTimeout(function() {
bubble.renderStep(step, stepIdx, substepIdx, isLast, function() {
// when done adjusting window scroll, call bubble.show()
adjustWindowScroll(function() {
bubble.show.call(bubble);
});
});
}, delay);
<<<<<<<
this.nextStep = function(btnClick) {
var step = getCurrStep(),
origStepNum = currStepNum,
foundTarget = false;
=======
this.nextStep = function() {
var step = getCurrStep(),
foundTarget = false,
bubble = getBubble();
>>>>>>>
this.nextStep = function(btnClick) {
var step = getCurrStep(),
origStepNum = currStepNum,
foundTarget = false,
bubble = getBubble();
<<<<<<<
if (btnClick) {
// invoke callbacks -- only if it resulted from a button click
if (step.onNext) {
step.onNext();
}
utils.invokeCallbacks('next', [currTour.id, origStepNum]);
}
=======
bubble.hide(false);
>>>>>>>
if (btnClick) {
// invoke callbacks -- only if it resulted from a button click
if (step.onNext) {
step.onNext();
}
utils.invokeCallbacks('next', [currTour.id, origStepNum]);
}
bubble.hide(false); |
<<<<<<<
/// - `product.introPrice` - Localized introductory price, with currency symbol
this.introPrice = options.introPrice || null;
/// - `product.introPriceMicros` - Introductory price in micro-units (divide by 1000000 to get numeric price)
this.introPriceMicros = options.introPriceMicros || null;
/// - `product.introPriceNumberOfPeriods` - number of periods the introductory price is available
this.introPriceNumberOfPeriods = options.introPriceNumberOfPeriods || null;
/// - `product.introPriceSubscriptionPeriod` - Period for the introductory price ("Day", "Week", "Month" or "Year")
this.introPriceSubscriptionPeriod = options.introPriceSubscriptionPeriod || null;
/// - `product.introPricePaymentMode` - Payment mode for the introductory price ("PayAsYouGo", "UpFront", or "FreeTrial")
this.introPricePaymentMode = options.introPricePaymentMode || null;
/// - `product.ineligibleForIntroPrice` - True when a trial or introductory price has been applied to a subscription. Only available after [receipt validation](#validator). Available only on iOS
this.ineligibleForIntroPrice = options.ineligibleForIntroPrice || null;
=======
>>>>>>> |
<<<<<<<
document.removeEventListener( 'mouseup', this.reset );
=======
this.lastCursorPos = this._getCursorPos( event, this.area );
>>>>>>>
this.lastCursorPos = this._getCursorPos( event, this.area );
document.removeEventListener( 'mouseup', this.reset ); |
<<<<<<<
inputFields: Thunk<GraphQLInputFieldConfigMap>,
outputFields: Thunk<GraphQLFieldConfigMap<*, *>>,
=======
description?: string,
inputFields: InputObjectConfigFieldMap,
outputFields: GraphQLFieldConfigMap,
>>>>>>>
description?: string,
inputFields: Thunk<GraphQLInputFieldConfigMap>,
outputFields: Thunk<GraphQLFieldConfigMap<*, *>>,
<<<<<<<
): GraphQLFieldConfig<*, *> {
const { name, inputFields, outputFields, mutateAndGetPayload } = config;
const augmentedInputFields = () => ({
=======
): GraphQLFieldConfig {
var { name, inputFields, outputFields, mutateAndGetPayload } = config;
var description = config.description ? config.description : undefined;
var augmentedInputFields = () => ({
>>>>>>>
): GraphQLFieldConfig<*, *> {
const {
name,
description,
inputFields,
outputFields,
mutateAndGetPayload
} = config;
const augmentedInputFields = () => ({ |
<<<<<<<
"pagedown",
"pagedown-extra"
], function($, registry, inject, pagedown) {
=======
"pagedown_converter",
"pagedown_extra",
"pagedown_sanitizer"
], function($, logger, registry, utils, inject) {
var log = logger.getLogger("pat.markdown");
>>>>>>>
"pagedown",
"pagedown-extra"
], function($, logger, registry, utils, inject) {
var log = logger.getLogger("pat.markdown"); |
<<<<<<<
'../lib/dist/fullcalendar/fullcalendar'
], function($, logging, utils, registry) {
=======
'../3rdparty/fullcalendar/fullcalendar'
], function($, logging, utils, mapal, patterns) {
>>>>>>>
'../3rdparty/fullcalendar/fullcalendar'
], function($, logging, utils, registry) {
<<<<<<<
$calroot.on('patterns-injected.pat-fullcalendar', function(ev) {
initMonths($(ev.target));
=======
$calroot.on('inject.pat-fullcalendar', function(ev, opts) {
initMonths($(ev.target));
});
$calroot.on('injection.pat-fullcalendar', function(event, month) {
initMonths($(month));
>>>>>>>
$calroot.on('patterns-injected.pat-fullcalendar', function(ev) {
initMonths($(ev.target)); |
<<<<<<<
/*! exports provided: default, en, de, fr, sv, available */
=======
/*! exports provided: default, en, de, fr, sv, nl, available */
>>>>>>>
/*! exports provided: default, en, de, fr, sv, nl, available */
<<<<<<<
/* harmony import */ var _fr_yaml__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fr.yaml */ "./src/js/locale/fr.yaml");
var _fr_yaml__WEBPACK_IMPORTED_MODULE_3___namespace = /*#__PURE__*/__webpack_require__.t(/*! ./fr.yaml */ "./src/js/locale/fr.yaml", 1);
/* harmony import */ var _sv_yaml__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./sv.yaml */ "./src/js/locale/sv.yaml");
var _sv_yaml__WEBPACK_IMPORTED_MODULE_4___namespace = /*#__PURE__*/__webpack_require__.t(/*! ./sv.yaml */ "./src/js/locale/sv.yaml", 1);
=======
/* harmony import */ var _fr_yaml__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fr.yaml */ "./src/js/locale/fr.yaml");
var _fr_yaml__WEBPACK_IMPORTED_MODULE_3___namespace = /*#__PURE__*/__webpack_require__.t(/*! ./fr.yaml */ "./src/js/locale/fr.yaml", 1);
/* harmony import */ var _sv_yaml__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./sv.yaml */ "./src/js/locale/sv.yaml");
var _sv_yaml__WEBPACK_IMPORTED_MODULE_4___namespace = /*#__PURE__*/__webpack_require__.t(/*! ./sv.yaml */ "./src/js/locale/sv.yaml", 1);
/* harmony import */ var _nl_yaml__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./nl.yaml */ "./src/js/locale/nl.yaml");
var _nl_yaml__WEBPACK_IMPORTED_MODULE_5___namespace = /*#__PURE__*/__webpack_require__.t(/*! ./nl.yaml */ "./src/js/locale/nl.yaml", 1);
>>>>>>>
/* harmony import */ var _fr_yaml__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fr.yaml */ "./src/js/locale/fr.yaml");
var _fr_yaml__WEBPACK_IMPORTED_MODULE_3___namespace = /*#__PURE__*/__webpack_require__.t(/*! ./fr.yaml */ "./src/js/locale/fr.yaml", 1);
/* harmony import */ var _sv_yaml__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./sv.yaml */ "./src/js/locale/sv.yaml");
var _sv_yaml__WEBPACK_IMPORTED_MODULE_4___namespace = /*#__PURE__*/__webpack_require__.t(/*! ./sv.yaml */ "./src/js/locale/sv.yaml", 1);
/* harmony import */ var _nl_yaml__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./nl.yaml */ "./src/js/locale/nl.yaml");
var _nl_yaml__WEBPACK_IMPORTED_MODULE_5___namespace = /*#__PURE__*/__webpack_require__.t(/*! ./nl.yaml */ "./src/js/locale/nl.yaml", 1);
<<<<<<<
Object(lodash__WEBPACK_IMPORTED_MODULE_0__["merge"])(sv, _en_yaml__WEBPACK_IMPORTED_MODULE_1__, _sv_yaml__WEBPACK_IMPORTED_MODULE_4__);
=======
Object(lodash__WEBPACK_IMPORTED_MODULE_0__["merge"])(sv, _en_yaml__WEBPACK_IMPORTED_MODULE_1__, _sv_yaml__WEBPACK_IMPORTED_MODULE_4__);
var nl = {};
Object(lodash__WEBPACK_IMPORTED_MODULE_0__["merge"])(nl, _en_yaml__WEBPACK_IMPORTED_MODULE_1__, _nl_yaml__WEBPACK_IMPORTED_MODULE_5__);
>>>>>>>
Object(lodash__WEBPACK_IMPORTED_MODULE_0__["merge"])(sv, _en_yaml__WEBPACK_IMPORTED_MODULE_1__, _sv_yaml__WEBPACK_IMPORTED_MODULE_4__);
var nl = {};
Object(lodash__WEBPACK_IMPORTED_MODULE_0__["merge"])(nl, _en_yaml__WEBPACK_IMPORTED_MODULE_1__, _nl_yaml__WEBPACK_IMPORTED_MODULE_5__);
<<<<<<<
key: 'fr',
name: fr.name
}, {
key: 'sv',
name: sv.name
=======
key: 'fr',
name: fr.name
}, {
key: 'nl',
name: nl.name
>>>>>>>
key: 'fr',
name: fr.name
}, {
key: 'nl',
name: nl.name
<<<<<<<
/*! exports provided: getBroadcasts, startSearch, handleException, debugResponse, set, clearCurrentTrack, cachebustHttpStream, loadItem, loadTrack, loadAlbum, loadArtist, loadPlaylist, loadUser, loadUserPlaylists, trackLoaded, tracksLoaded, artistLoaded, artistsLoaded, albumLoaded, albumsLoaded, playlistLoaded, playlistsLoaded, userLoaded, usersLoaded, userPlaylistsLoaded, loadedMore, removeFromIndex, streamTitleLoaded, streamTitleChanged, viewDataLoaded, reorderPlaylistTracks, savePlaylist, createPlaylist, deletePlaylist, removeTracksFromPlaylist, addTracksToPlaylist, getLibraryPlaylists, getLibraryAlbums, getLibraryArtists */
=======
/*! exports provided: getBroadcasts, startSearch, handleException, debugResponse, set, clearCurrentTrack, cachebustHttpStream, loadItems, loadItem, loadTrack, loadAlbum, loadArtist, loadPlaylist, loadUser, loadUserPlaylists, trackLoaded, tracksLoaded, artistLoaded, artistsLoaded, albumLoaded, albumsLoaded, playlistLoaded, playlistsLoaded, userLoaded, usersLoaded, userPlaylistsLoaded, loadedMore, removeFromIndex, viewDataLoaded, reorderPlaylistTracks, savePlaylist, createPlaylist, deletePlaylist, removeTracksFromPlaylist, addTracksToPlaylist, getLibraryPlaylists, getLibraryAlbums, getLibraryArtists, addPinned, removePinned, updatePinned, updatePinnedUri */
>>>>>>>
/*! exports provided: getBroadcasts, startSearch, handleException, debugResponse, set, clearCurrentTrack, cachebustHttpStream, loadItems, loadItem, loadTrack, loadAlbum, loadArtist, loadPlaylist, loadUser, loadUserPlaylists, trackLoaded, tracksLoaded, artistLoaded, artistsLoaded, albumLoaded, albumsLoaded, playlistLoaded, playlistsLoaded, userLoaded, usersLoaded, userPlaylistsLoaded, loadedMore, removeFromIndex, streamTitleLoaded, streamTitleChanged, viewDataLoaded, reorderPlaylistTracks, savePlaylist, createPlaylist, deletePlaylist, removeTracksFromPlaylist, addTracksToPlaylist, getLibraryPlaylists, getLibraryAlbums, getLibraryArtists, addPinned, removePinned, updatePinned, updatePinnedUri */ |
<<<<<<<
try {fs.mkdirSync("../mithril")} catch (e) {/* ignore */}
try {fs.mkdirSync("../mithril/archive")} catch (e) {/* ignore */}
try {fs.mkdirSync("../mithril/archive/v" + version)} catch (e) {/* ignore */}
try {fs.mkdirSync("../mithril/archive/v" + version + "/lib")} catch (e) {/* ignore */}
try {fs.mkdirSync("../mithril/archive/v" + version + "/lib/prism")} catch (e) {/* ignore */}
try {fs.mkdirSync("../mithril/lib")} catch (e) {/* ignore */}
try {fs.mkdirSync("../mithril/lib/prism")} catch (e) {/* ignore */}
=======
try {fs.mkdirSync("./dist")} catch (e) {}
try {fs.mkdirSync("./dist/archive")} catch (e) {}
try {fs.mkdirSync("./dist/archive/v" + version)} catch (e) {}
try {fs.mkdirSync("./dist/archive/v" + version + "/lib")} catch (e) {}
try {fs.mkdirSync("./dist/archive/v" + version + "/lib/prism")} catch (e) {}
try {fs.mkdirSync("./dist/lib")} catch (e) {}
try {fs.mkdirSync("./dist/lib/prism")} catch (e) {}
>>>>>>>
try {fs.mkdirSync("./dist")} catch (e) {/* ignore */}
try {fs.mkdirSync("./dist/archive")} catch (e) {/* ignore */}
try {fs.mkdirSync("./dist/archive/v" + version)} catch (e) {/* ignore */}
try {fs.mkdirSync("./dist/archive/v" + version + "/lib")} catch (e) {/* ignore */}
try {fs.mkdirSync("./dist/archive/v" + version + "/lib/prism")} catch (e) {/* ignore */}
try {fs.mkdirSync("./dist/lib")} catch (e) {/* ignore */}
try {fs.mkdirSync("./dist/lib/prism")} catch (e) {/* ignore */} |
<<<<<<<
this.searchHandler = (e, msg) => this.handleSearch(msg)
this.searchState = null
}
handleSearch (msg) {
const cm = this.editor
const component = this
if (component.searchState) cm.removeOverlay(component.searchState)
if (msg.length < 3) return
cm.operation(function () {
component.searchState = makeOverlay(msg, 'searching')
cm.addOverlay(component.searchState)
function makeOverlay (query, style) {
query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'), 'gi')
return {
token: function (stream) {
query.lastIndex = stream.pos
var match = query.exec(stream.string)
if (match && match.index === stream.pos) {
stream.pos += match[0].length || 1
return style
} else if (match) {
stream.pos = match.index
} else {
stream.skipToEnd()
}
}
}
}
})
=======
this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {leading: false, trailing: true})
>>>>>>>
this.searchHandler = (e, msg) => this.handleSearch(msg)
this.searchState = null
}
handleSearch (msg) {
const cm = this.editor
const component = this
if (component.searchState) cm.removeOverlay(component.searchState)
if (msg.length < 3) return
cm.operation(function () {
component.searchState = makeOverlay(msg, 'searching')
cm.addOverlay(component.searchState)
function makeOverlay (query, style) {
query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'), 'gi')
return {
token: function (stream) {
query.lastIndex = stream.pos
var match = query.exec(stream.string)
if (match && match.index === stream.pos) {
stream.pos += match[0].length || 1
return style
} else if (match) {
stream.pos = match.index
} else {
stream.skipToEnd()
}
}
}
}
})
this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {leading: false, trailing: true})
<<<<<<<
eventEmitter.on('top:search', this.searchHandler)
eventEmitter.emit('code:init')
=======
this.editor.on('scroll', this.scrollHandler)
>>>>>>>
eventEmitter.on('top:search', this.searchHandler)
eventEmitter.emit('code:init')
this.editor.on('scroll', this.scrollHandler)
<<<<<<<
eventEmitter.off('top:search', this.searchHandler)
=======
this.editor.off('scroll', this.scrollHandler)
>>>>>>>
eventEmitter.off('top:search', this.searchHandler)
this.editor.off('scroll', this.scrollHandler) |
<<<<<<<
test(function() {
//https://github.com/lhorie/mithril.js/issues/277
var root = mock.document.createElement("div")
function Field() {
this.tag = "div";
this.attrs = {};
this.children = "hello";
}
m.render(root, new Field())
return root.childNodes.length == 1
})
=======
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li")]))
var change = function() {
m.render(root, m("ul", arguments))
}
change(m("b"));
return root.childNodes[0].childNodes[0].nodeName == "B"
})
>>>>>>>
test(function() {
//https://github.com/lhorie/mithril.js/issues/277
var root = mock.document.createElement("div")
function Field() {
this.tag = "div";
this.attrs = {};
this.children = "hello";
}
m.render(root, new Field())
return root.childNodes.length == 1
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li")]))
var change = function() {
m.render(root, m("ul", arguments))
}
change(m("b"));
return root.childNodes[0].childNodes[0].nodeName == "B"
}) |
<<<<<<<
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("svg", [m("g")]))
console.log(root.childNodes[0].childNodes[0])
return root.childNodes[0].childNodes[0].nodeName === "G"
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("svg", [m("a[href='http://google.com']")]))
console.log(root.childNodes[0].childNodes[0])
return root.childNodes[0].childNodes[0].nodeName === "A"
})
=======
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("div.classname", [m("a", {href: "/first"})]))
m.render(root, m("div", [m("a", {href: "/second"})]))
return root.childNodes[0].childNodes.length == 1
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li")]))
m.render(root, m("ul", [m("li"), undefined]))
return root.childNodes[0].childNodes.length === 1
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li"), m("li")]))
m.render(root, m("ul", [m("li"), undefined]))
return root.childNodes[0].childNodes.length === 1
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li")]))
m.render(root, m("ul", [undefined]))
return root.childNodes[0].childNodes.length === 0
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li")]))
m.render(root, m("ul", [{}]))
return root.childNodes[0].childNodes.length === 0
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li", [m("a")])]))
m.render(root, m("ul", [{subtree: "retain"}]))
return root.childNodes[0].childNodes[0].childNodes[0].nodeName === "A"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/43
var root = mock.document.createElement("div")
m.render(root, m("a", {config: m.route}, "test"))
m.render(root, m("a", {config: m.route}, "test"))
return root.childNodes[0].childNodes[0].nodeValue === "test"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/29
var root = mock.document.createElement("div")
var list = [false, false]
m.render(root, list.reverse().map(function(flag, index) {
return m("input[type=checkbox]", {onclick: m.withAttr("checked", function(value) {list[index] = value}), checked: flag})
}))
mock.document.activeElement = root.childNodes[0]
root.childNodes[0].checked = true
root.childNodes[0].onclick({currentTarget: {checked: true}})
m.render(root, list.reverse().map(function(flag, index) {
return m("input[type=checkbox]", {onclick: m.withAttr("checked", function(value) {list[index] = value}), checked: flag})
}))
mock.document.activeElement = null
return root.childNodes[0].checked === false && root.childNodes[1].checked === true
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/44
var root = mock.document.createElement("div")
m.render(root, m("#foo", [null, m("#bar")]))
m.render(root, m("#foo", ["test", m("#bar")]))
return root.childNodes[0].childNodes[0].nodeValue === "test"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/44
var root = mock.document.createElement("div")
m.render(root, m("#foo", [null, m("#bar")]))
m.render(root, m("#foo", [m("div"), m("#bar")]))
return root.childNodes[0].childNodes[0].nodeName === "DIV"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/44
var root = mock.document.createElement("div")
m.render(root, m("#foo", ["test", m("#bar")]))
m.render(root, m("#foo", [m("div"), m("#bar")]))
return root.childNodes[0].childNodes[0].nodeName === "DIV"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/44
var root = mock.document.createElement("div")
m.render(root, m("#foo", [m("div"), m("#bar")]))
m.render(root, m("#foo", ["test", m("#bar")]))
return root.childNodes[0].childNodes[0].nodeValue === "test"
})
>>>>>>>
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("svg", [m("g")]))
return root.childNodes[0].childNodes[0].nodeName === "G"
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("svg", [m("a[href='http://google.com']")]))
return root.childNodes[0].childNodes[0].nodeName === "A"
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("div.classname", [m("a", {href: "/first"})]))
m.render(root, m("div", [m("a", {href: "/second"})]))
return root.childNodes[0].childNodes.length == 1
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li")]))
m.render(root, m("ul", [m("li"), undefined]))
return root.childNodes[0].childNodes.length === 1
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li"), m("li")]))
m.render(root, m("ul", [m("li"), undefined]))
return root.childNodes[0].childNodes.length === 1
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li")]))
m.render(root, m("ul", [undefined]))
return root.childNodes[0].childNodes.length === 0
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li")]))
m.render(root, m("ul", [{}]))
return root.childNodes[0].childNodes.length === 0
})
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li", [m("a")])]))
m.render(root, m("ul", [{subtree: "retain"}]))
return root.childNodes[0].childNodes[0].childNodes[0].nodeName === "A"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/43
var root = mock.document.createElement("div")
m.render(root, m("a", {config: m.route}, "test"))
m.render(root, m("a", {config: m.route}, "test"))
return root.childNodes[0].childNodes[0].nodeValue === "test"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/29
var root = mock.document.createElement("div")
var list = [false, false]
m.render(root, list.reverse().map(function(flag, index) {
return m("input[type=checkbox]", {onclick: m.withAttr("checked", function(value) {list[index] = value}), checked: flag})
}))
mock.document.activeElement = root.childNodes[0]
root.childNodes[0].checked = true
root.childNodes[0].onclick({currentTarget: {checked: true}})
m.render(root, list.reverse().map(function(flag, index) {
return m("input[type=checkbox]", {onclick: m.withAttr("checked", function(value) {list[index] = value}), checked: flag})
}))
mock.document.activeElement = null
return root.childNodes[0].checked === false && root.childNodes[1].checked === true
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/44
var root = mock.document.createElement("div")
m.render(root, m("#foo", [null, m("#bar")]))
m.render(root, m("#foo", ["test", m("#bar")]))
return root.childNodes[0].childNodes[0].nodeValue === "test"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/44
var root = mock.document.createElement("div")
m.render(root, m("#foo", [null, m("#bar")]))
m.render(root, m("#foo", [m("div"), m("#bar")]))
return root.childNodes[0].childNodes[0].nodeName === "DIV"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/44
var root = mock.document.createElement("div")
m.render(root, m("#foo", ["test", m("#bar")]))
m.render(root, m("#foo", [m("div"), m("#bar")]))
return root.childNodes[0].childNodes[0].nodeName === "DIV"
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/44
var root = mock.document.createElement("div")
m.render(root, m("#foo", [m("div"), m("#bar")]))
m.render(root, m("#foo", ["test", m("#bar")]))
return root.childNodes[0].childNodes[0].nodeValue === "test"
}) |
<<<<<<<
renderers = []
route = router($window, renderers)
=======
redraw = {}
route = apiRouter($window, redraw)
>>>>>>>
renderers = []
route = apiRouter($window, redraw) |
<<<<<<<
module.exports = function($window, renderers) {
var renderer = createRenderer($window)
=======
module.exports = function($window, redraw) {
var renderer = coreRenderer($window)
>>>>>>>
module.exports = function($window, renderers) {
var renderer = coreRenderer($window) |
<<<<<<<
function rewriteIfThenElse(schema) {
/* @handrews https://github.com/OAI/OpenAPI-Specification/pull/1766#issuecomment-442652805
if and the *Of keywords
There is a really easy solution for implementations, which is that
if: X, then: Y, else: Z
is equivalent to
oneOf: [allOf: [X, Y], allOf: [not: X, Z]]
*/
if (schema.if && schema.then) {
schema.oneOf = [ { allOf: [ schema.if, schema.then ] },
{ allOf: [ { not: schema.if }, schema.else ] } ];
delete schema.if;
delete schema.then;
delete schema.else;
}
return schema;
}
function rewriteExclusiveMinMax(schema) {
if (typeof schema.exclusiveMaximum === 'number') {
schema.maximum = schema.exclusiveMaximum;
schema.exclusiveMaximum = true;
}
if (typeof schema.exclusiveMinimum === 'number') {
schema.minimum = schema.exclusiveMinimum;
schema.exclusiveMinimum = true;
}
return schema;
}
module.exports = convert;
=======
function rewriteConst(schema) {
if (schema.const) {
schema.enum = [ schema.const ];
delete schema.const;
}
return schema;
}
module.exports = convert;
>>>>>>>
function rewriteConst(schema) {
if (schema.const) {
schema.enum = [ schema.const ];
delete schema.const;
}
return schema;
}
function rewriteIfThenElse(schema) {
/* @handrews https://github.com/OAI/OpenAPI-Specification/pull/1766#issuecomment-442652805
if and the *Of keywords
There is a really easy solution for implementations, which is that
if: X, then: Y, else: Z
is equivalent to
oneOf: [allOf: [X, Y], allOf: [not: X, Z]]
*/
if (schema.if && schema.then) {
schema.oneOf = [ { allOf: [ schema.if, schema.then ] },
{ allOf: [ { not: schema.if }, schema.else ] } ];
delete schema.if;
delete schema.then;
delete schema.else;
}
return schema;
}
function rewriteExclusiveMinMax(schema) {
if (typeof schema.exclusiveMaximum === 'number') {
schema.maximum = schema.exclusiveMaximum;
schema.exclusiveMaximum = true;
}
if (typeof schema.exclusiveMinimum === 'number') {
schema.minimum = schema.exclusiveMinimum;
schema.exclusiveMinimum = true;
}
return schema;
}
module.exports = convert; |
<<<<<<<
"use strict";
=======
var VERSION = "v0.2.0-next";
>>>>>>>
"use strict";
var VERSION = "v0.2.0-next"; |
<<<<<<<
=======
//key algorithm: sort elements without recreating them if keys are present
//1) create a map of all existing keys, and mark all for deletion
//2) add new keys to map and mark them for addition
//3) if key exists in new list, change action from deletion to a move
//4) for each key, handle its corresponding action as marked in previous steps
//5) copy unkeyed items into their respective gaps
>>>>>>>
//key algorithm: sort elements without recreating them if keys are present
//1) create a map of all existing keys, and mark all for deletion
//2) add new keys to map and mark them for addition
//3) if key exists in new list, change action from deletion to a move
//4) for each key, handle its corresponding action as marked in previous steps
//5) copy unkeyed items into their respective gaps
<<<<<<<
=======
//end key algorithm
>>>>>>>
//end key algorithm
<<<<<<<
// cnt protects against abuse calls from spec checker
var cnt = 0
ref.call(val, function (v) {
if (cnt++) return
val = v
cb()
}, function (v) {
if (cnt++) return
val = v
ec()
})
} catch (e) {
val = e
ec()
=======
var result = callback(value)
if (result && typeof result.then == "function") result.then(next[method], error)
else next[method](result !== undefined ? result : value)
}
catch (e) {
if (type.call(e) == "[object Error]" && e.constructor !== Error) throw e
else next.reject(e)
>>>>>>>
// cnt protects against abuse calls from spec checker
var cnt = 0
ref.call(val, function (v) {
if (cnt++) return
val = v
cb()
}, function (v) {
if (cnt++) return
val = v
ec()
})
} catch (e) {
val = e
ec() |
<<<<<<<
pl: "Czy jesteś pewien ?",
pt_BR: "Are you sure ?",
=======
pl: "Are you sure ?",
pt_BR: "Você tem certeza?",
>>>>>>>
pl: "Czy jesteś pewien ?",
pt_BR: "Você tem certeza?",
<<<<<<<
pl: "Rozważ",
pt_BR: "Consider",
=======
pl: "Consider",
pt_BR: "Considere",
>>>>>>>
pl: "Rozważ",
pt_BR: "Considere",
<<<<<<<
pl: "przekazanie darowizny",
pt_BR: "donating",
=======
pl: "donating",
pt_BR: "doar",
>>>>>>>
pl: "przekazanie darowizny",
pt_BR: "doar",
<<<<<<<
pl: "jeśli kochasz Bonjourr",
pt_BR: "if you love Bonjourr",
=======
pl: "if you love Bonjourr",
pt_BR: "se você ama o Bonjourr",
>>>>>>>
pl: "jeśli kochasz Bonjourr",
pt_BR: "se você ama o Bonjourr", |
<<<<<<<
if (window.Tether === undefined) {
throw new Error('Bootstrap tooltips require Tether (http://tether.io/)')
=======
if (typeof Tether === 'undefined') {
throw new Error('Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)')
>>>>>>>
if (typeof Tether === 'undefined') {
throw new Error('Bootstrap tooltips require Tether (http://tether.io/)') |
<<<<<<<
goog.debug.Logger.getLogger('owg.GlobeRenderer').info("-------------------------");
goog.debug.Logger.getLogger('owg.GlobeRenderer').info("Frustum size: " + this.lstFrustum.length);
/*for (var i=0;i<this.lstFrustum.length;i++)
{
goog.debug.Logger.getLogger('owg.GlobeRenderer').info(this.lstFrustum[i].quadcode);
}*/
goog.debug.Logger.getLogger('owg.GlobeRenderer').info("-------------------------");
=======
console.log("-------------------------");
console.log("Frustum size: " + this.lstFrustum.length);
console.log("-------------------------");
>>>>>>>
goog.debug.Logger.getLogger('owg.GlobeRenderer').info("-------------------------");
goog.debug.Logger.getLogger('owg.GlobeRenderer').info("Frustum size: " + this.lstFrustum.length);
goog.debug.Logger.getLogger('owg.GlobeRenderer').info("-------------------------"); |
<<<<<<<
}(window.jQuery);/* =========================================================
* bootstrap-modal.js v3.0.0
=======
==================================================
* bootstrap-modal.js v2.3.0
=======
}(window.jQuery);
/* =========================================================
* bootstrap-modal.js v2.3.0
>>>>>>>
}(window.jQuery);
/* =========================================================
* bootstrap-modal.js v3.0.0
<<<<<<<
* bootstrap-popover.js v3.0.0
=======
* bootstrap-popover.js v2.3.0
>>>>>>>
* bootstrap-popover.js v3.0.0
<<<<<<<
}(window.jQuery);
/* =============================================================
* bootstrap-scrollspy.js v3.0.0
=======
======================================================
* bootstrap-scrollspy.js v2.3.0
=======
}(window.jQuery);
/* =============================================================
* bootstrap-scrollspy.js v2.3.0
>>>>>>>
}(window.jQuery);
/* =============================================================
* bootstrap-scrollspy.js v3.0.0 |
<<<<<<<
test('should not fire sliden when slide is prevented', function () {
=======
test("should not fire slid when slide is prevented", function () {
>>>>>>>
test('should not fire slide when slide is prevented', function () {
<<<<<<<
test('should fire slide event with direction', function () {
=======
test("should reset when slide is prevented", function () {
var template = '<div id="carousel-example-generic" class="carousel slide"><ol class="carousel-indicators"><li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li><li data-target="#carousel-example-generic" data-slide-to="1"></li><li data-target="#carousel-example-generic" data-slide-to="2"></li></ol><div class="carousel-inner"><div class="item active"><div class="carousel-caption"></div></div><div class="item"><div class="carousel-caption"></div></div><div class="item"><div class="carousel-caption"></div></div></div><a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"></a><a class="right carousel-control" href="#carousel-example-generic" data-slide="next"></a></div>'
var $carousel = $(template)
$.support.transition = false
stop()
$carousel.one('slide.bs.carousel', function (e) {
e.preventDefault()
setTimeout(function () {
ok($carousel.find('.item:eq(0)').is('.active'))
ok($carousel.find('.carousel-indicators li:eq(0)').is('.active'))
$carousel.carousel('next')
}, 1);
})
$carousel.one('slid.bs.carousel', function () {
setTimeout(function () {
ok($carousel.find('.item:eq(1)').is('.active'))
ok($carousel.find('.carousel-indicators li:eq(1)').is('.active'))
start()
}, 1);
})
$carousel.carousel('next')
})
test("should fire slide event with direction", function () {
>>>>>>>
test('should reset when slide is prevented', function () {
var template = '<div id="carousel-example-generic" class="carousel slide"><ol class="carousel-indicators"><li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li><li data-target="#carousel-example-generic" data-slide-to="1"></li><li data-target="#carousel-example-generic" data-slide-to="2"></li></ol><div class="carousel-inner"><div class="item active"><div class="carousel-caption"></div></div><div class="item"><div class="carousel-caption"></div></div><div class="item"><div class="carousel-caption"></div></div></div><a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"></a><a class="right carousel-control" href="#carousel-example-generic" data-slide="next"></a></div>'
var $carousel = $(template)
$.support.transition = false
stop()
$carousel.one('slide.bs.carousel', function (e) {
e.preventDefault()
setTimeout(function () {
ok($carousel.find('.item:eq(0)').is('.active'))
ok($carousel.find('.carousel-indicators li:eq(0)').is('.active'))
$carousel.carousel('next')
}, 1);
})
$carousel.one('slid.bs.carousel', function () {
setTimeout(function () {
ok($carousel.find('.item:eq(1)').is('.active'))
ok($carousel.find('.carousel-indicators li:eq(1)').is('.active'))
start()
}, 1);
})
$carousel.carousel('next')
})
test('should fire slide event with direction', function () { |
<<<<<<<
this.yaw = 0;
=======
this.longitude = 0;
this.latitude = 0;
this.elevation = 0;
>>>>>>>
this.yaw = 0;
this.longitude = 0;
this.latitude = 0;
this.elevation = 0;
<<<<<<<
this.yaw = ts.compassdirection*57.295779513082320876798154814105; //rad2deg
=======
this.longitude = ts.geoposition.longitude;
this.latitude = ts.geoposition.latitude;
this.elevation = ts.geoposition.elevation;
>>>>>>>
this.yaw = ts.compassdirection*57.295779513082320876798154814105; //rad2deg
this.longitude = ts.geoposition.longitude;
this.latitude = ts.geoposition.latitude;
this.elevation = ts.geoposition.elevation; |
<<<<<<<
this.hoverState = null
this.$element.trigger('shown.bs.' + this.type)
=======
var complete = function() {
that.$element.trigger('shown.bs.' + that.type)
}
$.support.transition && this.$tip.hasClass('fade') ?
$tip
.one($.support.transition.end, complete)
.emulateTransitionEnd(150) :
complete()
>>>>>>>
this.hoverState = null
var complete = function() {
that.$element.trigger('shown.bs.' + that.type)
}
$.support.transition && this.$tip.hasClass('fade') ?
$tip
.one($.support.transition.end, complete)
.emulateTransitionEnd(150) :
complete()
<<<<<<<
this.hoverState = null
this.$element.trigger('hidden.bs.' + this.type)
=======
>>>>>>>
this.hoverState = null |
<<<<<<<
this.poiActiveColor = new vec4(1,1,1,1);
/** @type PoiIconStyle */
=======
/** @type {PoiIconStyle} */
>>>>>>>
this.poiActiveColor = new vec4(1,1,1,1);
/** @type PoiIconStyle */
/** @type {PoiIconStyle} */ |
<<<<<<<
});
gulp.task('docs', function() {
gulp.src("./docs-tpls/*.nunjucks")
.pipe(nunjucks({
path: "./docs-tpls"
}))
.pipe(rename({extname: ".html"}))
.pipe(gulp.dest("./docs"))
;
});
gulp.task('zip', function() {
// gulp.src(["!./node_modules", "!./bower_components", "./**/*"])
// .pipe(zip('bootstrap-offcanvas-'+VERSION+".zip"))
// .pipe(gulp.dest("./dist"))
// ;
=======
>>>>>>>
});
gulp.task('docs', function() {
gulp.src("./docs-tpls/*.nunjucks")
.pipe(nunjucks({
path: "./docs-tpls"
}))
.pipe(rename({extname: ".html"}))
.pipe(gulp.dest("./docs"))
; |
<<<<<<<
processInputValue(processed, values.includes, errors, node, validate);
if (!shouldInclude(node)) {
var descendants = descendantsToInclude(node);
forEach(descendants, function (descendant) {
processInputValue(processed, values.includes, errors, descendant, validate);
})
}
=======
processInputValue(processed, values, errors, node, validate);
>>>>>>>
processInputValue(processed, values, errors, node, validate);
if (!shouldInclude(node)) {
var descendants = descendantsToInclude(node);
forEach(descendants, function (descendant) {
processInputValue(processed, values, errors, descendant, validate);
})
} |
<<<<<<<
processInputValue(processed, values.form, errors, closest(elt, 'form'));
=======
processInputValue(processed, values, errors, closest(elt, 'form'), validate);
>>>>>>>
processInputValue(processed, values.form, errors, closest(elt, 'form'), validate);
<<<<<<<
processInputValue(processed, values.element, errors, elt);
=======
processInputValue(processed, values, errors, elt, validate);
>>>>>>>
processInputValue(processed, values.element, errors, elt, validate);
<<<<<<<
processInputValue(processed, values.includes, errors, node);
=======
processInputValue(processed, values, errors, node, validate);
>>>>>>>
processInputValue(processed, values.includes, errors, node, validate); |
<<<<<<<
* @class poi
* @constructor
* {@link http://www.openwebglobe.org}
=======
* @constructor
* @description This class is used to create meshes with Canvas(2d) as textures. E.g. for POIs.
>>>>>>>
* @constructor
* @description This class is used to create meshes with Canvas(2d) as textures. E.g. for POIs.
<<<<<<<
}
goog.exportSymbol('CanvasTexture', CanvasTexture);
goog.exportProperty(CanvasTexture.prototype, 'DrawToCanvas2D', CanvasTexture.prototype.DrawToCanvas2D);
goog.exportProperty(CanvasTexture.prototype, 'GenerateText', CanvasTexture.prototype.GenerateText);
=======
}
/**
* Returns a mesh for the poi-pole.
* @extends CanvasTexture
* @param{float} x x,y,z cartesian pole start coordinates.
* @param{float} x x2,y2,z2 cartesian pole end coordinates.
*/
CanvasTexture.prototype.GetPoleMesh = function(x,y,z,x2,y2,z2)
{
this.poleMesh = new Mesh(engine);
var vert = new Array();
vert.push(x,y,z,1,1,0,1);
vert.push(x2,y2,z2,1,1,0,1);
this.poleMesh.SetBufferPC(vert);
this.poleMesh.SetIndexBuffer([0,1],"LINES");
return this.poleMesh;
}
/* Video POIs not supported...
function _cbHandleLoadedVideo(gl,canvasTex)
{
gl.enable(gl.TEXTURE_2D);
gl.bindTexture(gl.TEXTURE_2D, canvasTex.tex.texture);
gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB,gl.RGB,gl.UNSIGNED_BYTE, canvasTex.videoElement);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
gl.bindTexture(gl.TEXTURE_2D, null);
canvasTex.tex.ready = true;
canvasTex.mesh.SetTexture(canvasTex.tex);
}
CanvasTexture.prototype.GenerateVideoPoi = function(url)
{
this.videoElement = document.createElement('video');
this.videoElement.style.display = 'none';
document.body.appendChild(this.videoElement);
//set canvas as texture
this.tex = new Texture(this.engine);
this.tex.texture = this.gl.createTexture();
var curgl = this.gl;
var canvasTex = this;
this.videoElement.addEventListener("loadeddata", function()
{
console.log("Video loaded...");
_cbHandleLoadedVideo(curgl,canvasTex);
},true);
// this.videoElement.addEventListener("canplaythrough", this.videoElement.play(), true);
this.videoElement.src=url;
this.videoElement.onerror = function()
{
console.log("***FAILED VIDEO DOWNLOADING: " + url);
}
this.tex.width = 640;
this.tex.height = 480;
this.mesh = new Mesh(engine);
this.mesh.SetTexture(this.tex);
var vert = new Array();
vert.push(-this.tex.width/2,this.tex.height/2,0,0,1);
vert.push(-this.tex.width/2,-this.tex.height/2,0,0,0);
vert.push(this.tex.width/2,-this.tex.height/2,0,1,0);
vert.push(this.tex.width/2,this.tex.height/2,0,1,1);
this.mesh.SetBufferFont(vert);
this.mesh.SetIndexBuffer([0, 1, 2, 0, 2, 3],"TRIANGLES");
return this.mesh;
}
*/
>>>>>>>
}
/**
* Returns a mesh for the poi-pole.
* @extends CanvasTexture
* @param{float} x x,y,z cartesian pole start coordinates.
* @param{float} x x2,y2,z2 cartesian pole end coordinates.
*/
CanvasTexture.prototype.GetPoleMesh = function(x,y,z,x2,y2,z2)
{
this.poleMesh = new Mesh(engine);
var vert = new Array();
vert.push(x,y,z,1,1,0,1);
vert.push(x2,y2,z2,1,1,0,1);
this.poleMesh.SetBufferPC(vert);
this.poleMesh.SetIndexBuffer([0,1],"LINES");
return this.poleMesh;
}
/* Video POIs not supported...
function _cbHandleLoadedVideo(gl,canvasTex)
{
gl.enable(gl.TEXTURE_2D);
gl.bindTexture(gl.TEXTURE_2D, canvasTex.tex.texture);
gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB,gl.RGB,gl.UNSIGNED_BYTE, canvasTex.videoElement);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
gl.bindTexture(gl.TEXTURE_2D, null);
canvasTex.tex.ready = true;
canvasTex.mesh.SetTexture(canvasTex.tex);
}
CanvasTexture.prototype.GenerateVideoPoi = function(url)
{
this.videoElement = document.createElement('video');
this.videoElement.style.display = 'none';
document.body.appendChild(this.videoElement);
//set canvas as texture
this.tex = new Texture(this.engine);
this.tex.texture = this.gl.createTexture();
var curgl = this.gl;
var canvasTex = this;
this.videoElement.addEventListener("loadeddata", function()
{
console.log("Video loaded...");
_cbHandleLoadedVideo(curgl,canvasTex);
},true);
// this.videoElement.addEventListener("canplaythrough", this.videoElement.play(), true);
this.videoElement.src=url;
this.videoElement.onerror = function()
{
console.log("***FAILED VIDEO DOWNLOADING: " + url);
}
this.tex.width = 640;
this.tex.height = 480;
this.mesh = new Mesh(engine);
this.mesh.SetTexture(this.tex);
var vert = new Array();
vert.push(-this.tex.width/2,this.tex.height/2,0,0,1);
vert.push(-this.tex.width/2,-this.tex.height/2,0,0,0);
vert.push(this.tex.width/2,-this.tex.height/2,0,1,0);
vert.push(this.tex.width/2,this.tex.height/2,0,1,1);
this.mesh.SetBufferFont(vert);
this.mesh.SetIndexBuffer([0, 1, 2, 0, 2, 3],"TRIANGLES");
return this.mesh;
}
*/
goog.exportSymbol('CanvasTexture', CanvasTexture);
goog.exportProperty(CanvasTexture.prototype, 'DrawToCanvas2D', CanvasTexture.prototype.DrawToCanvas2D);
goog.exportProperty(CanvasTexture.prototype, 'GenerateText', CanvasTexture.prototype.GenerateText); |
<<<<<<<
/**
* List of all propagate flag names
* @const
* @type {Array.<string>}
*/
var propagateFlagNames = [
'DEADLINE',
'CENSUS_STATS_CONTEXT',
'CENSUS_TRACING_CONTEXT',
'CANCELLATION',
'DEFAULTS'
];
=======
/**
* List of all connectivity state names
* @const
* @type {Array.<string>}
*/
var connectivityStateNames = [
'IDLE',
'CONNECTING',
'READY',
'TRANSIENT_FAILURE',
'FATAL_FAILURE'
];
>>>>>>>
/**
* List of all propagate flag names
* @const
* @type {Array.<string>}
*/
var propagateFlagNames = [
'DEADLINE',
'CENSUS_STATS_CONTEXT',
'CENSUS_TRACING_CONTEXT',
'CANCELLATION',
'DEFAULTS'
];
/*
* List of all connectivity state names
* @const
* @type {Array.<string>}
*/
var connectivityStateNames = [
'IDLE',
'CONNECTING',
'READY',
'TRANSIENT_FAILURE',
'FATAL_FAILURE'
];
<<<<<<<
it('should have all of the propagate flags', function() {
for (var i = 0; i < propagateFlagNames.length; i++) {
assert(grpc.propagate.hasOwnProperty(propagateFlagNames[i]),
'call error missing: ' + propagateFlagNames[i]);
}
});
=======
it('should have all of the connectivity states', function() {
for (var i = 0; i < connectivityStateNames.length; i++) {
assert(grpc.connectivityState.hasOwnProperty(connectivityStateNames[i]),
'connectivity status missing: ' + connectivityStateNames[i]);
}
});
>>>>>>>
it('should have all of the propagate flags', function() {
for (var i = 0; i < propagateFlagNames.length; i++) {
assert(grpc.propagate.hasOwnProperty(propagateFlagNames[i]),
'call error missing: ' + propagateFlagNames[i]);
}
});
it('should have all of the connectivity states', function() {
for (var i = 0; i < connectivityStateNames.length; i++) {
assert(grpc.connectivityState.hasOwnProperty(connectivityStateNames[i]),
'connectivity status missing: ' + connectivityStateNames[i]);
}
}); |
<<<<<<<
var channel = new grpc.Channel('localhost:' + port_num);
var deadline = new Date();
deadline.setSeconds(deadline.getSeconds() + 3);
var call = new grpc.Call(channel,
'echo',
deadline);
call.startInvoke(function(event) {
assert.strictEqual(event.type,
grpc.completionType.INVOKE_ACCEPTED);
call.startWrite(
new Buffer(req_text),
function(event) {
assert.strictEqual(event.type,
grpc.completionType.WRITE_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
call.writesDone(function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
}, 0);
call.startRead(function(event) {
assert.strictEqual(event.type, grpc.completionType.READ);
assert.strictEqual(event.data.toString(), req_text);
=======
var channel = new grpc.Channel(port);
var deadline = new Date();
deadline.setSeconds(deadline.getSeconds() + 3);
var call = new grpc.Call(channel,
'echo',
deadline);
call.invoke(function(event) {
assert.strictEqual(event.type,
grpc.completionType.CLIENT_METADATA_READ);
>>>>>>>
var channel = new grpc.Channel('localhost:' + port_num);
var deadline = new Date();
deadline.setSeconds(deadline.getSeconds() + 3);
var call = new grpc.Call(channel,
'echo',
deadline);
call.invoke(function(event) {
assert.strictEqual(event.type,
grpc.completionType.CLIENT_METADATA_READ);
done();
},function(event) {
assert.strictEqual(event.type, grpc.completionType.FINISHED);
var status = event.data;
assert.strictEqual(status.code, grpc.status.OK);
assert.strictEqual(status.details, status_text);
server.shutdown();
done();
}, 0);
call.startWrite(
new Buffer(req_text),
function(event) {
assert.strictEqual(event.type,
grpc.completionType.WRITE_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
call.writesDone(function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
<<<<<<<
});
},function(event) {
assert.strictEqual(event.type,
grpc.completionType.CLIENT_METADATA_READ);
done();
},function(event) {
assert.strictEqual(event.type, grpc.completionType.FINISHED);
var status = event.data;
assert.strictEqual(status.code, grpc.status.OK);
assert.strictEqual(status.details, status_text);
server.shutdown();
done();
}, 0);
=======
},function(event) {
assert.strictEqual(event.type, grpc.completionType.FINISHED);
var status = event.data;
assert.strictEqual(status.code, grpc.status.OK);
assert.strictEqual(status.details, status_text);
server.shutdown();
done();
}, 0);
call.startWrite(
new Buffer(req_text),
function(event) {
assert.strictEqual(event.type,
grpc.completionType.WRITE_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
call.writesDone(function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
}, 0);
call.startRead(function(event) {
assert.strictEqual(event.type, grpc.completionType.READ);
assert.strictEqual(event.data.toString(), req_text);
done();
});
});
>>>>>>>
});
}, 0);
call.startRead(function(event) {
assert.strictEqual(event.type, grpc.completionType.READ);
assert.strictEqual(event.data.toString(), req_text);
done();
}); |
<<<<<<<
server_call.serverEndInitialMetadata(0);
server_call.startWriteStatus(
grpc.status.OK,
status_text,
function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
});
});
=======
call.writesDone(function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
});
>>>>>>>
server_call.serverEndInitialMetadata(0);
server_call.startWriteStatus(
grpc.status.OK,
status_text,
function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
});
call.writesDone(function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
});
});
<<<<<<<
server.start();
server.requestCall(function(event) {
assert.strictEqual(event.type, grpc.completionType.SERVER_RPC_NEW);
var server_call = event.call;
assert.notEqual(server_call, null);
server_call.serverAccept(function(event) {
assert.strictEqual(event.type, grpc.completionType.FINISHED);
done();
});
server_call.serverEndInitialMetadata(0);
server_call.startRead(function(event) {
assert.strictEqual(event.type, grpc.completionType.READ);
assert.strictEqual(event.data.toString(), req_text);
server_call.startWrite(
new Buffer(reply_text),
function(event) {
assert.strictEqual(event.type,
grpc.completionType.WRITE_ACCEPTED);
assert.strictEqual(event.data,
grpc.opError.OK);
server_call.startWriteStatus(
grpc.status.OK,
status_text,
function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
}, 0);
=======
it('should send and receive data without error', function(complete) {
port_picker.nextAvailablePort(function(port) {
var req_text = 'client_request';
var reply_text = 'server_response';
var server = new grpc.Server();
var done = multiDone(function() {
complete();
server.shutdown();
}, 6);
server.addHttp2Port(port);
var channel = new grpc.Channel(port);
var deadline = new Date();
deadline.setSeconds(deadline.getSeconds() + 3);
var status_text = 'success';
var call = new grpc.Call(channel,
'dummy_method',
deadline);
call.invoke(function(event) {
assert.strictEqual(event.type,
grpc.completionType.CLIENT_METADATA_READ);
done();
},function(event) {
assert.strictEqual(event.type, grpc.completionType.FINISHED);
var status = event.data;
assert.strictEqual(status.code, grpc.status.OK);
assert.strictEqual(status.details, status_text);
done();
}, 0);
call.startWrite(
new Buffer(req_text),
function(event) {
assert.strictEqual(event.type,
grpc.completionType.WRITE_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
call.writesDone(function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
}, 0);
call.startRead(function(event) {
assert.strictEqual(event.type, grpc.completionType.READ);
assert.strictEqual(event.data.toString(), reply_text);
done();
});
server.start();
server.requestCall(function(event) {
assert.strictEqual(event.type, grpc.completionType.SERVER_RPC_NEW);
var server_call = event.call;
assert.notEqual(server_call, null);
server_call.serverAccept(function(event) {
assert.strictEqual(event.type, grpc.completionType.FINISHED);
done();
});
server_call.serverEndInitialMetadata(0);
server_call.startRead(function(event) {
assert.strictEqual(event.type, grpc.completionType.READ);
assert.strictEqual(event.data.toString(), req_text);
server_call.startWrite(
new Buffer(reply_text),
function(event) {
assert.strictEqual(event.type,
grpc.completionType.WRITE_ACCEPTED);
assert.strictEqual(event.data,
grpc.opError.OK);
server_call.startWriteStatus(
grpc.status.OK,
status_text,
function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
}, 0);
});
>>>>>>>
server.start();
server.requestCall(function(event) {
assert.strictEqual(event.type, grpc.completionType.SERVER_RPC_NEW);
var server_call = event.call;
assert.notEqual(server_call, null);
server_call.serverAccept(function(event) {
assert.strictEqual(event.type, grpc.completionType.FINISHED);
}, 0);
server_call.serverEndInitialMetadata(0);
server_call.startWriteStatus(
grpc.status.OK,
status_text,
function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
});
call.writesDone(function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
});
});
it('should send and receive data without error', function(complete) {
var req_text = 'client_request';
var reply_text = 'server_response';
var server = new grpc.Server();
var done = multiDone(function() {
complete();
server.shutdown();
}, 6);
var port_num = server.addHttp2Port('0.0.0.0:0');
var channel = new grpc.Channel('localhost:' + port_num);
var deadline = new Date();
deadline.setSeconds(deadline.getSeconds() + 3);
var status_text = 'success';
var call = new grpc.Call(channel,
'dummy_method',
deadline);
call.invoke(function(event) {
assert.strictEqual(event.type,
grpc.completionType.CLIENT_METADATA_READ);
done();
},function(event) {
assert.strictEqual(event.type, grpc.completionType.FINISHED);
var status = event.data;
assert.strictEqual(status.code, grpc.status.OK);
assert.strictEqual(status.details, status_text);
done();
}, 0);
call.startWrite(
new Buffer(req_text),
function(event) {
assert.strictEqual(event.type,
grpc.completionType.WRITE_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
call.writesDone(function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
}, 0);
call.startRead(function(event) {
assert.strictEqual(event.type, grpc.completionType.READ);
assert.strictEqual(event.data.toString(), reply_text);
done();
});
server.start();
server.requestCall(function(event) {
assert.strictEqual(event.type, grpc.completionType.SERVER_RPC_NEW);
var server_call = event.call;
assert.notEqual(server_call, null);
server_call.serverAccept(function(event) {
assert.strictEqual(event.type, grpc.completionType.FINISHED);
done();
});
server_call.serverEndInitialMetadata(0);
server_call.startRead(function(event) {
assert.strictEqual(event.type, grpc.completionType.READ);
assert.strictEqual(event.data.toString(), req_text);
server_call.startWrite(
new Buffer(reply_text),
function(event) {
assert.strictEqual(event.type,
grpc.completionType.WRITE_ACCEPTED);
assert.strictEqual(event.data,
grpc.opError.OK);
server_call.startWriteStatus(
grpc.status.OK,
status_text,
function(event) {
assert.strictEqual(event.type,
grpc.completionType.FINISH_ACCEPTED);
assert.strictEqual(event.data, grpc.opError.OK);
done();
});
}, 0); |
<<<<<<<
/**
* This is used for testing functions with multiple asynchronous calls that
* can happen in different orders. This should be passed the number of async
* function invocations that can occur last, and each of those should call this
* function's return value
* @param {function()} done The function that should be called when a test is
* complete.
* @param {number} count The number of calls to the resulting function if the
* test passes.
* @return {function()} The function that should be called at the end of each
* sequence of asynchronous functions.
*/
function multiDone(done, count) {
return function() {
count -= 1;
if (count <= 0) {
done();
}
};
}
=======
var insecureCreds = grpc.Credentials.createInsecure();
>>>>>>>
/**
* This is used for testing functions with multiple asynchronous calls that
* can happen in different orders. This should be passed the number of async
* function invocations that can occur last, and each of those should call this
* function's return value
* @param {function()} done The function that should be called when a test is
* complete.
* @param {number} count The number of calls to the resulting function if the
* test passes.
* @return {function()} The function that should be called at the end of each
* sequence of asynchronous functions.
*/
function multiDone(done, count) {
return function() {
count -= 1;
if (count <= 0) {
done();
}
};
}
var insecureCreds = grpc.Credentials.createInsecure();
<<<<<<<
=======
var channel = new grpc.Channel('hostname', insecureCreds, {});
>>>>>>>
<<<<<<<
=======
var channel = new grpc.Channel('hostname', insecureCreds, {});
>>>>>>>
<<<<<<<
=======
var channel = new grpc.Channel('localhost', insecureCreds, {});
>>>>>>> |
<<<<<<<
});
};
proxy.addProtoService(test_service, proxy_impl);
var proxy_port = proxy.bind('localhost:0', server_insecure_creds);
proxy.start();
var proxy_client = new Client('localhost:' + proxy_port,
grpc.credentials.createInsecure());
var deadline = new Date();
deadline.setSeconds(deadline.getSeconds() + 1);
var call = proxy_client.bidiStream(null, {deadline: deadline});
call.on('error', function(err) {
=======
}
}, null, {parent: parent, propagate_flags: deadline_flags});
};
proxy.addProtoService(test_service, proxy_impl);
var proxy_port = proxy.bind('localhost:0', server_insecure_creds);
proxy.start();
var proxy_client = new Client('localhost:' + proxy_port,
grpc.Credentials.createInsecure());
var deadline = new Date();
deadline.setSeconds(deadline.getSeconds() + 1);
proxy_client.clientStream(function(err, value) {
done();
}, null, {deadline: deadline});
});
it('With a bidi stream call', function(done) {
done = multiDone(done, 2);
proxy_impl.bidiStream = function(parent) {
var child = client.bidiStream(
null, {parent: parent, propagate_flags: deadline_flags});
child.on('error', function(err) {
assert(err);
assert(err.code === grpc.status.DEADLINE_EXCEEDED ||
err.code === grpc.status.INTERNAL);
>>>>>>>
}
}, null, {parent: parent, propagate_flags: deadline_flags});
};
proxy.addProtoService(test_service, proxy_impl);
var proxy_port = proxy.bind('localhost:0', server_insecure_creds);
proxy.start();
var proxy_client = new Client('localhost:' + proxy_port,
grpc.credentials.createInsecure());
var deadline = new Date();
deadline.setSeconds(deadline.getSeconds() + 1);
proxy_client.clientStream(function(err, value) {
done();
}, null, {deadline: deadline});
});
it('With a bidi stream call', function(done) {
done = multiDone(done, 2);
proxy_impl.bidiStream = function(parent) {
var child = client.bidiStream(
null, {parent: parent, propagate_flags: deadline_flags});
child.on('error', function(err) {
assert(err);
assert(err.code === grpc.status.DEADLINE_EXCEEDED ||
err.code === grpc.status.INTERNAL); |
<<<<<<<
'expect (chain) to be accepted with numbers': function (test) {
=======
'expect (chain) to be accepted again': function (test) {
>>>>>>>
'expect (chain) to be accepted again': function (test) {
<<<<<<<
var p1 = N.number().thenLeft(C.char(' ').opt()),
p2 = F.any().then(F.any()).thenLeft(F.eos()).map(function (r) {
=======
const p1 = N.numberLiteral().thenLeft(C.char(' ').opt()),
p2 = F.any().then(F.any()).thenLeft(F.eos())
.array().map(function (r) {
>>>>>>>
const p1 = N.number().thenLeft(C.char(' ').opt()),
p2 = F.any().then(F.any()).thenLeft(F.eos())
.array().map(function (r) {
<<<<<<<
const token = N.number().then(spaces().opt().drop());
=======
const token = N.numberLiteral().then(spaces().opt().drop()).single();
>>>>>>>
const token = N.number().then(spaces().opt().drop()).single();
<<<<<<<
test.ok(parsing.isEos(), 'should have been consumed');
test.equal(parsing.value, 66, 'should be 66.');
=======
test.ok(parsing.isConsumed(), 'should have been consumed');
test.equal(parsing.value, 66);
>>>>>>>
test.ok(parsing.isEos(), 'should have been consumed');
test.equal(parsing.value, 66); |
<<<<<<<
var p = C.char(' ').optrep().thenRight(N.number());
=======
var p = C.char(' ').optrep().thenRight(N.numberLiteral()).single();
>>>>>>>
var p = C.char(' ').optrep().thenRight(N.number()).single();
<<<<<<<
const p = N.number()
.then(C.char(' ').optrep().drop());
=======
const p = N.numberLiteral()
.then(C.char(' ').optrep().drop()).single();
>>>>>>>
const p = N.number()
.then(C.char(' ').optrep().drop()).single();
<<<<<<<
const p = N.number()
.then(C.char(' ').optrep().drop());
=======
const p = N.numberLiteral()
.then(C.char(' ').optrep().drop()).single();
>>>>>>>
const p = N.number()
.then(C.char(' ').optrep().drop()).single();
<<<<<<<
const p = N.number()
.then(C.char(' ').optrep().drop());
=======
const p = N.numberLiteral()
.then(C.char(' ').optrep().drop()).single();
>>>>>>>
const p = N.number()
.then(C.char(' ').optrep().drop()).single();
<<<<<<<
const p = N.number()
.then(C.char(' ').optrep().drop());
=======
const p = N.numberLiteral()
.then(C.char(' ').optrep().drop()).single();
>>>>>>>
const p = N.number()
.then(C.char(' ').optrep().drop()).single();
<<<<<<<
const lower = N.number().then(spaces().opt().drop());
=======
const lower = N.numberLiteral().then(spaces().opt().drop()).single();
>>>>>>>
const lower = N.number().then(spaces().opt().drop()).single(); |
<<<<<<<
.then(N.number())
=======
.then(N.numberLiteral()).array()
>>>>>>>
.then(N.number()).array()
<<<<<<<
.then(N.number())
.thenReturns([])
=======
.then(N.numberLiteral())
.returns([])
>>>>>>>
.then(N.number())
.returns([]) |
<<<<<<<
api: images[i].api
};
if (images[i].hasOwnProperty('xoffset'))
{
pages[i].xoffset = images[i].xoffset;
pages[i].yoffset = images[i].yoffset;
}
=======
api: images[i].api,
paged: images[i].paged
};
>>>>>>>
api: images[i].api,
paged: images[i].paged
};
if (images[i].hasOwnProperty('xoffset'))
{
pages[i].xoffset = images[i].xoffset;
pages[i].yoffset = images[i].yoffset;
} |
<<<<<<<
=======
zoomOut: null, // Callback function for zooming out only
zoomSlider: true // Should there be a zoom slider or not, defaults to yes
//itemOrientation: 0, // Either "h" (horizontal) or "v" (vertical) - currently not implemented
>>>>>>>
<<<<<<<
if (typeof settings.onScroll == 'function' && direction != 0) {
settings.onScroll.call(this, settings.pageLoadedId);
=======
if (typeof settings.scroll == 'function' && direction !== 0) {
settings.scroll.call(this, settings.pageLoadedId);
>>>>>>>
if (typeof settings.onScroll == 'function' && direction !== 0) {
settings.onScroll.call(this, settings.pageLoadedId);
<<<<<<<
if (settings.enableZoomSlider) {
createZoomSlider();
=======
if (settings.zoomSlider) {
this.createZoomer();
>>>>>>>
if (settings.enableZoomSlider) {
createZoomSlider(); |
<<<<<<<
get container() {
delete this.container;
return this.container = document.getElementById('windows');
},
=======
enabled: true,
>>>>>>>
enabled: true,
get container() {
delete this.container;
return this.container = document.getElementById('windows');
}, |
<<<<<<<
if (status.state === 200) {
=======
if (status){
localStorage.setItem("user", JSON.stringify($scope.user));
>>>>>>>
if (status.state === 200) {
localStorage.setItem("user", JSON.stringify($scope.user)); |
<<<<<<<
{id:"name", name:"Name", field:"name", width:50},
=======
{id:"scope", name:"Scope", field:"scope", width:80},
{id:"name", name:"Name", field:"name", width:50}
>>>>>>>
{id:"name", name:"Name", field:"name", width:50}
<<<<<<<
}
cmd = cmd + ");"
=======
}
if (scope) {
cmd = cmd + ",scope="+scope;
}
cmd = cmd + ");";
>>>>>>>
}
cmd = cmd + ");";
<<<<<<<
name = jQuery('<input type="text" style="width:75%"></input>');
=======
name = jQuery('<input type="text" style="width:50%"></input>'),
scope = jQuery('<input type="text" style="width:50%"></input>');
>>>>>>>
name = jQuery('<input type="text" style="width:75%"></input>'); |
<<<<<<<
// resize the Ace code pane when the window is resized
jQuery(window).resize(function(e) {
code.resize();
});
// set label above code editor to filename when tab is clicked
code_tab.click(function(e) { central_label.text(code.getPathname()); });
// make sure tabbed panes are showing
code_tab.click();
file_tab.click();
=======
>>>>>>>
// resize the Ace code pane when the window is resized
jQuery(window).resize(function(e) {
code.resize();
});
// set label above code editor to filename when tab is clicked
code_tab.click(function(e) { central_label.text(code.getPathname()); });
// make sure tabbed panes are showing
code_tab.click();
file_tab.click(); |
<<<<<<<
var compName = pathname.replace(".", "-", "g");
if(!(compName in openmdao.preferences.gui.compeditor)){
openmdao.preferences.gui.compeditor[compName] = {};
}
if(!(name.toLowerCase() in openmdao.preferences.gui.compeditor[compName])){
openmdao.preferences.gui.compeditor[compName][name.toLowerCase()] = {};
}
if(!("columns" in openmdao.preferences.gui.compeditor[compName][name.toLowerCase()])){
openmdao.preferences.gui.compeditor[compName][name.toLowerCase()].columns = {
info : true,
name : true,
type : false,
value : true,
hi : false,
low : false,
units : true,
desc : true,
};
}
=======
>>>>>>>
var compName = pathname.replace(".", "-", "g");
if(!(compName in openmdao.preferences.gui.compeditor)){
openmdao.preferences.gui.compeditor[compName] = {};
}
if(!(name.toLowerCase() in openmdao.preferences.gui.compeditor[compName])){
openmdao.preferences.gui.compeditor[compName][name.toLowerCase()] = {};
}
if(!("columns" in openmdao.preferences.gui.compeditor[compName][name.toLowerCase()])){
openmdao.preferences.gui.compeditor[compName][name.toLowerCase()].columns = {
info : true,
name : true,
type : false,
value : true,
hi : false,
low : false,
units : true,
desc : true,
};
} |
<<<<<<<
model.setFile(filepath,editor.getSession().getValue(), 1,
function(data, textStatus, jqXHR) {
model.saveProject(function(data, textStatus, jqXHR) {
model.reload()
})
});
=======
model.setFile(filepath, editor.getSession().getValue(), 1,
successful_save, null, handle409);
>>>>>>>
model.setFile(filepath,editor.getSession().getValue(), 1,
function(data, textStatus, jqXHR) {
model.saveProject(function(data, textStatus, jqXHR) {
model.reload()
})
});
<<<<<<<
function saveFile() {
model.setFile(filepath,editor.getSession().getValue(), 0,
successful_save, failed_save, handle409);
=======
function saveFile(fname_nodot) {
if (! fname_nodot) {
fname_nodot=selectedFile;
}
code_last = sessions[fname_nodot][1];
current_code = sessions[fname_nodot][0].getValue();
filepath = sessions[fname_nodot][2];
if (code_last !== current_code) {
sessions[fname_nodot][1] = current_code; // store saved file for comparison
model.setFile(filepath,current_code, 0,
successful_save, null, handle409);
}
renameTab("#"+fname_nodot,filepath);
sessions[fname_nodot][3] = false;
}
function saveAllFiles() {
for (key in sessions) {
saveFile(key);
}
}
function findMode(filepath) {
chunks = filepath.split('.');
if (chunks.length === 2){
if (chunks[1] === "py") {
return "ace/mode/python";
}
else if (chunks[1] === "js") {
return "ace/mode/javascript";
}
else {
return "ace/mode/python";
}
}
else {
return "ace/mode/python";
}
}
function newTab(contents,filepath,fname_nodot,mode) {
editor.setReadOnly(false);
if (!fname_nodot) {
fname_nodot = nameSplit(filepath);
}
if (!mode) {
mode = findMode(filepath);
}
var newfile = new EditSession(contents); // new code session for ace
newfile.setUseSoftTabs();
newfile.setUndoManager(new UndoManager());
newfile.setMode(mode);
newfile.on('change', function(evt) {
if (! sessions[fname_nodot][3]) {
renameTab("#"+fname_nodot, filepath+"*");
sessions[fname_nodot][3] = true;
}
});
editor.setSession(newfile);
sessions[fname_nodot] = [newfile,contents,filepath,false]; // store session for efficent switching
jQuery('<div id="'+fname_nodot+'"></div>').appendTo(file_inner); // new empty div
file_tabs.tabs("add",'#'+fname_nodot,filepath);
file_tabs.tabs( 'select', "#"+fname_nodot);
selectedFile=fname_nodot;
self.resize();
editor.resize();
}
function renameTab(selector, value) {
txt = jQuery('a[href="' + selector + '"]').text();
jQuery('a[href="' + selector + '"]').text(value);
}
function nameSplit(pathname) {
return pathname.split('.').join('').split('/').join('').split('*').join('');
}
/** display file error */
function fileError(msg) {
// topic = msg[0];
text = msg[1];
openmdao.Util.notify(text, 'File Error', 'file-error');
>>>>>>>
function saveFile(fname_nodot) {
if (! fname_nodot) {
fname_nodot=selectedFile;
}
code_last = sessions[fname_nodot][1];
current_code = sessions[fname_nodot][0].getValue();
filepath = sessions[fname_nodot][2];
if (code_last !== current_code) {
sessions[fname_nodot][1] = current_code; // store saved file for comparison
model.setFile(filepath,current_code, 0,
successful_save, failed_save, handle409);
}
renameTab("#"+fname_nodot,filepath);
sessions[fname_nodot][3] = false;
}
function saveAllFiles() {
for (key in sessions) {
saveFile(key);
}
}
function findMode(filepath) {
chunks = filepath.split('.');
if (chunks.length === 2){
if (chunks[1] === "py") {
return "ace/mode/python";
}
else if (chunks[1] === "js") {
return "ace/mode/javascript";
}
else {
return "ace/mode/python";
}
}
else {
return "ace/mode/python";
}
}
function newTab(contents,filepath,fname_nodot,mode) {
editor.setReadOnly(false);
if (!fname_nodot) {
fname_nodot = nameSplit(filepath);
}
if (!mode) {
mode = findMode(filepath);
}
var newfile = new EditSession(contents); // new code session for ace
newfile.setUseSoftTabs();
newfile.setUndoManager(new UndoManager());
newfile.setMode(mode);
newfile.on('change', function(evt) {
if (! sessions[fname_nodot][3]) {
renameTab("#"+fname_nodot, filepath+"*");
sessions[fname_nodot][3] = true;
}
});
editor.setSession(newfile);
sessions[fname_nodot] = [newfile,contents,filepath,false]; // store session for efficent switching
jQuery('<div id="'+fname_nodot+'"></div>').appendTo(file_inner); // new empty div
file_tabs.tabs("add",'#'+fname_nodot,filepath);
file_tabs.tabs( 'select', "#"+fname_nodot);
selectedFile=fname_nodot;
self.resize();
editor.resize();
}
function renameTab(selector, value) {
txt = jQuery('a[href="' + selector + '"]').text();
jQuery('a[href="' + selector + '"]').text(value);
}
function nameSplit(pathname) {
return pathname.split('.').join('').split('/').join('').split('*').join('');
}
/** display file error */
function fileError(msg) {
// topic = msg[0];
text = msg[1];
openmdao.Util.notify(text, 'File Error', 'file-error'); |
<<<<<<<
/**
* [BEEP description]
* @type {string}
*/
_.BEEP = '\x1b\x42', // Printer Buzzer pre hex
=======
/**
* [COLOR description]
* @type {Object}
*/
_.COLOR = {
0: '\x1b\x72\x00', // black
1: '\x1b\x72\x01' // red
}
>>>>>>>
/**
* [BEEP description]
* @type {string}
*/
_.BEEP = '\x1b\x42', // Printer Buzzer pre hex
/**
* [COLOR description]
* @type {Object}
*/
_.COLOR = {
0: '\x1b\x72\x00', // black
1: '\x1b\x72\x01' // red
} |
<<<<<<<
importBootstrapFont: true,
bootstrapVersion: 3
=======
importBootstrapFont: true,
insertEmberWormholeElementToDom: true
>>>>>>>
importBootstrapFont: true,
insertEmberWormholeElementToDom: true,
bootstrapVersion: 3
<<<<<<<
},
treeForVendor(tree) {
let trees = [tree];
if (!this.hasPreprocessor()) {
trees.push(new Funnel(this.getBootstrapStylesPath(), {
destDir: 'ember-bootstrap'
}));
}
return mergeTrees(trees);
},
getBootstrapVersion() {
return parseInt(this.bootstrapOptions.bootstrapVersion);
},
getOtherBootstrapVersion() {
return this.getBootstrapVersion() === 3 ? 4 : 3;
},
treeForAddon() {
let tree = this._super.treeForAddon.apply(this, arguments);
let bsVersion = this.getBootstrapVersion();
let otherBsVersion = this.getOtherBootstrapVersion();
let componentsPath = 'modules/ember-bootstrap/components/';
tree = mv(tree, `${componentsPath}bs${bsVersion}/`, componentsPath);
tree = rm(tree, `${componentsPath}bs${otherBsVersion}/**/*`);
return tree; // log(tree, {output: 'tree', label: 'moved'});
},
treeForAddonTemplates() {
let tree = this._super.treeForAddonTemplates.apply(this, arguments);
let bsVersion = this.getBootstrapVersion();
let otherBsVersion = this.getOtherBootstrapVersion();
let templatePath = 'components/';
tree = mv(tree, `${templatePath}common/`, templatePath);
tree = mv(tree, `${templatePath}bs${bsVersion}/`, templatePath);
tree = rm(tree, `${templatePath}bs${otherBsVersion}/**/*`);
return tree; //log(tree, {output: 'tree', label: 'moved'});
},
treeForTemplates() {
let tree = this._super.treeForTemplates.apply(this, arguments);
let bsVersion = this.getBootstrapVersion();
let otherBsVersion = this.getOtherBootstrapVersion();
let templatePath = 'components/';
tree = mv(tree, `${templatePath}common/`, templatePath);
tree = mv(tree, `${templatePath}bs${bsVersion}/`, templatePath);
tree = rm(tree, `${templatePath}bs${otherBsVersion}/**/*`);
return tree; //log(tree, {output: 'tree', label: 'moved'});
=======
},
contentFor(type, config) {
if (type === 'body-footer' && config.environment !== 'test' && this.bootstrapOptions.insertEmberWormholeElementToDom !== false) {
return '<div id="ember-bootstrap-wormhole"></div>';
}
>>>>>>>
},
treeForVendor(tree) {
let trees = [tree];
if (!this.hasPreprocessor()) {
trees.push(new Funnel(this.getBootstrapStylesPath(), {
destDir: 'ember-bootstrap'
}));
}
return mergeTrees(trees);
},
getBootstrapVersion() {
return parseInt(this.bootstrapOptions.bootstrapVersion);
},
getOtherBootstrapVersion() {
return this.getBootstrapVersion() === 3 ? 4 : 3;
},
treeForAddon() {
let tree = this._super.treeForAddon.apply(this, arguments);
let bsVersion = this.getBootstrapVersion();
let otherBsVersion = this.getOtherBootstrapVersion();
let componentsPath = 'modules/ember-bootstrap/components/';
tree = mv(tree, `${componentsPath}bs${bsVersion}/`, componentsPath);
tree = rm(tree, `${componentsPath}bs${otherBsVersion}/**/*`);
return tree; // log(tree, {output: 'tree', label: 'moved'});
},
treeForAddonTemplates() {
let tree = this._super.treeForAddonTemplates.apply(this, arguments);
let bsVersion = this.getBootstrapVersion();
let otherBsVersion = this.getOtherBootstrapVersion();
let templatePath = 'components/';
tree = mv(tree, `${templatePath}common/`, templatePath);
tree = mv(tree, `${templatePath}bs${bsVersion}/`, templatePath);
tree = rm(tree, `${templatePath}bs${otherBsVersion}/**/*`);
return tree; //log(tree, {output: 'tree', label: 'moved'});
},
treeForTemplates() {
let tree = this._super.treeForTemplates.apply(this, arguments);
let bsVersion = this.getBootstrapVersion();
let otherBsVersion = this.getOtherBootstrapVersion();
let templatePath = 'components/';
tree = mv(tree, `${templatePath}common/`, templatePath);
tree = mv(tree, `${templatePath}bs${bsVersion}/`, templatePath);
tree = rm(tree, `${templatePath}bs${otherBsVersion}/**/*`);
return tree; //log(tree, {output: 'tree', label: 'moved'});
},
contentFor(type, config) {
if (type === 'body-footer' && config.environment !== 'test' && this.bootstrapOptions.insertEmberWormholeElementToDom !== false) {
return '<div id="ember-bootstrap-wormhole"></div>';
} |
<<<<<<<
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({})", result:"{}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({1,2,3,4,4})", result:"{1, 2, 3, 4, 4}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({123456789123456789,?})", result:"{123456789123456789}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({?,1,2,?,3,4,4,?,?})", result:"{1, 2, 3, 4, 4}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined(Sequence(If(IsInteger(a^2/2),a^2,?),a,1,10))", result:"{4, 16, 36, 64, 100}" },
{ cat:"IsInteger.1", cmd:"IsInteger(1.5)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(1)", result:"true" },
{ cat:"IsInteger.1", cmd:"IsInteger(44/3)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(44/2)", result:"true" },
{ cat:"IsInteger.1", cmd:"IsInteger(pi)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(?)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(a)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(123456789123456789.1)", result:"false" },
=======
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^4-4x^2+6))==a x^4-4x^2+6", result:"true" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^4-4x^2))==a x^4-4x^2", result:"true" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^2-4x))==a x^2-4x", result:"true" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^4-4x^2+6)", result:"6 - 16 / (4a) + a (x\u00B2 - 4 / (2a))\u00B2" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^4-4x^2)", result:"a (x\u00B2 - 4 / (2a))\u00B2 - 16 / (4a)" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^2-4x)", result:"a (x - 4 / (2a))\u00B2 - 16 / (4a)" },
>>>>>>>
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({})", result:"{}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({1,2,3,4,4})", result:"{1, 2, 3, 4, 4}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({123456789123456789,?})", result:"{123456789123456789}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({?,1,2,?,3,4,4,?,?})", result:"{1, 2, 3, 4, 4}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined(Sequence(If(IsInteger(a^2/2),a^2,?),a,1,10))", result:"{4, 16, 36, 64, 100}" },
{ cat:"IsInteger.1", cmd:"IsInteger(1.5)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(1)", result:"true" },
{ cat:"IsInteger.1", cmd:"IsInteger(44/3)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(44/2)", result:"true" },
{ cat:"IsInteger.1", cmd:"IsInteger(pi)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(?)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(a)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(123456789123456789.1)", result:"false" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^4-4x^2+6))==a x^4-4x^2+6", result:"true" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^4-4x^2))==a x^4-4x^2", result:"true" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^2-4x))==a x^2-4x", result:"true" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^4-4x^2+6)", result:"6 - 16 / (4a) + a (x\u00B2 - 4 / (2a))\u00B2" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^4-4x^2)", result:"a (x\u00B2 - 4 / (2a))\u00B2 - 16 / (4a)" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^2-4x)", result:"a (x - 4 / (2a))\u00B2 - 16 / (4a)" }, |
<<<<<<<
{ cat:"PlotSolve.1", cmd:"PlotSolve(x^2-2)", result:"{(-sqrt(2), 0), (sqrt(2), 0)}" },
=======
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({})", result:"{}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({1,2,3,4,4})", result:"{1, 2, 3, 4, 4}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({123456789123456789,?})", result:"{123456789123456789}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({?,1,2,?,3,4,4,?,?})", result:"{1, 2, 3, 4, 4}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined(Sequence(If(IsInteger(a^2/2),a^2,?),a,1,10))", result:"{4, 16, 36, 64, 100}" },
{ cat:"IsInteger.1", cmd:"IsInteger(1.5)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(1)", result:"true" },
{ cat:"IsInteger.1", cmd:"IsInteger(44/3)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(44/2)", result:"true" },
{ cat:"IsInteger.1", cmd:"IsInteger(pi)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(?)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(a)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(123456789123456789.1)", result:"false" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^4-4x^2+6))==a x^4-4x^2+6", result:"true" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^4-4x^2))==a x^4-4x^2", result:"true" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^2-4x))==a x^2-4x", result:"true" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^4-4x^2+6)", result:"6 - 16 / (4a) + a (x\u00B2 - 4 / (2a))\u00B2" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^4-4x^2)", result:"a (x\u00B2 - 4 / (2a))\u00B2 - 16 / (4a)" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^2-4x)", result:"a (x - 4 / (2a))\u00B2 - 16 / (4a)" },
>>>>>>>
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({})", result:"{}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({1,2,3,4,4})", result:"{1, 2, 3, 4, 4}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({123456789123456789,?})", result:"{123456789123456789}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined({?,1,2,?,3,4,4,?,?})", result:"{1, 2, 3, 4, 4}" },
{ cat:"RemoveUndefined.1", cmd:"RemoveUndefined(Sequence(If(IsInteger(a^2/2),a^2,?),a,1,10))", result:"{4, 16, 36, 64, 100}" },
{ cat:"IsInteger.1", cmd:"IsInteger(1.5)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(1)", result:"true" },
{ cat:"IsInteger.1", cmd:"IsInteger(44/3)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(44/2)", result:"true" },
{ cat:"IsInteger.1", cmd:"IsInteger(pi)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(?)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(a)", result:"false" },
{ cat:"IsInteger.1", cmd:"IsInteger(123456789123456789.1)", result:"false" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^4-4x^2+6))==a x^4-4x^2+6", result:"true" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^4-4x^2))==a x^4-4x^2", result:"true" },
{ cat:"CompleteSquare", cmd:"Expand(CompleteSquare(a x^2-4x))==a x^2-4x", result:"true" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^4-4x^2+6)", result:"6 - 16 / (4a) + a (x\u00B2 - 4 / (2a))\u00B2" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^4-4x^2)", result:"a (x\u00B2 - 4 / (2a))\u00B2 - 16 / (4a)" },
{ cat:"CompleteSquare", cmd:"CompleteSquare(a x^2-4x)", result:"a (x - 4 / (2a))\u00B2 - 16 / (4a)" },
{ cat:"PlotSolve.1", cmd:"PlotSolve(x^2-2)", result:"{(-sqrt(2), 0), (sqrt(2), 0)}" }, |
<<<<<<<
import { dropDBs, loadFixture, withLogin } from '../utils.js';
=======
import { withLogin } from '../utils.js';
import nock from 'nock';
import config from '../../src/config';
>>>>>>>
import config from '../../src/config';
import { dropDBs, loadFixture, withLogin } from '../utils.js'; |
<<<<<<<
let logger = new winston.createLogger({
format: winston.format.simple(),
transports: transports,
});
=======
let logger = winston.createLogger({
format: winston.format.simple(),
transports: transports,
})
>>>>>>>
let logger = winston.createLogger({
format: winston.format.simple(),
transports: transports,
}); |
<<<<<<<
fs.readdirSync(path.join(__dirname, "routes")).map(file => {
require("./routes/" + file)(api)
})
api.listen(config.server.port, err => {
if (err) {
logger.error(err)
process.exit(1)
}
logger.info(`API is now running on port ${config.server.port} in ${config.env} mode`)
})
=======
if (require.main === module) {
api.listen(config.server.port, err => {
if (err) {
logger.error(err)
process.exit(1)
}
require("./utils/db")
fs.readdirSync(path.join(__dirname, "routes")).map(file => {
if (file.endsWith(".js")) {
require("./routes/" + file)(api)
}
})
logger.info(`API is now running on port ${config.server.port} in ${config.env} mode`)
})
}
>>>>>>>
fs.readdirSync(path.join(__dirname, "routes")).map(file => {
require("./routes/" + file)(api)
})
if (require.main === module) {
require("./utils/db")
api.listen(config.server.port, err => {
if (err) {
logger.error(err)
process.exit(1)
}
logger.info(`API is now running on port ${config.server.port} in ${config.env} mode`)
})
} |
<<<<<<<
const invalidExtensions = ['mp3', 'mp4', 'mov', 'm4a', 'mpeg'];
=======
>>>>>>> |
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_7__fields_select__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_6__fields_select__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_7__fields_select__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_10__fields_range__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_9__fields_range__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_10__fields_range__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_9__fields_radio__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_8__fields_radio__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_9__fields_radio__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_8__fields_checkbox__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_7__fields_checkbox__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_8__fields_checkbox__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_11__fields_button__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_10__fields_button__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_11__fields_button__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_12__fields_button_editable__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_11__fields_button_editable__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_12__fields_button_editable__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_13__fields_color__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_12__fields_color__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_13__fields_color__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_14__fields_dropdown__["a" /* default */])(props, config);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_13__fields_dropdown__["a" /* default */])(props, config);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_14__fields_dropdown__["a" /* default */])(props, config);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_15__fields_code_editor__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_14__fields_code_editor__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_15__fields_code_editor__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_16__fields_date_time__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_15__fields_date_time__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_16__fields_date_time__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_17__fields_form_toggle__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_16__fields_form_toggle__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_17__fields_form_toggle__["a" /* default */])(props, config, attributeKey);
<<<<<<<
fields[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_18__fields_tree_select__["a" /* default */])(props, config, attributeKey);
=======
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_17__fields_tree_select__["a" /* default */])(props, config, attributeKey);
>>>>>>>
field[attributeKey] = Object(__WEBPACK_IMPORTED_MODULE_18__fields_tree_select__["a" /* default */])(props, config, attributeKey);
<<<<<<<
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
=======
function buttonEditable(props, config, attributeKey) {
var defaultValue = config.default || '';
var defaultAttributes = {
placeholder: __('Add text…'),
tagName: 'span',
value: props.attributes[attributeKey] ? props.attributes[attributeKey].text : defaultValue,
className: 'wp-block-button__link',
keepPlaceholderOnFocus: true
};
var fieldAttributes = _.extend(defaultAttributes, config);
fieldAttributes.onChange = function (value) {
if (config.onChange) {
config.onChange(value, props);
} else {
var newAttributes = {};
var buttonValue = _.extend({}, props.attributes[attributeKey] || {});
buttonValue.text = value;
newAttributes[attributeKey] = buttonValue;
props.setAttributes(newAttributes);
}
};
fieldAttributes.onInputChange = function (value) {
if (config.onInputChange) {
config.onInputChange(value, props);
} else {
var newAttributes = {};
var buttonValue = _.extend({}, props.attributes[attributeKey] || {});
buttonValue.link = value;
newAttributes[attributeKey] = buttonValue;
props.setAttributes(newAttributes);
}
};
return React.createElement(__WEBPACK_IMPORTED_MODULE_0__components_button_editable__["a" /* default */], {
fieldAttributes: fieldAttributes,
inputValue: props.attributes[attributeKey] ? props.attributes[attributeKey].link : '',
buttonValue: fieldAttributes.value,
isSelected: props.isSelected
});
}
/***/ }),
/* 15 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
>>>>>>>
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
<<<<<<<
/* harmony export (immutable) */ __webpack_exports__["a"] = dateTime;
=======
/* harmony export (immutable) */ __webpack_exports__["a"] = text;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__input_field__ = __webpack_require__(5);
>>>>>>>
/* harmony export (immutable) */ __webpack_exports__["a"] = dateTime;
<<<<<<<
function dateTime(props, config, attributeKey) {
var is12HourTime = /a(?!\\)/i.test(settings.formats.time.toLowerCase() // Test only the lower case a
.replace(/\\\\/g, '') // Replace "//" with empty strings
.split('').reverse().join('') // Reverse the string and test for "a" not followed by a slash
);
=======
function text(props, config, attributeKey) {
if ('inspector' === config.placement) {
return Object(__WEBPACK_IMPORTED_MODULE_0__input_field__["a" /* default */])(props, config, attributeKey);
}
>>>>>>>
function dateTime(props, config, attributeKey) {
var is12HourTime = /a(?!\\)/i.test(settings.formats.time.toLowerCase() // Test only the lower case a
.replace(/\\\\/g, '') // Replace "//" with empty strings
.split('').reverse().join('') // Reverse the string and test for "a" not followed by a slash
); |
<<<<<<<
name: 'CacheSettings',
path: '/admin/CacheSettings'.toLowerCase(),
components: {
default: CacheSettings,
navigation: AdminPanel
}
},
{
name: 'AddCategory',
path: '/admin/AddCategory'.toLowerCase(),
=======
name: 'CreateCategory',
path: '/admin/CreateCategory'.toLowerCase(),
>>>>>>>
name: 'CacheSettings',
path: '/admin/CacheSettings'.toLowerCase(),
components: {
default: CacheSettings,
navigation: AdminPanel
}
},
{
name: 'CreateCategory',
path: '/admin/CreateCategory'.toLowerCase(), |
<<<<<<<
export DeletedElements from './DeletedElements'
=======
export CategoriesAdmin from './CategoriesAdmin'
export CategoryItem from './CategoryItem'
export ImagesCleaner from './ImagesCleaner'
export adminGetAllCategories from './adminGetAllCategories'
export ProfileRoles from './ProfileRoles'
export RolesPage from './RolesPage'
export RolesPermissions from './RolesPermissions'
export RoleUsers from './RoleUsers'
export CategoryForm from './CreateEditCategory/CategoryForm'
export CreateCategory from './CreateEditCategory/CreateCategory'
export EditCategory from './CreateEditCategory/EditCategory'
export cachePolicies from './cachePolicies'
>>>>>>>
export DeletedElements from './DeletedElements'
export ImagesCleaner from './ImagesCleaner' |
<<<<<<<
* @param {string} attributeName Name of the attribute for faceting (eg. "free_shipping")
* @param {number} [limit = 10] How many facets values to retrieve [*]
* @param {number} [showMoreLimit] How many facets values to retrieve when `toggleShowMore` is called, this value is meant to be greater than `limit` option
* @param {string[]|function} [sortBy = ['isRefined', 'count:desc']] How to sort refinements. Possible values: `count|isRefined|name:asc|name:desc`.
=======
* @property {string} attributeName Name of the attribute for faceting (eg. "free_shipping")
* @property {number} [limit = 10] How many facets values to retrieve [*]
* @property {string[]|function} [sortBy = ['isRefined', 'count:desc']] How to sort refinements. Possible values: `count|isRefined|name:asc|name:desc`.
>>>>>>>
* @property {string} attributeName Name of the attribute for faceting (eg. "free_shipping")
* @property {number} [limit = 10] How many facets values to retrieve [*]
* @property {number} [showMoreLimit] How many facets values to retrieve when `toggleShowMore` is called, this value is meant to be greater than `limit` option
* @property {string[]|function} [sortBy = ['isRefined', 'count:desc']] How to sort refinements. Possible values: `count|isRefined|name:asc|name:desc`. |
<<<<<<<
instantsearch.widgets.sortBy({
container: '#sort-by',
items: [
{name: 'ikea', label: 'Featured'},
{name: 'ikea_price_asc', label: 'Price asc.'},
{name: 'ikea_price_desc', label: 'Price desc.'}
=======
instantsearch.widgets.sortBySelector({
container: '#sort-by-selector',
indices: [
{name: 'instant_search', label: 'Featured'},
{name: 'instant_search_price_asc', label: 'Price asc.'},
{name: 'instant_search_price_desc', label: 'Price desc.'}
>>>>>>>
instantsearch.widgets.sortBy({
container: '#sort-by',
items: [
{name: 'instant_search', label: 'Featured'},
{name: 'instant_search_price_asc', label: 'Price asc.'},
{name: 'instant_search_price_desc', label: 'Price desc.'} |
<<<<<<<
export default '1.1.1';
=======
module.exports = '1.1.2';
>>>>>>>
export default '1.1.2'; |
<<<<<<<
import expect from 'expect';
=======
import jsHelper from 'algoliasearch-helper';
>>>>>>>
import expect from 'expect';
import jsHelper from 'algoliasearch-helper'; |
<<<<<<<
export {default as pagination} from './pagination';
export {default as hitsPerPageSelector} from './hits-per-page.js';
export {default as hits} from './hits.js';
=======
export {default as pagination} from './pagination';
export {default as hits} from './hits';
export {default as refinementList} from './refinementList';
export {default as hitsPerPageSelector} from './hitsPerPageSelector';
export {default as numericSelector} from './numericSelector';
export {default as numericRefinementList} from './numericRefinementList';
>>>>>>>
export {default as pagination} from './pagination';
export {default as hitsPerPageSelector} from './hits-per-page.js';
export {default as hits} from './hits';
export {default as refinementList} from './refinementList';
export {default as numericSelector} from './numericSelector';
export {default as numericRefinementList} from './numericRefinementList'; |
<<<<<<<
const port = window.location.port ? `:${window.location.port}` : '';
return `${window.location.protocol}//${window.location.hostname}${port}`;
=======
return `${window.location.protocol}//${window.location.hostname}${window
.location.port
? `:${window.location.port}`
: ''}`;
>>>>>>>
return `${window.location.protocol}//${window.location.hostname}${window
.location.port
? `:${window.location.port}`
: ''}`;
<<<<<<<
const foreignConfig = AlgoliaSearchHelper
.getForeignConfigurationInQueryString(currentQueryString, {mapping: this.mapping});
=======
const foreignConfig = AlgoliaSearchHelper.getForeignConfigurationInQueryString(
currentQueryString,
{ mapping: this.mapping }
);
// eslint-disable-next-line camelcase
foreignConfig.is_v = majorVersionNumber;
>>>>>>>
const foreignConfig = AlgoliaSearchHelper.getForeignConfigurationInQueryString(
currentQueryString,
{ mapping: this.mapping }
);
<<<<<<<
createURL(state, {absolute}) {
=======
createURL(state, { absolute }) {
const currentQueryString = this.urlUtils.readUrl();
>>>>>>>
createURL(state, { absolute }) {
<<<<<<<
const relative = this
.urlUtils
.createURL(algoliasearchHelper.url.getQueryStringFromState(filteredState, {mapping: this.mapping}));
=======
const foreignConfig = algoliasearchHelper.url.getUnrecognizedParametersInQueryString(
currentQueryString,
{ mapping: this.mapping }
);
// Add instantsearch version to reconciliate old url with newer versions
// eslint-disable-next-line camelcase
foreignConfig.is_v = majorVersionNumber;
const relative = this.urlUtils.createURL(
algoliasearchHelper.url.getQueryStringFromState(filteredState, {
mapping: this.mapping,
})
);
>>>>>>>
const relative = this.urlUtils.createURL(
algoliasearchHelper.url.getQueryStringFromState(filteredState, {
mapping: this.mapping,
})
); |
<<<<<<<
if (reset) {
const resetButtonContainer = containerNode.tagName === 'INPUT'
? containerNode.parentNode
: containerNode;
// hide reset button when there is no query
const resetButton = resetButtonContainer.querySelector('button[type="reset"]');
resetButton.style.display = query && query.trim() ? 'block' : 'none';
}
=======
const resetButtonContainer =
containerNode.tagName === 'INPUT'
? containerNode.parentNode
: containerNode;
// hide reset button when there is no query
const resetButton = resetButtonContainer.querySelector(
'button[type="reset"]'
);
resetButton.style.display = query && query.trim() ? 'block' : 'none';
>>>>>>>
if (reset) {
const resetButtonContainer =
containerNode.tagName === 'INPUT'
? containerNode.parentNode
: containerNode;
// hide reset button when there is no query
const resetButton = resetButtonContainer.querySelector(
'button[type="reset"]'
);
resetButton.style.display = query && query.trim() ? 'block' : 'none';
}
<<<<<<<
const resetCSSClasses = {root: cx(bem('reset'), reset.cssClasses.root)};
const stringNode = processTemplate(reset.template, {cssClasses: resetCSSClasses});
=======
const resetCSSClasses = { root: cx(bem('reset'), reset.cssClasses.root) };
const stringNode = processTemplate(resetTemplate, {
cssClasses: resetCSSClasses,
});
>>>>>>>
const resetCSSClasses = { root: cx(bem('reset'), reset.cssClasses.root) };
const stringNode = processTemplate(reset.template, {
cssClasses: resetCSSClasses,
});
<<<<<<<
const magnifierCSSClasses = {root: cx(bem('magnifier'), magnifier.cssClasses.root)};
const stringNode = processTemplate(magnifier.template, {cssClasses: magnifierCSSClasses});
=======
const magnifierCSSClasses = {
root: cx(bem('magnifier'), magnifier.cssClasses.root),
};
const stringNode = processTemplate(magnifierTemplate, {
cssClasses: magnifierCSSClasses,
});
>>>>>>>
const magnifierCSSClasses = {
root: cx(bem('magnifier'), magnifier.cssClasses.root),
};
const stringNode = processTemplate(magnifier.template, {
cssClasses: magnifierCSSClasses,
}); |
<<<<<<<
fluid.transforms.value.invert = function (transformSpec, transform) {
var togo = fluid.copy(transformSpec);
=======
fluid.transforms.value.invert = function (expandSpec, expander) {
var togo = fluid.copy(expandSpec);
>>>>>>>
fluid.transforms.value.invert = function (transformSpec, transform) {
var togo = fluid.copy(transformSpec);
<<<<<<<
fluid.transforms.literalValue = function (transformSpec) {
return transformSpec.value;
=======
fluid.transforms.literalValue = function (expanderSpec) {
return expanderSpec.value;
>>>>>>>
fluid.transforms.literalValue = function (transformSpec) {
return transformSpec.value;
<<<<<<<
fluid.transforms["delete"] = function (transformSpec, transform) {
var outputPath = fluid.model.composePaths(transform.outputPrefix, transformSpec.outputPath);
transform.applier.requestChange(outputPath, null, "DELETE");
=======
fluid.transforms["delete"] = function (expandSpec, expander) {
var outputPath = fluid.model.composePaths(expander.outputPrefix, expandSpec.outputPath);
expander.applier.requestChange(outputPath, null, "DELETE");
>>>>>>>
fluid.transforms["delete"] = function (transformSpec, transform) {
var outputPath = fluid.model.composePaths(transform.outputPrefix, transformSpec.outputPath);
transform.applier.requestChange(outputPath, null, "DELETE");
<<<<<<<
fluid.transforms.firstValue = function (transformSpec, transform) {
if (!transformSpec.values || !transformSpec.values.length) {
fluid.fail("firstValue transformer requires an array of values at path named \"values\", supplied", transformSpec);
=======
fluid.transforms.firstValue = function (expandSpec, expander) {
if (!expandSpec.values || !expandSpec.values.length) {
fluid.fail("firstValue transformer requires an array of values at path named \"values\", supplied", expandSpec);
>>>>>>>
fluid.transforms.firstValue = function (transformSpec, transform) {
if (!transformSpec.values || !transformSpec.values.length) {
fluid.fail("firstValue transformer requires an array of values at path named \"values\", supplied", transformSpec);
<<<<<<<
fluid.transforms.linearScale = function (inputs, transformSpec, transform) {
=======
fluid.transforms.linearScale = function (inputs, expandSpec, expander) {
>>>>>>>
fluid.transforms.linearScale = function (inputs, transformSpec, transform) {
<<<<<<<
fluid.transforms.linearScale.invert = function (transformSpec, transform) {
var togo = fluid.copy(transformSpec);
togo.type = "fluid.transforms.inverseLinearScale";
togo.valuePath = fluid.model.composePaths(transform.outputPrefix, transformSpec.outputPath);
togo.outputPath = fluid.model.composePaths(transform.inputPrefix, transformSpec.valuePath);
return togo;
};
fluid.defaults("fluid.transforms.inverseLinearScale", {
gradeNames: [ "fluid.multiInputTransformFunction", "fluid.standardOutputTransformFunction" ],
inputVariables: {
value: null,
factor: 1,
offset: 0
}
});
/* inverse linear transformation y = (x-b)/a where a=factor, b=offset and x=value */
fluid.transforms.inverseLinearScale = function (inputs, transformSpec, transform) {
if (typeof(inputs.value) !== "number" || typeof(inputs.factor) !== "number" || typeof(inputs.offset) !== "number") {
return undefined;
}
return (inputs.value - inputs.offset) / inputs.factor;
};
=======
/* TODO: This inversion doesn't work if the value and factors are given as paths in the source model */
fluid.transforms.linearScale.invert = function (expandSpec, expander) {
var togo = fluid.copy(expandSpec);
togo.type = "fluid.transforms.linearScale";
if (togo.factor) {
togo.factor = (togo.factor === 0) ? 0 : 1 / togo.factor;
}
if (togo.offset) {
togo.offset = - togo.offset * (togo.factor != undefined ? togo.factor : 1);
}
togo.valuePath = fluid.model.composePaths(expander.outputPrefix, expandSpec.outputPath);
togo.outputPath = fluid.model.composePaths(expander.inputPrefix, expandSpec.valuePath);
return togo;
};
>>>>>>>
/* TODO: This inversion doesn't work if the value and factors are given as paths in the source model */
fluid.transforms.linearScale.invert = function (transformSpec, expander) {
var togo = fluid.copy(transformSpec);
togo.type = "fluid.transforms.linearScale";
if (togo.factor) {
togo.factor = (togo.factor === 0) ? 0 : 1 / togo.factor;
}
if (togo.offset) {
togo.offset = - togo.offset * (togo.factor != undefined ? togo.factor : 1);
}
togo.valuePath = fluid.model.composePaths(transform.outputPrefix, transformSpec.outputPath);
togo.outputPath = fluid.model.composePaths(transform.inputPrefix, transformSpec.valuePath);
return togo;
};
<<<<<<<
fluid.transforms.binaryOp = function (inputs, transformSpec, transform) {
var operator = fluid.model.transform.getValue(undefined, transformSpec.operator, transform);
=======
fluid.transforms.binaryOp = function (inputs, expandSpec, expander) {
var operator = fluid.model.transform.getValue(undefined, expandSpec.operator, expander);
>>>>>>>
fluid.transforms.binaryOp = function (inputs, transformSpec, transform) {
var operator = fluid.model.transform.getValue(undefined, transformSpec.operator, transform);
<<<<<<<
fluid.transforms.condition = function (inputs, transformSpec, transform) {
=======
fluid.transforms.condition = function (inputs, expandSpec, expander) {
>>>>>>>
fluid.transforms.condition = function (inputs, transformSpec, transform) {
<<<<<<<
fluid.transforms.valueMapper = function (transformSpec, transform) {
if (!transformSpec.options) {
fluid.fail("demultiplexValue requires a list or hash of options at path named \"options\", supplied ", transformSpec);
=======
fluid.transforms.valueMapper = function (expandSpec, expander) {
if (!expandSpec.options) {
fluid.fail("demultiplexValue requires a list or hash of options at path named \"options\", supplied ", expandSpec);
>>>>>>>
fluid.transforms.valueMapper = function (transformSpec, transform) {
if (!transformSpec.options) {
fluid.fail("demultiplexValue requires a list or hash of options at path named \"options\", supplied ", transformSpec);
<<<<<<<
fluid.transforms.valueMapper.invert = function (transformSpec, transform) {
=======
fluid.transforms.valueMapper.invert = function (expandSpec, expander) {
>>>>>>>
fluid.transforms.valueMapper.invert = function (transformSpec, transform) {
<<<<<<<
fluid.transforms.valueMapper.collect = function (transformSpec, transform) {
=======
fluid.transforms.valueMapper.collect = function (expandSpec, expander) {
>>>>>>>
fluid.transforms.valueMapper.collect = function (transformSpec, transform) {
<<<<<<<
fluid.transforms.arrayToSetMembership = function (value, transformSpec, transform) {
var options = transformSpec.options;
=======
fluid.transforms.arrayToSetMembership = function (value, expandSpec, expander) {
var options = expandSpec.options;
>>>>>>>
fluid.transforms.arrayToSetMembership = function (value, transformSpec, transform) {
var options = transformSpec.options;
<<<<<<<
fluid.transforms.arrayToSetMembership.invert = function (transformSpec, transform) {
var togo = fluid.copy(transformSpec);
=======
fluid.transforms.arrayToSetMembership.invert = function (expandSpec, expander) {
var togo = fluid.copy(expandSpec);
>>>>>>>
fluid.transforms.arrayToSetMembership.invert = function (transformSpec, transform) {
var togo = fluid.copy(transformSpec);
<<<<<<<
togo.type = "fluid.transforms.setMembershipToArray";
togo.outputPath = fluid.model.composePaths(transform.inputPrefix, transformSpec.inputPath);
=======
togo.type = "fluid.transforms.setMembershipToArray";
togo.outputPath = fluid.model.composePaths(expander.inputPrefix, expandSpec.inputPath);
>>>>>>>
togo.type = "fluid.transforms.setMembershipToArray";
togo.outputPath = fluid.model.composePaths(transform.inputPrefix, transformSpec.inputPath);
<<<<<<<
fluid.transforms.setMembershipToArray = function (transformSpec, transform) {
var options = transformSpec.options;
=======
fluid.transforms.setMembershipToArray = function (expandSpec, expander) {
var options = expandSpec.options;
>>>>>>>
fluid.transforms.setMembershipToArray = function (transformSpec, transform) {
var options = transformSpec.options;
<<<<<<<
fluid.transforms.arrayToObject = function (arr, transformSpec, transform) {
if (transformSpec.key === undefined) {
fluid.fail("arrayToObject requires a 'key' option.", transformSpec);
=======
fluid.transforms.arrayToObject = function (arr, expandSpec, expander) {
if (expandSpec.key === undefined) {
fluid.fail("arrayToObject requires a 'key' option.", expandSpec);
>>>>>>>
fluid.transforms.arrayToObject = function (arr, transformSpec, transform) {
if (transformSpec.key === undefined) {
fluid.fail("arrayToObject requires a 'key' option.", transformSpec);
<<<<<<<
fluid.transforms.arrayToObject.invert = function (transformSpec, transform) {
var togo = fluid.copy(transformSpec);
togo.type = "fluid.transforms.objectToArray";
togo.inputPath = fluid.model.composePaths(transform.outputPrefix, transformSpec.outputPath);
togo.outputPath = fluid.model.composePaths(transform.inputPrefix, transformSpec.inputPath);
// invert transforms from innerValue as well:
=======
fluid.transforms.arrayToObject.invert = function (expandSpec, expander) {
var togo = fluid.copy(expandSpec);
togo.type = "fluid.transforms.objectToArray";
togo.inputPath = fluid.model.composePaths(expander.outputPrefix, expandSpec.outputPath);
togo.outputPath = fluid.model.composePaths(expander.inputPrefix, expandSpec.inputPath);
// invert expanders from innerValue as well:
>>>>>>>
fluid.transforms.arrayToObject.invert = function (transformSpec, transform) {
var togo = fluid.copy(transformSpec);
togo.type = "fluid.transforms.objectToArray";
togo.inputPath = fluid.model.composePaths(transform.outputPrefix, transformSpec.outputPath);
togo.outputPath = fluid.model.composePaths(transform.inputPrefix, transformSpec.inputPath);
// invert transforms from innerValue as well:
<<<<<<<
fluid.transforms.objectToArray = function (hash, transformSpec, transform) {
if (transformSpec.key === undefined) {
fluid.fail("objectToArray requires a 'key' option.", transformSpec);
=======
fluid.transforms.objectToArray = function (hash, expandSpec, expander) {
if (expandSpec.key === undefined) {
fluid.fail("objectToArray requires a 'key' option.", expandSpec);
>>>>>>>
fluid.transforms.objectToArray = function (hash, transformSpec, transform) {
if (transformSpec.key === undefined) {
fluid.fail("objectToArray requires a 'key' option.", transformSpec); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.