conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
/** @type {TODO} */ ({
name: "ModuleConcatenationPlugin",
stage: STAGE_DEFAULT
}),
(chunks, modules) => {
const chunkGraph = compilation.chunkGraph;
=======
"ModuleConcatenationPlugin",
(allChunks, modules) => {
>>>>>>>
/** @type {TODO} */ ({
name: "ModuleConcatenationPlugin",
stage: STAGE_DEFAULT
}),
(allChunks, modules) => {
const chunkGraph = compilation.chunkGraph;
<<<<<<<
// add to builtModules when one of the included modules was built
if (compilation.builtModules.has(m)) {
compilation.builtModules.add(newModule);
=======
for (const chunk of chunks) {
chunk.removeModule(m);
}
}
for (const chunk of chunks) {
chunk.addModule(newModule);
newModule.addChunk(chunk);
}
for (const chunk of allChunks) {
if (chunk.entryModule === concatConfiguration.rootModule) {
chunk.entryModule = newModule;
}
}
compilation.modules.push(newModule);
for (const reason of newModule.reasons) {
if (reason.dependency.module === concatConfiguration.rootModule)
reason.dependency.module = newModule;
if (
reason.dependency.redirectedModule ===
concatConfiguration.rootModule
)
reason.dependency.redirectedModule = newModule;
}
// TODO: remove when LTS node version contains fixed v8 version
// @see https://github.com/webpack/webpack/pull/6613
// Turbofan does not correctly inline for-of loops with polymorphic input arrays.
// Work around issue by using a standard for loop and assigning dep.module.reasons
for (let i = 0; i < newModule.dependencies.length; i++) {
let dep = newModule.dependencies[i];
if (dep.module) {
let reasons = dep.module.reasons;
for (let j = 0; j < reasons.length; j++) {
let reason = reasons[j];
if (reason.dependency === dep) {
reason.module = newModule;
}
}
>>>>>>>
// add to builtModules when one of the included modules was built
if (compilation.builtModules.has(m)) {
compilation.builtModules.add(newModule); |
<<<<<<<
=======
const ConstPlugin = require("./ConstPlugin");
const CommonJsStuffPlugin = require("./CommonJsStuffPlugin");
>>>>>>>
const CommonJsStuffPlugin = require("./CommonJsStuffPlugin"); |
<<<<<<<
/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
=======
/** @typedef {import("./util/createHash").Hash} Hash */
>>>>>>>
/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
/** @typedef {import("./util/createHash").Hash} Hash */ |
<<<<<<<
import AVAILABLE_CONFIGS from 'Parser/AVAILABLE_CONFIGS';
import getFightName from 'common/getFightName';
import { fetchReport } from 'actions/report';
import { appendReportHistory } from 'actions/reportHistory';
import { fetchCombatants } from 'actions/combatants';
import { getFightId, getPlayerId, getPlayerName, getReportCode } from 'selectors/url/report';
import { getArticleId } from 'selectors/url/news';
import { getContributorId } from 'selectors/url/contributors';
import { getCharRegion, getCharRealm, getCharName } from 'selectors/url/character';
import { getReport } from 'selectors/report';
import { getFightById } from 'selectors/fight';
import { getCombatants } from 'selectors/combatants';
import { API_DOWN, apiDownError, clearError, INTERNET_EXPLORER, internetExplorerError, REPORT_NOT_FOUND, reportNotFoundError, UNKNOWN_NETWORK_ISSUE, unknownError, unknownNetworkIssueError } from 'actions/error';
=======
import { API_DOWN, clearError, INTERNET_EXPLORER, internetExplorerError, REPORT_NOT_FOUND, UNKNOWN_NETWORK_ISSUE } from 'actions/error';
>>>>>>>
import { API_DOWN, clearError, INTERNET_EXPLORER, internetExplorerError, REPORT_NOT_FOUND, UNKNOWN_NETWORK_ISSUE } from 'actions/error';
<<<<<<<
import ContributorDetails from './Contributors/ContributorDetails';
import CharacterParses from './Character/CharacterParses';
=======
>>>>>>>
<<<<<<<
import ActivityIndicator from './ActivityIndicator';
import CharacterSelecter from './Character/CharacterSelecter';
const timeAvailable = console.time && console.timeEnd;
const PROGRESS_STEP1_INITIALIZATION = 0.02;
const PROGRESS_STEP2_FETCH_EVENTS = 0.13;
const PROGRESS_STEP3_PARSE_EVENTS = 0.99;
/* eslint-disable no-alert */
=======
import Report from './Report';
import ContributorDetails from './Contributors/ContributorDetails';
>>>>>>>
import Report from './Report';
import ContributorDetails from './Contributors/ContributorDetails';
import CharacterParses from './Character/CharacterParses';
import CharacterSelecter from './Character/CharacterSelecter';
<<<<<<<
reportCode: PropTypes.string,
articleId: PropTypes.string,
contributorId: PropTypes.string,
charRegion: PropTypes.string,
charRealm: PropTypes.string,
charName: PropTypes.string,
playerName: PropTypes.string,
playerId: PropTypes.number,
fightId: PropTypes.number,
report: PropTypes.shape({
title: PropTypes.string.isRequired,
code: PropTypes.string.isRequired,
}),
fight: PropTypes.shape({
start_time: PropTypes.number.isRequired,
end_time: PropTypes.number.isRequired,
boss: PropTypes.number.isRequired,
}),
combatants: PropTypes.arrayOf(PropTypes.shape({
sourceID: PropTypes.number.isRequired,
})),
fetchReport: PropTypes.func.isRequired,
fetchCombatants: PropTypes.func.isRequired,
=======
isHome: PropTypes.bool,
>>>>>>>
isHome: PropTypes.bool,
<<<<<<<
getChildContext() {
return {
config: this.state.config,
};
}
getConfig(specId) {
return AVAILABLE_CONFIGS.find(config => config.spec.id === specId);
}
createParser(ParserClass, report, fight, player) {
const playerPets = this.getPlayerPetsFromReport(report, player.id);
return new ParserClass(report, player, playerPets, fight);
}
async fetchEventsAndParse(report, fight, combatants, combatant, player) {
// We use the setState callback for triggering UI updates to allow our CSS animations to work
await this.setStatePromise({
progress: 0,
});
const config = this.getConfig(combatant.specID);
timeAvailable && console.time('full parse');
const parser = this.createParser(config.parser, report, fight, player);
// We send combatants already to the analyzer so it can show the results page with the correct items and talents while waiting for the API request
parser.initialize(combatants);
await this.setStatePromise({
config,
parser,
progress: PROGRESS_STEP1_INITIALIZATION,
});
await this.parse(parser, report, player, fight);
}
async parse(parser, report, player, fight) {
this._jobId += 1;
const jobId = this._jobId;
let events;
try {
this.startFakeNetworkProgress();
events = await fetchEvents(report.code, fight.start_time, fight.end_time, player.id);
this.stopFakeNetworkProgress();
} catch (err) {
this.stopFakeNetworkProgress();
if (err instanceof LogNotFoundError) {
this.props.reportNotFoundError();
} else if (err instanceof ApiDownError) {
this.props.apiDownError();
} else if (err instanceof JsonParseError) {
captureException(err);
this.props.unknownError('JSON parse error, the API response is probably corrupt. Let us know on Discord and we may be able to fix it for you.');
} else {
// Some kind of network error, internet may be down.
captureException(err);
this.props.unknownNetworkIssueError(err);
}
return;
}
try {
events = parser.normalize(events);
await this.setStatePromise({
progress: PROGRESS_STEP2_FETCH_EVENTS,
});
const batchSize = 400;
const numEvents = events.length;
let offset = 0;
while (offset < numEvents) {
if (this._jobId !== jobId) {
return;
}
const eventsBatch = events.slice(offset, offset + batchSize);
parser.parseEvents(eventsBatch);
// await-ing setState does not ensure we wait until a render completed, so instead we wait 1 frame
const progress = Math.min(1, (offset + batchSize) / numEvents);
this.setState({
progress: PROGRESS_STEP2_FETCH_EVENTS + (PROGRESS_STEP3_PARSE_EVENTS - PROGRESS_STEP2_FETCH_EVENTS) * progress,
dataVersion: this.state.dataVersion + 1, // each time we parsed events we want to refresh the report, progress might not have updated
});
await this.timeout(1000 / 60);
offset += batchSize;
}
parser.fabricateEvent({
type: 'finished',
});
timeAvailable && console.timeEnd('full parse');
this.setState({
progress: 1.0,
});
} catch (err) {
captureException(err);
if (process.env.NODE_ENV === 'development') {
// Something went wrong during the analysis of the log, there's probably an issue in your analyzer or one of its modules.
throw err;
} else {
alert(`The report could not be parsed because an error occured while running the analysis. ${err.message}`);
}
}
}
_isFakeNetworking = false;
async startFakeNetworkProgress() {
this._isFakeNetworking = true;
const expectedDuration = 5000;
const stepInterval = 50;
const jobId = this._jobId;
let step = 1;
while (this._isFakeNetworking) {
if (this._jobId !== jobId) {
// This could happen when switching players/fights while still loading another one
break;
}
const progress = Math.min(1, step * stepInterval / expectedDuration);
this.setState({
progress: PROGRESS_STEP1_INITIALIZATION + ((PROGRESS_STEP2_FETCH_EVENTS - PROGRESS_STEP1_INITIALIZATION) * progress),
});
await this.timeout(stepInterval);
step += 1;
}
}
stopFakeNetworkProgress() {
this._isFakeNetworking = false;
}
timeout(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
async fetchCombatantsForFight(report, fight) {
try {
await this.props.fetchCombatants(report.code, fight.start_time, fight.end_time);
} catch (err) {
// TODO: Redirect to homepage
this.reset();
if (err instanceof LogNotFoundError) {
this.props.reportNotFoundError();
} else if (err instanceof ApiDownError) {
this.props.apiDownError();
} else if (err instanceof JsonParseError) {
captureException(err);
this.props.unknownError('JSON parse error, the API response is probably corrupt. Let us know on Discord and we may be able to fix it for you.');
} else {
// Some kind of network error, internet may be down.
captureException(err);
this.props.unknownNetworkIssueError(err);
}
}
}
reset() {
this._jobId += 1;
this.setState({
config: null,
parser: null,
progress: 0,
});
this.stopFakeNetworkProgress();
}
componentWillMount() {
this.fetchReportIfNecessary({});
}
componentDidUpdate(prevProps, prevState) {
ReactTooltip.rebuild();
this.fetchReportIfNecessary(prevProps);
this.fetchCombatantsIfNecessary(prevProps, prevState);
this.fetchEventsAndParseIfNecessary(prevProps, prevState);
}
fetchReportIfNecessary(prevProps) {
if (this.props.error || isIE()) {
return;
}
if (this.props.reportCode && this.props.reportCode !== prevProps.reportCode) {
this.props.fetchReport(this.props.reportCode)
.catch(err => {
this.reset();
if (err instanceof LogNotFoundError) {
this.props.reportNotFoundError();
} else if (err instanceof ApiDownError) {
this.props.apiDownError();
} else if (err instanceof CorruptResponseError) {
captureException(err);
this.props.unknownError('Corrupt Warcraft Logs API response received, this report can not be processed.');
} else if (err instanceof JsonParseError) {
captureException(err);
this.props.unknownError('JSON parse error, the API response is probably corrupt. Let us know on Discord and we may be able to fix it for you.');
} else {
// Some kind of network error, internet may be down.
captureException(err);
this.props.unknownNetworkIssueError(err);
}
});
}
}
fetchCombatantsIfNecessary(prevProps, prevState) {
if (this.isReportValid && this.props.fight && (this.props.report !== prevProps.report || this.props.fight !== prevProps.fight)) {
// A report has been loaded, it is the report the user wants (this can be a mismatch if a new report is still loading), a fight was selected, and one of the fight-relevant things was changed
this.fetchCombatantsForFight(this.props.report, this.props.fight);
}
}
fetchEventsAndParseIfNecessary(prevProps, prevState) {
const changed = this.props.report !== prevProps.report
|| this.props.combatants !== prevProps.combatants
|| this.props.fightId !== prevProps.fightId
|| this.props.playerName !== prevProps.playerName
|| this.props.playerId !== prevProps.playerId;
if (changed) {
this.reset();
const report = this.props.report;
const fight = this.props.fight;
const combatants = this.props.combatants;
const playerId = this.props.playerId;
const playerName = this.props.playerName;
const valid = report && fight && combatants && (playerName || playerId);
if (valid) {
const player = this.getPlayerFromReport(report, playerId, playerName);
if (!player) {
alert(`Unknown player: ${playerName}`);
this.props.push(makeAnalyzerUrl(report, fight.id));
return;
}
const combatant = combatants.find(combatant => combatant.sourceID === player.id);
if (!combatant) {
alert('This player does not seem to be in this fight.');
return;
}
this.fetchEventsAndParse(report, fight, combatants, combatant, player);
this.appendHistory(report, fight, player);
}
}
}
appendHistory(report, fight, player) {
this.props.appendReportHistory({
code: report.code,
title: report.title,
start: Math.floor(report.start / 1000),
end: Math.floor(report.end / 1000),
fightId: fight.id,
fightName: getFightName(report, fight),
playerId: player.id,
playerName: player.name,
playerClass: player.type,
});
}
=======
>>>>>>>
<<<<<<<
if (this.props.charRegion && this.props.charRealm && this.props.charName) {
return <CharacterParses region={this.props.charRegion} realm={this.props.charRealm} name={this.props.charName} />;
}
if (this.props.contributorId) {
return <ContributorDetails contributorId={this.props.contributorId} />;
}
if (this.props.articleId) {
return <NewsView articleId={this.props.articleId} />;
}
if (!this.props.reportCode) {
return <Home />;
}
if (!report) {
return <ActivityIndicator text="Pulling report info..." />;
}
if (!this.props.fightId) {
return <FightSelecter />;
}
if (!this.props.playerName) {
return <PlayerSelecter />;
}
if (!parser) {
return <ActivityIndicator text="Initializing analyzer..." />;
}
=======
>>>>>>>
<<<<<<<
async setStatePromise(newState) {
return new Promise((resolve, reject) => {
this.setState(newState, resolve);
});
}
get hasContent() {
return this.props.reportCode || this.props.error || this.props.articleId || this.props.contributorId || this.props.charRegion;
=======
get showReportSelecter() {
return this.props.isHome && !this.props.error;
>>>>>>>
get showReportSelecter() {
return this.props.isHome && !this.props.error;
<<<<<<<
const mapStateToProps = state => {
const fightId = getFightId(state);
return ({
reportCode: getReportCode(state),
fightId,
playerName: getPlayerName(state),
playerId: getPlayerId(state),
report: getReport(state),
fight: getFightById(state, fightId),
combatants: getCombatants(state),
articleId: getArticleId(state),
contributorId: getContributorId(state),
charRegion: getCharRegion(state),
charRealm: getCharRealm(state),
charName: getCharName(state),
error: getError(state),
});
};
=======
const mapStateToProps = (state, props) => ({
error: getError(state),
isHome: getLocation(state).pathname === '/', // createMatchSelector doesn't seem to be consistent
});
>>>>>>>
const mapStateToProps = (state, props) => ({
error: getError(state),
isHome: getLocation(state).pathname === '/', // createMatchSelector doesn't seem to be consistent
}); |
<<<<<<<
if(options.devtool === "eval")
compiler.apply(new EvalDevToolModulePlugin(null, options.output.devtoolModuleFilenameTemplate));
else if(options.devtool === "@eval")
compiler.apply(new EvalDevToolModulePlugin("//@ sourceURL=[url]", options.output.devtoolModuleFilenameTemplate));
else if(options.devtool === "#eval")
compiler.apply(new EvalDevToolModulePlugin("//# sourceURL=[url]", options.output.devtoolModuleFilenameTemplate));
else if(options.devtool === "#@eval")
compiler.apply(new EvalDevToolModulePlugin("//@ sourceURL=[url]\n//# sourceURL=[url]", options.output.devtoolModuleFilenameTemplate));
else if(options.devtool && (options.devtool.indexOf("sourcemap") >= 0 || options.devtool.indexOf("source-map") >= 0)) {
=======
if(options.hot) {
compiler.apply(new MovedToPluginWarningPlugin("hot", "HotModuleReplacementPlugin"));
var HotModuleReplacementPlugin = require("./HotModuleReplacementPlugin");
compiler.apply(new HotModuleReplacementPlugin(options.output));
}
if(options.devtool && (options.devtool.indexOf("sourcemap") >= 0 || options.devtool.indexOf("source-map") >= 0)) {
>>>>>>>
if(options.devtool && (options.devtool.indexOf("sourcemap") >= 0 || options.devtool.indexOf("source-map") >= 0)) { |
<<<<<<<
}
file = this.getPath(filenameTemplate, {
chunk: chunk
});
if(this.assets[file])
throw new Error("Conflict: Multiple assets emit to the same filename '" + file + "'");
this.assets[file] = source;
chunk.files.push(file);
this.applyPlugins("chunk-asset", chunk, file);
=======
this.assets[
file = this.getPath(filenameTemplate, {
noChunkHash: !useChunkHash,
chunk: chunk
})
] = source;
chunk.files.push(file);
this.applyPlugins("chunk-asset", chunk, file);
file = undefined;
if(chunk.id !== 0 && namedChunkFilename && chunk.name) {
this.assets[
file = this.getPath(namedChunkFilename, {
noChunkHash: !useChunkHash,
chunk: chunk
})
] = source;
chunk.files.push(file);
this.applyPlugins("chunk-asset", chunk, file);
}
} catch(err) {
this.errors.push(new ChunkRenderError(chunk, file || filenameTemplate, err));
}
>>>>>>>
file = this.getPath(filenameTemplate, {
noChunkHash: !useChunkHash,
chunk: chunk
});
if(this.assets[file])
throw new Error("Conflict: Multiple assets emit to the same filename '" + file + "'");
this.assets[file] = source;
chunk.files.push(file);
this.applyPlugins("chunk-asset", chunk, file);
} catch(err) {
this.errors.push(new ChunkRenderError(chunk, file || filenameTemplate, err));
} |
<<<<<<<
=======
beforeChunks: "chunk graph",
afterChunks: "after chunk graph",
optimizeDependenciesBasic: "basic dependencies optimization",
>>>>>>>
beforeChunks: "chunk graph",
afterChunks: "after chunk graph", |
<<<<<<<
/** @private @type {Map<string, GenerateSourceResult & CachedSourceEntry>} */
=======
this._sourceSize = null;
this._buildHash = "";
this.buildTimestamp = undefined;
/** @private @type {Map<string, CachedSourceEntry>} */
>>>>>>>
/** @private @type {Map<string, number>} **/
this._sourceSizes = new Map();
/** @private @type {Map<string, GenerateSourceResult & CachedSourceEntry>} */
<<<<<<<
=======
this._sourceSize = null;
this._ast =
typeof extraInfo === "object" &&
extraInfo !== null &&
extraInfo.webpackAST !== undefined
? extraInfo.webpackAST
: null;
return callback();
>>>>>>>
<<<<<<<
this.errors.push(error);
=======
this.errors.push(this.error);
this._source = new RawSource(
"throw new Error(" + JSON.stringify(this.error.message) + ");"
);
this._sourceSize = null;
this._ast = null;
>>>>>>>
this.errors.push(error);
<<<<<<<
/**
* Get a list of runtime requirements
* @param {SourceContext} context context for code generation
* @returns {Iterable<string> | null} required runtime modules
*/
getRuntimeRequirements(context) {
return this._generateSource(context).runtimeRequirements;
}
/**
* @param {string=} type the source type for which the size should be estimated
* @returns {number} the estimated size of the module (must be non-zero)
*/
size(type) {
return Math.max(1, this.generator.getSize(this, type));
=======
size() {
if (this._sourceSize === null) {
this._sourceSize = this._source ? this._source.size() : -1;
}
return this._sourceSize;
>>>>>>>
/**
* Get a list of runtime requirements
* @param {SourceContext} context context for code generation
* @returns {Iterable<string> | null} required runtime modules
*/
getRuntimeRequirements(context) {
return this._generateSource(context).runtimeRequirements;
}
/**
* @param {string=} type the source type for which the size should be estimated
* @returns {number} the estimated size of the module (must be non-zero)
*/
size(type) {
const cachedSize = this._sourceSizes.get(type);
if (cachedSize !== undefined) {
return cachedSize;
}
const size = Math.max(1, this.generator.getSize(this, type));
this._sourceSizes.set(type, size);
return size; |
<<<<<<<
.for("require.main")
.tap(
"NodeStuffPlugin",
toConstantDependency(
parser,
`${RuntimeGlobals.moduleCache}[${
RuntimeGlobals.entryModuleId
}]`,
[RuntimeGlobals.moduleCache, RuntimeGlobals.entryModuleId]
)
);
parser.hooks.expression
=======
>>>>>>>
<<<<<<<
parser.hooks.expression
.for("require.main.require")
.tap(
"NodeStuffPlugin",
expressionIsUnsupported(
parser,
"require.main.require is not supported by webpack."
)
);
parser.hooks.expression
.for("module.parent.require")
.tap(
"NodeStuffPlugin",
expressionIsUnsupported(
parser,
"module.parent.require is not supported by webpack."
)
);
parser.hooks.expression
.for("module.loaded")
.tap("NodeStuffPlugin", expr => {
parser.state.module.buildMeta.moduleConcatenationBailout =
"module.loaded";
return toConstantDependency(parser, "module.l", [
RuntimeGlobals.module
])(expr);
});
parser.hooks.expression
.for("module.id")
.tap("NodeStuffPlugin", expr => {
parser.state.module.buildMeta.moduleConcatenationBailout =
"module.id";
return toConstantDependency(parser, "module.i", [
RuntimeGlobals.module
])(expr);
});
parser.hooks.expression
.for("module.exports")
.tap("NodeStuffPlugin", expr => {
const module = parser.state.module;
const isHarmony =
module.buildMeta && module.buildMeta.exportsType;
if (!isHarmony) {
return toConstantDependency(parser, "module.exports", [
RuntimeGlobals.module
])(expr);
}
});
parser.hooks.evaluateIdentifier
.for("module.hot")
.tap("NodeStuffPlugin", evaluateToIdentifier("module.hot", false));
parser.hooks.expression.for("module").tap("NodeStuffPlugin", expr => {
const isHarmony =
parser.state.module.buildMeta &&
parser.state.module.buildMeta.exportsType;
const dep = new ModuleDecoratorDependency(
isHarmony
? RuntimeGlobals.harmonyModuleDecorator
: RuntimeGlobals.nodeModuleDecorator
);
dep.loc = expr.loc;
parser.state.module.addDependency(dep);
return true;
});
=======
>>>>>>> |
<<<<<<<
parser.hooks.expression
.for(key)
.tap(
"DefinePlugin",
/__webpack_require__/.test(code)
? toConstantDependencyWithWebpackRequire(parser, code)
: toConstantDependency(parser, code)
);
=======
parser.hooks.expression.for(key).tap("DefinePlugin", expr => {
const strCode = toCode(code, parser);
if (/__webpack_require__/.test(strCode)) {
return ParserHelpers.toConstantDependencyWithWebpackRequire(
parser,
strCode
)(expr);
} else {
return ParserHelpers.toConstantDependency(parser, strCode)(
expr
);
}
});
>>>>>>>
parser.hooks.expression.for(key).tap("DefinePlugin", expr => {
const strCode = toCode(code, parser);
if (/__webpack_require__/.test(strCode)) {
return toConstantDependencyWithWebpackRequire(
parser,
strCode
)(expr);
} else {
return toConstantDependency(parser, strCode)(expr);
}
});
<<<<<<<
const code = stringifyObj(obj);
parser.hooks.canRename.for(key).tap("DefinePlugin", approve);
=======
parser.hooks.canRename
.for(key)
.tap("DefinePlugin", ParserHelpers.approve);
>>>>>>>
parser.hooks.canRename.for(key).tap("DefinePlugin", approve);
<<<<<<<
parser.hooks.evaluateTypeof
.for(key)
.tap("DefinePlugin", evaluateToString("object"));
parser.hooks.expression
.for(key)
.tap(
"DefinePlugin",
/__webpack_require__/.test(code)
? toConstantDependencyWithWebpackRequire(parser, code)
: toConstantDependency(parser, code)
);
parser.hooks.typeof
.for(key)
.tap(
"DefinePlugin",
toConstantDependency(parser, JSON.stringify("object"))
);
=======
parser.hooks.evaluateTypeof.for(key).tap("DefinePlugin", expr => {
return ParserHelpers.evaluateToString("object")(expr);
});
parser.hooks.expression.for(key).tap("DefinePlugin", expr => {
const strCode = stringifyObj(obj, parser);
if (/__webpack_require__/.test(strCode)) {
return ParserHelpers.toConstantDependencyWithWebpackRequire(
parser,
strCode
)(expr);
} else {
return ParserHelpers.toConstantDependency(parser, strCode)(
expr
);
}
});
parser.hooks.typeof.for(key).tap("DefinePlugin", expr => {
return ParserHelpers.toConstantDependency(
parser,
JSON.stringify("object")
)(expr);
});
>>>>>>>
parser.hooks.evaluateTypeof
.for(key)
.tap("DefinePlugin", evaluateToString("object"));
parser.hooks.expression.for(key).tap("DefinePlugin", expr => {
const strCode = stringifyObj(obj, parser);
if (/__webpack_require__/.test(strCode)) {
return toConstantDependencyWithWebpackRequire(parser, strCode)(
expr
);
} else {
return toConstantDependency(parser, strCode)(expr);
}
});
parser.hooks.typeof
.for(key)
.tap(
"DefinePlugin",
toConstantDependency(parser, JSON.stringify("object"))
); |
<<<<<<<
const comment = used !== exportName ? ` ${Template.toNormalComment(exportName)}` : "";
const reference = `${importedVar}[${JSON.stringify(used)}${comment}]`;
=======
// TODO use Template.toNormalComment when merging with pure-module
const comment = used !== exportName ? ` /* ${exportName} */` : "";
const reference = `${info.name}[${JSON.stringify(used)}${comment}]`;
>>>>>>>
const comment = used !== exportName ? ` ${Template.toNormalComment(exportName)}` : "";
const reference = `${info.name}[${JSON.stringify(used)}${comment}]`; |
<<<<<<<
const source = /** @type {string} */ (this._source.source());
const error = new ModuleParseError(source, e);
=======
const source = this._source.source();
const loaders = this.loaders.map(item =>
contextify(options.context, item.loader)
);
const error = new ModuleParseError(this, source, e, loaders);
>>>>>>>
const source = /** @type {string} */ (this._source.source());
const loaders = this.loaders.map(item =>
contextify(options.context, item.loader)
);
const error = new ModuleParseError(source, e, loaders); |
<<<<<<<
}).filter(Boolean).join(" ");
const hash = createHash("md5");
=======
}
const hash = crypto.createHash("md5");
>>>>>>>
}
const hash = createHash("md5"); |
<<<<<<<
const makeSerializable = require("./util/makeSerializable");
/** @typedef {import("./Chunk")} Chunk */
/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
=======
const inspect = require("util").inspect.custom;
>>>>>>>
const inspect = require("util").inspect.custom;
const makeSerializable = require("./util/makeSerializable");
/** @typedef {import("./Chunk")} Chunk */
/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */ |
<<<<<<<
this.contextDependencies = new Set([this.context]);
this.built = false;
=======
// Info from Build
this.builtTime = undefined;
this.contextDependencies = [this.context];
>>>>>>>
// Info from Build
this.builtTime = undefined;
this.contextDependencies = new Set([this.context]); |
<<<<<<<
externals.map(
m =>
typeof m.request === "object" && !Array.isArray(m.request)
? m.request.amd
: m.request
=======
externals.map(m =>
typeof m.request === "object" ? m.request.amd : m.request
>>>>>>>
externals.map(m =>
typeof m.request === "object" && !Array.isArray(m.request)
? m.request.amd
: m.request |
<<<<<<<
hasRestrictionListener: function(component) {
return this._inputRestrictionListeners && this._inputRestrictionListeners[component.renderId] !== undefined;
},
=======
>>>>>>>
hasRestrictionListener: function(component) {
return this._inputRestrictionListeners && this._inputRestrictionListeners[component.renderId] !== undefined;
}, |
<<<<<<<
VariableCheckGrader.prototype.grade = function(studentcode) {
=======
//Return executable code in one string
VariableCheckGrader.prototype._codelinesAsString = function() {
var student_code = this.parson.normalizeIndents(this.parson.getModifiedCode("#ul-" + this.parson.options.sortableId));
var executableCode = "";
$.each(student_code, function(index, item) {
// split codeblocks on br elements
var lines = $("#" + item.id).html().split(/<br\s*\/?>/);
// go through all the lines
for (var i = 0; i < lines.length; i++) {
// add indents and get the text for the line (to remove the syntax highlight html elements)
executableCode += python_indents[item.indent] + $("<span>" + lines[i] + "</span>").text() + "\n";
}
});
return executableCode;
};
VariableCheckGrader.prototype.grade = function() {
>>>>>>>
//Return executable code in one string
VariableCheckGrader.prototype._codelinesAsString = function() {
var student_code = this.parson.normalizeIndents(this.parson.getModifiedCode("#ul-" + this.parson.options.sortableId));
var executableCode = "";
$.each(student_code, function(index, item) {
// split codeblocks on br elements
var lines = $("#" + item.id).html().split(/<br\s*\/?>/);
// go through all the lines
for (var i = 0; i < lines.length; i++) {
// add indents and get the text for the line (to remove the syntax highlight html elements)
executableCode += python_indents[item.indent] + $("<span>" + lines[i] + "</span>").text() + "\n";
}
});
return executableCode;
};
VariableCheckGrader.prototype.grade = function(studentcode) {
<<<<<<<
var student_code = studentcode || parson._codelinesAsString();
=======
var student_code = that._codelinesAsString();
>>>>>>>
var student_code = studentcode || that._codelinesAsString();
<<<<<<<
graders.UnitTestGrader = UnitTestGrader;
// copy the line number fixer from VariableCheckGrader
=======
// copy the line number fixer and code-construction from VariableCheckGrader
>>>>>>>
graders.UnitTestGrader = UnitTestGrader;
// copy the line number fixer and code-construction from VariableCheckGrader
<<<<<<<
studentCode = studentcode || parson._codelinesAsString(),
=======
studentCode = this._codelinesAsString(),
>>>>>>>
studentCode = studentcode || this._codelinesAsString(), |
<<<<<<<
if (this.options.incorrectSound && $.sound) {
$.sound.play(this.options.incorrectSound);
}
=======
$("#" + code_line.id).addClass("incorrectPosition");
>>>>>>>
if (this.options.incorrectSound && $.sound) {
$.sound.play(this.options.incorrectSound);
}
$("#" + code_line.id).addClass("incorrectPosition");
<<<<<<<
if (code_line.indent !== this.options.codeLines[i][0]) {
if (this.options.incorrectSound && $.sound) {
$.sound.play(this.options.incorrectSound);
}
=======
if (code_line.indent !== this.options.codeLines[i][0]) {
$("#" + code_line.id).addClass("incorrectIndent");
>>>>>>>
if (code_line.indent !== this.options.codeLines[i][0]) {
if (this.options.incorrectSound && $.sound) {
$.sound.play(this.options.incorrectSound);
}
$("#" + code_line.id).addClass("incorrectIndent");
<<<<<<<
// //ids of the the modified code
// var usersCode = $("#" + this.options.sortableId).sortable('toArray');
// for ( var i = 0; i < modified_lines.length; i++) {
// var code_line = getLineById(usersCode[i]);
// if (modified_lines[i].code !== code_line.code) {
// alert("line " + (i+1) + " is not correct!");
// return;
// }
// if (modified_lines[i].indent !== this.options.codeLines[i][0]) {
// alert("line " + (i+1) + " is not indented correctly");
// return;
// }
// }
if (this.options.correctSound && $.sound) {
$.sound.play(this.options.correctSound);
}
=======
>>>>>>>
if (this.options.correctSound && $.sound) {
$.sound.play(this.options.correctSound);
} |
<<<<<<<
var boundary = [],
// Freeze the list of nodes
els = [].map.call(container.children, function(el){
el.style.position = 'absolute';
return el;
});
function margin(name, el){
var style = window.getComputedStyle(el);
return parseFloat(style['margin' + name]) || 0;
}
=======
function style(el){ return window.getComputedStyle(el); }
function margin(name, el){ return parseFloat(style(el)['margin' + name]) || 0; }
>>>>>>>
var boundary = [],
// Freeze the list of nodes
els = [].map.call(container.children, function(el){
el.style.position = 'absolute';
return el;
});
function style(el){ return window.getComputedStyle(el); }
function margin(name, el){ return parseFloat(style(el)['margin' + name]) || 0; } |
<<<<<<<
const { CONVECTION_API_BASE, LEWITT_API_BASE } = config
=======
const { CONVECTION_API_BASE, GRAVITY_GRAPHQL_ENDPOINT } = config
>>>>>>>
const {
CONVECTION_API_BASE,
GRAVITY_GRAPHQL_ENDPOINT,
LEWITT_API_BASE,
} = config
<<<<<<<
export async function executableConvectionSchema() {
const convectionLink = createConvectionLink()
=======
export function createGravityLink() {
const httpLink = createHttpLink({
fetch,
uri: urljoin(GRAVITY_GRAPHQL_ENDPOINT, "graphql"),
})
const middlewareLink = new ApolloLink((operation, forward) =>
forward(operation)
)
const authMiddleware = setContext((_request, context) => {
const locals = context.graphqlContext && context.graphqlContext.res.locals
const headers = { ...(locals && requestIDHeaders(locals.requestIDs)) }
Object.assign(headers, { "X-XAPP-TOKEN": config.GRAVITY_XAPP_TOKEN })
if (locals.accessToken) {
Object.assign(headers, { "X-ACCESS-TOKEN": locals.accessToken })
}
return { headers }
})
return middlewareLink.concat(authMiddleware).concat(httpLink)
}
export async function mergeSchemas() {
// The below all relate to Convection stitching.
// TODO: Refactor when adding another service.
>>>>>>>
export function createGravityLink() {
const httpLink = createHttpLink({
fetch,
uri: urljoin(GRAVITY_GRAPHQL_ENDPOINT, "graphql"),
})
const middlewareLink = new ApolloLink((operation, forward) =>
forward(operation)
)
const authMiddleware = setContext((_request, context) => {
const locals = context.graphqlContext && context.graphqlContext.res.locals
const headers = { ...(locals && requestIDHeaders(locals.requestIDs)) }
Object.assign(headers, { "X-XAPP-TOKEN": config.GRAVITY_XAPP_TOKEN })
if (locals.accessToken) {
Object.assign(headers, { "X-ACCESS-TOKEN": locals.accessToken })
}
return { headers }
})
return middlewareLink.concat(authMiddleware).concat(httpLink)
}
export async function executableConvectionSchema() {
const convectionLink = createConvectionLink() |
<<<<<<<
gravityLoaderWithoutAuthenticationFactory: apiLoaderWithoutAuthenticationFactory(gravity, { requestIDs }),
=======
gravityLoaderWithoutAuthenticationFactory: apiLoaderWithoutAuthenticationFactory(gravity, "gravity", { requestID }),
>>>>>>>
gravityLoaderWithoutAuthenticationFactory: apiLoaderWithoutAuthenticationFactory(gravity, "gravity", { requestIDs }),
<<<<<<<
gravityLoaderWithAuthenticationFactory: apiLoaderWithAuthenticationFactory(gravity, { requestIDs }),
=======
gravityLoaderWithAuthenticationFactory: apiLoaderWithAuthenticationFactory(gravity, "gravity", { requestID }),
>>>>>>>
gravityLoaderWithAuthenticationFactory: apiLoaderWithAuthenticationFactory(gravity, "gravity", { requestIDs }), |
<<<<<<<
CACHE_COMPRESSION_ENABLED: CACHE_COMPRESSION_ENABLED || "true",
=======
CACHE_DISABLED: CACHE_DISABLED === "true",
>>>>>>>
CACHE_COMPRESSION_ENABLED: CACHE_COMPRESSION_ENABLED || "true",
CACHE_DISABLED: CACHE_DISABLED === "true", |
<<<<<<<
import { connectionDefinitions, connectionFromArraySlice } from "graphql-relay"
=======
import { parseRelayOptions } from "lib/helpers"
>>>>>>>
import { connectionDefinitions, connectionFromArraySlice } from "graphql-relay"
import { parseRelayOptions } from "lib/helpers" |
<<<<<<<
matchGeneLoader: gravityLoader("match/genes"),
partnerArtistsLoader: gravityLoader(id => `artist/${id}/partner_artists`),
=======
partnerArtistsForArtistLoader: gravityLoader(id => `artist/${id}/partner_artists`),
partnerArtistsLoader: gravityLoader("partner_artists"),
>>>>>>>
matchGeneLoader: gravityLoader("match/genes"),
partnerArtistsForArtistLoader: gravityLoader(id => `artist/${id}/partner_artists`),
partnerArtistsLoader: gravityLoader("partner_artists"), |
<<<<<<<
import Tracer from "datadog-tracer"
import { forIn, has, assign } from "lodash"
=======
import uuid from "uuid/v1"
import { fetchLoggerSetup, fetchLoggerRequestDone } from "lib/loaders/api/logger"
>>>>>>>
import Tracer from "datadog-tracer"
import { forIn, has, assign } from "lodash"
import uuid from "uuid/v1"
import { fetchLoggerSetup, fetchLoggerRequestDone } from "lib/loaders/api/logger"
<<<<<<<
const requestID = request.headers["x-request-id"] || "implement-me"
const span = request.span
const traceContext = span.context()
const traceId = traceContext.traceId
const parentSpanId = traceContext.spanId
const requestIDs = { requestID, traceId, parentSpanId }
=======
const requestID = request.headers["x-request-id"] || uuid()
if (!isProduction) {
fetchLoggerSetup(requestID)
}
>>>>>>>
const requestID = request.headers["x-request-id"] || uuid()
const span = request.span
const traceContext = span.context()
const traceId = traceContext.traceId
const parentSpanId = traceContext.spanId
const requestIDs = { requestID, traceId, parentSpanId }
if (!isProduction) {
fetchLoggerSetup(requestID)
} |
<<<<<<<
this.textRegexpCallbacks.some(reg => {
debug('Matching %s whith', message.text, reg.regexp);
=======
this.textRegexpCallbacks.forEach(reg => {
debug('Matching %s with %s', message.text, reg.regexp);
>>>>>>>
this.textRegexpCallbacks.some(reg => {
debug('Matching %s with %s', message.text, reg.regexp); |
<<<<<<<
done(err);
});
=======
testSslPort += 1;
var sslOptions = {
key: fs.readFileSync('test/resources/ssl/server.key'),
cert: fs.readFileSync('test/resources/ssl/server.crt')
/*
Country Name (2 letter code) [AU]:
State or Province Name (full name) [Some-State]:
Locality Name (eg, city) []:
Organization Name (eg, company) [Internet Widgits Pty Ltd]:
Organizational Unit Name (eg, section) []:
Common Name (e.g. server FQDN or YOUR name) []:localhost
Email Address []:
Please enter the following 'extra' attributes to be sent with your certificate request
A challenge password []:
An optional company name []:
*/
};
testSslServer = https.createServer(sslOptions,testApp);
testSslServer.listen(testSslPort);
testProxyPort += 1;
testProxyServer = httpProxy.createProxyServer({target:'http://localhost:' + testPort});
testProxyServer.on('proxyReq', function(proxyReq, req, res, options) {
proxyReq.setHeader('x-testproxy-header', 'foobar');
});
testProxyServer.on('proxyRes', function (proxyRes, req, res, options) {
if (req.url == getTestURL('/proxyAuthenticate')){
var user = auth.parse(req.headers['proxy-authorization']);
if (!(user.name == "foouser" && user.pass == "barpassword")){
proxyRes.headers['proxy-authenticate'] = 'BASIC realm="test"';
proxyRes.statusCode = 407;
}
}
});
testProxyServer.listen(testProxyPort);
done();
});
>>>>>>>
testSslPort += 1;
var sslOptions = {
key: fs.readFileSync('test/resources/ssl/server.key'),
cert: fs.readFileSync('test/resources/ssl/server.crt')
/*
Country Name (2 letter code) [AU]:
State or Province Name (full name) [Some-State]:
Locality Name (eg, city) []:
Organization Name (eg, company) [Internet Widgits Pty Ltd]:
Organizational Unit Name (eg, section) []:
Common Name (e.g. server FQDN or YOUR name) []:localhost
Email Address []:
Please enter the following 'extra' attributes to be sent with your certificate request
A challenge password []:
An optional company name []:
*/
};
testSslServer = https.createServer(sslOptions,testApp);
testSslServer.listen(testSslPort);
testProxyPort += 1;
testProxyServer = httpProxy.createProxyServer({target:'http://localhost:' + testPort});
testProxyServer.on('proxyReq', function(proxyReq, req, res, options) {
proxyReq.setHeader('x-testproxy-header', 'foobar');
});
testProxyServer.on('proxyRes', function (proxyRes, req, res, options) {
if (req.url == getTestURL('/proxyAuthenticate')){
var user = auth.parse(req.headers['proxy-authorization']);
if (!(user.name == "foouser" && user.pass == "barpassword")){
proxyRes.headers['proxy-authenticate'] = 'BASIC realm="test"';
proxyRes.statusCode = 407;
}
}
});
testProxyServer.listen(testProxyPort);
done(err);
});
<<<<<<<
startServer(function(err) {
if (err) {
done(err);
}
=======
testApp.put('/putInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.delete('/deleteInspect', function(req,res) { res.status(204).end();});
testApp.head('/headInspect', function(req,res) { res.status(204).end();});
testApp.patch('/patchInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.trace('/traceInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.options('/*', function(req,res) {
res.status(200).end();
});
startServer(function() {
>>>>>>>
testApp.put('/putInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.delete('/deleteInspect', function(req,res) { res.status(204).end();});
testApp.head('/headInspect', function(req,res) { res.status(204).end();});
testApp.patch('/patchInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.trace('/traceInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.options('/*', function(req,res) {
res.status(200).end();
});
startServer(function(err) {
if (err) {
done(err);
}
<<<<<<<
after(function(done) {
testServer.stop(() => {
helper.stopServer(done);
});
=======
after(function() {
testServer.close();
testProxyServer.close();
>>>>>>>
after(function(done) {
testServer.stop(() => {
testProxyServer.close();
helper.stopServer(done);
}); |
<<<<<<<
import GarothiFeedbackConduit from './Modules/Items/GarothiFeedbackConduit';
=======
import CarafeOfSearingLight from './Modules/Items/CarafeOfSearingLight';
>>>>>>>
import GarothiFeedbackConduit from './Modules/Items/GarothiFeedbackConduit';
import CarafeOfSearingLight from './Modules/Items/CarafeOfSearingLight';
<<<<<<<
garothiFeedbackConduit: GarothiFeedbackConduit,
=======
carafeOfSearingLight: CarafeOfSearingLight,
>>>>>>>
garothiFeedbackConduit: GarothiFeedbackConduit,
carafeOfSearingLight: CarafeOfSearingLight, |
<<<<<<<
msg.onmouseenter = function() {
$(msg).addClass('red-ui-debug-msg-hover');
=======
msg.on("mouseenter", function() {
msg.addClass('debug-message-hover');
>>>>>>>
msg.on("mouseenter", function() {
msg.addClass('red-ui-debug-msg-hover');
<<<<<<<
};
msg.onmouseleave = function() {
$(msg).removeClass('red-ui-debug-msg-hover');
=======
});
msg.on("mouseleave", function() {
msg.removeClass('debug-message-hover');
>>>>>>>
});
msg.on("mouseleave", function() {
msg.removeClass('red-ui-debug-msg-hover');
<<<<<<<
msg.className = 'red-ui-debug-msg'+(o.level?(' red-ui-debug-msg-level-'+o.level):'')+
=======
msg.attr("class", 'debug-message'+(o.level?(' debug-message-level-'+o.level):'')+
>>>>>>>
msg.attr("class", 'red-ui-debug-msg'+(o.level?(' red-ui-debug-msg-level-'+o.level):'')+
<<<<<<<
" red-ui-debug-msg-node-"+sourceNode.id.replace(/\./g,"_")+
(sourceNode.z?" red-ui-debug-msg-flow-"+sourceNode.z.replace(/\./g,"_"):"")
):"");
=======
" debug-message-node-"+sourceNode.id.replace(/\./g,"_")+
(sourceNode.z?" debug-message-flow-"+sourceNode.z.replace(/\./g,"_"):"")
):""));
>>>>>>>
" red-ui-debug-msg-node-"+sourceNode.id.replace(/\./g,"_")+
(sourceNode.z?" red-ui-debug-msg-flow-"+sourceNode.z.replace(/\./g,"_"):"")
):""));
<<<<<<<
$(msg).addClass('red-ui-debug-msg-level-' + errorLvl);
$('<span class="red-ui-debug-msg-topic">function : (' + errorLvlType + ')</span>').appendTo(metaRow);
=======
msg.addClass('debug-message-level-' + errorLvl);
$('<span class="debug-message-topic">function : (' + errorLvlType + ')</span>').appendTo(metaRow);
>>>>>>>
msg.addClass('red-ui-debug-msg-level-' + errorLvl);
$('<span class="red-ui-debug-msg-topic">function : (' + errorLvlType + ')</span>').appendTo(metaRow); |
<<<<<<<
it('should allow accessing node.id', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.id; return msg;"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('payload', n1.id);
done();
});
n1.receive({payload:"foo",topicb: "bar"});
});
});
it('should allow accessing node.name', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.name; return msg;", "name":"name of node"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('payload', n1.name);
done();
});
n1.receive({payload:"foo",topicb: "bar"});
});
});
=======
it('should use the same Date object from outside the sandbox', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload=global.get('typeTest')(new Date());return msg;"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n1.context().global.set("typeTest",function(d) { return d instanceof Date });
n2.on("input", function(msg) {
msg.should.have.property('payload', true);
done();
});
n1.receive({payload:"foo",topic: "bar"});
});
});
>>>>>>>
it('should allow accessing node.id', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.id; return msg;"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('payload', n1.id);
done();
});
n1.receive({payload:"foo",topicb: "bar"});
});
});
it('should allow accessing node.name', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.name; return msg;", "name":"name of node"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('payload', n1.name);
done();
});
n1.receive({payload:"foo",topicb: "bar"});
});
});
it('should use the same Date object from outside the sandbox', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload=global.get('typeTest')(new Date());return msg;"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n1.context().global.set("typeTest",function(d) { return d instanceof Date });
n2.on("input", function(msg) {
msg.should.have.property('payload', true);
done();
});
n1.receive({payload:"foo",topic: "bar"});
});
}); |
<<<<<<<
open: function(tray) {
var trayFooter = tray.find(".editor-tray-footer");
var trayBody = tray.find('.editor-tray-body');
trayBody.parent().css('overflow','hidden');
var stack = RED.stack.create({
container: trayBody,
singleExpanded: true
});
var nodeProperties = stack.add({
title: RED._("editor.nodeProperties"),
expanded: true
});
var portLabels = stack.add({
title: RED._("editor.portLabels"),
onexpand: function() {
refreshLabelForm(this.content,node);
}
});
=======
open: function(tray,done) {
>>>>>>>
open: function(tray, done) {
var trayFooter = tray.find(".editor-tray-footer");
var trayBody = tray.find('.editor-tray-body');
trayBody.parent().css('overflow','hidden');
var stack = RED.stack.create({
container: trayBody,
singleExpanded: true
});
var nodeProperties = stack.add({
title: RED._("editor.nodeProperties"),
expanded: true
});
var portLabels = stack.add({
title: RED._("editor.portLabels"),
onexpand: function() {
refreshLabelForm(this.content,node);
}
});
<<<<<<<
buildEditForm(nodeProperties.content,"dialog-form",type,ns);
buildLabelForm(portLabels.content,node);
prepareEditDialog(node,node._def,"node-input");
trayBody.i18n();
=======
var dialogForm = buildEditForm(tray,"dialog-form",type,ns);
prepareEditDialog(node,node._def,"node-input", function() {
dialogForm.i18n();
done();
});
>>>>>>>
buildEditForm(nodeProperties.content,"dialog-form",type,ns);
buildLabelForm(portLabels.content,node);
prepareEditDialog(node,node._def,"node-input", function() {
trayBody.i18n();
done();
}); |
<<<<<<<
})
$('<div id="node-settings-icon">').text(node.icon).appendTo(iconButton);
}
$('<div class="form-row"><span data-i18n="editor.portLabels"></span></div>').appendTo(dialogForm);
var inputCount = node.inputs || node._def.inputs || 0;
var outputCount = node.outputs || node._def.outputs || 0;
if (node.type === 'subflow') {
inputCount = node.in.length;
outputCount = node.out.length;
}
var inputLabels = node.inputLabels || [];
var outputLabels = node.outputLabels || [];
var inputPlaceholder = node._def.inputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
var outputPlaceholder = node._def.outputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
$('<div class="form-row"><span style="margin-left: 10px;" data-i18n="editor.labelInputs"></span><div id="node-label-form-inputs"></div></div>').appendTo(dialogForm);
var inputsDiv = $("#node-label-form-inputs");
if (inputCount > 0) {
for (i=0;i<inputCount;i++) {
buildLabelRow("input",i,inputLabels[i],inputPlaceholder).appendTo(inputsDiv);
}
} else {
buildLabelRow().appendTo(inputsDiv);
}
$('<div class="form-row"><span style="margin-left: 10px;" data-i18n="editor.labelOutputs"></span><div id="node-label-form-outputs"></div></div>').appendTo(dialogForm);
var outputsDiv = $("#node-label-form-outputs");
if (outputCount > 0) {
for (i=0;i<outputCount;i++) {
buildLabelRow("output",i,outputLabels[i],outputPlaceholder).appendTo(outputsDiv);
}
} else {
buildLabelRow().appendTo(outputsDiv);
=======
});
$('<div class="uneditable-input" id="node-settings-icon">').text(node.icon).appendTo(iconRow);
>>>>>>>
});
$('<div id="node-settings-icon">').text(node.icon).appendTo(iconButton);
}
$('<div class="form-row"><span data-i18n="editor.portLabels"></span></div>').appendTo(dialogForm);
var inputCount = node.inputs || node._def.inputs || 0;
var outputCount = node.outputs || node._def.outputs || 0;
if (node.type === 'subflow') {
inputCount = node.in.length;
outputCount = node.out.length;
}
var inputLabels = node.inputLabels || [];
var outputLabels = node.outputLabels || [];
var inputPlaceholder = node._def.inputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
var outputPlaceholder = node._def.outputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
$('<div class="form-row"><span style="margin-left: 10px;" data-i18n="editor.labelInputs"></span><div id="node-label-form-inputs"></div></div>').appendTo(dialogForm);
var inputsDiv = $("#node-label-form-inputs");
if (inputCount > 0) {
for (i=0;i<inputCount;i++) {
buildLabelRow("input",i,inputLabels[i],inputPlaceholder).appendTo(inputsDiv);
}
} else {
buildLabelRow().appendTo(inputsDiv);
}
$('<div class="form-row"><span style="margin-left: 10px;" data-i18n="editor.labelOutputs"></span><div id="node-label-form-outputs"></div></div>').appendTo(dialogForm);
var outputsDiv = $("#node-label-form-outputs");
if (outputCount > 0) {
for (i=0;i<outputCount;i++) {
buildLabelRow("output",i,outputLabels[i],outputPlaceholder).appendTo(outputsDiv);
}
} else {
buildLabelRow().appendTo(outputsDiv); |
<<<<<<<
var stoppable = require('stoppable');
var helper = require("../../helper.js");
=======
var helper = require("node-red-node-test-helper");
>>>>>>>
var stoppable = require('stoppable');
var helper = require("node-red-node-test-helper"); |
<<<<<<<
* Get environment variable of subflow
* @param {String} name name of env var
* @return {Object} val value of env var
*/
getSetting(name) {
var env = this.env;
if (env && env.hasOwnProperty(name)) {
var val = env[name];
try {
var ret = redUtil.evaluateNodeProperty(val.value, val.type, null, null, null);
return ret;
}
catch (e) {
this.error(e);
return undefined;
}
}
var parent = this.parent;
if (parent) {
var val = parent.getSetting(name);
return val;
}
return undefined;
}
/**
=======
* Get a node instance from this subflow.
* If the subflow has a status node, check for that, otherwise use
* the super-class function
* @param {String} id [description]
* @param {Boolean} cancelBubble if true, prevents the flow from passing the request to the parent
* This stops infinite loops when the parent asked this Flow for the
* node to begin with.
* @return {[type]} [description]
*/
getNode(id, cancelBubble) {
if (this.statusNode && this.statusNode.id === id) {
return this.statusNode;
}
return super.getNode(id,cancelBubble);
}
/**
>>>>>>>
* Get environment variable of subflow
* @param {String} name name of env var
* @return {Object} val value of env var
*/
getSetting(name) {
var env = this.env;
if (env && env.hasOwnProperty(name)) {
var val = env[name];
try {
var ret = redUtil.evaluateNodeProperty(val.value, val.type, null, null, null);
return ret;
}
catch (e) {
this.error(e);
return undefined;
}
}
var parent = this.parent;
if (parent) {
var val = parent.getSetting(name);
return val;
}
return undefined;
}
/**
* Get a node instance from this subflow.
* If the subflow has a status node, check for that, otherwise use
* the super-class function
* @param {String} id [description]
* @param {Boolean} cancelBubble if true, prevents the flow from passing the request to the parent
* This stops infinite loops when the parent asked this Flow for the
* node to begin with.
* @return {[type]} [description]
*/
getNode(id, cancelBubble) {
if (this.statusNode && this.statusNode.id === id) {
return this.statusNode;
}
return super.getNode(id,cancelBubble);
}
/** |
<<<<<<<
* @param {module:enums.publicKey} algo Algorithm to be used (See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1})
* @param {Array<module:type/mpi>} publicMPIs Algorithm dependent multiprecision integers
=======
* @param {module:enums.publicKey} algo Algorithm to be used (See {@link http://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1})
* @param {Array<module:type/mpi|module:type/oid|module:type/kdf_params|module:type/ecdh_symkey>} publicParams Algorithm dependent params
>>>>>>>
* @param {module:enums.publicKey} algo Algorithm to be used (See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1})
* @param {Array<module:type/mpi|module:type/oid|module:type/kdf_params|module:type/ecdh_symkey>} publicParams Algorithm dependent params
<<<<<<<
* @param {module:enums.publicKey} algo Algorithm to be used (See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1})
* @param {Array<module:type/mpi>} publicMPIs Algorithm dependent multiprecision integers
* of the public key part of the private key
* @param {Array<module:type/mpi>} secretMPIs Algorithm dependent multiprecision integers
* of the private key used
* @param {module:type/mpi} data Data to be encrypted as MPI
=======
* @param {module:enums.publicKey} algo Algorithm to be used (See {@link http://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1})
* @param {Array<module:type/mpi|module:type/oid|module:type/kdf_params>} keyIntegers Algorithm dependent params
* @param {Array<module:type/mpi|module:type/ecdh_symkey>} dataIntegers encrypted session key parameters
* @param {String} fingerprint Recipient fingerprint
>>>>>>>
* @param {module:enums.publicKey} algo Algorithm to be used (See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1})
* @param {Array<module:type/mpi|module:type/oid|module:type/kdf_params>} keyIntegers Algorithm dependent params
* @param {Array<module:type/mpi|module:type/ecdh_symkey>} dataIntegers encrypted session key parameters
* @param {String} fingerprint Recipient fingerprint |
<<<<<<<
// See {@link https://tools.ietf.org/html/rfc4880#section-11.1}
var selfSigned = false;
for (var i = 0; i < this.users.length; i++) {
if (this.users[i].userId && this.users[i].selfCertifications) {
selfSigned = true;
}
}
if (!selfSigned) {
=======
// See {@link http://tools.ietf.org/html/rfc4880#section-11.1}
if (!this.users.some(user => user.userId && user.selfCertifications)) {
>>>>>>>
// See {@link https://tools.ietf.org/html/rfc4880#section-11.1}
if (!this.users.some(user => user.userId && user.selfCertifications)) { |
<<<<<<<
};
export const mtblanton = {
nickname: 'mtblanton',
github: 'mtblanton',
mains: [{
name: 'Harzwaz',
spec: SPECS.ENHANCEMENT_SHAMAN,
link: 'https://worldofwarcraft.com/en-us/character/turalyon/Harzwaz',
}],
=======
};
export const mblanton = {
nickname: 'mtblanton',
github: 'mtblanton',
mains: [{
name: 'Harzwaz',
spec: SPECS.ENHANCEMENT_SHAMAN,
link: 'https://worldofwarcraft.com/en-us/character/turalyon/Harzwaz',
}],
};
export const Streammz = {
nickname: 'Streammz',
github: 'Streammz',
discord: 'Streammz#9999',
>>>>>>>
};
export const mtblanton = {
nickname: 'mtblanton',
github: 'mtblanton',
mains: [{
name: 'Harzwaz',
spec: SPECS.ENHANCEMENT_SHAMAN,
link: 'https://worldofwarcraft.com/en-us/character/turalyon/Harzwaz',
}],
};
export const Streammz = {
nickname: 'Streammz',
github: 'Streammz',
discord: 'Streammz#9999', |
<<<<<<<
date: new Date('2018-09-20'),
changes: <React.Fragment>Updated bad Regrowth usage suggestions - using a non clearcasting regrowth on low health target is not considered bad.</React.Fragment>,
contributors: [blazyb],
},
{
=======
date: new Date('2018-09-20'),
changes: <React.Fragment>Added mana used doughnut chart (code taken from Hunter focus used module) to resto druid & set icons for Uldir bosses (not headshots)</React.Fragment>,
contributors: [fel1ne],
},
{
>>>>>>>
date: new Date('2018-09-20'),
changes: <React.Fragment>Added mana used doughnut chart (code taken from Hunter focus used module) to resto druid & set icons for Uldir bosses (not headshots)</React.Fragment>,
contributors: [fel1ne],
},
{
date: new Date('2018-09-20'),
changes: <React.Fragment>Updated bad Regrowth usage suggestions - using a non clearcasting regrowth on low health target is not considered bad.</React.Fragment>,
contributors: [blazyb],
},
{ |
<<<<<<<
import VoidformStyles from './VoidformStyles';
=======
import 'chartist-plugin-legend';
import './VoidformsTab.css';
const formatDuration = duration => {
const seconds = Math.floor(duration % 60);
return `${Math.floor(duration / 60)}:${seconds < 10 ? `0${seconds}` : seconds}`;
};
>>>>>>>
import VoidformStyles from './VoidformStyles';
<<<<<<<
insanityEvents,
surrenderToMadness = false,
setT20P4 = false,
fightEnd,
...voidform
}) => {
=======
insanityEvents,
surrenderToMadness = false,
setT20P4 = false,
fightEnd,
...voidform
}) => {
>>>>>>>
insanityEvents,
surrenderToMadness = false,
setT20P4 = false,
fightEnd,
...voidform
}) => {
<<<<<<<
const INSANITY_DRAIN_MODIFIER = setT20P4 ?
(surrenderToMadness ?
T20_4P_DECREASE_DRAIN_MODIFIER_SURRENDER_TO_MADNESS :
T20_4P_DECREASE_DRAIN_MODIFIER_NORMAL)
: 1;
=======
const INSANITY_DRAIN_MODIFIER = setT20P4 ? (
surrenderToMadness ? T20_4P_DECREASE_DRAIN_MODIFIER_SURRENDER_TO_MADNESS : T20_4P_DECREASE_DRAIN_MODIFIER_NORMAL
) : 1;
>>>>>>>
const INSANITY_DRAIN_MODIFIER = setT20P4 ?
(surrenderToMadness ?
T20_4P_DECREASE_DRAIN_MODIFIER_SURRENDER_TO_MADNESS :
T20_4P_DECREASE_DRAIN_MODIFIER_NORMAL)
: 1;
<<<<<<<
=======
let legends = {
classNames: [
'stacks',
'insanity',
// 'insanityDrain',
'voidtorrent',
'mindbender',
'dispersion',
'endOfVoidform',
],
};
>>>>>>>
<<<<<<<
datasets: [
=======
series: [
>>>>>>>
datasets: [
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
" --independent, -i Version packages independently",
" --canary, -c Publish packages after every successful merge using the sha as part of the tag",
" --skip-git Skip commiting, tagging, and pushing git changes (only affects publish)",
" --skip-npm Stop before actually publishing change to npm (only affects publish)",
" --npm-tag [tagname] Publish packages with the specified npm dist-tag",
" --scope [glob] Restricts the scope to package names matching the given glob (Works only in combination with the 'run', 'exec', 'clean', 'ls' and 'bootstrap' commands).",
" --ignore [glob] Ignores packages with names matching the given glob (Works only in combination with the 'run', 'exec', 'clean', 'ls' and 'bootstrap' commands).",
" --force-publish Force publish for the specified packages (comma-separated) or all packages using * (skips the git diff check for changed packages)",
" --yes Skip all confirmation prompts",
" --repo-version Specify repo version to publish",
" --concurrency How many threads to use if lerna parallelises the tasks (defaults to 4)",
" --loglevel What level of logs to report (defaults to \"info\"). On failure, all logs are written to lerna-debug.log in the current working directory.",
" --no-sort When executing tasks, ignore the dependency ordering of packages (only affects run, exec and bootstrap)",
=======
" --independent, -i Version packages independently",
" --canary, -c Publish packages after every successful merge using the sha as part of the tag",
" --git-remote [remote] Push git changes to the specified remote instead of 'origin'",
" --skip-git Skip commiting, tagging, and pushing git changes (only affects publish)",
" --skip-npm Stop before actually publishing change to npm (only affects publish)",
" --message, -m [msg] Use a custom commit message when creating the publish commit (only affects publish)",
" --npm-tag [tagname] Publish packages with the specified npm dist-tag",
" --scope [glob] Restricts the scope to package names matching the given glob (Works only in combination with the 'run', 'exec', 'clean', 'ls' and 'bootstrap' commands).",
" --ignore [glob] Ignores packages with names matching the given glob (Works only in combination with the 'run', 'exec', 'clean', 'ls' and 'bootstrap' commands).",
" --include-filtered-dependencies Flag to force lerna to include all dependencies and transitive dependencies when running 'bootstrap', even if they should not be included by the scope or ignore flags",
" --force-publish Force publish for the specified packages (comma-separated) or all packages using * (skips the git diff check for changed packages)",
" --yes Skip all confirmation prompts",
" --repo-version Specify repo version to publish",
" --concurrency How many threads to use if lerna parallelises the tasks (defaults to 4)",
" --loglevel What level of logs to report (defaults to \"info\"). On failure, all logs are written to lerna-debug.log in the current working directory.",
>>>>>>>
" --independent, -i Version packages independently",
" --canary, -c Publish packages after every successful merge using the sha as part of the tag",
" --git-remote [remote] Push git changes to the specified remote instead of 'origin'",
" --skip-git Skip commiting, tagging, and pushing git changes (only affects publish)",
" --skip-npm Stop before actually publishing change to npm (only affects publish)",
" --message, -m [msg] Use a custom commit message when creating the publish commit (only affects publish)",
" --npm-tag [tagname] Publish packages with the specified npm dist-tag",
" --scope [glob] Restricts the scope to package names matching the given glob (Works only in combination with the 'run', 'exec', 'clean', 'ls' and 'bootstrap' commands).",
" --ignore [glob] Ignores packages with names matching the given glob (Works only in combination with the 'run', 'exec', 'clean', 'ls' and 'bootstrap' commands).",
" --include-filtered-dependencies Flag to force lerna to include all dependencies and transitive dependencies when running 'bootstrap', even if they should not be included by the scope or ignore flags",
" --force-publish Force publish for the specified packages (comma-separated) or all packages using * (skips the git diff check for changed packages)",
" --yes Skip all confirmation prompts",
" --repo-version Specify repo version to publish",
" --concurrency How many threads to use if lerna parallelises the tasks (defaults to 4)",
" --loglevel What level of logs to report (defaults to \"info\"). On failure, all logs are written to lerna-debug.log in the current working directory.",
" --no-sort When executing tasks, ignore the dependency ordering of packages (only affects run, exec and bootstrap)", |
<<<<<<<
/*
|--------------------------------------------------------------------------
| Routes
|--------------------------------------------------------------------------
|
| Http routes are entry points to your web application. You can create
| routes for different URL's and bind Controller actions to them.
|
| A complete guide on routing is available here.
| http://adonisjs.com/docs/4.1/routing
|
*/
/** @type {typeof import('@adonisjs/framework/src/Route/Manager')} */
const Database = use('Database')
=======
>>>>>>>
const Database = use('Database')
<<<<<<<
Route.on('/').render('welcome')
// Route.get('/hello', ({ request }) => {
// return `hello ~ ${ request.input('name') }`
// })
Route.get('hello', 'HelloController.render')
Route.get('/posts', async () => {
return await Database.table('posts').select('*')
})
=======
Route.on('/').render('welcome')
Route.resource('posts', 'PostController').except(['index'])
// .only(['index', 'show', 'store'])
// .apiOnly()
Route.get('/list-of-users', () => 'List of users.').as('users.index')
Route.get('/users', ({ request }) => {
switch (request.format()) {
case 'json':
return [{ name: 'lishaoy' }, { name: 'miaomiao' }]
default:
return `lishaoy`
}
}).formats(['json', 'html'], true)
Route.group(() => {
Route.get('users', () => 'Manage users')
Route.get('posts', () => 'Manage posts')
}).prefix('admin')
Route.any('*', ({ view }) => view.render('welcome'))
>>>>>>>
Route.on('/').render('welcome')
Route.resource('posts', 'PostController').except(['index'])
// .only(['index', 'show', 'store'])
// .apiOnly()
Route.get('/list-of-users', () => 'List of users.').as('users.index')
Route.get('/users', ({ request }) => {
switch (request.format()) {
case 'json':
return [{ name: 'lishaoy' }, { name: 'miaomiao' }]
default:
return `lishaoy`
}
}).formats(['json', 'html'], true)
Route.group(() => {
Route.get('users', () => 'Manage users')
Route.get('posts', () => 'Manage posts')
}).prefix('admin')
Route.any('*', ({ view }) => view.render('welcome')) |
<<<<<<<
this.tip_unit_labels[i] = new St.Label({ text: unit });
tipline.addActor(this.tip_unit_labels[i]);
=======
tipline.addActor(new St.Label({ text: unit[i] }));
>>>>>>>
this.tip_unit_labels[i] = new St.Label({ text: unit[i] });
tipline.addActor(this.tip_unit_labels[i]);
<<<<<<<
this.tip_format('kB/s');
this.update_units();
Schema.connect('changed::' + this.elt + '-speed-in-bits', Lang.bind(this, this.update_units));
=======
this.tip_format(['kB/s', '/s', 'kB/s', '/s', '/s']);
>>>>>>>
this.tip_format(['kB/s', '/s', 'kB/s', '/s', '/s']);
this.update_units();
Schema.connect('changed::' + this.elt + '-speed-in-bits', Lang.bind(this, this.update_units));
<<<<<<<
let accum = [0,0];
let time = 0;
let net_lines = Shell.get_file_contents_utf8_sync('/proc/net/dev').split("\n");
for(let i = 3; i < net_lines.length - 1 ; i++) {
let net_params = net_lines[i].replace(/ +/g, " ").split(" ");
let ifc = net_params[1];
if(ifc.indexOf("br") < 0 && ifc.indexOf("lo") < 0) {
if (this.speed_in_bits) {
accum[0] += parseInt(net_params[2]) * 8;
accum[1] += parseInt(net_params[10]) * 8;
} else {
accum[0] += parseInt(net_params[2]);
accum[1] += parseInt(net_params[10]);
}
}
=======
let accum = [0, 0, 0, 0, 0];
for (let ifn in this.ifs) {
GTop.glibtop_get_netload(this.gtop, this.ifs[ifn]);
accum[0] += this.gtop.bytes_in;
accum[1] += this.gtop.errors_in;
accum[2] += this.gtop.bytes_out;
accum[3] += this.gtop.errors_out;
accum[4] += this.gtop.collisions;
>>>>>>>
let accum = [0, 0, 0, 0, 0];
for (let ifn in this.ifs) {
GTop.glibtop_get_netload(this.gtop, this.ifs[ifn]);
accum[0] += this.gtop.bytes_in * (this.speed_in_bits ? 8 : 1);
accum[1] += this.gtop.errors_in;
accum[2] += this.gtop.bytes_out * (this.speed_in_bits ? 8 : 1);
accum[3] += this.gtop.errors_out;
accum[4] += this.gtop.collisions; |
<<<<<<<
return this._jsonRequest({ cache: this.cache,
=======
var pObj = {params: jsonpParams};
if (this.tagFilters) {
pObj['X-Algolia-TagFilters'] = this.tagFilters;
}
if (this.userToken) {
pObj['X-Algolia-UserToken'] = this.userToken;
}
this._jsonRequest({ cache: this.cache,
>>>>>>>
var pObj = {params: jsonpParams};
if (this.tagFilters) {
pObj['X-Algolia-TagFilters'] = this.tagFilters;
}
if (this.userToken) {
pObj['X-Algolia-UserToken'] = this.userToken;
}
return this._jsonRequest({ cache: this.cache,
<<<<<<<
successiveRetryCount = 0;
deferred && deferred.resolve(body);
=======
opts.successiveRetryCount = 0;
>>>>>>>
opts.successiveRetryCount = 0;
deferred && deferred.resolve(body);
<<<<<<<
return this.as._jsonRequest({ method: 'GET',
url: '/1/indexes/' + encodeURIComponent(indexObj.indexName) + '/' + encodeURIComponent(objectID) + params,
callback: callback });
=======
if (this.as.jsonp === null) {
this.as._jsonRequest({ method: 'GET',
url: '/1/indexes/' + encodeURIComponent(indexObj.indexName) + '/' + encodeURIComponent(objectID) + params,
callback: callback });
} else {
var pObj = {params: params};
if (this.as.tagFilters) {
pObj['X-Algolia-TagFilters'] = this.as.tagFilters;
}
if (this.as.userToken) {
pObj['X-Algolia-UserToken'] = this.as.userToken;
}
this.as._jsonRequest({ method: 'GET',
url: '/1/indexes/' + encodeURIComponent(indexObj.indexName) + '/' + encodeURIComponent(objectID),
callback: callback,
body: pObj});
}
>>>>>>>
if (this.as.jsonp === null) {
return this.as._jsonRequest({ method: 'GET',
url: '/1/indexes/' + encodeURIComponent(indexObj.indexName) + '/' + encodeURIComponent(objectID) + params,
callback: callback });
} else {
var pObj = {params: params};
if (this.as.tagFilters) {
pObj['X-Algolia-TagFilters'] = this.as.tagFilters;
}
if (this.as.userToken) {
pObj['X-Algolia-UserToken'] = this.as.userToken;
}
return this.as._jsonRequest({ method: 'GET',
url: '/1/indexes/' + encodeURIComponent(indexObj.indexName) + '/' + encodeURIComponent(objectID),
callback: callback,
body: pObj});
} |
<<<<<<<
// T20 Trinkets
ARCHIVE_OF_FAITH: {
id: 147006,
name: 'Archive of Faith',
icon: 'inv__wod_arakoa4',
quality: QUALITIES.EPIC,
},
BARBARIC_MINDSLAVER: {
id: 147003,
name: 'Barbaric Mindslaver',
icon: 'spell_priest_psyfiend',
quality: QUALITIES.EPIC,
},
DECEIVERS_GRAND_DESIGN: {
id: 147007,
name: 'The Deceiver\'s Grand Design',
icon: 'inv_offhand_1h_pvpcataclysms3_c_01',
quality: QUALITIES.EPIC,
},
SEA_STAR_OF_THE_DEPTHMOTHER: {
id: 147004,
name: 'Sea Star of the Depthmother',
icon: 'inv_jewelcrafting_starofelune_02',
quality: QUALITIES.EPIC,
},
=======
// DPS Trinkets
TARNISHED_SENTINEL_MEDALLION: {
id: 147017,
name: 'Tarnished Sentinel Medallion',
icon: 'inv_jewelcrafting_purpleowl.jpg',
quality: QUALITIES.EPIC,
},
>>>>>>>
// T20 Trinkets
ARCHIVE_OF_FAITH: {
id: 147006,
name: 'Archive of Faith',
icon: 'inv__wod_arakoa4',
quality: QUALITIES.EPIC,
},
BARBARIC_MINDSLAVER: {
id: 147003,
name: 'Barbaric Mindslaver',
icon: 'spell_priest_psyfiend',
quality: QUALITIES.EPIC,
},
DECEIVERS_GRAND_DESIGN: {
id: 147007,
name: 'The Deceiver\'s Grand Design',
icon: 'inv_offhand_1h_pvpcataclysms3_c_01',
quality: QUALITIES.EPIC,
},
SEA_STAR_OF_THE_DEPTHMOTHER: {
id: 147004,
name: 'Sea Star of the Depthmother',
icon: 'inv_jewelcrafting_starofelune_02',
quality: QUALITIES.EPIC,
},
// DPS Trinkets
TARNISHED_SENTINEL_MEDALLION: {
id: 147017,
name: 'Tarnished Sentinel Medallion',
icon: 'inv_jewelcrafting_purpleowl.jpg',
quality: QUALITIES.EPIC,
}, |
<<<<<<<
=======
// wait until the presentation is loaded to hook up the previews.
// TODO: If we decide to implement this for the audience display, we can move it later
$("body").bind("showoff:loaded", function (event) {
$('#navigation li a.navItem').hover(function() {
var position = $(this).position();
$('#navigationHover').css({top: position.top, left: position.left + $('#navigation').width() + 5})
$('#navigationHover').html(slides.eq($(this).attr('rel')).html());
$('#navigationHover').show();
},function() {
$('#navigationHover').hide();
});
});
// set up notes resizing
$( "#notes" ).resizable({
minHeight: 0,
handles: {"n": $(".notes-grippy")}
});
>>>>>>>
// set up notes resizing
$( "#notes" ).resizable({
minHeight: 0,
handles: {"n": $(".notes-grippy")}
}); |
<<<<<<<
errors.push({
path,
message: "Parameter objects must have a `description` field."
})
=======
let message = "Parameters with a description must have content in it."
let checkStatus = config.no_parameter_description
if (checkStatus !== "off") {
result[checkStatus].push({
path,
message
})
}
>>>>>>>
let message = "Parameter objects must have a `description` field."
let checkStatus = config.no_parameter_description
if (checkStatus !== "off") {
result[checkStatus].push({
path,
message
})
} |
<<<<<<<
// Assertation 4:
// Required parameters should not specify default values.
import snakecase from "lodash/snakeCase"
=======
>>>>>>>
// Assertation 4:
// Required parameters should not specify default values. |
<<<<<<<
operations: {
no_consumes_for_put_or_post: 'error',
get_op_has_consumes: 'warning',
no_produces: 'error',
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
},
parameters: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error'
=======
shared: {
operations: {
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error',
parameter_order: 'warning'
},
parameters: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error',
content_type_parameter: 'error',
accept_type_parameter: 'error'
},
paths: {
missing_path_parameter: 'error'
},
security_definitions: {
unused_security_schemes: 'warning',
unused_security_scopes: 'warning'
},
security: {
invalid_non_empty_security_array: 'error'
},
schemas: {
invalid_type_format_pair: 'error',
snake_case_only: 'warning',
no_property_description: 'warning',
description_mentions_json: 'warning',
array_of_arrays: 'warning'
},
walker: {
no_empty_descriptions: 'error',
has_circular_references: 'warning',
$ref_siblings: 'off'
}
>>>>>>>
shared: {
operations: {
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error',
parameter_order: 'warning'
},
parameters: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error',
content_type_parameter: 'error',
accept_type_parameter: 'error'
},
paths: {
missing_path_parameter: 'error'
},
security_definitions: {
unused_security_schemes: 'warning',
unused_security_scopes: 'warning'
},
security: {
invalid_non_empty_security_array: 'error'
},
schemas: {
invalid_type_format_pair: 'error',
snake_case_only: 'warning',
no_property_description: 'warning',
description_mentions_json: 'warning',
array_of_arrays: 'warning'
},
walker: {
no_empty_descriptions: 'error',
has_circular_references: 'warning',
$ref_siblings: 'off'
}
<<<<<<<
operations: {
no_consumes_for_put_or_post: 'error',
get_op_has_consumes: 'warning',
no_produces: 'error',
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
},
nonValidCategory: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error'
},
schemas: {
invalid_type_format_pair: 'error',
snake_case_only: 'warning',
no_property_description: 'warning',
description_mentions_json: 'warning'
},
walker: {
no_empty_descriptions: 'error'
=======
shared: {
operations: {
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
},
nonValidCategory: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error'
},
walker: {
no_empty_descriptions: 'error'
}
>>>>>>>
shared: {
operations: {
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
},
nonValidCategory: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error'
},
walker: {
no_empty_descriptions: 'error'
}
<<<<<<<
operations: {
nonValidRule: 'error',
get_op_has_consumes: 'warning',
no_produces: 'error',
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
},
parameters: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error'
},
schemas: {
invalid_type_format_pair: 'error',
snake_case_only: 'warning',
no_property_description: 'warning',
description_mentions_json: 'warning'
},
walker: {
no_empty_descriptions: 'error'
=======
shared: {
operations: {
nonValidRule: 'error',
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
},
parameters: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error'
},
walker: {
no_empty_descriptions: 'error'
}
>>>>>>>
shared: {
operations: {
nonValidRule: 'error',
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
},
parameters: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error'
},
walker: {
no_empty_descriptions: 'error'
}
<<<<<<<
operations: {
no_consumes_for_put_or_post: 'error',
get_op_has_consumes: 'warning',
no_produces: 'error',
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
},
parameters: {
no_parameter_description: 'error',
snake_case_only: 'warning',
invalid_type_format_pair: 'error'
},
schemas: {
invalid_type_format_pair: 'error',
snake_case_only: 'warning',
no_property_description: 'warning',
description_mentions_json: 'warning'
},
walker: {
no_empty_descriptions: 'nonValidStatus'
=======
swagger2: {
operations: {
no_consumes_for_put_or_post: 'error',
get_op_has_consumes: 'warning',
no_produces_for_get: 'nonValidStatus'
}
>>>>>>>
swagger2: {
operations: {
no_consumes_for_put_or_post: 'error',
get_op_has_consumes: 'warning',
no_produces: 'nonValidStatus'
}
<<<<<<<
operations: {
no_consumes_for_put_or_post: 'error',
get_op_has_consumes: 'warning',
no_produces: 'error',
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
=======
shared: {
operations: {
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
}
>>>>>>>
shared: {
operations: {
no_operation_id: 'warning',
no_summary: 'warning',
no_array_responses: 'error'
} |
<<<<<<<
}
define([], function(){ // AMD PATTERN - OK
// comment
return 1;
});
define([], "module name", function(){ // AMD PATTERN - OK
// comment
return 1;
});
=======
}
new (function(){ // OK
// comment
var a = 1;
})();
new function(){ // NOK
// comment
var a = 1;
};
>>>>>>>
}
new (function(){ // OK
// comment
var a = 1;
})();
new function(){ // NOK
// comment
var a = 1;
};
define([], function(){ // AMD PATTERN - OK
// comment
return 1;
});
define([], "module name", function(){ // AMD PATTERN - OK
// comment
return 1;
}); |
<<<<<<<
import Checklist from 'parser/shared/modules/features/Checklist';
import Rule from 'parser/shared/modules/features/Checklist/Rule';
import Requirement from 'parser/shared/modules/features/Checklist/Requirement';
import PreparationRule from 'parser/shared/modules/features/Checklist/PreparationRule';
import GenericCastEfficiencyRequirement from 'parser/shared/modules/features/Checklist/GenericCastEfficiencyRequirement';
=======
import SpellLink from 'common/SpellLink';
import Checklist from 'parser/shared/modules/features/Checklist2';
import Rule from 'parser/shared/modules/features/Checklist2/Rule';
import Requirement from 'parser/shared/modules/features/Checklist2/Requirement';
import PreparationRule from 'parser/shared/modules/features/Checklist2/PreparationRule';
import GenericCastEfficiencyRequirement from 'parser/shared/modules/features/Checklist2/GenericCastEfficiencyRequirement';
>>>>>>>
import SpellLink from 'common/SpellLink';
import Checklist from 'parser/shared/modules/features/Checklist';
import Rule from 'parser/shared/modules/features/Checklist/Rule';
import Requirement from 'parser/shared/modules/features/Checklist/Requirement';
import PreparationRule from 'parser/shared/modules/features/Checklist/PreparationRule';
import GenericCastEfficiencyRequirement from 'parser/shared/modules/features/Checklist/GenericCastEfficiencyRequirement';
<<<<<<<
<Requirement
name="Used Brain Freeze procs"
thresholds={thresholds.brainFreezeUtilization}
tooltip="Your Brain Freeze utilization. Brain Freeze is your most important proc and it is very important that you utilize them properly."
/>
<Requirement
name="Used Fingers of Frost procs"
thresholds={thresholds.fingersOfFrostUtilization}
/>
<Requirement
name="Ice Lance into Winter's Chill"
thresholds={thresholds.wintersChillIceLance}
tooltip="Using Brain Freeze will apply the Winter's Chill debuff to the target which causes your spells to act as if the target is frozen. Therefore, you should always cast Ice Lance after every instant cast Flurry so that the Ice Lance hits the target while Winter's Chill is up."
/>
<Requirement
name="Hardcast into Winter's Chill"
thresholds={thresholds.wintersChillHardCasts}
tooltip="Flurry travels faster than your other spells, so you can pre-cast Frostbolt, Ebonbolt, or Glacial Spike before using your instant cast Flurry. This will result in the pre-cast spell landing in the Winter's Chill debuff and dealing bonus shatter damage."
/>
=======
<Requirement name="Used Brain Freeze procs" thresholds={thresholds.brainFreezeUtilization} tooltip="Your Brain Freeze utilization. Brain Freeze is your most important proc and it is very important that you utilize them properly." />
<Requirement name="Used Fingers of Frost procs" thresholds={thresholds.fingersOfFrostUtilization} />
</Rule>
<Rule
name="Use Glacial Spike properly"
description={(
<>
<SpellLink id={SPELLS.GLACIAL_SPIKE_TALENT.id} /> is one of the most impactful talents that you can choose and it plays a large part in your rotation; So you should always ensure that you are getting the most out of it, because a large part of your damage will come from making sure that you are handling Glacial Spike properly. As a rule, once you have Glacial Spike available, you should not cast it unless you have a <SpellLink id={SPELLS.BRAIN_FREEZE.id} /> proc to use alongside it (<SpellLink id={SPELLS.GLACIAL_SPIKE_TALENT.id} /> > <SpellLink id={SPELLS.FLURRY.id} /> > <SpellLink id={SPELLS.ICE_LANCE.id} />) or if you also have the <SpellLink id={SPELLS.SPLITTING_ICE_TALENT.id} /> and the Glacial Spike will hit a second target. If neither of those are true, then you should continue casting <SpellLink id={SPELLS.FROSTBOLT.id} /> until you have a <SpellLink id={SPELLS.BRAIN_FREEZE.id} /> proc. If you are consistently in situations where you are waiting to get a Brain Freeze proc, then consider taking the <SpellLink id={SPELLS.EBONBOLT_TALENT.id} /> talent and saving it for when you need to generate a proc to use with Glacial Spike.
</>
)}
>
{combatant.hasTalent(SPELLS.GLACIAL_SPIKE_TALENT.id) && <Requirement name="Glacial Spike utilization" thresholds={thresholds.glacialSpikeUtilization} />}
>>>>>>>
<Requirement name="Used Brain Freeze procs" thresholds={thresholds.brainFreezeUtilization} tooltip="Your Brain Freeze utilization. Brain Freeze is your most important proc and it is very important that you utilize them properly." />
<Requirement name="Used Fingers of Frost procs" thresholds={thresholds.fingersOfFrostUtilization} />
</Rule>
<Rule
name="Use Glacial Spike properly"
description={(
<>
<SpellLink id={SPELLS.GLACIAL_SPIKE_TALENT.id} /> is one of the most impactful talents that you can choose and it plays a large part in your rotation; So you should always ensure that you are getting the most out of it, because a large part of your damage will come from making sure that you are handling Glacial Spike properly. As a rule, once you have Glacial Spike available, you should not cast it unless you have a <SpellLink id={SPELLS.BRAIN_FREEZE.id} /> proc to use alongside it (<SpellLink id={SPELLS.GLACIAL_SPIKE_TALENT.id} /> > <SpellLink id={SPELLS.FLURRY.id} /> > <SpellLink id={SPELLS.ICE_LANCE.id} />) or if you also have the <SpellLink id={SPELLS.SPLITTING_ICE_TALENT.id} /> and the Glacial Spike will hit a second target. If neither of those are true, then you should continue casting <SpellLink id={SPELLS.FROSTBOLT.id} /> until you have a <SpellLink id={SPELLS.BRAIN_FREEZE.id} /> proc. If you are consistently in situations where you are waiting to get a Brain Freeze proc, then consider taking the <SpellLink id={SPELLS.EBONBOLT_TALENT.id} /> talent and saving it for when you need to generate a proc to use with Glacial Spike.
</>
)}
>
{combatant.hasTalent(SPELLS.GLACIAL_SPIKE_TALENT.id) && <Requirement name="Glacial Spike utilization" thresholds={thresholds.glacialSpikeUtilization} />} |
<<<<<<<
window.Usergrid.console.pageSelectGroupMemberships = pageSelectGroupMemberships;
=======
window.apigee.console.pageSelectGroupMemberships = pageSelectGroupMemberships;
//TODO: MARKED FOR REMOVAL BY REFACTORING
>>>>>>>
window.Usergrid.console.pageSelectGroupMemberships = pageSelectGroupMemberships;
//TODO: MARKED FOR REMOVAL BY REFACTORING
<<<<<<<
redrawGroupPanel();
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/users', null, null,
=======
runAppQuery(new apigee.Query("GET",'groups/' + entity.uuid + '/users', null, null,
>>>>>>>
// redrawGroupPanel();
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/users', null, null,
<<<<<<<
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/rolenames', null, null,
function(response) {
if (user_data && response.entities && (response.entities.length > 0)) {
group_data.roles = response.data;
redrawGroupPanel();
}
},
function() { alertModal("Error", "Unable to retrieve group's rolenames."); }
));
//TODO: check if duplicate.
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/users', null, null,
function(response) {
if (group_data && response.entities && (response.entities.length > 0)) {
group_data.memberships = response.entities;
redrawGroupPanel();
}
},
function() { alertModal("Error", "Unable to retrieve group's rolenames."); }
));
//TODO: check if duplicate.
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/activities', null, null,
function(response) {
if (group_data && response.entities && (response.entities.length > 0)) {
group_data.activities = response.entities;
redrawGroupPanel();
}
},
function() { alertModal("Error", "Unable to retrieve group's rolenames."); }
));
//TODO: check against /rolenames
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/roles', null, null,
=======
runAppQuery(new apigee.Query("GET",'groups/' + entity.uuid + '/roles', null, null,
>>>>>>>
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/rolenames', null, null,
function(response) {
if (user_data && response.entities && (response.entities.length > 0)) {
group_data.roles = response.data;
redrawGroupPanel();
}
},
function() { alertModal("Error", "Unable to retrieve group's rolenames."); }
));
//TODO: check if duplicate.
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/users', null, null,
function(response) {
if (group_data && response.entities && (response.entities.length > 0)) {
group_data.memberships = response.entities;
redrawGroupPanel();
}
},
function() { alertModal("Error", "Unable to retrieve group's rolenames."); }
));
//TODO: check if duplicate.
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/activities', null, null,
function(response) {
if (group_data && response.entities && (response.entities.length > 0)) {
group_data.activities = response.entities;
redrawGroupPanel();
}
},
function() { alertModal("Error", "Unable to retrieve group's rolenames."); }
));
//TODO: check against /rolenames
runAppQuery(new Usergrid.Query("GET",'groups/' + entity.uuid + '/roles', null, null, |
<<<<<<<
export { default as WingBlank } from './components/wing-blank/';
export { default as Progress } from './components/progress/';
=======
export { default as WingBlank } from './components/wing-blank/';
export { default as TextAreaItem } from './components/textarea-item/';
>>>>>>>
export { default as WingBlank } from './components/wing-blank/';
export { default as Progress } from './components/progress/';
export { default as TextAreaItem } from './components/textarea-item/'; |
<<<<<<<
=======
<div styleName='group-section'>
<div styleName='group-section-label'>
{i18n.__('Matching character pairs')}
</div>
<div styleName='group-section-control'>
<input
styleName='group-section-control-input'
value={this.state.config.editor.matchingPairs}
ref='matchingPairs'
onChange={e => this.handleUIChange(e)}
type='text'
/>
</div>
</div>
<div styleName='group-section'>
<div styleName='group-section-label'>
{i18n.__('Matching character triples')}
</div>
<div styleName='group-section-control'>
<input
styleName='group-section-control-input'
value={this.state.config.editor.matchingTriples}
ref='matchingTriples'
onChange={e => this.handleUIChange(e)}
type='text'
/>
</div>
</div>
<div styleName='group-section'>
<div styleName='group-section-label'>
{i18n.__('Exploding character pairs')}
</div>
<div styleName='group-section-control'>
<input
styleName='group-section-control-input'
value={this.state.config.editor.explodingPairs}
ref='explodingPairs'
onChange={e => this.handleUIChange(e)}
type='text'
/>
</div>
</div>
<div styleName='group-section'>
<div styleName='group-section-label'>
{i18n.__('Custom MarkdownLint Rules')}
</div>
<div styleName='group-section-control'>
<input
onChange={e => this.handleUIChange(e)}
checked={this.state.config.editor.enableMarkdownLint}
ref='enableMarkdownLint'
type='checkbox'
/>
{i18n.__('Enable MarkdownLint')}
<div
style={{
fontFamily,
display: this.state.config.editor.enableMarkdownLint
? 'block'
: 'none'
}}
>
<ReactCodeMirror
width='400px'
height='200px'
onChange={e => this.handleUIChange(e)}
ref={e => (this.customMarkdownLintConfigCM = e)}
value={config.editor.customMarkdownLintConfig}
options={{
lineNumbers: true,
mode: 'application/json',
theme: codemirrorTheme,
lint: true,
gutters: [
'CodeMirror-linenumbers',
'CodeMirror-foldgutter',
'CodeMirror-lint-markers'
]
}}
/>
</div>
</div>
</div>
>>>>>>>
<div styleName='group-section'>
<div styleName='group-section-label'>
{i18n.__('Custom MarkdownLint Rules')}
</div>
<div styleName='group-section-control'>
<input
onChange={e => this.handleUIChange(e)}
checked={this.state.config.editor.enableMarkdownLint}
ref='enableMarkdownLint'
type='checkbox'
/>
{i18n.__('Enable MarkdownLint')}
<div
style={{
fontFamily,
display: this.state.config.editor.enableMarkdownLint
? 'block'
: 'none'
}}
>
<ReactCodeMirror
width='400px'
height='200px'
onChange={e => this.handleUIChange(e)}
ref={e => (this.customMarkdownLintConfigCM = e)}
value={config.editor.customMarkdownLintConfig}
options={{
lineNumbers: true,
mode: 'application/json',
theme: codemirrorTheme,
lint: true,
gutters: [
'CodeMirror-linenumbers',
'CodeMirror-foldgutter',
'CodeMirror-lint-markers'
]
}}
/>
</div>
</div>
</div> |
<<<<<<<
function PreparationListCtrl($stateParams, PreparationListService, PlaygroundService) {
=======
function PreparationListCtrl(PreparationService, PreparationListService, PlaygroundService, TalendConfirmService, MessageService) {
>>>>>>>
function PreparationListCtrl($stateParams, PreparationListService, PlaygroundService, PreparationService, TalendConfirmService, MessageService) {
<<<<<<<
/**
* Load playground with provided preparation id, if present in route param
* @param preparations - list of all user's preparation
*/
var loadUrlSelectedPreparation = function(preparations) {
if($stateParams.prepid) {
var selectedPrep = _.find(preparations, function(preparation) {
return preparation.id === $stateParams.prepid;
});
if(selectedPrep) {
vm.load(selectedPrep);
}
}
};
/**
* Load preparations list if needed, and load playground if route has preparation id
*/
PreparationListService.getPreparationsPromise()
.then(loadUrlSelectedPreparation);
=======
/**
* Delete a preparation
* @param preparation - the preparation to delete
*/
vm.delete = function(preparation) {
TalendConfirmService.confirm({disableEnter: true}, ['DELETE_PERMANENTLY', 'NO_UNDONE_CONFIRM'], {type:'preparation', name: preparation.name})
.then(function() {
return PreparationService.delete(preparation);
})
.then(function() {
MessageService.success('REMOVE_SUCCESS_TITLE', 'REMOVE_SUCCESS', {type:'preparation', name: preparation.name});
PreparationListService.refreshPreparations();
});
};
PreparationListService.refreshPreparations();
>>>>>>>
/**
* Delete a preparation
* @param preparation - the preparation to delete
*/
vm.delete = function(preparation) {
TalendConfirmService.confirm({disableEnter: true}, ['DELETE_PERMANENTLY', 'NO_UNDONE_CONFIRM'], {type:'preparation', name: preparation.name})
.then(function() {
return PreparationService.delete(preparation);
})
.then(function() {
MessageService.success('REMOVE_SUCCESS_TITLE', 'REMOVE_SUCCESS', {type:'preparation', name: preparation.name});
PreparationListService.refreshPreparations();
});
};
/**
* Load playground with provided preparation id, if present in route param
* @param preparations - list of all user's preparation
*/
var loadUrlSelectedPreparation = function(preparations) {
if($stateParams.prepid) {
var selectedPrep = _.find(preparations, function(preparation) {
return preparation.id === $stateParams.prepid;
});
if(selectedPrep) {
vm.load(selectedPrep);
}
}
};
/**
* Load preparations list if needed, and load playground if route has preparation id
*/
PreparationListService.getPreparationsPromise()
.then(loadUrlSelectedPreparation); |
<<<<<<<
//.constant('apiUrl', 'http://10.42.10.99:8081')
.constant('apiUrl', 'http://10.42.10.44:8081')
//.constant('apiUrl', 'http://10.42.10.99:8888')
=======
/**
* @ngdoc object
* @name data-prep.services.utils.service:apiUrl
* @description The REST api base url
*/
.constant('apiUrl', 'http://10.42.10.99:8888')
/**
* @ngdoc object
* @name data-prep.services.utils.service:disableDebug
* @description Application option. Disable debug mode (ex: in production) for performance
*/
>>>>>>>
/**
* @ngdoc object
* @name data-prep.services.utils.service:apiUrl
* @description The REST api base url
*/
.constant('apiUrl', 'http://10.42.10.99:8888')
/**
* @ngdoc object
* @name data-prep.services.utils.service:disableDebug
* @description Application option. Disable debug mode (ex: in production) for performance
*/
//.constant('apiUrl', 'http://10.42.10.99:8081')
//.constant('apiUrl', 'http://10.42.10.44:8081')
//.constant('apiUrl', 'http://10.42.10.99:8888') |
<<<<<<<
expect(element.find('.grid-header-type').text()).toBe('string');
expect(element.find('.grid-header-domain').text()).toBe('city');
=======
expect(element.find('.grid-header-type').text()).toBe('text');
>>>>>>>
expect(element.find('.grid-header-type').text()).toBe('text');
expect(element.find('.grid-header-domain').text()).toBe('city'); |
<<<<<<<
function DatagridHeaderCtrl(TransformationService, ConverterService, FilterService) {
var vm = this;
/**
* @ngdoc method
* @name refreshQualityBar
* @methodOf data-prep.datagrid-header.controller:DatagridHeaderCtrl
* @description [PRIVATE] Compute quality bars percentage
*/
vm.refreshQualityBar = function () {
var MIN_PERCENT = 10;
var column = vm.column;
column.total = column.quality.valid + column.quality.empty + column.quality.invalid;
// *_percent is the real % of empty/valid/invalid records, while *_percent_width is the width % of the bar.
// They can be different if less than MIN_PERCENT are valid/invalid/empty, to assure a min width of each bar. To be usable by the user.
column.quality.emptyPercent = column.quality.empty <= 0 ? 0 : Math.ceil(column.quality.empty * 100 / column.total);
column.quality.emptyPercentWidth = column.quality.empty <= 0 ? 0 : Math.max(column.quality.emptyPercent, MIN_PERCENT);
column.quality.invalidPercent = column.quality.invalid <= 0 ? 0 : Math.ceil(column.quality.invalid * 100 / column.total);
column.quality.invalidPercentWidth = column.quality.invalid <= 0 ? 0 : Math.max(column.quality.invalidPercent, MIN_PERCENT);
column.quality.validPercent = 100 - column.quality.emptyPercent - column.quality.invalidPercent;
column.quality.validPercentWidth = 100 - column.quality.emptyPercentWidth - column.quality.invalidPercentWidth;
};
/**
* @ngdoc method
* @name insertDividers
* @methodOf data-prep.datagrid-header.controller:DatagridHeaderCtrl
* @param {object[]} menuGroups - the menus grouped by category
* @description [PRIVATE] Insert a divider between each group of menus
* @returns {object[]} - each element is a group of menu or a divider
*/
var insertDividers = function(menuGroups) {
var divider = {isDivider : true};
var result = [];
_.forEach(menuGroups, function(group) {
if(result.length) {
result.push(divider);
}
=======
function DatagridHeaderCtrl(TransformationCacheService, ConverterService) {
var COLUMN_CATEGORY = 'columns';
>>>>>>>
function DatagridHeaderCtrl(TransformationCacheService, ConverterService, FilterService) {
<<<<<<<
/**
* @ngdoc method
* @name setColumnSimplifiedType
* @methodOf data-prep.datagrid-header.controller:DatagridHeaderCtrl
* @description set the column simplified, more user friendly, type.
*/
var setColumnSimplifiedType = function () {
vm.column.simplifiedType = ConverterService.simplifyType(vm.column.type);
};
/**
* @ngdoc method
* @name filterInvalidRecords
* @methodOf data-prep.datagrid-header.controller:DatagridHeaderCtrl
* @description Create a filter for invalid records on the given column.
* @param {object} column - the column to filter
*/
vm.filterInvalidRecords = function(column) {
FilterService.addFilter('invalid_records', column.id, column.name, {values: column.quality.invalidValues});
};
/**
* @ngdoc method
* @name filterEmptyRecords
* @methodOf data-prep.datagrid-header.controller:DatagridHeaderCtrl
* @description Create a filter for empty records on the given column.
* @param {object} column - the column to filter
*/
vm.filterEmptyRecords = function(column) {
FilterService.addFilter('empty_records', column.id, column.name, {});
};
setColumnSimplifiedType();
=======
>>>>>>>
/**
* @ngdoc method
* @name filterInvalidRecords
* @methodOf data-prep.datagrid-header.controller:DatagridHeaderCtrl
* @description Create a filter for invalid records on the given column.
* @param {object} column - the column to filter
*/
vm.filterInvalidRecords = function(column) {
FilterService.addFilter('invalid_records', column.id, column.name, {values: column.quality.invalidValues});
};
/**
* @ngdoc method
* @name filterEmptyRecords
* @methodOf data-prep.datagrid-header.controller:DatagridHeaderCtrl
* @description Create a filter for empty records on the given column.
* @param {object} column - the column to filter
*/
vm.filterEmptyRecords = function(column) {
FilterService.addFilter('empty_records', column.id, column.name, {});
}; |
<<<<<<<
function DatasetListCtrl($q, $timeout, $translate, $stateParams, StateService, DatasetService, DatasetListSortService, PlaygroundService,
TalendConfirmService, MessageService, UploadWorkflowService, UpdateWorkflowService, FolderService, state, PreparationListService) {
=======
function DatasetListCtrl($timeout, $translate, $stateParams, state, StateService,
DatasetService, DatasetListSortService, FolderService,
PlaygroundService,
UploadWorkflowService, UpdateWorkflowService,
MessageService, TalendConfirmService) {
>>>>>>>
function DatasetListCtrl($q, $timeout, $translate, $stateParams, StateService, DatasetService, DatasetListSortService, PlaygroundService,
TalendConfirmService, MessageService, UploadWorkflowService, UpdateWorkflowService, FolderService, state) {
<<<<<<<
vm.cloneName = dataset.name;
vm.cloneQueryCanceller = $q.defer();
vm.moveQueryCanceller = $q.defer();
// ensure nothing is null
=======
vm.cloneName = dataset.name + $translate.instant('COPY');
>>>>>>>
vm.cloneName = dataset.name;
vm.cloneQueryCanceller = $q.defer();
vm.moveQueryCanceller = $q.defer(); |
<<<<<<<
vm.datasetAggregationsService = SuggestionsStatsAggregationsService;
=======
vm.statisticsService = StatisticsService;
>>>>>>>
vm.statisticsService = StatisticsService;
vm.datasetAggregationsService = SuggestionsStatsAggregationsService; |
<<<<<<<
import Havoc from './Modules/Features/Havoc';
import DamageDone from './Modules/Features/DamageDone';
=======
import DimensionalRift from './Modules/Features/DimensionalRift';
>>>>>>>
import Havoc from './Modules/Features/Havoc';
import DamageDone from './Modules/Features/DamageDone';
import DimensionalRift from './Modules/Features/DimensionalRift'; |
<<<<<<<
* @requires data-prep.suggestions-stats
* @requires data-prep.services.onboarding
=======
>>>>>>>
* @requires data-prep.services.onboarding |
<<<<<<<
processData: processData,
processAggregation: processAggregation,
=======
//filters
>>>>>>>
//filters
<<<<<<<
=======
selectedColumn = column;
//remove the boxplot
service.boxplotData = null;
//remove the barchart
service.data = null;
//remove range slider
service.rangeLimits = null;
//show the map
>>>>>>>
<<<<<<<
=======
service.selectedColumn = column;
service.boxplotData = null;
service.data = null;
service.stateDistribution = null;
service.rangeLimits = null;
>>>>>>> |
<<<<<<<
vm.loadLookupDsContent = LookupService.loadContent;
vm.addLookupDatasetModal = false;
vm.isSendingRequest = false;
=======
vm.loadFromAction= LookupService.loadFromAction;
>>>>>>>
vm.loadFromAction= LookupService.loadFromAction;
vm.addLookupDatasetModal = false;
vm.isSendingRequest = false; |
<<<<<<<
, useRiver = options && options.useRiver
, bulk = options && options.bulk;
=======
>>>>>>>
, bulk = options && options.bulk;
<<<<<<<
var bulkBuffer = [];
function bulkDelete(indexName, typeName, model) {
bulkAdd({delete: {index: indexName, type: typeName, id: model._id.toString()}});
}
function bulkIndex(indexName, typeName, model) {
bulkAdd({index: {index: indexName, type: typeName, id: model._id.toString(), data: model}});
}
var bulkTimeout;
function bulkAdd(instruction) {
bulkBuffer.push(instruction);
clearTimeout(bulkTimeout);
if(bulkBuffer.length >= (bulk.size || 1000)) {
schema.statics.flush();
} else {
bulkTimeout = setTimeout(function(){
schema.statics.flush();
}, bulk.delay || 1000);
}
}
schema.statics.flush = function(){
esClient.bulk(bulkBuffer);
bulkBuffer = [];
};
=======
schema.statics.refresh = function(cb){
var model = this;
setIndexNameIfUnset(model.modelName);
esClient.refresh(indexName, cb);
};
>>>>>>>
var bulkBuffer = [];
function bulkDelete(indexName, typeName, model) {
bulkAdd({delete: {index: indexName, type: typeName, id: model._id.toString()}});
}
function bulkIndex(indexName, typeName, model) {
bulkAdd({index: {index: indexName, type: typeName, id: model._id.toString(), data: model}});
}
var bulkTimeout;
function bulkAdd(instruction) {
bulkBuffer.push(instruction);
clearTimeout(bulkTimeout);
if(bulkBuffer.length >= (bulk.size || 1000)) {
schema.statics.flush();
} else {
bulkTimeout = setTimeout(function(){
schema.statics.flush();
}, bulk.delay || 1000);
}
}
schema.statics.flush = function(){
esClient.bulk(bulkBuffer);
bulkBuffer = [];
};
schema.statics.refresh = function(cb){
var model = this;
setIndexNameIfUnset(model.modelName);
esClient.refresh(indexName, cb);
};
<<<<<<<
/*
* Experimental MongoDB River functionality
* NOTICE: Only tested with:
* MongoDB V2.4.1
* Elasticsearch V0.20.6
* elasticsearch-river-mongodb V1.6.5
* - https://github.com/richardwilly98/elasticsearch-river-mongodb/
*/
function setUpRiver(schema) {
schema.statics.river = function(cb) {
var model = this;
setIndexNameIfUnset(model.modelName);
if (!this.db.name) throw "ERROR: "+ model.modelName +".river() call before mongoose.connect"
// the river definition can come from the options of mongoosasic,
// but some attributes will be overwritten anyway
// see https://github.com/richardwilly98/elasticsearch-river-mongodb/wiki
var riverDefinition = useRiver.definition || {};
riverDefinition.type = 'mongodb';
riverDefinition.mongodb = riverDefinition.mongodb || {};
riverDefinition.mongodb.db = this.db.name;
riverDefinition.mongodb.collection = this.modelName.toLowerCase() + 's';
riverDefinition.gridfs = (useRiver && useRiver.gridfs) ? useRiver.gridfs : false;
riverDefinition.index = riverDefinition.index || {};
riverDefinition.index.name = indexName;
riverDefinition.index.type = typeName;
esClient.putRiver('mongodb', indexName, riverDefinition, cb);
}
}
=======
>>>>>>> |
<<<<<<<
bowlingBall: {type:Schema.ObjectId, ref:'BowlingBall'},
games: [{score: Number, date: Date}]
=======
bowlingBall: {type:Schema.ObjectId, ref:'BowlingBall'},
somethingToCast : {
type: String,
es_cast: function(element){
return element+' has been cast';
}
}
>>>>>>>
bowlingBall: {type:Schema.ObjectId, ref:'BowlingBall'},
games: [{score: Number, date: Date}],
somethingToCast : {
type: String,
es_cast: function(element){
return element+' has been cast';
}
}
<<<<<<<
bowlingBall: new BowlingBall(),
games: [{score: 80, date: new Date(Date.parse('05/17/1962'))}, {score: 80, date: new Date(Date.parse('06/17/1962'))}]
=======
bowlingBall: new BowlingBall(),
somethingToCast: 'Something'
>>>>>>>
bowlingBall: new BowlingBall(),
games: [{score: 80, date: new Date(Date.parse('05/17/1962'))}, {score: 80, date: new Date(Date.parse('06/17/1962'))}],
somethingToCast: 'Something'
<<<<<<<
serialized.dob.should.eql(dude.dob);
});
it('should serialize nested arrays', function(){
serialized.games.should.have.lengthOf(2);
serialized.games[0].should.have.property('score', 80);
=======
serialized.dob.should.eql(dude.dob.toJSON())
>>>>>>>
serialized.dob.should.eql(dude.dob.toJSON())
});
it('should serialize nested arrays', function(){
serialized.games.should.have.lengthOf(2);
serialized.games[0].should.have.property('score', 80); |
<<<<<<<
this.verifyTouch();
this.createSVG();
=======
>>>>>>>
this.verifyTouch();
this.createSVG(); |
<<<<<<<
this.verifyTouch();
this.createSVG();
=======
>>>>>>>
this.verifyTouch();
this.createSVG(); |
<<<<<<<
const data = await response.json();
return data.layers;
=======
return response.json();
>>>>>>>
const data = await response.json();
return data.layers;
<<<<<<<
const data = await response.json();
return data.layer;
=======
return response.json();
}
};
previews = {
url: (layerDescriptor: LayerDescriptor) => {
// prettier-ignore
return `${ABSTRACT_PREVIEWS_URL}/projects/${layerDescriptor.projectId}/commits/${layerDescriptor.sha}/files/${layerDescriptor.fileId}/layers/${layerDescriptor.layerId}`;
},
blob: async (layerDescriptor: LayerDescriptor, options: *) => {
const response = await this.fetchPreview(
// prettier-ignore
`projects/${layerDescriptor.projectId}/commits/${layerDescriptor.sha}/files/${layerDescriptor.fileId}/layers/${layerDescriptor.layerId}`,
options
);
return response.blob();
>>>>>>>
const data = await response.json();
return data.layer;
}
};
previews = {
url: (layerDescriptor: LayerDescriptor) => {
// prettier-ignore
return `${ABSTRACT_PREVIEWS_URL}/projects/${layerDescriptor.projectId}/commits/${layerDescriptor.sha}/files/${layerDescriptor.fileId}/layers/${layerDescriptor.layerId}`;
},
blob: async (layerDescriptor: LayerDescriptor, options: *) => {
const response = await this.fetchPreview(
// prettier-ignore
`projects/${layerDescriptor.projectId}/commits/${layerDescriptor.sha}/files/${layerDescriptor.fileId}/layers/${layerDescriptor.layerId}`,
options
);
return response.blob(); |
<<<<<<<
// descriptors
[
"descriptors.info",
{
url:
"https://share.goabstract.com/738d0202-0eea-4e13-a911-a6e7dfafe85f"
}
],
[
"descriptors.info",
{
sha: "latest",
url:
"https://share.goabstract.com/738d0202-0eea-4e13-a911-a6e7dfafe85f"
}
],
[
"descriptors.info",
{
sha: "my-sha",
url:
"https://share.goabstract.com/738d0202-0eea-4e13-a911-a6e7dfafe85f"
}
],
=======
// activities
[
"activities.list",
buildBranchDescriptor(),
{ responses: [responses.activities.list()] }
],
[
"activities.list",
buildOrganizationDescriptor(),
{ responses: [responses.activities.list()] }
],
[
"activities.list",
buildProjectDescriptor(),
{ responses: [responses.activities.list()] }
],
[
"activities.info",
buildActivityDescriptor(),
{ responses: [responses.activities.info()] }
],
>>>>>>>
// descriptors
[
"descriptors.info",
{
url:
"https://share.goabstract.com/738d0202-0eea-4e13-a911-a6e7dfafe85f"
}
],
[
"descriptors.info",
{
sha: "latest",
url:
"https://share.goabstract.com/738d0202-0eea-4e13-a911-a6e7dfafe85f"
}
],
[
"descriptors.info",
{
sha: "my-sha",
url:
"https://share.goabstract.com/738d0202-0eea-4e13-a911-a6e7dfafe85f"
}
],
// activities
[
"activities.list",
buildBranchDescriptor(),
{ responses: [responses.activities.list()] }
],
[
"activities.list",
buildOrganizationDescriptor(),
{ responses: [responses.activities.list()] }
],
[
"activities.list",
buildProjectDescriptor(),
{ responses: [responses.activities.list()] }
],
[
"activities.info",
buildActivityDescriptor(),
{ responses: [responses.activities.info()] }
], |
<<<<<<<
descriptors = {
info: async function(
shareDescriptor: ShareDescriptor
): Promise<ShareableDescriptor> {
const shareUrl = shareDescriptor.url
? shareDescriptor.url
: shareDescriptor.id
? `https://share.goabstract.com/${shareDescriptor.id}`
: undefined;
if (!shareUrl) {
throw new Error(
`Malformed share descriptor, "id" or "url" required: ${JSON.stringify(
shareDescriptor
)}`
);
}
const share = await this.shares.info(shareUrl);
return share.descriptor;
}.bind(this) // flow + async + generic = https://github.com/babel/babylon/issues/235#issuecomment-319450941
};
=======
activities = {
list: async (
objectDescriptor: $Shape<
BranchDescriptor & OrganizationDescriptor & ProjectDescriptor
> = {},
options: ListOptions = {}
) => {
const query = queryString.stringify({
limit: options.offset,
offset: options.offset,
branchId: objectDescriptor.branchId,
organizationId: objectDescriptor.organizationId,
projectId: objectDescriptor.projectId
});
const response = await this.fetch(`activities?${query}`);
const { activities } = await unwrapEnvelope(response.json());
return activities;
},
info: async ({ activityId }: ActivityDescriptor) => {
const response = await this.fetch(`activities/${activityId}`);
return response.json();
}
};
>>>>>>>
descriptors = {
info: async function(
shareDescriptor: ShareDescriptor
): Promise<ShareableDescriptor> {
const shareUrl = shareDescriptor.url
? shareDescriptor.url
: shareDescriptor.id
? `https://share.goabstract.com/${shareDescriptor.id}`
: undefined;
if (!shareUrl) {
throw new Error(
`Malformed share descriptor, "id" or "url" required: ${JSON.stringify(
shareDescriptor
)}`
);
}
const share = await this.shares.info(shareUrl);
return share.descriptor;
}.bind(this) // flow + async + generic = https://github.com/babel/babylon/issues/235#issuecomment-319450941
}
activities = {
list: async (
objectDescriptor: $Shape<
BranchDescriptor & OrganizationDescriptor & ProjectDescriptor
> = {},
options: ListOptions = {}
) => {
const query = queryString.stringify({
limit: options.offset,
offset: options.offset,
branchId: objectDescriptor.branchId,
organizationId: objectDescriptor.organizationId,
projectId: objectDescriptor.projectId
});
const response = await this.fetch(`activities?${query}`);
const { activities } = await unwrapEnvelope(response.json());
return activities;
},
info: async ({ activityId }: ActivityDescriptor) => {
const response = await this.fetch(`activities/${activityId}`);
return response.json();
}
}; |
<<<<<<<
value: React.PropTypes.instanceOf(Date),
minValue: React.PropTypes.object,
maxValue: React.PropTypes.object,
=======
value: React.PropTypes.date,
minValue: React.PropTypes.date,
maxValue: React.PropTypes.date,
>>>>>>>
value: React.PropTypes.instanceOf(Date),
minValue: React.PropTypes.instanceOf(Date),
maxValue: React.PropTypes.instanceOf(Date),
<<<<<<<
value: React.PropTypes.instanceOf(Date),
minValue: React.PropTypes.object,
maxValue: React.PropTypes.object,
=======
value: React.PropTypes.date,
minValue: React.PropTypes.date,
maxValue: React.PropTypes.date,
>>>>>>>
value: React.PropTypes.instanceOf(Date),
minValue: React.PropTypes.object,
maxValue: React.PropTypes.object, |
<<<<<<<
attrMapString = 'attrMap',
isNodeString = 'isNode',
isElementString = 'isElement',
=======
textContent = 'textContent',
setAttribute = 'setAttribute',
attrMap = 'attrMap',
d = typeof document === 'object' ? document : {},
>>>>>>>
nodeType = 'nodeType',
textContent = 'textContent',
setAttribute = 'setAttribute',
attrMapString = 'attrMap',
isNodeString = 'isNode',
isElementString = 'isElement',
d = typeof document === obj ? document : {},
<<<<<<<
if(!crel[isNodeString](child)){
child = document.createTextNode(child);
=======
if(!isNode(child)){
child = d.createTextNode(child);
>>>>>>>
if(!crel[isNodeString](child)){
child = d.createTextNode(child);
<<<<<<<
var attr = attributeMap[key];
=======
var attr = crel[attrMap][key];
>>>>>>>
var attr = attributeMap[key];
<<<<<<<
crel[attrMapString] = {};
=======
// String referenced so that compilers maintain the property name.
crel[attrMap] = {};
>>>>>>>
crel[attrMapString] = {}; |
<<<<<<<
iconsStyles: true,
stylesheet: 'css'
=======
iconsStyles: false || !plainCss,
ligatures: addLigatures
>>>>>>>
iconsStyles: true,
stylesheet: 'css'
<<<<<<<
styles: htmlStyles
=======
styles: htmlStyles,
plainCss: plainCss,
ligatures: addLigatures
>>>>>>>
styles: htmlStyles,
ligatures: addLigatures |
<<<<<<<
import React, { useMemo } from 'react';
=======
import * as React from 'react';
import { useCallback, useMemo } from 'react';
>>>>>>>
import * as React from 'react';
import { useMemo } from 'react'; |
<<<<<<<
import React, { memo } from 'react';
=======
import * as React from 'react';
>>>>>>>
import * as React from 'react';
import { memo } from 'react'; |
<<<<<<<
const enhance = compose(
connect((state, props) => ({
initialValues: getDefaultValues(state, props),
})),
reduxForm({
form: 'record-form',
validate: validateForm,
}),
);
=======
const ReduxForm = reduxForm({
form: 'record-form',
validate: validateForm,
enableReinitialize: true,
})(SimpleForm);
const mapStateToProps = (state, props) => ({
initialValues: getDefaultValues(state, props),
});
>>>>>>>
const enhance = compose(
connect((state, props) => ({
initialValues: getDefaultValues(state, props),
})),
reduxForm({
form: 'record-form',
validate: validateForm,
enableReinitialize: true,
}),
); |
<<<<<<<
soulFire: SoulFire,
=======
internalCombustion: InternalCombustion,
shadowburn: Shadowburn,
>>>>>>>
soulFire: SoulFire,
internalCombustion: InternalCombustion,
shadowburn: Shadowburn, |
<<<<<<<
const { actions = <DefaultActions />, children, data, hasDelete, hasShow, id, isLoading, resource, title, translate } = this.props;
=======
const { actions = <DefaultActions />, children, data, hasDelete, hasShow, id, isLoading, resource, title } = this.props;
const { key } = this.state;
>>>>>>>
const { actions = <DefaultActions />, children, data, hasDelete, hasShow, id, isLoading, resource, title, translate } = this.props;
const { key } = this.state; |
<<<<<<<
<FlatButton className="page-number" key={pageNum} label={pageNum} data-page={pageNum} onClick={this.gotoPage} primary={pageNum !== this.props.page} style={buttonStyle} />
=======
<FlatButton key={pageNum} label={pageNum} data-page={pageNum} onClick={this.gotoPage} primary={pageNum !== this.props.page} style={styles.button} />
>>>>>>>
<FlatButton className="page-number" key={pageNum} label={pageNum} data-page={pageNum} onClick={this.gotoPage} primary={pageNum !== this.props.page} style={styles.button} />
<<<<<<<
<span className="displayed-records" style={{ padding: '1.2em' }}>{ translate('aor.navigation.page_range_info', { offsetBegin, offsetEnd, total }) }</span>
=======
<span style={styles.pageInfo}>{translate('aor.navigation.page_range_info', { offsetBegin, offsetEnd, total })}</span>
>>>>>>>
<span className="displayed-records" style={styles.pageInfo}>{translate('aor.navigation.page_range_info', { offsetBegin, offsetEnd, total })}</span>
<<<<<<<
<FlatButton className="previous-page" primary key="prev" label={translate('aor.navigation.prev')} icon={<ChevronLeft />} onClick={this.prevPage} style={buttonStyle} />
=======
<FlatButton primary key="prev" label={translate('aor.navigation.prev')} icon={<ChevronLeft />} onClick={this.prevPage} style={styles.button} />
>>>>>>>
<FlatButton className="previous-page" primary key="prev" label={translate('aor.navigation.prev')} icon={<ChevronLeft />} onClick={this.prevPage} style={styles.button} />
<<<<<<<
<FlatButton className="next-page" primary key="next" label={translate('aor.navigation.next')} icon={<ChevronRight />} labelPosition="before" onClick={this.nextPage} style={buttonStyle} />
=======
<FlatButton primary key="next" label={translate('aor.navigation.next')} icon={<ChevronRight />} labelPosition="before" onClick={this.nextPage} style={styles.button} />
>>>>>>>
<FlatButton className="next-page" primary key="next" label={translate('aor.navigation.next')} icon={<ChevronRight />} labelPosition="before" onClick={this.nextPage} style={styles.button} /> |
<<<<<<<
import DatagridLoading from './DatagridLoading';
=======
import DatagridBody from './DatagridBody';
import DatagridRow from './DatagridRow';
import DatagridHeaderCell from './DatagridHeaderCell';
import DatagridCell from './DatagridCell';
>>>>>>>
import DatagridLoading from './DatagridLoading';
import DatagridBody from './DatagridBody';
import DatagridRow from './DatagridRow';
import DatagridHeaderCell from './DatagridHeaderCell';
import DatagridCell from './DatagridCell';
<<<<<<<
DatagridLoading,
=======
DatagridBody,
DatagridRow,
DatagridHeaderCell,
DatagridCell,
>>>>>>>
DatagridLoading,
DatagridBody,
DatagridRow,
DatagridHeaderCell,
DatagridCell, |
<<<<<<<
TransitionProps,
=======
variant,
margin,
>>>>>>>
variant,
margin,
TransitionProps, |
<<<<<<<
<MuiToolbar
className={classnames(
width === 'xs' ? classes.mobileToolbar : classes.desktopToolbar,
className
)}
disableGutters
{...rest}
>
<span>
{Children.count(children) === 0 ? (
<SaveButton
handleSubmitWithRedirect={handleSubmitWithRedirect}
invalid={invalid}
redirect={redirect}
saving={saving}
submitOnEnter={submitOnEnter}
/>
) : (
Children.map(
children,
button =>
button
? React.cloneElement(button, {
basePath,
handleSubmit,
handleSubmitWithRedirect,
invalid,
pristine,
saving,
submitOnEnter: valueOrDefault(
button.props.submitOnEnter,
submitOnEnter
),
})
: null
)
)}
</span>
{record &&
record.id && (
<DeleteButton
basePath={basePath}
record={record}
resource={resource}
/>
)}
</MuiToolbar>
=======
<Responsive
xsmall={
<MuiToolbar
className={classnames(classes.mobileToolbar, className)}
disableGutters
{...rest}
>
{Children.count(children) === 0 ? (
<SaveButton
handleSubmitWithRedirect={handleSubmitWithRedirect}
invalid={invalid}
variant="flat"
redirect={redirect}
saving={saving}
submitOnEnter={submitOnEnter}
/>
) : (
Children.map(
children,
button =>
button
? React.cloneElement(button, {
basePath,
handleSubmit: valueOrDefault(
button.props.handleSubmit,
handleSubmit
),
handleSubmitWithRedirect: valueOrDefault(
button.props.handleSubmitWithRedirect,
handleSubmitWithRedirect
),
invalid,
pristine,
saving,
submitOnEnter: valueOrDefault(
button.props.submitOnEnter,
submitOnEnter
),
variant: 'flat',
})
: null
)
)}
</MuiToolbar>
}
medium={
<MuiToolbar className={className} {...rest}>
{Children.count(children) === 0 ? (
<SaveButton
handleSubmitWithRedirect={handleSubmitWithRedirect}
invalid={invalid}
redirect={redirect}
saving={saving}
submitOnEnter={submitOnEnter}
/>
) : (
Children.map(
children,
button =>
button
? React.cloneElement(button, {
basePath,
handleSubmit,
handleSubmitWithRedirect,
invalid,
pristine,
saving,
submitOnEnter: valueOrDefault(
button.props.submitOnEnter,
submitOnEnter
),
})
: null
)
)}
</MuiToolbar>
}
/>
>>>>>>>
<MuiToolbar
className={classnames(
width === 'xs' ? classes.mobileToolbar : classes.desktopToolbar,
className
)}
disableGutters
{...rest}
>
<span>
{Children.count(children) === 0 ? (
<SaveButton
handleSubmitWithRedirect={handleSubmitWithRedirect}
invalid={invalid}
redirect={redirect}
saving={saving}
submitOnEnter={submitOnEnter}
/>
) : (
Children.map(
children,
button =>
button
? React.cloneElement(button, {
basePath,
handleSubmit: valueOrDefault(
button.props.handleSubmit,
handleSubmit
),
handleSubmitWithRedirect: valueOrDefault(
button.props.handleSubmitWithRedirect,
handleSubmitWithRedirect
),
invalid,
pristine,
saving,
submitOnEnter: valueOrDefault(
button.props.submitOnEnter,
submitOnEnter
),
})
: null
)
)}
</span>
{record &&
record.id && (
<DeleteButton
basePath={basePath}
record={record}
resource={resource}
/>
)}
</MuiToolbar> |
<<<<<<<
describe('rowClick', () => {
it('should accept a function', () => {
cy.contains(
'Fusce massa lorem, pulvinar a posuere ut, accumsan ac nisi'
)
.parents('tr')
.click();
cy.contains('Summary').should(el => expect(el).to.exist);
});
it('should accept a function returning a promise', () => {
LoginPage.navigate();
LoginPage.login('user', 'password');
ListPageUsers.navigate();
cy.contains('Annamarie Mayer')
.parents('tr')
.click();
cy.contains('Summary').should(el => expect(el).to.exist);
});
});
describe('expand panel', () => {
it('should show an expand button opening the expand element', () => {
cy.contains('1-10 of 13'); // wait for data
cy.get('[role="expand"]')
.eq(0)
.click();
cy.get('[role="expand-content"]').should(el =>
expect(el).to.contain(
'Curabitur eu odio ullamcorper, pretium sem at, blandit libero. Nulla sodales facilisis libero, eu gravida tellus ultrices nec. In ut gravida mi. Vivamus finibus tortor tempus egestas lacinia. Cras eu arcu nisl. Donec pretium dolor ipsum, eget feugiat urna iaculis ut.'
)
);
cy.get('.datagrid-body').should(el =>
expect(el).to.not.contain('[role="expand-content"]')
);
});
it('should accept multiple expands', () => {
cy.contains('1-10 of 13'); // wait for data
cy.get('[role="expand"]')
.eq(0)
.click();
cy.get('[role="expand"]')
.eq(1)
.click();
cy.get('[role="expand-content"]').should(el =>
expect(el).to.have.length(2)
);
});
});
=======
describe("Sorting", () => {
it('should display a sort arrow when clicking on a sortable column header', () => {
ListPagePosts.toggleColumnSort('id');
cy.get(ListPagePosts.elements.svg('id')).should('be.visible');
ListPagePosts.toggleColumnSort('tags.name');
cy.get(ListPagePosts.elements.svg('tags.name')).should('be.visible');
});
it('should hide the sort arrow when clicking on another sortable column header', () => {
ListPagePosts.toggleColumnSort('published_at');
cy.get(ListPagePosts.elements.svg('id')).should('be.hidden');
cy.get(ListPagePosts.elements.svg('tags.name')).should('be.hidden');
});
it('should reverse the sort arrow when clicking on an already sorted column header', () => {
ListPagePosts.toggleColumnSort('published_at');
ListPagePosts.toggleColumnSort('tags.name');
cy.get(ListPagePosts.elements.svg('tags.name', '[class*=iconDirectionAsc]')).should('exist');
ListPagePosts.toggleColumnSort('tags.name');
cy.get(ListPagePosts.elements.svg('tags.name', '[class*=iconDirectionDesc]')).should('exist');
});
})
>>>>>>>
describe('rowClick', () => {
it('should accept a function', () => {
cy.contains(
'Fusce massa lorem, pulvinar a posuere ut, accumsan ac nisi'
)
.parents('tr')
.click();
cy.contains('Summary').should(el => expect(el).to.exist);
});
it('should accept a function returning a promise', () => {
LoginPage.navigate();
LoginPage.login('user', 'password');
ListPageUsers.navigate();
cy.contains('Annamarie Mayer')
.parents('tr')
.click();
cy.contains('Summary').should(el => expect(el).to.exist);
});
});
describe('expand panel', () => {
it('should show an expand button opening the expand element', () => {
cy.contains('1-10 of 13'); // wait for data
cy.get('[role="expand"]')
.eq(0)
.click();
cy.get('[role="expand-content"]').should(el =>
expect(el).to.contain(
'Curabitur eu odio ullamcorper, pretium sem at, blandit libero. Nulla sodales facilisis libero, eu gravida tellus ultrices nec. In ut gravida mi. Vivamus finibus tortor tempus egestas lacinia. Cras eu arcu nisl. Donec pretium dolor ipsum, eget feugiat urna iaculis ut.'
)
);
cy.get('.datagrid-body').should(el =>
expect(el).to.not.contain('[role="expand-content"]')
);
});
it('should accept multiple expands', () => {
cy.contains('1-10 of 13'); // wait for data
cy.get('[role="expand"]')
.eq(0)
.click();
cy.get('[role="expand"]')
.eq(1)
.click();
cy.get('[role="expand-content"]').should(el =>
expect(el).to.have.length(2)
);
});
});
describe("Sorting", () => {
it('should display a sort arrow when clicking on a sortable column header', () => {
ListPagePosts.toggleColumnSort('id');
cy.get(ListPagePosts.elements.svg('id')).should('be.visible');
ListPagePosts.toggleColumnSort('tags.name');
cy.get(ListPagePosts.elements.svg('tags.name')).should('be.visible');
});
it('should hide the sort arrow when clicking on another sortable column header', () => {
ListPagePosts.toggleColumnSort('published_at');
cy.get(ListPagePosts.elements.svg('id')).should('be.hidden');
cy.get(ListPagePosts.elements.svg('tags.name')).should('be.hidden');
});
it('should reverse the sort arrow when clicking on an already sorted column header', () => {
ListPagePosts.toggleColumnSort('published_at');
ListPagePosts.toggleColumnSort('tags.name');
cy.get(ListPagePosts.elements.svg('tags.name', '[class*=iconDirectionAsc]')).should('exist');
ListPagePosts.toggleColumnSort('tags.name');
cy.get(ListPagePosts.elements.svg('tags.name', '[class*=iconDirectionDesc]')).should('exist');
});
}) |
<<<<<<<
const style =
this.choicesMaxHeight > 0
? { maxHeight: this.choicesMaxHeight, overflow: 'auto' }
: null;
=======
// Force the Popper component to reposition the popup only when this.inputEl is moved to another location
this.updateAnchorEl();
>>>>>>>
const style =
this.choicesMaxHeight > 0
? { maxHeight: this.choicesMaxHeight, overflow: 'auto' }
: null;
// Force the Popper component to reposition the popup only when this.inputEl is moved to another location
this.updateAnchorEl(); |
<<<<<<<
return (timeScale(d.renderEndTime || d.endTime) - timeScale(d.startTime))
=======
if (d.milestone) {
return theBarHeight
}
return (timeScale(d.endTime) - timeScale(d.startTime))
>>>>>>>
if (d.milestone) {
return theBarHeight
}
return (timeScale(d.renderEndTime || d.endTime) - timeScale(d.startTime))
<<<<<<<
const startX = timeScale(d.startTime)
const endX = timeScale(d.renderEndTime || d.endTime)
=======
let startX = timeScale(d.startTime)
let endX = timeScale(d.endTime)
if (d.milestone) {
startX += (0.5 * (timeScale(d.endTime) - timeScale(d.startTime))) - (0.5 * theBarHeight)
}
if (d.milestone) {
endX = startX + theBarHeight
}
>>>>>>>
let startX = timeScale(d.startTime)
let endX = timeScale(d.renderEndTime || d.endTime)
if (d.milestone) {
startX += (0.5 * (timeScale(d.endTime) - timeScale(d.startTime))) - (0.5 * theBarHeight)
}
if (d.milestone) {
endX = startX + theBarHeight
} |
<<<<<<<
MASTER_OF_BEASTS: {
id: 197248,
name: 'Master of Beasts',
icon: 'ability_hunter_masterscall',
},
SURGE_OF_THE_STORMGOD: {
id: 197354,
name: 'Surge of the Stormgod',
icon: 'ability_monk_forcesphere',
},
THUNDERSLASH: {
id: 238087,
name: 'Thunderslash',
icon: 'warrior_talent_icon_thunderstruck',
},
=======
DEATHSTRIKE_VENOM: {
id: 243121,
name: 'Deathstrike Venom',
icon: 'spell_nature_nullifypoison',
},
>>>>>>>
MASTER_OF_BEASTS: {
id: 197248,
name: 'Master of Beasts',
icon: 'ability_hunter_masterscall',
},
SURGE_OF_THE_STORMGOD: {
id: 197354,
name: 'Surge of the Stormgod',
icon: 'ability_monk_forcesphere',
},
THUNDERSLASH: {
id: 238087,
name: 'Thunderslash',
icon: 'warrior_talent_icon_thunderstruck',
},
DEATHSTRIKE_VENOM: {
id: 243121,
name: 'Deathstrike Venom',
icon: 'spell_nature_nullifypoison',
}, |
<<<<<<<
i = i || require("./osc.js");
=======
l = l || require("../osc.js");
>>>>>>>
l = l || require("./osc.js"); |
<<<<<<<
return e;
}) : "object" == typeof module && module.exports ? module.exports = e : t.EventEmitter = e;
}("undefined" != typeof window ? window : this || {});
=======
return t;
}) : "object" == typeof module && module.exports ? module.exports = t : e.EventEmitter = t;
}(this || {});
>>>>>>>
return t;
}) : "object" == typeof module && module.exports ? module.exports = t : e.EventEmitter = t;
}("undefined" != typeof window ? window : this || {}); |
<<<<<<<
function s(e, t) {
if (isNaN(e)) return t ? w : v;
=======
function l(e, t) {
if (isNaN(e)) return t ? c : m;
>>>>>>>
function l(e, t) {
if (isNaN(e)) return t ? c : m;
<<<<<<<
if ((n = e.indexOf("-")) > 0) throw Error("interior hyphen");
if (0 === n) return a(e.substring(1), t, r).neg();
for (var i = s(d(r, 8)), o = v, u = 0; u < e.length; u += 8) {
var c = Math.min(8, e.length - u), h = parseInt(e.substring(u, u + c), r);
if (c < 8) {
var f = s(d(r, c));
o = o.mul(f).add(s(h));
} else o = (o = o.mul(i)).add(s(h));
=======
if (0 < (n = e.indexOf("-"))) throw Error("interior hyphen");
if (0 === n) return h(e.substring(1), t, r).neg();
for (var i = l(f(r, 8)), s = m, o = 0; o < e.length; o += 8) {
var a = Math.min(8, e.length - o), u = parseInt(e.substring(o, o + a), r);
if (a < 8) {
var c = l(f(r, a));
s = s.mul(c).add(l(u));
} else s = (s = s.mul(i)).add(l(u));
>>>>>>>
if (0 < (n = e.indexOf("-"))) throw Error("interior hyphen");
if (0 === n) return h(e.substring(1), t, r).neg();
for (var i = l(f(r, 8)), s = m, o = 0; o < e.length; o += 8) {
var a = Math.min(8, e.length - o), u = parseInt(e.substring(o, o + a), r);
if (a < 8) {
var c = l(f(r, a));
s = s.mul(c).add(l(u));
} else s = (s = s.mul(i)).add(l(u));
<<<<<<<
}), r.isLong = n;
var h = {}, f = {};
r.fromInt = i, r.fromNumber = s, r.fromBits = o;
var d = Math.pow;
r.fromString = a, r.fromValue = u;
var g = 4294967296, l = g * g, p = l / 2, y = i(1 << 24), v = i(0);
r.ZERO = v;
var w = i(0, !0);
r.UZERO = w;
var m = i(1);
r.ONE = m;
var b = i(1, !0);
r.UONE = b;
var E = i(-1);
r.NEG_ONE = E;
var S = o(-1, 2147483647, !1);
r.MAX_VALUE = S;
var A = o(-1, -1, !0);
r.MAX_UNSIGNED_VALUE = A;
var P = o(0, -2147483648, !1);
r.MIN_VALUE = P;
var B = r.prototype;
=======
}), n.isLong = g;
var s = {}, o = {};
n.fromInt = r, n.fromNumber = l, n.fromBits = p;
var f = Math.pow;
n.fromString = h, n.fromValue = y;
var i = 4294967296, a = i * i, u = a / 2, w = r(1 << 24), m = r(0);
n.ZERO = m;
var c = r(0, !0);
n.UZERO = c;
var d = r(1);
n.ONE = d;
var b = r(1, !0);
n.UONE = b;
var S = r(-1);
n.NEG_ONE = S;
var E = p(-1, 2147483647, !1);
n.MAX_VALUE = E;
var A = p(-1, -1, !0);
n.MAX_UNSIGNED_VALUE = A;
var P = p(0, -2147483648, !1);
n.MIN_VALUE = P;
var B = n.prototype;
>>>>>>>
}), n.isLong = g;
var s = {}, o = {};
n.fromInt = r, n.fromNumber = l, n.fromBits = p;
var f = Math.pow;
n.fromString = h, n.fromValue = y;
var i = 4294967296, a = i * i, u = a / 2, v = r(1 << 24), m = r(0);
n.ZERO = m;
var c = r(0, !0);
n.UZERO = c;
var d = r(1);
n.ONE = d;
var b = r(1, !0);
n.UONE = b;
var S = r(-1);
n.NEG_ONE = S;
var E = p(-1, 2147483647, !1);
n.MAX_VALUE = E;
var A = p(-1, -1, !0);
n.MAX_UNSIGNED_VALUE = A;
var P = p(0, -2147483648, !1);
n.MIN_VALUE = P;
var B = n.prototype;
<<<<<<<
if (this.isZero()) return v;
if (n(e) || (e = u(e)), c) return o(c.mul(this.low, this.high, e.low, e.high), c.get_high(), this.unsigned);
if (e.isZero()) return v;
if (this.eq(P)) return e.isOdd() ? P : v;
if (e.eq(P)) return this.isOdd() ? P : v;
=======
if (this.isZero()) return m;
if (g(e) || (e = y(e)), v) return p(v.mul(this.low, this.high, e.low, e.high), v.get_high(), this.unsigned);
if (e.isZero()) return m;
if (this.eq(P)) return e.isOdd() ? P : m;
if (e.eq(P)) return this.isOdd() ? P : m;
>>>>>>>
if (this.isZero()) return m;
if (g(e) || (e = y(e)), w) return p(w.mul(this.low, this.high, e.low, e.high), w.get_high(), this.unsigned);
if (e.isZero()) return m;
if (this.eq(P)) return e.isOdd() ? P : m;
if (e.eq(P)) return this.isOdd() ? P : m;
<<<<<<<
if (this.lt(y) && e.lt(y)) return s(this.toNumber() * e.toNumber(), this.unsigned);
var t = this.high >>> 16, r = 65535 & this.high, i = this.low >>> 16, a = 65535 & this.low, h = e.high >>> 16, f = 65535 & e.high, d = e.low >>> 16, g = 65535 & e.low, l = 0, p = 0, w = 0, m = 0;
return w += (m += a * g) >>> 16, p += (w += i * g) >>> 16, w &= 65535, p += (w += a * d) >>> 16,
l += (p += r * g) >>> 16, p &= 65535, l += (p += i * d) >>> 16, p &= 65535, l += (p += a * f) >>> 16,
l += t * g + r * d + i * f + a * h, o((w &= 65535) << 16 | (m &= 65535), (l &= 65535) << 16 | (p &= 65535), this.unsigned);
=======
if (this.lt(w) && e.lt(w)) return l(this.toNumber() * e.toNumber(), this.unsigned);
var t = this.high >>> 16, r = 65535 & this.high, n = this.low >>> 16, i = 65535 & this.low, s = e.high >>> 16, o = 65535 & e.high, a = e.low >>> 16, u = 65535 & e.low, c = 0, h = 0, f = 0, d = 0;
return f += (d += i * u) >>> 16, h += (f += n * u) >>> 16, f &= 65535, h += (f += i * a) >>> 16,
c += (h += r * u) >>> 16, h &= 65535, c += (h += n * a) >>> 16, h &= 65535, c += (h += i * o) >>> 16,
c += t * u + r * a + n * o + i * s, p((f &= 65535) << 16 | (d &= 65535), (c &= 65535) << 16 | (h &= 65535), this.unsigned);
>>>>>>>
if (this.lt(v) && e.lt(v)) return l(this.toNumber() * e.toNumber(), this.unsigned);
var t = this.high >>> 16, r = 65535 & this.high, n = this.low >>> 16, i = 65535 & this.low, s = e.high >>> 16, o = 65535 & e.high, a = e.low >>> 16, u = 65535 & e.low, c = 0, h = 0, f = 0, d = 0;
return f += (d += i * u) >>> 16, h += (f += n * u) >>> 16, f &= 65535, h += (f += i * a) >>> 16,
c += (h += r * u) >>> 16, h &= 65535, c += (h += n * a) >>> 16, h &= 65535, c += (h += i * o) >>> 16,
c += t * u + r * a + n * o + i * s, p((f &= 65535) << 16 | (d &= 65535), (c &= 65535) << 16 | (h &= 65535), this.unsigned);
<<<<<<<
if (n(e) || (e = u(e)), e.isZero()) throw Error("division by zero");
if (c) return this.unsigned || -2147483648 !== this.high || -1 !== e.low || -1 !== e.high ? o((this.unsigned ? c.div_u : c.div_s)(this.low, this.high, e.low, e.high), c.get_high(), this.unsigned) : this;
if (this.isZero()) return this.unsigned ? w : v;
var t, r, i;
=======
if (g(e) || (e = y(e)), e.isZero()) throw Error("division by zero");
if (v) return this.unsigned || -2147483648 !== this.high || -1 !== e.low || -1 !== e.high ? p((this.unsigned ? v.div_u : v.div_s)(this.low, this.high, e.low, e.high), v.get_high(), this.unsigned) : this;
if (this.isZero()) return this.unsigned ? c : m;
var t, r, n;
>>>>>>>
if (g(e) || (e = y(e)), e.isZero()) throw Error("division by zero");
if (w) return this.unsigned || -2147483648 !== this.high || -1 !== e.low || -1 !== e.high ? p((this.unsigned ? w.div_u : w.div_s)(this.low, this.high, e.low, e.high), w.get_high(), this.unsigned) : this;
if (this.isZero()) return this.unsigned ? c : m;
var t, r, n;
<<<<<<<
if (this.eq(P)) return e.eq(m) || e.eq(E) ? P : e.eq(P) ? m : (t = this.shr(1).div(e).shl(1)).eq(v) ? e.isNegative() ? m : E : (r = this.sub(e.mul(t)),
i = t.add(r.div(e)));
if (e.eq(P)) return this.unsigned ? w : v;
=======
if (this.eq(P)) return e.eq(d) || e.eq(S) ? P : e.eq(P) ? d : (t = this.shr(1).div(e).shl(1)).eq(m) ? e.isNegative() ? d : S : (r = this.sub(e.mul(t)),
n = t.add(r.div(e)));
if (e.eq(P)) return this.unsigned ? c : m;
>>>>>>>
if (this.eq(P)) return e.eq(d) || e.eq(S) ? P : e.eq(P) ? d : (t = this.shr(1).div(e).shl(1)).eq(m) ? e.isNegative() ? d : S : (r = this.sub(e.mul(t)),
n = t.add(r.div(e)));
if (e.eq(P)) return this.unsigned ? c : m;
<<<<<<<
i = v;
=======
n = m;
>>>>>>>
n = m; |
<<<<<<<
isOnGCD: true,
=======
gcd: {
base: 1500,
},
castEfficiency: {
suggestion: true,
recommendedEfficiency: 0.90,
extraSuggestion: 'Should be casting this on CD for the dps unless your saving the leach for something or saving it for a pack of adds.',
},
>>>>>>>
gcd: {
base: 1500,
},
castEfficiency: {
suggestion: true,
recommendedEfficiency: 0.90,
extraSuggestion: 'Should be casting this on CD for the dps unless your saving the leach for something or saving it for a pack of adds.',
},
<<<<<<<
isOnGCD: true,
cooldown: 120,
=======
gcd: {
base: 1500,
},
cooldown: 180,
>>>>>>>
gcd: {
base: 1500,
},
cooldown: 120,
<<<<<<<
isOnGCD: true,
cooldown: combatant.hasTalent(SPELLS.TIGHTENING_GRASP_TALENT.id) ? 120 - 30 : 120,
=======
gcd: {
base: 1500,
},
cooldown: combatant.hasTalent(SPELLS.TIGHTENING_GRASP_TALENT.id) ? 90 : 120,
>>>>>>>
gcd: {
base: 1500,
},
cooldown: combatant.hasTalent(SPELLS.TIGHTENING_GRASP_TALENT.id) ? 90 : 120,
<<<<<<<
isOnGCD: true,
cooldown: 6,
=======
gcd: {
base: 1500,
},
>>>>>>>
cooldown: 6,
gcd: {
base: 1500,
}, |
<<<<<<<
publishDocs: {
options: {
stdout: true
},
=======
component: {
command: path.resolve('node_modules', 'component', 'bin',
'component-build') +
' -o test -n localforage.component'
},
options: {
stdout: true
},
publish: {
>>>>>>>
options: {
stdout: true
},
component: {
command: path.resolve('node_modules', 'component', 'bin',
'component-build') +
' -o test -n localforage.component'
},
publishDocs: {
<<<<<<<
grunt.registerTask('build', ['concat', 'uglify']);
grunt.registerTask('docs', ['shell:serveDocs']);
grunt.registerTask('publish', ['build', 'shell:publishDocs']);
=======
grunt.registerTask('build', ['concat', 'uglify', 'shell:component']);
grunt.registerTask('publish', ['build', 'shell:publish']);
>>>>>>>
grunt.registerTask('build', ['concat', 'uglify']);
grunt.registerTask('docs', ['shell:serveDocs']);
grunt.registerTask('publish', ['build', 'shell:publishDocs']); |
<<<<<<<
import normalizeKey from '../utils/normalizeKey';
=======
import getCallback from '../utils/getCallback';
function _getKeyPrefix(options, defaultConfig) {
var keyPrefix = options.name + '/';
if (options.storeName !== defaultConfig.storeName) {
keyPrefix += options.storeName + '/';
}
return keyPrefix;
}
>>>>>>>
import normalizeKey from '../utils/normalizeKey';
import getCallback from '../utils/getCallback';
function _getKeyPrefix(options, defaultConfig) {
var keyPrefix = options.name + '/';
if (options.storeName !== defaultConfig.storeName) {
keyPrefix += options.storeName + '/';
}
return keyPrefix;
} |
<<<<<<<
import normalizeKey from '../utils/normalizeKey';
=======
import getCallback from '../utils/getCallback';
>>>>>>>
import normalizeKey from '../utils/normalizeKey';
import getCallback from '../utils/getCallback'; |
<<<<<<<
function normalizeKey(key) {
// Cast the key to a string, as that's all we can set as a key.
if (typeof key !== 'string') {
console.warn(key + ' used as a key, but it is not a string.');
key = String(key);
}
return key;
}
=======
function getCallback() {
if (arguments.length && typeof arguments[arguments.length - 1] === 'function') {
return arguments[arguments.length - 1];
}
}
>>>>>>>
function normalizeKey(key) {
// Cast the key to a string, as that's all we can set as a key.
if (typeof key !== 'string') {
console.warn(key + ' used as a key, but it is not a string.');
key = String(key);
}
return key;
}
function getCallback() {
if (arguments.length && typeof arguments[arguments.length - 1] === 'function') {
return arguments[arguments.length - 1];
}
} |
<<<<<<<
var selector = 'applet';
=======
options = options || {};
var selector = 'applet';
this.get('$scope').each(function () {
var candidates = $(this).find(selector);
if (!candidates.length) {
test.add(Case({
element: undefined,
status: (options.test ? 'inapplicable' : 'passed')
}));
}
else {
candidates.each(function () {
var status;
// If a test is defined, then use it
if (options.test && !$(this).is(options.test)) {
status = 'passed';
}
else {
status = 'failed';
}
>>>>>>>
options = options || {};
var selector = 'applet'; |
<<<<<<<
this.cache[cacheKey] = Math.round((Math.max(l1, l2) + 0.05) / (Math.min(l1, l2) + 0.05) * 10) / 10;
return this.cache[cacheKey];
=======
colors.cache[cacheKey] = Math.round((Math.max(l1, l2) + 0.05)/(Math.min(l1, l2) + 0.05)*10)/10;
return colors.cache[cacheKey];
>>>>>>>
colors.cache[cacheKey] = Math.round((Math.max(l1, l2) + 0.05) / (Math.min(l1, l2) + 0.05) * 10) / 10;
return colors.cache[cacheKey];
<<<<<<<
/**
* Returns whether an element's color passes
* WCAG at a certain contrast ratio.
*/
passesWCAG: function (element, level) {
return this.passesWCAGColor(element, this.getColor(element, 'foreground'), this.getColor(element, 'background'), level);
=======
testElmContrast: function (algorithm, element, level) {
var background = colors.getColor(element, 'background');
return colors.testElmBackground(algorithm, element, background, level);
},
testElmBackground: function (algorithm, element, background, level) {
var foreground = colors.getColor(element, 'foreground');
var res;
if (algorithm === 'wcag') {
res = colors.passesWCAGColor(element, foreground, background, level);
} else if (algorithm === 'wai') {
res = colors.passesWAIColor(foreground, background);
}
return res;
>>>>>>>
/**
* Returns whether an element's color passes
* WCAG at a certain contrast ratio.
*/
passesWCAG: function (element, level) {
return this.passesWCAGColor(element, this.getColor(element, 'foreground'), this.getColor(element, 'background'), level);
},
testElmContrast: function (algorithm, element, level) {
var background = colors.getColor(element, 'background');
return colors.testElmBackground(algorithm, element, background, level);
},
testElmBackground: function (algorithm, element, background, level) {
var foreground = colors.getColor(element, 'foreground');
var res;
if (algorithm === 'wcag') {
res = colors.passesWCAGColor(element, foreground, background, level);
} else if (algorithm === 'wai') {
res = colors.passesWAIColor(foreground, background);
}
return res;
<<<<<<<
getWAIErtContrast: function (foreground, background) {
var diffs = this.getWAIDiffs(foreground, background);
=======
getWAIErtContrast : function(foreground, background) {
var diffs = colors.getWAIDiffs(foreground, background);
>>>>>>>
getWAIErtContrast : function(foreground, background) {
var diffs = colors.getWAIDiffs(foreground, background);
<<<<<<<
getWAIErtBrightness: function (foreground, background) {
var diffs = this.getWAIDiffs(foreground, background);
=======
getWAIErtBrightness : function(foreground, background) {
var diffs = colors.getWAIDiffs(foreground, background);
>>>>>>>
getWAIErtBrightness : function(foreground, background) {
var diffs = colors.getWAIDiffs(foreground, background);
<<<<<<<
getWAIDiffs: function (foreground, background) {
var diff = { };
diff.red = Math.abs(foreground.r - background.r);
diff.green = Math.abs(foreground.g - background.g);
diff.blue = Math.abs(foreground.b - background.b);
return diff;
=======
getWAIDiffs : function(foreground, background) {
return {
red: Math.abs(foreground.r - background.r),
green: Math.abs(foreground.g - background.g),
blue: Math.abs(foreground.b - background.b)
};
>>>>>>>
getWAIDiffs : function(foreground, background) {
return {
red: Math.abs(foreground.r - background.r),
green: Math.abs(foreground.g - background.g),
blue: Math.abs(foreground.b - background.b)
};
<<<<<<<
getColor: function (element, type) {
var self = this;
=======
getColor : function(element, type) {
var self = colors;
>>>>>>>
getColor : function (element, type) {
var self = colors;
<<<<<<<
cleanup: function (color) {
=======
parseColor : function(color) {
>>>>>>>
parseColor: function (color) {
<<<<<<<
} catch (e) {
this.cache[cacheKey] = defaultRGB;
=======
} catch(e) {
colors.cache[cacheKey] = defaultRGB;
>>>>>>>
} catch (e) {
colors.cache[cacheKey] = defaultRGB;
<<<<<<<
var notempty = function (s) {
return $.trim(s) !== '';
};
=======
>>>>>>>
var notempty = function (s) {
return $.trim(s) !== '';
};
<<<<<<<
getBehindElementBackgroundColor: function (element) {
return quail.components.color.colors.traverseVisualTreeForBackground(element, 'background-color');
=======
getBehindElementBackgroundColor: function(element) {
return colors.traverseVisualTreeForBackground(element, 'background-color');
>>>>>>>
getBehindElementBackgroundColor: function(element) {
return colors.traverseVisualTreeForBackground(element, 'background-color');
<<<<<<<
getBehindElementBackgroundGradient: function (element) {
return quail.components.color.colors.traverseVisualTreeForBackground(element, 'background-gradient');
=======
getBehindElementBackgroundGradient: function(element) {
return colors.traverseVisualTreeForBackground(element, 'background-gradient');
>>>>>>>
getBehindElementBackgroundGradient: function(element) {
return colors.traverseVisualTreeForBackground(element, 'background-gradient'); |
<<<<<<<
selector: options.selector,
status: 'passed'
=======
expected: $scope.data('expected') || $scope.find('[data-expected]').data('expected'),
// status: 'passed'
status: (options.test ? 'inapplicable' : 'passed')
>>>>>>>
// status: 'passed'
status: (options.test ? 'inapplicable' : 'passed')
<<<<<<<
selector: options.selector,
status: 'failed'
=======
expected: $this.closest('.quail-test').data('expected'),
status: status
>>>>>>>
status: status |
<<<<<<<
var selector = 'applet';
=======
options = options || {};
var selector = 'applet';
this.get('$scope').each(function () {
var candidates = $(this).find(selector);
if (!candidates.length) {
test.add(Case({
element: undefined,
status: (options.test ? 'inapplicable' : 'passed')
}));
}
else {
candidates.each(function () {
var status;
// If a test is defined, then use it
if (options.test && !$(this).is(options.test)) {
status = 'passed';
}
else {
status = 'failed';
}
>>>>>>>
options = options || {};
var selector = 'applet'; |
<<<<<<<
grunt.loadNpmTasks('grunt-chmod');
=======
grunt.loadNpmTasks('grunt-karma');
>>>>>>>
grunt.loadNpmTasks('grunt-chmod');
grunt.loadNpmTasks('grunt-karma'); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.