conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
.send({ name: "Bill", username: "bill", password: "bills_password", roleId: BUILTIN_ROLE_IDS.POWER })
=======
.send({ email: "[email protected]", password: "bills_password", accessLevelId: BUILTIN_LEVEL_IDS.POWER })
>>>>>>>
.send({ email: "[email protected]", password: "bills_password", roleId: BUILTIN_LEVEL_IDS.POWER })
<<<<<<<
body: { name: "brandNewUser", username: "brandNewUser", password: "yeeooo", roleId: BUILTIN_ROLE_IDS.POWER },
=======
body: { email: "[email protected]", password: "yeeooo", accessLevelId: BUILTIN_LEVEL_IDS.POWER },
>>>>>>>
body: { email: "[email protected]", password: "yeeooo", roleId: BUILTIN_LEVEL_IDS.POWER }, |
<<<<<<<
FIRE_MINES: {
id: 253321,
name: 'Fire Mines',
icon: 'inv_jewelry_orgrimmarraid_trinket_04_green',
},
=======
GORSHALACHS_LEGACY_FIRST_HIT: {
id: 253329,
name: 'Gorshalach\'s Legacy',
icon: 'inv_sword_1h_firelandsraid_d_01',
},
GORSHALACHS_LEGACY_SECOND_HIT: {
id: 255673,
name: 'Gorshalach\'s Legacy',
icon: 'inv_sword_1h_firelandsraid_d_01',
},
GOLGANNETHS_VITALITY_RAVAGING_STORM: { //Each tick is a cast event of this spell
id: 257286,
name: 'Ravaging Storm',
icon: 'inv_antorus_grey',
},
GOLGANNETHS_VITALITY_THUNDEROUS_WRATH: {
id: 257430,
name: 'Golganneth\'s Thunderous Wrath',
icon: 'ability_thunderking_thunderstruck',
},
>>>>>>>
GORSHALACHS_LEGACY_FIRST_HIT: {
id: 253329,
name: 'Gorshalach\'s Legacy',
icon: 'inv_sword_1h_firelandsraid_d_01',
},
GORSHALACHS_LEGACY_SECOND_HIT: {
id: 255673,
name: 'Gorshalach\'s Legacy',
icon: 'inv_sword_1h_firelandsraid_d_01',
},
GOLGANNETHS_VITALITY_RAVAGING_STORM: { //Each tick is a cast event of this spell
id: 257286,
name: 'Ravaging Storm',
icon: 'inv_antorus_grey',
},
GOLGANNETHS_VITALITY_THUNDEROUS_WRATH: {
id: 257430,
name: 'Golganneth\'s Thunderous Wrath',
icon: 'ability_thunderking_thunderstruck',
},
FIRE_MINES: {
id: 253321,
name: 'Fire Mines',
icon: 'inv_jewelry_orgrimmarraid_trinket_04_green',
}, |
<<<<<<<
const linkRecords = require("../../db/linkedRecords")
=======
const csvParser = require("../../utilities/csvParser")
>>>>>>>
const linkRecords = require("../../db/linkedRecords")
const csvParser = require("../../utilities/csvParser")
<<<<<<<
const instanceId = ctx.user.instanceId
const db = new CouchDB(instanceId)
=======
const db = new CouchDB(ctx.user.instanceId)
const { dataImport, ...rest } = ctx.request.body
>>>>>>>
const instanceId = ctx.user.instanceId
const db = new CouchDB(instanceId)
const { dataImport, ...rest } = ctx.request.body
<<<<<<<
// update linked records
await linkRecords.updateLinks({
instanceId,
eventType: oldModel
? linkRecords.EventType.MODEL_UPDATED
: linkRecords.EventType.MODEL_SAVE,
model: modelToSave,
oldModel: oldModel,
})
ctx.eventEmitter &&
ctx.eventEmitter.emitModel(`model:save`, instanceId, modelToSave)
=======
const { schema } = ctx.request.body
for (let key of Object.keys(schema)) {
// model has a linked record
if (schema[key].type === "link") {
// create the link field in the other model
const linkedModel = await db.get(schema[key].modelId)
linkedModel.schema[modelToSave.name] = {
name: modelToSave.name,
type: "link",
modelId: modelToSave._id,
constraints: {
type: "array",
},
}
await db.put(linkedModel)
}
}
if (dataImport && dataImport.path) {
// Populate the table with records imported from CSV in a bulk update
const data = await csvParser.transform(dataImport)
for (let row of data) {
row._id = generateRecordID(modelToSave._id)
row.modelId = modelToSave._id
}
await db.bulkDocs(data)
}
>>>>>>>
// update linked records
await linkRecords.updateLinks({
instanceId,
eventType: oldModel
? linkRecords.EventType.MODEL_UPDATED
: linkRecords.EventType.MODEL_SAVE,
model: modelToSave,
oldModel: oldModel,
})
ctx.eventEmitter &&
ctx.eventEmitter.emitModel(`model:save`, instanceId, modelToSave)
if (dataImport && dataImport.path) {
// Populate the table with records imported from CSV in a bulk update
const data = await csvParser.transform(dataImport)
for (let row of data) {
row._id = generateRecordID(modelToSave._id)
row.modelId = modelToSave._id
}
await db.bulkDocs(data)
} |
<<<<<<<
const newid = require("../../db/newid")
const linkRecords = require("../../db/linkedRecords")
=======
const {
getRecordParams,
getModelParams,
generateModelID,
} = require("../../db/utils")
>>>>>>>
const linkRecords = require("../../db/linkedRecords")
const {
getRecordParams,
getModelParams,
generateModelID,
} = require("../../db/utils")
<<<<<<<
if (_rename && modelToSave.schema[_rename.updated].type === "link") {
throw "Cannot rename a linked field."
} else if (_rename && modelToSave.primaryDisplay === _rename.old) {
throw "Cannot rename the primary display field."
} else if (_rename) {
const records = await db.query(`database/all_${modelToSave._id}`, {
include_docs: true,
})
=======
if (_rename) {
const records = await db.allDocs(
getRecordParams(modelToSave._id, null, {
include_docs: true,
})
)
>>>>>>>
if (_rename && modelToSave.schema[_rename.updated].type === "link") {
throw "Cannot rename a linked field."
} else if (_rename && modelToSave.primaryDisplay === _rename.old) {
throw "Cannot rename the primary display field."
} else if (_rename) {
const records = await db.allDocs(
getRecordParams(modelToSave._id, null, {
include_docs: true,
})
)
<<<<<<<
const designDoc = await db.get("_design/database")
/** TODO: should we include the doc type here - currently it is possible for anything
with a modelId in it to be returned */
designDoc.views = {
...designDoc.views,
[`all_${modelToSave._id}`]: {
map: `function(doc) {
if (doc.modelId === "${modelToSave._id}") {
emit(doc._id);
}
}`,
},
}
// update linked records
await linkRecords.updateLinks({
instanceId,
eventType: oldModel
? linkRecords.EventType.MODEL_UPDATED
: linkRecords.EventType.MODEL_SAVE,
model: modelToSave,
oldModel: oldModel,
})
await db.put(designDoc)
ctx.eventEmitter &&
ctx.eventEmitter.emitModel(`model:save`, instanceId, modelToSave)
=======
const { schema } = ctx.request.body
for (let key of Object.keys(schema)) {
// model has a linked record
if (schema[key].type === "link") {
// create the link field in the other model
const linkedModel = await db.get(schema[key].modelId)
linkedModel.schema[modelToSave.name] = {
name: modelToSave.name,
type: "link",
modelId: modelToSave._id,
constraints: {
type: "array",
},
}
await db.put(linkedModel)
}
}
>>>>>>>
// update linked records
await linkRecords.updateLinks({
instanceId,
eventType: oldModel
? linkRecords.EventType.MODEL_UPDATED
: linkRecords.EventType.MODEL_SAVE,
model: modelToSave,
oldModel: oldModel,
})
await db.put(designDoc)
ctx.eventEmitter &&
ctx.eventEmitter.emitModel(`model:save`, instanceId, modelToSave)
<<<<<<<
// update linked records
await linkRecords.updateLinks({
instanceId,
eventType: linkRecords.EventType.MODEL_DELETE,
model: modelToDelete,
})
// delete the "all" view
const designDoc = await db.get("_design/database")
delete designDoc.views[modelViewId]
await db.put(designDoc)
ctx.eventEmitter &&
ctx.eventEmitter.emitModel(`model:delete`, instanceId, modelToDelete)
=======
// Delete linked record fields in dependent models
for (let key of Object.keys(modelToDelete.schema)) {
const { type, modelId } = modelToDelete.schema[key]
if (type === "link") {
const linkedModel = await db.get(modelId)
delete linkedModel.schema[modelToDelete.name]
await db.put(linkedModel)
}
}
>>>>>>>
// update linked records
await linkRecords.updateLinks({
instanceId,
eventType: linkRecords.EventType.MODEL_DELETE,
model: modelToDelete,
})
ctx.eventEmitter &&
ctx.eventEmitter.emitModel(`model:delete`, instanceId, modelToDelete) |
<<<<<<<
var setStmts = ["`value`=?"];
var params = [JSON.stringify(model.toJSON())];
this.columns.forEach(function(col) {
setStmts.push("`" + col.name + "`=?");
params.push(model.attributes[col.name]);
});
params.push(model.attributes[model.idAttribute]);
this._executeSql("UPDATE `"+this.tableName+"` SET " + setStmts.join(" AND ") + " WHERE(`id`=?);", params, success, error, options);
=======
this._executeSql("UPDATE `"+this.tableName+"` SET `value`=? WHERE(`id`=?);",[JSON.stringify(model.toJSON()), model.attributes[model.idAttribute]], function(tx, result) {
if (result.rowsAffected == 1)
success(tx, result);
else
error(tx, new Error('UPDATE affected ' + result.rowsAffected + ' rows'));
}, error);
>>>>>>>
var setStmts = ["`value`=?"];
var params = [JSON.stringify(model.toJSON())];
this.columns.forEach(function(col) {
setStmts.push("`" + col.name + "`=?");
params.push(model.attributes[col.name]);
});
params.push(model.attributes[model.idAttribute]);
this._executeSql("UPDATE `"+this.tableName+"` SET " + setStmts.join(" AND ") + " WHERE(`id`=?);", params, function(tx, result) {
if (result.rowsAffected == 1)
success(tx, result);
else
error(tx, new Error('UPDATE affected ' + result.rowsAffected + ' rows'));
}, error, options); |
<<<<<<<
this._executeSql("CREATE TABLE IF NOT EXISTS `" + tableName + "` (`id` unique, `value`);",null,success, error, {});
=======
var colDefns = ["`id` unique", "`value`"];
colDefns = colDefns.concat(this.columns.map(createColDefn));
this._executeSql("CREATE TABLE IF NOT EXISTS `" + tableName + "` (" + colDefns.join(", ") + ");",null,success, error);
>>>>>>>
var colDefns = ["`id` unique", "`value`"];
colDefns = colDefns.concat(this.columns.map(createColDefn));
this._executeSql("CREATE TABLE IF NOT EXISTS `" + tableName + "` (" + colDefns.join(", ") + ");",null,success, error, {});
<<<<<<<
this._executeSql("INSERT" + orReplace + " INTO `" + this.tableName + "`(`id`,`value`)VALUES(?,?);",[model.attributes[model.idAttribute], JSON.stringify(model.toJSON())], success, error, options);
=======
this._executeSql("INSERT" + orReplace + " INTO `" + this.tableName + "`(" + colNames.join(",") + ")VALUES(" + placeholders.join(",") + ");", params, success, error);
>>>>>>>
this._executeSql("INSERT" + orReplace + " INTO `" + this.tableName + "`(" + colNames.join(",") + ")VALUES(" + placeholders.join(",") + ");", params, success, error, options);
<<<<<<<
findAll: function (model, success,error, options) {
=======
findAll: function (model, success, error, options) {
>>>>>>>
findAll: function (model, success, error, options) {
<<<<<<<
this._executeSql("SELECT `id`, `value` FROM `"+this.tableName+"`;",null, success, error, options);
=======
var params = [];
var sql = "SELECT `id`, `value` FROM `"+this.tableName+"`";
if (options.filters) {
if (typeof options.filters == 'string') {
sql += ' WHERE ' + options.filters;
}
else if (typeof options.filters == 'object') {
sql += ' WHERE ' + Object.keys(options.filters).map(function(col) {
params.push(options.filters[col]);
return '`' + col + '` = ?';
}).join(' AND ');
}
else {
throw new Error('Unsupported filters type: ' + typeof options.filters);
}
}
this._executeSql(sql, params, success, error);
>>>>>>>
var params = [];
var sql = "SELECT `id`, `value` FROM `"+this.tableName+"`";
if (options.filters) {
if (typeof options.filters == 'string') {
sql += ' WHERE ' + options.filters;
}
else if (typeof options.filters == 'object') {
sql += ' WHERE ' + Object.keys(options.filters).map(function(col) {
params.push(options.filters[col]);
return '`' + col + '` = ?';
}).join(' AND ');
}
else {
throw new Error('Unsupported filters type: ' + typeof options.filters);
}
}
this._executeSql(sql, params, success, error, options);
<<<<<<<
this._executeSql("UPDATE `"+this.tableName+"` SET `value`=? WHERE(`id`=?);",[JSON.stringify(model.toJSON()), model.attributes[model.idAttribute]], success, error, options);
=======
var setStmts = ["`value`=?"];
var params = [JSON.stringify(model.toJSON())];
this.columns.forEach(function(col) {
setStmts.push("`" + col.name + "`=?");
params.push(model.attributes[col.name]);
});
params.push(model.attributes[model.idAttribute]);
this._executeSql("UPDATE `"+this.tableName+"` SET " + setStmts.join(" AND ") + " WHERE(`id`=?);", params, success, error);
>>>>>>>
var setStmts = ["`value`=?"];
var params = [JSON.stringify(model.toJSON())];
this.columns.forEach(function(col) {
setStmts.push("`" + col.name + "`=?");
params.push(model.attributes[col.name]);
});
params.push(model.attributes[model.idAttribute]);
this._executeSql("UPDATE `"+this.tableName+"` SET " + setStmts.join(" AND ") + " WHERE(`id`=?);", params, success, error, options); |
<<<<<<<
// import FireAndBrimstone from './FireAndBrimstone';
import Cataclysm from './Cataclysm';
=======
import FireAndBrimstone from './FireAndBrimstone';
>>>>>>>
import FireAndBrimstone from './FireAndBrimstone';
import Cataclysm from './Cataclysm';
<<<<<<<
// fireAndBrimstone: FireAndBrimstone,
cataclysm: Cataclysm,
=======
fireAndBrimstone: FireAndBrimstone,
>>>>>>>
fireAndBrimstone: FireAndBrimstone,
cataclysm: Cataclysm, |
<<<<<<<
},
{
name: 'Chen A',
description: 'Just another blog about Devops/SRE - blog about infrastructure, software-engineering, et al.',
url: 'https://devopsian.net',
tags: [
'Software Engineer',
'AWS',
'Cloud',
'Infrastructure',
'Git',
'Python',
'Productivity',
'Docker',
'Linux',
'Kubernetes'
]
}
=======
},
{
name: 'Godswill Umukoro',
description: 'Software engineer who loves building frontend applications',
url: 'https://godswillumukoro.hashnode.dev',
twitter: '@umuks_',
tags: [
'Software Engineer',
'Javascript',
'React',
'Node.js',
'APIs',
'Web Development',
]
},
>>>>>>>
},
{
name: 'Chen A',
description: 'Just another blog about Devops/SRE - blog about infrastructure, software-engineering, et al.',
url: 'https://devopsian.net',
tags: [
'Software Engineer',
'AWS',
'Cloud',
'Infrastructure',
'Git',
'Python',
'Productivity',
'Docker',
'Linux',
'Kubernetes'
]
},
{
name: 'Godswill Umukoro',
description: 'Software engineer who loves building frontend applications',
url: 'https://godswillumukoro.hashnode.dev',
twitter: '@umuks_',
tags: [
'Software Engineer',
'Javascript',
'React',
'Node.js',
'APIs',
'Web Development',
]
}, |
<<<<<<<
{
name: 'Ankur Tyagi',
description: 'Hi, I’m Ankur Tyagi, Software Engineer, Mentor, Coach, Content creator, Checkout my website for more details at https://theankurtyagi.com/',
url: 'https://theankurtyagi.com/blog/',
twitter: '@TheAnkurTyagi',
tags: [
'Web Development',
'JavaScript',
'Python',
'HTML',
'React',
'Freelancing',
'Mentorship',
'WordPress',
'Software Development',
'Software Architecture',
'Software Engineering',
'Software Engineer',
'Project Management',
'Front End',
'CSS',
],
},
=======
{
name: 'James Drysdale',
description: 'Frontend Developer from Scotland writing about web development. Currently working with React, React Native and Node.',
url: 'https://jamesdrysdale.hashnode.dev/',
twitter: '@JamesDrysdale84',
tags:[
'JavaScript',
'HTML',
'CSS',
'Front End',
'Web Development',
'React',
'React Native',
'SEO',
]
},
{
name: 'Piyush Sinha',
description: 'Frontend Engineer | Problem Solver',
url: 'https://piyushsinha.tech/',
twitter: '@devps2020',
tags:[
'JavaScript',
'Web Development',
'React',
'Web Components',
'Chrome Extension',
]
},
>>>>>>>
{
name: 'Ankur Tyagi',
description: 'Hi, I’m Ankur Tyagi, Software Engineer, Mentor, Coach, Content creator, Checkout my website for more details at https://theankurtyagi.com/',
url: 'https://theankurtyagi.com/blog/',
twitter: '@TheAnkurTyagi',
tags: [
'Web Development',
'JavaScript',
'Python',
'HTML',
'React',
'Freelancing',
'Mentorship',
'WordPress',
'Software Development',
'Software Architecture',
'Software Engineering',
'Software Engineer',
'Project Management',
'Front End',
'CSS',
],
},
{
name: 'James Drysdale',
description: 'Frontend Developer from Scotland writing about web development. Currently working with React, React Native and Node.',
url: 'https://jamesdrysdale.hashnode.dev/',
twitter: '@JamesDrysdale84',
tags:[
'JavaScript',
'HTML',
'CSS',
'Front End',
'Web Development',
'React',
'React Native',
'SEO',
]
},
{
name: 'Piyush Sinha',
description: 'Frontend Engineer | Problem Solver',
url: 'https://piyushsinha.tech/',
twitter: '@devps2020',
tags:[
'JavaScript',
'Web Development',
'React',
'Web Components',
'Chrome Extension',
]
}, |
<<<<<<<
{
name: 'Aadhithyan Suresh',
description: 'Why you should switch to ubuntu today.',
url: 'https://aadhithyan.hashnode.dev/switch-linux',
twitter: '@Aadhithyan_17',
tags: [
'Linux',
'Ubuntu',
'Faster Development',
],
},
=======
{
name: 'Vlad Pasca',
description: 'Self-taught web developer, documenting my journey and sharing the projects I am working on',
url: 'https://vladpasca.hashnode.dev/',
twitter: '@VladPasca5',
tags: [
'HTML',
'CSS',
'JavaScript',
'Web Development',
'Beginner',
'Self-taught',
],
},
>>>>>>>
{
name: 'Aadhithyan Suresh',
description: 'Why you should switch to ubuntu today.',
url: 'https://aadhithyan.hashnode.dev/switch-linux',
twitter: '@Aadhithyan_17',
tags: [
'Linux',
'Ubuntu',
'Faster Development',
],
},
{
name: 'Vlad Pasca',
description: 'Self-taught web developer, documenting my journey and sharing the projects I am working on',
url: 'https://vladpasca.hashnode.dev/',
twitter: '@VladPasca5',
tags: [
'HTML',
'CSS',
'JavaScript',
'Web Development',
'Beginner',
'Self-taught',
],
}, |
<<<<<<<
janin.currency.createCurrency ("Zcash", [0x1c,0xb8], 0x80, "5", "[LK]" , ""),
=======
janin.currency.createCurrency ("Yenten", 0x4e, 0x7b, "5", "K" , "YStuCpv1U9iT3L1VqBr52B9nBxrNgt4Fpj"),
>>>>>>>
janin.currency.createCurrency ("Yenten", 0x4e, 0x7b, "5", "K" , "YStuCpv1U9iT3L1VqBr52B9nBxrNgt4Fpj"),
janin.currency.createCurrency ("Zcash", [0x1c,0xb8], 0x80, "5", "[LK]" , ""), |
<<<<<<<
{ token: "//ua.js", file: "./l10n/ua.js" },
{ token: "//tr.js", file: "./l10n/tr.js" }
=======
{ token: "//it.js", file: "./l10n/it.js" },
{ token: "//ua.js", file: "./l10n/ua.js" }
>>>>>>>
{ token: "//ua.js", file: "./l10n/ua.js" },
{ token: "//tr.js", file: "./l10n/tr.js" },
{ token: "//it.js", file: "./l10n/it.js" } |
<<<<<<<
document.getElementById("cultureua").href = "?culture=ua¤cy=" + janin.currency.name().toLowerCase();
document.getElementById("culturetr").href = "?culture=tr¤cy=" + janin.currency.name().toLowerCase();
=======
document.getElementById("cultureit").href = "?culture=it¤cy=" + janin.currency.name().toLowerCase();
>>>>>>>
document.getElementById("cultureua").href = "?culture=ua¤cy=" + janin.currency.name().toLowerCase();
document.getElementById("culturetr").href = "?culture=tr¤cy=" + janin.currency.name().toLowerCase();
document.getElementById("cultureit").href = "?culture=it¤cy=" + janin.currency.name().toLowerCase(); |
<<<<<<<
var $ = require('jquery')
var Color = require('color.js')
const contextMenu = require('electron-context-menu')
=======
var $ = require('jquery');
var Color = require('color.js');
var urlRegex = require('url-regex');
var globalCloseableTabsOverride;
>>>>>>>
var $ = require('jquery');
var Color = require('color.js');
var urlRegex = require('url-regex');
const contextMenu = require('electron-context-menu')
var globalCloseableTabsOverride;
<<<<<<<
$('#nav-body-ctrls').append('<input id="nav-ctrls-url" type="text" title="Enter an address or search term" ' + (options.readonly ? 'readonly' : '') + '/>')
=======
$('#nav-body-ctrls').append('<input id="nav-ctrls-url" type="text" title="Enter an address or search term"/>');
>>>>>>>
$('#nav-body-ctrls').append('<input id="nav-ctrls-url" type="text" title="Enter an address or search term" ' + (options.readonly ? 'readonly' : '') + '/>')
<<<<<<<
var session = $('.nav-views-view[data-session="' + sessionID + '"]')[0]
$('#nav-ctrls-url').prop('value', session.getURL())
NAV._updateCtrls(session);
// get options
var opts = JSON.parse(decodeURIComponent($(session).attr('data-options-json')));
// is readonly tab?
if (opts.readonly)
$('#nav-ctrls-url').attr('readonly', 'readonly')
else
$('#nav-ctrls-url').removeAttr('readonly')
// listener for when tabs are activated
if (NAV.onActivateTab) NAV.onActivateTab(session, opts);
=======
var session = $('.nav-views-view[data-session="' + sessionID + '"]')[0];
NAV._updateUrl(session.getURL());
NAV._updateCtrls();
>>>>>>>
var session = $('.nav-views-view[data-session="' + sessionID + '"]')[0];
NAV._updateUrl(session.getURL());
NAV._updateCtrls();
// get options
var opts = JSON.parse(decodeURIComponent($(session).attr('data-options-json')));
// is readonly tab?
if (opts.readonly)
$('#nav-ctrls-url').attr('readonly', 'readonly')
else
$('#nav-ctrls-url').removeAttr('readonly')
// listener for when tabs are activated
if (NAV.onActivateTab) NAV.onActivateTab(session, opts);
<<<<<<<
NAV._updateCtrls(webview[0])
if (!$('#nav-ctrls-url').is(':focus')) {
$('#nav-ctrls-url').val(webview[0].getURL())
}
})
=======
NAV._updateCtrls();
});
webview[0].addEventListener('did-navigate', function (res) {
NAV._updateUrl(res.url);
});
webview[0].addEventListener('did-fail-load', function (res) {
NAV._updateUrl(res.validatedUrl);
});
webview[0].addEventListener('did-navigate-in-page', function (res) {
NAV._updateUrl(res.url);
});
>>>>>>>
NAV._updateCtrls();
});
webview[0].addEventListener('did-navigate', function (res) {
NAV._updateUrl(res.url);
});
webview[0].addEventListener('did-fail-load', function (res) {
NAV._updateUrl(res.validatedUrl);
});
webview[0].addEventListener('did-navigate-in-page', function (res) {
NAV._updateUrl(res.url);
});
<<<<<<<
close: true, // true, false
readonly: false,
contextMenu: true
}
=======
close: true // true, false
};
>>>>>>>
close: true, // true, false
readonly: false,
contextMenu: true
}
<<<<<<<
Navigation.prototype.listen = function (id, callback) {
let webview = null
=======
Navigation.prototype.listen = function (id, callback) {
let webview = null;
>>>>>>>
Navigation.prototype.listen = function (id, callback) {
let webview = null;
<<<<<<<
webview = document.getElementById(id)
} else {
console.log('ERROR[electron-navigation][func "listen();"]: Cannot find the ID "' + id + '"')
=======
webview = document.getElementById(id);
} else {
console.log('ERROR[electron-navigation][func "listen();"]: Cannot find the ID "' + id + '"');
>>>>>>>
webview = document.getElementById(id);
} else {
console.log('ERROR[electron-navigation][func "listen();"]: Cannot find the ID "' + id + '"');
<<<<<<<
})
})
}
}
=======
});
});
}
}
>>>>>>>
});
});
}
}
<<<<<<<
Navigation.prototype.send = function (id, channel, args) {
let webview = null
=======
Navigation.prototype.send = function (id, channel, args) {
let webview = null;
>>>>>>>
Navigation.prototype.send = function (id, channel, args) {
let webview = null;
<<<<<<<
webview = document.getElementById(id)
} else {
console.log('ERROR[electron-navigation][func "send();"]: Cannot find the ID "' + id + '"')
=======
webview = document.getElementById(id);
} else {
console.log('ERROR[electron-navigation][func "send();"]: Cannot find the ID "' + id + '"');
>>>>>>>
webview = document.getElementById(id);
} else {
console.log('ERROR[electron-navigation][func "send();"]: Cannot find the ID "' + id + '"');
<<<<<<<
webview.send(channel, args)
})
}
}
=======
webview.send(channel, args);
});
}
}
>>>>>>>
webview.send(channel, args);
});
}
}
<<<<<<<
Navigation.prototype.openDevTools = function (id) {
id = id || null
let webview = null
=======
Navigation.prototype.openDevTools = function(id) {
id = id || null;
let webview = null;
>>>>>>>
Navigation.prototype.openDevTools = function(id) {
id = id || null;
let webview = null;
<<<<<<<
webview = document.getElementById(id)
} else {
console.log('ERROR[electron-navigation][func "openDevTools();"]: Cannot find the ID "' + id + '"')
=======
webview = document.getElementById(id);
} else {
console.log('ERROR[electron-navigation][func "openDevTools();"]: Cannot find the ID "' + id + '"');
>>>>>>>
webview = document.getElementById(id);
} else {
console.log('ERROR[electron-navigation][func "openDevTools();"]: Cannot find the ID "' + id + '"');
<<<<<<<
webview.openDevTools()
})
}
}
=======
webview.openDevTools();
});
}
}
>>>>>>>
webview.openDevTools();
});
}
}
<<<<<<<
//
// print current or specified tab and view
//
Navigation.prototype.printTab = function (id, opts) {
id = id || null
let webview = null
// check id
if (id == null) {
webview = $('.nav-views-view.active')[0]
} else {
if ($('#' + id).length) {
webview = document.getElementById(id)
} else {
console.log('ERROR[electron-navigation][func "printTab();"]: Cannot find the ID "' + id + '"')
}
}
// print
if (webview != null) {
webview.print(opts || {});
}
}
//:nextTab()
//
// toggle next available tab
//
Navigation.prototype.nextTab = function () {
var tabs = $('.nav-tabs-tab').toArray();
var activeTabIndex = tabs.indexOf($('.nav-tabs-tab.active')[0]);
var nexti = activeTabIndex + 1;
if(nexti > tabs.length-1) nexti = 0;
$($('.nav-tabs-tab')[nexti]).trigger('click');
return false
} //:nextTab()
//:prevTab()
//
// toggle previous available tab
//
Navigation.prototype.prevTab = function () {
var tabs = $('.nav-tabs-tab').toArray();
var activeTabIndex = tabs.indexOf($('.nav-tabs-tab.active')[0]);
var nexti = activeTabIndex - 1;
if(nexti < 0) nexti = tabs.length-1;
$($('.nav-tabs-tab')[nexti]).trigger('click');
return false
} //:prevTab()
=======
//
// go to a tab by index or keyword
//
Navigation.prototype.goToTab = function(index) {
$activeTabAndView = $('#nav-body-tabs .nav-tabs-tab.active, #nav-body-views .nav-views-view.active');
if (index == 'previous') {
$tabAndViewToActivate = $activeTabAndView.prev('#nav-body-tabs .nav-tabs-tab, #nav-body-views .nav-views-view');
} else if (index == 'next') {
$tabAndViewToActivate = $activeTabAndView.next('#nav-body-tabs .nav-tabs-tab, #nav-body-views .nav-views-view');
} else if (index == 'last') {
$tabAndViewToActivate = $('#nav-body-tabs .nav-tabs-tab:last-of-type, #nav-body-views .nav-views-view:last-of-type');
} else {
$tabAndViewToActivate = $('#nav-body-tabs .nav-tabs-tab:nth-of-type(' + index + '), #nav-body-views .nav-views-view:nth-of-type(' + index + ')');
}
if ($tabAndViewToActivate.length) {
$('#nav-ctrls-url').blur();
$activeTabAndView.removeClass('active');
$tabAndViewToActivate.addClass('active');
this._updateUrl();
this._updateCtrls();
}
} //:goToTab()
>>>>>>>
//
// print current or specified tab and view
//
Navigation.prototype.printTab = function (id, opts) {
id = id || null
let webview = null
// check id
if (id == null) {
webview = $('.nav-views-view.active')[0]
} else {
if ($('#' + id).length) {
webview = document.getElementById(id)
} else {
console.log('ERROR[electron-navigation][func "printTab();"]: Cannot find the ID "' + id + '"')
}
}
// print
if (webview != null) {
webview.print(opts || {});
}
}
//:nextTab()
//
// toggle next available tab
//
Navigation.prototype.nextTab = function () {
var tabs = $('.nav-tabs-tab').toArray();
var activeTabIndex = tabs.indexOf($('.nav-tabs-tab.active')[0]);
var nexti = activeTabIndex + 1;
if(nexti > tabs.length-1) nexti = 0;
$($('.nav-tabs-tab')[nexti]).trigger('click');
return false
} //:nextTab()
//:prevTab()
//
// toggle previous available tab
//
Navigation.prototype.prevTab = function () {
var tabs = $('.nav-tabs-tab').toArray();
var activeTabIndex = tabs.indexOf($('.nav-tabs-tab.active')[0]);
var nexti = activeTabIndex - 1;
if(nexti < 0) nexti = tabs.length-1;
$($('.nav-tabs-tab')[nexti]).trigger('click');
return false
} //:prevTab()
// go to a tab by index or keyword
//
Navigation.prototype.goToTab = function(index) {
$activeTabAndView = $('#nav-body-tabs .nav-tabs-tab.active, #nav-body-views .nav-views-view.active');
if (index == 'previous') {
$tabAndViewToActivate = $activeTabAndView.prev('#nav-body-tabs .nav-tabs-tab, #nav-body-views .nav-views-view');
} else if (index == 'next') {
$tabAndViewToActivate = $activeTabAndView.next('#nav-body-tabs .nav-tabs-tab, #nav-body-views .nav-views-view');
} else if (index == 'last') {
$tabAndViewToActivate = $('#nav-body-tabs .nav-tabs-tab:last-of-type, #nav-body-views .nav-views-view:last-of-type');
} else {
$tabAndViewToActivate = $('#nav-body-tabs .nav-tabs-tab:nth-of-type(' + index + '), #nav-body-views .nav-views-view:nth-of-type(' + index + ')');
}
if ($tabAndViewToActivate.length) {
$('#nav-ctrls-url').blur();
$activeTabAndView.removeClass('active');
$tabAndViewToActivate.addClass('active');
this._updateUrl();
this._updateCtrls();
}
} //:goToTab() |
<<<<<<<
=======
// Expose storage prototype for extending
Seed._Store = require('./store/store');
>>>>>>>
// Expose storage prototype for extending
Seed._Store = require('./store/store'); |
<<<<<<<
app.page = new app.views.Stream({model : app.stream});
app.publisher = app.publisher || new app.views.Publisher({collection : app.stream.items});
app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)});
var streamFacesView = new app.views.StreamFaces({collection : app.stream.items});
$("#main_stream").html(app.page.render().el);
$("#selected_aspect_contacts .content").html(streamFacesView.render().el);
this._hideInactiveStreamLists();
=======
this._initializeStreamView();
>>>>>>>
this._initializeStreamView();
<<<<<<<
aspects : function(){
app.aspects = new app.collections.Aspects(app.currentUser.get("aspects"));
this.aspects_list = new app.views.AspectsList({ collection: app.aspects });
this.aspects_list.render();
=======
aspects: function() {
app.aspects = new app.collections.Aspects(app.currentUser.get("aspects"));
this.aspectsList = new app.views.AspectsList({ collection: app.aspects });
this.aspectsList.render();
>>>>>>>
aspects: function() {
app.aspects = new app.collections.Aspects(app.currentUser.get("aspects"));
this.aspectsList = new app.views.AspectsList({ collection: app.aspects });
this.aspectsList.render();
<<<<<<<
var streamFacesView = new app.views.StreamFaces({collection : app.stream.items});
$("#main_stream").html(app.page.render().el);
$("#selected_aspect_contacts .content").html(streamFacesView.render().el);
this._hideInactiveStreamLists();
},
_hideInactiveStreamLists: function() {
if(this.aspects_list && Backbone.history.fragment !== "aspects")
this.aspects_list.hideAspectsList();
if(this.followedTagsView && Backbone.history.fragment !== "followed_tags")
this.followedTagsView.hideFollowedTags();
=======
>>>>>>>
<<<<<<<
this.renderPage(function() {
return new app.pages.Profile({
el: $("body > #profile_container")
});
});
=======
this.renderPage(function() { return new app.pages.Profile({
el: $('body > .container-fluid')
}); });
},
_hideInactiveStreamLists: function() {
if(this.aspectsList && Backbone.history.fragment !== "aspects") {
this.aspectsList.hideAspectsList();
}
if(this.followedTagsView && Backbone.history.fragment !== "followed_tags") {
this.followedTagsView.hideFollowedTags();
}
},
_initializeStreamView: function() {
if(app.page) {
app.page.unbindInfScroll();
app.page.remove();
}
app.page = new app.views.Stream({model : app.stream});
app.publisher = app.publisher || new app.views.Publisher({collection : app.stream.items});
app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)});
var streamFacesView = new app.views.StreamFaces({collection : app.stream.items});
$("#main_stream").html(app.page.render().el);
$("#selected_aspect_contacts .content").html(streamFacesView.render().el);
this._hideInactiveStreamLists();
>>>>>>>
this.renderPage(function() {
return new app.pages.Profile({
el: $("body > #profile_container")
});
});
},
_hideInactiveStreamLists: function() {
if(this.aspectsList && Backbone.history.fragment !== "aspects") {
this.aspectsList.hideAspectsList();
}
if(this.followedTagsView && Backbone.history.fragment !== "followed_tags") {
this.followedTagsView.hideFollowedTags();
}
},
_initializeStreamView: function() {
if(app.page) {
app.page.unbindInfScroll();
app.page.remove();
}
app.page = new app.views.Stream({model : app.stream});
app.publisher = app.publisher || new app.views.Publisher({collection : app.stream.items});
app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)});
var streamFacesView = new app.views.StreamFaces({collection : app.stream.items});
$("#main_stream").html(app.page.render().el);
$("#selected_aspect_contacts .content").html(streamFacesView.render().el);
this._hideInactiveStreamLists(); |
<<<<<<<
dateFormatISO8601={config.editor.dateFormatISO8601}
=======
storageKey={storageKey}
noteKey={note.key}
>>>>>>>
dateFormatISO8601={config.editor.dateFormatISO8601}
storageKey={storageKey}
noteKey={note.key} |
<<<<<<<
import MasterfulInstincts from './modules/azeritetraits/MasterfulInstincts';
=======
import TwistedClaws from './modules/azeritetraits/TwistedClaws';
import LayeredMane from './modules/azeritetraits/LayeredMane';
>>>>>>>
import MasterfulInstincts from './modules/azeritetraits/MasterfulInstincts';
import TwistedClaws from './modules/azeritetraits/TwistedClaws';
import LayeredMane from './modules/azeritetraits/LayeredMane';
<<<<<<<
// Azerite traits
masterfulInstincts: MasterfulInstincts,
=======
// Azerite Traits
twistedClaws: TwistedClaws,
layeredMane: LayeredMane,
>>>>>>>
// Azerite Traits
twistedClaws: TwistedClaws,
layeredMane: LayeredMane,
masterfulInstincts: MasterfulInstincts, |
<<<<<<<
extensions: ['.re', '.ml', '.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
=======
extensions: ['.mjs', '.web.js', '.js', '.json', '.web.jsx', '.jsx'],
>>>>>>>
extensions: ['.re', '.ml', '.mjs', '.web.js', '.js', '.json', '.web.jsx', '.jsx'], |
<<<<<<<
'<rootDir>/src/**/__tests__/**/*.{js,jsx,mjs}',
'<rootDir>/src/**/?((*.)|(*_))(test|spec).{js,jsx,mjs,re,ml}',
=======
'<rootDir>/src/**/__tests__/**/*.{js,jsx}',
'<rootDir>/src/**/?(*.)(spec|test).{js,jsx}',
>>>>>>>
'<rootDir>/src/**/__tests__/**/*.{js,jsx}',
'<rootDir>/src/**/?((*.)|(*_))(spec|test).{js,jsx,re,ml}',
<<<<<<<
'^.+\\.(re|ml)$': resolve('config/jest/bsLoaderTransform'),
'^.+\\.(js|jsx|mjs)$': resolve('config/jest/bsLoaderTransform'),
=======
'^.+\\.(js|jsx)$': isEjecting
? '<rootDir>/node_modules/babel-jest'
: resolve('config/jest/babelTransform.js'),
>>>>>>>
'^.+\\.(re|ml)$': resolve('config/jest/bsLoaderTransform'),
'^.+\\.(js|jsx)$': isEjecting
? '<rootDir>/node_modules/babel-jest'
: resolve('config/jest/babelTransform.js'),
<<<<<<<
moduleFileExtensions: [
'web.js',
'js',
'json',
'web.jsx',
'jsx',
'node',
'mjs',
're',
'ml',
],
=======
moduleFileExtensions: ['web.js', 'js', 'json', 'web.jsx', 'jsx', 'node'],
>>>>>>>
moduleFileExtensions: [
'web.js',
'js',
'json',
'web.jsx',
'jsx',
'node',
're',
'ml',
], |
<<<<<<<
htmldata, editorFocused=false, elecScreen=null;
=======
htmldata, elecScreen=null;
>>>>>>>
htmldata, editorFocused=false, elecScreen=null;
<<<<<<<
// Load other modules
var remote = require('electron').remote; //Returns the object returned by require(electron) in the main process.
elecScreen = require('electron').screen; //Returns the object returned by require(electron.screen) in the main process.
//var electronScreen = electron.screen; // Module that retrieves information about screen size, displays,
// cursor position, etc. Important: You should not use this module until the ready event of the app module is Emitted.
/*
// Initiate QRs for Remote Control.
=======
// Load other modules
var remote = require('electron').remote; //Returns the object returned by require(electron) in the main process.
elecScreen = require('electron').screen; //Returns the object returned by require(electron.screen) in the main process.
//var electronScreen = electron.screen; // Module that retrieves information about screen size, displays,
// cursor position, etc. Important: You should not use this module until the ready event of the app module is Emitted.
// When asynchronous reply from main process, run function to...
>>>>>>>
// Load other modules
var remote = require('electron').remote; //Returns the object returned by require(electron) in the main process.
elecScreen = require('electron').screen; //Returns the object returned by require(electron.screen) in the main process.
//var electronScreen = electron.screen; // Module that retrieves information about screen size, displays,
// cursor position, etc. Important: You should not use this module until the ready event of the app module is Emitted.
// Initiate QRs for Remote Control.
// When asynchronous reply from main process, run function to...
<<<<<<<
// In case of both instances active and not enough screens...
if (inElectron() && !secondaryDisplay && instance[0] && instance[1] ) {
window.alert("You don't have any external Display.");
instance[0] = false;
instance[1] = false;
}
// In case that no instance is active...
else if (!(instance[0] || instance[1]))
window.alert("You must prompt at least to one display.");
else
=======
// In case of both
if (inElectron() && instance[0] && instance[1] && !secondaryDisplay)
window.alert("You don't have any external Display.");
// In case of none
else if (!(instance[0] || instance[1]))
window.alert("You must prompt at least to one display.");
else
>>>>>>>
// In case of both instances active and not enough screens...
if (inElectron() && !secondaryDisplay && instance[0] && instance[1] ) {
window.alert("You don't have any external Display.");
instance[0] = false;
instance[1] = false;
}
// In case that no instance is active...
else if (!(instance[0] || instance[1]))
window.alert("You must prompt at least to one display.");
else
<<<<<<<
function updateTeleprompter(event) {
// Stops the event but continues executing the code.
event.preventDefault();
// Update data.
updatePrompterData();
if (debug) console.log("Updating prompter contents");
// Request update on teleprompter other instance.
listener({
data: {
request: command.updateContents
}
});
}
function toggleDebug() {
// I do these the long way because debug could also be a numeric.
if (debug) {
debug = false;
console.log("Leaving debug mode.");
}
else {
debug = true;
console.log("Entering debug mode.");
}
}
=======
>>>>>>>
function updateTeleprompter(event) {
// Stops the event but continues executing the code.
event.preventDefault();
// Update data.
updatePrompterData();
if (debug) console.log("Updating prompter contents");
// Request update on teleprompter other instance.
listener({
data: {
request: command.updateContents
}
});
}
function toggleDebug() {
// I do these the long way because debug could also be a numeric.
if (debug) {
debug = false;
console.log("Leaving debug mode.");
}
else {
debug = true;
console.log("Entering debug mode.");
}
} |
<<<<<<<
//encoderMp3Worker.terminate();
//encoderMp3Worker = null;
=======
// Removed the terminate of the worker - terminate does not allow multiple recordings
//encoderMp3Worker.terminate();
//encoderMp3Worker = null;
>>>>>>>
// Removed the terminate of the worker - terminate does not allow multiple recordings
//encoderMp3Worker.terminate();
//encoderMp3Worker = null;
<<<<<<<
var au = document.createElement('audio');
au.controls = true;
au.src = url;
li.appendChild(au);
=======
// Upload file to server - uncomment below
// uploadAudio(blob);
// console.log("File uploaded");
// log.innerHTML += "\n" + "File uploaded";
>>>>>>>
var au = document.createElement('audio');
au.controls = true;
au.src = url;
li.appendChild(au);
// Upload file to server - uncomment below
// uploadAudio(blob);
// console.log("File uploaded");
// log.innerHTML += "\n" + "File uploaded"; |
<<<<<<<
}(window.jQuery);
/* =============================================================
* bootstrap-scrollspy.js v3.0.0
=======
======================================================
* bootstrap-scrollspy.js v2.2.2
=======
/* POPOVER NO CONFLICT
* =================== */
$.fn.popover.noConflict = function () {
$.fn.popover = old
return this
}
}(window.jQuery);/* =============================================================
* bootstrap-scrollspy.js v2.2.2
>>>>>>>
/* POPOVER NO CONFLICT
* =================== */
$.fn.popover.noConflict = function () {
$.fn.popover = old
return this
}
}(window.jQuery);
/* =============================================================
* bootstrap-scrollspy.js v3.0.0 |
<<<<<<<
* CoreUI data.js v4.0.0-alpha.1 (https://coreui.io)
* Copyright 2021 The CoreUI Team (https://github.com/orgs/coreui/people)
* Licensed under MIT (https://coreui.io)
=======
* Bootstrap data.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
>>>>>>>
* CoreUI data.js v4.0.0-alpha.1 (https://coreui.io)
* Copyright 2021 The CoreUI Team (https://github.com/orgs/coreui/people)
* Licensed under MIT (https://coreui.io)
<<<<<<<
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's dom/data.js
=======
* Bootstrap (v5.0.0-beta2): dom/data.js
>>>>>>>
* CoreUI (v4.0.0-alpha.1): dom/data.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's dom/data.js |
<<<<<<<
* Bootstrap popover.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
=======
* Bootstrap popover.js v5.0.0-beta2 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
>>>>>>>
* Bootstrap popover.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
<<<<<<<
function _defineProperties(target, props) {
for (var i = 0; i < props.length; i++) {
var descriptor = props[i];
descriptor.enumerable = descriptor.enumerable || false;
descriptor.configurable = true;
if ("value" in descriptor) descriptor.writable = true;
Object.defineProperty(target, descriptor.key, descriptor);
}
}
function _createClass(Constructor, protoProps, staticProps) {
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
if (staticProps) _defineProperties(Constructor, staticProps);
return Constructor;
}
function _extends() {
_extends = Object.assign || function (target) {
for (var i = 1; i < arguments.length; i++) {
var source = arguments[i];
for (var key in source) {
if (Object.prototype.hasOwnProperty.call(source, key)) {
target[key] = source[key];
}
}
}
return target;
};
return _extends.apply(this, arguments);
}
function _inheritsLoose(subClass, superClass) {
subClass.prototype = Object.create(superClass.prototype);
subClass.prototype.constructor = subClass;
subClass.__proto__ = superClass;
}
=======
function _defineProperties(target, props) {
for (var i = 0; i < props.length; i++) {
var descriptor = props[i];
descriptor.enumerable = descriptor.enumerable || false;
descriptor.configurable = true;
if ("value" in descriptor) descriptor.writable = true;
Object.defineProperty(target, descriptor.key, descriptor);
}
}
function _createClass(Constructor, protoProps, staticProps) {
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
if (staticProps) _defineProperties(Constructor, staticProps);
return Constructor;
}
function _extends() {
_extends = Object.assign || function (target) {
for (var i = 1; i < arguments.length; i++) {
var source = arguments[i];
for (var key in source) {
if (Object.prototype.hasOwnProperty.call(source, key)) {
target[key] = source[key];
}
}
}
return target;
};
return _extends.apply(this, arguments);
}
function _inheritsLoose(subClass, superClass) {
subClass.prototype = Object.create(superClass.prototype);
subClass.prototype.constructor = subClass;
_setPrototypeOf(subClass, superClass);
}
function _setPrototypeOf(o, p) {
_setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
o.__proto__ = p;
return o;
};
return _setPrototypeOf(o, p);
}
>>>>>>>
function _defineProperties(target, props) {
for (var i = 0; i < props.length; i++) {
var descriptor = props[i];
descriptor.enumerable = descriptor.enumerable || false;
descriptor.configurable = true;
if ("value" in descriptor) descriptor.writable = true;
Object.defineProperty(target, descriptor.key, descriptor);
}
}
function _createClass(Constructor, protoProps, staticProps) {
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
if (staticProps) _defineProperties(Constructor, staticProps);
return Constructor;
}
function _extends() {
_extends = Object.assign || function (target) {
for (var i = 1; i < arguments.length; i++) {
var source = arguments[i];
for (var key in source) {
if (Object.prototype.hasOwnProperty.call(source, key)) {
target[key] = source[key];
}
}
}
return target;
};
return _extends.apply(this, arguments);
}
function _inheritsLoose(subClass, superClass) {
subClass.prototype = Object.create(superClass.prototype);
subClass.prototype.constructor = subClass;
_setPrototypeOf(subClass, superClass);
}
function _setPrototypeOf(o, p) {
_setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
o.__proto__ = p;
return o;
};
return _setPrototypeOf(o, p);
} |
<<<<<<<
import ActivityIndicator from '../ActivityIndicator';
import FightNavigationBar from './FightNavigationBar';
=======
>>>>>>>
import FightNavigationBar from './FightNavigationBar'; |
<<<<<<<
* CoreUI event-handler.js v4.0.0-alpha.1 (https://coreui.io)
* Copyright 2021 The CoreUI Team (https://github.com/orgs/coreui/people)
* Licensed under MIT (https://coreui.io)
=======
* Bootstrap event-handler.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
>>>>>>>
* CoreUI event-handler.js v4.0.0-alpha.1 (https://coreui.io)
* Copyright 2021 The CoreUI Team (https://github.com/orgs/coreui/people)
* Licensed under MIT (https://coreui.io)
<<<<<<<
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's util/index.js
=======
* Bootstrap (v5.0.0-beta2): util/index.js
>>>>>>>
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's util/index.js
<<<<<<<
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's dom/event-handler.js
=======
* Bootstrap (v5.0.0-beta2): dom/event-handler.js
>>>>>>>
* CoreUI (v4.0.0-alpha.1): dom/event-handler.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's dom/event-handler.js |
<<<<<<<
* CoreUI toast.js v4.0.0-alpha.1 (https://coreui.io)
* Copyright 2021 The CoreUI Team (https://github.com/orgs/coreui/people)
* Licensed under MIT (https://coreui.io)
=======
* Bootstrap toast.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
>>>>>>>
* CoreUI toast.js v4.0.0-alpha.1 (https://coreui.io)
* Copyright 2021 The CoreUI Team (https://github.com/orgs/coreui/people)
* Licensed under MIT (https://coreui.io)
<<<<<<<
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's util/index.js
=======
* Bootstrap (v5.0.0-beta2): util/index.js
>>>>>>>
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's util/index.js
<<<<<<<
var VERSION = '4.0.0-alpha.1';
var BaseComponent = /*#__PURE__*/function () {
function BaseComponent(element) {
if (!element) {
return;
}
this._element = element;
Data__default['default'].setData(element, this.constructor.DATA_KEY, this);
}
var _proto = BaseComponent.prototype;
_proto.dispose = function dispose() {
Data__default['default'].removeData(this._element, this.constructor.DATA_KEY);
this._element = null;
}
/** Static */
;
BaseComponent.getInstance = function getInstance(element) {
return Data__default['default'].getData(element, this.DATA_KEY);
};
_createClass(BaseComponent, null, [{
key: "VERSION",
get: function get() {
return VERSION;
}
}]);
return BaseComponent;
}();
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
=======
>>>>>>> |
<<<<<<<
=======
//Remove the defined spells from the Cooldown window
on_byPlayer_cast(event) {
const spellID = event.ability.guid;
if (this.ignoredSpells.includes(spellID)) {
debug && console.log('Exiting');
return;
}
super.on_byPlayer_cast(event);
}
>>>>>>> |
<<<<<<<
* Bootstrap tooltip.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
=======
* Bootstrap tooltip.js v5.0.0-beta2 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
>>>>>>>
* Bootstrap tooltip.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
<<<<<<<
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
var VERSION = '5.0.0-beta1';
var BaseComponent = /*#__PURE__*/function () {
function BaseComponent(element) {
if (!element) {
return;
}
this._element = element;
Data__default['default'].setData(element, this.constructor.DATA_KEY, this);
}
var _proto = BaseComponent.prototype;
_proto.dispose = function dispose() {
Data__default['default'].removeData(this._element, this.constructor.DATA_KEY);
this._element = null;
}
/** Static */
;
BaseComponent.getInstance = function getInstance(element) {
return Data__default['default'].getData(element, this.DATA_KEY);
};
_createClass(BaseComponent, null, [{
key: "VERSION",
get: function get() {
return VERSION;
}
}]);
return BaseComponent;
}();
=======
>>>>>>>
<<<<<<<
if (this.tip.classList.contains(CLASS_NAME_FADE)) {
var transitionDuration = getTransitionDurationFromElement(this.tip);
EventHandler__default['default'].one(this.tip, 'transitionend', complete);
emulateTransitionEnd(this.tip, transitionDuration);
} else {
complete();
=======
if (prevHoverState === HOVER_STATE_OUT) {
_this2._leave(null, _this2);
>>>>>>>
if (prevHoverState === HOVER_STATE_OUT) {
_this2._leave(null, _this2);
<<<<<<<
var flipModifier = {
name: 'flip',
options: {
altBoundary: true,
fallbackPlacements: ['top', 'right', 'bottom', 'left']
}
};
=======
var offset = this.config.offset;
>>>>>>>
var offset = this.config.offset; |
<<<<<<<
// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
// IT'S ALL JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
=======
===========
=======
// Hide the Mobile Safari address bar once loaded
// ==============================================
window.addEventListener("load",function() {
// Set a timeout...
setTimeout(function(){
// Hide the address bar!
window.scrollTo(0, 1);
}, 0);
});
// Docs topbar nav
// ===============
$('.nav .active').click(function(e) {
e.preventDefault();
$(this).siblings().toggle();
});
// Show grid dimensions on hover
// =============================
$('.show-grid > div').hover(function() {
var width = $(this).width();
$(this).attr('title', width);
$(this).twipsy();
});
// table sort example
// ==================
>>>>>>>
// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
// IT'S ALL JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
// Hide the Mobile Safari address bar once loaded
// ==============================================
// Set a timeout...
setTimeout(function(){
// Hide the address bar!
window.scrollTo(0, 1);
}, 0);
// table sort example
// ================== |
<<<<<<<
files: {
'docs/assets/css/docs.min.css': 'docs/assets/less/docs.less'
}
=======
src: 'less/theme.less',
dest: 'dist/css/<%= pkg.name %>-theme.css'
>>>>>>>
files: {
'docs/assets/css/docs.min.css': 'docs/assets/less/docs.less'
}
<<<<<<<
core: {
files: {
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css'
}
=======
minifyCore: {
src: 'dist/css/<%= pkg.name %>.css',
dest: 'dist/css/<%= pkg.name %>.min.css'
},
minifyTheme: {
src: 'dist/css/<%= pkg.name %>-theme.css',
dest: 'dist/css/<%= pkg.name %>-theme.min.css'
>>>>>>>
core: {
files: {
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css'
}
<<<<<<<
=======
fonts: {
src: 'fonts/*',
dest: 'dist/'
},
>>>>>>>
<<<<<<<
compile: {
options: {
pretty: true,
data: function () {
var filePath = path.join(__dirname, 'less/variables.less');
var fileContent = fs.readFileSync(filePath, { encoding: 'utf8' });
var parser = new BsLessdocParser(fileContent);
return { sections: parser.parseFile() };
}
},
files: {
'docs/_includes/customizer-variables.html': 'docs/_jade/customizer-variables.jade',
'docs/_includes/customize-nav.html': 'docs/_jade/customizer-nav.jade'
}
=======
options: {
pretty: true,
data: getLessVarsData
},
customizerVars: {
src: 'docs/_jade/customizer-variables.jade',
dest: 'docs/_includes/customizer-variables.html'
},
customizerNav: {
src: 'docs/_jade/customizer-nav.jade',
dest: 'docs/_includes/nav/customize.html'
>>>>>>>
options: {
pretty: true,
data: getLessVarsData
},
customizerVars: {
src: 'docs/_jade/customizer-variables.jade',
dest: 'docs/_includes/customizer-variables.html'
},
customizerNav: {
src: 'docs/_jade/customizer-nav.jade',
dest: 'docs/_includes/nav/customize.html'
<<<<<<<
testSubtasks = testSubtasks.concat(['dist-css', 'csslint', 'jshint', 'jscs', 'qunit']);
=======
testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'csslint:dist', 'jshint:core', 'jshint:test', 'jshint:grunt', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit', 'docs']);
>>>>>>>
testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'jshint:core', 'jshint:test', 'jshint:grunt', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit', 'docs']);
<<<<<<<
grunt.registerTask('less-compile', ['less:compileDocs', 'less:compileCore']);
grunt.registerTask('dist-css', ['less-compile', 'autoprefixer', 'usebanner', 'csscomb', 'cssmin']);
// Docs distribution task.
grunt.registerTask('dist-docs', 'copy:docs');
=======
grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']);
grunt.registerTask('dist-css', ['less-compile', 'autoprefixer:core', 'autoprefixer:theme', 'usebanner', 'csscomb:dist', 'cssmin:minifyCore', 'cssmin:minifyTheme']);
>>>>>>>
grunt.registerTask('less-compile', ['less:compileCore']);
grunt.registerTask('dist-css', ['less-compile', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core']);
<<<<<<<
grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js', 'dist-docs']);
// Custom docs rebuild task.
grunt.registerTask('build', ['clean', 'less-compile', 'autoprefixer:core', 'autoprefixer:docs', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs', 'concat', 'uglify:bootstrap', 'dist-docs']);
=======
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'copy:fonts', 'dist-js']);
>>>>>>>
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']);
<<<<<<<
// grunt.registerTask('default', ['test', 'dist']);
grunt.registerTask('default', ['dist']);
=======
grunt.registerTask('default', ['clean:dist', 'copy:fonts', 'test']);
>>>>>>>
grunt.registerTask('default', ['clean:dist', 'test']); |
<<<<<<<
testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'jshint:core', 'jshint:test', 'jshint:grunt', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit', 'docs']);
=======
testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'csslint:dist', 'test-js', 'docs']);
>>>>>>>
testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'test-js', 'docs']); |
<<<<<<<
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's dom/manipulator.js
=======
* Bootstrap (v5.0.0-beta2): dom/manipulator.js
>>>>>>>
* CoreUI (v4.0.0-alpha.1): dom/manipulator.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's dom/manipulator.js |
<<<<<<<
* CoreUI alert.js v4.0.0-alpha.1 (https://coreui.io)
* Copyright 2021 The CoreUI Team (https://github.com/orgs/coreui/people)
* Licensed under MIT (https://coreui.io)
=======
* Bootstrap alert.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
>>>>>>>
* CoreUI alert.js v4.0.0-alpha.1 (https://coreui.io)
* Copyright 2021 The CoreUI Team (https://github.com/orgs/coreui/people)
* Licensed under MIT (https://coreui.io)
<<<<<<<
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's util/index.js
=======
* Bootstrap (v5.0.0-beta2): util/index.js
>>>>>>>
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's util/index.js
<<<<<<<
var VERSION = '4.0.0-alpha.1';
var BaseComponent = /*#__PURE__*/function () {
function BaseComponent(element) {
if (!element) {
return;
}
this._element = element;
Data__default['default'].setData(element, this.constructor.DATA_KEY, this);
}
var _proto = BaseComponent.prototype;
_proto.dispose = function dispose() {
Data__default['default'].removeData(this._element, this.constructor.DATA_KEY);
this._element = null;
}
/** Static */
;
BaseComponent.getInstance = function getInstance(element) {
return Data__default['default'].getData(element, this.DATA_KEY);
};
_createClass(BaseComponent, null, [{
key: "VERSION",
get: function get() {
return VERSION;
}
}]);
return BaseComponent;
}();
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
=======
>>>>>>> |
<<<<<<<
* Bootstrap selector-engine.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
=======
* Bootstrap selector-engine.js v5.0.0-beta2 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
>>>>>>>
* Bootstrap selector-engine.js v4.0.0-alpha.1 (https://bootstrap.coreui.io)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) |
<<<<<<<
* CoreUI (v4.0.0-alpha.1): alert.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's dom/data.js
=======
* Bootstrap (v5.0.0-beta2): dom/data.js
>>>>>>>
* CoreUI (v4.0.0-alpha.1): dom/data.js
* Licensed under MIT (https://coreui.io/license)
*
* This component is a modified version of the Bootstrap's dom/data.js |
<<<<<<<
it('should add a listener on trigger which do not have data-coreui-toggle="dropdown"', () => {
=======
it('should take care of element either passed as a CSS selector or DOM element', () => {
fixtureEl.innerHTML = [
'<div class="dropdown">',
' <button class="btn dropdown-toggle" data-bs-toggle="dropdown">Dropdown</button>',
' <div class="dropdown-menu">',
' <a class="dropdown-item" href="#">Link</a>',
' </div>',
'</div>'
].join('')
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
const dropdownBySelector = new Dropdown('[data-bs-toggle="dropdown"]')
const dropdownByElement = new Dropdown(btnDropdown)
expect(dropdownBySelector._element).toEqual(btnDropdown)
expect(dropdownByElement._element).toEqual(btnDropdown)
})
it('should add a listener on trigger which do not have data-bs-toggle="dropdown"', () => {
>>>>>>>
it('should take care of element either passed as a CSS selector or DOM element', () => {
fixtureEl.innerHTML = [
'<div class="dropdown">',
' <button class="btn dropdown-toggle" data-coreui-toggle="dropdown">Dropdown</button>',
' <div class="dropdown-menu">',
' <a class="dropdown-item" href="#">Link</a>',
' </div>',
'</div>'
].join('')
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdownBySelector = new Dropdown('[data-coreui-toggle="dropdown"]')
const dropdownByElement = new Dropdown(btnDropdown)
expect(dropdownBySelector._element).toEqual(btnDropdown)
expect(dropdownByElement._element).toEqual(btnDropdown)
})
it('should add a listener on trigger which do not have data-coreui-toggle="dropdown"', () => {
<<<<<<<
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdownEl = fixtureEl.querySelector('.dropdown')
=======
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdownEl.addEventListener('shown.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
dropdownEl.addEventListener('hidden.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('hidden.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('hidden.coreui.dropdown', () => {
<<<<<<<
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdownEl = fixtureEl.querySelector('.dropdown')
=======
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdownEl.addEventListener('shown.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdownEl = fixtureEl.querySelector('.dropdown')
=======
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdownEl.addEventListener('shown.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdownEl = fixtureEl.querySelector('.dropdown')
=======
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdownEl.addEventListener('shown.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
dropdownEl.addEventListener('hidden.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('hidden.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('hidden.coreui.dropdown', () => {
<<<<<<<
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
=======
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
spyOn(btnDropdown, 'addEventListener').and.callThrough()
spyOn(btnDropdown, 'removeEventListener').and.callThrough()
>>>>>>>
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
spyOn(btnDropdown, 'addEventListener').and.callThrough()
spyOn(btnDropdown, 'removeEventListener').and.callThrough()
<<<<<<<
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdownEl = fixtureEl.querySelector('.dropdown')
=======
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdownEl.addEventListener('show.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('show.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('show.coreui.dropdown', () => {
<<<<<<<
dropdownEl.addEventListener('shown.coreui.dropdown', e => {
=======
btnDropdown.addEventListener('shown.bs.dropdown', e => {
>>>>>>>
btnDropdown.addEventListener('shown.coreui.dropdown', e => {
<<<<<<<
dropdownEl.addEventListener('hide.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('hide.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('hide.coreui.dropdown', () => {
<<<<<<<
dropdownEl.addEventListener('hidden.coreui.dropdown', e => {
=======
btnDropdown.addEventListener('hidden.bs.dropdown', e => {
>>>>>>>
btnDropdown.addEventListener('hidden.coreui.dropdown', e => {
<<<<<<<
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdownEl = fixtureEl.querySelector('.dropdown')
=======
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const btnDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdownEl.addEventListener('shown.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
dropdownEl.addEventListener('hidden.coreui.dropdown', () => {
=======
btnDropdown.addEventListener('hidden.bs.dropdown', () => {
>>>>>>>
btnDropdown.addEventListener('hidden.coreui.dropdown', () => {
<<<<<<<
dropdown.addEventListener('hidden.coreui.dropdown', e => {
=======
triggerDropdown.addEventListener('hidden.bs.dropdown', e => {
>>>>>>>
triggerDropdown.addEventListener('hidden.coreui.dropdown', e => {
<<<<<<<
dropdown.addEventListener('shown.coreui.dropdown', () => {
=======
triggerDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
triggerDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdown = fixtureEl.querySelector('.dropdown')
=======
const triggerDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdown.addEventListener('shown.coreui.dropdown', () => {
=======
triggerDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
triggerDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdown = fixtureEl.querySelector('.dropdown')
=======
const triggerDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdown.addEventListener('shown.coreui.dropdown', () => {
=======
triggerDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
triggerDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdown = fixtureEl.querySelector('.dropdown')
=======
const triggerDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdown.addEventListener('shown.coreui.dropdown', () => {
=======
triggerDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
triggerDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdown = fixtureEl.querySelector('.dropdown')
=======
const triggerDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdown.addEventListener('shown.coreui.dropdown', () => {
=======
triggerDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
triggerDropdown.addEventListener('shown.coreui.dropdown', () => {
<<<<<<<
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
const dropdown = fixtureEl.querySelector('.dropdown')
=======
const triggerDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
>>>>>>>
const triggerDropdown = fixtureEl.querySelector('[data-coreui-toggle="dropdown"]')
<<<<<<<
dropdown.addEventListener('shown.coreui.dropdown', () => {
=======
triggerDropdown.addEventListener('shown.bs.dropdown', () => {
>>>>>>>
triggerDropdown.addEventListener('shown.coreui.dropdown', () => { |
<<<<<<<
SUDDEN_ONSET: {
id: 278721,
name: 'Sudden Onset',
icon: 'spell_shadow_curseofsargeras',
},
=======
SUPREME_COMMANDER: {
id: 279878,
name: 'Supreme Commander',
icon: 'inv_summondemonictyrant',
},
SUPREME_COMMANDER_BUFF: {
id: 279885,
name: 'Supreme Commander',
icon: 'inv_summondemonictyrant',
},
>>>>>>>
SUDDEN_ONSET: {
id: 278721,
name: 'Sudden Onset',
icon: 'spell_shadow_curseofsargeras',
},
SUPREME_COMMANDER: {
id: 279878,
name: 'Supreme Commander',
icon: 'inv_summondemonictyrant',
},
SUPREME_COMMANDER_BUFF: {
id: 279885,
name: 'Supreme Commander',
icon: 'inv_summondemonictyrant',
}, |
<<<<<<<
export {default as geoCentroid} from "./src/centroid";
=======
export {default as geoArea} from "./src/area";
>>>>>>>
export {default as geoArea} from "./src/area";
export {default as geoCentroid} from "./src/centroid"; |
<<<<<<<
change(date(2019, 7, 29), <>Fixed bug where if you end the fight with wotc buff it said everything was 0 hps. Added more info the the wotc infographic.</>, Abelito75),
=======
change(date(2019, 8, 6), <>Valid for 8.2</>, Abelito75),
change(date(2019, 8, 2), <>Fixed trait calculations being unaffected by healing increases or decreases.</>, niseko),
>>>>>>>
change(date(2019, 8, 6), <>Valid for 8.2</>, Abelito75),
change(date(2019, 8, 2), <>Fixed trait calculations being unaffected by healing increases or decreases.</>, niseko),
change(date(2019, 7, 29), <>Fixed bug where if you end the fight with wotc buff it said everything was 0 hps. Added more info the the wotc infographic.</>, Abelito75), |
<<<<<<<
{
themeList.map((theme, index) => {
const { _id: themeId, themeName, shareImageUrl } = theme
return (
<View className={`tabs-bar-item ${activeTab === index ? 'bar-active' : ''}`} key={themeId} id={`item-${index}`} onClick={this.onSwitchTab.bind(this, index)}>
<Image className="bar-image" src={shareImageUrl}></Image>
<View className="bar-text">{themeName}</View>
</View>
)
})
}
=======
<View className="tabs-bar-inner">
{
themeList.map((theme, index) => {
const { _id: themeId, themeName, shareImage } = theme
return (
<View className={`tabs-bar-item ${activeTab === index ? 'bar-active' : ''}`} key={themeId} id={`item-${index}`} onClick={this.onSwitchTab.bind(this, index)}>
<Image className="bar-image" src={shareImage}></Image>
<View className="bar-text">{themeName}</View>
</View>
)
})
}
</View>
>>>>>>>
<View className="tabs-bar-inner">
{
themeList.map((theme, index) => {
const { _id: themeId, themeName, shareImageUrl } = theme
return (
<View className={`tabs-bar-item ${activeTab === index ? 'bar-active' : ''}`} key={themeId} id={`item-${index}`} onClick={this.onSwitchTab.bind(this, index)}>
<Image className="bar-image" src={shareImageUrl}></Image>
<View className="bar-text">{themeName}</View>
</View>
)
})
}
</View> |
<<<<<<<
const { coverImageUrl, shareTitle, shareDesc } = themeData
=======
const { coverImage, shareTitle, shareDesc, themeName } = themeData
>>>>>>>
const { coverImageUrl, shareTitle, shareDesc, themeName } = themeData
<<<<<<<
<Image className="theme-cover" src={coverImageUrl} />
=======
>>>>>>>
<<<<<<<
const { _id: categoryId, categoryName, categoryImageUrl, shapeList } = category
=======
const { _id: categoryId, categoryName, categoryImage, shapeList = [] } = category
let showList = shapeList.filter((item, index) => index < 4)
>>>>>>>
const { _id: categoryId, categoryName, shapeList = [] } = category
let showList = shapeList.filter((item, index) => index < 4)
<<<<<<<
<View className='category-hd'>
<Image className='category-image' src={categoryImageUrl}></Image>
<View>{categoryName}</View>
</View>
=======
>>>>>>> |
<<<<<<<
date: new Date('2018-02-20'),
changes: <Wrapper>Moved <SpellLink id={SPELLS.CONCORDANCE_OF_THE_LEGIONFALL_AGILITY.id} icon /> statistic into the Netherlight Crucible list and renamed it.</Wrapper>,
contributors: [Putro],
},
{
=======
date: new Date('2018-02-21'),
changes: 'Minimized images and delayed the status page API query to improve initial load speeds.',
contributors: [Zerotorescue],
},
{
>>>>>>>
date: new Date('2018-02-21'),
changes: <Wrapper>Moved <SpellLink id={SPELLS.CONCORDANCE_OF_THE_LEGIONFALL_AGILITY.id} icon /> statistic into the Netherlight Crucible list and renamed it.</Wrapper>,
contributors: [Putro],
},
{
date: new Date('2018-02-21'),
changes: 'Minimized images and delayed the status page API query to improve initial load speeds.',
contributors: [Zerotorescue],
},
{ |
<<<<<<<
},
=======
// check for existence of package.json
try {
fs.accessSync('./package.json', fs.F_OK);
this.hasPackageJson = true;
} catch (e) {
this.hasPackageJson = false;
}
}
>>>>>>>
}
<<<<<<<
'grunt-sass',
'esri-wab-build'
], {
=======
'grunt-sass',
'grunt-sync',
'grunt-contrib-watch',
];
if(this.jsVersion === 'TypeScript') {
dependencies = dependencies.concat([
'dojo-typings',
'grunt-contrib-connect',
'grunt-ts',
,
'[email protected]'
]);
// 3D vs 2D we need to install a different declarations file:
if (this.widgetsType === 'is3d') {
dependencies.push('@types/[email protected]');
} else {
dependencies.push('@types/[email protected]');
}
} else {
dependencies = dependencies.concat([
'babel-plugin-transform-es2015-modules-simple-amd',
'babel-preset-es2015-without-strict',
'babel-preset-stage-0',
'grunt-babel',
'babel-core'
]);
}
this.npmInstall(dependencies, {
>>>>>>>
'grunt-sass',
'grunt-sync',
'grunt-contrib-watch',
'esri-wab-build'
];
if(this.jsVersion === 'TypeScript') {
dependencies = dependencies.concat([
'dojo-typings',
'grunt-contrib-connect',
'grunt-ts',
,
'[email protected]'
]);
// 3D vs 2D we need to install a different declarations file:
if (this.widgetsType === 'is3d') {
dependencies.push('@types/[email protected]');
} else {
dependencies.push('@types/[email protected]');
}
} else {
dependencies = dependencies.concat([
'babel-plugin-transform-es2015-modules-simple-amd',
'babel-preset-es2015-without-strict',
'babel-preset-stage-0',
'grunt-babel',
'babel-core'
]);
}
this.npmInstall(dependencies, { |
<<<<<<<
case "#scripts":
sBradCrumb = "Scripts";
break;
=======
case "#permissions":
sBradCrumb = "Api Access";
break;
case "#push_conf":
sBradCrumb = "Push Settings";
break;
>>>>>>>
case "#scripts":
sBradCrumb = "Scripts";
case "#permissions":
sBradCrumb = "Api Access";
break;
case "#push_conf":
sBradCrumb = "Push Settings";
break; |
<<<<<<<
function removeWatched() {
let els = newLayout ? document.querySelectorAll("ytd-grid-video-renderer.style-scope.ytd-grid-renderer") : document.querySelectorAll(".feed-item-container .yt-shelf-grid-item");
for (item of els) {
if (isWatched(item)) {
getStorage().remove(getVideoId(item)); //since its marked watched by YouTube, remove from storage to free space
hideItem(item);
}
}
}
=======
>>>>>>> |
<<<<<<<
var scopePattern = new RegExp('^\\s*(\\[|\\{)[ \t\r]*([^' + slugBlacklist + ']*)[ \t\r]*(?:\\]|\\}).*?(\n|\r|$)');
=======
var scopePattern = new RegExp('^\\s*(\\[|\\{)[ \t\r]*([\+\.]*)[ \t\r]*([A-Za-z0-9-_\.]*)[ \t\r]*(?:\\]|\\}).*?(\n|\r|$)');
>>>>>>>
var scopePattern = new RegExp('^\\s*(\\[|\\{)[ \t\r]*([\+\.]*)[ \t\r]*([^' + slugBlacklist + ']*)[ \t\r]*(?:\\]|\\}).*?(\n|\r|$)'); |
<<<<<<<
const PWMetrics = require('..');
const { getConfig } = require('../expectations');
const { getMessageWithPrefix } = require('../messages');
=======
const PWMetrics = require('../lib');
const {getConfig} = require('../lib/expectations');
const {getErrorMessage} = require('../lib/messages');
>>>>>>>
const PWMetrics = require('../lib');
const { getConfig } = require('../lib/expectations');
const { getMessageWithPrefix } = require('../lib/messages'); |
<<<<<<<
const {getConfigFromFile} = require('../lib/utils/fs');
const {getMessageWithPrefix, getMessage} = require('../lib/utils/messages');
=======
const { getConfigFromFile } = require('../lib/utils/fs');
const { getMessageWithPrefix, getMessage } = require('../lib/utils/messages');
let config;
>>>>>>>
const {getConfigFromFile} = require('../lib/utils/fs');
const {getMessageWithPrefix, getMessage} = require('../lib/utils/messages');
let config;
<<<<<<<
const config = getConfigFromFile(cliFlags.config);
// Merge options from all sources. Order indicates precedence (last one wins)
const options = Object.assign({}, {flags: cliFlags}, config);
=======
//Merge options from all sources. Order indicates precedence (last one wins)
let options = Object.assign({}, { flags: cliFlags }, config);
>>>>>>>
// Merge options from all sources. Order indicates precedence (last one wins)
const options = Object.assign({}, {flags: cliFlags}, config); |
<<<<<<<
return self.broadcastMessage('closeAllModals', '');
}
=======
return self.broadcastMessage('closeModal', '');
}
CoreCommandRouter.prototype.getMyVolumioToken = function () {
var self=this;
var defer = libQ.defer();
var response = self.executeOnPlugin('system_controller', 'my_volumio', 'getMyVolumioToken', '');
if (response != undefined) {
response.then(function (result) {
defer.resolve(result);
})
.fail(function () {
var jsonobject = {"tokenAvailable":false}
defer.resolve(jsonobject);
});
}
return defer.promise;
}
CoreCommandRouter.prototype.setMyVolumioToken = function (data) {
var self=this;
var defer = libQ.defer();
var response = self.executeOnPlugin('system_controller', 'my_volumio', 'setMyVolumioToken', data);
if (response != undefined) {
response.then(function (result) {
defer.resolve(result);
})
.fail(function () {
defer.resolve('');
});
}
return defer.promise;
}
CoreCommandRouter.prototype.getMyVolumioStatus = function () {
var self=this;
var defer = libQ.defer();
var response = self.executeOnPlugin('system_controller', 'my_volumio', 'getMyVolumioStatus', '');
if (response != undefined) {
response.then(function (result) {
defer.resolve(result);
})
.fail(function () {
var jsonobject = {"loggedIn":false}
defer.resolve(jsonobject);
});
}
return defer.promise;
}
CoreCommandRouter.prototype.myVolumioLogout = function () {
var self=this;
var defer = libQ.defer();
return self.executeOnPlugin('system_controller', 'my_volumio', 'myVolumioLogout', '');
}
CoreCommandRouter.prototype.enableMyVolumioDevice = function (device) {
var self=this;
var defer = libQ.defer();
return self.executeOnPlugin('system_controller', 'my_volumio', 'enableMyVolumioDevice', device);
}
CoreCommandRouter.prototype.disableMyVolumioDevice = function (device) {
var self=this;
var defer = libQ.defer();
return self.executeOnPlugin('system_controller', 'my_volumio', 'disableMyVolumioDevice', device);
}
CoreCommandRouter.prototype.deleteMyVolumioDevice = function (device) {
var self=this;
var defer = libQ.defer();
return self.executeOnPlugin('system_controller', 'my_volumio', 'deleteMyVolumioDevice', device);
}
>>>>>>>
return self.broadcastMessage('closeAllModals', '');
}
CoreCommandRouter.prototype.getMyVolumioToken = function () {
var self=this;
var defer = libQ.defer();
var response = self.executeOnPlugin('system_controller', 'my_volumio', 'getMyVolumioToken', '');
if (response != undefined) {
response.then(function (result) {
defer.resolve(result);
})
.fail(function () {
var jsonobject = {"tokenAvailable":false}
defer.resolve(jsonobject);
});
}
return defer.promise;
}
CoreCommandRouter.prototype.setMyVolumioToken = function (data) {
var self=this;
var defer = libQ.defer();
var response = self.executeOnPlugin('system_controller', 'my_volumio', 'setMyVolumioToken', data);
if (response != undefined) {
response.then(function (result) {
defer.resolve(result);
})
.fail(function () {
defer.resolve('');
});
}
return defer.promise;
}
CoreCommandRouter.prototype.getMyVolumioStatus = function () {
var self=this;
var defer = libQ.defer();
var response = self.executeOnPlugin('system_controller', 'my_volumio', 'getMyVolumioStatus', '');
if (response != undefined) {
response.then(function (result) {
defer.resolve(result);
})
.fail(function () {
var jsonobject = {"loggedIn":false}
defer.resolve(jsonobject);
});
}
return defer.promise;
}
CoreCommandRouter.prototype.myVolumioLogout = function () {
var self=this;
var defer = libQ.defer();
return self.executeOnPlugin('system_controller', 'my_volumio', 'myVolumioLogout', '');
}
CoreCommandRouter.prototype.enableMyVolumioDevice = function (device) {
var self=this;
var defer = libQ.defer();
return self.executeOnPlugin('system_controller', 'my_volumio', 'enableMyVolumioDevice', device);
}
CoreCommandRouter.prototype.disableMyVolumioDevice = function (device) {
var self=this;
var defer = libQ.defer();
return self.executeOnPlugin('system_controller', 'my_volumio', 'disableMyVolumioDevice', device);
}
CoreCommandRouter.prototype.deleteMyVolumioDevice = function (device) {
var self=this;
var defer = libQ.defer();
return self.executeOnPlugin('system_controller', 'my_volumio', 'deleteMyVolumioDevice', device);
} |
<<<<<<<
connWebSocket.on('volumioImportServicePlaylists', function () {
var timeStart = Date.now();
self.logStart('Client requests import of playlists')
.then(libFast.bind(commandRouter.volumioImportServicePlaylists, commandRouter))
.fail(function (error) {
self.commandRouter.pushConsoleMessage.call(self.commandRouter, error.stack);
})
.done(function () {
return self.logDone(timeStart);
});
});
=======
connWebSocket.on('getMenuItems', function () {
selfConnWebSocket = this;
var timeStart = Date.now();
self.logStart('Client requests Menu Items')
.then(function () {
var menuitems = [{"id":"home","name":"Home","type":"static","state":"volumio.playback"},{"id":"components","name":"Components","type":"static","state":"volumio.components"},{"id":"network","name":"Network","type":"dynamic"},{"id":"settings","name":"Settings","type":"dynamic"}]
self.libSocketIO.emit('printConsoleMessage', menuitems);
return self.libSocketIO.emit('pushMenuItems', menuitems);
})
.fail(function (error) {
self.commandRouter.pushConsoleMessage.call(self.commandRouter, error.stack);
})
.done(function () {
return self.logDone(timeStart);
});
});
connWebSocket.on('wirelessScan', function() {
selfConnWebSocket = this;
var timeStart = Date.now();
self.logStart('Client requests Wireless Network Scan ')
.then(function () {
return commandRouter.volumiowirelessscan.call(commandRouter);
})
.fail(function (error) {
self.commandRouter.pushConsoleMessage.call(self.commandRouter, error.stack);
})
.done(function () {
return self.logDone(timeStart);
});
})
>>>>>>>
connWebSocket.on('volumioImportServicePlaylists', function () {
var timeStart = Date.now();
self.logStart('Client requests import of playlists')
.then(libFast.bind(commandRouter.volumioImportServicePlaylists, commandRouter))
})
.fail(function (error) {
self.commandRouter.pushConsoleMessage.call(self.commandRouter, error.stack);
})
.done(function () {
return self.logDone(timeStart);
});
});
connWebSocket.on('getMenuItems', function () {
selfConnWebSocket = this;
var timeStart = Date.now();
self.logStart('Client requests Menu Items')
.then(function () {
var menuitems = [{"id":"home","name":"Home","type":"static","state":"volumio.playback"},{"id":"components","name":"Components","type":"static","state":"volumio.components"},{"id":"network","name":"Network","type":"dynamic"},{"id":"settings","name":"Settings","type":"dynamic"}]
self.libSocketIO.emit('printConsoleMessage', menuitems);
return self.libSocketIO.emit('pushMenuItems', menuitems);
})
.fail(function (error) {
self.commandRouter.pushConsoleMessage.call(self.commandRouter, error.stack);
})
.done(function () {
return self.logDone(timeStart);
});
});
connWebSocket.on('wirelessScan', function() {
selfConnWebSocket = this;
var timeStart = Date.now();
self.logStart('Client requests Wireless Network Scan ')
.then(function () {
return commandRouter.volumiowirelessscan.call(commandRouter);
})
.fail(function (error) {
self.commandRouter.pushConsoleMessage.call(self.commandRouter, error.stack);
})
.done(function () {
return self.logDone(timeStart);
});
}); |
<<<<<<<
// Volumio Stop Command
CoreStateMachine.prototype.stop = function (promisedResponse) {
this.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'CoreStateMachine::stop');
if (this.currentStatus === 'play') {
// Play -> Stop transition
this.currentStatus = 'stop';
this.currentSeek = 0;
this.updateTrackBlock();
return this.serviceStop();
} else if (this.currentStatus === 'pause') {
// Pause -> Stop transition
this.currentStatus = 'stop';
this.currentSeek = 0;
this.updateTrackBlock();
return this.serviceStop();
}
};
// Volumio Pause Command
CoreStateMachine.prototype.pause = function (promisedResponse) {
this.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'CoreStateMachine::pause');
if (this.currentStatus === 'play') {
// Play -> Pause transition
if (this.currentTrackType === 'webradio') {
this.currentStatus = 'stop';
return this.serviceStop();
} else {
this.currentStatus = 'pause';
return this.servicePause();
}
}
};
=======
>>>>>>>
// Volumio Stop Command
CoreStateMachine.prototype.stop = function (promisedResponse) {
this.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'CoreStateMachine::stop');
if (this.currentStatus === 'play') {
// Play -> Stop transition
this.currentStatus = 'stop';
this.currentSeek = 0;
this.updateTrackBlock();
return this.serviceStop();
} else if (this.currentStatus === 'pause') {
// Pause -> Stop transition
this.currentStatus = 'stop';
this.currentSeek = 0;
this.updateTrackBlock();
return this.serviceStop();
}
};
// Volumio Pause Command
CoreStateMachine.prototype.pause = function (promisedResponse) {
this.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'CoreStateMachine::pause');
if (this.currentStatus === 'play') {
// Play -> Pause transition
if (this.currentTrackType === 'webradio') {
this.currentStatus = 'stop';
return this.serviceStop();
} else {
this.currentStatus = 'pause';
return this.servicePause();
}
}
};
<<<<<<<
this.currentPosition = stateService.position;
this.currentSeek = stateService.seek;
this.currentDuration = stateService.duration;
this.currentTrackType = null;
this.currentTitle = null;
this.currentArtist = null;
this.currentAlbum = null;
this.currentAlbumArt = '/albumart';
this.currentUri = stateService.uri;
this.currentSampleRate = null;
this.currentBitDepth = null;
this.currentChannels = null;
this.currentRandom = stateService.random;
this.currentRepeat = stateService.repeat;
=======
this.currentStatus = 'play';
>>>>>>>
this.currentPosition = stateService.position;
this.currentSeek = stateService.seek;
this.currentDuration = stateService.duration;
this.currentTrackType = null;
this.currentTitle = null;
this.currentArtist = null;
this.currentAlbum = null;
this.currentAlbumArt = '/albumart';
this.currentUri = stateService.uri;
this.currentSampleRate = null;
this.currentBitDepth = null;
this.currentChannels = null;
this.currentRandom = stateService.random;
this.currentRepeat = stateService.repeat;
this.currentStatus = 'play';
<<<<<<<
// Service has stopped without client request, meaning it is finished playing its track block. Move on to next track block.
this.currentPosition = stateService.position;
this.currentSeek = stateService.seek;
this.currentDuration = stateService.duration;
this.currentTrackType = null;
this.currentTitle = null;
this.currentArtist = null;
this.currentAlbum = null;
this.currentAlbumArt = '/albumart';
this.currentUri = stateService.uri;
this.currentSampleRate = null;
this.currentBitDepth = null;
this.currentChannels = null;
this.currentRandom = stateService.random;
this.currentRepeat = stateService.repeat;
=======
>>>>>>>
// Service has stopped without client request, meaning it is finished playing its track block. Move on to next track block.
this.currentPosition = stateService.position;
this.currentSeek = stateService.seek;
this.currentDuration = stateService.duration;
this.currentTrackType = null;
this.currentTitle = null;
this.currentArtist = null;
this.currentAlbum = null;
this.currentAlbumArt = '/albumart';
this.currentUri = stateService.uri;
this.currentSampleRate = null;
this.currentBitDepth = null;
this.currentChannels = null;
this.currentRandom = stateService.random;
this.currentRepeat = stateService.repeat; |
<<<<<<<
var fs=require('fs-extra');
=======
var chokidar = require('chokidar');
>>>>>>>
var fs=require('fs-extra');
var chokidar = require('chokidar');
<<<<<<<
/*
* This method can be defined by every plugin which needs to be informed of the startup of Volumio.
* The Core controller checks if the method is defined and executes it on startup if it exists.
*/
ControllerMpd.prototype.onVolumioStart = function() {
console.log("Plugin mpd startup");
}
/*
* This method shall be defined by every plugin which needs to be configured.
*/
ControllerMpd.prototype.getConfiguration = function(mainConfig) {
var language=__dirname+"/i18n/"+mainConfig.locale+".json";
if(!fs.existsSync(language))
{
language=__dirname+"/i18n/EN.json";
}
var languageJSON=fs.readJsonSync(language);
var config=fs.readJsonSync(__dirname+'/config.json');
var uiConfig={};
for(var key in config)
{
if(config[key].modifiable==true)
{
uiConfig[key]={
"value":config[key].value,
"type":config[key].type,
"label":languageJSON[config[key].ui_label_key]
};
if(config[key].enabled_by!=undefined)
uiConfig[key].enabled_by=config[key].enabled_by;
}
}
return uiConfig;
}
/*
* This method shall be defined by every plugin which needs to be configured.
*/
ControllerMpd.prototype.setConfiguration = function(configuration) {
//DO something intelligent
}
=======
ControllerMpd.prototype.fswatch = function () {
var self = this;
var watcher = chokidar.watch('/mnt/', {ignored: /^\./, persistent: true, interval: 100, ignoreInitial: true});
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::StartedWatchService');
watcher
.on('add', function (path) {
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::UpdateMusicDatabase');
self.sendMpdCommand('update', []);
watcher.close();
return self.waitupdate();
})
.on('addDir', function(path) {
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::UpdateMusicDatabase');
self.sendMpdCommand('update', []);
watcher.close();
return self.waitupdate();
})
.on('unlink', function (path) {
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::UpdateMusicDatabase');
self.sendMpdCommand('update', []);
watcher.close();
return self.waitupdate();
})
.on('error', function (error) {
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::UpdateMusicDatabase ERROR');
})
}
ControllerMpd.prototype.waitupdate = function () {
var self = this;
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::WaitUpdatetoFinish');
//self.sendMpdCommand('idle update', []);
//self.mpdUpdated = libQ.nfcall(libFast.bind(self.clientMpd.on, self.clientMpd), 'update');
//return self.mpdUpdated
// .then(function() {
// self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::Updated');
// self.fswatch();
// })
// .then (function() {
//
// self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::aaa');
setTimeout(function() {
//Temporary Fix: wait 30 seconds before restarting indexing service
self.commandRouter.volumioRebuildLibrary();
return self.fswatch()
}, 30000);
//});
}
>>>>>>>
/*
* This method can be defined by every plugin which needs to be informed of the startup of Volumio.
* The Core controller checks if the method is defined and executes it on startup if it exists.
*/
ControllerMpd.prototype.onVolumioStart = function() {
console.log("Plugin mpd startup");
}
/*
* This method shall be defined by every plugin which needs to be configured.
*/
ControllerMpd.prototype.getConfiguration = function(mainConfig) {
var language=__dirname+"/i18n/"+mainConfig.locale+".json";
if(!fs.existsSync(language))
{
language=__dirname+"/i18n/EN.json";
}
var languageJSON=fs.readJsonSync(language);
var config=fs.readJsonSync(__dirname+'/config.json');
var uiConfig={};
for(var key in config)
{
if(config[key].modifiable==true)
{
uiConfig[key]={
"value":config[key].value,
"type":config[key].type,
"label":languageJSON[config[key].ui_label_key]
};
if(config[key].enabled_by!=undefined)
uiConfig[key].enabled_by=config[key].enabled_by;
}
}
return uiConfig;
}
/*
* This method shall be defined by every plugin which needs to be configured.
*/
ControllerMpd.prototype.setConfiguration = function(configuration) {
//DO something intelligent
}
ControllerMpd.prototype.fswatch = function () {
var self = this;
var watcher = chokidar.watch('/mnt/', {ignored: /^\./, persistent: true, interval: 100, ignoreInitial: true});
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::StartedWatchService');
watcher
.on('add', function (path) {
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::UpdateMusicDatabase');
self.sendMpdCommand('update', []);
watcher.close();
return self.waitupdate();
})
.on('addDir', function(path) {
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::UpdateMusicDatabase');
self.sendMpdCommand('update', []);
watcher.close();
return self.waitupdate();
})
.on('unlink', function (path) {
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::UpdateMusicDatabase');
self.sendMpdCommand('update', []);
watcher.close();
return self.waitupdate();
})
.on('error', function (error) {
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::UpdateMusicDatabase ERROR');
})
}
ControllerMpd.prototype.waitupdate = function () {
var self = this;
self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::WaitUpdatetoFinish');
//self.sendMpdCommand('idle update', []);
//self.mpdUpdated = libQ.nfcall(libFast.bind(self.clientMpd.on, self.clientMpd), 'update');
//return self.mpdUpdated
// .then(function() {
// self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::Updated');
// self.fswatch();
// })
// .then (function() {
//
// self.commandRouter.pushConsoleMessage('[' + Date.now() + '] ' + 'ControllerMpd::aaa');
setTimeout(function() {
//Temporary Fix: wait 30 seconds before restarting indexing service
self.commandRouter.volumioRebuildLibrary();
return self.fswatch()
}, 30000);
//});
} |
<<<<<<<
var i, ii;
=======
var cumulativeTotalMass = 0,
i, ii;
>>>>>>>
var cumulativeTotalMass = 0,
i, ii;
<<<<<<<
// Publish the current state
T = computeTemperature();
=======
if (props.ELEMENT) {
for (i=0, ii=N; i<ii; i++){
element[i] = props.ELEMENT[i];
cumulativeTotalMass += elements[element[i]][0];
}
} else {
cumulativeTotalMass = N * elements[0][0];
}
totalMass = model.totalMass = cumulativeTotalMass;
>>>>>>>
if (props.ELEMENT) {
for (i=0, ii=N; i<ii; i++){
element[i] = props.ELEMENT[i];
cumulativeTotalMass += elements[element[i]][0];
}
} else {
cumulativeTotalMass = N * elements[0][0];
}
totalMass = model.totalMass = cumulativeTotalMass;
// Publish the current state
T = computeTemperature();
<<<<<<<
vMagnitude, vDirection;
=======
vMagnitude, vDirection,
rescalingFactor,
cumulativeTotalMass = 0;
>>>>>>>
vMagnitude, vDirection;
<<<<<<<
vMagnitude = math.normal(1, 1/4);
vDirection = 2 * Math.random() * Math.PI;
vx[i] = vMagnitude * Math.cos(vDirection);
px[i] = mass[i] * vx[i];
vy[i] = vMagnitude * Math.sin(vDirection);
py[i] = mass[i] * vy[i];
=======
// Randomize velocities, exactly balancing the motion of the center of mass by making the second half of the
// set of atoms have the opposite velocities of the first half. (If the atom number is odd, the "odd atom out"
// should have 0 velocity).
//
// Note that although the instantaneous temperature will be 'temperature' exactly, the temperature will quickly
// settle to a lower value because we are initializing the atoms spaced far apart, in an artificially low-energy
// configuration.
if (i < Math.floor(N/2)) { // 'middle' atom will have 0 velocity
// Note kT = m<v^2>/2 because there are 2 degrees of freedom per atom, not 3
// TODO: define constants to avoid unnecesssary conversions below.
mass = elements[element[i]][0];
mass_in_kg = constants.convert(mass, { from: unit.DALTON, to: unit.KILOGRAM });
v0_MKS = Math.sqrt(2 * k_inJoulesPerKelvin * temperature / mass_in_kg);
v0 = constants.convert(v0_MKS, { from: unit.METERS_PER_SECOND, to: unit.MW_VELOCITY_UNIT });
vMagnitude = math.normal(v0, v0/4);
vDirection = 2 * Math.random() * Math.PI;
vx[i] = vMagnitude * Math.cos(vDirection);
px[i] = mass * vx[i];
vy[i] = vMagnitude * Math.sin(vDirection);
py[i] = mass * vy[i];
vx[N-i-1] = -vx[i];
px[N-i-1] = elements[element[N-i-1]][0] * vx[N-i-1];
vy[N-i-1] = -vy[i];
py[N-i-1] = elements[element[N-i-1]][0] * vy[N-i-1];
}
>>>>>>>
vMagnitude = math.normal(1, 1/4);
vDirection = 2 * Math.random() * Math.PI;
vx[i] = vMagnitude * Math.cos(vDirection);
px[i] = elements[element[i]][0] * vx[i];
vy[i] = vMagnitude * Math.sin(vDirection);
py[i] = elements[element[i]][0] * vy[i];
<<<<<<<
// now, remove all translation of the center of mass and rotation about the center of mass
=======
totalMass = model.totalMass = cumulativeTotalMass;
// Compute linear and angular velocity of CM, compute temperature, and publish output state:
>>>>>>>
// now, remove all translation of the center of mass and rotation about the center of mass
<<<<<<<
KEinMWUnits += 0.5 * mass[i] * (vx[i] * vx[i] + vy[i] * vy[i]);
=======
realKEinMWUnits += 0.5 * elements[element[i]][0] * (vx[i] * vx[i] + vy[i] * vy[i]);
>>>>>>>
KEinMWUnits += 0.5 * elements[element[i]][0] * (vx[i] * vx[i] + vy[i] * vy[i]); |
<<<<<<<
function renderCompareView () {
return yo`
<div class="container">
<div class="view compare">
${renderArchiveComparison({
base: compareReversed ? compareTargetArchive : archive,
target: compareReversed ? archive : compareTargetArchive,
reversed: compareReversed,
revisions: compareDiff,
onMerge: onCompareMerge,
onChangeCompareTarget,
onSwitchCompareArchives,
onToggleRevisionCollapsed: onToggleCompareRevisionCollapsed
})}
</div>
</div>
</div>`
}
function renderTabs () {
=======
function renderToolbar () {
return yo`
<div class="library-toolbar">
<div class="container">
${renderNav()}
<div class="buttons">
${toggleable(yo`
<div class="dropdown toggleable-container">
<button class="btn plain nofocus toggleable">
<span class="fa fa-share-square-o"></span>
</button>
<div class="dropdown-items wide subtle-shadow">
<div class="dropdown-item vertically-aligned-icon">
<span class="icon fa fa-link"></span>
<span class="label">Share this project</span>
<p class="description small">
Anyone with this link can view this project${"'"}s files
</p>
<p>
<input type="text" disabled value="${archive.url}"/>
<button class="btn" onclick=${() => onCopy(archive.url)}>
Copy URL
</button>
</p>
</div>
<div class="dropdown-item vertically-aligned-icon">
<span class="icon fa fa-external-link"></span>
<span class="label">Open</span>
<p class="description small">
View the live version of this project
</p>
</div>
</div>
</div>`
)}
</div>
</div>
</div>
`
}
function renderNav () {
>>>>>>>
function renderCompareView () {
return yo`
<div class="container">
<div class="view compare">
${renderArchiveComparison({
base: compareReversed ? compareTargetArchive : archive,
target: compareReversed ? archive : compareTargetArchive,
reversed: compareReversed,
revisions: compareDiff,
onMerge: onCompareMerge,
onChangeCompareTarget,
onSwitchCompareArchives,
onToggleRevisionCollapsed: onToggleCompareRevisionCollapsed
})}
</div>
</div>
</div>`
}
function renderToolbar () {
return yo`
<div class="library-toolbar">
<div class="container">
${renderNav()}
<div class="buttons">
${toggleable(yo`
<div class="dropdown toggleable-container">
<button class="btn plain nofocus toggleable">
<span class="fa fa-share-square-o"></span>
</button>
<div class="dropdown-items wide subtle-shadow">
<div class="dropdown-item vertically-aligned-icon">
<span class="icon fa fa-link"></span>
<span class="label">Share this project</span>
<p class="description small">
Anyone with this link can view this project${"'"}s files
</p>
<p>
<input type="text" disabled value="${archive.url}"/>
<button class="btn" onclick=${() => onCopy(archive.url)}>
Copy URL
</button>
</p>
</div>
<div class="dropdown-item vertically-aligned-icon">
<span class="icon fa fa-external-link"></span>
<span class="label">Open</span>
<p class="description small">
View the live version of this project
</p>
</div>
</div>
</div>`
)}
</div>
</div>
</div>
`
}
function renderNav () { |
<<<<<<<
import {showShellModal, closeModal} from './ui/modals'
import {getUserSessionFor, setUserSessionFor} from './ui/windows'
=======
import * as modals from './ui/subwindows/modals'
>>>>>>>
import {getUserSessionFor, setUserSessionFor} from './ui/windows'
import * as modals from './ui/subwindows/modals'
<<<<<<<
var res = await showShellModal(e.sender, 'prompt', {message, default: def})
=======
var res = await modals.create(e.sender, 'prompt', {message, default: def})
>>>>>>>
var res = await modals.create(e.sender, 'prompt', {message, default: def})
<<<<<<<
// quick sync getters
ipcMain.on('get-json-renderer-script', e => {
e.returnValue = fs.readFileSync(path.join(app.getAppPath(), 'json-renderer.build.js'), 'utf8')
})
=======
>>>>>>>
<<<<<<<
if (test === 'modal') {
return showShellModal(this.sender, 'example', {i: 5})
}
if (test === 'tutorial') {
return showShellModal(this.sender, 'tutorial')
}
=======
>>>>>>> |
<<<<<<<
function rNode (archiveInfo, node, depth) {
if (node.entry.name === 'dat.json') {
// hide dat.json for now
return ''
}
=======
function rNode (archiveInfo, node, depth, opts) {
>>>>>>>
function rNode (archiveInfo, node, depth, opts) {
if (node.entry.name === 'dat.json') {
// hide dat.json for now
return ''
} |
<<<<<<<
export function setApplicationMenu (opts = {}) {
Menu.setApplicationMenu(Menu.buildFromTemplate(buildWindowMenu(opts)))
}
export function buildWindowMenu (opts = {}) {
const isDat = opts.url && opts.url.startsWith('dat://')
var darwinMenu = {
label: 'Beaker',
submenu: [
{
label: 'Preferences',
click (item, win) {
if (win) win.webContents.send('command', 'file:new-tab', 'beaker://settings')
}
},
{ type: 'separator' },
{ label: 'Services', role: 'services', submenu: [] },
{ type: 'separator' },
{ label: 'Hide Beaker', accelerator: 'Command+H', role: 'hide' },
{ label: 'Hide Others', accelerator: 'Command+Alt+H', role: 'hideothers' },
{ label: 'Show All', role: 'unhide' },
{ type: 'separator' },
{ label: 'Quit', accelerator: 'Command+Q', click () { app.quit() } }
]
}
var fileMenu = {
label: 'File',
submenu: [
{
label: 'New Tab',
accelerator: 'CmdOrCtrl+T',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:new-tab')
}
},
{
label: 'New Window',
accelerator: 'CmdOrCtrl+N',
click: function () { createShellWindow() }
},
{
label: 'Reopen Closed Tab',
accelerator: 'CmdOrCtrl+Shift+T',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:reopen-closed-tab')
}
},
{
label: 'Open File',
accelerator: 'CmdOrCtrl+O',
click: function (item, win) {
if (win) {
dialog.showOpenDialog({ title: 'Open file...', properties: ['openFile', 'createDirectory'] }, files => {
if (files && files[0]) { win.webContents.send('command', 'file:new-tab', 'file://' + files[0]) }
})
}
}
},
{
label: 'Open Location',
accelerator: 'CmdOrCtrl+L',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:open-location')
}
},
{ type: 'separator' },
{
label: 'Close Window',
accelerator: 'CmdOrCtrl+Shift+W',
click: function (item, win) {
if (win) win.close()
}
},
{
label: 'Close Tab',
accelerator: 'CmdOrCtrl+W',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:close-tab')
}
=======
var fileMenu = {
label: 'File',
submenu: [
{
label: 'New Tab',
accelerator: 'CmdOrCtrl+T',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:new-tab')
else createShellWindow()
}
},
{
label: 'New Window',
accelerator: 'CmdOrCtrl+N',
click: function () { createShellWindow() }
},
{
label: 'Reopen Closed Tab',
accelerator: 'CmdOrCtrl+Shift+T',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:reopen-closed-tab')
>>>>>>>
export function setApplicationMenu (opts = {}) {
Menu.setApplicationMenu(Menu.buildFromTemplate(buildWindowMenu(opts)))
}
export function buildWindowMenu (opts = {}) {
const isDat = opts.url && opts.url.startsWith('dat://')
var darwinMenu = {
label: 'Beaker',
submenu: [
{
label: 'Preferences',
click (item, win) {
if (win) win.webContents.send('command', 'file:new-tab', 'beaker://settings')
}
},
{ type: 'separator' },
{ label: 'Services', role: 'services', submenu: [] },
{ type: 'separator' },
{ label: 'Hide Beaker', accelerator: 'Command+H', role: 'hide' },
{ label: 'Hide Others', accelerator: 'Command+Alt+H', role: 'hideothers' },
{ label: 'Show All', role: 'unhide' },
{ type: 'separator' },
{ label: 'Quit', accelerator: 'Command+Q', click () { app.quit() } }
]
}
var fileMenu = {
label: 'File',
submenu: [
{
label: 'New Tab',
accelerator: 'CmdOrCtrl+T',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:new-tab')
else createShellWindow()
}
},
{
label: 'New Window',
accelerator: 'CmdOrCtrl+N',
click: function () { createShellWindow() }
},
{
label: 'Reopen Closed Tab',
accelerator: 'CmdOrCtrl+Shift+T',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:reopen-closed-tab')
}
},
{
label: 'Open File',
accelerator: 'CmdOrCtrl+O',
click: function (item, win) {
if (win) {
dialog.showOpenDialog({ title: 'Open file...', properties: ['openFile', 'createDirectory'] }, files => {
if (files && files[0]) { win.webContents.send('command', 'file:new-tab', 'file://' + files[0]) }
})
}
}
},
{
label: 'Open Location',
accelerator: 'CmdOrCtrl+L',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:open-location')
}
},
{ type: 'separator' },
{
label: 'Close Window',
accelerator: 'CmdOrCtrl+Shift+W',
click: function (item, win) {
if (win) win.close()
}
},
{
label: 'Close Tab',
accelerator: 'CmdOrCtrl+W',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:close-tab')
}
<<<<<<<
if (win) win.webContents.send('command', 'view:zoom-in')
=======
if (win) win.webContents.send('command', 'edit:find')
}
}
]
}
var viewMenu = {
label: 'View',
submenu: [{
label: 'Reload',
accelerator: 'CmdOrCtrl+R',
click: function (item, win) {
if (win) win.webContents.send('command', 'view:reload')
}
},
{
label: 'Hard Reload (Clear Cache)',
accelerator: 'CmdOrCtrl+Shift+R',
click: function (item, win) {
// HACK
// this is *super* lazy but it works
// clear all dat-dns cache on hard reload, to make sure the next
// load is fresh
// -prf
datDns.flushCache()
if (win) win.webContents.send('command', 'view:hard-reload')
}
},
{ type: 'separator' },
{
label: 'Zoom In',
accelerator: 'CmdOrCtrl+Plus',
click: function (item, win) {
if (win) win.webContents.send('command', 'view:zoom-in')
}
},
{
label: 'Zoom Out',
accelerator: 'CmdOrCtrl+-',
click: function (item, win) {
if (win) win.webContents.send('command', 'view:zoom-out')
}
},
{
label: 'Actual Size',
accelerator: 'CmdOrCtrl+0',
click: function (item, win) {
if (win) win.webContents.send('command', 'view:zoom-reset')
}
},
{ type: 'separator' },
{
label: 'Toggle DevTools',
accelerator: (process.platform === 'darwin') ? 'Alt+CmdOrCtrl+I' : 'Shift+CmdOrCtrl+I',
click: function (item, win) {
if (win) win.webContents.send('command', 'view:toggle-dev-tools')
}
},
{
label: 'Toggle Javascript Console',
accelerator: (process.platform === 'darwin') ? 'Alt+CmdOrCtrl+J' : 'Shift+CmdOrCtrl+J',
click: function (item, win) {
if (win) win.webContents.send('command', 'view:toggle-javascript-console')
}
},
{
label: 'Toggle Sidebar',
accelerator: (process.platform === 'darwin') ? 'Alt+CmdOrCtrl+B' : 'Shift+CmdOrCtrl+B',
click: function (item, win) {
if (win) win.webContents.send('command', 'view:toggle-sidebar')
}
}]
}
var showHistoryAccelerator = 'Ctrl+h'
if (process.platform === 'darwin') {
showHistoryAccelerator = 'Command+y'
}
var historyMenu = {
label: 'History',
role: 'history',
submenu: [
{
label: 'Back',
accelerator: 'CmdOrCtrl+Left',
click: function (item, win) {
if (win) win.webContents.send('command', 'history:back')
>>>>>>>
if (win) win.webContents.send('command', 'view:zoom-in')
<<<<<<<
type: 'submenu',
label: 'Advanced Tools',
submenu: [{
label: 'Reload Shell-Window',
accelerator: 'CmdOrCtrl+alt+shift+R',
click: function () {
BrowserWindow.getFocusedWindow().webContents.reloadIgnoringCache()
}
}, {
label: 'Toggle Shell-Window DevTools',
accelerator: 'CmdOrCtrl+alt+shift+I',
click: function () {
BrowserWindow.getFocusedWindow().toggleDevTools()
}
},
{ type: 'separator' },
{
label: 'Open Archives Debug Page',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:new-tab', 'beaker://internal-archives/')
}
}, {
label: 'Open Dat-DNS Cache Page',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:new-tab', 'beaker://dat-dns-cache/')
}
}, {
label: 'Open Debug Log Page',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:new-tab', 'beaker://debug-log/')
}
}]
},
{
label: 'Toggle DevTools',
accelerator: (process.platform === 'darwin') ? 'Alt+CmdOrCtrl+I' : 'Shift+CmdOrCtrl+I',
=======
label: 'Next Tab',
accelerator: 'CmdOrCtrl+}',
>>>>>>>
type: 'submenu',
label: 'Advanced Tools',
submenu: [{
label: 'Reload Shell-Window',
accelerator: 'CmdOrCtrl+alt+shift+R',
click: function () {
BrowserWindow.getFocusedWindow().webContents.reloadIgnoringCache()
}
}, {
label: 'Toggle Shell-Window DevTools',
accelerator: 'CmdOrCtrl+alt+shift+I',
click: function () {
BrowserWindow.getFocusedWindow().toggleDevTools()
}
},
{ type: 'separator' },
{
label: 'Open Archives Debug Page',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:new-tab', 'beaker://internal-archives/')
}
}, {
label: 'Open Dat-DNS Cache Page',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:new-tab', 'beaker://dat-dns-cache/')
}
}, {
label: 'Open Debug Log Page',
click: function (item, win) {
if (win) win.webContents.send('command', 'file:new-tab', 'beaker://debug-log/')
}
}]
},
{
label: 'Toggle DevTools',
accelerator: (process.platform === 'darwin') ? 'Alt+CmdOrCtrl+I' : 'Shift+CmdOrCtrl+I', |
<<<<<<<
import * as statusbar from './ui/statusbar'
=======
import * as win32Titlebar from './ui/win32-titlebar'
import * as sidebar from './ui/sidebar'
>>>>>>>
import * as statusbar from './ui/statusbar'
import * as win32Titlebar from './ui/win32-titlebar'
<<<<<<<
statusbar.setup()
=======
if (window.process.platform == 'win32') {
win32Titlebar.setup()
}
sidebar.setup()
>>>>>>>
statusbar.setup()
if (window.process.platform == 'win32') {
win32Titlebar.setup()
} |
<<<<<<<
import {UpdatesNavbarBtn} from './navbar/updates'
import {BrowserMenuNavbarBtn} from './navbar/browser-menu'
import {AppsMenuNavbarBtn} from './navbar/apps-menu'
import {DatsiteMenuNavbarBtn} from './navbar/datsite-menu'
import {BookmarkMenuNavbarBtn} from './navbar/bookmark-menu'
import {PageMenuNavbarBtn} from './navbar/page-menu'
import {SiteInfoNavbarBtn} from './navbar/site-info'
import {findParent} from '../../lib/fg/event-handlers'
import renderNavArrowIcon from './icon/nav-arrow'
import renderRefreshIcon from './icon/refresh'
import renderCloseIcon from './icon/close'
=======
import { UpdatesNavbarBtn } from './navbar/updates'
import { BrowserMenuNavbarBtn } from './navbar/browser-menu'
import { PageMenuNavbarBtn } from './navbar/page-menu'
import { DatSidebarBtn } from './navbar/dat-sidebar'
import {pluralize} from '../../lib/strings'
>>>>>>>
import {UpdatesNavbarBtn} from './navbar/updates'
import {BrowserMenuNavbarBtn} from './navbar/browser-menu'
import {AppsMenuNavbarBtn} from './navbar/apps-menu'
import {DatsiteMenuNavbarBtn} from './navbar/datsite-menu'
import {BookmarkMenuNavbarBtn} from './navbar/bookmark-menu'
import {PageMenuNavbarBtn} from './navbar/page-menu'
import {findParent} from '../../lib/fg/event-handlers'
import renderNavArrowIcon from './icon/nav-arrow'
import renderRefreshIcon from './icon/refresh'
import renderCloseIcon from './icon/close'
<<<<<<<
siteInfoNavbarBtn = new SiteInfoNavbarBtn()
// add some global listeners
window.addEventListener('keydown', onGlobalKeydown)
=======
>>>>>>>
// add some global listeners
window.addEventListener('keydown', onGlobalKeydown)
<<<<<<<
<div class="toolbar-input-group${isLocationHighlighted ? ' input-focused' : ''}${autocompleteResults ? ' autocomplete' : ''}">
${!(isLoading || isLocationHighlighted) ? siteInfoNavbarBtn.render() : ''}
=======
<div class="toolbar-input-group">
${page ? page.siteInfoNavbarBtn.render() : ''}
>>>>>>>
<div class="toolbar-input-group${isLocationHighlighted ? ' input-focused' : ''}${autocompleteResults ? ' autocomplete' : ''}">
${page && !(isLoading || isLocationHighlighted) ? page.siteInfoNavbarBtn.render() : ''} |
<<<<<<<
// create the new archive
return createNewArchive({ title, description, origin: 'beaker:archives' }).then(newArchiveKey => {
// list the old archive's files
var newArchive = getArchive(newArchiveKey)
oldArchive.list((err, entries) => {
if (err) return console.error('Failed to list old archive files during fork', err)
// TEMPORARY
// remove duplicates
// this is only needed until hyperdrive fixes its .list()
// see https://github.com/mafintosh/hyperdrive/pull/99
// -prf
var entriesDeDuped = {}
entries.forEach(entry => { entriesDeDuped[entry.name] = entry })
entries = Object.keys(entriesDeDuped).map(name => entriesDeDuped[name])
// copy over files
next()
function next (err) {
if (err) console.error('Error while copying file during fork', err)
var entry = entries.shift()
if (!entry) return // done!
// skip non-files, undownloaded files, and the old manifest
if (entry.type !== 'file' || !oldArchive.isEntryDownloaded(entry) || entry.name === DAT_MANIFEST_FILENAME) {
return next()
=======
// fetch old archive meta
return archivesDb.getArchiveMeta(oldArchiveKey).then(meta => {
// override any manifest data
var newArchiveOpts = {
title: (opts.title) ? opts.title : meta.title,
description: (opts.description) ? opts.description : meta.description,
forkOf: (meta.forkOf || []).concat(`dat://${oldArchiveKey}/`),
origin: opts.origin
}
if (opts.author) newArchiveOpts.author = opts.author
// create the new archive
return createNewArchive(newArchiveOpts)
}).then(newArchiveKey => {
return new Promise(resolve => {
// list the old archive's files
var newArchive = getArchive(newArchiveKey)
oldArchive.list((err, entries) => {
if (err) return log.error('[DAT] Failed to list old archive files during fork', err)
// TEMPORARY
// remove duplicates
// this is only needed until hyperdrive fixes its .list()
// see https://github.com/mafintosh/hyperdrive/pull/99
// -prf
var entriesDeDuped = {}
entries.forEach(entry => { entriesDeDuped[entry.name] = entry })
entries = Object.keys(entriesDeDuped).map(name => entriesDeDuped[name])
// copy over files
next()
function next (err) {
if (err) log.error('[DAT] Error while copying file during fork', err)
var entry = entries.shift()
if (!entry) {
// done!
return resolve(newArchiveKey)
}
// directories
if (entry.type === 'directory') {
return newArchive.append({
name: entry.name,
type: 'directory',
mtime: entry.mtime
}, next)
}
// skip other non-files, undownloaded files, and the old manifest
if (
entry.type !== 'file' ||
!oldArchive.isEntryDownloaded(entry) ||
entry.name === DAT_MANIFEST_FILENAME ||
entry.name === ('/' + DAT_MANIFEST_FILENAME)
) {
return next()
}
// copy the file
pump(
oldArchive.createFileReadStream(entry),
newArchive.createFileWriteStream({ name: entry.name, mtime: entry.mtime, ctime: entry.ctime }),
next
)
>>>>>>>
// fetch old archive meta
return archivesDb.getArchiveMeta(oldArchiveKey).then(meta => {
// override any manifest data
var newArchiveOpts = {
title: (opts.title) ? opts.title : meta.title,
description: (opts.description) ? opts.description : meta.description,
forkOf: (meta.forkOf || []).concat(`dat://${oldArchiveKey}/`),
origin: opts.origin
}
if (opts.author) newArchiveOpts.author = opts.author
// create the new archive
return createNewArchive(newArchiveOpts)
}).then(newArchiveKey => {
return new Promise(resolve => {
// list the old archive's files
var newArchive = getArchive(newArchiveKey)
oldArchive.list((err, entries) => {
if (err) return console.error('[DAT] Failed to list old archive files during fork', err)
// TEMPORARY
// remove duplicates
// this is only needed until hyperdrive fixes its .list()
// see https://github.com/mafintosh/hyperdrive/pull/99
// -prf
var entriesDeDuped = {}
entries.forEach(entry => { entriesDeDuped[entry.name] = entry })
entries = Object.keys(entriesDeDuped).map(name => entriesDeDuped[name])
// copy over files
next()
function next (err) {
if (err) console.error('[DAT] Error while copying file during fork', err)
var entry = entries.shift()
if (!entry) {
// done!
return resolve(newArchiveKey)
}
// directories
if (entry.type === 'directory') {
return newArchive.append({
name: entry.name,
type: 'directory',
mtime: entry.mtime
}, next)
}
// skip other non-files, undownloaded files, and the old manifest
if (
entry.type !== 'file' ||
!oldArchive.isEntryDownloaded(entry) ||
entry.name === DAT_MANIFEST_FILENAME ||
entry.name === ('/' + DAT_MANIFEST_FILENAME)
) {
return next()
}
// copy the file
pump(
oldArchive.createFileReadStream(entry),
newArchive.createFileWriteStream({ name: entry.name, mtime: entry.mtime, ctime: entry.ctime }),
next
)
<<<<<<<
var upload = settings.uploadClaims.length > 0
var download = settings.downloadClaims.length > 0
var archive = getOrLoadArchive(key, { noSwarm: true })
var wasUploading = (archive.userSettings && archive.userSettings.uploadClaims && archive.userSettings.uploadClaims.length > 0)
archive.userSettings = settings
archivesEvents.emit('update-archive', { key, isUploading: upload, isDownloading: download })
=======
var upload = settings.isHosting
var download = settings.isSaved
var archive = getArchive(key)
if (archive) {
// re-set swarming
swarm(key, { upload })
} else {
// load and set swarming there
archive = loadArchive(new Buffer(key, 'hex'), { upload })
}
>>>>>>>
var upload = settings.isHosting
var download = settings.isSaved
var archive = getOrLoadArchive(key, { noSwarm: true })
var wasUploading = (archive.userSettings && archive.userSettings.isHosting)
archive.userSettings = settings
archivesEvents.emit('update-archive', { key, isUploading: upload, isDownloading: download })
<<<<<<<
debug('Writing file(s) from path:', src, 'to', dst)
hyperImport(archive, src, {
=======
log.debug('[DAT] Writing file(s) from path:', src, 'to', dst)
var stats = { addCount: 0, updateCount: 0, skipCount: 0, fileCount: 0, totalSize: 0 }
var status = hyperImport(archive, src, {
>>>>>>>
debug('Writing file(s) from path:', src, 'to', dst)
var stats = { addCount: 0, updateCount: 0, skipCount: 0, fileCount: 0, totalSize: 0 }
var status = hyperImport(archive, src, {
<<<<<<<
var update = { title, description, author, createdBy, mtime, size, isOwner }
debug('Writing meta', update)
=======
var update = { title, description, author, version, forkOf, createdBy, mtime, size, isOwner }
log.debug('[DAT] Writing meta', update)
>>>>>>>
var update = { title, description, author, version, forkOf, createdBy, mtime, size, isOwner }
debug('Writing meta', update) |
<<<<<<<
const LATEST_VERSION = 7011 // semver where major*1mm and minor*1k; thus 3.2.1 = 3002001
const WELCOME_URL = 'https://beakerbrowser.com/docs/using-beaker/'
const RELEASE_NOTES_URL = 'https://beakerbrowser.com/releases/0-7-11/?updated=true'
=======
const LATEST_VERSION = 7010 // semver where major*1mm and minor*1k; thus 3.2.1 = 3002001
const RELEASE_NOTES_URL = 'https://beakerbrowser.com/releases/0-7-10/?updated=true'
>>>>>>>
const LATEST_VERSION = 7011 // semver where major*1mm and minor*1k; thus 3.2.1 = 3002001
const RELEASE_NOTES_URL = 'https://beakerbrowser.com/releases/0-7-10/?updated=true' |
<<<<<<<
exports.escape = function (variable, context) {
if (_.isArray(variable)) {
=======
exports.escapeVarName = function (variable, context) {
if (Array.isArray(variable)) {
>>>>>>>
exports.escapeVarName = function (variable, context) {
if (_.isArray(variable)) { |
<<<<<<<
'__context["' + operand1 + '"] = __forloopIter[forloop.key];\n' +
parser.compile.apply(this, [indent + ' ', parentBlock]);
=======
'_context["' + operand1 + '"] = __forloopIter[forloop.key];\n' +
parser.compile.call(this, indent + ' ');
>>>>>>>
'_context["' + operand1 + '"] = __forloopIter[forloop.key];\n' +
parser.compile.apply(this, [indent + ' ', parentBlock]);
<<<<<<<
' var __output = "";\n' +
parser.compile.apply({ tokens: [value] }, [indent, parentBlock]) + '\n' +
' return __output; })();\n';
=======
' var _output = "";\n' +
parser.compile.call({ tokens: [value] }, indent) + '\n' +
' return _output; })();\n';
>>>>>>>
' var _output = "";\n' +
parser.compile.apply({ tokens: [value] }, [indent, parentBlock]) + '\n' +
' return _output; })();\n';
<<<<<<<
out += '__context.' + macro + ' = function (' + args + ') {\n';
out += ' var __output = "";\n';
out += parser.compile.apply(this, [indent + ' ', parentBlock]);
out += ' return __output;\n';
=======
out += '_context.' + macro + ' = function (' + args + ') {\n';
out += ' var _output = "";\n';
out += parser.compile.call(this, indent + ' ');
out += ' return _output;\n';
>>>>>>>
out += '_context.' + macro + ' = function (' + args + ') {\n';
out += ' var _output = "";\n';
out += parser.compile.apply(this, [indent + ' ', parentBlock]);
out += ' return _output;\n';
<<<<<<<
value += ' var __output = "";\n';
value += parser.compile.apply(this, [indent + ' ', parentBlock]) + '\n';
value += ' return __output;\n';
=======
value += ' var _output = "";\n';
value += parser.compile.call(this, indent + ' ') + '\n';
value += ' return _output;\n';
>>>>>>>
value += ' var _output = "";\n';
value += parser.compile.apply(this, [indent + ' ', parentBlock]) + '\n';
value += ' return _output;\n'; |
<<<<<<<
this.mathField = MathLive.makeMathField(this.mathliveDOM, {
virtualKeyboardMode: 'manual',
onBlur: () => this.showPlaceHolder(),
onFocus: () => this.hidePlaceHolder(),
onContentDidChange: () => {
this.equation = this.mathField.$latex()
this.showHideNonMathElements()
},
locale: 'int',
strings: {
'int': {
"keyboard.tooltip.functions": gettext("Functions"),
"keyboard.tooltip.greek": gettext("Greek Letters"),
"keyboard.tooltip.command": gettext("LaTeX Command Mode"),
"keyboard.tooltip.numeric": gettext("Numeric"),
"keyboard.tooltip.roman": gettext("Symbols and Roman Letters"),
"tooltip.copy to clipboard": gettext("Copy to Clipboard"),
"tooltip.redo": gettext("Redo"),
"tooltip.toggle virtual keyboard": gettext("Toggle Virtual Keyboard"),
"tooltip.undo": gettext("Undo")
}
}
=======
import("mathlive").then(MathLive => {
this.mathField = MathLive.makeMathField(this.mathliveDOM, {
virtualKeyboardMode: 'manual',
onBlur: () => this.showPlaceHolder(),
onFocus: () => this.hidePlaceHolder(),
onContentDidChange: () => {
this.equation = this.mathField.$latex()
this.showHideNonMathElements()
}
})
this.mathField.$latex(this.equation)
this.showPlaceHolder()
this.showHideNonMathElements()
this.dialog.dialogEl.querySelector('#insert-figure-image').addEventListener(
'click',
() => this.selectImage()
)
>>>>>>>
import("mathlive").then(MathLive => {
this.mathField = MathLive.makeMathField(this.mathliveDOM, {
virtualKeyboardMode: 'manual',
onBlur: () => this.showPlaceHolder(),
onFocus: () => this.hidePlaceHolder(),
locale: 'int',
strings: {
'int': {
"keyboard.tooltip.functions": gettext("Functions"),
"keyboard.tooltip.greek": gettext("Greek Letters"),
"keyboard.tooltip.command": gettext("LaTeX Command Mode"),
"keyboard.tooltip.numeric": gettext("Numeric"),
"keyboard.tooltip.roman": gettext("Symbols and Roman Letters"),
"tooltip.copy to clipboard": gettext("Copy to Clipboard"),
"tooltip.redo": gettext("Redo"),
"tooltip.toggle virtual keyboard": gettext("Toggle Virtual Keyboard"),
"tooltip.undo": gettext("Undo")
}
},
onContentDidChange: () => {
this.equation = this.mathField.$latex()
this.showHideNonMathElements()
}
})
this.mathField.$latex(this.equation)
this.showPlaceHolder()
this.showHideNonMathElements()
this.dialog.dialogEl.querySelector('#insert-figure-image').addEventListener(
'click',
() => this.selectImage()
) |
<<<<<<<
this.mathField = MathLive.makeMathField(this.mathliveDOM, {
virtualKeyboardMode: 'manual',
onBlur: () => this.showPlaceHolder(),
onFocus: () => this.hidePlaceHolder(),
locale: 'int',
strings: {
'int': {
"keyboard.tooltip.functions": gettext("Functions"),
"keyboard.tooltip.greek": gettext("Greek Letters"),
"keyboard.tooltip.command": gettext("LaTeX Command Mode"),
"keyboard.tooltip.numeric": gettext("Numeric"),
"keyboard.tooltip.roman": gettext("Symbols and Roman Letters"),
"tooltip.copy to clipboard": gettext("Copy to Clipboard"),
"tooltip.redo": gettext("Redo"),
"tooltip.toggle virtual keyboard": gettext("Toggle Virtual Keyboard"),
"tooltip.undo": gettext("Undo")
}
}
=======
import("mathlive").then(MathLive => {
this.mathField = MathLive.makeMathField(this.mathliveDOM, {
virtualKeyboardMode: 'manual',
onBlur: () => this.showPlaceHolder(),
onFocus: () => this.hidePlaceHolder()
})
this.mathField.$latex(this.equation)
this.showPlaceHolder()
>>>>>>>
import("mathlive").then(MathLive => {
this.mathField = MathLive.makeMathField(this.mathliveDOM, {
virtualKeyboardMode: 'manual',
onBlur: () => this.showPlaceHolder(),
onFocus: () => this.hidePlaceHolder(),
locale: 'int',
strings: {
'int': {
"keyboard.tooltip.functions": gettext("Functions"),
"keyboard.tooltip.greek": gettext("Greek Letters"),
"keyboard.tooltip.command": gettext("LaTeX Command Mode"),
"keyboard.tooltip.numeric": gettext("Numeric"),
"keyboard.tooltip.roman": gettext("Symbols and Roman Letters"),
"tooltip.copy to clipboard": gettext("Copy to Clipboard"),
"tooltip.redo": gettext("Redo"),
"tooltip.toggle virtual keyboard": gettext("Toggle Virtual Keyboard"),
"tooltip.undo": gettext("Undo")
}
}
})
this.mathField.$latex(this.equation)
this.showPlaceHolder() |
<<<<<<<
"settings_JSONPATCH": "readonly",
"transpile_VERSION": "readonly",
"process": "readonly"
=======
"transpile_VERSION":"readonly",
"process": "readonly",
"settings_USE_SERVICE_WORKER": "readonly"
>>>>>>>
"settings_USE_SERVICE_WORKER": "readonly",
"settings_JSONPATCH": "readonly",
"transpile_VERSION": "readonly",
"process": "readonly" |
<<<<<<<
// Link window.isOffline => this.isOffline()
Object.defineProperty(window, 'isOffline', {get: () => this.isOffline()})
}
isOffline() {
return !navigator.onLine || this.ws?.ws?.readyState > 1
=======
this.handleSWUpdate = () => window.location.reload()
>>>>>>>
this.handleSWUpdate = () => window.location.reload()
}
isOffline() {
return !navigator.onLine || this.ws?.ws?.readyState > 1 |
<<<<<<<
var citeprocSys = exports.citeprocSys = function () {
function citeprocSys() {
=======
var citeprocSys = exports.citeprocSys = (function () {
function citeprocSys(cslDB) {
>>>>>>>
var citeprocSys = exports.citeprocSys = function () {
function citeprocSys(cslDB) { |
<<<<<<<
export Group from './Group';
=======
export Subscribe from './Subscribe';
export Status from './Status';
export Profile from './Profile';
>>>>>>>
export Group from './Group';
export Subscribe from './Subscribe';
export Status from './Status';
export Profile from './Profile'; |
<<<<<<<
let newSettings = this.createContextmenuItems(type);
=======
let newSettings = this.contextMenuDefaultSettings;
//add viewer one and viewer two options to pages with multiple viewers
if (this.viewertwo) {
delete newSettings.Load;
//console.log('new settings', newSettings);
newSettings = Object.assign(newSettings, {
'Viewer1': {
'separator_before': false,
'separator_after': false,
'label': 'Load Image to Viewer 1',
'action': () => {
this.loadImageFromTree(0);
}
},
'Viewer2': {
'separator_before': false,
'separator_after': false,
'label': 'Load Image to Viewer 2',
'action': () => {
this.loadImageFromTree(1);
}
}
});
}
>>>>>>>
let newSettings = this.contextMenuDefaultSettings;
//add viewer one and viewer two options to pages with multiple viewers
if (this.viewertwo) {
delete newSettings.Load;
//console.log('new settings', newSettings);
newSettings = Object.assign(newSettings, {
'Viewer1': {
'separator_before': false,
'separator_after': false,
'label': 'Load Image to Viewer 1',
'action': () => {
this.loadImageFromTree(0);
}
},
'Viewer2': {
'separator_before': false,
'separator_after': false,
'label': 'Load Image to Viewer 2',
'action': () => {
this.loadImageFromTree(1);
}
}
});
}
<<<<<<<
elementsDiv.append(`<br><p class = "bisweb-file-import-label" style="font-size:80%; font-style:italic">Currently loaded — ${type}</p>`);
elementsDiv.append($(`<label>Tag Selected Element:</label></br>`));
elementsDiv.append(tagSelectDiv);
=======
loadImageButton.css({'margin' : '10px'});
lab.css({'margin-left' : '10px'});
elementsDiv.append($('<HR>'));
>>>>>>>
elementsDiv.append(`<br><p class = "bisweb-file-import-label" style="font-size:80%; font-style:italic">Currently loaded — ${type}</p>`);
elementsDiv.append($(`<label>Tag Selected Element:</label></br>`));
elementsDiv.append(tagSelectDiv);
loadImageButton.css({'margin' : '10px'});
lab.css({'margin-left' : '10px'});
elementsDiv.append($('<HR>'));
<<<<<<<
let importTaskButton = bis_webfileutil.createFileButton({
'type' : 'info',
'name' : 'Import task file',
'callback' : (f) => {
this.loadStudyTaskData(f);
},
},
{
'title': 'Import task file',
'filters': [
{ 'name': 'Task Files', extensions: ['json'] }
],
'suffix': 'json',
'save': false,
});
let clearTaskButton = bis_webutil.createbutton({ 'name' : 'Clear tasks', 'type' : 'primary' });
clearTaskButton.on('click', () => {
bootbox.confirm({
'message' : 'Clear loaded task data?',
'buttons' : {
'confirm' : {
'label' : 'Yes',
'className' : 'btn-success'
},
'cancel': {
'label' : 'No',
'className' : 'btn-danger'
}
},
'callback' : (result) => {
if (result) { this.graphelement.taskdata = null; }
}
});
this.graphelement.taskdata = null;
});
=======
saveStudyButton.css({ 'margin' : '10px'});
>>>>>>>
let importTaskButton = bis_webfileutil.createFileButton({
'type' : 'info',
'name' : 'Import task file',
'callback' : (f) => {
this.loadStudyTaskData(f);
},
},
{
'title': 'Import task file',
'filters': [
{ 'name': 'Task Files', extensions: ['json'] }
],
'suffix': 'json',
'save': false,
});
let clearTaskButton = bis_webutil.createbutton({ 'name' : 'Clear tasks', 'type' : 'primary' });
clearTaskButton.on('click', () => {
bootbox.confirm({
'message' : 'Clear loaded task data?',
'buttons' : {
'confirm' : {
'label' : 'Yes',
'className' : 'btn-success'
},
'cancel': {
'label' : 'No',
'className' : 'btn-danger'
}
},
'callback' : (result) => {
if (result) { this.graphelement.taskdata = null; }
}
});
this.graphelement.taskdata = null;
});
saveStudyButton.css({ 'margin' : '10px'});
<<<<<<<
<option value='none'></option>
<option value='anatomical'>Anatomical</option>
<option value='functional'>Functional</option>
<option value='diffusion'>Diffusion</option>
<option value='localizer'>Localizer</option>
</select>`
);
=======
<option value='image'>Image</option>
<option value='task'>Task Run</option>
<option value='rest'>Rest Run</option>
<option value='dwi'>DWI</option>
<option value='3danat'>3DAnat</option>
<option value='2danat'>2DAnat</option>
</select>`);
let tagSelectMenu2=$(`<select class='form-control' disabled>
<option value='none'></option>
<option value='1'>1</option>
<option value='2'>2</option>
<option value='3'>3</option>
<option value='4'>4</option>
<option value='5'>5</option>
<option value='6'>6</option>
<option value='7'>7</option>
<option value='8'>8</option>
<option value='9'>9</option>
</select>`);
>>>>>>>
<option value='image'>Image</option>
<option value='task'>Task Run</option>
<option value='rest'>Rest Run</option>
<option value='dwi'>DWI</option>
<option value='3danat'>3DAnat</option>
<option value='2danat'>2DAnat</option>
</select>`);
let tagSelectMenu2=$(`<select class='form-control' disabled>
<option value='none'></option>
<option value='1'>1</option>
<option value='2'>2</option>
<option value='3'>3</option>
<option value='4'>4</option>
<option value='5'>5</option>
<option value='6'>6</option>
<option value='7'>7</option>
<option value='8'>8</option>
<option value='9'>9</option>
</select>`);
<<<<<<<
=======
// console.log('item', item, 'parent node', parentNode);
>>>>>>> |
<<<<<<<
=======
// DICOM
>>>>>>>
// DICOM
<<<<<<<
/**
* Iteratively scans for a free port on the user's system.
*
* @param {Number} port - The port to start scanning from, typically the number of the control socket. Increments each time the function finds an in-use port.
* @returns A promise that will resolve a free port, or reject with an error.
*/
findFreePort(port) {
return new Promise( (resolve, reject) => {
let currentPort = port;
let testServer = new net.Server();
let searchPort = () => {
currentPort = currentPort + 1;
if (currentPort > port + 20) { reject('timed out scanning ports'); }
console.log('checking port', currentPort);
try {
testServer.listen(currentPort, 'localhost');
testServer.on('error', (e) => {
if (e.code === 'EADDRINUSE') {
testServer.close();
searchPort();
} else {
reject(e);
}
});
testServer.on('listening', () => {
testServer.close();
resolve(currentPort);
});
} catch(e) {
console.log('catch', e);
}
};
searchPort();
});
}
=======
>>>>>>>
/**
* Iteratively scans for a free port on the user's system.
*
* @param {Number} port - The port to start scanning from, typically the number of the control socket. Increments each time the function finds an in-use port.
* @returns A promise that will resolve a free port, or reject with an error.
*/
findFreePort(port) {
return new Promise( (resolve, reject) => {
let currentPort = port;
let testServer = new net.Server();
let searchPort = () => {
currentPort = currentPort + 1;
if (currentPort > port + 20) { reject('timed out scanning ports'); }
console.log('checking port', currentPort);
try {
testServer.listen(currentPort, 'localhost');
testServer.on('error', (e) => {
if (e.code === 'EADDRINUSE') {
testServer.close();
searchPort();
} else {
reject(e);
}
});
testServer.on('listening', () => {
testServer.close();
resolve(currentPort);
});
} catch(e) {
console.log('catch', e);
}
};
searchPort();
});
} |
<<<<<<<
// extract a multi-line string from a comment within a function.
// @param f {Function} eg function () { /* [[[...content...]]] */ }
// @returns {String} eg "content"
var textFromFunction = function(f) {
var str = f.toString().match(/\[\[\[([\S\s]*)\]\]\]/m)[1];
// remove line number comments added by linker
str = str.replace(/[ ]*\/\/ \d+$/gm, '');
return str;
};
Tinytest.add('spacebars-tests - template_tests - #markdown - basic', function (test) {
=======
Tinytest.addAsync('spacebars - templates - #markdown - basic', function (test, onComplete) {
>>>>>>>
Tinytest.addAsync('spacebars-tests - template_tests - #markdown - basic', function (test, onComplete) {
<<<<<<<
test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(textFromFunction(function () { /*
[[[<p><i>hi</i>
/each}}</p>
<p><b><i>hi</i></b>
<b>/each}}</b></p>
<ul>
<li><i>hi</i></li>
<li><p>/each}}</p></li>
<li><p><b><i>hi</i></b></p></li>
<li><b>/each}}</b></li>
</ul>
<p>some paragraph to fix showdown's four space parsing below.</p>
<pre><code><i>hi</i>
/each}}
<b><i>hi</i></b>
<b>/each}}</b>
</code></pre>
<p>&gt</p>
<ul>
<li>&gt</li>
</ul>
<p><code>&gt</code></p>
<pre><code>&gt
</code></pre>
<p>></p>
<ul>
<li>></li>
</ul>
<p><code>&gt;</code></p>
<pre><code>&gt;
</code></pre>
<p><code><i>hi</i></code>
<code>/each}}</code></p>
<p><code><b><i>hi</i></b></code>
<code><b>/each}}</code></p>]]] */
})));
});
Tinytest.add('spacebars-tests - template_tests - #markdown - if', function (test) {
var tmpl = Template.spacebars_template_test_markdown_if;
var R = new ReactiveVar(false);
tmpl.cond = function () { return R.get(); };
var div = renderToDiv(tmpl);
test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(textFromFunction(function () { /*
[[[<p>false</p>
<p><b>false</b></p>
<ul>
<li><p>false</p></li>
<li><p><b>false</b></p></li>
</ul>
<p>some paragraph to fix showdown's four space parsing below.</p>
<pre><code>false
<b>false</b>
</code></pre>
<p><code>false</code></p>
<p><code><b>false</b></code></p>]]] */
})));
R.set(true);
Deps.flush();
test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(textFromFunction(function () { /*
[[[<p>true</p>
<p><b>true</b></p>
<ul>
<li><p>true</p></li>
<li><p><b>true</b></p></li>
</ul>
<p>some paragraph to fix showdown's four space parsing below.</p>
<pre><code>true
<b>true</b>
</code></pre>
<p><code>true</code></p>
=======
>>>>>>>
<<<<<<<
Tinytest.add('spacebars-tests - template_tests - #markdown - each', function (test) {
var tmpl = Template.spacebars_template_test_markdown_each;
var R = new ReactiveVar([]);
tmpl.seq = function () { return R.get(); };
var div = renderToDiv(tmpl);
test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(textFromFunction(function () { /*
[[[<p><b></b></p>
<ul>
<li></li>
<li><b></b></li>
</ul>
<p>some paragraph to fix showdown's four space parsing below.</p>
<pre><code><b></b>
</code></pre>
<p>``</p>
<p><code><b></b></code></p>]]] */
})));
R.set(["item"]);
Deps.flush();
test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(textFromFunction(function () { /*
[[[<p>item</p>
<p><b>item</b></p>
=======
testAsyncMulti('spacebars - templates - #markdown - if', [
function (test, expect) {
var self = this;
Meteor.call("getAsset", "markdown_if1.html", expect(function (err, html) {
test.isFalse(err);
self.html1 = html;
}));
Meteor.call("getAsset", "markdown_if2.html", expect(function (err, html) {
test.isFalse(err);
self.html2 = html;
}));
},
>>>>>>>
testAsyncMulti('spacebars-tests - template_tests - #markdown - if', [
function (test, expect) {
var self = this;
Meteor.call("getAsset", "markdown_if1.html", expect(function (err, html) {
test.isFalse(err);
self.html1 = html;
}));
Meteor.call("getAsset", "markdown_if2.html", expect(function (err, html) {
test.isFalse(err);
self.html2 = html;
}));
}, |
<<<<<<<
// headers: extra headers to send on the websockets connection, for
// server-to-server DDP only
=======
// onDDPNegotiationVersionFailure: callback when version negotiation fails.
>>>>>>>
// headers: extra headers to send on the websockets connection, for
// server-to-server DDP only
// onDDPNegotiationVersionFailure: callback when version negotiation fails.
<<<<<<<
self._stream = new LivedataTest.ClientStream(url, {
headers: options.headers
});
=======
self._stream = new LivedataTest.ClientStream(url, {
retry: options.retry
});
>>>>>>>
self._stream = new LivedataTest.ClientStream(url, {
retry: options.retry,
headers: options.headers
});
<<<<<<<
DDP.connect = function (url, _reloadOnUpdate, _headers) {
if (typeof _reloadOnUpdate === "object" && _headers === undefined) {
_headers = _reloadOnUpdate;
_reloadOnUpdate = false;
}
var ret = new Connection(
url,
{
reloadOnUpdate: _reloadOnUpdate,
headers: _headers
}
);
=======
DDP.connect = function (url, options) {
var ret = new Connection(url, options);
>>>>>>>
DDP.connect = function (url, options) {
var ret = new Connection(url, options); |
<<<<<<<
// Given an arbitrary Mongo-style query selector, return an expression
// that evaluates to true if the document in 'doc' matches the
// selector, else false.
LocalCollection._exprForSelector = function (selector, literals) {
var clauses = [];
for (var key in selector) {
var value = selector[key];
if (key.substr(0, 1) === '$') { // no indexing into strings on IE7
// whole-document predicate like {$or: [{x: 12}, {y: 12}]}
clauses.push(LocalCollection._exprForDocumentPredicate(key, value, literals));
} else {
// else, it's a constraint on a particular key (or dotted keypath)
clauses.push(LocalCollection._exprForKeypathPredicate(key, value, literals));
}
};
if (clauses.length === 0) return 'true'; // selector === {}
return '(' + clauses.join('&&') +')';
};
// 'op' is a top-level, whole-document predicate from a mongo
// selector, like '$or' in {$or: [{x: 12}, {y: 12}]}. 'value' is its
// value in the selector. Return an expression that evaluates to true
// if 'doc' matches this predicate, else false.
LocalCollection._exprForDocumentPredicate = function (op, value, literals) {
if (op === '$or' || op === '$and' || op === '$nor') {
if (_.isEmpty(value) || !_.isArray(value))
throw Error("$and/$or/$nor must be a nonempty array");
}
var clauses;
if (op === '$or') {
clauses = _.map(value, function (c) {
return LocalCollection._exprForSelector(c, literals);
});
return '(' + clauses.join('||') +')';
}
if (op === '$and') {
clauses = _.map(value, function (c) {
return LocalCollection._exprForSelector(c, literals);
});
return '(' + clauses.join('&&') +')';
}
if (op === '$nor') {
clauses = _.map(value, function (c) {
return "!(" + LocalCollection._exprForSelector(c, literals) + ")";
});
return '(' + clauses.join('&&') +')';
}
if (op === '$where') {
if (value instanceof Function) {
literals.push(value);
return 'literals[' + (literals.length - 1) + '].call(doc)';
}
return "(function(){return " + value + ";}).call(doc)";
}
throw Error("Unrecognized key in selector: ", op);
}
// Given a single 'dotted.key.path: value' constraint from a Mongo
// query selector, return an expression that evaluates to true if the
// document in 'doc' matches the constraint, else false.
LocalCollection._exprForKeypathPredicate = function (keypath, value, literals) {
var keyparts = keypath.split('.');
// get the inner predicate expression
var predcode = '';
if (value instanceof RegExp) {
predcode = LocalCollection._exprForOperatorTest(value, literals);
} else if ( !(typeof value === 'object')
|| value === null
|| value instanceof Array) {
// it's something like {x.y: 12} or {x.y: [12]}
predcode = LocalCollection._exprForValueTest(value, literals);
} else {
// is it a literal document or a bunch of $-expressions?
var is_literal = true;
for (var k in value) {
if (k.substr(0, 1) === '$') { // no indexing into strings on IE7
is_literal = false;
break;
=======
// Is this selector just shorthand for lookup by _id?
LocalCollection._selectorIsId = function (selector) {
return (typeof selector === "string") || (typeof selector === "number");
};
// Give a sort spec, which can be in any of these forms:
// {"key1": 1, "key2": -1}
// [["key1", "asc"], ["key2", "desc"]]
// ["key1", ["key2", "desc"]]
//
// (.. with the first form being dependent on the key enumeration
// behavior of your javascript VM, which usually does what you mean in
// this case if the key names don't look like integers ..)
//
// return a function that takes two objects, and returns -1 if the
// first object comes first in order, 1 if the second object comes
// first, or 0 if neither object comes before the other.
LocalCollection._compileSort = function (spec) {
var sortSpecParts = [];
if (spec instanceof Array) {
for (var i = 0; i < spec.length; i++) {
if (typeof spec[i] === "string") {
sortSpecParts.push({
lookup: makeLookupFunction(spec[i]),
ascending: true
});
} else {
sortSpecParts.push({
lookup: makeLookupFunction(spec[i][0]),
ascending: spec[i][1] !== "desc"
});
>>>>>>>
// Give a sort spec, which can be in any of these forms:
// {"key1": 1, "key2": -1}
// [["key1", "asc"], ["key2", "desc"]]
// ["key1", ["key2", "desc"]]
//
// (.. with the first form being dependent on the key enumeration
// behavior of your javascript VM, which usually does what you mean in
// this case if the key names don't look like integers ..)
//
// return a function that takes two objects, and returns -1 if the
// first object comes first in order, 1 if the second object comes
// first, or 0 if neither object comes before the other.
LocalCollection._compileSort = function (spec) {
var sortSpecParts = [];
if (spec instanceof Array) {
for (var i = 0; i < spec.length; i++) {
if (typeof spec[i] === "string") {
sortSpecParts.push({
lookup: makeLookupFunction(spec[i]),
ascending: true
});
} else {
sortSpecParts.push({
lookup: makeLookupFunction(spec[i][0]),
ascending: spec[i][1] !== "desc"
});
<<<<<<<
lastPartWasNumber = thisPartIsNumber;
}
return ret;
};
// Given a value, return an expression that evaluates to true if the
// value in 'x' matches the value, or else false. This includes
// searching 'x' if it is an array. This doesn't include regular
// expressions (that's because mongo's $not operator works with
// regular expressions but not other kinds of scalar tests.)
LocalCollection._exprForValueTest = function (value, literals) {
var expr;
if (value === null) {
// null has special semantics
// http://www.mongodb.org/display/DOCS/Querying+and+nulls
expr = 'x===null||x===undefined';
} else if (typeof value === 'string' ||
typeof value === 'number' ||
typeof value === 'boolean') {
// literal scalar value
// XXX object ids, dates, timestamps?
expr = 'x===' + JSON.stringify(value);
} else if (typeof value === 'function') {
// note that typeof(/a/) === 'function' in javascript
// XXX improve error
throw Error("Bad value type in query");
} else if (value.serializeForEval) {
expr = 'f._equal(x,' + value.serializeForEval() + ')';
=======
>>>>>>> |
<<<<<<<
(function(window, videojs) {
'use strict';
var Playlist = {
/**
* The number of segments that are unsafe to start playback at in
* a live stream. Changing this value can cause playback stalls.
* See HTTP Live Streaming, "Playing the Media Playlist File"
* https://tools.ietf.org/html/draft-pantos-http-live-streaming-18#section-6.3.3
*/
UNSAFE_LIVE_SEGMENTS: 3
};
var duration, intervalDuration, backwardDuration, forwardDuration, seekable;
backwardDuration = function(playlist, endSequence) {
var result = 0, segment, i;
i = endSequence - playlist.mediaSequence;
// if a start time is available for segment immediately following
// the interval, use it
=======
import {createTimeRange} from 'video.js';
const backwardDuration = function(playlist, endSequence) {
let result = 0;
let i = endSequence - playlist.mediaSequence;
// if a start time is available for segment immediately following
// the interval, use it
let segment = playlist.segments[i];
// Walk backward until we find the latest segment with timeline
// information that is earlier than endSequence
if (segment) {
if (typeof segment.start !== 'undefined') {
return { result: segment.start, precise: true };
}
if (typeof segment.end !== 'undefined') {
return {
result: segment.end - segment.duration,
precise: true
};
}
}
while (i--) {
>>>>>>>
import {createTimeRange} from 'video.js';
let Playlist = {
/**
* The number of segments that are unsafe to start playback at in
* a live stream. Changing this value can cause playback stalls.
* See HTTP Live Streaming, "Playing the Media Playlist File"
* https://tools.ietf.org/html/draft-pantos-http-live-streaming-18#section-6.3.3
*/
UNSAFE_LIVE_SEGMENTS: 3
};
const backwardDuration = function(playlist, endSequence) {
let result = 0;
let i = endSequence - playlist.mediaSequence;
// if a start time is available for segment immediately following
// the interval, use it
let segment = playlist.segments[i];
// Walk backward until we find the latest segment with timeline
// information that is earlier than endSequence
if (segment) {
if (typeof segment.start !== 'undefined') {
return { result: segment.start, precise: true };
}
if (typeof segment.end !== 'undefined') {
return {
result: segment.end - segment.duration,
precise: true
};
}
}
while (i--) {
<<<<<<<
// live playlists should not expose three segment durations worth
// of content from the end of the playlist
// https://tools.ietf.org/html/draft-pantos-http-live-streaming-16#section-6.3.3
start = intervalDuration(playlist, playlist.mediaSequence);
end = intervalDuration(playlist,
playlist.mediaSequence +
Math.max(0, playlist.segments.length - Playlist.UNSAFE_LIVE_SEGMENTS));
return videojs.createTimeRange(start, end);
};
// exports
Playlist.duration = duration;
Playlist.seekable = seekable;
videojs.Hls.Playlist = Playlist;
})(window, window.videojs);
=======
// calculate the total duration based on the segment durations
return intervalDuration(playlist,
endSequence,
includeTrailingTime);
};
/**
* Calculates the interval of time that is currently seekable in a
* playlist. The returned time ranges are relative to the earliest
* moment in the specified playlist that is still available. A full
* seekable implementation for live streams would need to offset
* these values by the duration of content that has expired from the
* stream.
* @param playlist {object} a media playlist object
* @return {TimeRanges} the periods of time that are valid targets
* for seeking
*/
export const seekable = function(playlist) {
let start;
let end;
// without segments, there are no seekable ranges
if (!playlist.segments) {
return createTimeRange();
}
// when the playlist is complete, the entire duration is seekable
if (playlist.endList) {
return createTimeRange(0, duration(playlist));
}
// live playlists should not expose three segment durations worth
// of content from the end of the playlist
// https://tools.ietf.org/html/draft-pantos-http-live-streaming-16#section-6.3.3
start = intervalDuration(playlist, playlist.mediaSequence);
end = intervalDuration(playlist,
playlist.mediaSequence +
Math.max(0, playlist.segments.length - 3));
return createTimeRange(start, end);
};
// exports
export default {
duration,
seekable
};
>>>>>>>
// calculate the total duration based on the segment durations
return intervalDuration(playlist,
endSequence,
includeTrailingTime);
};
/**
* Calculates the interval of time that is currently seekable in a
* playlist. The returned time ranges are relative to the earliest
* moment in the specified playlist that is still available. A full
* seekable implementation for live streams would need to offset
* these values by the duration of content that has expired from the
* stream.
* @param playlist {object} a media playlist object
* @return {TimeRanges} the periods of time that are valid targets
* for seeking
*/
export const seekable = function(playlist) {
let start;
let end;
// without segments, there are no seekable ranges
if (!playlist.segments) {
return createTimeRange();
}
// when the playlist is complete, the entire duration is seekable
if (playlist.endList) {
return createTimeRange(0, duration(playlist));
}
// live playlists should not expose three segment durations worth
// of content from the end of the playlist
// https://tools.ietf.org/html/draft-pantos-http-live-streaming-16#section-6.3.3
start = intervalDuration(playlist, playlist.mediaSequence);
end = intervalDuration(playlist,
playlist.mediaSequence +
Math.max(0, playlist.segments.length - Playlist.UNSAFE_LIVE_SEGMENTS));
return createTimeRange(start, end);
};
Playlist.duration = duration;
Playlist.seekable = seekable;
// exports
export default Playlist; |
<<<<<<<
////////// Requires //////////
var fs = Npm.require("fs");
var http = Npm.require("http");
var os = Npm.require("os");
var path = Npm.require("path");
var url = Npm.require("url");
var crypto = Npm.require("crypto");
var net = Npm.require("net");
var connect = Npm.require('connect');
var parseurl = Npm.require('parseurl');
var useragent = Npm.require('useragent');
var send = Npm.require('send');
var Future = Npm.require('fibers/future');
var Fiber = Npm.require('fibers');
=======
import assert from "assert";
import { readFile } from "fs";
import { createServer } from "http";
import {
join as pathJoin,
dirname as pathDirname,
} from "path";
import { parse as parseUrl } from "url";
import { createHash } from "crypto";
import connect from "connect";
import parseRequest from "parseurl";
import { lookup as lookupUserAgent } from "useragent";
import send from "send";
>>>>>>>
import assert from "assert";
import { readFile } from "fs";
import { createServer } from "http";
import {
join as pathJoin,
dirname as pathDirname,
} from "path";
import { parse as parseUrl } from "url";
import { createHash } from "crypto";
import connect from "connect";
import parseRequest from "parseurl";
import { lookup as lookupUserAgent } from "useragent";
import send from "send";
import net from "net";
<<<<<<<
var runWebAppServer = function () {
=======
// parse port to see if its a Windows Server style named pipe. If so, return as-is (String), otherwise return as Int
WebAppInternals.parsePort = function (port) {
if( /\\\\?.+\\pipe\\?.+/.test(port) ) {
return port;
}
return parseInt(port);
};
function runWebAppServer() {
>>>>>>>
function runWebAppServer() {
<<<<<<<
=======
httpServer.listen(localPort, localIp, Meteor.bindEnvironment(function() {
if (process.env.METEOR_PRINT_ON_LISTEN) {
console.log("LISTENING"); // must match run-app.js
}
>>>>>>> |
<<<<<<<
f['throw'](new TestFailure('junk-before', { run: self.run }));
=======
f['throw'](new TestFailure(
'junk-before', { run: self.run, pattern: self.matchPattern }));
>>>>>>>
Console.info("Extra junk is: ", self.buf.substr(0, m.index));
f['throw'](new TestFailure(
'junk-before', { run: self.run, pattern: self.matchPattern }));
<<<<<<<
f['throw'](new TestFailure('junk-before', { run: self.run }));
=======
f['throw'](new TestFailure('junk-before',
{ run: self.run, pattern: self.matchPattern }));
>>>>>>>
Console.info("Extra junk is: ", self.buf.substr(0, i));
f['throw'](new TestFailure('junk-before',
{ run: self.run, pattern: self.matchPattern })); |
<<<<<<<
// Takes in two meteor versions. Returns 0 if equal, 1 if v1 is greater, -1 if
// v2 is greater. Versions are strings or PackageVersion objects.
=======
// Takes in two meteor versions. Returns 0 if equal, a positive number if v1
// is greater, a negative number if v2 is greater.
>>>>>>>
// Takes in two meteor versions. Returns 0 if equal, a positive number if v1
// is greater, a negative number if v2 is greater.
// Versions are strings or PackageVersion objects. |
<<<<<<<
/**
* Returns an array of team member's photos and stuff.
*/
function getTeam (seed) {
var ratio = Math.min(random(seed), random(seed * 2));
var size = randomInt(seed * 4, 2, 8);
var girlCount = Math.floor(size * ratio);
var guyCount = size - girlCount;
var girls = someChoices(seed, females, girlCount);
var guys = someChoices(seed, males, guyCount);
var mult = 3;
var results = [];
var m = 0;
var f = 0;
while (m < guyCount || f < girlCount) {
if (random(seed * mult + 1) > 0.5 && f < girlCount) {
// Add the next girl
var name = getFemaleName(seed * mult);
var photo = femaleRoot + girls[f];
results.push({'name': name, 'photo': photo});
f++;
} else if (m < guyCount) {
// Add the next guy
var name = getMaleName(seed * mult);
var photo = maleRoot + guys[m];
results.push({'name': name, 'photo': photo});
m++;
}
mult *= 3;
}
return results;
}
function getMaleName (seed) {
return "Adam Smith";
}
function getFemaleName (seed) {
return "Kayla McAllison";
}
=======
function removeLastVowel (seed) {
var word = commonWord(seed);
if (word.length <= 4) {
return word;
}
var lastVowel = -1;
for (var i = 0; i < word.length; i++) {
if (word[i] == 'a' || word[i] == 'e' || word[i] == 'i' || word[i] == 'o' || word[i] == 'u' || word[i] == 'y') {
lastVowel = i;
}
}
if (lastVowel > -1) {
return word.slice(0, lastVowel) + word.slice(lastVowel + 1);
} else {
return word;
}
}
>>>>>>>
/**
* Returns an array of team member's photos and stuff.
*/
function getTeam (seed) {
var ratio = Math.min(random(seed), random(seed * 2));
var size = randomInt(seed * 4, 2, 8);
var girlCount = Math.floor(size * ratio);
var guyCount = size - girlCount;
var girls = someChoices(seed, females, girlCount);
var guys = someChoices(seed, males, guyCount);
var mult = 3;
var results = [];
var m = 0;
var f = 0;
while (m < guyCount || f < girlCount) {
if (random(seed * mult + 1) > 0.5 && f < girlCount) {
// Add the next girl
var name = getFemaleName(seed * mult);
var photo = femaleRoot + girls[f];
results.push({'name': name, 'photo': photo});
f++;
} else if (m < guyCount) {
// Add the next guy
var name = getMaleName(seed * mult);
var photo = maleRoot + guys[m];
results.push({'name': name, 'photo': photo});
m++;
}
mult *= 3;
}
return results;
}
function getMaleName (seed) {
return "Adam Smith";
}
function getFemaleName (seed) {
return "Kayla McAllison";
}
function removeLastVowel (seed) {
var word = commonWord(seed);
if (word.length <= 4) {
return word;
}
var lastVowel = -1;
for (var i = 0; i < word.length; i++) {
if (word[i] == 'a' || word[i] == 'e' || word[i] == 'i' || word[i] == 'o' || word[i] == 'u' || word[i] == 'y') {
lastVowel = i;
}
}
if (lastVowel > -1) {
return word.slice(0, lastVowel) + word.slice(lastVowel + 1);
} else {
return word;
}
} |
<<<<<<<
var mexpContentView = wp.media.view.ME,
flagAjaxExecutions = '';
=======
var emmContentView = wp.media.view.EMM
flagAjaxExecutions = '',
isInfiniteScroll = false;
>>>>>>>
var mexpContentView = wp.media.view.ME,
flagAjaxExecutions = '',
isInfiniteScroll = false;
<<<<<<<
params.startIndex = jQuery( '.mexp-item' ).length;
=======
if ( undefined === pageToken ) {
isInfiniteScroll = false;
jQuery( '.tab-all #page_token' ).val( '' );
params.page_token = '';
} else {
isInfiniteScroll = true;
}
console.log(params);
params.startIndex = jQuery( '.emm-item' ).length;
>>>>>>>
if ( undefined === pageToken ) {
isInfiniteScroll = false;
jQuery( '.tab-all #page_token' ).val( '' );
params.page_token = '';
} else {
isInfiniteScroll = true;
}
params.startIndex = jQuery( '.mexp-item' ).length;
<<<<<<<
this.$el.find( '.mexp-pagination' ).show();
this.model.set( 'max_id', response.meta.max_id );
=======
>>>>>>> |
<<<<<<<
userid: config.opt.app_uid,
chroot_base: config.opt.node_base_folder,
=======
userid: config.opt.userid,
>>>>>>>
userid: config.opt.app_uid,
chroot_base: config.opt.node_base_folder,
<<<<<<<
console.log('Writing config data: ', path.join(configData.apprwfolder, '.nodester', 'config.json'));
fs.writeFileSync(path.join(configData.apprwfolder, '.nodester', 'config.json'), JSON.stringify(configData), encoding='utf8'); // TODO Change to ASYNC
lib.setup_unionfs_chroot(configData.chroot_base, configData.apphome, configData.apprwfolder, configData.appchroot, function (resp) {
if (resp == true) {
var cmd = 'cd ' + app_home + ' && sudo ' + path.join(config.opt.app_dir, 'scripts', 'chroot_runner.js');
console.log(cmd);
exec(cmd, function (error, stdout, stderr) {
if (stdout) {
console.log(stdout);
=======
console.log('Writing config data: ', path.join(app_home, '.nodester', 'config.json'));
fs.writeFileSync(path.join(app_home, '.nodester', 'config.json'), JSON.stringify(configData), encoding='utf8');
//var cmd = "sudo " + path.join(config.opt.app_dir, 'scripts', 'launch_app.sh') + ' ' + config.opt.app_dir + ' ' + config.opt.userid + ' ' + app_home + ' ' + app.start + ' ' + app.port + ' ' + '127.0.0.1' + ' ' + doc.appname;
// var cmd = 'cd ' + app_home + ' && sudo ' + path.join(config.opt.app_dir, 'scripts', 'launch_chrooted_app.js') + ' "' + doc.username + '/' + repo_id + '/' + doc.appname + '/' + app.start + ':' + app.port + '"';
var cmd = 'cd ' + app_home + ' && ulimit -c unlimited -n 65000 -u 100000 -i 1000000 -l 10240 -s 102400 && sudo ' + path.join(config.opt.app_dir, 'scripts', 'launch_chrooted_app.js') + ' "' + doc.username + '/' + repo_id + '/' + doc.appname + '/' + app.start + ':' + app.port + '"';
console.log(cmd);
exec(cmd, function (error, stdout, stderr) {
if (stdout) {
console.log(stdout);
}
if (stderr) {
console.log(stderr);
}
console.log('Getting new PID');
console.log("ps aux | awk '/" + repo_id + "/ && !/awk |curl / {print $2}'");
exec("ps aux | awk '/" + repo_id + "/ && !/awk |curl / {print $2}'", function(err, pid) {
console.log('PID: "' + pid + '"');
var tapp = {
pid: 'unknown',
running: 'failed-to-start'
};
var pids = pid.split('\n');
var p = parseInt(pids[0]);
if (p > 0) {
tapp.pid = p;
tapp.running = 'true';
>>>>>>>
console.log('Writing config data: ', path.join(configData.apprwfolder, '.nodester', 'config.json'));
fs.writeFileSync(path.join(configData.apprwfolder, '.nodester', 'config.json'), JSON.stringify(configData), encoding='utf8'); // TODO Change to ASYNC
lib.setup_unionfs_chroot(configData.chroot_base, configData.apphome, configData.apprwfolder, configData.appchroot, function (resp) {
if (resp == true) {
var cmd = 'cd ' + app_home + ' && ulimit -c unlimited -n 65000 -u 100000 -i 1000000 -l 10240 -s 102400 && sudo ' + path.join(config.opt.app_dir, 'scripts', 'chroot_runner.js');
console.log(cmd);
exec(cmd, function (error, stdout, stderr) {
if (stdout) {
console.log(stdout); |
<<<<<<<
var leaderboard_elt = $('<div class="leaderboard"></div>')[0];
Meteor.ui.renderList(Players, leaderboard_elt, {
=======
var scores = Sky.ui.renderList(Players, {
>>>>>>>
var scores = Meteor.ui.renderList(Players, {
<<<<<<<
if (Meteor.is_server) {
=======
// If you don't want your server code to be sent to the client
// (probably a good thing to avoid), you can just put it in a
// subdirectory named 'server'.
if (Sky.is_server) {
>>>>>>>
// If you don't want your server code to be sent to the client
// (probably a good thing to avoid), you can just put it in a
// subdirectory named 'server'.
if (Meteor.is_server) { |
<<<<<<<
daemon.setreuid(config.userid);
log('User Changed: ' + process.getuid());
=======
daemon.setreuid(config.userid);
console.log('User Changed: ', process.getuid());
>>>>>>>
daemon.setreuid(config.userid);
log('User Changed: ' + process.getuid());
<<<<<<<
//Setup the errorlog
process.on('uncaughtException', function (err) {
fs.write(error_log_fd, err.stack);
});
=======
//Setup the errorlog
var error_log_fd = fs.openSync('/error.log', 'w');
process.on('uncaughtException', function (err) {
fs.write(error_log_fd, err.stack);
});
>>>>>>>
process.on('uncaughtException', function (err) {
fs.write(error_log_fd, err.stack);
});
<<<<<<<
sandbox.require.paths = ['/node_modules','/.node_libraries'];
=======
sandbox.require.paths = ['/.node_libraries', '/node_modules'];
>>>>>>>
sandbox.require.paths = ['/node_modules','/.node_libraries'];
<<<<<<<
//Just to make sure the process is owned by the right users (overkill)
daemon.setreuid(config.userid);
console.log('Final user check (overkill)', process.getuid());
=======
var resp = daemon.setreuid(config.userid);
console.log('Final user check: ', process.getuid());
>>>>>>>
var resp = daemon.setreuid(config.userid);
console.log('Final user check: ', process.getuid()); |
<<<<<<<
'mongo-livedata',
'package-version-parser',
'boilerplate-generator',
'webapp-hashing'
=======
'mongo',
'package-version-parser'
>>>>>>>
'mongo',
'package-version-parser',
'boilerplate-generator',
'webapp-hashing' |
<<<<<<<
if (tag.type === 'BLOCKOPEN' &&
builtInBlockHelpers.hasOwnProperty(path[0])) {
// if, unless, with, each.
//
// If someone tries to do `{{> if}}`, we don't
// get here, but an error is thrown when we try to codegen the path.
// Note: If we caught these errors earlier, while scanning, we'd be able to
// provide nice line numbers.
if (path.length > 1)
throw new Error("Unexpected dotted path beginning with " + path[0]);
if (! tag.args.length)
throw new Error("#" + path[0] + " requires an argument");
var info = codeGenInclusionArgs(tag);
var dataFunc = info.dataFuncCode; // must exist (tag.args.length > 0)
var contentBlock = info.extraArgs.content; // must exist
var elseContentBlock = info.extraArgs.elseContent; // may not exist
var callArgs = [dataFunc, contentBlock];
if (elseContentBlock)
callArgs.push(elseContentBlock);
return HTML.EmitCode(
builtInBlockHelpers[path[0]] + '(' + callArgs.join(', ') + ')');
} else {
var compCode = codeGenPath(path);
if (path.length === 1) {
// toObjectLiteralKey returns `"foo"` or `foo` depending on
// whether `foo` is a safe JavaScript identifier.
var member = toObjectLiteralKey(path[0]);
var templateDotFoo = (member.charAt(0) === '"' ?
'Template[' + member + ']' :
'Template.' + member);
compCode = ('(' + templateDotFoo + ' || ' + compCode + ')');
} else {
// path code may be reactive; wrap it
compCode = 'function () { return ' + compCode + '; }';
}
=======
var compCode;
if (path.length === 1 && builtInComponents.hasOwnProperty(path[0])) {
compCode = builtInComponents[path[0]];
} else {
compCode = codeGenPath(path, {lookupTemplate: true});
}
>>>>>>>
if (tag.type === 'BLOCKOPEN' &&
builtInBlockHelpers.hasOwnProperty(path[0])) {
// if, unless, with, each.
//
// If someone tries to do `{{> if}}`, we don't
// get here, but an error is thrown when we try to codegen the path.
// Note: If we caught these errors earlier, while scanning, we'd be able to
// provide nice line numbers.
if (path.length > 1)
throw new Error("Unexpected dotted path beginning with " + path[0]);
if (! tag.args.length)
throw new Error("#" + path[0] + " requires an argument");
var info = codeGenInclusionArgs(tag);
var dataFunc = info.dataFuncCode; // must exist (tag.args.length > 0)
var contentBlock = info.extraArgs.content; // must exist
var elseContentBlock = info.extraArgs.elseContent; // may not exist
var callArgs = [dataFunc, contentBlock];
if (elseContentBlock)
callArgs.push(elseContentBlock);
return HTML.EmitCode(
builtInBlockHelpers[path[0]] + '(' + callArgs.join(', ') + ')');
} else {
var compCode = codeGenPath(path, {lookupTemplate: true});
if (path.length !== 1) {
// path code may be reactive; wrap it
compCode = 'function () { return ' + compCode + '; }';
}
<<<<<<<
var codeGenPath = function (path) {
if (builtInBlockHelpers.hasOwnProperty(path[0]))
throw new Error("Can't use the built-in '" + path[0] + "' here");
// Let `{{#if content}}` check whether this template was invoked via
// inclusion or as a block helper, in addition to supporting
// `{{> content}}`.
if (builtInLexicals.hasOwnProperty(path[0])) {
=======
//
// Options:
//
// - lookupTemplate {Boolean} If true, generated code also looks in
// the list of templates. (After helpers, before data context).
// Used when generating code for `{{> foo}}` or `{{#foo}}`. Only
// used for non-dotted paths.
var codeGenPath = function (path, opts) {
// Let {{#if content}} check whether this template was invoked via
// inclusion or as a block helper.
if (builtInComponents.hasOwnProperty(path[0])) {
>>>>>>>
//
// Options:
//
// - lookupTemplate {Boolean} If true, generated code also looks in
// the list of templates. (After helpers, before data context).
// Used when generating code for `{{> foo}}` or `{{#foo}}`. Only
// used for non-dotted paths.
var codeGenPath = function (path, opts) {
if (builtInBlockHelpers.hasOwnProperty(path[0]))
throw new Error("Can't use the built-in '" + path[0] + "' here");
// Let `{{#if content}}` check whether this template was invoked via
// inclusion or as a block helper, in addition to supporting
// `{{> content}}`.
if (builtInLexicals.hasOwnProperty(path[0])) { |
<<<<<<<
var Selenium = require('./run-selenium.js').Selenium;
=======
var HttpProxy = require('./run-httpproxy.js').HttpProxy;
>>>>>>>
var Selenium = require('./run-selenium.js').Selenium;
var HttpProxy = require('./run-httpproxy.js').HttpProxy; |
<<<<<<<
var http = require('http');
exports.login = function(req, res, next){
users.login(req, res, next);
};
=======
var http = require("http");
>>>>>>>
exports.login = function(req, res, next){
users.login(req, res, next);
}; |
<<<<<<<
// Trims whitespace & other filler characters of a line in a project file.
var trimLine = function (line) {
var match = line.match(/^([^#]*)#/);
if (match)
line = match[1];
line = line.replace(/^\s+|\s+$/g, ''); // leading/trailing whitespace
return line;
};
// Given a set of lines, each of the form "foo@bar", return an object of form
// {foo: "bar", bar: null}. If there is "bar", value of the corresponding key is
// null.
=======
// Given a set of lines, each of the form "foo@bar", return an array of form
// [{packageName: foo, versionConstraint: bar}]. If there is bar,
// versionConstraint is null.
>>>>>>>
// Given a set of lines, each of the form "foo@bar", return an object of form
// {foo: "bar", bar: null}. If there is "bar", value of the corresponding key is
// null.
// Trims whitespace & other filler characters of a line in a project file.
var trimLine = function (line) {
var match = line.match(/^([^#]*)#/);
if (match)
line = match[1];
line = line.replace(/^\s+|\s+$/g, ''); // leading/trailing whitespace
return line;
};
// Given a set of lines, each of the form "foo@bar", return an array of form
// [{packageName: foo, versionConstraint: bar}]. If there is bar,
// versionConstraint is null. |
<<<<<<<
npm: "5.0.4",
"node-gyp": "3.6.2",
"node-pre-gyp": "0.6.36",
"meteor-babel": "0.21.5",
=======
npm: "4.6.1",
"node-gyp": "3.6.0",
"node-pre-gyp": "0.6.34",
"meteor-babel": "0.22.0",
reify: "0.11.24",
>>>>>>>
npm: "5.0.4",
"node-gyp": "3.6.2",
"node-pre-gyp": "0.6.36",
"meteor-babel": "0.22.0", |
<<<<<<<
// == Format of a program when arch is "client.*" ==
=======
// == Format of a program when arch is "web.*" ==
>>>>>>>
// == Format of a program when arch is "web.*" ==
<<<<<<<
// - format: "client-program-pre1" for this version
=======
// - format: "web-program-pre1" for this version
>>>>>>>
// - format: "web-program-pre1" for this version
<<<<<<<
// Something like "client.w3c" or "os" or "os.osx.x86_64"
=======
// Something like "web.browser" or "os" or "os.osx.x86_64"
>>>>>>>
// Something like "web.browser" or "os" or "os.osx.x86_64"
<<<<<<<
var isClient = archinfo.matches(self.arch, "client");
=======
var isWeb = archinfo.matches(self.arch, "web");
>>>>>>>
var isWeb = archinfo.matches(self.arch, "web");
<<<<<<<
if (isClient)
=======
if (isWeb)
>>>>>>>
if (isWeb)
<<<<<<<
if (resource.type === "css" && ! isClient)
=======
if (resource.type === "css" && ! isWeb)
>>>>>>>
if (resource.type === "css" && ! isWeb)
<<<<<<<
if (isClient) {
=======
if (isWeb) {
>>>>>>>
if (isWeb) {
<<<<<<<
if (! isClient)
throw new Error("HTML segments can only go to the client");
=======
if (! isWeb)
throw new Error("HTML segments can only go to the client");
>>>>>>>
if (! isWeb)
throw new Error("HTML segments can only go to the client");
<<<<<<<
if (! archinfo.matches(self.arch, "client"))
throw new Error("ClientTarget targeting something that isn't a client?");
=======
if (! archinfo.matches(self.arch, "web"))
throw new Error("ClientTarget targeting something that isn't a client?");
>>>>>>>
if (! archinfo.matches(self.arch, "web"))
throw new Error("ClientTarget targeting something that isn't a client?");
<<<<<<<
format: "client-program-pre1",
=======
format: "web-program-pre1",
>>>>>>>
format: "web-program-pre1",
<<<<<<<
// Pick a path in the bundle for each target
var paths = {};
_.each(targets, function (target, name) {
var p = path.join('programs', name);
builder.reserve(p, { directory: true });
paths[name] = p;
});
// Hack to let servers find relative paths to clients. Should find
// another solution eventually (probably some kind of mount
// directive that mounts the client bundle in the server at runtime)
var getRelativeTargetPath = function (options) {
var pathForTarget = function (target) {
var name;
_.each(targets, function (t, n) {
if (t === target)
name = n;
});
if (! name)
throw new Error("missing target?");
if (! (name in paths))
throw new Error("missing target path?");
return paths[name];
};
return path.relative(pathForTarget(options.relativeTo),
pathForTarget(options.forTarget));
};
// Write out each target
_.each(targets, function (target, name) {
var relControlFilePath =
target.write(builder.enter(paths[name]), {
includeNodeModulesSymlink: options.includeNodeModulesSymlink,
getRelativeTargetPath: getRelativeTargetPath });
json.programs.push({
name: name,
arch: target.mostCompatibleArch(),
path: path.join(paths[name], relControlFilePath)
});
_.each(target.cordovaDependencies, function (version, name) {
json.cordovaDependencies[name] = version;
});
});
=======
>>>>>>>
<<<<<<<
_.each(targets, function (target, name) {
json.programs.push(writeTargetToPath(name, target, builder.buildPath, options));
});
=======
_.each(targets, function (target, name) {
json.programs.push(writeTargetToPath(name, target, builder.buildPath, {
includeNodeModulesSymlink: options.includeNodeModulesSymlink,
builtBy: options.builtBy,
controlProgram: options.controlProgram,
releaseName: options.releaseName,
getRelativeTargetPath: options.getRelativeTargetPath
}));
});
// Control file
builder.writeJson('star.json', json);
>>>>>>>
_.each(targets, function (target, name) {
json.programs.push(writeTargetToPath(name, target, builder.buildPath, {
includeNodeModulesSymlink: options.includeNodeModulesSymlink,
builtBy: options.builtBy,
controlProgram: options.controlProgram,
releaseName: options.releaseName,
getRelativeTargetPath: options.getRelativeTargetPath
}));
});
// Control file
builder.writeJson('star.json', json);
<<<<<<<
* - serverArch: the server architecture to target
* (defaults to archinfo.host())
* - clientArchs: an array of client archs to target
*
* - hasCachedBundle: true if we already have a cached bundle stored in
* /build. When true, we only build the new client targets in the bundle.
=======
* - serverArch: the server architecture to target
* (defaults to archinfo.host())
* - webArchs: an array of web archs to target
*
* - hasCachedBundle: true if we already have a cached bundle stored in
* /build. When true, we only build the new client targets in the bundle.
>>>>>>>
* - arch: the server architecture to target (defaults to archinfo.host())
* - serverArch: the server architecture to target
* (defaults to archinfo.host())
* - webArchs: an array of web archs to target
*
* - hasCachedBundle: true if we already have a cached bundle stored in
* /build. When true, we only build the new client targets in the bundle.
<<<<<<<
var serverArch = buildOptions.serverArch || archinfo.host();
var clientArchs = buildOptions.clientArchs || [ "client.browser", "client.cordova" ];
var appDir = project.project.rootDir;
var packageLoader = project.project.getPackageLoader();
var downloaded = project.project._ensurePackagesExistOnDisk(
project.project.dependencies, { arch: serverArch, verbose: true });
if (_.keys(downloaded).length !==
_.keys(project.project.dependencies).length) {
buildmessage.error("Unable to download package builds for this architecture.");
// Recover by returning.
return;
}
=======
var serverArch = buildOptions.serverArch || archinfo.host();
var webArchs = buildOptions.webArchs || [ "web.browser" ];
>>>>>>>
var serverArch = buildOptions.serverArch || archinfo.host();
var webArchs = buildOptions.webArchs || [ "web.browser" ];
<<<<<<<
arch: "client.browser"
=======
arch: "web.browser"
>>>>>>>
arch: "web.browser"
<<<<<<<
_.each(clientArchs, function (arch) {
var client = makeClientTarget(app, arch);
targets[arch] = client;
clientTargets.push(client);
});
=======
_.each(webArchs, function (arch) {
var client = makeClientTarget(app, arch);
targets[arch] = client;
});
// Create a browser client if one doesn't exist already.
var browserClient = targets["web.browser"];
if (! browserClient) {
browserClient = makeBlankClientTarget(app);
targets["web.browser"] = browserClient;
}
>>>>>>>
_.each(webArchs, function (arch) {
var client = makeClientTarget(app, arch);
clientTargets.push(client);
targets[arch] = client;
});
<<<<<<<
if (! options.hasCachedBundle) {
var server = makeServerTarget(app, clientTargets);
server.clientTargets = clientTargets;
targets.server = server;
}
=======
if (! options.hasCachedBundle) {
var server = makeServerTarget(app, browserClient);
server.clientTarget = browserClient;
targets.server = server;
}
>>>>>>>
if (! options.hasCachedBundle) {
var server = makeServerTarget(app, clientTargets);
targets.server = server;
}
<<<<<<<
releaseName: releaseName,
getRelativeTargetPath: getRelativeTargetPath
};
if (options.hasCachedBundle) {
// XXX If we already have a cached bundle, just recreate the new targets.
// This might make the contents of "star.json" out of date.
_.each(targets, function (target, name) {
writeTargetToPath(name, target, outputPath, options);
clientWatchSet.merge(target.getWatchSet());
});
} else {
starResult = writeSiteArchive(targets, outputPath, writeOptions);
serverWatchSet.merge(starResult.serverWatchSet);
clientWatchSet.merge(starResult.clientWatchSet);
}
=======
releaseName: releaseName,
getRelativeTargetPath: getRelativeTargetPath
};
if (options.hasCachedBundle) {
// If we already have a cached bundle, just recreate the new targets.
// XXX This might make the contents of "star.json" out of date.
_.each(targets, function (target, name) {
writeTargetToPath(name, target, outputPath, writeOptions);
clientWatchSet.merge(target.getWatchSet());
});
} else {
starResult = writeSiteArchive(targets, outputPath, writeOptions);
serverWatchSet.merge(starResult.serverWatchSet);
clientWatchSet.merge(starResult.clientWatchSet);
}
>>>>>>>
releaseName: releaseName,
getRelativeTargetPath: getRelativeTargetPath
};
if (options.hasCachedBundle) {
// If we already have a cached bundle, just recreate the new targets.
// XXX This might make the contents of "star.json" out of date.
_.each(targets, function (target, name) {
writeTargetToPath(name, target, outputPath, writeOptions);
clientWatchSet.merge(target.getWatchSet());
});
} else {
starResult = writeSiteArchive(targets, outputPath, writeOptions);
serverWatchSet.merge(starResult.serverWatchSet);
clientWatchSet.merge(starResult.clientWatchSet);
} |
<<<<<<<
self.css = [new File({ data: new Buffer(allCss, 'utf8') })];
self.css[0].setUrlToHash(".css", "?meteor_css_resource=true");
=======
self.css = [new File({ data: new Buffer(minifiedCss, 'utf8') })];
self.css[0].setUrlToHash(".css");
>>>>>>>
self.css = [new File({ data: new Buffer(minifiedCss, 'utf8') })];
self.css[0].setUrlToHash(".css", "?meteor_css_resource=true"); |
<<<<<<<
MiuiLogo,
=======
JimdoLogo,
>>>>>>>
MiuiLogo,
JimdoLogo, |
<<<<<<<
var url = Npm.require('url');
// unique id for this instantiation of the server. If this changes
// between client reconnects, the client will reload. You can set the
// environment variable "SERVER_ID" to control this. For example, if
// you want to only force a reload on major changes, you can use a
// custom serverId which you only change when something worth pushing
// to clients immediately happens.
__meteor_runtime_config__.serverId =
process.env.SERVER_ID ? process.env.SERVER_ID : Random.id();
=======
>>>>>>>
var url = Npm.require('url'); |
<<<<<<<
=======
if (dataToUpdate["longDescription"].length > 1500) {
buildmessage.error(
"Longform package description is too long. Meteor uses the section of " +
"the Markdown documentation file between the first and second " +
"headings. That section must be less than 1500 characters long.");
return;
}
>>>>>>>
if (dataToUpdate["longDescription"].length > 1500) {
buildmessage.error(
"Longform package description is too long. Meteor uses the section of " +
"the Markdown documentation file between the first and second " +
"headings. That section must be less than 1500 characters long.");
return;
}
<<<<<<<
=======
if (readmeInfo && readmeInfo.excerpt.length > 1500) {
buildmessage.error(
"Longform package description is too long. Meteor uses the section of " +
"the Markdown documentation file between the first and second " +
"headings. That section must be less than 1500 characters long.");
return;
}
>>>>>>>
if (readmeInfo && readmeInfo.excerpt.length > 1500) {
buildmessage.error(
"Longform package description is too long. Meteor uses the section of " +
"the Markdown documentation file between the first and second " +
"headings. That section must be less than 1500 characters long.");
return;
} |
<<<<<<<
if (!Oauth.hasCredential(options.oauth.credentialToken)) {
// OAuth credentialToken is not recognized, which could be either
// because the popup was closed by the user before completion, or
// some sort of error where the oauth provider didn't talk to our
// server correctly and closed the popup somehow.
=======
var result = Oauth.retrieveCredential(options.oauth.credentialToken);
if (!result) {
// OAuth credentialToken is not recognized, which could be either because the popup
// was closed by the user before completion, or some sort of error where
// the oauth provider didn't talk to our server correctly and closed the
// popup somehow.
>>>>>>>
var result = Oauth.retrieveCredential(options.oauth.credentialToken);
if (!result) {
// OAuth credentialToken is not recognized, which could be either
// because the popup was closed by the user before completion, or
// some sort of error where the oauth provider didn't talk to our
// server correctly and closed the popup somehow. |
<<<<<<<
);
export const MiuiLogo = () => (
<svg viewBox="0 0 256.8 92.1" fill="#4B4B4B">
<path d="M85.2,0l-38,48.3L9.1,0H0v89.7h9V15l38.2,48.7l38.2-48.8v74.9h9V0H85.2z" />
<path
d="M228.1,0h0.2l0,0H220l0,0l0,0h-0.1v52.6c0,17.1-13.8,30.9-30.9,30.9h0c-17.1,0-30.9-13.8-30.9-30.9V0.2h-8.8
l0,0l0,0l0,0l0,0v52.5c0,21.8,17.7,39.4,39.4,39.4h0c21.8,0,39.4-17.6,39.4-39.4L228.3,0H228.1z"
/>
<polygon points="117.1,0 117.1,89.8 125.4,89.8 125.4,0 " />
<polygon points="248.5,0 248.5,89.8 256.8,89.8 256.8,0 " />
</svg>
=======
);
export const JimdoLogo = () => (
<svg viewBox="0 0 543 117">
<g fill="none" fillRule="evenodd">
<path
d="M140.653 114.788h-29.064a1.417 1.417 0 01-1.417-1.417V2.819c0-.782.634-1.417 1.417-1.417h29.064c.783 0 1.417.635 1.417 1.417V113.37c0 .782-.634 1.417-1.417 1.417M56.19 1.457c-.783 0-1.417.635-1.417 1.417V58.15h.013c0 14.504-11.757 26.262-26.26 26.262a26.13 26.13 0 01-11.939-2.872c-.674-.345-1.502-.074-1.88.582L.191 107.262a1.421 1.421 0 00.535 1.954 57.835 57.835 0 0027.054 7.076c32.387.408 58.89-26.637 58.89-59.027V2.875c0-.783-.634-1.418-1.417-1.418H56.19zM175.355 2.396a4.704 4.704 0 00-7.594 3.709V113.37c0 .783.634 1.418 1.417 1.418h29.043c.783 0 1.417-.635 1.417-1.418V65.324l24.816-24.646-49.1-38.282z"
fill="#00828C"
></path>
<path
d="M355.35 83.691v-.014h-16.544V32.576h16.543v-.03c13.836.72 24.828 11.893 24.828 25.573 0 13.679-10.992 24.853-24.828 25.572m0-82.241l-47.025-.033c-.782 0-1.417.635-1.417 1.417v106.284a5.67 5.67 0 005.67 5.67l42.772.015v-.015c31.436-.738 56.693-25.817 56.693-56.669 0-30.852-25.257-55.932-56.693-56.669M484.282 84.355c-14.495 0-26.245-11.75-26.245-26.245 0-14.495 11.75-26.246 26.245-26.246 14.495 0 26.245 11.751 26.245 26.246s-11.75 26.245-26.245 26.245m0-84.355c-32.093 0-58.11 26.016-58.11 58.11 0 32.093 26.017 58.11 58.11 58.11 32.094 0 58.11-26.017 58.11-58.11 0-32.094-26.016-58.11-58.11-58.11M276.444 1.402h-.65c-.626 0-1.236.208-1.732.592l-49.608 38.684 24.815 24.645v48.047c0 .783.635 1.418 1.418 1.418h29.042c.783 0 1.418-.635 1.418-1.418V6.105a4.703 4.703 0 00-4.703-4.703"
fill="#006678"
></path>
<path
d="M199.638 65.323l23.815 23.735a1.418 1.418 0 002 0l23.816-23.735-24.816-24.646-24.815 24.646z"
fill="#005469"
></path>
</g>
</svg>
>>>>>>>
);
export const MiuiLogo = () => (
<svg viewBox="0 0 256.8 92.1" fill="#4B4B4B">
<path d="M85.2,0l-38,48.3L9.1,0H0v89.7h9V15l38.2,48.7l38.2-48.8v74.9h9V0H85.2z" />
<path
d="M228.1,0h0.2l0,0H220l0,0l0,0h-0.1v52.6c0,17.1-13.8,30.9-30.9,30.9h0c-17.1,0-30.9-13.8-30.9-30.9V0.2h-8.8
l0,0l0,0l0,0l0,0v52.5c0,21.8,17.7,39.4,39.4,39.4h0c21.8,0,39.4-17.6,39.4-39.4L228.3,0H228.1z"
/>
<polygon points="117.1,0 117.1,89.8 125.4,89.8 125.4,0 " />
<polygon points="248.5,0 248.5,89.8 256.8,89.8 256.8,0 " />
</svg>
);
export const JimdoLogo = () => (
<svg viewBox="0 0 543 117">
<g fill="none" fillRule="evenodd">
<path
d="M140.653 114.788h-29.064a1.417 1.417 0 01-1.417-1.417V2.819c0-.782.634-1.417 1.417-1.417h29.064c.783 0 1.417.635 1.417 1.417V113.37c0 .782-.634 1.417-1.417 1.417M56.19 1.457c-.783 0-1.417.635-1.417 1.417V58.15h.013c0 14.504-11.757 26.262-26.26 26.262a26.13 26.13 0 01-11.939-2.872c-.674-.345-1.502-.074-1.88.582L.191 107.262a1.421 1.421 0 00.535 1.954 57.835 57.835 0 0027.054 7.076c32.387.408 58.89-26.637 58.89-59.027V2.875c0-.783-.634-1.418-1.417-1.418H56.19zM175.355 2.396a4.704 4.704 0 00-7.594 3.709V113.37c0 .783.634 1.418 1.417 1.418h29.043c.783 0 1.417-.635 1.417-1.418V65.324l24.816-24.646-49.1-38.282z"
fill="#00828C"
></path>
<path
d="M355.35 83.691v-.014h-16.544V32.576h16.543v-.03c13.836.72 24.828 11.893 24.828 25.573 0 13.679-10.992 24.853-24.828 25.572m0-82.241l-47.025-.033c-.782 0-1.417.635-1.417 1.417v106.284a5.67 5.67 0 005.67 5.67l42.772.015v-.015c31.436-.738 56.693-25.817 56.693-56.669 0-30.852-25.257-55.932-56.693-56.669M484.282 84.355c-14.495 0-26.245-11.75-26.245-26.245 0-14.495 11.75-26.246 26.245-26.246 14.495 0 26.245 11.751 26.245 26.246s-11.75 26.245-26.245 26.245m0-84.355c-32.093 0-58.11 26.016-58.11 58.11 0 32.093 26.017 58.11 58.11 58.11 32.094 0 58.11-26.017 58.11-58.11 0-32.094-26.016-58.11-58.11-58.11M276.444 1.402h-.65c-.626 0-1.236.208-1.732.592l-49.608 38.684 24.815 24.645v48.047c0 .783.635 1.418 1.418 1.418h29.042c.783 0 1.418-.635 1.418-1.418V6.105a4.703 4.703 0 00-4.703-4.703"
fill="#006678"
></path>
<path
d="M199.638 65.323l23.815 23.735a1.418 1.418 0 002 0l23.816-23.735-24.816-24.646-24.815 24.646z"
fill="#005469"
></path>
</g>
</svg> |
<<<<<<<
var c = Deps.autorun(function viewAutorun(c) {
return Blaze._withCurrentView(_inViewScope || self, function () {
=======
var c = Tracker.autorun(function viewAutorun(c) {
return Blaze.withCurrentView(_inViewScope || self, function () {
>>>>>>>
var c = Tracker.autorun(function viewAutorun(c) {
return Blaze._withCurrentView(_inViewScope || self, function () {
<<<<<<<
Blaze._withCurrentView(view, function () {
Deps.nonreactive(function fireCallbacks() {
=======
Blaze.withCurrentView(view, function () {
Tracker.nonreactive(function fireCallbacks() {
>>>>>>>
Blaze._withCurrentView(view, function () {
Tracker.nonreactive(function fireCallbacks() {
<<<<<<<
Blaze._materializeView = function (view, parentView) {
Blaze._createView(view, parentView);
=======
var domrange;
var needsRenderedCallback = false;
var scheduleRenderedCallback = function () {
if (needsRenderedCallback && ! view.isDestroyed &&
view._callbacks.rendered && view._callbacks.rendered.length) {
Tracker.afterFlush(function callRendered() {
if (needsRenderedCallback && ! view.isDestroyed) {
needsRenderedCallback = false;
Blaze._fireCallbacks(view, 'rendered');
}
});
}
};
>>>>>>>
Blaze._materializeView = function (view, parentView) {
Blaze._createView(view, parentView);
<<<<<<<
Deps.nonreactive(function doMaterialize() {
var materializer = new Blaze._DOMMaterializer({parentView: view});
=======
Tracker.nonreactive(function doMaterialize() {
var materializer = new Blaze.DOMMaterializer({parentView: view});
>>>>>>>
Tracker.nonreactive(function doMaterialize() {
var materializer = new Blaze._DOMMaterializer({parentView: view});
<<<<<<<
if (Deps.active) {
Deps.onInvalidate(function () {
Blaze._destroyView(view);
=======
if (Tracker.active) {
Tracker.onInvalidate(function () {
Blaze.destroyView(view);
>>>>>>>
if (Tracker.active) {
Tracker.onInvalidate(function () {
Blaze._destroyView(view); |
<<<<<<<
npmDependencies: {"coffee-script": "1.6.3", "source-map": "0.1.32"}
=======
npmDependencies: {"coffee-script": "1.7.1", "source-map": "0.1.24"}
>>>>>>>
npmDependencies: {"coffee-script": "1.7.1", "source-map": "0.1.32"} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.