conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
G.renderer.setSize( G.w , G.h );
G.container.appendChild( G.renderer.domElement );
G.composer = new WAGNER.Composer( G.renderer, { useRGBA: false } );
G.stats.domElement.id = 'stats';
//document.body.appendChild( G.stats.domElement );
=======
this.tween = TWEEN;
TWEEN.origTween = TWEEN.Tween;
TWEEN.Tween = function (options){
var res = new TWEEN.origTween(options);
res.easing(TWEEN.Easing.Quadratic.InOut);
return res;
};
// Need something to call when started
this.startArray = [];
this.loader.loadUpdate = function( percent ){
//console.log( 'hello : ' + percent )
this.loadBar.onLoad( percent )
}.bind( this )
this.loader.onStart = function(){
//console.log( this.loadBar)
this.onResize();
this.init();
for( var i = 0; i < this.startArray.length; i++ ){
this.startArray[i]();
}
>>>>>>>
this.tween = TWEEN;
TWEEN.origTween = TWEEN.Tween;
TWEEN.Tween = function (options){
var res = new TWEEN.origTween(options);
res.easing(TWEEN.Easing.Quadratic.InOut);
return res;
};
// Need something to call when started
this.startArray = [];
this.loader.loadUpdate = function( percent ){
//console.log( 'hello : ' + percent )
this.loadBar.onLoad( percent )
}.bind( this )
this.loader.onStart = function(){
//console.log( this.loadBar)
this.onResize();
this.init();
for( var i = 0; i < this.startArray.length; i++ ){
this.startArray[i]();
}
<<<<<<<
this.renderer.setSize( this.w , this.h);
console.log( this.dpr );
//renderer.setSize( s * w, s * h );
//camera.projectionMatrix.makePerspective( fov, w / h, camera.near, camera.far );
//TODO: Make this work for dpr!
this.composer.setSize( this.w * 2, this.h* 2);
// depthTexture = WAGNER.Pass.prototype.getOfflineTexture( w, h, true );
=======
this.renderer.setSize( this.w , this.h );
if( this.currentPage ){
this.currentPage.resizeFrames();
if( this.nextPage ){
this.nextPage.resizeFrames();
}
}
>>>>>>>
this.renderer.setSize( this.w , this.h);
//renderer.setSize( s * w, s * h );
//camera.projectionMatrix.makePerspective( fov, w / h, camera.near, camera.far );
//TODO: Make this work for dpr!
this.composer.setSize( this.w , this.h);
// depthTexture = WAGNER.Pass.prototype.getOfflineTexture( w, h, true );
this.renderer.setSize( this.w , this.h );
if( this.currentPage ){
this.currentPage.resizeFrames();
if( this.nextPage ){
this.nextPage.resizeFrames();
}
} |
<<<<<<<
var REDIS_PREFIX = 'batch:jobs:';
=======
var debug = require('./util/debug')('job-backend');
var REDIS_PREFIX = 'batch:jobs:';
var REDIS_DB = 5;
>>>>>>>
var debug = require('./util/debug')('job-backend');
var REDIS_PREFIX = 'batch:jobs:';
var REDIS_DB = 5;
<<<<<<<
this.db = 5;
=======
>>>>>>>
<<<<<<<
function toRedisParams(data) {
var redisParams = [REDIS_PREFIX + data.job_id];
var obj = JSON.parse(JSON.stringify(data));
=======
function toRedisParams(job) {
var redisParams = [REDIS_PREFIX + job.job_id];
var obj = JSON.parse(JSON.stringify(job));
>>>>>>>
function toRedisParams(job) {
var redisParams = [REDIS_PREFIX + job.job_id];
var obj = JSON.parse(JSON.stringify(job));
<<<<<<<
self.metadataBackend.redisCmd(this.db, 'HMGET', redisParams , function (err, redisValues) {
=======
self.metadataBackend.redisCmd(REDIS_DB, 'HMGET', redisParams , function (err, redisValues) {
>>>>>>>
self.metadataBackend.redisCmd(REDIS_DB, 'HMGET', redisParams , function (err, redisValues) {
<<<<<<<
var redisParams = toRedisParams(data);
=======
var redisParams = toRedisParams(job);
>>>>>>>
var redisParams = toRedisParams(job); |
<<<<<<<
if (!_.isArray(this.uciq_fields[item.database])) {
this.uciq_fields[item.database]=[];
}
=======
if (!_.isArray(this.uciq_fields[item.database])) {
this.uciq_fields[item.database]=[];
}
>>>>>>>
if (!_.isArray(this.uciq_fields[item.database])) {
this.uciq_fields[item.database]=[];
}
if (!_.isArray(this.uciq_fields[item.database])) {
this.uciq_fields[item.database]=[];
} |
<<<<<<<
SqlController.$inject = ['$scope', '$rootScope', '$window', 'localStorageService', 'LxNotificationService', 'API', '$filter'];
=======
SqlController.$inject = [
'$scope',
'$rootScope',
'$window',
'localStorageService',
'API',
'$mdSidenav',
'$mdDialog',
'$mdToast',
'ThemeService',
'$timeout',
'$filter'
];
>>>>>>>
SqlController.$inject = [
'$scope',
'$rootScope',
'$window',
'localStorageService',
'API',
'$mdSidenav',
'$mdDialog',
'$mdToast',
'ThemeService',
'$timeout',
'$filter'
];
<<<<<<<
function SqlController($scope, $rootScope, $window, localStorageService, LxNotificationService, API, $filter) {
=======
function SqlController($scope,
$rootScope,
$window,
localStorageService,
API,
$mdSidenav,
$mdDialog,
$mdToast,
ThemeService,
$timeout,
$filter) {
const SQL_HISTORY_KEY = 'sqlHistory2';
const SQL_LOG_KEY = 'sqlLog';
const SQL_SAVE_TABS_KEY = 'saveTabs';
const SQL_SESSION_KEY = 'sessionData';
const SQL_LOG_LENGTH = 30;
>>>>>>>
function SqlController($scope,
$rootScope,
$window,
localStorageService,
API,
$mdSidenav,
$mdDialog,
$mdToast,
ThemeService,
$timeout,
$filter) {
const SQL_HISTORY_KEY = 'sqlHistory2';
const SQL_LOG_KEY = 'sqlLog';
const SQL_SAVE_TABS_KEY = 'saveTabs';
const SQL_SESSION_KEY = 'sessionData';
const SQL_LOG_LENGTH = 30;
<<<<<<<
sql: '',
button_run: $filter('translate')('Выполнить ⌘ + ⏎'),
sqlHistory: localStorageService.get('sqlHistory') || [],
format: {},
=======
sqlHistory: localStorageService.get(SQL_HISTORY_KEY) || [],
>>>>>>>
sqlHistory: localStorageService.get(SQL_HISTORY_KEY) || [],
<<<<<<<
$window.onbeforeunload = function (event) {
if ($scope.vars.sql !== '' && location.hostname != 'localhost') {
var message = $filter('translate')('Хотите покинуть страницу?');
=======
$window.onbeforeunload = (event) => {
if ($scope.vars.currentTab.sql !== '' && location.hostname != 'localhost') {
let message = 'Хотите покинуть страницу?';
>>>>>>>
$window.onbeforeunload = (event) => {
if ($scope.vars.currentTab.sql !== '' && location.hostname != 'localhost') {
let message = $filter('translate')('Хотите покинуть страницу?');
<<<<<<<
var clearRouterListener = $scope.$on('$stateChangeStart', function (event) {
var message = $filter('translate')('Хотите покинуть страницу?');
if (!event.defaultPrevented && $scope.vars.sql !== '' && !confirm(message)) {
=======
const clearRouterListener = $scope.$on('$stateChangeStart', (event) => {
let message = 'Хотите покинуть страницу?';
if (!event.defaultPrevented && $scope.vars.currentTab !== '' && !confirm(message)) {
>>>>>>>
const clearRouterListener = $scope.$on('$stateChangeStart', (event) => {
let message = $filter('translate')('Хотите покинуть страницу?');
if (!event.defaultPrevented && $scope.vars.currentTab !== '' && !confirm(message)) {
<<<<<<<
}, function (response) {
LxNotificationService.error($filter('translate')('Ошибка'));
var result = {};
result.meta = null;
result.rows = null;
result.query = query;
result.statistics = null;
if (response.data) {
=======
}, (response) => {
$mdToast.show(
$mdToast
.simple()
.content('Ошибка')
.theme(ThemeService.theme)
.position('bottom right')
);
let result = {
meta: null,
rows: null,
query: query,
statistics: null
};
if (response && response.data) {
>>>>>>>
}, (response) => {
$mdToast.show(
$mdToast
.simple()
.content($filter('translate')('Ошибка'))
.theme(ThemeService.theme)
.position('bottom right')
);
let result = {
meta: null,
rows: null,
query: query,
statistics: null
};
if (response && response.data) {
<<<<<<<
LxNotificationService.warning($filter('translate')('Не введен SQL'));
=======
$mdToast.show(
$mdToast
.simple()
.content('Не введен SQL')
.theme(ThemeService.theme)
.position('bottom right')
);
>>>>>>>
$mdToast.show(
$mdToast
.simple()
.content($filter('translate')('Не введен SQL'))
.theme(ThemeService.theme)
.position('bottom right')
);
<<<<<<<
$scope.vars.editor.clearSelection();
// Повесить эвент и переиминовывать кнопку -"Выполнить"
editor.on('changeSelection', function () {
if (editor.getSelectedText()) {
$scope.vars.button_run = $filter('translate')('Выполнить выделенное ⌘ + ⏎');
} else {
$scope.vars.button_run = $filter('translate')('Выполнить все ⇧ + ⌘ + ⏎');
}
document.getElementById('sql_button').innerHTML = $scope.vars.button_run;
});
=======
editor.clearSelection();
>>>>>>>
editor.clearSelection(); |
<<<<<<<
// Если state не найден - шлю 404
$urlRouterProvider.otherwise(function($injector) {
var $state = $injector.get("$state");
$state.transitionTo('404');
});
}
])
.config(['$translateProvider', function ($translateProvider) {
$translateProvider.translations('en', {
'Подключение': 'Connection',
'Неверные данные':'some data is wrong',
'название':'name',
'хост:порт':'host:port',
'логин':'login',
'пароль': 'password',
'Удалить': 'Delete',
'Войти': 'Sing in',
'не найдено': 'not found',
'нет данных': 'no data',
'Назад': 'Back',
'Выход': 'Sing out',
'Шрифт': 'font',
'История запросов пуста': 'Requests\'s history is empty',
'Структура':'Structure',
'Данные':'Data',
'Информация': 'Information',
'Размер': 'Size',
'Размер, байт': 'Size in bytes',
'Первая запись': 'First record',
'Последняя запись': 'Last record',
'Название': 'name',
'Тип': 'Type',
'Default тип': 'Default type',
'Значение': 'Default value',
'Рабочий стол': 'Dashboard',
'База': 'Database',
'Выполнить ⌘ + ⏎': 'Run ⌘ + ⏎',
'Таблица': 'Table',
'Таблица ': 'Table ',
'Хотите покинуть страницу?': 'Do you want to leave this page?',
'Ошибка': 'Error',
'Не введен SQL': 'SQL request is empty',
'Выполнить выделенное ⌘ + ⏎': 'Run selected ⌘ + ⏎',
'Выполнить все ⇧ + ⌘ + ⏎': 'Run all ⇧ + ⌘ + ⏎',
'Просмотр': 'Preview',
'Ошибка ': 'Error '
});
$translateProvider.translations('ru', {
});
$translateProvider.preferredLanguage('en');
}]);
=======
// Если state не найден - шлю 404
$urlRouterProvider.otherwise(function ($injector) {
var $state = $injector.get("$state");
$state.transitionTo('404');
});
if (ThemeService.$get().isDark()) {
$mdThemingProvider
.theme('default')
.dark()
.primaryPalette('blue')
.accentPalette('blue', {
'default': '500'
});
}
}
]);
>>>>>>>
// Если state не найден - шлю 404
$urlRouterProvider.otherwise(function ($injector) {
var $state = $injector.get("$state");
$state.transitionTo('404');
});
if (ThemeService.$get().isDark()) {
$mdThemingProvider
.theme('default')
.dark()
.primaryPalette('blue')
.accentPalette('blue', {
'default': '500'
});
}
}
])
.config(['$translateProvider', function ($translateProvider) {
$translateProvider.translations('en', {
'Подключение': 'Connection',
'Неверные данные':'some data is wrong',
'название':'name',
'хост:порт':'host:port',
'логин':'login',
'пароль': 'password',
'Удалить': 'Delete',
'Войти': 'Sing in',
'не найдено': 'not found',
'нет данных': 'no data',
'Назад': 'Back',
'Выход': 'Sing out',
'Шрифт': 'font',
'История запросов пуста': 'Requests\'s history is empty',
'Структура':'Structure',
'Данные':'Data',
'Информация': 'Information',
'Размер': 'Size',
'Размер, байт': 'Size in bytes',
'Первая запись': 'First record',
'Последняя запись': 'Last record',
'Название': 'name',
'Тип': 'Type',
'Default тип': 'Default type',
'Значение': 'Default value',
'Рабочий стол': 'Dashboard',
'База': 'Database',
'Выполнить ⌘ + ⏎': 'Run ⌘ + ⏎',
'Таблица': 'Table',
'Таблица ': 'Table ',
'Хотите покинуть страницу?': 'Do you want to leave this page?',
'Ошибка': 'Error',
'Не введен SQL': 'SQL request is empty',
'Выполнить выделенное ⌘ + ⏎': 'Run selected ⌘ + ⏎',
'Выполнить все ⇧ + ⌘ + ⏎': 'Run all ⇧ + ⌘ + ⏎',
'Просмотр': 'Preview',
'Ошибка ': 'Error '
});
$translateProvider.translations('ru', {
});
$translateProvider.preferredLanguage('en'); |
<<<<<<<
let debug;
let statusTextMap;
=======
>>>>>>>
let statusTextMap;
<<<<<<<
opts.sendAsJson = config.sendAsJson === undefined ? true : config.sendAsJson;
opts.status = config.status || 200;
opts.statusText = statusTextMap['' + opts.status];
=======
opts.sendAsJson = responseConfig.sendAsJson === undefined ? true : responseConfig.sendAsJson;
opts.status = responseConfig.status || 200;
>>>>>>>
opts.sendAsJson = responseConfig.sendAsJson === undefined ? true : responseConfig.sendAsJson;
opts.status = responseConfig.status || 200;
opts.statusText = statusTextMap['' + opts.status];
<<<<<<<
debug = opts.debug;
statusTextMap = opts.statusTextMap;
=======
>>>>>>>
statusTextMap = opts.statusTextMap; |
<<<<<<<
invalidAddressBookFile() {
this._ngToast.create({
content: this._$filter('translate')('ALERT_INVALID_ADDRESS_BOOK_FILE'),
className: 'danger'
});
}
=======
namespaceExpiryNotice(ns, blocks) {
this._ngToast.create({
content: this._$filter("translate")("RENEW_NS_ALERT_PART_1") + ' <b>'+ns+'</b> ' + this._$filter("translate")("RENEW_NS_ALERT_PART_2") + ' (~' + blocks + ' ' + this._$filter("translate")("GENERAL_BLOCKS") + '). ' + this._$filter("translate")("RENEW_NS_ALERT_PART_3") ,
className: 'warning',
timeout: 10000
});
}
>>>>>>>
invalidAddressBookFile() {
this._ngToast.create({
content: this._$filter('translate')('ALERT_INVALID_ADDRESS_BOOK_FILE'),
className: 'danger'
});
}
namespaceExpiryNotice(ns, blocks) {
this._ngToast.create({
content: this._$filter("translate")("RENEW_NS_ALERT_PART_1") + ' <b>'+ns+'</b> ' + this._$filter("translate")("RENEW_NS_ALERT_PART_2") + ' (~' + blocks + ' ' + this._$filter("translate")("GENERAL_BLOCKS") + '). ' + this._$filter("translate")("RENEW_NS_ALERT_PART_3") ,
className: 'warning',
timeout: 10000
});
} |
<<<<<<<
setAnimatedCoords(coords) {
this._coords = coords;
this.svgPaths = renderSVGPaths(coords, {renderAs: 'nodes'});
this.svgPaths.forEach((path, index) => {
const oldPath = this.svgContainer.querySelector(`path:nth-child(${index + 1})`);
if (!oldPath) {
this.svgContainer.appendChild(path);
return;
}
oldPath.setAttribute('d', path.getAttribute('d'));
});
}
=======
abort() {
const response = window.confirm('This will abort the printing!');
this.shouldAbortPrinting = response;
}
>>>>>>>
setAnimatedCoords(coords) {
this._coords = coords;
this.svgPaths = renderSVGPaths(coords, {renderAs: 'nodes'});
this.svgPaths.forEach((path, index) => {
const oldPath = this.svgContainer.querySelector(`path:nth-child(${index + 1})`);
if (!oldPath) {
this.svgContainer.appendChild(path);
return;
}
oldPath.setAttribute('d', path.getAttribute('d'));
});
}
abort() {
const response = window.confirm('This will abort the printing!');
this.shouldAbortPrinting = response;
} |
<<<<<<<
/* globals test, ok, templatizer, unaltered, multipleDirs, dontRemoveMixins, app, app2, _, globalErrorCount */
=======
/* globals test, ok, equal, templatizer, unaltered, multipleDirs, dontRemoveMixins, app, _, globalErrorCount, glob, negativeglob */
>>>>>>>
/* globals test, ok, equal, templatizer, unaltered, multipleDirs, dontRemoveMixins, app, app2, _, globalErrorCount, glob, negativeglob */
<<<<<<<
});
test('Parent namespace and module namespace will be created and not throw an error if option is specified', function () {
var userString = app2.my_templates.users(data);
ok(userString == '<ul><li>larry</li><li>curly</li><li>moe</li></ul>');
=======
});
test('Glob produces templatizer functions', function () {
equal(typeof glob.templatizer.otherfolder.deepnested.deeptweet, 'function');
equal(typeof glob.templatizer.otherfolder.nestedMixin, 'function');
equal(typeof glob.templatizer.usersMixins, 'function');
equal(glob.templatizer['404'](), '<div class="page-404">404!</div>');
});
test('Negative Glob doesnt produce matching templatizer functions', function () {
equal(typeof negativeglob.templatizer.otherfolder.deepnested.deeptweet, 'function');
equal(typeof negativeglob.templatizer.otherfolder.nestedMixin, 'function');
equal(typeof negativeglob.templatizer.users, 'undefined');
equal(typeof negativeglob.templatizer.usersMixins, 'undefined');
>>>>>>>
});
test('Parent namespace and module namespace will be created and not throw an error if option is specified', function () {
var userString = app2.my_templates.users(data);
ok(userString == '<ul><li>larry</li><li>curly</li><li>moe</li></ul>');
});
test('Glob produces templatizer functions', function () {
equal(typeof glob.templatizer.otherfolder.deepnested.deeptweet, 'function');
equal(typeof glob.templatizer.otherfolder.nestedMixin, 'function');
equal(typeof glob.templatizer.usersMixins, 'function');
equal(glob.templatizer['404'](), '<div class="page-404">404!</div>');
});
test('Negative Glob doesnt produce matching templatizer functions', function () {
equal(typeof negativeglob.templatizer.otherfolder.deepnested.deeptweet, 'function');
equal(typeof negativeglob.templatizer.otherfolder.nestedMixin, 'function');
equal(typeof negativeglob.templatizer.users, 'undefined');
equal(typeof negativeglob.templatizer.usersMixins, 'undefined'); |
<<<<<<<
=======
var map1 = [["F","F","W","F","F","F","F","F","F"],
["F","F","W","F","F","F","F","F","F"],
["F","W","W","F","F","F","F","F","F"],
["F","F","F","F","F","F","F","F","F"],
["F","W","W","W","W","W","W","F","F"],
["F","F","W","F","F","F","W","F","F"],
["F","F","W","F","W","C","W","F","F"],
["F","F","W","F","W","W","W","F","F"],
["F","F","W","F","F","F","F","F","F"]]
//Not sure if these should be global
var history;
var res;
var context;
var time;
var interval;
class TimeSlice {
constructor(q, obs, reward, envt) {
this.q = q; // Make abstract for other agents
this.obs = obs;
this.reward = reward
this.xpos = envt.pos.x
this.ypos = envt.pos.y
this.r_ave = r_ave
}
}
var map2 = [["F","F","F","F","F"],
["W","W","F","W","F"],
["W","F","F","F","W"],
["F","F","F","W","W"],
["W","W","C","W","W"]]
>>>>>>>
<<<<<<<
s = s_
r_tot += r
=======
//My code
q = agent.Q.get(s_, a)
r_ave = (r + iter * r_ave)/(iter + 1)
time = new TimeSlice(q, s_, r, env, r_ave)
history[iter] = time
//TODO start to show history and visualise
//(User defined parameters, so will select which TimeSlice to view,
//or can progress at a set speed (maybe add graphs etc later) )
//Update for next cycle
s = s_
>>>>>>>
q = agent.Q.get(s_, a)
r_ave = (r + iter * r_ave)/(iter + 1)
time = new TimeSlice(q, s_, r, env, r_ave)
history[iter] = time
s = s_
<<<<<<<
return [r_tot/iter, iter]
=======
history[0] = env //first element will be used to figure out context for vis.
return history
}
//Lots of reused code here, should try and minimise that
function viewTime(){
pause();
//Retrieve user defined TimeSlice
time = document.getElementById("selectTime").value
document.getElementById("r_ave").value = res[time].r_ave
//log the TimeSlice info
/*console.log("History: Agent is in position (" + res[time].ypos+ ","+
res[time].xpos+") with an updated Q value of "+ res[time].q);*/
draw(context, res[0], res[time].xpos, res[time].ypos)
}
function run(speed){
pause();
var f = function () {
time++;
draw(context, res[0], res[time].xpos,
res[time].ypos);
document.getElementById("selectTime").value = time;
document.getElementById("r_ave").value = res[time].r_ave
}
interval = setInterval(f, speed)
}
function pause(){
clearInterval(interval)
}
function increment(){
pause();
time++;
document.getElementById("selectTime").value = time
document.getElementById("r_ave").value = res[time].r_ave
/*
console.log("History: Agent is in position (" + res[time].xpos+ ","+
res[time].ypos+") with an updated Q value of "+ res[time].q);*/
draw(context, res[0], res[time].xpos, res[time].ypos)
}
function slide(time){
document.getElementById("selectTime").value = time
document.getElementById("r_ave").value = res[time].r_ave //Maybe graph later
viewTime();
>>>>>>>
history[0] = env //first element will be used to figure out context for vis.
return history
<<<<<<<
env = new SimpleDispenserGrid(dispenser1)
agent = new QLearn(env,alpha=0.9,gamma=0.99,epsilon=0.01)
res = simulate(env,agent,t=1e6)
// log output
console.log("Agent: "+ agent.constructor.name)
console.log("Agent's average reward: " + res[0])
=======
// experiment parameters
var alpha = document.getElementById("alpha").value;
var gamma = document.getElementById("gamma").value;
var epsilon = document.getElementById("epsilon").value;
var t_max = document.getElementById("t_max").value;
/*
var gamma = 0.99;
var epsilon = 0.01;
var t_max = 1e6*/
time = 0;
env = new SimpleEpisodicGrid(map1)
context = visualize(env)
agent = new QLearn(env,alpha,gamma,epsilon)
res = simulate(env,agent,t_max)
env.optimal_average_reward = 10 / 26 // for map1 (!)
>>>>>>>
// experiment parameters
var alpha = document.getElementById("alpha").value;
var gamma = document.getElementById("gamma").value;
var epsilon = document.getElementById("epsilon").value;
var t_max = document.getElementById("t_max").value;
time = 0;
env = new SimpleEpisodicGrid(episodic1)
context = visualize(env)
agent = new QLearn(env,alpha,gamma,epsilon)
res = simulate(env,agent,t_max)
env.optimal_average_reward = 10 / 26 // for map1 (!)
<<<<<<<
console.log("Total reward: " + Math.floor(res[0] * res[1]))
if (env.constructor.name == "DispenserGrid") {
nd = 0
for (var val of env.disp) {
nd += env.tiles[val[0]][val[1]].num_dispensed
}
console.log("Chocolates dispensed: " + nd)
}
ctx = visualize(env)
draw(ctx,env)
=======
viewTime();
// todo VISUALISE history / show statistics/etc
>>>>>>>
viewTime();
// todo VISUALISE history / show statistics/etc |
<<<<<<<
throw new Error('Nothing to download');
=======
if (this.stopping === null) {
new Error('Nothing to download');
} else {
// Re-trigger after stop completes
this.stopping.then(() => {
this.download();
});
}
return;
>>>>>>>
if (this.stopping === null) {
throw new Error('Nothing to download');
}
// Re-trigger after stop completes
this.stopping.then(() => {
this.download();
});
return; |
<<<<<<<
responsive: function responsive(contexts, options) {
=======
/*!
*
* @public methods
*
**/
>>>>>>>
responsive: function responsive(contexts, options) {
/*!
*
* @public methods
*
**/
<<<<<<<
=======
/*!
*
* @private methods
*
**/
>>>>>>>
/*!
*
* @private methods
*
**/ |
<<<<<<<
// @public methods
=======
>>>>>>>
<<<<<<<
// @private methods
=======
>>>>>>> |
<<<<<<<
_truncate: function(string, length) {
let shortened = string.replace(/\s+/g, ' ');
if (shortened.length > length)
shortened = shortened.substring(0,length-1) + '...';
=======
/* When text change, this function will check, for each item of the
historySection, if it should be visible or not (based on words contained
in the clipContents attribute of the item). It doesn't destroy or create
items. It the entry is empty, the section is restored with all items
set as visible. */
_onSearchTextChanged: function() {
let searchedText = this.searchEntry.get_text();
if(searchedText === '') {
this.historySection._getMenuItems().forEach(function(mItem){
mItem.actor.visible = true;
});
} else {
this.historySection._getMenuItems().forEach(function(mItem){
mItem.actor.visible = false;
});
this.historySection._getMenuItems().forEach(function(mItem){
let itemWords = mItem.clipContents.split(' ');
itemWords.forEach(function(word){
if(searchedText.substr(0, searchedText.length) == word.substr(0, searchedText.length)) {
mItem.actor.visible = true;
}
});
});
}
},
_setEntryLabel: function (menuItem) {
let buffer = menuItem.clipContents,
shortened = buffer.substr(0,MAX_ENTRY_LENGTH).replace(/\s+/g, ' ');
>>>>>>>
/* When text change, this function will check, for each item of the
historySection, if it should be visible or not (based on words contained
in the clipContents attribute of the item). It doesn't destroy or create
items. It the entry is empty, the section is restored with all items
set as visible. */
_onSearchTextChanged: function() {
let searchedText = this.searchEntry.get_text();
if(searchedText === '') {
this.historySection._getMenuItems().forEach(function(mItem){
mItem.actor.visible = true;
});
} else {
this.historySection._getMenuItems().forEach(function(mItem){
mItem.actor.visible = false;
});
this.historySection._getMenuItems().forEach(function(mItem){
let itemWords = mItem.clipContents.split(' ');
itemWords.forEach(function(word){
if(searchedText.substr(0, searchedText.length) == word.substr(0, searchedText.length)) {
mItem.actor.visible = true;
}
});
});
}
},
_truncate: function(string, length) {
let shortened = string.replace(/\s+/g, ' ');
if (shortened.length > length)
shortened = shortened.substring(0,length-1) + '...'; |
<<<<<<<
grunt.loadNpmTasks('grunt-appcache');
=======
grunt.loadNpmTasks('grunt-browserify');
>>>>>>>
grunt.loadNpmTasks('grunt-appcache');
<<<<<<<
grunt.registerTask('default', ['uglify', 'concat', 'wrap', 'less', 'autoprefixer', 'imageEmbed', 'appcache']);
=======
grunt.registerTask('default', ['browserify', 'uglify', 'concat', 'wrap', 'less', 'autoprefixer', 'imageEmbed']);
>>>>>>>
grunt.registerTask('default', ['browserify', 'uglify', 'concat', 'wrap', 'less', 'autoprefixer', 'imageEmbed', 'appcache']); |
<<<<<<<
/**
* @lends $.editor.prototype
*/
var RaptorWidget = {
=======
$.widget('ui.editor',
/**
* @lends $.editor.prototype
*/
{
>>>>>>>
/**
* @lends $.editor.prototype
*/
var RaptorWidget = {
<<<<<<<
=======
=================================================================*/
getRanges: function() {
return rangy.getSelection().getAllRanges();
var selection = rangy.getSelection(),
validRanges = [],
allRanges;
selection.refresh();
allRanges = selection.getAllRanges();
for (var i = 0; i < allRanges.length; i++) {
allRanges[i].refresh();
if (rangeIsContainedBy(allRanges[i], this.getNode())) {
validRanges.push(allRanges[i]);
}
}
return validRanges;
},
getSelection: function() {
return rangy.getSelection();
},
/*========================================================================*\
=======
* Selection functions
\*========================================================================*/
getRanges: function() {
return rangy.getSelection().getAllRanges();
var selection = rangy.getSelection(),
validRanges = [],
allRanges;
selection.refresh();
allRanges = selection.getAllRanges();
for (var i = 0; i < allRanges.length; i++) {
allRanges[i].refresh();
if (rangeIsContainedBy(allRanges[i], this.getNode())) {
validRanges.push(allRanges[i]);
}
}
return validRanges;
},
getSelection: function() {
return rangy.getSelection();
},
/*========================================================================*\
>>>>>>>
<<<<<<<
try {
document.execCommand('enableInlineTableEditing', false, false);
document.execCommand('styleWithCSS', true, true);
} catch (error) {
handleError(error);
}
=======
for (var name in this.plugins) {
this.plugins[name].enable();
}
this.execCommand('enableInlineTableEditing', false, false);
this.execCommand('styleWithCSS', true, true);
>>>>>>>
try {
document.execCommand('enableInlineTableEditing', false, false);
document.execCommand('styleWithCSS', true, true);
} catch (error) {
handleError(error);
}
for (var name in this.plugins) {
this.plugins[name].enable();
} |
<<<<<<<
=======
if(!text) return;
>>>>>>>
if(!text) return; |
<<<<<<<
var silentTimeout;
module.exports = function(coreObj, conf) {
config = conf;
if (config && config.consumerKey && config.consumerSecret) {
redis = require('../lib/redisProxy.js').select(config.redisDB);
twitterConsumerKey = config.consumerKey;
twitterConsumerSecret = config.consumerSecret;
timeout = config.timeout; // search Interval
silentTimeout = config.silentTimeout;
=======
var silentTimeout = config.twitter.silentTimeout;
var functionUtils = require('../lib/functionUtils.js');
module.exports = function(coreObj) {
if (config.twitter && config.twitter.consumerKey && config.twitter.consumerSecret) {
>>>>>>>
var functionUtils = require('../lib/functionUtils.js');
var silentTimeout;
module.exports = function(coreObj, conf) {
config = conf;
if (config && config.consumerKey && config.consumerSecret) {
redis = require('../lib/redisProxy.js').select(config.redisDB);
twitterConsumerKey = config.consumerKey;
twitterConsumerSecret = config.consumerSecret;
timeout = config.timeout; // search Interval
silentTimeout = config.silentTimeout; |
<<<<<<<
bower = require("bower"),
=======
bower = require("bower"),
>>>>>>>
bower = require("bower"),
<<<<<<<
es = require("event-stream"),
plumber = require("gulp-plumber"),
=======
es = require("event-stream"),
plumber = require("gulp-plumber"),
>>>>>>>
es = require("event-stream"),
plumber = require("gulp-plumber"),
<<<<<<<
clientConfig = require("./client-config.js"),
=======
clientConfig = require("./client-config.js"),
>>>>>>>
clientConfig = require("./client-config.js"),
<<<<<<<
if (typeof files[i] === "string") {
streams.push(bundler(files[i]));
}
=======
if (typeof files[i] === "string") {
streams.push(bundler(files[i]));
}
>>>>>>>
if (typeof files[i] === "string") {
streams.push(bundler(files[i]));
}
<<<<<<<
])
.pipe(plumber())
=======
])
.pipe(plumber())
>>>>>>>
])
.pipe(plumber())
<<<<<<<
return bundle([ "libsb.js", "client.js" ], { debug: !gutil.env.production })
.pipe(plumber())
=======
return bundle([ "libsb.js", "client.js" ], { debug: !gutil.env.production })
.pipe(plumber())
>>>>>>>
return bundle([ "libsb.js", "client.js" ], { debug: !gutil.env.production })
.pipe(plumber())
<<<<<<<
return bundle("embed/embed-parent.js", { debug: !gutil.env.production })
.pipe(plumber())
=======
return bundle("embed/embed-parent.js", { debug: !gutil.env.production })
.pipe(plumber())
>>>>>>>
return bundle("embed/embed-parent.js", { debug: !gutil.env.production })
.pipe(plumber())
<<<<<<<
=======
// Generate appcache manifest file
gulp.task("manifest", function() {
var protocol = clientConfig.server.protocol,
host = clientConfig.server.host,
prefix = protocol + host;
return gulp.src([
"public/s/scripts/lib/jquery.min.js",
"public/s/scripts/client.bundle.min.js",
"public/s/styles/dist/client.css",
"public/s/img/client/**/*"
])
.pipe(manifest({
basePath: "public",
prefix: prefix,
cache: [
protocol + "//fonts.googleapis.com/css?family=Open+Sans:400,600",
protocol + "//fonts.gstatic.com/s/opensans/v10/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff",
protocol + "//fonts.gstatic.com/s/opensans/v10/MTP_ySUJH_bn48VBG8sNSnhCUOGz7vYGh680lGh-uXM.woff"
],
network: [ "*" ],
fallback: [
protocol + "//gravatar.com/avatar/ " + prefix + "/s/img/client/avatar-fallback.svg",
prefix + "/socket " + prefix + "/s/socket-fallback",
"/ " + prefix + "/offline.html"
],
preferOnline: true,
hash: true,
filename: "manifest.appcache"
}))
.pipe(gulp.dest("public"))
.on("error", gutil.log);
});
>>>>>>>
<<<<<<<
gulp.task("lace", [ "bower" ], function() {
return gulp.src(bowerDir + "/lace/src/scss/*.scss")
.pipe(plumber())
=======
gulp.task("lace", [ "bower" ], function() {
return gulp.src(bowerDir + "/lace/src/scss/*.scss")
.pipe(plumber())
>>>>>>>
gulp.task("lace", [ "bower" ], function() {
return gulp.src(bowerDir + "/lace/src/scss/*.scss")
.pipe(plumber())
<<<<<<<
}))
.pipe(plumber())
=======
}))
.pipe(plumber())
>>>>>>>
}))
.pipe(plumber())
<<<<<<<
], { read: false })
.pipe(plumber())
=======
], { read: false })
.pipe(plumber())
>>>>>>>
], { read: false })
.pipe(plumber()) |
<<<<<<<
=======
/**
* Checks if an element is empty.
*
* @param {jQuery|Element} element The element to be checked.
* @returns {Boolean} Returns true if element is empty.
*/
>>>>>>>
/**
* Checks if an element is empty.
*
* @param {jQuery|Element} element The element to be checked.
* @returns {Boolean} Returns true if element is empty.
*/
<<<<<<<
/**
* @param {Element} element
* @param {string} newTag
* @return {Element}
*/
=======
/**
* Changes the tags on a given element.
* @todo not sure of details of return
* @param {jQuerySelector|jQuery|Element} element The element(s) to have it's tags changed
* @param {Element} newTag The new tag for the element(s)
* @returns {type}
*/
>>>>>>>
/**
* Changes the tags on a given element.
*
* @todo not sure of details of return
* @param {jQuerySelector|jQuery|Element} element The element(s) to have it's tags changed
* @param {Element} newTag The new tag for the element(s)
* @returns {type}
*/ |
<<<<<<<
if (!results.params.antiAbuse) {
results.params.antiAbuse = {offensive: true};
=======
if(!room.params) room.params = {};
if(!room.params["anti-abuse"]) room.params["anti-abuse"] = {};
if (typeof room.params["anti-abuse"].wordblock !== "boolean") {
room.params["anti-abuse"].wordblock = true;
}
if (!(room.params["anti-abuse"]["block-lists"] instanceof Array)) {
lists = [];
}else {
lists = room.params["anti-abuse"]["block-lists"];
>>>>>>>
if(!room.params) room.params = {};
if (!results.params.antiAbuse) {
results.params.antiAbuse = {offensive: true};
if (typeof room.params.antiAbuse.wordblock !== "boolean") {
room.params.antiAbuse.wordblock = true;
}
if (!(room.params.antiAbuse["block-lists"] instanceof Array)) {
lists = [];
}else {
lists = room.params.antiAbuse["block-lists"];
<<<<<<<
libsb.on('config-save', function(room, next){
room.params.antiAbuse = {
offensive : $('#block-offensive').is(':checked')
};
next();
});
function hasLabel(label, labels){
for(var i=0; i<labels.length; i++){
if(labels[i] === label){
return true;
}
}
return false;
}
libsb.on('text-menu', function(menu, next){
if(menu.role !== "owner") return next();
var textObj;
libsb.emit('getTexts', {ref: menu.target.id, to: currentState.roomName}, function(err, data){
textObj = data.results[0];
console.log("Recieved ", err, textObj);
if(!hasLabel('hidden', textObj.labels)){
menu["Hide Message"] = function(){
libsb.emit('edit-up', {to: currentState.room, labels: {hidden: 1}, ref: menu.target.id, cookie: false});
$(menu.target).addClass('hidden');
};
} else{
menu["Unhide Message"] = function(){
libsb.emit('edit-up', {to: currentState.room, labels: {hidden: 0}, ref: menu.target.id, cookie: false});
$(menu.target).removeClass('hidden');
};
}
if(hasLabel('abusive', textObj.labels)){
menu["Mark as Not Abusive"] = function(){
libsb.emit('edit-up', {to: currentState.room, labels: {abusive: 0}, ref: menu.target.id, cookie: false});
};
}
});
next();
=======
libsb.on("config-save", function(room, next){
room.params["anti-abuse"] = {
wordblock: $("#block-offensive").is(":checked"),
"block-lists": $("input[name='blocklists-list']:checked").map(function(i, el) {
return $(el).attr("value");
}).get(),
customWords: $("#block-custom").val().split(",").map(function(item) {
return (item.trim()).toLowerCase();
})
};
next();
>>>>>>>
libsb.on("config-save", function(room, next){
room.params.antiAbuse = {
wordblock: $("#block-offensive").is(":checked"),
"block-lists": $("input[name='blocklists-list']:checked").map(function(i, el) {
return $(el).attr("value");
}).get(),
customWords: $("#block-custom").val().split(",").map(function(item) {
return (item.trim()).toLowerCase();
})
};
next();
});
function hasLabel(label, labels){
for(var i=0; i<labels.length; i++){
if(labels[i] === label){
return true;
}
}
return false;
}
libsb.on('text-menu', function(menu, next){
if(menu.role !== "owner") return next();
var textObj;
libsb.emit('getTexts', {ref: menu.target.id, to: currentState.roomName}, function(err, data){
textObj = data.results[0];
console.log("Recieved ", err, textObj);
if(!hasLabel('hidden', textObj.labels)){
menu["Hide Message"] = function(){
libsb.emit('edit-up', {to: currentState.room, labels: {hidden: 1}, ref: menu.target.id, cookie: false});
$(menu.target).addClass('hidden');
};
} else{
menu["Unhide Message"] = function(){
libsb.emit('edit-up', {to: currentState.room, labels: {hidden: 0}, ref: menu.target.id, cookie: false});
$(menu.target).removeClass('hidden');
};
}
if(hasLabel('abusive', textObj.labels)){
menu["Mark as Not Abusive"] = function(){
libsb.emit('edit-up', {to: currentState.room, labels: {abusive: 0}, ref: menu.target.id, cookie: false});
};
}
});
next(); |
<<<<<<<
"admin-notifier", "entityloader", "irc", "twitter", "jws", "censor", "email", "superuser", "search", "sitemap",
=======
"entityloader", "irc", "twitter", "censor", "email", "superuser", "search", "sitemap",
>>>>>>>
"entityloader", "irc", "twitter", "jws", "censor", "email", "superuser", "search", "sitemap", |
<<<<<<<
* Determine whether object is a number
* {@link http://stackoverflow.com/a/1421988/187954}.
*
* @param {mixed} object The object to be tested
=======
* Determine whether object is a number {@link http://stackoverflow.com/a/1421988/187954}.
* @param {mixed} object The object to be tested.
>>>>>>>
* Determine whether object is a number
* {@link http://stackoverflow.com/a/1421988/187954}.
*
* @param {mixed} object The object to be tested
<<<<<<<
/**
* @param {mixed} object
* @return {boolean} True if object is an Object.
*/
=======
/**
* Determines whether object is a node.
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is a node.
*/
>>>>>>>
/**
* Determines whether object is a node.
*
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is a node.
*/
<<<<<<<
/**
* @param {mixed} object
* @return {boolean} True if object is a jQuery element.
*/
=======
/**
* Determines whether object is an element.
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is an element.
*/
>>>>>>>
/**
* Determines whether object is an element.
*
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is an element.
*/
<<<<<<<
/**
* @param {mixed} object
* @return {boolean} True if object is a RangyRange.
*/
=======
/**
* Determines whether object is a range.
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is a range.
*/
>>>>>>>
/**
* Determines whether object is a range.
*
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is a range.
*/
<<<<<<<
/**
* @param {mixed} object
* @return {boolean} True if object is a RangySelection.
*/
=======
/**
* Determines whether object is a selection.
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is a selection.
*/
>>>>>>>
/**
* Determines whether object is a selection.
*
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is a selection.
*/
<<<<<<<
/**
* @param {mixed} object
* @return {boolean} True if object is a string.
*/
=======
/**
* Determines whether object is a string.
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is a string.
*/
>>>>>>>
/**
* Determines whether object is a string.
*
* @param {mixed} object The object to be tested.
* @returns {Boolean} True if the object is a string.
*/ |
<<<<<<<
libsb.on("navigate", function(state, next) {
var room = state.roomName;
if(currentState.embed == "toast") return next();
enter(room);
if(state.old && state.old.roomName === state.roomName) return next();
next();
}, 10);
libsb.on("init-dn", function(init, next) {
if(currentState.embed == "toast") return next();
/* if(init.occupantOf){
init.occupantOf.forEach(function(r) {
enter(r.id);
});
}*/
if(init.memberOf){
init.memberOf.forEach(function(r) {
enter(r.id);
});
}
next();
}, 10);
libsb.on('navigate', function(state, next) {
if(state.roomName == "pending" && state.room ===null) return next();
if(state.roomName && state.room!== null) {
roomName = state.roomName;
$(".room-item.current").removeClass("current");
$("#room-item-" + state.roomName).addClass("current");
}
next();
}, 500);
=======
>>>>>>> |
<<<<<<<
threader: 11,
sitemap: 12,
=======
>>>>>>>
sitemap: 12, |
<<<<<<<
module.exports = function(message, cb) {
function send(){
//console.log("trying to send in api/message:",message);
pool.get(function(err, db) {
if (err) throw err;
if (!message.id) message.id = guid();
if (!message.time) message.time = new Date().getTime();
if(abuse.rejectable(message)) {
if(cb) cb(false,{err:"ERR_ABUSE"});
return;
}
db.query("INSERT INTO `messages` SET `id`=?, `from`=?, `to`=?, `type`=?, `text`=?, "+
"`origin`=?, `time`=?, `ref`=?", [message.id, message.from, message.to, message.type,
message.text, message.origin, message.time, message.ref],
function () {
db.query("SELECT * FROM `accounts` WHERE `room`=?", [message.to], function(err, data) {
var i, l, name, list = {};
if(err) { console.log("Can't get list of accounts"); return; }
for(i=0, l=data.length; i<l; i+=1) {
name = data[i].id.split(':')[0];
if(!list[name]) list[name] = [];
list[name].push(data[i].id);
}
for(name in list) {
if(gateways[name] && gateways[name].send)
gateways[name].send(message, list[name]);
}
db.end();
});
});
console.log(message);
gateways.http.send(message, [message.to]);
});
=======
module.exports = function(message, gateways, cb) {
if (!message.id) message.id = guid();
if (!message.time) message.time = new Date().getTime();
if(plugin.invoke(message)) {
if(cb) cb(false,{err:"ERR_ABUSE"});
return;
>>>>>>>
module.exports = function(message, cb) {
function send(){
//console.log("trying to send in api/message:",message);
pool.get(function(err, db) {
if (err) throw err;
if (!message.id) message.id = guid();
if (!message.time) message.time = new Date().getTime();
if(plugin.invoke(message)) {
if(cb) cb(false,{err:"ERR_ABUSE"});
return;
}
db.query("INSERT INTO `messages` SET `id`=?, `from`=?, `to`=?, `type`=?, `text`=?, "+
"`origin`=?, `time`=?, `ref`=?", [message.id, message.from, message.to, message.type,
message.text, message.origin, message.time, message.ref],
function () {
db.query("SELECT * FROM `accounts` WHERE `room`=?", [message.to], function(err, data) {
var i, l, name, list = {};
if(err) { console.log("Can't get list of accounts"); return; }
for(i=0, l=data.length; i<l; i+=1) {
name = data[i].id.split(':')[0];
if(!list[name]) list[name] = [];
list[name].push(data[i].id);
}
for(name in list) {
if(gateways[name] && gateways[name].send)
gateways[name].send(message, list[name]);
}
db.end();
});
});
console.log(message);
gateways.http.send(message, [message.to]);
});
<<<<<<<
if (message.auth) {
gateways[message.auth.gateway].auth(message.auth, function(status,response) {
cb(status,response);
if (status==false) {
console.log(response.err);
return;
}
/*
*
*done in the socket.js with the the core.message function. Temp solution.
db.query("select id from rooms where id=?",[response[0].room],function(err,room){
delete message.auth;
message.ref=room[0].id;
send();
});
*/
});
}
else {
send();
}
=======
db.query("INSERT INTO `messages` SET `id`=?, `from`=?, `to`=?, `type`=?, `text`=?, "+
"`origin`=?, `time`=?, `ref`=?", [message.id, message.from, message.to, message.type,
message.text, message.origin, message.time, message.ref]);
gateways.http.send(message, [message.to]);
db.query("SELECT * FROM `accounts` WHERE `room`=?", [message.to],
function(err, data) {
var i, l, name, list = {};
if(err) console.log("Can't get list of rooms");
for(i=0, l=data.length; i<l; i+=1) {
name = data[i].gateway;
if(!list[name]) list[name] = [];
list[name].push(data[i].id);
}
for(name in list) {
if(gateways[name] && gateways[name].send)
gateways[name].send(message, list[name]);
}
}
);
>>>>>>>
if (message.auth) {
gateways[message.auth.gateway].auth(message.auth, function(status,response) {
cb(status,response);
if (status==false) {
console.log(response.err);
return;
}
/*
*
*done in the socket.js with the the core.message function. Temp solution.
db.query("select id from rooms where id=?",[response[0].room],function(err,room){
delete message.auth;
message.ref=room[0].id;
send();
});
*/
});
}
else {
send();
} |
<<<<<<<
/**
* @param {string} listType List type, e.g. ul, ol or blockquote
* @param {string} listItem List item, e.g. li or p
* @param {Element} wrapper
*/
=======
/**
* @fileOverview List manipulation helper functions.
* @author David Neilsen [email protected]
* @author Michael Robinson [email protected]
*/
/**
* Checks whether the selection is fully encased by ul or ol tags, if it is then unwrap the parent ul/ol.
* @todo can't work out what wrapper is.
* @param {String} listType This is the type of list to check the selection against.
* @param {Object} listItem This is the list item to use as the selection.
* @param {Array} wrapper An array of something i can't work out.
*/
>>>>>>>
/**
* @fileOverview List manipulation helper functions.
* @author David Neilsen [email protected]
* @author Michael Robinson [email protected]
*/
/**
* Checks whether the selection is fully encased by ul or ol tags, if it is then unwrap the parent ul/ol.
* @todo can't work out what wrapper is.
* @param {String} listType This is the type of list to check the selection against.
* @param {Object} listItem This is the list item to use as the selection.
* @param {Array} wrapper An array of something i can't work out.
*/
<<<<<<<
function listUnwrap(list, listItem) {
list.find(listItem).each(function() {
$(this).replaceWith(listConvertListItem($(this), 'p', listValidPChildren));
});
list.contents().unwrap();
}
/**
* @param {string} listType
* @param {string} listItem
* @param {Element} wrapper
*/
function listUnwrapSelection(listType, listItem, wrapper) {
var range = rangy.getSelection().getRangeAt(0);
if (rangeIsEmpty(range)) {
range = rangeExpandTo(range, [listItem]);
=======
// Select the first list element of the inserted list
selectionSelectInner(replacement.find(listItem + ':first')[0]);
};
/**
* Unwraps the selected list item(s) and puts it into <p> tags.
*
* @param {Object} listItem
*/
function listUnwrapSelection(listItem) {
// Array containing the html contents of each of the selected li elements.
var listElementsContent = [];
// Array containing the selected li elements themselves.
var listElements = [];
// The element within which selection begins.
var startElement = selectionGetStartElement();
// The element within which ends.
var endElement = selectionGetEndElement();
// Collect the first selected list element's content
listElementsContent.push($(startElement).html());
listElements.push(startElement);
// Collect the remaining list elements' content
if ($(startElement)[0] !== $(endElement)[0]) {
var currentElement = startElement;
do {
currentElement = $(currentElement).next();
listElementsContent.push($(currentElement).html());
listElements.push(currentElement);
} while($(currentElement)[0] !== $(endElement)[0]);
>>>>>>>
function listUnwrap(list, listItem) {
list.find(listItem).each(function() {
$(this).replaceWith(listConvertListItem($(this), 'p', listValidPChildren));
});
list.contents().unwrap();
}
/**
* Unwraps the selected list item(s) and puts it into <p> tags.
*
* @param {Object} listItem
*/
function listUnwrapSelection(listType, listItem, wrapper) {
var range = rangy.getSelection().getRangeAt(0);
if (rangeIsEmpty(range)) {
range = rangeExpandTo(range, [listItem]); |
<<<<<<<
// if(data.params[i].error) newRoom.params[i] = action.old.params[i];
newRoom.params[i] = data.params[i];
=======
// if(data.params[i].error) newRoom.params[i] = action.old.params[i];
newRoom.params[i] = data.params[i];
>>>>>>>
newRoom.params[i] = data.params[i]; |
<<<<<<<
gulp.task("embed-legacy", function() {
return bundle("embed/embed-parent.js", { debug: debug })
=======
gulp.task("embed", function() {
return bundle("embed/embed-parent.js", { debug: true })
.pipe(sourcemaps.init({ loadMaps: true }))
>>>>>>>
gulp.task("embed-legacy", function() {
return bundle("embed/embed-parent.js", { debug: true })
.pipe(sourcemaps.init({ loadMaps: true })) |
<<<<<<<
if(!m.to && Object.keys(user.rooms).length != 0) {
m.to = m.to || Object.keys(user.rooms);
}
if(typeof m.to != "string" && m.to.length==0) return;
=======
m.to = m.to || Object.keys(user.rooms);
if(typeof m.to != "string" && m.to.length==0)
return;
if(m.type == 'join'){
//check for user login as well
sess.user.membership[roomName] = true;
session.set(conn.sid, sess);
}
if(m.type == 'part'){
//check for user login as well
delete sess.user.membership[roomName];
session.set(conn.sid, sess);
}
>>>>>>>
if(!m.to && Object.keys(user.rooms).length != 0) {
m.to = m.to || Object.keys(user.rooms);
}
if(typeof m.to != "string" && m.to.length==0) return;
if(m.type == 'join'){
//check for user login as well
sess.user.membership[roomName] = true;
session.set(conn.sid, sess);
}
if(m.type == 'part'){
//check for user login as well
delete sess.user.membership[roomName];
session.set(conn.sid, sess);
} |
<<<<<<<
//console.log(name);
return [ "span", {
'class': 'scrollback-message-nick',
onmouseout: function() {
if(self.userStyle) self.userStyle.parentNode.removeChild(self.userStyle);
},
onmouseover: function() {
var ucss = {".scrollback-tread-row": {width: "0 !important"}};
ucss[ ".scrollback-user-" + name] = {
"background": hashColor(message.from) + " !important",
width: "100% !important"
};
self.userStyle = addStyles(ucss);
}
}, (name.indexOf("guest-")===0)?(name.replace("guest-","")):name];
//(name.indexOf("guest-")===0)?(name.replace("guest-","")):name
=======
return [ "span", {
'class': 'scrollback-message-nick',
onmouseout: function() {
if(self.userStyle) self.userStyle.parentNode.removeChild(self.userStyle);
},
onmouseover: function() {
var ucss = {".scrollback-tread-row": {width: "0 !important"}};
ucss[ ".scrollback-user-" + name] = {
"background": hashColor(message.from) + " !important",
width: "100% !important"
};
self.userStyle = addStyles(ucss);
}
}, name ];
>>>>>>>
return [ "span", {
'class': 'scrollback-message-nick',
onmouseout: function() {
if(self.userStyle) self.userStyle.parentNode.removeChild(self.userStyle);
},
onmouseover: function() {
var ucss = {".scrollback-tread-row": {width: "0 !important"}};
ucss[ ".scrollback-user-" + name] = {
"background": hashColor(message.from) + " !important",
width: "100% !important"
};
self.userStyle = addStyles(ucss);
}
}, (name.indexOf("guest-")===0)?(name.replace("guest-","")):name];
<<<<<<<
if (showTimestamp) {
el.push([ "span", { 'class': 'scrollback-message-timestamp'},
"Sent " + prettyDate(message.time, core.time())
]);
}
=======
if (showTimestamp && message.time) {
el.push([ "span", { 'class': 'scrollback-message-timestamp'},
"Sent " + prettyDate(message.time, core.time())
]);
}
>>>>>>>
if (showTimestamp && message.time) {
el.push([ "span", { 'class': 'scrollback-message-timestamp'},
"Sent " + prettyDate(message.time, core.time())
]);
} |
<<<<<<<
var crypto = require("crypto");
/*var log = require("../lib/logger.js")*/
var utils = require("../lib/app-utils.js");
var names = require("../lib/generate.js").names;
=======
var crypto = require('crypto');
var userUtils = require('../lib/user-utils.js');
var names = require('../lib/generate.js').names;
var mathUtils = require('../lib/math-utils.js');
>>>>>>>
var crypto = require("crypto");
var names = require("../lib/generate.js").names;
var userUtils = require('../lib/user-utils.js'); |
<<<<<<<
// safeSends sends the data over the socket only after the socket has
// been initialised
if(libsb.isInited) {
client.send(data);
}else {
queue.push(function() {
client.send(data);
});
}
=======
// safeSends sends the data over the socket only after the socket has
// been initialised
if(libsb.isInited){
client.send(data);
}else{
libsb.on('inited', function(d,n){
client.send(data);
n();
});
}
>>>>>>>
// safeSends sends the data over the socket only after the socket has
// been initialised
if(libsb.isInited) {
client.send(data);
}else {
queue.push(function() {
client.send(data);
});
}
<<<<<<<
function returnPending(action, next) {
return function(newAction) {
var i;
<<<<<<< HEAD
if(newAction.type === "error") return next(newAction);
for(i in action) delete action[i];
for(i in newAction) {
if(newAction.hasOwnProperty(i)) action[i] = newAction[i];
}
=======
console.log("BLAH:",action, newAction);
for(i in action) delete action[i];
for(i in newAction) action[i] = newAction[i];
>>>>>>> 169cfa1bd8111205a4b02d21b921fe117d70f653
next();
};
}
function makeAction(action, props) {
var i;
for(i in action){ delete action[i]; }
<<<<<<< HEAD
for(i in props){ if(props.hasOwnProperty(i)) action[i] = props[i]; }
=======
for(i in props){ action[i] = props[i]; }
>>>>>>> 169cfa1bd8111205a4b02d21b921fe117d70f653
=======
function makeAction(action) {
// action.id = generate.uid();
>>>>>>>
function returnPending(action, next) {
return function(newAction) {
var i;
if(newAction.type === "error") return next(newAction);
for(i in action) delete action[i];
for(i in newAction) {
if(newAction.hasOwnProperty(i)) action[i] = newAction[i];
}
next();
};
}
function makeAction(action, props) {
var i;
for(i in action){ delete action[i]; }
for(i in props){ if(props.hasOwnProperty(i)) action[i] = props[i]; }
<<<<<<<
function sendText(text, next) {
var action = makeAction(text, {to: text.to, type: 'text', text: text.text, from: text.from, id: text.id});
=======
function sendText(text, next){
var action = makeAction({to: text.to, type: 'text', text: text.text, from: text.from, id: text.id, labels: text.labels || {}, mentions: text.mentions || []});
>>>>>>>
function sendText(text, next){
var action = makeAction({to: text.to, type: 'text', text: text.text, from: text.from, id: text.id, labels: text.labels || {}, mentions: text.mentions || []}); |
<<<<<<<
var state = require("./../store/store.js")(core, config );
window.state = state;
require("./store/view-manager.js")(core, config, state);
=======
require("./store/view-manager.js")(core, config, state);
>>>>>>>
state = require("./../store/store.js")(core, config );
window.state = state;
require("./store/view-manager.js")(core, config, state);
<<<<<<<
require("./components/people.js")(core, config, state);
require("./components/discussions.js")(core, config, state);
require("./components/chat.js")(core, config, state);
// JSX components
require("./jsx/sidebar.jsx")(core, config, state);
require("./jsx/profile-card.jsx")(core, config, state);
require("./jsx/home-feed.jsx")(core, config, state);
require("./jsx/people-list.jsx")(core, config, state);
=======
require("./components/appbar-primary.jsx")(core, config, state);
require("./components/appbar-secondary.jsx")(core, config, state);
require("./components/chat.jsx")(core, config, state);
require("./components/home-feed.jsx")(core, config, state);
require("./components/people-list.jsx")(core, config, state);
require("./components/profile-card.jsx")(core, config, state);
require("./components/sidebar.jsx")(core, config, state);
require("./components/thread-feed.jsx")(core, config, state);
>>>>>>>
require("./components/appbar-primary.jsx")(core, config, state);
require("./components/appbar-secondary.jsx")(core, config, state);
require("./components/chat.jsx")(core, config, state);
require("./components/home-feed.jsx")(core, config, state);
require("./components/people-list.jsx")(core, config, state);
require("./components/profile-card.jsx")(core, config, state);
require("./components/sidebar.jsx")(core, config, state);
require("./components/thread-feed.jsx")(core, config, state); |
<<<<<<<
server: {
protocol: "http:",
host: "local.scrollback.io" // localhost:7528
},
analytics: {
"id": "UA-XXXXXXXX-1"
},
localStorage: {
version: 1.0
},
errorception: {
// https://errorception.com/
id: "XXXXXXXXXXXXXXXXX"
}
=======
server: {
protocol: "http:",
host: "//localhost:7528"
},
analytics: {
"id": "UA-XXXXXXXX-1"
},
localStorage: {
version: 1.0
},
errorception: {
id: "XXXXXXXXXXXXXXXXX"//https://errorception.com/ project id
}
>>>>>>>
analytics: {
"id": "UA-XXXXXXXX-1"
},
localStorage: {
version: 1.0
},
errorception: {
// https://errorception.com/
id: "XXXXXXXXXXXXXXXXX"
} |
<<<<<<<
function rangeSelectElement(range, element) {
range.selectNode($(element)[0]);
}
=======
/**
* While there are common ancestors, check to see if they match an element.
* @todo Not sure of return
* @param {RangyRange} range The range to expand.
* @param {array} elements An array of elements to check the current range against.
* @returns {unresolved}
*/
>>>>>>>
function rangeSelectElement(range, element) {
range.selectNode($(element)[0]);
}
/**
* While there are common ancestors, check to see if they match an element.
* @todo Not sure of return
* @param {RangyRange} range The range to expand.
* @param {array} elements An array of elements to check the current range against.
* @returns {unresolved}
*/
<<<<<<<
function rangeReplace(range, html) {
// <strict>
if (!typeIsRange(range)) {
handleInvalidArgumentError('Paramter 1 to rangeReplace is expected to be a range', range);
return;
}
if (!typeIsString(html)) {
handleInvalidArgumentError('Paramter 2 to rangeReplace is expected to be a string', html);
return;
}
// <strict>
=======
function rangeReplace(range, html) {
>>>>>>>
function rangeReplace(range, html) {
// <strict>
if (!typeIsRange(range)) {
handleInvalidArgumentError('Paramter 1 to rangeReplace is expected to be a range', range);
return;
}
if (!typeIsString(html)) {
handleInvalidArgumentError('Paramter 2 to rangeReplace is expected to be a string', html);
return;
}
// <strict>
<<<<<<<
*
* @param {RangyRange} range
=======
*
* @param {RangyRange} selection
>>>>>>>
*
* @param {RangyRange} selection
<<<<<<<
=======
//function rangesToggleWrapper(ranges, tag, options) {
// var applier = rangy.createCssClassApplier(options.classes || '', {
// normalize: true,
// elementTagName: tag,
// elementProperties: options.attributes || {},
// ignoreWhiteSpace: false
// });
// applier.applyToRanges(ranges);
//}
//
//function rangeToggleWrapper(range, tag, options) {
// options = options || {};
// var applier = rangy.createCssClassApplier(options.classes || '', {
// normalize: true,
// elementTagName: tag,
// elementProperties: options.attributes || {}
// });
// if (rangeEmptyTag(range)) {
// var element = $('<' + tag + '/>')
// .addClass(options.classes)
// .attr(options.attributes || {})
// .append(fragmentToHtml(range.cloneContents()));
// rangeReplace(element, range);
// } else {
// applier.toggleRange(range);
// }
//}
/**
* Removes the white space at the start and the end of the selection.
*
* @param {RangyRange} range This is the range of selected text.
*/
>>>>>>>
/**
* Removes the white space at the start and the end of the selection.
*
* @param {RangyRange} range This is the range of selected text.
*/ |
<<<<<<<
$logs = $(".chat-area");
$logs.infinite({
=======
'use strict';
$(".chat-area").infinite({
>>>>>>>
$logs = $(".chat-area");
$logs.infinite({
$(".chat-area").infinite({
<<<<<<<
libsb.on('text-dn', function(text, next) {
if($logs.data("lower-limit"))
$("#logs").addBelow($("<div>").text("New, live text message.").data("index", 42));
})
=======
// libsb.on('text-dn', function(text, next) {
//
// });
setInterval(function() {
var $logs = $("#logs");
if($logs.data("lower-limit")) $("#logs").addBelow($("<div>").text("New, live text message.").data("index", 42));
}, 4000);
>>>>>>>
// libsb.on('text-dn', function(text, next) {
// if($logs.data("lower-limit"))
// $("#logs").addBelow($("<div>").text("New, live text message.").data("index", 42));
// }) |
<<<<<<<
if (changes.session) updateSession(changes.session);
if (changes.user) updateCurrentUser(changes.user);
=======
if (changes.user) updateCurrentUser(changes.user);
buildIndex(changes);
core.emit("statechange", changes);
>>>>>>>
if (changes.session) updateSession(changes.session);
if (changes.user) updateCurrentUser(changes.user);
buildIndex(changes);
core.emit("statechange", changes); |
<<<<<<<
scrollbackApp.controller('rootController' , ['$scope', '$factory', '$location', function($scope, $factory, $location) {
=======
scrollbackApp.controller('rootController' , ['$scope', '$factory', function($scope, $factory) {
$scope.status= {
waiting : false
};
>>>>>>>
scrollbackApp.controller('rootController' , ['$scope', '$factory', '$location', function($scope, $factory, $location) {
$scope.status= {
waiting : false
}; |
<<<<<<<
require('./lib/swipe-events.js');
// libsb files
var libsb = require('./interface/interface-client')(core);
require('./localStorage/localStorage-client')(libsb);
require('./socket/socket-client')(libsb);
//Bootup related
require('./client-init/client-init.js')(libsb);
require('./id-generator/id-generator-client.js')(libsb);
require('./client-entityloader/client-entityloader.js')(libsb);
require('./ui/user-area.js');
require('./ui/infinite.js');
require('./ui/hide-scroll.js');
require('./ui/chat.js');
require('./ui/chat-area.js');
=======
require('./lib/swipe-events.js');
>>>>>>>
require('./lib/swipe-events.js');
// libsb files
var libsb = require('./interface/interface-client')(core);
require('./localStorage/localStorage-client')(libsb);
require('./socket/socket-client')(libsb);
//Bootup related
require('./client-init/client-init.js')(libsb);
require('./id-generator/id-generator-client.js')(libsb);
require('./client-entityloader/client-entityloader.js')(libsb);
require('./ui/infinite.js');
require('./ui/hide-scroll.js');
require('./ui/user-area.js');
require('./ui/chat.js');
require('./ui/chat-area.js');
<<<<<<<
require('./client-init/boot.js')(libsb);
//# sourceMappingURL=libsb.js.map
=======
require('./ui/workarounds.js');
>>>>>>>
require('./client-init/boot.js')(libsb);
require('./ui/workarounds.js');
//# sourceMappingURL=libsb.js.map |
<<<<<<<
=======
log.i(matches, text);
>>>>>>>
<<<<<<<
else a.tags.push("abusive", "hidden");
log(a);
=======
a.tags.push("abusive", "hidden");
>>>>>>>
else a.tags.push("abusive", "hidden");
log.i(matches, text); |
<<<<<<<
config.leveldb.path = "data-test";
=======
config["leveldb-storage"].path = "data-test";
config["leveldb-storage"].global = config.global;
// describe("Just to try something out quick.",function(){
// it("Checking join:", function(done) {
// core.emit("getRooms", {hasMember:"harish"}, function(err, data){
// console.log(data);
// done();
// });
// });
// });
>>>>>>>
config["leveldb-storage"].path = "data-test";
config["leveldb-storage"].global = config.global; |
<<<<<<<
// Handle back button
/*
=======
// On history change, load the appropriate state
>>>>>>>
// Handle back button
// On history change, load the appropriate state
<<<<<<<
});*/
=======
});
>>>>>>>
}); |
<<<<<<<
rooms[element.id].params = JSON.parse(element.params)|| {};
console.log("Caching rooms", element);
=======
console.log(element.params);
try {
rooms[element.id].params = JSON.parse(element.params);
} catch(e) {
rooms[element.id].params = {};
}
console.log("Caching rooms", element.id);
>>>>>>>
try {
rooms[element.id].params = JSON.parse(element.params);
} catch(e) {
rooms[element.id].params = {};
}
console.log("Caching rooms", element.id); |
<<<<<<<
match,
event_name,
selector,
nodes;
=======
match,
event_name,
selector,
nodes,
_this = this;
>>>>>>>
match,
event_name,
selector,
nodes;
_this = this; |
<<<<<<<
for (i = 0; i < interfaces[key].length; i++) {
address = interfaces[key][i].address;
if (address.indexOf(':') === -1) {
debug('add A record for interface: %s %s', key, address);
=======
for (var i = 0; i < interfaces[key].length; i++) {
var iface = interfaces[key][i];
if (iface.internal) {
continue;
}
if (iface.address.indexOf(':') === -1) {
debug('add A record for iface: %s %s', key, iface.address);
>>>>>>>
for (i = 0; i < interfaces[key].length; i++) {
var iface = interfaces[key][i];
if (iface.internal) {
continue;
}
if (iface.address.indexOf(':') === -1) {
debug('add A record for iface: %s %s', key, iface.address); |
<<<<<<<
// Sort sources
this.currentSources = src.sort(compareResolutions);
this.groupedSrc = bucketSources(this.currentSources);
// Pick one by default
var chosen = chooseSrc(this.groupedSrc, this.currentSources);
this.currentResolutionState = {
label: chosen.label,
sources: chosen.sources
=======
// Dispose old resolution menu button before adding new sources
if(player.controlBar.resolutionSwitcher){
player.controlBar.resolutionSwitcher.dispose();
delete player.controlBar.resolutionSwitcher;
}
// Only add those sources which we can (maybe) play
src = src.filter( function(source) {
try {
return ( player.canPlayType( source.type ) !== '' );
} catch (e) {
// If a Tech doesn't yet have canPlayType just add it
return true;
}
});
//Sort sources
src = src.sort(compareResolutions);
groupedSrc = bucketSources(src);
var choosen = chooseSrc(groupedSrc, src);
var menuButton = new ResolutionMenuButton(player, { sources: groupedSrc, initialySelectedLabel: choosen.label , initialySelectedRes: choosen.res , customSourcePicker: settings.customSourcePicker}, settings, label);
videojs.addClass(menuButton.el(), 'vjs-resolution-button');
player.controlBar.resolutionSwitcher = player.controlBar.el_.insertBefore(menuButton.el_, player.controlBar.getChild('fullscreenToggle').el_);
player.controlBar.resolutionSwitcher.dispose = function(){
this.parentNode.removeChild(this);
>>>>>>>
// Only add those sources which we can (maybe) play
src = src.filter( function(source) {
try {
return ( player.canPlayType( source.type ) !== '' );
} catch (e) {
// If a Tech doesn't yet have canPlayType just add it
return true;
}
});
//Sort sources
this.currentSources = src.sort(compareResolutions);
this.groupedSrc = bucketSources(this.currentSources);
// Pick one by default
var chosen = chooseSrc(this.groupedSrc, this.currentSources);
this.currentResolutionState = {
label: chosen.label,
sources: chosen.sources |
<<<<<<<
<a href="javascript:;" title="Add or remove user from subreddit ban, contributor, and moderator lists." class="user-role active">Role</a>\
<a href="javascript:;" title="Edit user flair" class="edit-user-flair">User Flair</a>\
=======
<a href="javascript:;" title="Edit user flair" class="edit-user-flair">User Flair</a>\
<!--a href="javascript:;" title="Nuke chain" class="nuke-comment-chain">Nuke Chain</a-->\
>>>>>>>
<a href="javascript:;" title="Add or remove user from subreddit ban, contributor, and moderator lists." class="user-role active">Role</a>\
<a href="javascript:;" title="Edit user flair" class="edit-user-flair">User Flair</a>\
<!--a href="javascript:;" title="Nuke chain" class="nuke-comment-chain">Nuke Chain</a-->\
<<<<<<<
//
// Refresh the main tab saved subs list (with checkboxes)
//
// move this code in from the two other places it was
var $table = $(this).parents('.mod-popup').find('tbody'),
currentsub = $('#subreddit').text();
$table.html(''); //clear all the current subs.
=======
$('.the-nuclear-option').prop('checked', (JSON.parse(localStorage["Toolbox.ModButton.globalbutton"] || "false")));
$('.save').hide();
$('.mod-action').hide();
$('.subs-body').hide();
$('.ban-note').hide();
$('.global-button').hide();
$('.edit-user-flair').hide();
$('.nuke-comment-chain').hide();
$('.edit-dropdown').hide();
$('.settingSave').show();
$('.edit-subreddits').show();
});
function updateSavedSubs(){
savedSubs = TBUtils.saneSort(savedSubs);
savedSub = TBUtils.setting('ModButton', 'sublist', null, savedSubs);
$('.remove-dropdown').find('option').remove();
>>>>>>>
//
// Refresh the main tab saved subs list (with checkboxes)
//
// move this code in from the two other places it was
var $table = $(this).parents('.mod-popup').find('tbody'),
currentsub = $('#subreddit').text();
$table.html(''); //clear all the current subs.
<<<<<<<
// TODO: replace this with a real tab view controller so we don't have to duplicate these lines all the time
$(this).parents('.mod-popup').find('.edit-user-flair').removeClass('active');
$(this).parents('.mod-popup').find('.user-role').addClass('active');
$(this).parents('.mod-popup').find('.edit-modbutton-settings').removeClass('active');
$(this).parents('.mod-popup').find('.mod-popup-tab-settings').hide();
$(this).parents('.mod-popup').find('.mod-popup-tab-flair').hide();
$(this).parents('.mod-popup').find('.mod-popup-tab-role').show();
=======
$('.save').show();
$('.mod-action').show();
$('.subs-body').show();
$('.ban-note').show();
$('.global-button').show();
$('.edit-user-flair').show();
$('.nuke-comment-chain').show();
$('.edit-dropdown').show();
$('.settingSave').hide();
$('.edit-subreddits').hide();
>>>>>>>
// TODO: replace this with a real tab view controller so we don't have to duplicate these lines all the time
$(this).parents('.mod-popup').find('.edit-user-flair').removeClass('active');
$(this).parents('.mod-popup').find('.user-role').addClass('active');
$(this).parents('.mod-popup').find('.edit-modbutton-settings').removeClass('active');
$(this).parents('.mod-popup').find('.mod-popup-tab-settings').hide();
$(this).parents('.mod-popup').find('.mod-popup-tab-flair').hide();
$(this).parents('.mod-popup').find('.mod-popup-tab-role').show(); |
<<<<<<<
export const ID = 'transactionHistory'
=======
function sum (txns, address, asset) {
const matchingTxns = filter(txns, (txn) => {
return txn.asset === asset && txn.address_hash === address
})
return reduce(matchingTxns, (sum, txn) => {
return sum.plus(txn.value)
}, toBigNumber(0))
}
export const ID = 'TRANSACTION_HISTORY'
>>>>>>>
function sum (txns, address, asset) {
const matchingTxns = filter(txns, (txn) => {
return txn.asset === asset && txn.address_hash === address
})
return reduce(matchingTxns, (sum, txn) => {
return sum.plus(txn.value)
}, toBigNumber(0))
}
export const ID = 'transactionHistory' |
<<<<<<<
* @param {Object|null} [options] => https server options
=======
* @param {Function|null} [errorCallback]
* @param {Object|null} [options]
>>>>>>>
* @param {Object|null} [options] => https server options
* @param {Function|null} [errorCallback]
* @param {Object|null} [options] |
<<<<<<<
_.each(['creds', 'servers', 'atomServer', 'crypto', 'system'], function (cmdName) {
=======
_.each(['creds', 'servers', 'crypto', 'system', 'pinning'], function (cmdName) {
>>>>>>>
_.each(['creds', 'servers', 'atomServer', 'crypto', 'system', 'pinning'], function (cmdName) { |
<<<<<<<
const ocspCachePeriod = process.env.BEAME_OSCSP_CACHE_PERIOD || 1000 * 60 * 60 * 24 * 30;
const ocspCheckInterval = process.env.BEAME_OCSP_CHECK_INTERVAL || 1000 * 60 * 60 * 24;
const renewalCheckInterval = process.env.BEAME_RENEWAL_CHECK_INTERVAL || 1000 * 60 * 60 * 24;
=======
const defaultDays2Log = 7;
const ocspCachePeriod = 1000 * 60 * 60 * 24 * 30;
>>>>>>>
const defaultDays2Log = 7;
const ocspCachePeriod = process.env.BEAME_OSCSP_CACHE_PERIOD || 1000 * 60 * 60 * 24 * 30;
const ocspCheckInterval = process.env.BEAME_OCSP_CHECK_INTERVAL || 1000 * 60 * 60 * 24;
const renewalCheckInterval = process.env.BEAME_RENEWAL_CHECK_INTERVAL || 1000 * 60 * 60 * 24;
<<<<<<<
defaultTimeFuzz,
CDREvents,
OcspStatus,
AuthEventType,
AltPrefix
=======
defaultTimeFuzz,
LogFileNames,
LogEvents,
localLogDir,
defaultDays2Log
>>>>>>>
defaultTimeFuzz,
CDREvents,
OcspStatus,
AuthEventType,
AltPrefix,
LogFileNames,
LogEvents,
localLogDir,
defaultDays2Log |
<<<<<<<
determineCertStatus() {
if (this.dirShaStatus && this.dirShaStatus.length !== 0) {
//
// This means this is a brand new object and we dont know anything at all
this.credentials = this.readCertificateDir();
}
if (this.hasKey(config.CertificateFiles.X509)) {
this.state = this.state | config.CredentialStatus.CERT;
}
if (this.state & config.CredentialStatus.CERT && this.extractCommonName().indexOf("beameio.net")) {
this.state = this.state | config.CredentialStatus.BEAME_ISSUED_CERT;
this.state = this.state & config.CredentialStatus.NON_BEAME_CERT;
} else {
this.state = this.state | config.CredentialStatus.BEAME_ISSUED_CERT;
this.state = this.state & config.CredentialStatus.NON_BEAME_CERT;
}
if (this.hasKey(config.CertificateFiles.PRIVATE_KEY)) {
this.state = this.state & config.CredentialStatus.PRIVATE_KEY;
} else {
this.state = this.state | config.CredentialStatus.PRIVATE_KEY;
}
}
=======
>>>>>>>
determineCertStatus() {
if (this.dirShaStatus && this.dirShaStatus.length !== 0) {
//
// This means this is a brand new object and we dont know anything at all
this.credentials = this.readCertificateDir();
}
if (this.hasKey("X509")) {
this.state = this.state | config.CredentialStatus.CERT;
}
if (this.state & config.CredentialStatus.CERT && this.extractCommonName().indexOf("beameio.net")) {
this.state = this.state | config.CredentialStatus.BEAME_ISSUED_CERT;
this.state = this.state & config.CredentialStatus.NON_BEAME_CERT;
} else {
this.state = this.state | config.CredentialStatus.BEAME_ISSUED_CERT;
this.state = this.state & config.CredentialStatus.NON_BEAME_CERT;
}
if (this.hasKey("PRIVATE_KEY")) {
this.state = this.state & config.CredentialStatus.PRIVATE_KEY;
} else {
this.state = this.state | config.CredentialStatus.PRIVATE_KEY;
}
} |
<<<<<<<
setReadOnly( utils, 'isObjectLike', require( '@stdlib/utils/is-object-like' ) );
setReadOnly( utils, 'isBuffer', require( '@stdlib/utils/is-buffer' ) );
setReadOnly( utils, 'isString', require( '@stdlib/utils/is-string' ) );
=======
setReadOnly( utils, 'isPrimitive', require( '@stdlib/utils/is-primitive' ) );
setReadOnly( utils, 'isBoolean', require( '@stdlib/utils/is-boolean' ) );
>>>>>>>
setReadOnly( utils, 'isObjectLike', require( '@stdlib/utils/is-object-like' ) );
setReadOnly( utils, 'isBuffer', require( '@stdlib/utils/is-buffer' ) );
setReadOnly( utils, 'isString', require( '@stdlib/utils/is-string' ) );
setReadOnly( utils, 'isPrimitive', require( '@stdlib/utils/is-primitive' ) );
setReadOnly( utils, 'isBoolean', require( '@stdlib/utils/is-boolean' ) );
<<<<<<<
=======
setReadOnly( utils, 'isString', require( '@stdlib/utils/is-string' ) );
>>>>>>>
setReadOnly( utils, 'isString', require( '@stdlib/utils/is-string' ) ); |
<<<<<<<
import { doClaimAllGas, doSendAsset } from '../wallet/api.js';
import { sendEvent, clearTransactionEvent } from '../modules/transactions';
import { setClaimRequest, disableClaim } from '../modules/claim';
=======
import { doClaimAllGas, doSendAsset } from 'neon-js';
import { sendEvent, clearTransactionEvent, setClaimRequest, disableClaim } from '../actions/index.js';
>>>>>>>
import { setClaimRequest, disableClaim } from '../modules/claim';
import { sendEvent, clearTransactionEvent } from '../modules/transactions';
import { doClaimAllGas, doSendAsset } from 'neon-js'; |
<<<<<<<
promise = $q.when(httpConfig),
self = this;
=======
abortDeferred = $q.defer();
function abortRequest() {
abortDeferred.resolve();
}
if (httpConfig && httpConfig.timeout) {
if (httpConfig.timeout > 0) {
timeoutPromise = $timeout(abortDeferred.resolve, httpConfig.timeout);
} else if (angular.isFunction(httpConfig.timeout.then)) {
httpConfig.timeout.then(abortDeferred.resolve);
}
}
httpConfig = angular.extend({}, httpConfig, {timeout: abortDeferred.promise});
promise = $q.when(httpConfig);
>>>>>>>
abortDeferred = $q.defer();
self = this;
function abortRequest() {
abortDeferred.resolve();
}
if (httpConfig && httpConfig.timeout) {
if (httpConfig.timeout > 0) {
timeoutPromise = $timeout(abortDeferred.resolve, httpConfig.timeout);
} else if (angular.isFunction(httpConfig.timeout.then)) {
httpConfig.timeout.then(abortDeferred.resolve);
}
}
httpConfig = angular.extend({}, httpConfig, {timeout: abortDeferred.promise});
promise = $q.when(httpConfig);
<<<<<<<
promise = this.runInterceptorPhase('afterDeserialize', context, promise);
promise.resource = config.resourceConstructor;
promise.context = context;
return promise;
=======
return extendPromise(promise, {
resource: config.resourceConstructor,
context: context,
abort: abortRequest
});
>>>>>>>
promise = this.runInterceptorPhase('afterDeserialize', context, promise);
return extendPromise(promise, {
resource: config.resourceConstructor,
context: context,
abort: abortRequest
}); |
<<<<<<<
it('should allow changing urls after first operation', function () {
$httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
Test.get(123);
$httpBackend.flush();
$httpBackend.expectGET('/test2/123').respond(200, {test: {id: 123, abc: 'xyz'}});
Test.config.url = '/test2';
Test.get(123);
$httpBackend.flush();
});
=======
it('should support constructing with date properties', function () {
var testDate = new Date(),
test = new Test({id: 123, testDate: testDate});
expect(test.testDate).toBe(testDate);
});
>>>>>>>
it('should allow changing urls after first operation', function () {
$httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
Test.get(123);
$httpBackend.flush();
$httpBackend.expectGET('/test2/123').respond(200, {test: {id: 123, abc: 'xyz'}});
Test.config.url = '/test2';
Test.get(123);
$httpBackend.flush();
});
it('should support constructing with date properties', function () {
var testDate = new Date(),
test = new Test({id: 123, testDate: testDate});
expect(test.testDate).toBe(testDate);
}); |
<<<<<<<
import tr from './tr.yml'
=======
import pl from './pl.yml'
>>>>>>>
import tr from './tr.yml'
import pl from './pl.yml'
<<<<<<<
tr,
=======
pl,
>>>>>>>
tr,
pl, |
<<<<<<<
{privacyPolicyLink}
=======
>>>>>>>
{privacyPolicyLink}
<<<<<<<
{secondButton}
{acceptButton}
=======
<button className="cm-btn cm-btn-success" type="button" onClick={this.saveAndHide}>{t(['ok'])}</button>
<button className="cm-btn" type="button" onClick={this.declineAndHide}>{t(['decline'])}</button>
<button className="cm-btn cm-btn-info" type="button" onClick={this.showModal}>{t(['consentNotice', 'learnMore'])}</button>
>>>>>>>
<button className="cm-btn cm-btn-success" type="button" onClick={this.saveAndHide}>{t(['ok'])}</button>
<button className="cm-btn" type="button" onClick={this.declineAndHide}>{t(['decline'])}</button>
<button className="cm-btn cm-btn-info" type="button" onClick={this.showModal}>{t(['consentNotice', 'learnMore'])}</button> |
<<<<<<<
import { getAccountFromWIFKey, decryptWIF } from 'neon-js'
import { verifyPrivateKey, validatePassphrase } from '../core/wallet'
=======
import { verifyPrivateKey } from '../core/wallet'
>>>>>>>
import { verifyPrivateKey, validatePassphrase } from '../core/wallet'
<<<<<<<
import { ROUTES } from '../core/constants'
=======
import { getAccountFromWIFKey, getPublicKeyEncoded, getAccountFromPublicKey } from 'neon-js'
import commNode from '../ledger/ledger-comm-node'
import { BIP44_PATH } from '../core/constants'
import asyncWrap from '../core/asyncHelper'
import { ledgerNanoSCreateSignatureAsync } from '../ledger/ledgerNanoS'
>>>>>>>
import { getAccountFromWIFKey, getPublicKeyEncoded, getAccountFromPublicKey, decryptWIF } from 'neon-js'
import commNode from '../ledger/ledger-comm-node'
import { BIP44_PATH, ROUTES } from '../core/constants'
import asyncWrap from '../core/asyncHelper'
import { ledgerNanoSCreateSignatureAsync } from '../ledger/ledgerNanoS'
<<<<<<<
export const loginNep2 = (passphrase: string, wif: string, history: Object) => (dispatch: DispatchType) => {
if (!validatePassphrase(passphrase)) {
dispatch(sendEvent(false, 'Passphrase too short'))
setTimeout(() => dispatch(clearTransactionEvent()), 5000)
}
dispatch(sendEvent(true, 'Decrypting encoded key...'))
const wrongPassphraseOrEncryptedKeyError = () => {
dispatch(sendEvent(false, 'Wrong passphrase or invalid encrypted key'))
setTimeout(() => dispatch(clearTransactionEvent()), 5000)
}
setTimeout(() => {
try {
decryptWIF(wif, passphrase).then((wif) => {
dispatch(login(wif))
history.push(ROUTES.DASHBOARD)
dispatch(clearTransactionEvent())
}).catch(() => {
wrongPassphraseOrEncryptedKeyError()
})
} catch (e) {
wrongPassphraseOrEncryptedKeyError()
}
}, 500)
}
export const loginWithPrivateKey = (wif: string, history: Object, route?: RouteType) => (dispatch: DispatchType) => {
=======
export function hardwareDeviceInfo (hardwareDeviceInfo: string) {
return {
type: HARDWARE_DEVICE_INFO,
hardwareDeviceInfo
}
}
export function hardwarePublicKeyInfo (hardwarePublicKeyInfo: string) {
return {
type: HARDWARE_PUBLIC_KEY_INFO,
hardwarePublicKeyInfo
}
}
export function hardwarePublicKey (publicKey: string) {
return {
type: HARDWARE_PUBLIC_KEY,
publicKey
}
}
export const onWifChange = (history: Object, wif: string) => (dispatch: DispatchType) => {
>>>>>>>
export const loginNep2 = (passphrase: string, wif: string, history: Object) => (dispatch: DispatchType) => {
if (!validatePassphrase(passphrase)) {
dispatch(sendEvent(false, 'Passphrase too short'))
setTimeout(() => dispatch(clearTransactionEvent()), 5000)
}
dispatch(sendEvent(true, 'Decrypting encoded key...'))
const wrongPassphraseOrEncryptedKeyError = () => {
dispatch(sendEvent(false, 'Wrong passphrase or invalid encrypted key'))
setTimeout(() => dispatch(clearTransactionEvent()), 5000)
}
setTimeout(() => {
try {
decryptWIF(wif, passphrase).then((wif) => {
dispatch(login(wif))
history.push(ROUTES.DASHBOARD)
dispatch(clearTransactionEvent())
}).catch(() => {
wrongPassphraseOrEncryptedKeyError()
})
} catch (e) {
wrongPassphraseOrEncryptedKeyError()
}
}, 500)
}
export function hardwareDeviceInfo (hardwareDeviceInfo: string) {
return {
type: HARDWARE_DEVICE_INFO,
hardwareDeviceInfo
}
}
export function hardwarePublicKeyInfo (hardwarePublicKeyInfo: string) {
return {
type: HARDWARE_PUBLIC_KEY_INFO,
hardwarePublicKeyInfo
}
}
export function hardwarePublicKey (publicKey: string) {
return {
type: HARDWARE_PUBLIC_KEY,
publicKey
}
}
export const loginWithPrivateKey = (wif: string, history: Object, route?: RouteType) => (dispatch: DispatchType) => {
<<<<<<<
return {
...state,
wif: null,
address: null,
loggedIn: false
}
=======
return {...state, 'wif': null, address: null, 'loggedIn': false, decrypting: false, signingFunction: null, publicKey: null}
case SET_DECRYPTING:
return {...state, decrypting: action.state}
>>>>>>>
return {...state, 'wif': null, address: null, 'loggedIn': false, decrypting: false, signingFunction: null, publicKey: null}
<<<<<<<
return {
...state,
accountKeys: action.keys
}
=======
return {...state, accountKeys: action.keys}
case HARDWARE_DEVICE_INFO:
return {...state, hardwareDeviceInfo: action.hardwareDeviceInfo}
case HARDWARE_PUBLIC_KEY_INFO:
return {...state, hardwarePublicKeyInfo: action.hardwarePublicKeyInfo}
case HARDWARE_PUBLIC_KEY:
return {...state, publicKey: action.publicKey}
>>>>>>>
return {...state, accountKeys: action.keys}
case HARDWARE_DEVICE_INFO:
return {...state, hardwareDeviceInfo: action.hardwareDeviceInfo}
case HARDWARE_PUBLIC_KEY_INFO:
return {...state, hardwarePublicKeyInfo: action.hardwarePublicKeyInfo}
case HARDWARE_PUBLIC_KEY:
return {...state, publicKey: action.publicKey} |
<<<<<<<
return acc;
}
return acc.concat({
output,
suggestionIndex: _.suggestionIndex
});
}, [])
.filter(_ => !!_);
if (!outputsAndSuggestions.length) {
return false;
}
if (dispatch) {
const tr = state.tr;
outputsAndSuggestions.forEach(({ output, suggestionIndex }) => {
const suggestion = output.suggestions && output.suggestions[suggestionIndex];
if (!suggestion) {
return false;
=======
return acc;
}
return acc.concat({
output,
suggestionIndex: _.suggestionIndex
});
}, [])
.filter(_ => !!_);
if (!outputsAndSuggestions.length) {
return false;
}
if (dispatch) {
const tr = state.tr;
outputsAndSuggestions.forEach(({ output, suggestionIndex }) => {
const suggestion = output.suggestions && output.suggestions[suggestionIndex];
if (!suggestion) {
return false;
>>>>>>>
return acc;
}
return acc.concat({
output,
suggestionIndex: _.suggestionIndex
});
}, [])
.filter(_ => !!_);
if (!outputsAndSuggestions.length) {
return false;
}
if (dispatch) {
const tr = state.tr;
outputsAndSuggestions.forEach(({ output, suggestionIndex }) => {
const suggestion = output.suggestions && output.suggestions[suggestionIndex];
if (!suggestion) {
return false;
<<<<<<<
return true;
};
const createBoundCommands = ({ state, dispatch }, getState) => {
const bindCommand = (action) => (...args) => action(...args)(state, dispatch);
return {
validateDocument: () => validateDocumentCommand(state, dispatch),
applyValidationResult: bindCommand(applyValidationResponseCommand),
applyValidationError: bindCommand(applyValidationErrorCommand),
applySuggestions: (suggestionOpts) => applySuggestionsCommand(suggestionOpts, getState)(state, dispatch),
selectValidation: (validationId) => selectValidationCommand(validationId, getState)(state, dispatch),
indicateHover: bindCommand(indicateHoverCommand),
setDebugState: bindCommand(setDebugStateCommand)
};
};
//# sourceMappingURL=commands.js.map
=======
return true;
};
const createBoundCommands = (view, getState) => {
const bindCommand = (action) => (...args) => action(...args)(view.state, view.dispatch);
return {
validateDocument: () => validateDocumentCommand(view.state, view.dispatch),
applyValidationResult: bindCommand(applyValidationResponseCommand),
applyValidationError: bindCommand(applyValidationErrorCommand),
applySuggestions: (suggestionOpts) => applySuggestionsCommand(suggestionOpts, getState)(view.state, view.dispatch),
selectValidation: (validationId) => selectValidationCommand(validationId, getState)(view.state, view.dispatch),
indicateHover: bindCommand(indicateHoverCommand),
setDebugState: bindCommand(setDebugStateCommand)
};
};
>>>>>>>
return true;
};
const createBoundCommands = (view, getState) => {
const bindCommand = (action) => (...args) => action(...args)(view.state, view.dispatch);
return {
validateDocument: () => validateDocumentCommand(view.state, view.dispatch),
applyValidationResult: bindCommand(applyValidationResponseCommand),
applyValidationError: bindCommand(applyValidationErrorCommand),
applySuggestions: (suggestionOpts) => applySuggestionsCommand(suggestionOpts, getState)(view.state, view.dispatch),
selectValidation: (validationId) => selectValidationCommand(validationId, getState)(view.state, view.dispatch),
indicateHover: bindCommand(indicateHoverCommand),
setDebugState: bindCommand(setDebugStateCommand)
};
};
//# sourceMappingURL=commands.js.map
<<<<<<<
init: (_, { doc }) => createInitialState(doc, throttleInMs, maxThrottle),
=======
init(_, { doc }) {
validationService.on(ValidationEvents.VALIDATION_SUCCESS, (validationResponse) => localView.dispatch(localView.state.tr.setMeta(VALIDATION_PLUGIN_ACTION, validationRequestSuccess(validationResponse))));
validationService.on(ValidationEvents.VALIDATION_ERROR, (validationError) => localView.dispatch(localView.state.tr.setMeta(VALIDATION_PLUGIN_ACTION, validationRequestError(validationError))));
return createInitialState(doc, throttleInMs, maxThrottle);
},
>>>>>>>
init: (_, { doc }) => createInitialState(doc, throttleInMs, maxThrottle),
<<<<<<<
commands.indicateHover(newValidationId, getStateHoverInfoFromEvent(event, view.dom, heightMarker));
=======
indicateHoverCommand(newValidationId, getStateHoverInfoFromEvent(event, view.dom, heightMarker))(localView.state, localView.dispatch);
>>>>>>>
indicateHoverCommand(newValidationId, getStateHoverInfoFromEvent(event, view.dom, heightMarker))(localView.state, localView.dispatch);
<<<<<<<
const commands = createBoundCommands(localView, plugin.getState.bind(plugin));
=======
>>>>>>>
<<<<<<<
//# sourceMappingURL=regex.js.map
class EventEmitter {
constructor() {
this.events = {};
}
on(event, listener) {
if (typeof this.events[event] !== "object") {
this.events[event] = [];
}
this.events[event].push(listener);
return () => this.removeListener(event, listener);
}
removeListener(event, listener) {
if (typeof this.events[event] !== "object") {
return;
}
const idx = this.events[event].indexOf(listener);
if (idx > -1) {
this.events[event].splice(idx, 1);
}
}
removeAllListeners() {
Object.keys(this.events).forEach((event) => this.events[event].splice(0, this.events[event].length));
}
emit(event, ...args) {
if (typeof this.events[event] !== "object") {
return;
}
[...this.events[event]].forEach(listener => listener.apply(this, args));
}
once(event, listener) {
const remove = this.on(event, (...args) => {
remove();
listener.apply(this, args);
});
return remove;
}
}
//# sourceMappingURL=EventEmitter.js.map
class ValidationService extends EventEmitter {
constructor(store, commands, adapter) {
super();
this.store = store;
this.commands = commands;
this.adapter = adapter;
this.cancelValidation = () => {
this.cancelValidation();
};
this.handleError = (validationInput, id, message) => {
this.commands.applyValidationError({
validationInput,
id,
message
});
};
this.handleCompleteValidation = (id, validationInput, validationOutputs) => {
this.commands.applyValidationResult({
id,
validationInput,
validationOutputs
});
};
this.store.subscribe((state, prevState) => {
if (!prevState.validationInFlight && state.validationInFlight) {
this.validate(state.validationInFlight.validationInputs, state.trHistory[state.trHistory.length - 1].time);
}
});
}
validate(inputs, id) {
return __awaiter(this, void 0, void 0, function* () {
const results = yield Promise.all(inputs.map((input) => __awaiter(this, void 0, void 0, function* () {
try {
const result = yield this.adapter(input);
this.handleCompleteValidation(id, input, result);
return result;
}
catch (e) {
this.handleError(input, id, e.message);
return {
validationInput: input,
message: e.message,
id
};
}
})));
return flatten_1(results);
});
}
}
//# sourceMappingURL=ValidationAPIService.js.map
=======
//# sourceMappingURL=regex.js.map
>>>>>>>
//# sourceMappingURL=regex.js.map
class EventEmitter {
constructor() {
this.events = {};
}
on(event, listener) {
if (typeof this.events[event] !== "object") {
this.events[event] = [];
}
this.events[event].push(listener);
return () => this.removeListener(event, listener);
}
removeListener(event, listener) {
if (typeof this.events[event] !== "object") {
return;
}
const idx = this.events[event].indexOf(listener);
if (idx > -1) {
this.events[event].splice(idx, 1);
}
}
removeAllListeners() {
Object.keys(this.events).forEach((event) => this.events[event].splice(0, this.events[event].length));
}
emit(event, ...args) {
if (typeof this.events[event] !== "object") {
return;
}
[...this.events[event]].forEach(listener => listener.apply(this, args));
}
once(event, listener) {
const remove = this.on(event, (...args) => {
remove();
listener.apply(this, args);
});
return remove;
}
}
//# sourceMappingURL=EventEmitter.js.map
class ValidationService extends EventEmitter {
constructor(store, commands, adapter) {
super();
this.store = store;
this.commands = commands;
this.adapter = adapter;
this.cancelValidation = () => {
this.cancelValidation();
};
this.handleError = (validationInput, id, message) => {
this.commands.applyValidationError({
validationInput,
id,
message
});
};
this.handleCompleteValidation = (id, validationInput, validationOutputs) => {
this.commands.applyValidationResult({
id,
validationInput,
validationOutputs
});
};
this.store.subscribe((state, prevState) => {
if (!prevState.validationInFlight && state.validationInFlight) {
this.validate(state.validationInFlight.validationInputs, state.trHistory[state.trHistory.length - 1].time);
}
});
}
validate(inputs, id) {
return __awaiter(this, void 0, void 0, function* () {
const results = yield Promise.all(inputs.map((input) => __awaiter(this, void 0, void 0, function* () {
try {
const result = yield this.adapter(input);
this.handleCompleteValidation(id, input, result);
return result;
}
catch (e) {
this.handleError(input, id, e.message);
return {
validationInput: input,
message: e.message,
id
};
}
})));
return flatten_1(results);
});
}
}
//# sourceMappingURL=ValidationAPIService.js.map
<<<<<<<
const controlsElement = document.querySelector("#controls");
const { plugin: validatorPlugin, store, commands } = createValidatorPlugin();
const validationService = new ValidationService(store, commands, regexAdapter);
=======
const controlsElement = document.querySelector('#controls');
const { plugin: validatorPlugin, store, getState } = createValidatorPlugin({
adapter: regexAdapter
});
>>>>>>>
const controlsElement = document.querySelector("#controls");
const { plugin: validatorPlugin, store, getState } = createValidatorPlugin(); |
<<<<<<<
title = _props.title,
animation = _props.animation;
=======
title = _props.title,
optimized = _props.optimized,
zIndex = _props.zIndex;
>>>>>>>
title = _props.title,
animation = _props.animation;
optimized = _props.optimized,
zIndex = _props.zIndex;
<<<<<<<
draggable: draggable,
animation: animation
=======
draggable: draggable,
optimized: optimized,
zIndex: zIndex
>>>>>>>
draggable: draggable,
animation: animation
optimized: optimized,
zIndex: zIndex |
<<<<<<<
chrome.storage.sync.get(
{
lastLaunchedVersion: thisVersion,
},
() => {
chrome.storage.sync.get(
{
AutoJoinButton: false,
AutoDescription: true,
IgnoreGroups: false,
IgnorePinned: true,
IgnoreWhitelist: false,
IgnoreGroupsBG: false,
IgnorePinnedBG: true,
PageForBG: 'wishlist',
RepeatHoursBG: 5,
PagesToLoad: 3,
PagesToLoadBG: 2,
BackgroundAJ: false,
LevelPriorityBG: true,
OddsPriorityBG: false,
lastLaunchedVersion: thisVersion,
InfiniteScrolling: true,
ShowPoints: true,
ShowButtons: true,
LoadFive: false,
HideDlc: false,
HideEntered: false,
HideGroups: false,
HideNonTradingCards: false,
HideWhitelist: false,
HideLevelsBelow: 0,
PriorityGroup: false,
PriorityRegion: false,
PriorityWhitelist: false,
PriorityWishlist: true,
RepeatIfOnPage: false,
RepeatHours: 5,
NightTheme: false,
LevelPriority: false,
PlayAudio: true,
AudioVolume: 1,
DelayBG: 10,
Delay: 10,
MinLevelBG: 0,
MinCost: 0,
MinCostBG: 0,
MaxCost: -1,
MaxCostBG: -1,
ShowChance: true,
PreciseTime: false,
},
data => {
settings = data;
loadCache();
}
);
}
);
=======
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', getSettings);
} else {
getSettings();
}
function getSettings() {
chrome.storage.sync.get(
{
lastLaunchedVersion: thisVersion,
},
() => {
chrome.storage.sync.get(
{
AutoJoinButton: false,
AutoDescription: true,
IgnoreGroups: false,
IgnorePinned: true,
IgnoreWhitelist: false,
IgnoreGroupsBG: false,
IgnorePinnedBG: true,
PageForBG: 'wishlist',
RepeatHoursBG: 5,
PagesToLoad: 3,
PagesToLoadBG: 2,
BackgroundAJ: false,
LevelPriorityBG: true,
OddsPriorityBG: false,
lastLaunchedVersion: thisVersion,
InfiniteScrolling: true,
ShowPoints: true,
ShowButtons: true,
LoadFive: false,
HideDlc: false,
HideEntered: false,
HideGroups: false,
HideNonTradingCards: false,
HideWhitelist: false,
HideLevelsBelow: 0,
PriorityGroup: false,
PriorityRegion: false,
PriorityWhitelist: false,
PriorityWishlist: true,
RepeatIfOnPage: false,
RepeatHours: 5,
NightTheme: false,
LevelPriority: false,
PlayAudio: true,
AudioVolume: 1,
DelayBG: 10,
Delay: 10,
MinLevelBG: 0,
MinCost: 0,
MinCostBG: 0,
ShowChance: true,
PreciseTime: false,
},
data => {
settings = data;
loadCache();
}
);
}
);
}
>>>>>>>
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', getSettings);
} else {
getSettings();
}
function getSettings() {
chrome.storage.sync.get(
{
lastLaunchedVersion: thisVersion,
},
() => {
chrome.storage.sync.get(
{
AutoJoinButton: false,
AutoDescription: true,
IgnoreGroups: false,
IgnorePinned: true,
IgnoreWhitelist: false,
IgnoreGroupsBG: false,
IgnorePinnedBG: true,
PageForBG: 'wishlist',
RepeatHoursBG: 5,
PagesToLoad: 3,
PagesToLoadBG: 2,
BackgroundAJ: false,
LevelPriorityBG: true,
OddsPriorityBG: false,
lastLaunchedVersion: thisVersion,
InfiniteScrolling: true,
ShowPoints: true,
ShowButtons: true,
LoadFive: false,
HideDlc: false,
HideEntered: false,
HideGroups: false,
HideNonTradingCards: false,
HideWhitelist: false,
HideLevelsBelow: 0,
PriorityGroup: false,
PriorityRegion: false,
PriorityWhitelist: false,
PriorityWishlist: true,
RepeatIfOnPage: false,
RepeatHours: 5,
NightTheme: false,
LevelPriority: false,
PlayAudio: true,
AudioVolume: 1,
DelayBG: 10,
Delay: 10,
MinLevelBG: 0,
MinCost: 0,
MinCostBG: 0,
MaxCost: -1,
MaxCostBG: -1,
ShowChance: true,
PreciseTime: false,
},
data => {
settings = data;
loadCache();
}
);
}
);
} |
<<<<<<<
it('should be able to abort a stream piped directly to Amazon S3 if max file using the multi part upload', function(done) {
var testLength = 7242880,
chunkSize = 2048,
stream = new mockstream.MockDataStream({chunkSize: chunkSize, streamLength: testLength}),
opts = {
client: client, objectName: Date.now() + '.txt', stream: stream, maxUploadSize : testLength/2
},
mpu = null;
// Upload the file
mpu = new MultiPartUpload(opts, function(err, body) {
assert.equal(err, "reached maxUploadSize");
//Check that the file does not exist
client.getFile(opts.objectName, function(err, res) {
if (err) return done('Could not get file [' + err + ']');
assert.equal(res.statusCode, 404);
return done();
});
});
stream.start();
});
=======
>>>>>>>
it('should be able to abort a stream piped directly to Amazon S3 if max file using the multi part upload', function(done) {
var testLength = 7242880,
chunkSize = 2048,
stream = new mockstream.MockDataStream({chunkSize: chunkSize, streamLength: testLength}),
opts = {
client: client, objectName: Date.now() + '.txt', stream: stream, maxUploadSize : testLength/2
},
mpu = null;
// Upload the file
mpu = new MultiPartUpload(opts, function(err, body) {
assert.equal(err, "reached maxUploadSize");
//Check that the file does not exist
client.getFile(opts.objectName, function(err, res) {
if (err) return done('Could not get file [' + err + ']');
assert.equal(res.statusCode, 404);
return done();
});
});
stream.start();
}); |
<<<<<<<
import { wallet, api } from 'neon-js'
import { flatten } from 'lodash-es'
=======
import { wallet, api } from '@cityofzion/neon-js'
import { flatten, isEmpty } from 'lodash-es'
>>>>>>>
import { flatten } from 'lodash-es'
import { wallet, api } from '@cityofzion/neon-js' |
<<<<<<<
window.WAPI._serializeNumberStatusObj = (obj) => {
if (obj == undefined) {
return null;
}
return Object.assign({}, {
id: obj.jid,
status: obj.status,
isBusiness: (obj.biz === true),
canReceiveMessage: (obj.status === 200)
});
};
window.WAPI.checkNumberStatus = async function (id) {
try {
const result = await window.Store.WapQuery.queryExist(id);
if (result.jid === undefined) throw 404;
const data = window.WAPI._serializeNumberStatusObj(result);
if (data.status == 200) data.numberExists = true
return data;
} catch (e) {
return window.WAPI._serializeNumberStatusObj({
status: e,
jid: id
});
}
};
=======
window.WAPI.downloadFileWithCredentials = async function (url) {
if(!axios || !url) return false;
const ab = (await axios.get(url,{responseType: 'arraybuffer'})).data
return btoa(new Uint8Array(ab).reduce((data, byte) => data + String.fromCharCode(byte), ''));
};
>>>>>>>
window.WAPI.downloadFileWithCredentials = async function (url) {
if(!axios || !url) return false;
const ab = (await axios.get(url,{responseType: 'arraybuffer'})).data
return btoa(new Uint8Array(ab).reduce((data, byte) => data + String.fromCharCode(byte), ''));
};
window.WAPI._serializeNumberStatusObj = (obj) => {
if (obj == undefined) {
return null;
}
return Object.assign({}, {
id: obj.jid,
status: obj.status,
isBusiness: (obj.biz === true),
canReceiveMessage: (obj.status === 200)
});
};
window.WAPI.checkNumberStatus = async function (id) {
try {
const result = await window.Store.WapQuery.queryExist(id);
if (result.jid === undefined) throw 404;
const data = window.WAPI._serializeNumberStatusObj(result);
if (data.status == 200) data.numberExists = true
return data;
} catch (e) {
return window.WAPI._serializeNumberStatusObj({
status: e,
jid: id
});
}
}; |
<<<<<<<
export default applyScalars(
applyDirectives(
makeAugmentedSchema({
typeDefs,
resolvers,
config: {
query: {
exclude: [
'Badge',
'Embed',
'InvitationCode',
'EmailAddress',
'Notfication',
'Statistics',
'LoggedInUser',
'Location',
'SocialMedia',
'NOTIFIED',
'REPORTED',
'REVIEWED',
'Donations',
],
// add 'User' here as soon as possible
},
mutation: {
exclude: [
'Badge',
'Embed',
'InvitationCode',
'EmailAddress',
'Notfication',
'Post',
'Comment',
'Statistics',
'LoggedInUser',
'Location',
'SocialMedia',
'User',
'EMOTED',
'NOTIFIED',
'REPORTED',
'REVIEWED',
'Donations',
],
// add 'User' here as soon as possible
},
debug: !!CONFIG.DEBUG,
},
}),
),
)
=======
export default makeAugmentedSchema({
typeDefs,
resolvers,
config: {
query: {
exclude: [
'Badge',
'Embed',
'InvitationCode',
'EmailAddress',
'Notfication',
'Statistics',
'LoggedInUser',
'Location',
'SocialMedia',
'NOTIFIED',
'REPORTED',
'Donations',
],
},
mutation: false,
},
})
>>>>>>>
export default makeAugmentedSchema({
typeDefs,
resolvers,
config: {
query: {
exclude: [
'Badge',
'Embed',
'InvitationCode',
'EmailAddress',
'Notfication',
'Statistics',
'LoggedInUser',
'Location',
'SocialMedia',
'NOTIFIED',
'REPORTED',
'REVIEWED',
'Donations',
],
},
mutation: false,
},
}) |
<<<<<<<
import { getBalance, getTransactionHistory, getMarketPriceUSD, neoId, getClaimAmounts, getWalletDBHeight } from '../wallet/api.js';
import { setBalance, setMarketPrice, resetPrice, setTransactionHistory, } from '../modules/wallet';
import { setBlockHeight, setNetwork } from '../modules/metadata';
import { setClaim } from '../modules/claim';
=======
import { setNetwork } from '../actions/index.js';
import { getBalance, getTransactionHistory, getMarketPriceUSD, neoId, getClaimAmounts, getWalletDBHeight } from 'neon-js';
import { setBalance, setMarketPrice, resetPrice, setTransactionHistory, setClaim, setBlockHeight } from '../actions/index.js';
>>>>>>>
import { getBalance, getTransactionHistory, getMarketPriceUSD, neoId, getClaimAmounts, getWalletDBHeight } from 'neon-js';
import { setClaim } from '../modules/claim';
import { setBlockHeight, setNetwork } from '../modules/metadata';
import { setBalance, setMarketPrice, resetPrice, setTransactionHistory, } from '../modules/wallet'; |
<<<<<<<
Given('"Spammy Spammer" wrote a post {string}', title => {
cy.factory()
.build("post", {
=======
Given('{string} wrote a post {string}', (_, title) => {
cy.createCategories("cat21")
.factory()
.create("Post", {
authorId: 'annoying-user',
>>>>>>>
Given('{string} wrote a post {string}', (_, title) => {
cy.factory()
.build("post", { |
<<<<<<<
import { host, login, gql } from '../../jest/helpers'
import { neode } from '../../bootstrap/neo4j'
=======
import { host, login, gql } from '../../jest/helpers'
>>>>>>>
import { host, login, gql } from '../../jest/helpers'
import { neode } from '../../bootstrap/neo4j'
<<<<<<<
describe('Notification', () => {
const query = gql`
query {
Notification {
id
}
=======
describe('query for notification', () => {
const notificationQuery = gql`
{
Notification {
id
}
>>>>>>>
describe('Notification', () => {
const notificationQuery = gql`
query {
Notification {
id
}
<<<<<<<
await factory.create('Post', { id: 'p1', categoryIds })
=======
// Post and its notifications
await Promise.all([
factory.create('Post', {
id: 'p1',
}),
])
>>>>>>>
await factory.create('Post', { id: 'p1', categoryIds }) |
<<<<<<<
'DECIDED',
=======
'Donations',
>>>>>>>
'DECIDED',
'Donations',
<<<<<<<
'DECIDED',
=======
'Donations',
>>>>>>>
'DECIDED',
'Donations', |
<<<<<<<
import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
=======
import Filters from '~/plugins/vue-filters'
import TeaserImage from '~/components/TeaserImage/TeaserImage'
>>>>>>>
import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
import Filters from '~/plugins/vue-filters'
import TeaserImage from '~/components/TeaserImage/TeaserImage'
<<<<<<<
variables: {
title: postTitle,
content: postContent,
language: 'en',
id: null,
categoryIds: null,
},
=======
variables: {
title: postTitle,
content: postContent,
language: 'en',
id: null,
imageUpload: null,
},
>>>>>>>
variables: {
title: postTitle,
content: postContent,
language: 'en',
id: null,
categoryIds: null,
imageUpload: null,
},
<<<<<<<
it('supports adding categories', async () => {
const categoryIds = ['cat12', 'cat15', 'cat37']
expectedParams.variables.categoryIds = categoryIds
wrapper.find(CategoriesSelect).vm.$emit('updateCategories', categoryIds)
await wrapper.find('form').trigger('submit')
expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
})
=======
it('supports adding a teaser image', async () => {
expectedParams.variables.imageUpload = imageUpload
wrapper.find(TeaserImage).vm.$emit('addTeaserImage', imageUpload)
await wrapper.find('form').trigger('submit')
expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
})
>>>>>>>
it('supports adding categories', async () => {
const categoryIds = ['cat12', 'cat15', 'cat37']
expectedParams.variables.categoryIds = categoryIds
wrapper.find(CategoriesSelect).vm.$emit('updateCategories', categoryIds)
})
it('supports adding a teaser image', async () => {
expectedParams.variables.imageUpload = imageUpload
wrapper.find(TeaserImage).vm.$emit('addTeaserImage', imageUpload)
await wrapper.find('form').trigger('submit')
expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
})
<<<<<<<
categoryIds: null,
=======
imageUpload,
>>>>>>>
categoryIds: null,
imageUpload, |
<<<<<<<
console.log('parent', parent)
=======
>>>>>>> |
<<<<<<<
import validation from './validation'
import handleContentData from './handleHtmlContent/handleContentData'
=======
import validation from './validation/validationMiddleware'
import notifications from './notifications'
import email from './email/emailMiddleware'
>>>>>>>
import validation from './validation/validationMiddleware'
import handleContentData from './handleHtmlContent/handleContentData'
import email from './email/emailMiddleware'
<<<<<<<
'handleContentData',
=======
'email',
'notifications',
>>>>>>>
'email',
'handleContentData', |
<<<<<<<
blurImage: true,
=======
imageAspectRatio: 300 / 169,
>>>>>>>
blurImage: true,
imageAspectRatio: 300 / 169,
<<<<<<<
blurImage: false,
=======
imageAspectRatio: 300 / 1500,
>>>>>>>
blurImage: false,
imageAspectRatio: 300 / 1500,
<<<<<<<
blurImage: false,
=======
imageAspectRatio: 300 / 857,
>>>>>>>
blurImage: false,
imageAspectRatio: 300 / 857,
<<<<<<<
blurImage: false,
=======
imageAspectRatio: 300 / 901,
>>>>>>>
blurImage: false,
imageAspectRatio: 300 / 901,
<<<<<<<
blurImage: false,
=======
imageAspectRatio: 300 / 450,
>>>>>>>
blurImage: false,
imageAspectRatio: 300 / 450,
<<<<<<<
mutation(
$id: ID
$title: String!
$content: String!
$categoryIds: [ID]
$blurImage: Boolean
) {
CreatePost(
id: $id
title: $title
content: $content
categoryIds: $categoryIds
blurImage: $blurImage
) {
=======
mutation(
$id: ID
$title: String!
$content: String!
$categoryIds: [ID]
$imageAspectRatio: Float
) {
CreatePost(
id: $id
title: $title
content: $content
categoryIds: $categoryIds
imageAspectRatio: $imageAspectRatio
) {
>>>>>>>
mutation(
$id: ID
$title: String!
$content: String!
$categoryIds: [ID]
$blurImage: Boolean
$imageAspectRatio: Float
) {
CreatePost(
id: $id
title: $title
content: $content
categoryIds: $categoryIds
blurImage: $blurImage
imageAspectRatio: $imageAspectRatio
) {
<<<<<<<
blurImage: false,
=======
imageAspectRatio: 300 / 200,
>>>>>>>
blurImage: false,
imageAspectRatio: 300 / 200,
<<<<<<<
blurImage: false,
=======
imageAspectRatio: 300 / 180,
>>>>>>>
blurImage: false,
imageAspectRatio: 300 / 180,
<<<<<<<
blurImage: false,
=======
imageAspectRatio: 300 / 900,
>>>>>>>
blurImage: false,
imageAspectRatio: 300 / 900,
<<<<<<<
blurImage: false,
=======
imageAspectRatio: 300 / 200,
>>>>>>>
blurImage: false,
imageAspectRatio: 300 / 200, |
<<<<<<<
CreateSocialMedia: validateUrl,
CreateComment: validateComment,
UpdateComment: validateComment
}
=======
CreateSocialMedia: validateUrl,
},
>>>>>>>
CreateSocialMedia: validateUrl,
CreateComment: validateComment,
UpdateComment: validateComment,
}, |
<<<<<<<
const _updateLocalXr = () => {
=======
const _bindXrFramebuffer = () => {
if (vrPresentState.glContext) {
nativeWindow.setCurrentWindowContext(vrPresentState.glContext.getWindowHandle());
vrPresentState.glContext.setDefaultFramebuffer((vrPresentState.layers.length > 0 || vrPresentState.glContext.attrs.antialias) ? vrPresentState.msFbo : vrPresentState.fbo);
nativeWindow.bindVrChildFbo(vrPresentState.glContext, vrPresentState.fbo, xrState.tex[0], xrState.depthTex[0]);
}
};
const _emitXrEvents = () => {
>>>>>>>
const _bindXrFramebuffer = () => {
if (vrPresentState.glContext) {
nativeWindow.setCurrentWindowContext(vrPresentState.glContext.getWindowHandle());
vrPresentState.glContext.setDefaultFramebuffer((vrPresentState.layers.length > 0 || vrPresentState.glContext.attrs.antialias) ? vrPresentState.msFbo : vrPresentState.fbo);
nativeWindow.bindVrChildFbo(vrPresentState.glContext, vrPresentState.fbo, xrState.tex[0], xrState.depthTex[0]);
}
};
const _updateLocalXr = () => {
<<<<<<<
nativeWindow.bindVrChildFbo(context, vrPresentState.fbo, xrState.tex[0], xrState.depthTex[0]);
const width = xrState.renderWidth[0]*2;
const height = xrState.renderHeight[0];
if (vrPresentState.layers.length > 0) {
nativeWindow.composeLayers(context, vrPresentState.fbo, vrPresentState.layers, xrState);
} else {
nativeWindow.blitFrameBuffer(context, vrPresentState.msFbo, vrPresentState.fbo, width, height, width, height, true, false, false);
}
if ((vrPresentState.hmdType === 'fake' || vrPresentState.hmdType === 'oculus' || vrPresentState.hmdType === 'openvr') && !GlobalContext.xrState.hidden[0]) {
const {width: dWidth, height: dHeight} = nativeWindow.getFramebufferSize(windowHandle);
nativeWindow.blitFrameBuffer(context, vrPresentState.fbo, 0, width, height, dWidth, dHeight, true, false, false);
}
=======
_composeXrContext(context, windowHandle);
>>>>>>>
_composeXrContext(context, windowHandle);
<<<<<<<
_updateLocalXr();
=======
_bindXrFramebuffer();
_emitXrEvents();
>>>>>>>
_bindXrFramebuffer();
_updateLocalXr(); |
<<<<<<<
}
export const allowEmbedIframesMutation = () => {
return gql`
mutation($id: ID!, $allowEmbedIframes: Boolean) {
UpdateUser(id: $id, allowEmbedIframes: $allowEmbedIframes) {
id
allowEmbedIframes
}
}
`
}
=======
}
export const checkSlugAvailableQuery = gql`
query($slug: String!) {
User(slug: $slug) {
slug
}
}
`
>>>>>>>
}
export const allowEmbedIframesMutation = () => {
return gql`
mutation($id: ID!, $allowEmbedIframes: Boolean) {
UpdateUser(id: $id, allowEmbedIframes: $allowEmbedIframes) {
id
allowEmbedIframes
}
}
`
}
export const checkSlugAvailableQuery = gql`
query($slug: String!) {
User(slug: $slug) {
slug
}
}
` |
<<<<<<<
$blurImage: Boolean
=======
$imageAspectRatio: Float
>>>>>>>
$blurImage: Boolean
$imageAspectRatio: Float
<<<<<<<
blurImage: $blurImage
=======
imageAspectRatio: $imageAspectRatio
>>>>>>>
blurImage: $blurImage
imageAspectRatio: $imageAspectRatio
<<<<<<<
$blurImage: Boolean
=======
$imageAspectRatio: Float
>>>>>>>
$blurImage: Boolean
$imageAspectRatio: Float
<<<<<<<
blurImage: $blurImage
=======
imageAspectRatio: $imageAspectRatio
>>>>>>>
blurImage: $blurImage
imageAspectRatio: $imageAspectRatio |
<<<<<<<
import validation from './validation'
import handleContentData from './handleHtmlContent/handleContentData'
=======
import validation from './validation/validationMiddleware'
import notifications from './notifications'
import email from './email/emailMiddleware'
>>>>>>>
import validation from './validation/validationMiddleware'
import handleContentData from './handleHtmlContent/handleContentData'
import email from './email/emailMiddleware'
<<<<<<<
'handleContentData',
=======
'email',
'notifications',
>>>>>>>
'email',
'handleContentData', |
<<<<<<<
import { neo4jgraphql } from 'neo4j-graphql-js'
=======
import { AuthenticationError } from 'apollo-server'
>>>>>>>
import { AuthenticationError } from 'apollo-server'
<<<<<<<
}
session.close()
throw new Error('Incorrect password.')
}
session.close()
throw new Error('No Such User exists.')
},
report: async (parent, { resource, description }, { driver, req, user }, resolveInfo) => {
const contextId = uuid()
const session = driver.session()
const data = {
id: contextId,
type: resource.type,
createdAt: (new Date()).toISOString(),
description: resource.description
}
await session.run(
'CREATE (r:Report $report) ' +
'RETURN r.id, r.type, r.description', {
report: data
}
)
let contentType
switch (resource.type) {
case 'post':
case 'contribution':
contentType = 'Post'
break
case 'comment':
contentType = 'Comment'
break
case 'user':
contentType = 'User'
break
}
await session.run(
`MATCH (author:User {id: $userId}), (context:${contentType} {id: $resourceId}), (report:Report {id: $contextId}) ` +
'MERGE (report)<-[:REPORTED]-(author) ' +
'MERGE (context)<-[:REPORTED]-(report) ' +
'RETURN context', {
resourceId: resource.id,
userId: user.id,
contextId: contextId
}
)
session.close()
// TODO: output Report compatible object
return data
=======
if (currentUser && await bcrypt.compareSync(password, currentUser.password)) {
delete currentUser.password
currentUser.avatar = fixUrl(currentUser.avatar)
return Object.assign(currentUser, {
token: generateJwt(currentUser)
})
} else throw new AuthenticationError('Incorrect email address or password.')
})
>>>>>>>
if (currentUser && await bcrypt.compareSync(password, currentUser.password)) {
delete currentUser.password
currentUser.avatar = fixUrl(currentUser.avatar)
return Object.assign(currentUser, {
token: generateJwt(currentUser)
})
} else throw new AuthenticationError('Incorrect email address or password.')
})
},
report: async (parent, { resource, description }, { driver, req, user }, resolveInfo) => {
const contextId = uuid()
const session = driver.session()
const data = {
id: contextId,
type: resource.type,
createdAt: (new Date()).toISOString(),
description: resource.description
}
await session.run(
'CREATE (r:Report $report) ' +
'RETURN r.id, r.type, r.description', {
report: data
}
)
let contentType
switch (resource.type) {
case 'post':
case 'contribution':
contentType = 'Post'
break
case 'comment':
contentType = 'Comment'
break
case 'user':
contentType = 'User'
break
}
await session.run(
`MATCH (author:User {id: $userId}), (context:${contentType} {id: $resourceId}), (report:Report {id: $contextId}) ` +
'MERGE (report)<-[:REPORTED]-(author) ' +
'MERGE (context)<-[:REPORTED]-(report) ' +
'RETURN context', {
resourceId: resource.id,
userId: user.id,
contextId: contextId
}
)
session.close()
// TODO: output Report compatible object
return data |
<<<<<<<
async requestPresent(layers) {
/* GlobalContext.xrState.renderWidth[0] = this.window.innerWidth * this.window.devicePixelRatio / 2;
GlobalContext.xrState.renderHeight[0] = this.window.innerHeight * this.window.devicePixelRatio; */
await this.onrequestpresent();
const [{source: canvas}] = layers;
const {_context: context} = canvas;
this.onmakeswapchain(context);
const [fbo, msFbo, msTex, msDepthTex] = nativeWindow.createVrChildRenderTarget(context, xrState.renderWidth[0]*2, xrState.renderHeight[0]);
context.setDefaultFramebuffer(msFbo);
nativeWindow.bindVrChildFbo(context, fbo, xrState.tex[0], xrState.depthTex[0]);
if (this.onvrdisplaypresentchange && !this.isPresenting) {
this.isPresenting = true;
this.onvrdisplaypresentchange();
} else {
this.isPresenting = true;
}
=======
requestPresent(layers) {
return Promise.resolve().then(() => {
GlobalContext.xrState.renderWidth[0] = this.window.innerWidth / 2;
GlobalContext.xrState.renderHeight[0] = this.window.innerHeight;
if (this.onrequestpresent) {
this.onrequestpresent(layers);
}
if (this.onvrdisplaypresentchange && !this.isPresenting) {
this.isPresenting = true;
this.onvrdisplaypresentchange();
} else {
this.isPresenting = true;
}
});
>>>>>>>
async requestPresent(layers) {
GlobalContext.xrState.renderWidth[0] = this.window.innerWidth / 2;
GlobalContext.xrState.renderHeight[0] = this.window.innerHeight;
await this.onrequestpresent();
const [{source: canvas}] = layers;
const {_context: context} = canvas;
this.onmakeswapchain(context);
const [fbo, msFbo, msTex, msDepthTex] = nativeWindow.createVrChildRenderTarget(context, xrState.renderWidth[0]*2, xrState.renderHeight[0]);
context.setDefaultFramebuffer(msFbo);
nativeWindow.bindVrChildFbo(context, fbo, xrState.tex[0], xrState.depthTex[0]);
if (this.onvrdisplaypresentchange && !this.isPresenting) {
this.isPresenting = true;
this.onvrdisplaypresentchange();
} else {
this.isPresenting = true;
}
<<<<<<<
// GlobalContext.xrState.renderWidth[0] = this.window.innerWidth * this.window.devicePixelRatio / 2;
// GlobalContext.xrState.renderHeight[0] = this.window.innerHeight * this.window.devicePixelRatio;
=======
GlobalContext.xrState.renderWidth[0] = this.window.innerWidth / 2;
GlobalContext.xrState.renderHeight[0] = this.window.innerHeight;
>>>>>>>
GlobalContext.xrState.renderWidth[0] = this.window.innerWidth / 2;
GlobalContext.xrState.renderHeight[0] = this.window.innerHeight;
<<<<<<<
// const {oculusVRDisplay, openVRDisplay, oculusMobileVrDisplay, magicLeapARDisplay} = window[symbols.mrDisplaysSymbol];
if (GlobalContext.xrState.isPresenting[0]) {
=======
const {oculusVRDisplay, openVRDisplay, oculusMobileVrDisplay, magicLeapARDisplay} = window[symbols.mrDisplaysSymbol];
const presentingDisplay =
(GlobalContext.fakeVrDisplayEnabled && GlobalContext.fakePresentState.fakeVrDisplay) ||
(oculusVRDisplay.isPresenting && oculusVRDisplay) ||
(openVRDisplay.isPresenting && openVRDisplay) ||
(oculusMobileVrDisplay.isPresenting && oculusMobileVrDisplay) ||
(magicLeapARDisplay.isPresenting && magicLeapARDisplay);
if (presentingDisplay) {
>>>>>>>
if (GlobalContext.xrState.isPresenting[0]) {
<<<<<<<
const hmdType = getHMDType();
gamepads = Array(2 + maxNumTrackers);
=======
let numGamepads = 2;
if (presentingDisplay === openVRDisplay) {
numGamepads += maxNumTrackers;
}
gamepads = Array(numGamepads);
>>>>>>>
const hmdType = getHMDType();
let numGamepads = 2;
if (hmdType === 'openvr') {
numGamepads += maxNumTrackers;
}
gamepads = Array(numGamepads);
<<<<<<<
id = hmdType === 'oculus' ? oculusVRIdLeft : openVRId;
=======
id = getControllerID(presentingDisplay, hand);
>>>>>>>
id = getControllerID(hmdType, hand);
<<<<<<<
id = hmdType === 'oculus' ? oculusVRIdRight : openVRId;
=======
id = getControllerID(presentingDisplay, hand);
>>>>>>>
id = getControllerID(hmdType, hand); |
<<<<<<<
=======
URL.createObjectURL = blob => {
const url = 'blob:' + global.location.protocol + '//' + global.location.host + '/' + GlobalContext.xrState.blobId[0]++;
nativeCache.set(url, blob.buffer);
return url;
};
URL.revokeObjectURL = url => {
nativeCache.delete(url);
};
URL.lookupObjectURL = url => {
const uint8Array = nativeCache.get(url);
return uint8Array && new Blob([uint8Array], {
type: 'application/octet-stream', // TODO: make this the correct type
});
}
>>>>>>>
<<<<<<<
baseUrl: utils._getBaseUrl(src, GlobalContext.baseUrl),
args,
=======
options: {
url: src,
baseUrl: utils._getBaseUrl(src, baseUrl),
},
args: args.options.args,
>>>>>>>
options: {
url: src,
baseUrl: utils._getBaseUrl(src, GlobalContext.baseUrl),
},
args: args.options.args, |
<<<<<<<
// 3rd sort criteria: topic name
return compare(topic_1.value.toLowerCase(), topic_2.value.toLowerCase())
=======
// 2nd sort criteria: topic name
return compare(topic_1.value, topic_2.value)
>>>>>>>
// 2nd sort criteria: topic name
return compare(topic_1.value.toLowerCase(), topic_2.value.toLowerCase()) |
<<<<<<<
=======
import React, { Component, PropTypes } from 'react';
import Draggable from '@bokuweb/react-draggable-custom';
import Resizable from 'react-resizable-box';
const boxStyle = {
width: 'auto',
height: 'auto',
cursor: 'move',
position: 'absolute',
};
export default class ReactRnd extends Component {
static propTypes = {
onResizeStart: PropTypes.func,
onResize: PropTypes.func,
onResizeStop: PropTypes.func,
onDragStart: PropTypes.func,
onDrag: PropTypes.func,
onDragStop: PropTypes.func,
className: PropTypes.string,
style: PropTypes.object,
children: PropTypes.any,
onTouchStart: PropTypes.func,
onClick: PropTypes.func,
onDoubleClick: PropTypes.func,
dragHandlerClassName: PropTypes.string,
resizerHandleStyle: PropTypes.shape({
top: PropTypes.object,
right: PropTypes.object,
bottom: PropTypes.object,
left: PropTypes.object,
topRight: PropTypes.object,
bottomRight: PropTypes.object,
bottomLeft: PropTypes.object,
topLeft: PropTypes.object,
}),
isResizable: PropTypes.shape({
top: PropTypes.bool,
right: PropTypes.bool,
bottom: PropTypes.bool,
left: PropTypes.bool,
topRight: PropTypes.bool,
bottomRight: PropTypes.bool,
bottomLeft: PropTypes.bool,
topLeft: PropTypes.bool,
}),
initial: PropTypes.shape({
width: PropTypes.oneOfType([
PropTypes.number,
PropTypes.string,
]),
height: PropTypes.oneOfType([
PropTypes.number,
PropTypes.string,
]),
x: PropTypes.number,
y: PropTypes.number,
}),
minWidth: PropTypes.number,
minHeight: PropTypes.number,
maxWidth: PropTypes.number,
maxHeight: PropTypes.number,
moveAxis: PropTypes.oneOf(['x', 'y', 'both', 'none']),
moveGrid: PropTypes.arrayOf(PropTypes.number),
resizeGrid: PropTypes.arrayOf(PropTypes.number),
bounds: PropTypes.oneOfType([
PropTypes.string,
PropTypes.object,
]),
zIndex: PropTypes.number,
lockAspectRatio: PropTypes.bool,
};
static defaultProps = {
initial: {
x: 0,
y: 0,
width: 100,
height: 100,
},
zIndex: 100,
className: '',
dragHandlerClassName: '',
isResizable: {
top: true,
right: true,
bottom: true,
left: true,
topRight: true,
bottomRight: true,
bottomLeft: true,
topLeft: true,
},
style: {},
moveAxis: 'both',
moveGrid: [1, 1],
onClick: () => {},
onTouchStart: () => {},
onDragStart: () => {},
onDrag: () => {},
onDragStop: () => {},
onResizeStart: () => {},
onResize: () => {},
onResizeStop: () => {},
resizeGrid: [1, 1],
lockAspectRatio: false,
}
constructor(props) {
super(props);
this.state = {
isDraggable: true,
isMounted: false,
x: props.initial.x,
y: props.initial.y,
original: { x: props.initial.x, y: props.initial.y },
zIndex: props.zIndex
};
this.isResizing = false;
this.onDragStart = this.onDragStart.bind(this);
this.onDrag = this.onDrag.bind(this);
this.onDragStop = this.onDragStop.bind(this);
this.onResizeStart = this.onResizeStart.bind(this);
this.onResize = this.onResize.bind(this);
this.onResizeStop = this.onResizeStop.bind(this);
}
onResizeStart(dir, styleSize, clientSize, e) {
this.setState({
isDraggable: false,
original: { x: this.state.x, y: this.state.y },
});
this.isResizing = true;
this.props.onResizeStart(dir, styleSize, clientSize, e);
e.stopPropagation();
}
onResize(dir, styleSize, clientSize, delta) {
if (/left/i.test(dir)) {
this.setState({ x: this.state.original.x - delta.width });
}
if (/top/i.test(dir)) {
this.setState({ y: this.state.original.y - delta.height });
}
this.props.onResize(dir, styleSize, clientSize, delta, {
x: this.state.x,
y: this.state.y
});
}
onResizeStop(dir, styleSize, clientSize, delta) {
this.setState({ isDraggable: true });
this.isResizing = false;
this.props.onResizeStop(dir, styleSize, clientSize, delta, {
x: this.state.x,
y: this.state.y
});
}
onDragStart(e, ui) {
if (this.isResizing) return;
this.props.onDragStart(e, ui);
}
onDrag(e, ui) {
if (this.isResizing) return;
const allowX = this.props.moveAxis === 'x';
const allowY = this.props.moveAxis === 'y';
const allowBoth = this.props.moveAxis === 'both';
this.setState({
x: allowX || allowBoth ? ui.position.left : this.state.x,
y: allowY || allowBoth ? ui.position.top : this.state.y,
});
this.props.onDrag(e, ui);
}
onDragStop(e, ui) {
if (this.isResizing) return;
this.props.onDragStop(e, ui);
}
updateSize(size) {
this.resizable.updateSize(size);
}
updatePosition({ x, y }) {
this.setState({ x, y });
}
updateZIndex(zIndex) {
this.setState({ zIndex });
}
render() {
const { className, style, onClick, onTouchStart,
initial, minWidth, minHeight, maxWidth, maxHeight,
bounds, moveAxis, dragHandlerClassName, lockAspectRatio,
moveGrid, resizeGrid, onDoubleClick } = this.props;
const { x, y, zIndex } = this.state;
return (
<Draggable
axis={moveAxis}
zIndex={zIndex}
start={{ x: initial.x, y: initial.y }}
disabled={!this.state.isDraggable || this.props.moveAxis === 'none'}
onStart={this.onDragStart}
handle={dragHandlerClassName}
onDrag={this.onDrag}
onStop={this.onDragStop}
bounds={bounds}
grid={moveGrid}
passCoordinate
x={x}
y={y}
>
<div style={Object.assign({}, boxStyle, { zIndex })}>
<Resizable
ref={c => { this.resizable = c; }}
onClick={onClick}
onDoubleClick={onDoubleClick}
onTouchStart={onTouchStart}
onResizeStart={this.onResizeStart}
onResize={this.onResize}
onResizeStop={this.onResizeStop}
width={initial.width}
height={initial.height}
minWidth={minWidth}
minHeight={minHeight}
maxWidth={maxWidth}
maxHeight={maxHeight}
customStyle={Object.assign(style, { boxSizing: 'border-box' })}
customClass={className}
isResizable={this.props.isResizable}
handleStyle={this.props.resizerHandleStyle}
grid={resizeGrid}
lockAspectRatio={lockAspectRatio}
>
{this.props.children}
</Resizable>
</div>
</Draggable>
);
}
}
>>>>>>> |
<<<<<<<
if (_hex) {
c = sjcl.codec.base32._hexChars;
}
for (i=0; out.length * BASE <= bl; ) {
=======
for (i=0; out.length * BASE < bl; ) {
>>>>>>>
if (_hex) {
c = sjcl.codec.base32._hexChars;
}
for (i=0; out.length * BASE < bl; ) { |
<<<<<<<
"use strict";var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a}}};
sjcl.cipher.aes=function(a){this.h[0][0][0]||this.w();var b,c,d,e,f=this.h[0][4],g=this.h[1];b=a.length;var h=1;if(b!==4&&b!==6&&b!==8)throw new sjcl.exception.invalid("invalid aes key size");this.a=[d=a.slice(0),e=[]];for(a=b;a<4*b+28;a++){c=d[a-1];if(a%b===0||b===8&&a%b===4){c=f[c>>>24]<<24^f[c>>16&255]<<16^f[c>>8&255]<<8^f[c&255];if(a%b===0){c=c<<8^c>>>24^h<<24;h=h<<1^(h>>7)*283}}d[a]=d[a-b]^c}for(b=0;a;b++,a--){c=d[b&3?a:a-4];e[b]=a<=4||b<4?c:g[0][f[c>>>24]]^g[1][f[c>>16&255]]^g[2][f[c>>8&255]]^
=======
"use strict";var sjcl={cipher:{},hash:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a}}};
sjcl.cipher.aes=function(a){this.j[0][0][0]||this.B();var b,c,d,e,f=this.j[0][4],g=this.j[1];b=a.length;var h=1;if(b!==4&&b!==6&&b!==8)throw new sjcl.exception.invalid("invalid aes key size");this.a=[d=a.slice(0),e=[]];for(a=b;a<4*b+28;a++){c=d[a-1];if(a%b===0||b===8&&a%b===4){c=f[c>>>24]<<24^f[c>>16&255]<<16^f[c>>8&255]<<8^f[c&255];if(a%b===0){c=c<<8^c>>>24^h<<24;h=h<<1^(h>>7)*283}}d[a]=d[a-b]^c}for(b=0;a;b++,a--){c=d[b&3?a:a-4];e[b]=a<=4||b<4?c:g[0][f[c>>>24]]^g[1][f[c>>16&255]]^g[2][f[c>>8&255]]^
>>>>>>>
"use strict";var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a}}};
sjcl.cipher.aes=function(a){this.j[0][0][0]||this.B();var b,c,d,e,f=this.j[0][4],g=this.j[1];b=a.length;var h=1;if(b!==4&&b!==6&&b!==8)throw new sjcl.exception.invalid("invalid aes key size");this.a=[d=a.slice(0),e=[]];for(a=b;a<4*b+28;a++){c=d[a-1];if(a%b===0||b===8&&a%b===4){c=f[c>>>24]<<24^f[c>>16&255]<<16^f[c>>8&255]<<8^f[c&255];if(a%b===0){c=c<<8^c>>>24^h<<24;h=h<<1^(h>>7)*283}}d[a]=d[a-b]^c}for(b=0;a;b++,a--){c=d[b&3?a:a-4];e[b]=a<=4||b<4?c:g[0][f[c>>>24]]^g[1][f[c>>16&255]]^g[2][f[c>>8&255]]^
<<<<<<<
sjcl.random={randomWords:function(a,b){var c=[];b=this.isReady(b);var d;if(b===0)throw new sjcl.exception.notready("generator isn't seeded");else b&2&&this.U(!(b&1));for(b=0;b<a;b+=4){(b+1)%0x10000===0&&this.L();d=this.u();c.push(d[0],d[1],d[2],d[3])}this.L();return c.slice(0,a)},setDefaultParanoia:function(a){this.t=a},addEntropy:function(a,b,c){c=c||"user";var d,e,f=(new Date).valueOf(),g=this.q[c],h=this.isReady();d=this.F[c];if(d===undefined)d=this.F[c]=this.R++;if(g===undefined)g=this.q[c]=0;this.q[c]=
(this.q[c]+1)%this.b.length;switch(typeof a){case "number":break;case "object":if(b===undefined)for(c=b=0;c<a.length;c++)for(e=a[c];e>0;){b++;e>>>=1}this.b[g].update([d,this.J++,2,b,f,a.length].concat(a));break;case "string":if(b===undefined)b=a.length;this.b[g].update([d,this.J++,3,b,f,a.length]);this.b[g].update(a);break;default:throw new sjcl.exception.bug("random: addEntropy only supports number, array or string");}this.j[g]+=b;this.f+=b;if(h===0){this.isReady()!==0&&this.K("seeded",Math.max(this.g,
this.f));this.K("progress",this.getProgress())}},isReady:function(a){a=this.B[a!==undefined?a:this.t];return this.g&&this.g>=a?this.j[0]>80&&(new Date).valueOf()>this.O?3:1:this.f>=a?2:0},getProgress:function(a){a=this.B[a?a:this.t];return this.g>=a?1["0"]:this.f>a?1["0"]:this.f/a},startCollectors:function(){if(!this.m){if(window.addEventListener){window.addEventListener("load",this.o,false);window.addEventListener("mousemove",this.p,false)}else if(document.attachEvent){document.attachEvent("onload",
this.o);document.attachEvent("onmousemove",this.p)}else throw new sjcl.exception.bug("can't attach event");this.m=true}},stopCollectors:function(){if(this.m){if(window.removeEventListener){window.removeEventListener("load",this.o);window.removeEventListener("mousemove",this.p)}else if(window.detachEvent){window.detachEvent("onload",this.o);window.detachEvent("onmousemove",this.p)}this.m=false}},addEventListener:function(a,b){this.r[a][this.Q++]=b},removeEventListener:function(a,b){var c;a=this.r[a];
var d=[];for(c in a)a.hasOwnProperty(c)&&a[c]===b&&d.push(c);for(b=0;b<d.length;b++){c=d[b];delete a[c]}},b:[new sjcl.hash.sha256],j:[0],z:0,q:{},J:0,F:{},R:0,g:0,f:0,O:0,a:[0,0,0,0,0,0,0,0],d:[0,0,0,0],s:undefined,t:6,m:false,r:{progress:{},seeded:{}},Q:0,B:[0,48,64,96,128,192,0x100,384,512,768,1024],u:function(){for(var a=0;a<4;a++){this.d[a]=this.d[a]+1|0;if(this.d[a])break}return this.s.encrypt(this.d)},L:function(){this.a=this.u().concat(this.u());this.s=new sjcl.cipher.aes(this.a)},T:function(a){this.a=
sjcl.hash.sha256.hash(this.a.concat(a));this.s=new sjcl.cipher.aes(this.a);for(a=0;a<4;a++){this.d[a]=this.d[a]+1|0;if(this.d[a])break}},U:function(a){var b=[],c=0,d;this.O=b[0]=(new Date).valueOf()+3E4;for(d=0;d<16;d++)b.push(Math.random()*0x100000000|0);for(d=0;d<this.b.length;d++){b=b.concat(this.b[d].finalize());c+=this.j[d];this.j[d]=0;if(!a&&this.z&1<<d)break}if(this.z>=1<<this.b.length){this.b.push(new sjcl.hash.sha256);this.j.push(0)}this.f-=c;if(c>this.g)this.g=c;this.z++;this.T(b)},p:function(a){sjcl.random.addEntropy([a.x||
a.clientX||a.offsetX,a.y||a.clientY||a.offsetY],2,"mouse")},o:function(){sjcl.random.addEntropy(new Date,2,"loadtime")},K:function(a,b){var c;a=sjcl.random.r[a];var d=[];for(c in a)a.hasOwnProperty(c)&&d.push(a[c]);for(c=0;c<d.length;c++)d[c](b)}};
sjcl.json={defaults:{v:1,iter:1E3,ks:128,ts:64,mode:"ccm",adata:"",cipher:"aes"},encrypt:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json,f=e.c({iv:sjcl.random.randomWords(4,0)},e.defaults);e.c(f,c);if(typeof f.salt==="string")f.salt=sjcl.codec.base64.toBits(f.salt);if(typeof f.iv==="string")f.iv=sjcl.codec.base64.toBits(f.iv);if(!sjcl.mode[f.mode]||!sjcl.cipher[f.cipher]||typeof a==="string"&&f.iter<=100||f.ts!==64&&f.ts!==96&&f.ts!==128||f.ks!==128&&f.ks!==192&&f.ks!==0x100||f.iv.length<2||f.iv.length>
4)throw new sjcl.exception.invalid("json encrypt: invalid parameters");if(typeof a==="string"){c=sjcl.misc.cachedPbkdf2(a,f);a=c.key.slice(0,f.ks/32);f.salt=c.salt}if(typeof b==="string")b=sjcl.codec.utf8String.toBits(b);c=new sjcl.cipher[f.cipher](a);e.c(d,f);d.key=a;f.ct=sjcl.mode[f.mode].encrypt(c,b,f.iv,f.adata,f.tag);return e.encode(e.V(f,e.defaults))},decrypt:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json;b=e.c(e.c(e.c({},e.defaults),e.decode(b)),c,true);if(typeof b.salt==="string")b.salt=
=======
sjcl.random={randomWords:function(a,b){var c=[];b=this.isReady(b);var d;if(b===0)throw new sjcl.exception.notready("generator isn't seeded");else b&2&&this.W(!(b&1));for(b=0;b<a;b+=4){(b+1)%0x10000===0&&this.N();d=this.A();c.push(d[0],d[1],d[2],d[3])}this.N();return c.slice(0,a)},setDefaultParanoia:function(a){this.z=a},addEntropy:function(a,b,c){c=c||"user";var d,e,f=(new Date).valueOf(),g=this.s[c],h=this.isReady();d=this.H[c];if(d===undefined)d=this.H[c]=this.S++;if(g===undefined)g=this.s[c]=0;this.s[c]=
(this.s[c]+1)%this.e.length;switch(typeof a){case "number":break;case "object":if(b===undefined)for(c=b=0;c<a.length;c++)for(e=a[c];e>0;){b++;e>>>=1}this.e[g].update([d,this.L++,2,b,f,a.length].concat(a));break;case "string":if(b===undefined)b=a.length;this.e[g].update([d,this.L++,3,b,f,a.length]);this.e[g].update(a);break;default:throw new sjcl.exception.bug("random: addEntropy only supports number, array or string");}this.l[g]+=b;this.h+=b;if(h===0){this.isReady()!==0&&this.M("seeded",Math.max(this.i,
this.h));this.M("progress",this.getProgress())}},isReady:function(a){a=this.F[a!==undefined?a:this.z];return this.i&&this.i>=a?this.l[0]>80&&(new Date).valueOf()>this.P?3:1:this.h>=a?2:0},getProgress:function(a){a=this.F[a?a:this.z];return this.i>=a?1["0"]:this.h>a?1["0"]:this.h/a},startCollectors:function(){if(!this.o){if(window.addEventListener){window.addEventListener("load",this.q,false);window.addEventListener("mousemove",this.r,false)}else if(document.attachEvent){document.attachEvent("onload",
this.q);document.attachEvent("onmousemove",this.r)}else throw new sjcl.exception.bug("can't attach event");this.o=true}},stopCollectors:function(){if(this.o){if(window.removeEventListener){window.removeEventListener("load",this.q);window.removeEventListener("mousemove",this.r)}else if(window.detachEvent){window.detachEvent("onload",this.q);window.detachEvent("onmousemove",this.r)}this.o=false}},addEventListener:function(a,b){this.u[a][this.R++]=b},removeEventListener:function(a,b){var c;a=this.u[a];
var d=[];for(c in a)a.hasOwnProperty(c)&&a[c]===b&&d.push(c);for(b=0;b<d.length;b++){c=d[b];delete a[c]}},e:[new sjcl.hash.sha256],l:[0],C:0,s:{},L:0,H:{},S:0,i:0,h:0,P:0,a:[0,0,0,0,0,0,0,0],g:[0,0,0,0],w:undefined,z:6,o:false,u:{progress:{},seeded:{}},R:0,F:[0,48,64,96,128,192,0x100,384,512,768,1024],A:function(){for(var a=0;a<4;a++){this.g[a]=this.g[a]+1|0;if(this.g[a])break}return this.w.encrypt(this.g)},N:function(){this.a=this.A().concat(this.A());this.w=new sjcl.cipher.aes(this.a)},V:function(a){this.a=
sjcl.hash.sha256.hash(this.a.concat(a));this.w=new sjcl.cipher.aes(this.a);for(a=0;a<4;a++){this.g[a]=this.g[a]+1|0;if(this.g[a])break}},W:function(a){var b=[],c=0,d;this.P=b[0]=(new Date).valueOf()+3E4;for(d=0;d<16;d++)b.push(Math.random()*0x100000000|0);for(d=0;d<this.e.length;d++){b=b.concat(this.e[d].finalize());c+=this.l[d];this.l[d]=0;if(!a&&this.C&1<<d)break}if(this.C>=1<<this.e.length){this.e.push(new sjcl.hash.sha256);this.l.push(0)}this.h-=c;if(c>this.i)this.i=c;this.C++;this.V(b)},r:function(a){sjcl.random.addEntropy([a.x||
a.clientX||a.offsetX,a.y||a.clientY||a.offsetY],2,"mouse")},q:function(){sjcl.random.addEntropy(new Date,2,"loadtime")},M:function(a,b){var c;a=sjcl.random.u[a];var d=[];for(c in a)a.hasOwnProperty(c)&&d.push(a[c]);for(c=0;c<d.length;c++)d[c](b)}};
sjcl.json={defaults:{v:1,iter:1E3,ks:128,ts:64,mode:"ccm",adata:"",cipher:"aes"},encrypt:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json,f=e.f({iv:sjcl.random.randomWords(4,0)},e.defaults);e.f(f,c);if(typeof f.salt==="string")f.salt=sjcl.codec.base64.toBits(f.salt);if(typeof f.iv==="string")f.iv=sjcl.codec.base64.toBits(f.iv);if(!sjcl.mode[f.mode]||!sjcl.cipher[f.cipher]||typeof a==="string"&&f.iter<=100||f.ts!==64&&f.ts!==96&&f.ts!==128||f.ks!==128&&f.ks!==192&&f.ks!==0x100||f.iv.length<2||f.iv.length>
4)throw new sjcl.exception.invalid("json encrypt: invalid parameters");if(typeof a==="string"){c=sjcl.misc.cachedPbkdf2(a,f);a=c.key.slice(0,f.ks/32);f.salt=c.salt}if(typeof b==="string")b=sjcl.codec.utf8String.toBits(b);c=new sjcl.cipher[f.cipher](a);e.f(d,f);d.key=a;f.ct=sjcl.mode[f.mode].encrypt(c,b,f.iv,f.adata,f.tag);return e.encode(e.X(f,e.defaults))},decrypt:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json;b=e.f(e.f(e.f({},e.defaults),e.decode(b)),c,true);if(typeof b.salt==="string")b.salt=
>>>>>>>
sjcl.random={randomWords:function(a,b){var c=[];b=this.isReady(b);var d;if(b===0)throw new sjcl.exception.notready("generator isn't seeded");else b&2&&this.W(!(b&1));for(b=0;b<a;b+=4){(b+1)%0x10000===0&&this.N();d=this.A();c.push(d[0],d[1],d[2],d[3])}this.N();return c.slice(0,a)},setDefaultParanoia:function(a){this.z=a},addEntropy:function(a,b,c){c=c||"user";var d,e,f=(new Date).valueOf(),g=this.s[c],h=this.isReady();d=this.H[c];if(d===undefined)d=this.H[c]=this.S++;if(g===undefined)g=this.s[c]=0;this.s[c]=
(this.s[c]+1)%this.e.length;switch(typeof a){case "number":break;case "object":if(b===undefined)for(c=b=0;c<a.length;c++)for(e=a[c];e>0;){b++;e>>>=1}this.e[g].update([d,this.L++,2,b,f,a.length].concat(a));break;case "string":if(b===undefined)b=a.length;this.e[g].update([d,this.L++,3,b,f,a.length]);this.e[g].update(a);break;default:throw new sjcl.exception.bug("random: addEntropy only supports number, array or string");}this.l[g]+=b;this.h+=b;if(h===0){this.isReady()!==0&&this.M("seeded",Math.max(this.i,
this.h));this.M("progress",this.getProgress())}},isReady:function(a){a=this.F[a!==undefined?a:this.z];return this.i&&this.i>=a?this.l[0]>80&&(new Date).valueOf()>this.P?3:1:this.h>=a?2:0},getProgress:function(a){a=this.F[a?a:this.z];return this.i>=a?1["0"]:this.h>a?1["0"]:this.h/a},startCollectors:function(){if(!this.o){if(window.addEventListener){window.addEventListener("load",this.q,false);window.addEventListener("mousemove",this.r,false)}else if(document.attachEvent){document.attachEvent("onload",
this.q);document.attachEvent("onmousemove",this.r)}else throw new sjcl.exception.bug("can't attach event");this.o=true}},stopCollectors:function(){if(this.o){if(window.removeEventListener){window.removeEventListener("load",this.q);window.removeEventListener("mousemove",this.r)}else if(window.detachEvent){window.detachEvent("onload",this.q);window.detachEvent("onmousemove",this.r)}this.o=false}},addEventListener:function(a,b){this.u[a][this.R++]=b},removeEventListener:function(a,b){var c;a=this.u[a];
var d=[];for(c in a)a.hasOwnProperty(c)&&a[c]===b&&d.push(c);for(b=0;b<d.length;b++){c=d[b];delete a[c]}},e:[new sjcl.hash.sha256],l:[0],C:0,s:{},L:0,H:{},S:0,i:0,h:0,P:0,a:[0,0,0,0,0,0,0,0],g:[0,0,0,0],w:undefined,z:6,o:false,u:{progress:{},seeded:{}},R:0,F:[0,48,64,96,128,192,0x100,384,512,768,1024],A:function(){for(var a=0;a<4;a++){this.g[a]=this.g[a]+1|0;if(this.g[a])break}return this.w.encrypt(this.g)},N:function(){this.a=this.A().concat(this.A());this.w=new sjcl.cipher.aes(this.a)},V:function(a){this.a=
sjcl.hash.sha256.hash(this.a.concat(a));this.w=new sjcl.cipher.aes(this.a);for(a=0;a<4;a++){this.g[a]=this.g[a]+1|0;if(this.g[a])break}},W:function(a){var b=[],c=0,d;this.P=b[0]=(new Date).valueOf()+3E4;for(d=0;d<16;d++)b.push(Math.random()*0x100000000|0);for(d=0;d<this.e.length;d++){b=b.concat(this.e[d].finalize());c+=this.l[d];this.l[d]=0;if(!a&&this.C&1<<d)break}if(this.C>=1<<this.e.length){this.e.push(new sjcl.hash.sha256);this.l.push(0)}this.h-=c;if(c>this.i)this.i=c;this.C++;this.V(b)},r:function(a){sjcl.random.addEntropy([a.x||
a.clientX||a.offsetX,a.y||a.clientY||a.offsetY],2,"mouse")},q:function(){sjcl.random.addEntropy(new Date,2,"loadtime")},M:function(a,b){var c;a=sjcl.random.u[a];var d=[];for(c in a)a.hasOwnProperty(c)&&d.push(a[c]);for(c=0;c<d.length;c++)d[c](b)}};
sjcl.json={defaults:{v:1,iter:1E3,ks:128,ts:64,mode:"ccm",adata:"",cipher:"aes"},encrypt:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json,f=e.f({iv:sjcl.random.randomWords(4,0)},e.defaults);e.f(f,c);if(typeof f.salt==="string")f.salt=sjcl.codec.base64.toBits(f.salt);if(typeof f.iv==="string")f.iv=sjcl.codec.base64.toBits(f.iv);if(!sjcl.mode[f.mode]||!sjcl.cipher[f.cipher]||typeof a==="string"&&f.iter<=100||f.ts!==64&&f.ts!==96&&f.ts!==128||f.ks!==128&&f.ks!==192&&f.ks!==0x100||f.iv.length<2||f.iv.length>
4)throw new sjcl.exception.invalid("json encrypt: invalid parameters");if(typeof a==="string"){c=sjcl.misc.cachedPbkdf2(a,f);a=c.key.slice(0,f.ks/32);f.salt=c.salt}if(typeof b==="string")b=sjcl.codec.utf8String.toBits(b);c=new sjcl.cipher[f.cipher](a);e.f(d,f);d.key=a;f.ct=sjcl.mode[f.mode].encrypt(c,b,f.iv,f.adata,f.tag);return e.encode(e.X(f,e.defaults))},decrypt:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json;b=e.f(e.f(e.f({},e.defaults),e.decode(b)),c,true);if(typeof b.salt==="string")b.salt= |
<<<<<<<
<AccountIcon style={AppStyles.icon} seed={'0x' + this.state.address} />
<Text style={AppStyles.hintText}>name</Text>
=======
<Text style={AppStyles.hintText}>Account Name</Text>
>>>>>>>
<AccountIcon style={AppStyles.icon} seed={'0x' + this.state.address} />
<Text style={AppStyles.hintText}>Account Name</Text> |
<<<<<<<
'touch /var/lock/subsys/' + service_name,
'chkconfig --add ' + destination,
'chkconfig ' + service_name + ' on',
=======
'touch /var/lock/subsys/pm2',
'chkconfig --add pm2',
'chkconfig pm2 on',
>>>>>>>
'touch /var/lock/subsys/' + service_name,
'chkconfig --add ' + service_name,
'chkconfig ' + service_name + ' on', |
<<<<<<<
else if(path.includes("/downloads/federal-revenue-by-company/")){
loader.addPagesArray([{"componentChunkName":"component---src-pages-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-revenue-by-company.json","path": path}]);
}
else if(path.includes("/downloads/federal-revenue-by-month/")){
loader.addPagesArray([{"componentChunkName":"component---src-pages-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-revenue-by-month.json","path": path}]);
}
else if(path.includes("/downloads/federal-revenue-by-location/")){
loader.addPagesArray([{"componentChunkName":"component---src-pages-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-revenue-by-location.json","path": path}]);
}
else if(path.includes("/downloads/federal-production/")){
loader.addPagesArray([{"componentChunkName":"component---src-pages-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-production.json","path": path}]);
}
else if(path.includes("/downloads/federal-production-by-month/")){
loader.addPagesArray([{"componentChunkName":"component---src-pages-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-production-by-month.json","path": path}]);
}
=======
else if(path.includes("/downloads/federal-production/")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-production.json","path": path}]);
}
else if(path.includes("/downloads/federal-production-by-month/")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-production-by-month.json","path": path}]);
}
>>>>>>>
else if(path.includes("/downloads/federal-revenue-by-company/")){
loader.addPagesArray([{"componentChunkName":"component---src-pages-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-revenue-by-company.json","path": path}]);
}
else if(path.includes("/downloads/federal-revenue-by-month/")){
loader.addPagesArray([{"componentChunkName":"component---src-pages-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-revenue-by-month.json","path": path}]);
}
else if(path.includes("/downloads/federal-revenue-by-location/")){
loader.addPagesArray([{"componentChunkName":"component---src-pages-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-revenue-by-location.json","path": path}]);
}
else if(path.includes("/downloads/federal-production/")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-production.json","path": path}]);
}
else if(path.includes("/downloads/federal-production-by-month/")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-production-by-month.json","path": path}]);
} |
<<<<<<<
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksMineralsPageFrontmatter = "---"+os.EOL+
"title: Nonenergy Minerals | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/minerals/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
var howItWorksMineralsPageFrontmatter = "---"+os.EOL+
"title: Nonenergy Minerals | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/minerals/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter);
=======
prependFile.sync(__dirname+'/public/how-it-works/minerals/index.html', howItWorksMineralsPageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/minerals/index.html', howItWorksMineralsPageFrontmatter); |
<<<<<<<
id: index+"-resource-revenue",
=======
id: index+"-revenue",
Month: revenueData[SOURCE_COLUMNS.Month],
CalendarYear: revenueData[SOURCE_COLUMNS.CalendarYear],
>>>>>>>
id: index+"-resource-revenue",
Month: revenueData[SOURCE_COLUMNS.Month],
CalendarYear: revenueData[SOURCE_COLUMNS.CalendarYear],
<<<<<<<
type: 'ResourceRevenue',
=======
type: 'ResourceRevenues',
>>>>>>>
type: 'ResourceRevenues', |
<<<<<<<
else if(path.includes("/state-laws-and-regulations") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-state-laws-and-regulations.json","path":path}]);
}
=======
else if(path.includes("/federal-laws") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-laws.json","path":path}]);
}
else if(path.includes("/federal-reforms") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-reforms.json","path":path}]);
}
else if(path.includes("/renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-renewables.json","path":path}]);
}
>>>>>>>
else if(path.includes("/state-laws-and-regulations") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-state-laws-and-regulations.json","path":path}]);
}
else if(path.includes("/federal-laws") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-laws.json","path":path}]);
}
else if(path.includes("/federal-reforms") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-reforms.json","path":path}]);
}
else if(path.includes("/renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-renewables.json","path":path}]);
} |
<<<<<<<
var howItWorksLwcfPageFrontmatter = "---"+os.EOL+
"title: Land and Water Conservation Fund | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/land-and-water-conservation-fund/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksLwcfPageFrontmatter = "---"+os.EOL+
"title: Land and Water Conservation Fund | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/land-and-water-conservation-fund/"+os.EOL+
"---"+os.EOL;
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/land-and-water-conservation-fund/index.html', howItWorksLwcfPageFrontmatter);
=======
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/land-and-water-conservation-fund/index.html', howItWorksLwcfPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter); |
<<<<<<<
var howItWorksDisbursementsPageFrontmatter = "---"+os.EOL+
"title: Disbursements | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/disbursements/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksCompanyRevenue2017Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2017) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2017/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2016Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2016) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2016/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2015Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2015) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2015/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2014Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2014) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2014/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2013Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2013) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2013/"+os.EOL+
"---"+os.EOL;
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
var howItWorksMineralsPageFrontmatter = "---"+os.EOL+
"title: Nonenergy Minerals | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/minerals/"+os.EOL+
"---"+os.EOL;
var howItWorksOnshoreRenewablesPageFrontmatter = "---"+os.EOL+
"title: Onshore Renewables | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/onshore-renewables/"+os.EOL+
"---"+os.EOL;
var howItWorksOffshoreRenewablesPageFrontmatter = "---"+os.EOL+
"title: Offshore Renewables | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/offshore-renewables/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksDisbursementsPageFrontmatter = "---"+os.EOL+
"title: Disbursements | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/disbursements/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2017Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2017) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2017/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2016Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2016) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2016/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2015Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2015) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2015/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2014Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2014) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2014/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2013Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2013) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2013/"+os.EOL+
"---"+os.EOL;
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
var howItWorksMineralsPageFrontmatter = "---"+os.EOL+
"title: Nonenergy Minerals | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/minerals/"+os.EOL+
"---"+os.EOL;
var howItWorksOnshoreRenewablesPageFrontmatter = "---"+os.EOL+
"title: Onshore Renewables | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/onshore-renewables/"+os.EOL+
"---"+os.EOL;
var howItWorksOffshoreRenewablesPageFrontmatter = "---"+os.EOL+
"title: Offshore Renewables | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/offshore-renewables/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/disbursements/index.html', howItWorksDisbursementsPageFrontmatter);
=======
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2013/index.html', howItWorksCompanyRevenue2013Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2014/index.html', howItWorksCompanyRevenue2014Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2015/index.html', howItWorksCompanyRevenue2015Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2016/index.html', howItWorksCompanyRevenue2016Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2017/index.html', howItWorksCompanyRevenue2017Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/offshore-renewables/index.html', howItWorksOffshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/onshore-renewables/index.html', howItWorksOnshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/minerals/index.html', howItWorksMineralsPageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/disbursements/index.html', howItWorksDisbursementsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2013/index.html', howItWorksCompanyRevenue2013Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2014/index.html', howItWorksCompanyRevenue2014Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2015/index.html', howItWorksCompanyRevenue2015Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2016/index.html', howItWorksCompanyRevenue2016Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2017/index.html', howItWorksCompanyRevenue2017Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/offshore-renewables/index.html', howItWorksOffshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/onshore-renewables/index.html', howItWorksOnshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/minerals/index.html', howItWorksMineralsPageFrontmatter); |
<<<<<<<
else if(path.includes("/aml-reclamation-program") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-aml-reclamation-program.json","path":path}]);
}
=======
else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
}
else if(path.includes("/onshore-renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-onshore-renewables.json","path":path}]);
}
else if(path.includes("/offshore-renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-offshore-renewables.json","path":path}]);
}
else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2017") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2017.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2016") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2016.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2015") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2015.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2014") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2014.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2013") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2013.json","path":path}]);
}
>>>>>>>
else if(path.includes("/aml-reclamation-program") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-aml-reclamation-program.json","path":path}]);
}
else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
}
else if(path.includes("/onshore-renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-onshore-renewables.json","path":path}]);
}
else if(path.includes("/offshore-renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-offshore-renewables.json","path":path}]);
}
else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2017") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2017.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2016") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2016.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2015") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2015.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2014") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2014.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2013") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2013.json","path":path}]);
} |
<<<<<<<
else if(path.includes("/nonenergy-minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-nonenergy-minerals.json","path":path}]);
}
=======
else if(path.includes("/fossil-fuels") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-fossil-fuels.json","path":path}]);
}
else if(path.includes("/native-american-production") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-native-american-production.json","path":path}]);
}
else if(path.includes("/ownership") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-ownership.json","path":path}]);
}
else if(path.includes("/native-american-revenue") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-native-american-revenue.json","path":path}]);
}
else if(path.includes("/native-american-economic-impact") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-native-american-economic-impact.json","path":path}]);
}
>>>>>>>
else if(path.includes("/nonenergy-minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-nonenergy-minerals.json","path":path}]);
}
else if(path.includes("/fossil-fuels") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-fossil-fuels.json","path":path}]);
}
else if(path.includes("/native-american-production") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-native-american-production.json","path":path}]);
}
else if(path.includes("/ownership") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-ownership.json","path":path}]);
}
else if(path.includes("/native-american-revenue") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-native-american-revenue.json","path":path}]);
}
else if(path.includes("/native-american-economic-impact") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-native-american-economic-impact.json","path":path}]);
} |
<<<<<<<
else if(path.includes("/reconciliation/2015") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-reconciliation-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-reconciliation-2015.json","path":path}]);
}
else if(path.includes("/reconciliation/2016") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-reconciliation-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-reconciliation-2016.json","path":path}]);
}
=======
else if(path.includes("/aml-reclamation-program") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-aml-reclamation-program.json","path":path}]);
}
else if(path.includes("/revenues") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-revenues.json","path":path}]);
}
else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
}
else if(path.includes("/onshore-renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-onshore-renewables.json","path":path}]);
}
else if(path.includes("/offshore-renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-offshore-renewables.json","path":path}]);
}
else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2017") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2017.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2016") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2016.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2015") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2015.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2014") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2014.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2013") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2013.json","path":path}]);
}
>>>>>>>
else if(path.includes("/reconciliation/2015") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-reconciliation-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-reconciliation-2015.json","path":path}]);
}
else if(path.includes("/reconciliation/2016") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-reconciliation-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-reconciliation-2016.json","path":path}]);
}
else if(path.includes("/aml-reclamation-program") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-aml-reclamation-program.json","path":path}]);
}
else if(path.includes("/revenues") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-revenues.json","path":path}]);
}
else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
}
else if(path.includes("/onshore-renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-onshore-renewables.json","path":path}]);
}
else if(path.includes("/offshore-renewables") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-offshore-renewables.json","path":path}]);
}
else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2017") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2017.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2016") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2016.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2015") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2015.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2014") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2014.json","path":path}]);
}
else if(path.includes("/federal-revenue-by-company/2013") && !lastFourteen.includes("default-page")){
loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2013.json","path":path}]);
} |
<<<<<<<
const HOWITWORKS_RECONCILIATION_TEMPLATE = path.resolve(`src/templates/how-it-works-reconciliation.js`);
=======
const HOWITWORKS_REVENUE_BY_COMPANY_TEMPLATE = path.resolve(`src/templates/how-it-works-revenue-by-company.js`);
>>>>>>>
const HOWITWORKS_RECONCILIATION_TEMPLATE = path.resolve(`src/templates/how-it-works-reconciliation.js`);
const HOWITWORKS_REVENUE_BY_COMPANY_TEMPLATE = path.resolve(`src/templates/how-it-works-revenue-by-company.js`);
<<<<<<<
case 'how-it-works-reconciliation':
return HOWITWORKS_RECONCILIATION_TEMPLATE;
=======
case 'howitworks-revenue-by-company':
return HOWITWORKS_REVENUE_BY_COMPANY_TEMPLATE;
>>>>>>>
case 'how-it-works-reconciliation':
return HOWITWORKS_RECONCILIATION_TEMPLATE;
case 'howitworks-revenue-by-company':
return HOWITWORKS_REVENUE_BY_COMPANY_TEMPLATE;
<<<<<<<
var howItWorksReconcile2015PageFrontmatter = "---"+os.EOL+
"title: Reconciliation | How it works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/reconciliation/2015/"+os.EOL+
"---"+os.EOL;
var howItWorksReconcile2016PageFrontmatter = "---"+os.EOL+
"title: Reconciliation | How it works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/reconciliation/2016/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksMineralsPageFrontmatter = "---"+os.EOL+
"title: Nonenergy Minerals | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/minerals/"+os.EOL+
"---"+os.EOL;
var howItWorksOnshoreRenewablesPageFrontmatter = "---"+os.EOL+
"title: Onshore Renewables | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/onshore-renewables/"+os.EOL+
"---"+os.EOL;
var howItWorksOffshoreRenewablesPageFrontmatter = "---"+os.EOL+
"title: Offshore Renewables | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/offshore-renewables/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksReconcile2015PageFrontmatter = "---"+os.EOL+
"title: Reconciliation | How it works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/reconciliation/2015/"+os.EOL+
"---"+os.EOL;
var howItWorksReconcile2016PageFrontmatter = "---"+os.EOL+
"title: Reconciliation | How it works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/reconciliation/2016/"+os.EOL+
"---"+os.EOL;
var howItWorksMineralsPageFrontmatter = "---"+os.EOL+
"title: Nonenergy Minerals | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/minerals/"+os.EOL+
"---"+os.EOL;
var howItWorksOnshoreRenewablesPageFrontmatter = "---"+os.EOL+
"title: Onshore Renewables | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/onshore-renewables/"+os.EOL+
"---"+os.EOL;
var howItWorksOffshoreRenewablesPageFrontmatter = "---"+os.EOL+
"title: Offshore Renewables | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/offshore-renewables/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2015/index.html', howItWorksReconcile2015PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2016/index.html', howItWorksReconcile2016PageFrontmatter);
=======
prependFile.sync(__dirname+'/public/how-it-works/disbursements/index.html', howItWorksDisbursementsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/revenues/index.html', howItWorksRevenuesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2013/index.html', howItWorksCompanyRevenue2013Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2014/index.html', howItWorksCompanyRevenue2014Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2015/index.html', howItWorksCompanyRevenue2015Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2016/index.html', howItWorksCompanyRevenue2016Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2017/index.html', howItWorksCompanyRevenue2017Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/offshore-renewables/index.html', howItWorksOffshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/onshore-renewables/index.html', howItWorksOnshoreRenewablesPageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2015/index.html', howItWorksReconcile2015PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2016/index.html', howItWorksReconcile2016PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/disbursements/index.html', howItWorksDisbursementsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/revenues/index.html', howItWorksRevenuesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2013/index.html', howItWorksCompanyRevenue2013Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2014/index.html', howItWorksCompanyRevenue2014Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2015/index.html', howItWorksCompanyRevenue2015Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2016/index.html', howItWorksCompanyRevenue2016Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2017/index.html', howItWorksCompanyRevenue2017Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/offshore-renewables/index.html', howItWorksOffshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/onshore-renewables/index.html', howItWorksOnshoreRenewablesPageFrontmatter); |
<<<<<<<
import {DownloadDataLink} from '../components/layouts/icon-links/DownloadDataLink'
=======
import IconArchive from '-!svg-react-loader!../img/svg/icon-archive.svg';
import {DataArchiveLink} from '../components/layouts/icon-links/DataArchiveLink';
import {ArchiveBanner} from '../components/info/ArchiveBanner'
import CoalIcon from '-!svg-react-loader!../img/svg/icon-coal.svg';
import OilGasIcon from '-!svg-react-loader!../img/svg/icon-oil.svg';
import HardrockIcon from '-!svg-react-loader!../img/svg/icon-hardrock.svg';
import RenewablesIcon from '-!svg-react-loader!../img/svg/icon-renewables.svg';
import ChevronIcon from '-!svg-react-loader!../img/svg/chevron-lt.svg';
>>>>>>>
import {DownloadDataLink} from '../components/layouts/icon-links/DownloadDataLink'
import IconArchive from '-!svg-react-loader!../img/svg/icon-archive.svg';
import {DataArchiveLink} from '../components/layouts/icon-links/DataArchiveLink';
import {ArchiveBanner} from '../components/info/ArchiveBanner'
import CoalIcon from '-!svg-react-loader!../img/svg/icon-coal.svg';
import OilGasIcon from '-!svg-react-loader!../img/svg/icon-oil.svg';
import HardrockIcon from '-!svg-react-loader!../img/svg/icon-hardrock.svg';
import RenewablesIcon from '-!svg-react-loader!../img/svg/icon-renewables.svg';
import ChevronIcon from '-!svg-react-loader!../img/svg/chevron-lt.svg';
<<<<<<<
'download-data-link': DownloadDataLink,
=======
'icon-archive': IconArchive,
'data-archive-link': DataArchiveLink,
'archive-banner': ArchiveBanner,
'coal-icon': CoalIcon,
'oil-gas-icon': OilGasIcon,
'hardrock-icon': HardrockIcon,
'renewables-icon': RenewablesIcon,
'chevron-icon': ChevronIcon,
>>>>>>>
'download-data-link': DownloadDataLink,
'icon-archive': IconArchive,
'data-archive-link': DataArchiveLink,
'archive-banner': ArchiveBanner,
'coal-icon': CoalIcon,
'oil-gas-icon': OilGasIcon,
'hardrock-icon': HardrockIcon,
'renewables-icon': RenewablesIcon,
'chevron-icon': ChevronIcon, |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.