conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
if (canResetPassword) {
viewModel.users[i].canEdit = true;
}
=======
viewModel.roles[i].adminUser = $("#user-table").data("user");
>>>>>>>
if (canResetPassword) {
viewModel.users[i].canEdit = true;
}
viewModel.roles[i].adminUser = $("#user-table").data("user"); |
<<<<<<<
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
=======
>>>>>>>
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
<<<<<<<
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
=======
//Override
>>>>>>>
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
<<<<<<<
/**
* Displays the given messages in the growl window represented by this growl widget.
* @param {PrimeFaces.FacesMessage[]} msgs Messages to display in this growl
*/
=======
>>>>>>>
/**
* Displays the given messages in the growl window represented by this growl widget.
* @param {PrimeFaces.FacesMessage[]} msgs Messages to display in this growl
*/
<<<<<<<
/**
* Removes all growl messages that are currently displayed.
*/
=======
>>>>>>>
/**
* Removes all growl messages that are currently displayed.
*/
<<<<<<<
/**
* Renders the client-side parts of this widget.
* @private
*/
=======
>>>>>>>
/**
* Renders the client-side parts of this widget.
* @private
*/
<<<<<<<
/**
* Creates the HTML elements for the given faces message, and adds it to the DOM.
* @private
* @param {PrimeFaces.FacesMessage} msg A message to translate into an HTML element.
*/
=======
>>>>>>>
/**
* Creates the HTML elements for the given faces message, and adds it to the DOM.
* @private
* @param {PrimeFaces.FacesMessage} msg A message to translate into an HTML element.
*/
<<<<<<<
/**
* Sets up all event listeners for the given message, such as for closing the message when the close icon clicked.
* @private
* @param {JQuery} message The message for which to set up the event listeners
*/
=======
>>>>>>>
/**
* Sets up all event listeners for the given message, such as for closing the message when the close icon clicked.
* @private
* @param {JQuery} message The message for which to set up the event listeners
*/
<<<<<<<
/**
* Removes the given message from the screen, if it is currently displayed.
* @param {JQuery} message The message to remove, an HTML element with the class `ui-growl-item-container`.
*/
=======
>>>>>>>
/**
* Removes the given message from the screen, if it is currently displayed.
* @param {JQuery} message The message to remove, an HTML element with the class `ui-growl-item-container`.
*/
<<<<<<<
/**
* Starts a timeout that removes the given message after a certain delay (as defined by this widget's
* configuration).
* @private
* @param {JQuery} message The message to remove, an HTML element with the class `ui-growl-item-container`.
*/
=======
>>>>>>>
/**
* Starts a timeout that removes the given message after a certain delay (as defined by this widget's
* configuration).
* @private
* @param {JQuery} message The message to remove, an HTML element with the class `ui-growl-item-container`.
*/ |
<<<<<<<
import { setupI18n } from './i18n';
setupI18n();
=======
import { api } from "./utils";
// Before rendering anything, check if there is a session cookie.
// Note: the user could have an old session, so the first API call
// will set loggedIn to false if necessary
api.loggedIn = document.cookie.includes("user_id=");
>>>>>>>
import { api } from "./utils";
import { setupI18n } from './i18n';
// Before rendering anything, check if there is a session cookie.
// Note: the user could have an old session, so the first API call
// will set loggedIn to false if necessary
api.loggedIn = document.cookie.includes("user_id=");
setupI18n(); |
<<<<<<<
import { translate } from 'react-i18next';
import { padNumber, parseObjectForGraph, api, makeCancelable, ignoreCancel } from '../utils';
=======
import { padNumber, api, makeCancelable, ignoreCancel } from '../utils';
>>>>>>>
import { translate } from 'react-i18next';
import { padNumber, api, makeCancelable, ignoreCancel } from '../utils';
<<<<<<<
};
=======
}
};
constructor(props) {
super(props);
this.updateGraph = this.updateGraph.bind(this);
}
updateGraph() {
this.updateHandler = makeCancelable(api.getHistoryGraph(), { repeat: this.updateGraph, interval: 10 * 60 * 1000});
this.updateHandler.promise.then(res => {
// Remove last data point as it's not yet finished
res.blocked_over_time.splice(-1, 1);
res.domains_over_time.splice(-1, 1);
const data = this.state.data;
data.labels = res.domains_over_time.map(step => new Date(1000 * step.timestamp));
data.datasets[0].data = res.domains_over_time.map(step => step.count);
data.datasets[1].data = res.blocked_over_time.map(step => step.count);
this.setState({ data, loading: false });
}).catch(ignoreCancel);
}
>>>>>>>
}; |
<<<<<<<
return this.write(new Buffer([206])); // frameEnd
=======
b[0] = 206;
return this.write(b.slice(0,1)); // frameEnd
>>>>>>>
return this.write(new Buffer([206])); // frameEnd
<<<<<<<
Connection.prototype.queue = function (name /* , options, openCallback */) {
=======
Connection.prototype.queue = function (name /* options, openCallback */) {
if (name != '' && this.queues[name]) return this.queues[name];
this.channelCounter++;
var channel = this.channelCounter;
>>>>>>>
Connection.prototype.queue = function (name /* options, openCallback */) {
if (name != '' && this.queues[name]) return this.queues[name];
this.channelCounter++;
var channel = this.channelCounter;
<<<<<<<
// remove a queue when it's closed (called from Queue)
Connection.prototype.queueClosed = function (name) {
if (this.queues[name]) delete this.queues[name];
};
// remove an exchange when it's closed (called from Exchange)
Connection.prototype.exchangeClosed = function (name) {
if (this.exchanges[name]) delete this.exchanges[name];
};
=======
>>>>>>>
// remove a queue when it's closed (called from Queue)
Connection.prototype.queueClosed = function (name) {
if (this.queues[name]) delete this.queues[name];
};
// remove an exchange when it's closed (called from Exchange)
Connection.prototype.exchangeClosed = function (name) {
if (this.exchanges[name]) delete this.exchanges[name];
};
<<<<<<<
Connection.prototype.exchange = function (name, options, openCallback) {
if (!name) name = 'amq.topic';
=======
Connection.prototype.exchange = function (name, options) {
if (!name) name = '';
>>>>>>>
Connection.prototype.exchange = function (name, options, openCallback) {
if (name === undefined) name = 'amq.topic';
<<<<<<<
if (this.exchanges[name]) { // already declared? callback anyway
if (openCallback)
openCallback(this.exchanges[name]);
return this.exchanges[name];
}
var channel = this.channels.length;
var exchange = new Exchange(this, channel, name, options, openCallback);
this.channels.push(exchange);
=======
if (this.exchanges[name]) return this.exchanges[name];
this.channelCounter++;
channel = this.channelCounter;
var exchange = new Exchange(this, channel, name, options);
this.channels[channel] = exchange;
>>>>>>>
if (this.exchanges[name]) { // already declared? callback anyway
if (openCallback)
openCallback(this.exchanges[name]);
return this.exchanges[name];
}
this.channelCounter++;
var channel = this.channelCounter;
var exchange = new Exchange(this, channel, name, options, openCallback);
this.channels[channel] = exchange;
<<<<<<<
this.consumerTagListeners = {};
var self = this;
// route messages to subscribers based on consumerTag
this.on('rawMessage', function(message) {
if (message.consumerTag && self.consumerTagListeners[message.consumerTag]) {
self.consumerTagListeners[message.consumerTag](message);
}
});
=======
this._subscribers = {};
this.addListener('rawMessage', function(message) {
var cb = this._subscribers[message.consumerTag];
cb(message);
});
>>>>>>>
this.consumerTagListeners = {};
var self = this;
// route messages to subscribers based on consumerTag
this.on('rawMessage', function(message) {
if (message.consumerTag && self.consumerTagListeners[message.consumerTag]) {
self.consumerTagListeners[message.consumerTag](message);
}
});
<<<<<<<
, consumerTag: consumerTag
=======
, consumerTag: ctag
>>>>>>>
, consumerTag: consumerTag
<<<<<<<
this._openCallback(this);
=======
this._openCallback(args.queue, args.messageCount, args.consumerCount);
>>>>>>>
this._openCallback(this); |
<<<<<<<
function handleClick(e) {
=======
function handleClickLight(e) {
const isOverswipe = e && e.detail && e.detail === 'f7Overswipe';
>>>>>>>
function handleClick(e) {
const isOverswipe = e && e.detail && e.detail === 'f7Overswipe'; |
<<<<<<<
});
test( "player gets a proper _teardown", function() {
QUnit.reset();
var teardownCalled = false;
expect( 1 );
stop( 10000 );
Popcorn.player( "teardownTester", {
_teardown: function() {
teardownCalled = true;
}
});
var pop = Popcorn.teardownTester( "#video" );
pop.destroy();
equal( teardownCalled, true, "teardown function was called." );
start();
=======
});
test( "Popcorn.smart player selector", function() {
var expects = 10,
count = 0;
function plus() {
if ( ++count == expects ) {
start();
}
}
expect( expects );
stop( 10000 );
Popcorn.player( "spartaPlayer", {
_canPlayType: function( nodeName, url ) {
return url === "this is sparta" && nodeName !== "unsupported element";
}
});
Popcorn.player( "neverEverLand" );
// matching url to player returns true
ok( Popcorn.spartaPlayer.canPlayType( "div", "this is sparta" ), "canPlayType method succeeds on valid url!" );
plus();
ok( Popcorn.spartaPlayer.canPlayType( "unsupported element", "this is sparta" ) === false, "canPlayType method fails on invalid container!" );
plus();
equals( Popcorn.smart( "#video", "this is sparta" ).media.nodeName, "DIV", "A player was found for this URL" );
plus();
// not matching url to player returns false
ok( Popcorn.spartaPlayer.canPlayType( "div", "this is not sparta" ) === false, "canPlayType method fails on invalid url!" );
plus();
ok( Popcorn.spartaPlayer.canPlayType( "video", "this is not sparta" ) === false, "canPlayType method fails on invalid url and invalid container!" );
plus();
var thisIsNotSparta = Popcorn.smart( "#video", "this is not sparta", {
events: {
error: function( e ) {
ok( true, "invalid player failed and called error callback" );
plus();
}
}
});
equals( thisIsNotSparta.media.nodeName, "VIDEO", "no player was found for this URL, default to video element" );
plus();
// no existing canPlayType function returns undefined
ok( Popcorn.neverEverLand.canPlayType( "guessing time!", "is this sparta?" ) === undefined, "non exist canPlayType returns undefined" );
plus();
var loaded = false,
error = false;
Popcorn.player( "somePlayer", {
_canPlayType: function( nodeName, url ) {
return url === "canPlayType";
}
});
Popcorn.somePlayer( "#video", "canPlayType", {
events: {
load: function( e ) {
loaded = true;
}
}
}).destroy();
Popcorn.somePlayer( "#video", "cantPlayType", {
events: {
error: function( e ) {
error = true;
}
}
}).destroy();
equals( loaded, true, "canPlayType passed on a valid type" );
plus();
equals( error, true, "canPlayType failed on an invalid type" );
plus();
>>>>>>>
});
test( "player gets a proper _teardown", function() {
QUnit.reset();
var teardownCalled = false;
expect( 1 );
stop( 10000 );
Popcorn.player( "teardownTester", {
_teardown: function() {
teardownCalled = true;
}
});
var pop = Popcorn.teardownTester( "#video" );
pop.destroy();
equal( teardownCalled, true, "teardown function was called." );
start();
});
test( "Popcorn.smart player selector", function() {
var expects = 10,
count = 0;
function plus() {
if ( ++count == expects ) {
start();
}
}
expect( expects );
stop( 10000 );
Popcorn.player( "spartaPlayer", {
_canPlayType: function( nodeName, url ) {
return url === "this is sparta" && nodeName !== "unsupported element";
}
});
Popcorn.player( "neverEverLand" );
// matching url to player returns true
ok( Popcorn.spartaPlayer.canPlayType( "div", "this is sparta" ), "canPlayType method succeeds on valid url!" );
plus();
ok( Popcorn.spartaPlayer.canPlayType( "unsupported element", "this is sparta" ) === false, "canPlayType method fails on invalid container!" );
plus();
equals( Popcorn.smart( "#video", "this is sparta" ).media.nodeName, "DIV", "A player was found for this URL" );
plus();
// not matching url to player returns false
ok( Popcorn.spartaPlayer.canPlayType( "div", "this is not sparta" ) === false, "canPlayType method fails on invalid url!" );
plus();
ok( Popcorn.spartaPlayer.canPlayType( "video", "this is not sparta" ) === false, "canPlayType method fails on invalid url and invalid container!" );
plus();
var thisIsNotSparta = Popcorn.smart( "#video", "this is not sparta", {
events: {
error: function( e ) {
ok( true, "invalid player failed and called error callback" );
plus();
}
}
});
equals( thisIsNotSparta.media.nodeName, "VIDEO", "no player was found for this URL, default to video element" );
plus();
// no existing canPlayType function returns undefined
ok( Popcorn.neverEverLand.canPlayType( "guessing time!", "is this sparta?" ) === undefined, "non exist canPlayType returns undefined" );
plus();
var loaded = false,
error = false;
Popcorn.player( "somePlayer", {
_canPlayType: function( nodeName, url ) {
return url === "canPlayType";
}
});
Popcorn.somePlayer( "#video", "canPlayType", {
events: {
load: function( e ) {
loaded = true;
}
}
}).destroy();
Popcorn.somePlayer( "#video", "cantPlayType", {
events: {
error: function( e ) {
error = true;
}
}
}).destroy();
equals( loaded, true, "canPlayType passed on a valid type" );
plus();
equals( error, true, "canPlayType failed on an invalid type" );
plus(); |
<<<<<<<
const isBrokenBrowserHistory = device.ie || device.edge || (device.firefox && !device.ios);
const needHistoryBack =
router.params.browserHistory && navigateOptions.browserHistory !== false;
if (needHistoryBack && !isBrokenBrowserHistory) {
=======
const isBrokenPushState = Device.ie || Device.edge || (Device.firefox && !Device.ios);
const needHistoryBack = router.params.pushState && navigateOptions.pushState !== false;
const currentRouteWithoutPushState = router.currentRoute && router.currentRoute.route && router.currentRoute.route.options && router.currentRoute.route.options.pushState === false;
if (needHistoryBack && !isBrokenPushState && !currentRouteWithoutPushState) {
>>>>>>>
const isBrokenPushState = device.ie || device.edge || (device.firefox && !device.ios);
const needHistoryBack = router.params.pushState && navigateOptions.pushState !== false;
const currentRouteWithoutPushState =
router.currentRoute &&
router.currentRoute.route &&
router.currentRoute.route.options &&
router.currentRoute.route.options.pushState === false;
if (needHistoryBack && !isBrokenPushState && !currentRouteWithoutPushState) {
<<<<<<<
if (needHistoryBack && isBrokenBrowserHistory) {
=======
if (needHistoryBack && isBrokenPushState && !currentRouteWithoutPushState) {
>>>>>>>
if (needHistoryBack && isBrokenPushState && !currentRouteWithoutPushState) { |
<<<<<<<
const {
topHeightPixels,
bottomHeightPixels,
topHeight,
bottomHeight,
isDragging,
} = this.state
const {containerClass, children} = this.props
=======
const {bottomHeightPixels, topHeight, bottomHeight, isDragging} = this.state
const {containerClass, children, theme} = this.props
>>>>>>>
const {
topHeightPixels,
bottomHeightPixels,
topHeight,
bottomHeight,
isDragging,
} = this.state
const {containerClass, children, theme} = this.props |
<<<<<<<
if (options.animate) {
const delay = router.app.theme === 'md' ? router.params.mdPageLoadDelay : router.params.iosPageLoadDelay;
=======
if (options.animate && !(isMaster && app.width >= router.params.masterDetailBreakpoint)) {
const delay = router.app.theme === 'md' ? router.params.materialPageLoadDelay : router.params.iosPageLoadDelay;
>>>>>>>
if (options.animate && !(isMaster && app.width >= router.params.masterDetailBreakpoint)) {
const delay = router.app.theme === 'md' ? router.params.mdPageLoadDelay : router.params.iosPageLoadDelay; |
<<<<<<<
sb.$el.removeClass('searchbar-enabled');
sb.$el.removeClass('searchbar-focused');
if (sb.expandable) {
sb.$el.parents('.navbar-inner').removeClass('with-searchbar-expandable-enabled');
}
=======
sb.$el.removeClass('searchbar-enabled searchbar-focused searchbar-enabled-no-disable-button');
>>>>>>>
sb.$el.removeClass('searchbar-enabled searchbar-focused searchbar-enabled-no-disable-button');
if (sb.expandable) {
sb.$el.parents('.navbar-inner').removeClass('with-searchbar-expandable-enabled');
} |
<<<<<<<
app.emit('local::breakpoint panelBreakpoint');
panel.$el.trigger('panel:breakpoint');
=======
panel.emit('local::breakpoint panelBreakpoint');
panel.$el.trigger('panel:breakpoint', panel);
>>>>>>>
panel.emit('local::breakpoint panelBreakpoint');
panel.$el.trigger('panel:breakpoint');
<<<<<<<
app.emit('local::breakpoint panelBreakpoint');
panel.$el.trigger('panel:breakpoint');
=======
panel.emit('local::breakpoint panelBreakpoint');
panel.$el.trigger('panel:breakpoint', panel);
>>>>>>>
panel.emit('local::breakpoint panelBreakpoint');
panel.$el.trigger('panel:breakpoint');
<<<<<<<
app.emit('local::breakpoint panelBreakpoint');
panel.$el.trigger('panel:breakpoint');
=======
panel.emit('local::breakpoint panelBreakpoint');
panel.$el.trigger('panel:breakpoint', panel);
>>>>>>>
panel.emit('local::breakpoint panelBreakpoint');
panel.$el.trigger('panel:breakpoint'); |
<<<<<<<
handleClickFieldName = fieldName => () => {
const {data, sort} = this.state
const {tableOptions, timeFormat, fieldOptions, decimalPlaces} = this.props
if (fieldName === sort.field) {
sort.direction = sort.direction === ASCENDING ? DESCENDING : ASCENDING
=======
handleClickFieldName = clickedFieldName => () => {
const {tableOptions} = this.props
const {data, sort} = this.state
const fieldNames = _.get(tableOptions, 'fieldNames', [TIME_FIELD_DEFAULT])
if (clickedFieldName === sort.field) {
sort.direction = sort.direction === ASCENDING ? DESCENDING : ASCENDING
>>>>>>>
handleClickFieldName = clickedFieldName => () => {
const {tableOptions, fieldOptions, timeFormat, decimalPlaces} = this.props
const {data, sort} = this.state
if (clickedFieldName === sort.field) {
sort.direction = sort.direction === ASCENDING ? DESCENDING : ASCENDING
<<<<<<<
sort.field = fieldName
sort.direction = DEFAULT_SORT_DIRECTION
=======
sort.field = clickedFieldName
sort.direction = DEFAULT_SORT_DIRECTION
>>>>>>>
sort.field = clickedFieldName
sort.direction = DEFAULT_SORT_DIRECTION
<<<<<<<
sort,
fieldOptions,
tableOptions,
timeFormat,
decimalPlaces
=======
sort,
fieldNames,
tableOptions
>>>>>>>
sort,
fieldOptions,
tableOptions,
timeFormat,
decimalPlaces
<<<<<<<
=======
sort={sort}
>>>>>>>
sort={sort} |
<<<<<<<
// 人民邮电出版社
router.get('/ptpress/book/:type?', require('./routes/ptpress/book'));
// 本地宝焦点资讯
router.get('/bendibao/news/:city', require('./routes/bendibao/news'));
=======
// unit-image
router.get('/unit-image/films/:type?', require('./routes/unit-image/films'));
>>>>>>>
// 人民邮电出版社
router.get('/ptpress/book/:type?', require('./routes/ptpress/book'));
// 本地宝焦点资讯
router.get('/bendibao/news/:city', require('./routes/bendibao/news'));
// unit-image
router.get('/unit-image/films/:type?', require('./routes/unit-image/films')); |
<<<<<<<
// 果壳网
router.get('/guokr/scientific', require('./routes/guokr/scientific'));
// 联合早报
router.get('/zaobao/realtime/:type?', require('./routes/zaobao/realtime'));
router.get('/zaobao/znews/:type?', require('./routes/zaobao/znews'));
// Apple
router.get('/apple/exchange_repair/:country?', require('./routes/apple/exchange_repair'));
// Minecraft CurseForge
router.get('/curseforge/files/:project', require('./routes/curseforge/files'));
// 抖音
router.get('/douyin/user/:id', require('./routes/douyin/user'));
// 少数派 sspai
router.get('/sspai/series', require('./routes/sspai/series'));
router.get('/sspai/shortcuts', require('./routes/sspai/shortcutsGallery'));
// xclient.info
router.get('/xclient/app/:name', require('./routes/xclient/app'));
// 中国驻外使领事馆
router.get('/embassy/:country/:city?', require('./routes/embassy/index'));
// 澎湃新闻
router.get('/thepaper/featured', require('./routes/thepaper/featured'));
// 电影首发站
router.get('/dysfz/index', require('./routes/dysfz/index'));
// きららファンタジア
router.get('/kirara/news', require('./routes/kirara/news'));
// 电影天堂
router.get('/dytt/index', require('./routes/dytt/index'));
=======
// 果壳网
router.get('/guokr/scientific', require('./routes/guokr/scientific'));
// 趣头条
router.get('/qutoutiao/category/:cid', require('./routes/qutoutiao/category'));
>>>>>>>
// 果壳网
router.get('/guokr/scientific', require('./routes/guokr/scientific'));
// 联合早报
router.get('/zaobao/realtime/:type?', require('./routes/zaobao/realtime'));
router.get('/zaobao/znews/:type?', require('./routes/zaobao/znews'));
// Apple
router.get('/apple/exchange_repair/:country?', require('./routes/apple/exchange_repair'));
// Minecraft CurseForge
router.get('/curseforge/files/:project', require('./routes/curseforge/files'));
// 抖音
router.get('/douyin/user/:id', require('./routes/douyin/user'));
// 少数派 sspai
router.get('/sspai/series', require('./routes/sspai/series'));
router.get('/sspai/shortcuts', require('./routes/sspai/shortcutsGallery'));
// xclient.info
router.get('/xclient/app/:name', require('./routes/xclient/app'));
// 中国驻外使领事馆
router.get('/embassy/:country/:city?', require('./routes/embassy/index'));
// 澎湃新闻
router.get('/thepaper/featured', require('./routes/thepaper/featured'));
// 电影首发站
router.get('/dysfz/index', require('./routes/dysfz/index'));
// きららファンタジア
router.get('/kirara/news', require('./routes/kirara/news'));
// 电影天堂
router.get('/dytt/index', require('./routes/dytt/index'));
// 趣头条
router.get('/qutoutiao/category/:cid', require('./routes/qutoutiao/category')); |
<<<<<<<
'qq.com': {
_name: '微信',
'mp.weixin': [
{
title: '公众号栏目',
docs: 'https://docs.rsshub.app/new-media.html#gong-zhong-hao-lan-mu-fei-tui-song-li-shi-xiao-xi',
source: '/mp/homepage',
target: (params, url) => `/wechat/mp/homepage/${new URL(url).searchParams.get('__biz')}/${new URL(url).searchParams.get('hid')}/${new URL(url).searchParams.get('cid') ? new URL(url).searchParams.get('cid') : ''}`,
},
],
},
'javbus.com': {
_name: 'JavBus',
www: [
{
title: '首页',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/',
target: '/javbus/home',
},
{
title: '分类',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/genre/:gid',
target: '/javbus/genre/:gid',
},
{
title: '演员',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/star/:sid',
target: '/javbus/star/:sid',
},
{
title: '系列',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/series/:seriesid',
target: '/javbus/series/:seriesid',
},
{
title: '首页 / 步兵',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/uncensored',
target: '/javbus/uncensored/home',
},
{
title: '分类 / 步兵',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/uncensored/genre/:gid',
target: '/javbus/uncensored/genre/:gid',
},
{
title: '演员 / 步兵',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/uncensored/star/:sid',
target: '/javbus/uncensored/star/:sid',
},
{
title: '系列 / 步兵',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/uncensored/series/:seriesid',
target: '/javbus/uncensored/series/:seriesid',
},
],
},
'javbus.one': {
_name: 'JavBus',
www: [
{
title: '首页 / 欧陆风云',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/',
target: '/javbus/western/home',
},
{
title: '分类 / 欧陆风云',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/genre/:gid',
target: '/javbus/western/genre/:gid',
},
{
title: '演员 / 欧陆风云',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/star/:sid',
target: '/javbus/western/star/:sid',
},
{
title: '系列 / 欧陆风云',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/series/:seriesid',
target: '/javbus/western/series/:seriesid',
},
],
},
=======
'sexinsex.net': {
_name: 'sexinsex',
'.': [
{
title: '分区帖子',
docs: 'https://docs.rsshub.app/multimedia.html#sexinsex',
source: '/bbs/:path',
target: (params, url) => {
let pid, typeid;
const static_matched = params.path.match(/forum-(\d+)-\d+.html/);
if (static_matched) {
pid = static_matched[1];
} else if (params.path === 'forumdisplay.php') {
pid = new URL(url).searchParams.get('fid');
typeid = new URL(url).searchParams.get('typeid');
} else {
return false;
}
return `/sexinsex/${pid}/${typeid ? typeid : ''}`;
},
},
],
},
>>>>>>>
'qq.com': {
_name: '微信',
'mp.weixin': [
{
title: '公众号栏目',
docs: 'https://docs.rsshub.app/new-media.html#gong-zhong-hao-lan-mu-fei-tui-song-li-shi-xiao-xi',
source: '/mp/homepage',
target: (params, url) => `/wechat/mp/homepage/${new URL(url).searchParams.get('__biz')}/${new URL(url).searchParams.get('hid')}/${new URL(url).searchParams.get('cid') ? new URL(url).searchParams.get('cid') : ''}`,
},
],
},
'javbus.com': {
_name: 'JavBus',
www: [
{
title: '首页',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/',
target: '/javbus/home',
},
{
title: '分类',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/genre/:gid',
target: '/javbus/genre/:gid',
},
{
title: '演员',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/star/:sid',
target: '/javbus/star/:sid',
},
{
title: '系列',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/series/:seriesid',
target: '/javbus/series/:seriesid',
},
{
title: '首页 / 步兵',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/uncensored',
target: '/javbus/uncensored/home',
},
{
title: '分类 / 步兵',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/uncensored/genre/:gid',
target: '/javbus/uncensored/genre/:gid',
},
{
title: '演员 / 步兵',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/uncensored/star/:sid',
target: '/javbus/uncensored/star/:sid',
},
{
title: '系列 / 步兵',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/uncensored/series/:seriesid',
target: '/javbus/uncensored/series/:seriesid',
},
],
},
'javbus.one': {
_name: 'JavBus',
www: [
{
title: '首页 / 欧陆风云',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/',
target: '/javbus/western/home',
},
{
title: '分类 / 欧陆风云',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/genre/:gid',
target: '/javbus/western/genre/:gid',
},
{
title: '演员 / 欧陆风云',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/star/:sid',
target: '/javbus/western/star/:sid',
},
{
title: '系列 / 欧陆风云',
docs: 'https://docs.rsshub.app/multimedia.html#javbus',
source: '/series/:seriesid',
target: '/javbus/western/series/:seriesid',
},
],
},
'sexinsex.net': {
_name: 'sexinsex',
'.': [
{
title: '分区帖子',
docs: 'https://docs.rsshub.app/multimedia.html#sexinsex',
source: '/bbs/:path',
target: (params, url) => {
let pid, typeid;
const static_matched = params.path.match(/forum-(\d+)-\d+.html/);
if (static_matched) {
pid = static_matched[1];
} else if (params.path === 'forumdisplay.php') {
pid = new URL(url).searchParams.get('fid');
typeid = new URL(url).searchParams.get('typeid');
} else {
return false;
}
return `/sexinsex/${pid}/${typeid ? typeid : ''}`;
},
},
],
}, |
<<<<<<<
// booth.pm
router.get('/booth.pm/shop/:subdomain', require('./routes/booth-pm/shop'));
=======
// 鱼塘热榜
router.get('/mofish/:id', require('./routes/mofish/index'));
// Mcdonalds
router.get('/mcdonalds/:category', require('./routes/mcdonalds/news'));
// Pincong 品葱
router.get('/pincong/category/:category?/:sort?', require('./routes/pincong/index'));
router.get('/pincong/hot/:category?', require('./routes/pincong/hot'));
router.get('/pincong/topic/:topic', require('./routes/pincong/topic'));
// GoComics
router.get('/gocomics/:name', require('./routes/gocomics/index'));
// Comics Kingdom
router.get('/comicskingdom/:name', require('./routes/comicskingdom/index'));
// Media Digest
router.get('/mediadigest/:range/:category?', require('./routes/mediadigest/category'));
// 中国农工民主党
router.get('/ngd/:slug?', require('./routes/gov/ngd/index'));
// SimpRead-消息通知
router.get('/simpread/notice', require('./routes/simpread/notice'));
// SimpRead-更新日志
router.get('/simpread/changelog', require('./routes/simpread/changelog'));
// Radio Free Asia
router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index'));
>>>>>>>
// 鱼塘热榜
router.get('/mofish/:id', require('./routes/mofish/index'));
// Mcdonalds
router.get('/mcdonalds/:category', require('./routes/mcdonalds/news'));
// Pincong 品葱
router.get('/pincong/category/:category?/:sort?', require('./routes/pincong/index'));
router.get('/pincong/hot/:category?', require('./routes/pincong/hot'));
router.get('/pincong/topic/:topic', require('./routes/pincong/topic'));
// GoComics
router.get('/gocomics/:name', require('./routes/gocomics/index'));
// Comics Kingdom
router.get('/comicskingdom/:name', require('./routes/comicskingdom/index'));
// Media Digest
router.get('/mediadigest/:range/:category?', require('./routes/mediadigest/category'));
// 中国农工民主党
router.get('/ngd/:slug?', require('./routes/gov/ngd/index'));
// SimpRead-消息通知
router.get('/simpread/notice', require('./routes/simpread/notice'));
// SimpRead-更新日志
router.get('/simpread/changelog', require('./routes/simpread/changelog'));
// Radio Free Asia
router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index'));
// booth.pm
router.get('/booth.pm/shop/:subdomain', require('./routes/booth-pm/shop')); |
<<<<<<<
// 眾新聞
router.get('/hkcnews/news/:category?', require('./routes/hkcnews/news'));
=======
// AnyTXT
router.get('/anytxt/release-notes', require('./routes/anytxt/release-notes'));
// 鱼塘热榜
router.get('/mofish/:id', require('./routes/mofish/index'));
// Mcdonalds
router.get('/mcdonalds/:category', require('./routes/mcdonalds/news'));
// Pincong 品葱
router.get('/pincong/category/:category?/:sort?', require('./routes/pincong/index'));
router.get('/pincong/hot/:category?', require('./routes/pincong/hot'));
router.get('/pincong/topic/:topic', require('./routes/pincong/topic'));
// GoComics
router.get('/gocomics/:name', require('./routes/gocomics/index'));
// Comics Kingdom
router.get('/comicskingdom/:name', require('./routes/comicskingdom/index'));
// Media Digest
router.get('/mediadigest/:range/:category?', require('./routes/mediadigest/category'));
// 中国农工民主党
router.get('/ngd/:slug?', require('./routes/gov/ngd/index'));
// SimpRead-消息通知
router.get('/simpread/notice', require('./routes/simpread/notice'));
// SimpRead-更新日志
router.get('/simpread/changelog', require('./routes/simpread/changelog'));
// Radio Free Asia
router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index'));
// booth.pm
router.get('/booth.pm/shop/:subdomain', require('./routes/booth-pm/shop'));
>>>>>>>
// 眾新聞
router.get('/hkcnews/news/:category?', require('./routes/hkcnews/news'));
// AnyTXT
router.get('/anytxt/release-notes', require('./routes/anytxt/release-notes'));
// 鱼塘热榜
router.get('/mofish/:id', require('./routes/mofish/index'));
// Mcdonalds
router.get('/mcdonalds/:category', require('./routes/mcdonalds/news'));
// Pincong 品葱
router.get('/pincong/category/:category?/:sort?', require('./routes/pincong/index'));
router.get('/pincong/hot/:category?', require('./routes/pincong/hot'));
router.get('/pincong/topic/:topic', require('./routes/pincong/topic'));
// GoComics
router.get('/gocomics/:name', require('./routes/gocomics/index'));
// Comics Kingdom
router.get('/comicskingdom/:name', require('./routes/comicskingdom/index'));
// Media Digest
router.get('/mediadigest/:range/:category?', require('./routes/mediadigest/category'));
// 中国农工民主党
router.get('/ngd/:slug?', require('./routes/gov/ngd/index'));
// SimpRead-消息通知
router.get('/simpread/notice', require('./routes/simpread/notice'));
// SimpRead-更新日志
router.get('/simpread/changelog', require('./routes/simpread/changelog'));
// Radio Free Asia
router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index'));
// booth.pm
router.get('/booth.pm/shop/:subdomain', require('./routes/booth-pm/shop')); |
<<<<<<<
// 辽宁工程技术大学教务在线公告
router.get('/lntu/jwnews', require('./routes/universities/lntu/jwnews'));
=======
// 51voa
router.get('/51voa/:channel', require('./routes/51voa/channel'));
// zhuixinfan
router.get('/zhuixinfan/list', require('./routes/zhuixinfan/list'));
>>>>>>>
// 辽宁工程技术大学教务在线公告
router.get('/lntu/jwnews', require('./routes/universities/lntu/jwnews'));
// 51voa
router.get('/51voa/:channel', require('./routes/51voa/channel'));
// zhuixinfan
router.get('/zhuixinfan/list', require('./routes/zhuixinfan/list')); |
<<<<<<<
// GoComics
router.get('/gocomics/:name', require('./routes/gocomics/index'));
// Comics Kingdom
router.get('/comicskingdom/:name', require('./routes/comicskingdom/index'));
=======
// Media Digest
router.get('/mediadigest/:range/:category?', require('./routes/mediadigest/category'));
// 中国农工民主党
router.get('/ngd/:slug?', require('./routes/gov/ngd/index'));
// SimpRead-消息通知
router.get('/simpread/notice', require('./routes/simpread/notice'));
// SimpRead-更新日志
router.get('/simpread/changelog', require('./routes/simpread/changelog'));
// Radio Free Asia
router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index'));
>>>>>>>
// GoComics
router.get('/gocomics/:name', require('./routes/gocomics/index'));
// Comics Kingdom
router.get('/comicskingdom/:name', require('./routes/comicskingdom/index'));
// Media Digest
router.get('/mediadigest/:range/:category?', require('./routes/mediadigest/category'));
// 中国农工民主党
router.get('/ngd/:slug?', require('./routes/gov/ngd/index'));
// SimpRead-消息通知
router.get('/simpread/notice', require('./routes/simpread/notice'));
// SimpRead-更新日志
router.get('/simpread/changelog', require('./routes/simpread/changelog'));
// Radio Free Asia
router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index')); |
<<<<<<<
hoverTime,
onSetHoverTime,
onNewQueryAST,
=======
>>>>>>>
onNewQueryAST,
<<<<<<<
hoverTime={hoverTime}
onSetHoverTime={onSetHoverTime}
inView={inView}
onNewQueryAST={onNewQueryAST}
=======
resizerTopHeight={resizerTopHeight}
handleSetHoverTime={handleSetHoverTime}
>>>>>>>
onNewQueryAST={onNewQueryAST}
resizerTopHeight={resizerTopHeight}
handleSetHoverTime={handleSetHoverTime}
<<<<<<<
onNewQueryAST: func,
queryASTs: arrayOf(shape()),
=======
hoverTime: string.isRequired,
handleSetHoverTime: func.isRequired,
>>>>>>>
onNewQueryAST: func,
queryASTs: arrayOf(shape()),
hoverTime: string.isRequired,
handleSetHoverTime: func.isRequired, |
<<<<<<<
ASCENDING,
DESCENDING,
=======
FIX_FIRST_COLUMN_DEFAULT,
>>>>>>>
ASCENDING,
DESCENDING,
FIX_FIRST_COLUMN_DEFAULT,
<<<<<<<
handleClickFieldName = (columnIndex, rowIndex) => () => {
const {tableOptions} = this.props
const {clickToSortFieldIndex, clicktoSortDirection, data} = this.state
const verticalTimeAxis = _.get(tableOptions, 'verticalTimeAxis', true)
const newIndex = verticalTimeAxis ? columnIndex : rowIndex
if (clickToSortFieldIndex === newIndex) {
const direction =
clicktoSortDirection === ASCENDING ? DESCENDING : ASCENDING
const sortedData = [
data[0],
..._.orderBy(_.drop(data, 1), clickToSortFieldIndex, [direction]),
]
this.setState({
data: sortedData,
unzippedData: _.unzip(sortedData),
clicktoSortDirection: direction,
})
return
}
const sortedData = [
data[0],
..._.orderBy(_.drop(data, 1), clickToSortFieldIndex, [DEFAULT_SORT]),
]
this.setState({
data: sortedData,
unzippedData: _.unzip(sortedData),
clickToSortFieldIndex: newIndex,
clicktoSortDirection: DEFAULT_SORT,
})
}
cellRenderer = ({columnIndex, rowIndex, key, parent, style}) => {
const {hoveredColumnIndex, hoveredRowIndex} = this.state
const {tableOptions, colors} = this.props
const verticalTimeAxis = _.get(tableOptions, 'verticalTimeAxis', true)
const data = verticalTimeAxis ? this.state.data : this.state.unzippedData
=======
cellRenderer = ({columnIndex, rowIndex, key, style, parent}) => {
const {colors, tableOptions} = this.props
const {hoveredColumnIndex, hoveredRowIndex} = this.state
const data = _.get(tableOptions, 'verticalTimeAxis', true)
? this.state.data
: this.state.unzippedData
>>>>>>>
handleClickFieldName = (columnIndex, rowIndex) => () => {
const {tableOptions} = this.props
const {clickToSortFieldIndex, clicktoSortDirection, data} = this.state
const verticalTimeAxis = _.get(tableOptions, 'verticalTimeAxis', true)
const newIndex = verticalTimeAxis ? columnIndex : rowIndex
if (clickToSortFieldIndex === newIndex) {
const direction =
clicktoSortDirection === ASCENDING ? DESCENDING : ASCENDING
const sortedData = [
data[0],
..._.orderBy(_.drop(data, 1), clickToSortFieldIndex, [direction]),
]
this.setState({
data: sortedData,
unzippedData: _.unzip(sortedData),
clicktoSortDirection: direction,
})
return
}
const sortedData = [
data[0],
..._.orderBy(_.drop(data, 1), clickToSortFieldIndex, [DEFAULT_SORT]),
]
this.setState({
data: sortedData,
unzippedData: _.unzip(sortedData),
clickToSortFieldIndex: newIndex,
clicktoSortDirection: DEFAULT_SORT,
})
}
cellRenderer = ({columnIndex, rowIndex, key, parent, style}) => {
const {hoveredColumnIndex, hoveredRowIndex} = this.state
const {tableOptions, colors} = this.props
const verticalTimeAxis = _.get(tableOptions, 'verticalTimeAxis', true)
const data = verticalTimeAxis ? this.state.data : this.state.unzippedData
<<<<<<<
const isFixedColumn = rowIndex > 0 && columnIndex === 0
const isTimeData = verticalTimeAxis ? isFixedColumn : isFixedRow
const isFieldName = verticalTimeAxis ? rowIndex === 0 : columnIndex === 0
=======
const isFixedColumn = fixFirstColumn && rowIndex > 0 && columnIndex === 0
const isTimeData = tableOptions.verticalTimeAxis
? rowIndex > 0 && columnIndex === 0
: isFixedRow
>>>>>>>
const isFixedColumn = fixFirstColumn && rowIndex > 0 && columnIndex === 0
const isTimeData = verticalTimeAxis
? rowIndex > 0 && columnIndex === 0
: isFixedRow
const isFieldName = verticalTimeAxis ? rowIndex === 0 : columnIndex === 0
<<<<<<<
=======
const fixedColumnCount = tableOptions.fixFirstColumn ? 1 : undefined
const hoveringThisTable = hoveredColumnIndex !== NULL_COLUMN_INDEX
const scrollToRow =
!hoveringThisTable && verticalTimeAxis ? hoverTimeIndex : undefined
const scrollToColumn =
!hoveringThisTable && !verticalTimeAxis ? hoverTimeIndex : undefined
>>>>>>>
const fixedColumnCount = tableOptions.fixFirstColumn ? 1 : undefined
const hoveringThisTable = hoveredColumnIndex !== NULL_COLUMN_INDEX
const scrollToRow =
!hoveringThisTable && verticalTimeAxis ? hoverTimeIndex : undefined
const scrollToColumn =
!hoveringThisTable && !verticalTimeAxis ? hoverTimeIndex : undefined |
<<<<<<<
describe('export', () => {
const distDir = path.join(__dirname, 'fixtures', 'dist');
const scriptsDir = path.join(__dirname, 'fixtures', 'scripts');
const stylesDir = path.join(__dirname, 'fixtures', 'styles');
const indexPath = path.join(__dirname, 'fixtures', 'index.html');
const shas = path.join(distDir, '.shas.json');
const distIndexPath = path.join(distDir, 'index.html');
=======
const distDir = path.join(__dirname, 'fixtures', 'dist');
const scriptsDir = path.join(__dirname, 'fixtures', 'scripts');
const stylesDir = path.join(__dirname, 'fixtures', 'styles');
const stylesDistFile = path.join(distDir, 'styles', 'main.css');
const indexPath = path.join(__dirname, 'fixtures', 'index.html');
const shas = path.join(distDir, '.shas.json');
it('should export site', () => {
const promise = spawn('node', ['../../cli.js', 'export'], {
cwd: './test/fixtures',
});
>>>>>>>
const distDir = path.join(__dirname, 'fixtures', 'dist');
const scriptsDir = path.join(__dirname, 'fixtures', 'scripts');
const stylesDir = path.join(__dirname, 'fixtures', 'styles');
const indexPath = path.join(__dirname, 'fixtures', 'index.html');
const shas = path.join(distDir, '.shas.json');
const distIndexPath = path.join(distDir, 'index.html');
describe('export', () => {
<<<<<<<
const hasExportedSite = () =>
new Promise((resolve) => {
promise.childProcess.on('exit', resolve);
});
return hasExportedSite().then(() =>
expect.promise.all({
dir: expect(fs.existsSync(distDir), 'to be true'),
shas: expect(fs.existsSync(shas), 'to be true'),
index: expect(fs.readFileSync(distIndexPath, 'utf8'), 'to contain', '<body>\n'),
})
);
});
=======
const addAutoprefixConfig = () => {
const p = fs.readFileSync(pingyJsonPath, 'utf8');
fs.writeFileSync(
pingyJsonPath,
p.replace('"minify": true,', '"minify": true,\n\t"autoprefix": true,')
);
};
addAutoprefixConfig();
return hasExportedSite().then(() =>
expect.promise.all({
dir: expect(fs.existsSync(distDir), 'to be true'),
shas: expect(fs.existsSync(shas), 'to be true'),
styles: expect(
fs.readFileSync(stylesDistFile, 'utf8'),
'to contain',
'display:-webkit-box'
),
})
);
>>>>>>>
const addAutoprefixConfig = () => {
const p = fs.readFileSync(pingyJsonPath, 'utf8');
fs.writeFileSync(
pingyJsonPath,
p.replace('"minify": true,', '"minify": true,\n\t"autoprefix": true,')
);
};
addAutoprefixConfig();
return hasExportedSite().then(() =>
expect.promise.all({
dir: expect(fs.existsSync(distDir), 'to be true'),
shas: expect(fs.existsSync(shas), 'to be true'),
styles: expect(
fs.readFileSync(stylesDistFile, 'utf8'),
'to contain',
'display:-webkit-box'
),
})
);
}); |
<<<<<<<
import {getIdealColors} from 'src/shared/constants/graphColorPalettes'
const {LINEAR, LOG, BASE_10, BASE_2} = DISPLAY_OPTIONS
=======
const {LINEAR, LOG, BASE_10, BASE_2} = AXES_SCALE_OPTIONS
>>>>>>>
import {getIdealColors} from 'src/shared/constants/graphColorPalettes'
const {LINEAR, LOG, BASE_10, BASE_2} = AXES_SCALE_OPTIONS
<<<<<<<
series: this.colorDygraphSeries(),
unhighlightCallback: this.unhighlightCallback,
=======
series: this.hashColorDygraphSeries(),
>>>>>>>
series: this.colorDygraphSeries(),
<<<<<<<
colorDygraphSeries = () => {
=======
eventToTimestamp = ({pageX: pxBetweenMouseAndPage}) => {
const {left: pxBetweenGraphAndPage} = this.graphRef.getBoundingClientRect()
const graphXCoordinate = pxBetweenMouseAndPage - pxBetweenGraphAndPage
const timestamp = this.dygraph.toDataXCoord(graphXCoordinate)
const [xRangeStart] = this.dygraph.xAxisRange()
const clamped = Math.max(xRangeStart, timestamp)
return `${clamped}`
}
handleMouseMove = e => {
if (this.props.onSetHoverTime) {
const newTime = this.eventToTimestamp(e)
this.props.onSetHoverTime(newTime)
}
this.setState({isHoveringThisGraph: true})
}
handleMouseOut = () => {
if (this.props.onSetHoverTime) {
this.props.onSetHoverTime(NULL_HOVER_TIME)
}
this.setState({isHoveringThisGraph: false})
}
hashColorDygraphSeries = () => {
>>>>>>>
colorDygraphSeries = () => { |
<<<<<<<
ref={o => this.actionAttachmentSheet = o}
options={[i18n.t('cancel'), i18n.t('capture.gallery'), i18n.t('capture.photo'), i18n.t('capture.video')]}
=======
ref={this.setActionSheetRef}
options={['Cancel', 'Gallery', 'Photo', 'Video']}
>>>>>>>
ref={this.setActionSheetRef}
options={[i18n.t('cancel'), i18n.t('capture.gallery'), i18n.t('capture.photo'), i18n.t('capture.video')]} |
<<<<<<<
'browserstack.networkLogs': true,
'build' : 'v3.4.0',
=======
'build' : Version.VERSION,
>>>>>>>
'browserstack.networkLogs': true,
'build' : Version.VERSION, |
<<<<<<<
import i18n from '../common/services/i18n.service';
const REASONS = [
{ value: 1 },
{ value: 2 },
{ value: 3 },
{ value: 4 },
{ value: 5 },
{ value: 6 },
{ value: 7 },
{ value: 8 },
{ value: 10 },
{ value: 11 },
];
=======
import mindsService from '../common/services/minds.service';
import CenteredLoading from '../common/components/CenteredLoading';
>>>>>>>
import i18n from '../common/services/i18n.service';
const REASONS = [
{ value: 1 },
{ value: 2 },
{ value: 3 },
{ value: 4 },
{ value: 5 },
{ value: 6 },
{ value: 7 },
{ value: 8 },
{ value: 10 },
{ value: 11 },
];
import mindsService from '../common/services/minds.service';
import CenteredLoading from '../common/components/CenteredLoading';
<<<<<<<
title: i81n.t('report'),
=======
title: 'Report',
headerLeft: () => {
return <Icon name="chevron-left" size={38} color={colors.primary} onPress={
() => {
if (navigation.state.params && navigation.state.params.goBack) return navigation.state.params.goBack();
navigation.goBack();
}
}/>
},
>>>>>>>
title: i81n.t('report'),
headerLeft: () => {
return <Icon name="chevron-left" size={38} color={colors.primary} onPress={
() => {
if (navigation.state.params && navigation.state.params.goBack) return navigation.state.params.goBack();
navigation.goBack();
}
}/>
},
<<<<<<<
title={i18n.t('settings.submit')}
onPress={navigation.state.params.selectReason ?
navigation.state.params.selectReason : () => null}
=======
title="Submit"
onPress={navigation.state.params.confirmAndSubmit ?
navigation.state.params.confirmAndSubmit : () => null}
>>>>>>>
title={i18n.t('settings.submit')}
onPress={navigation.state.params.confirmAndSubmit ?
navigation.state.params.confirmAndSubmit : () => null}
<<<<<<<
constructor(props) {
super(props);
REASONS.forEach(r => {
r.label = i18n.t('reports.reasons.'+r.value);
});
}
=======
/**
* Component did mount
*/
>>>>>>>
constructor(props) {
super(props);
REASONS.forEach(r => {
r.label = i18n.t('reports.reasons.'+r.value);
});
}
/**
* Component did mount
*/
<<<<<<<
{text: i18n.t('tryAgain'), onPress: () => null},
=======
{text: 'Try again', onPress: () => this.submit()},
{text: 'Cancel'},
>>>>>>>
{text: i18n.t('tryAgain'), onPress: () => this.submit()},
{text: 'Cancel'},
<<<<<<<
style={{ backgroundColor: '#FFF', padding: 16, paddingTop: 24, borderWidth: 1, borderColor: '#ececec', minHeight: 100 }}
placeholder={i18n.t('reports.explain')}
=======
style={[CS.padding2x, CS.margin, CS.borderBottom, CS.borderGreyed]}
placeholder="Please explain why you wish to report this content in a few brief sentences."
>>>>>>>
style={[CS.padding2x, CS.margin, CS.borderBottom, CS.borderGreyed]}
placeholder={i18n.t('reports.explain')} |
<<<<<<<
@action
setPermissions(permissions) {
this.permissions = permissions;
}
/**
* Check if the current user can perform an action with the entity
* @param {string} action
* @param {boolean} showAlert Show an alert message if the action is not allowed
* @returns {boolean}
*/
can(action, showAlert = false) {
// TODO: clean up permissions feature flag
if (!featuresService.has('permissions')) return true;
let allowed = true;
if (!this.permissions || !this.permissions.permissions) {
allowed = false;
} else {
allowed = this.permissions.permissions.some(item => item === action);
}
if (showAlert && !allowed) {
Alert.alert(
i18n.t('sorry'),
i18n.t(`permissions.notAllowed.${action}`, {defaultValue: i18n.t('notAllowed')})
);
}
return allowed;
}
=======
isScheduled() {
return this.time_created * 1000 > Date.now();
}
static isScheduled(timeCreatedValue) {
let response = false;
if (timeCreatedValue) {
timeCreatedValue = new Date(timeCreatedValue);
response = timeCreatedValue.getTime() > Date.now();
}
return response;
}
>>>>>>>
@action
setPermissions(permissions) {
this.permissions = permissions;
}
/**
* Check if the current user can perform an action with the entity
* @param {string} action
* @param {boolean} showAlert Show an alert message if the action is not allowed
* @returns {boolean}
*/
can(action, showAlert = false) {
// TODO: clean up permissions feature flag
if (!featuresService.has('permissions')) return true;
let allowed = true;
if (!this.permissions || !this.permissions.permissions) {
allowed = false;
} else {
allowed = this.permissions.permissions.some(item => item === action);
}
if (showAlert && !allowed) {
Alert.alert(
i18n.t('sorry'),
i18n.t(`permissions.notAllowed.${action}`, {defaultValue: i18n.t('notAllowed')})
);
}
return allowed;
}
isScheduled() {
return this.time_created * 1000 > Date.now();
}
static isScheduled(timeCreatedValue) {
let response = false;
if (timeCreatedValue) {
timeCreatedValue = new Date(timeCreatedValue);
response = timeCreatedValue.getTime() > Date.now();
}
return response;
} |
<<<<<<<
<View>
<EmailConfirmation user={this.props.user} />
<BannerInfo user={this.props.user} logged={true} />
</View>
=======
<EmailConfirmation user={this.props.user} />
>>>>>>>
<EmailConfirmation user={this.props.user} />
<BannerInfo user={this.props.user} /> |
<<<<<<<
useEffect(() => {
if (inputRef.current) {
inputRef.current.focus();
}
}, [inputRef]);
=======
const showOptions = !(
keyboard.keyboardShown && props.store.attachment.hasAttachment
);
>>>>>>>
useEffect(() => {
if (inputRef.current) {
inputRef.current.focus();
}
}, [inputRef]);
const showOptions = !(
keyboard.keyboardShown && props.store.attachment.hasAttachment
); |
<<<<<<<
import OnboardingScreenNew from '../onboarding/OnboardingScreenNew';
import LoginScreenNew from '../auth/LoginScreenNew';
import featuresService from '../common/services/features.service';
=======
import EmailConfirmationScreen from '../onboarding/EmailConfirmationScreen';
>>>>>>>
import OnboardingScreenNew from '../onboarding/OnboardingScreenNew';
import LoginScreenNew from '../auth/LoginScreenNew';
import featuresService from '../common/services/features.service';
import EmailConfirmationScreen from '../onboarding/EmailConfirmationScreen'; |
<<<<<<<
justifyContent: 'center',
=======
padding: 4,
position: 'absolute',
overflow: 'visible',
>>>>>>>
justifyContent: 'center',
<<<<<<<
=======
left: 0,
top: topPosition,
zIndex: 999,
>>>>>>> |
<<<<<<<
import { isEntityNsfw } from '../../common/helpers/isNsfw';
import blockListService from '../../common/services/block-list.service';
=======
>>>>>>>
import blockListService from '../../common/services/block-list.service';
<<<<<<<
const blockedUsers = blockListService.getCachedList();
if (blockedUsers.indexOf(remind_object.owner_guid) > -1) {
return (
<View style={[styles.blockedNoticeView, CommonStyle.margin2x, CommonStyle.borderRadius2x, CommonStyle.padding2x]}>
<Text style={[CommonStyle.textCenter, CommonStyle.marginBottom]}>This content is unavailable.</Text>
<Text style={[CommonStyle.textCenter, styles.blockedNoticeDesc]}>You have blocked the author of this activity.</Text>
</View>
);
}
if (isEntityNsfw(this.props.entity)) {
=======
if (this.props.entity.shouldBeBlured()) {
>>>>>>>
const blockedUsers = blockListService.getCachedList();
if (blockedUsers.indexOf(remind_object.owner_guid) > -1) {
return (
<View style={[styles.blockedNoticeView, CommonStyle.margin2x, CommonStyle.borderRadius2x, CommonStyle.padding2x]}>
<Text style={[CommonStyle.textCenter, CommonStyle.marginBottom]}>This content is unavailable.</Text>
<Text style={[CommonStyle.textCenter, styles.blockedNoticeDesc]}>You have blocked the author of this activity.</Text>
</View>
);
}
if (this.props.entity.shouldBeBlured()) { |
<<<<<<<
import TosModal from './src/tos/TosModal';
=======
import Notification from './src/notifications/notification/Notification';
>>>>>>>
import TosModal from './src/tos/TosModal';
import Notification from './src/notifications/notification/Notification'; |
<<<<<<<
onEditRawStatus: func,
errorThrown: func.isRequired,
=======
editQueryStatus: func.isRequired,
>>>>>>>
errorThrown: func.isRequired,
editQueryStatus: func.isRequired,
<<<<<<<
const {onEditRawStatus, errorThrown} = this.props
onEditRawStatus(query.id, {loading: true})
=======
>>>>>>>
const {errorThrown} = this.props
<<<<<<<
errorThrown(error)
// 400 from chrono server = fail
const message = _.get(error, ['data', 'message'], error)
this.setState({isLoading: false})
console.error(message)
onEditRawStatus(query.id, {error: message})
=======
this.setState({
isLoading: false,
cellData: emptyCells,
})
console.error(error)
throw error
>>>>>>>
errorThrown(error)
this.setState({
isLoading: false,
cellData: emptyCells,
})
throw error |
<<<<<<<
import apiService from './src/common/services/api.service';
=======
import boostedContentService from './src/common/services/boosted-content.service';
>>>>>>>
import apiService from './src/common/services/api.service';
import boostedContentService from './src/common/services/boosted-content.service'; |
<<<<<<<
{previewComponent}
=======
<MIcon
size={45}
name="chevron-left"
style={[styles.backIcon, theme.colorWhite, cleanTop]}
onPress={props.store.rejectImage}
/>
>>>>>>>
{previewComponent}
<MIcon
size={45}
name="chevron-left"
style={[styles.backIcon, theme.colorWhite, cleanTop]}
onPress={props.store.rejectImage}
/> |
<<<<<<<
import i18n from '../common/services/i18n.service';
=======
import feedService from '../common/services/feed.service';
import featuresService from '../common/services/features.service';
import entitiesService from '../common/services/entities.service';
>>>>>>>
import i18n from '../common/services/i18n.service';
import feedService from '../common/services/feed.service';
import featuresService from '../common/services/features.service';
import entitiesService from '../common/services/entities.service'; |
<<<<<<<
<SmartImage
source={{ uri: props.image.uri }}
=======
<FastImage
key={props.image.key || 'imagePreview'}
source={{ uri: props.image.uri + `?${props.image.key}` }} // // we need to change the uri in order to force the reload of the image
>>>>>>>
<SmartImage
key={props.image.key || 'imagePreview'}
source={{ uri: props.image.uri + `?${props.image.key}` }} // // we need to change the uri in order to force the reload of the image |
<<<<<<<
import VideoClock from './VideoClock';
import { useRoute } from '@react-navigation/native';
=======
import { useTransition } from 'react-native-redash';
import Animated from 'react-native-reanimated';
>>>>>>>
import VideoClock from './VideoClock';
import { useRoute } from '@react-navigation/native';
import { useTransition } from 'react-native-redash';
import Animated from 'react-native-reanimated';
<<<<<<<
<RNCamera
ref={ref}
style={theme.flexContainer}
type={store.cameraType}
flashMode={store.flashMode}
androidCameraPermissionOptions={{
title: 'Permission to use camera',
message: 'We need your permission to use your camera',
buttonPositive: 'Ok',
buttonNegative: 'Cancel',
}}
androidRecordAudioPermissionOptions={{
title: 'Permission to use audio recording',
message: 'We need your permission to use your audio',
buttonPositive: 'Ok',
buttonNegative: 'Cancel',
}}
onGoogleVisionBarcodesDetected={({ barcodes }) => {
console.log(barcodes);
}}
/>
{store.recording && <VideoClock style={[styles.clock, cleanTop]} />}
=======
<Animated.View style={[theme.flexContainer, { opacity }]}>
{store.show && (
<RNCamera
ref={ref}
style={theme.flexContainer}
type={store.cameraType}
flashMode={store.flashMode}
androidCameraPermissionOptions={{
title: 'Permission to use camera',
message: 'We need your permission to use your camera',
buttonPositive: 'Ok',
buttonNegative: 'Cancel',
}}
androidRecordAudioPermissionOptions={{
title: 'Permission to use audio recording',
message: 'We need your permission to use your audio',
buttonPositive: 'Ok',
buttonNegative: 'Cancel',
}}
onCameraReady={store.isReady}
/>
)}
</Animated.View>
>>>>>>>
<Animated.View style={[theme.flexContainer, { opacity }]}>
{store.show && (
<RNCamera
ref={ref}
style={theme.flexContainer}
type={store.cameraType}
flashMode={store.flashMode}
androidCameraPermissionOptions={{
title: 'Permission to use camera',
message: 'We need your permission to use your camera',
buttonPositive: 'Ok',
buttonNegative: 'Cancel',
}}
androidRecordAudioPermissionOptions={{
title: 'Permission to use audio recording',
message: 'We need your permission to use your audio',
buttonPositive: 'Ok',
buttonNegative: 'Cancel',
}}
onCameraReady={store.isReady}
/>
)}
</Animated.View>
{store.recording && <VideoClock style={[styles.clock, cleanTop]} />} |
<<<<<<<
<View key="button" style={[styles.button, { backgroundColor: color, width: size, height: size }]}>
=======
<View key="button" style={[styles.button, { backgroundColor: color }]}>
>>>>>>>
<View key="button" style={[styles.button, { backgroundColor: color }]}>
<<<<<<<
size: PropTypes.number,
=======
>>>>>>>
<<<<<<<
textBackground: '#ffffff',
size: 40,
margin: 8
=======
textBackground: '#ffffff'
>>>>>>>
textBackground: '#ffffff',
margin: 8 |
<<<<<<<
options = defaultValue(options, {});
options.checkTransparency = defaultValue(options.checkTransparency, false);
options.decode = defaultValue(options.decode, false);
return fsExtraReadFile(imagePath)
=======
return fsExtra.readFile(imagePath)
>>>>>>>
options = defaultValue(options, {});
options.checkTransparency = defaultValue(options.checkTransparency, false);
options.decode = defaultValue(options.decode, false);
return fsExtra.readFile(imagePath) |
<<<<<<<
var Cesium = require('cesium');
var Promise = require('bluebird');
var loadObj = require('../../lib/loadObj');
var obj2gltf = require('../../lib/obj2gltf');
var Cartesian3 = Cesium.Cartesian3;
var CesiumMath = Cesium.Math;
var clone = Cesium.clone;
var RuntimeError = Cesium.RuntimeError;
var objPath = 'specs/data/box/box.obj';
var objNormalsPath = 'specs/data/box-normals/box-normals.obj';
var objUvsPath = 'specs/data/box-uvs/box-uvs.obj';
var objPositionsOnlyPath = 'specs/data/box-positions-only/box-positions-only.obj';
var objNegativeIndicesPath = 'specs/data/box-negative-indices/box-negative-indices.obj';
var objTrianglesPath = 'specs/data/box-triangles/box-triangles.obj';
var objObjectsPath = 'specs/data/box-objects/box-objects.obj';
var objGroupsPath = 'specs/data/box-groups/box-groups.obj';
var objObjectsGroupsPath = 'specs/data/box-objects-groups/box-objects-groups.obj';
var objObjectsGroupsMaterialsPath = 'specs/data/box-objects-groups-materials/box-objects-groups-materials.obj';
var objObjectsGroupsMaterialsPath2 = 'specs/data/box-objects-groups-materials-2/box-objects-groups-materials-2.obj';
var objUsemtlPath = 'specs/data/box-usemtl/box-usemtl.obj';
var objNoMaterialsPath = 'specs/data/box-no-materials/box-no-materials.obj';
var objMultipleMaterialsPath = 'specs/data/box-multiple-materials/box-multiple-materials.obj';
var objUncleanedPath = 'specs/data/box-uncleaned/box-uncleaned.obj';
var objMtllibPath = 'specs/data/box-mtllib/box-mtllib.obj';
var objMtllibSpacesPath = 'specs/data/box-mtllib-spaces/box mtllib.obj';
var objMissingMtllibPath = 'specs/data/box-missing-mtllib/box-missing-mtllib.obj';
var objMissingUsemtlPath = 'specs/data/box-missing-usemtl/box-missing-usemtl.obj';
var objUnnamedMaterialPath = 'specs/data/box-unnamed-material/box-unnamed-material.obj';
var objExternalResourcesPath = 'specs/data/box-external-resources/box-external-resources.obj';
var objResourcesInRootPath = 'specs/data/box-resources-in-root/box-resources-in-root.obj';
var objExternalResourcesInRootPath = 'specs/data/box-external-resources-in-root/box-external-resources-in-root.obj';
var objTexturedPath = 'specs/data/box-textured/box-textured.obj';
var objMissingTexturePath = 'specs/data/box-missing-texture/box-missing-texture.obj';
var objSubdirectoriesPath = 'specs/data/box-subdirectories/box-textured.obj';
var objWindowsPaths = 'specs/data/box-windows-paths/box-windows-paths.obj';
var objInvalidContentsPath = 'specs/data/box/box.mtl';
var objConcavePath = 'specs/data/concave/concave.obj';
var objUnnormalizedPath = 'specs/data/box-unnormalized/box-unnormalized.obj';
var objMixedAttributesPath = 'specs/data/box-mixed-attributes/box-mixed-attributes.obj';
var objInvalidPath = 'invalid.obj';
=======
const Cesium = require('cesium');
const loadObj = require('../../lib/loadObj');
const obj2gltf = require('../../lib/obj2gltf');
const Cartesian3 = Cesium.Cartesian3;
const CesiumMath = Cesium.Math;
const clone = Cesium.clone;
const RuntimeError = Cesium.RuntimeError;
const objPath = 'specs/data/box/box.obj';
const objNormalsPath = 'specs/data/box-normals/box-normals.obj';
const objUvsPath = 'specs/data/box-uvs/box-uvs.obj';
const objPositionsOnlyPath = 'specs/data/box-positions-only/box-positions-only.obj';
const objNegativeIndicesPath = 'specs/data/box-negative-indices/box-negative-indices.obj';
const objTrianglesPath = 'specs/data/box-triangles/box-triangles.obj';
const objObjectsPath = 'specs/data/box-objects/box-objects.obj';
const objGroupsPath = 'specs/data/box-groups/box-groups.obj';
const objObjectsGroupsPath = 'specs/data/box-objects-groups/box-objects-groups.obj';
const objObjectsGroupsMaterialsPath = 'specs/data/box-objects-groups-materials/box-objects-groups-materials.obj';
const objObjectsGroupsMaterialsPath2 = 'specs/data/box-objects-groups-materials-2/box-objects-groups-materials-2.obj';
const objUsemtlPath = 'specs/data/box-usemtl/box-usemtl.obj';
const objNoMaterialsPath = 'specs/data/box-no-materials/box-no-materials.obj';
const objMultipleMaterialsPath = 'specs/data/box-multiple-materials/box-multiple-materials.obj';
const objUncleanedPath = 'specs/data/box-uncleaned/box-uncleaned.obj';
const objMtllibPath = 'specs/data/box-mtllib/box-mtllib.obj';
const objMtllibSpacesPath = 'specs/data/box-mtllib-spaces/box mtllib.obj';
const objMissingMtllibPath = 'specs/data/box-missing-mtllib/box-missing-mtllib.obj';
const objMissingUsemtlPath = 'specs/data/box-missing-usemtl/box-missing-usemtl.obj';
const objExternalResourcesPath = 'specs/data/box-external-resources/box-external-resources.obj';
const objResourcesInRootPath = 'specs/data/box-resources-in-root/box-resources-in-root.obj';
const objExternalResourcesInRootPath = 'specs/data/box-external-resources-in-root/box-external-resources-in-root.obj';
const objTexturedPath = 'specs/data/box-textured/box-textured.obj';
const objMissingTexturePath = 'specs/data/box-missing-texture/box-missing-texture.obj';
const objSubdirectoriesPath = 'specs/data/box-subdirectories/box-textured.obj';
const objWindowsPaths = 'specs/data/box-windows-paths/box-windows-paths.obj';
const objInvalidContentsPath = 'specs/data/box/box.mtl';
const objConcavePath = 'specs/data/concave/concave.obj';
const objUnnormalizedPath = 'specs/data/box-unnormalized/box-unnormalized.obj';
const objMixedAttributesPath = 'specs/data/box-mixed-attributes/box-mixed-attributes.obj';
const objInvalidPath = 'invalid.obj';
>>>>>>>
const Cesium = require('cesium');
const loadObj = require('../../lib/loadObj');
const obj2gltf = require('../../lib/obj2gltf');
const Cartesian3 = Cesium.Cartesian3;
const CesiumMath = Cesium.Math;
const clone = Cesium.clone;
const RuntimeError = Cesium.RuntimeError;
const objPath = 'specs/data/box/box.obj';
const objNormalsPath = 'specs/data/box-normals/box-normals.obj';
const objUvsPath = 'specs/data/box-uvs/box-uvs.obj';
const objPositionsOnlyPath = 'specs/data/box-positions-only/box-positions-only.obj';
const objNegativeIndicesPath = 'specs/data/box-negative-indices/box-negative-indices.obj';
const objTrianglesPath = 'specs/data/box-triangles/box-triangles.obj';
const objObjectsPath = 'specs/data/box-objects/box-objects.obj';
const objGroupsPath = 'specs/data/box-groups/box-groups.obj';
const objObjectsGroupsPath = 'specs/data/box-objects-groups/box-objects-groups.obj';
const objObjectsGroupsMaterialsPath = 'specs/data/box-objects-groups-materials/box-objects-groups-materials.obj';
const objObjectsGroupsMaterialsPath2 = 'specs/data/box-objects-groups-materials-2/box-objects-groups-materials-2.obj';
const objUsemtlPath = 'specs/data/box-usemtl/box-usemtl.obj';
const objNoMaterialsPath = 'specs/data/box-no-materials/box-no-materials.obj';
const objMultipleMaterialsPath = 'specs/data/box-multiple-materials/box-multiple-materials.obj';
const objUncleanedPath = 'specs/data/box-uncleaned/box-uncleaned.obj';
const objMtllibPath = 'specs/data/box-mtllib/box-mtllib.obj';
const objMtllibSpacesPath = 'specs/data/box-mtllib-spaces/box mtllib.obj';
const objMissingMtllibPath = 'specs/data/box-missing-mtllib/box-missing-mtllib.obj';
const objMissingUsemtlPath = 'specs/data/box-missing-usemtl/box-missing-usemtl.obj';
const objUnnamedMaterialPath = 'specs/data/box-unnamed-material/box-unnamed-material.obj';
const objExternalResourcesPath = 'specs/data/box-external-resources/box-external-resources.obj';
const objResourcesInRootPath = 'specs/data/box-resources-in-root/box-resources-in-root.obj';
const objExternalResourcesInRootPath = 'specs/data/box-external-resources-in-root/box-external-resources-in-root.obj';
const objTexturedPath = 'specs/data/box-textured/box-textured.obj';
const objMissingTexturePath = 'specs/data/box-missing-texture/box-missing-texture.obj';
const objSubdirectoriesPath = 'specs/data/box-subdirectories/box-textured.obj';
const objWindowsPaths = 'specs/data/box-windows-paths/box-windows-paths.obj';
const objInvalidContentsPath = 'specs/data/box/box.mtl';
const objConcavePath = 'specs/data/concave/concave.obj';
const objUnnormalizedPath = 'specs/data/box-unnormalized/box-unnormalized.obj';
const objMixedAttributesPath = 'specs/data/box-mixed-attributes/box-mixed-attributes.obj';
const objInvalidPath = 'invalid.obj';
<<<<<<<
it('loads obj with unnamed material', function(done) {
expect(loadObj(objUnnamedMaterialPath, options)
.then(function(data) {
expect(data.materials.length).toBe(1);
expect(data.nodes[0].meshes[0].primitives[0].material).toBe('');
}), done).toResolve();
});
it('loads .mtl outside of the obj directory', function(done) {
expect(loadObj(objExternalResourcesPath, options)
.then(function(data) {
var materials = data.materials;
expect(materials.length).toBe(2);
=======
it('loads .mtl outside of the obj directory', async () => {
const data = await loadObj(objExternalResourcesPath, options);
const materials = data.materials;
expect(materials.length).toBe(2);
>>>>>>>
it('loads obj with unnamed material', async () => {
const data = await loadObj(objUnnamedMaterialPath, options);
expect(data.materials.length).toBe(1);
expect(data.nodes[0].meshes[0].primitives[0].material).toBe('');
});
it('loads .mtl outside of the obj directory', async () => {
const data = await loadObj(objExternalResourcesPath, options);
const materials = data.materials;
expect(materials.length).toBe(2); |
<<<<<<<
cellID={cellID}
=======
prefix={prefix}
suffix={suffix}
>>>>>>>
cellID={cellID}
prefix={prefix}
suffix={suffix}
<<<<<<<
cellID: string,
=======
inView: bool,
>>>>>>>
cellID: string,
inView: bool, |
<<<<<<<
// 3D object keyed first Sp, then by iteration, then by column index.
var connectionCache = {
random: {},
learning: {}
};
=======
var encodeWeekends = shouldEncodeWeekends();
>>>>>>>
// 3D object keyed first Sp, then by iteration, then by column index.
var connectionCache = {
random: {},
learning: {}
};
var encodeWeekends = shouldEncodeWeekends();
<<<<<<<
spClients.random = new HTM.SpatialPoolerClient();
spClients.learning = new HTM.SpatialPoolerClient(save);
=======
spClients.random = new HTM.SpatialPoolerClient(save);
spClients.learning = new HTM.SpatialPoolerClient(save);
>>>>>>>
spClients.random = new HTM.SpatialPoolerClient(save);
spClients.learning = new HTM.SpatialPoolerClient(save);
<<<<<<<
_.each(spClients, function(client, name) {
computes[name] = spClinets[name].compute(noisyEncoding, {
learn: (name == 'learning')
})
});
=======
computes.random = function(callback) {
spClients.random.compute(noisyEncoding, {
learn: learn
}, callback);
};
computes.learning = function(callback) {
spClients.learning.compute(noisyEncoding, {
learn: true
}, callback);
};
>>>>>>>
_.each(spClients, function(client, name) {
computes[name] = function(callback) {
spClients[name].compute(noisyEncoding, {
learn: (name == 'learning')
}, callback)
};
});
<<<<<<<
=======
>>>>>>> |
<<<<<<<
filters : {},
jsonOutput: false,
jsonOutputFilename: 'cachebuster.json'
=======
enableUrlFragmentHint: false,
filters : {}
>>>>>>>
enableUrlFragmentHint: false,
filters : {},
jsonOutput: false,
jsonOutputFilename: 'cachebuster.json' |
<<<<<<<
const STYLES_SIMPLE_FLOW_CONTAINER = css `
display: flex;
flex-direction: row;
width: 100vw;
justify-content: space-around;
padding-top: 20vh;
align-items: center;
`;
const STYLES_ARROW_CONTAINER = css `
width: 200px;
`
const STYLES_SECTION_TEXT = css`
display: block;
max-width: 980px;
`;
const STYLES_SECTION_SVG_CONTAINER = css`
display: flex;
justify-content: center;
`;
const STYLES_STROKE_KF = keyframes`
from { stroke-dashoffset: 1; }
to { stroke-dashoffset: 0;}
`
const STYLES_SVG_AN = css`
animation: ${STYLES_STROKE_KF} 5s ease-in-out infinite alternate;
`
const STYLES_CONTR_CONTAINER = css `
display: flex;
`
const STYLES_CONTR_LIST = css `
display: flex;
justify-content: space-around;
width: 100vw;
list-style: none;
`
const STYLES_CONTR_LI0 = css `
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration: none;
padding-bottom: 1.5rem;
`
const STYLES_CONTR_LI1 = css `
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration: none;
opacity: .76;
padding-bottom: 1.5rem;
`
const STYLES_CONTR_LI2 = css `
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration: none;
opacity: .56;
padding-bottom: 1.5rem;
`
const STYLES_CONTR_LI3 = css `
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration: none;
opacity: .26;
padding-bottom: 1.5rem;
`
=======
const STYLES_MEDIA_LEFT = css`
position: absolute;
right: 16%;
bottom: 24px
`;
const fadeImages = [
"/static/media/image.jpg",
"/static/media/sound.jpg",
"/static/media/code.jpg",
"/static/media/text.jpg",
"/static/media/url.jpg",
];
>>>>>>>
const STYLES_SIMPLE_FLOW_CONTAINER = css `
display: flex;
flex-direction: row;
width: 100vw;
justify-content: space-around;
padding-top: 20vh;
align-items: center;
`;
const STYLES_ARROW_CONTAINER = css `
width: 200px;
`
const STYLES_SECTION_TEXT = css`
display: block;
max-width: 980px;
`;
const STYLES_SECTION_SVG_CONTAINER = css`
display: flex;
justify-content: center;
`;
const STYLES_STROKE_KF = keyframes`
from { stroke-dashoffset: 1; }
to { stroke-dashoffset: 0;}
`
const STYLES_SVG_AN = css`
animation: ${STYLES_STROKE_KF} 5s ease-in-out infinite alternate;
`
const STYLES_CONTR_CONTAINER = css `
display: flex;
`
const STYLES_CONTR_LIST = css `
display: flex;
justify-content: space-around;
width: 100vw;
list-style: none;
`
const STYLES_CONTR_LI0 = css `
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration: none;
padding-bottom: 1.5rem;
`
const STYLES_CONTR_LI1 = css `
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration: none;
opacity: .76;
padding-bottom: 1.5rem;
`
const STYLES_CONTR_LI2 = css `
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration: none;
opacity: .56;
padding-bottom: 1.5rem;
`
const STYLES_CONTR_LI3 = css `
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration: none;
opacity: .26;
padding-bottom: 1.5rem;
`
const STYLES_MEDIA_LEFT = css`
position: absolute;
right: 16%;
bottom: 24px
`;
const fadeImages = [
"/static/media/image.jpg",
"/static/media/sound.jpg",
"/static/media/code.jpg",
"/static/media/text.jpg",
"/static/media/url.jpg",
]; |
<<<<<<<
width: 48%;
=======
color: ${Constants.system.black};
width: 100%;
>>>>>>>
width: 48%;
<<<<<<<
const STYLES_FOREGROUND_H1 = css`
font-size: 4.768rem;
color: ${Constants.system.foreground};
padding: 0px 0px 32px 0px;
width: 64%;
`;
const STYLES_FOREGROUND_H2 = css`
font-size: 1.953rem;
color: ${Constants.system.foreground};
width: 48%;
`;
const STYLES_HERO = css`
padding: 88px 24px;
width: 100vw;
height: 100vh;
background: ${Constants.system.foreground};
`;
=======
>>>>>>>
const STYLES_FOREGROUND_H1 = css`
font-size: 4.768rem;
color: ${Constants.system.foreground};
padding: 0px 0px 32px 0px;
width: 64%;
`;
const STYLES_FOREGROUND_H2 = css`
font-size: 1.953rem;
color: ${Constants.system.foreground};
width: 48%;
`;
const STYLES_HERO = css`
padding: 88px 24px;
width: 100vw;
height: 100vh;
background: ${Constants.system.foreground};
`;
<<<<<<<
const STYLES_SECTION_FRONT = css`
padding: 88px 24px 24px 24px;
margin: 0px 0px 0px 0px;
position: relative;
z-index : 2;
`;
=======
const STYLES_VIEWS_TEXT = css`
align-items: center;
height: 80%;
ul {
list-style-type: none;
position: relative;
padding-top: 20vh;
}
a {
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration: none;
}
a:hover{
font-size: 1.953rem;
color: ${Constants.system.black};
text-decoration-style: wavy;
font-weight: bold;
}
img {
display: none;
height: 301px;
position: absolute;
right: 0;
top: 0;
width: 300px;
}
a:hover + img,
img:hover {
width: 65%;
height: auto;
display: block;
}
}
`;
>>>>>>>
const STYLES_SECTION_FRONT = css`
padding: 88px 24px 24px 24px;
margin: 0px 0px 0px 0px;
position: relative;
z-index : 2;
// const STYLES_VIEWS_TEXT = css`
// align-items: center;
// height: 80%;
// ul {
// list-style-type: none;
// position: relative;
// padding-top: 20vh;
// }
// a {
// font-size: 1.953rem;
// color: ${Constants.system.black};
// text-decoration: none;
// }
// a:hover{
// font-size: 1.953rem;
// color: ${Constants.system.black};
// text-decoration-style: wavy;
// font-weight: bold;
// }
// img {
// display: none;
// height: 301px;
// position: absolute;
// right: 0;
// top: 0;
// width: 300px;
// }
// a:hover + img,
// img:hover {
// width: 65%;
// height: auto;
// display: block;
// }
// }
// `;
<<<<<<<
<section css={STYLES_HERO}>
<h1>Store your files, turn them into collections, and share them with the world — with Slate.</h1>
<br/>
=======
<section css={STYLES_HERO_SECTION}>
<div css={STYLES_HERO_TEXT}>
<System.H1>Slate is the gateway to Filecoin.</System.H1>
<br/>
<System.H2>By creating a safe, open, and moddable storage system that is easy to use, we create paths to a new network of designed around trust.</System.H2>
</div>
>>>>>>>
<section css={STYLES_HERO_SECTION}>
<div css={STYLES_HERO_TEXT}>
<System.H1>Slate is the gateway to Filecoin.</System.H1>
<br/>
<System.H2>By creating a safe, open, and moddable storage system that is easy to use, we create paths to a new network of designed around trust.</System.H2>
</div> |
<<<<<<<
nv.utils.windowResize(chart.update)
$rootScope.$on("QueryLaunched", function() {
console.log($scope.datax);
if (typeof(path) !== "undefined") {
data = builtAllSeries(getData($scope.datax, path.split('.')), $scope.pathx, getData($scope.datay, path.split('.')), $scope.pathy);
}
else {
data = builtAllSeries($scope.datax, $scope.pathx, $scope.datay, $scope.pathy);
}
});
d3.select(elem[0])
=======
var svg = d3.select(elem[0])
>>>>>>>
nv.utils.windowResize(chart.update)
var svg = d3.select(elem[0]) |
<<<<<<<
"} order by desc(?timestamp) ";//limit " + limit;
=======
//" filter ( ?timestamp >= " + timestamp + " ) \n" +
"} order by asc(?timestamp) ";//limit " + limit;
>>>>>>>
"} order by asc(?timestamp) ";//limit " + limit; |
<<<<<<<
}
window.toLocalISODateString4dbg = toLocalISODateString;
/**
* Calculates distance between two locations in meters
* If any of the locations or lat, lng of the location are undefined/null, return undefined
* @param locationA json {lat, lng]
* @param locationB json {lat, lng]
* @returns {number} distance between these two coordinates in meters
*/
export function calculateDistance(locationA, locationB) {
const locationAImm = locationA && Immutable.fromJS(locationA);
const locationBImm = locationB && Immutable.fromJS(locationB);
if (
!locationAImm ||
!locationAImm.get("lat") ||
!locationAImm.get("lng") ||
!locationBImm ||
!locationBImm.get("lat") ||
!locationBImm.get("lng")
) {
return;
}
const earthRadius = 6371000; // earth radius in meters
const dLat =
((locationBImm.get("lat") - locationAImm.get("lat")) * Math.PI) / 180;
const dLon =
((locationBImm.get("lng") - locationAImm.get("lng")) * Math.PI) / 180;
const a =
Math.sin(dLat / 2) * Math.sin(dLat / 2) +
Math.cos((locationAImm.get("lat") * Math.PI) / 180) *
Math.cos((locationBImm.get("lat") * Math.PI) / 180) *
Math.sin(dLon / 2) *
Math.sin(dLon / 2);
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
const d = earthRadius * c;
return Math.round(d);
}
export function base64UrlToUint8Array(base64UrlData) {
const padding = "=".repeat((4 - (base64UrlData.length % 4)) % 4);
const base64 = (base64UrlData + padding)
.replace(/-/g, "+")
.replace(/_/g, "/");
const rawData = atob(base64);
const buffer = new Uint8Array(rawData.length);
for (const i of buffer.keys()) {
buffer[i] = rawData.charCodeAt(i);
}
return buffer;
=======
>>>>>>>
}
export function base64UrlToUint8Array(base64UrlData) {
const padding = "=".repeat((4 - (base64UrlData.length % 4)) % 4);
const base64 = (base64UrlData + padding)
.replace(/-/g, "+")
.replace(/_/g, "/");
const rawData = atob(base64);
const buffer = new Uint8Array(rawData.length);
for (const i of buffer.keys()) {
buffer[i] = rawData.charCodeAt(i);
}
return buffer; |
<<<<<<<
applicationStateService.getBaseUrl = function(){
return baseUrl;
}
applicationStateService.getPublicLink = function(needUri){
return applicationStateService.getBaseUrl() + '/post-detail?need=' + encodeURIComponent(needUri);
}
applicationStateService.getPrivateLink = function(needUri){
return applicationStateService.getBaseUrl() + '/private'; //todo set value normaly
}
=======
applicationStateService.addSearchResults = function(searchResults,promises){
var deferred = $q.defer();
$q.all(promises).then(function(searchResults){
angular.forEach(searchResults,function(result){
result.data = linkedDataService.getNeed(result['matchURI']);
})
})
privateData.searchResults = searchResults;
deferred.resolve(privateData.searchResults);
return deferred.promise;
}
applicationStateService.getSearchResults = function(){
return privateData.searchResults;
}
>>>>>>>
applicationStateService.getBaseUrl = function(){
return baseUrl;
}
applicationStateService.getPublicLink = function(needUri){
return applicationStateService.getBaseUrl() + '/post-detail?need=' + encodeURIComponent(needUri);
}
applicationStateService.getPrivateLink = function(needUri){
return applicationStateService.getBaseUrl() + '/private'; //todo set value normaly
}
applicationStateService.addSearchResults = function(searchResults,promises){
var deferred = $q.defer();
$q.all(promises).then(function(searchResults){
angular.forEach(searchResults,function(result){
result.data = linkedDataService.getNeed(result['matchURI']);
})
})
privateData.searchResults = searchResults;
deferred.resolve(privateData.searchResults);
return deferred.promise;
}
applicationStateService.getSearchResults = function(){
return privateData.searchResults;
} |
<<<<<<<
class wrapper extends Component {
constructor() {
super()
this.state = {
=======
const wrapper = React.createClass({
propTypes: {
children: element,
autoRefresh: number.isRequired,
templates: arrayOf(
shape({
type: string.isRequired,
tempVar: string.isRequired,
query: shape({
db: string,
rp: string,
influxql: string,
}),
values: arrayOf(
shape({
type: string.isRequired,
value: string.isRequired,
selected: bool,
})
).isRequired,
})
),
queries: arrayOf(
shape({
host: oneOfType([string, arrayOf(string)]),
text: string,
}).isRequired
).isRequired,
axes: shape({
bounds: shape({
y: array,
y2: array,
}),
}),
editQueryStatus: func,
grabDataForDownload: func,
},
getInitialState() {
return {
>>>>>>>
class wrapper extends Component {
constructor() {
super()
this.state = {
<<<<<<<
executeQueries = async (queries, templates = []) => {
const {editQueryStatus} = this.props
=======
executeQueries(queries, templates = []) {
const {editQueryStatus, grabDataForDownload} = this.props
>>>>>>>
executeQueries = async (queries, templates = []) => {
const {editQueryStatus, grabDataForDownload} = this.props
<<<<<<<
const lastQuerySuccessful = this._resultsForQuery(newSeries)
=======
const lastQuerySuccessful = !this._noResultsForQuery(newSeries)
>>>>>>>
const lastQuerySuccessful = this._resultsForQuery(newSeries)
<<<<<<<
} catch (err) {
console.error(err)
}
}
=======
if (grabDataForDownload) {
grabDataForDownload(timeSeries)
}
})
},
>>>>>>>
if (grabDataForDownload) {
grabDataForDownload(timeSeries)
}
} catch (err) {
console.error(err)
}
} |
<<<<<<<
// move this down when refactoring preventSharing
const fullFlags = post && generateFullNeedFlags(post);
=======
const personaRating = persona && persona.get("rating");
>>>>>>>
const personaRating = persona && persona.get("rating");
<<<<<<<
// TODO: this probably should not be checked like that - util method?
=======
personaRating: personaRating,
>>>>>>>
personaRating: personaRating,
// TODO: this probably should not be checked like that - util method? |
<<<<<<<
const {annotation, dygraph, staticLegendHeight} = this.props
=======
const {annotation, dygraph} = this.props
const {isDragging} = this.state
>>>>>>>
const {annotation, dygraph, staticLegendHeight} = this.props
const {isDragging} = this.state
<<<<<<<
<AnnotationWindow
annotation={annotation}
dygraph={dygraph}
staticLegendHeight={staticLegendHeight}
/>
=======
<AnnotationWindow
annotation={annotation}
dygraph={dygraph}
active={isDragging}
/>
>>>>>>>
<AnnotationWindow
annotation={annotation}
dygraph={dygraph}
active={isDragging}
staticLegendHeight={staticLegendHeight}
/> |
<<<<<<<
const wonMessageBuilder = new won.MessageBuilder(won.WONMSG.connectionMessage)
=======
const wonMessageBuilder = new won.MessageBuilder(won.WONMSG.connectionMessage)
.eventURI(eventUri)
>>>>>>>
const wonMessageBuilder = new won.MessageBuilder(won.WONMSG.connectionMessage)
<<<<<<<
.hasSentTimestamp(new Date().getTime().toString());
if (chatMessage.startsWith("::msg::")) {
let candidateTripleString = chatMessage.replace(/</g,"<").replace(/>/g,">")
// triple syntax: parse chat message. if it has exactly three elements,
// separated by white space, interpret as triples:
const tripleCandidate = candidateTripleString.split(/\s+/);
if (tripleCandidate.length == 3){
const predicate = tripleCandidate[1];
const object = tripleCandidate[2];
const objectUri = getUri(object);
if (objectUri){
//object is an uri, add JSON-LD URI
wonMessageBuilder.addContentGraphData(predicate, {'@id':objectUri});
} else {
//object is interpreted as string
wonMessageBuilder.addContentGraphData(predicate, object);
}
}
}
if(graphPayload) {
wonMessageBuilder.mergeIntoContentGraph(graphPayload);
} else if (chatMessage) {
//add the chatMessage as normal text message
wonMessageBuilder.addContentGraphData(won.WON.hasTextMessage, chatMessage)
} else {
throw new Exception(
"No textmessage or valid graph as payload of chat message:" +
JSON.stringify(chatMessage) + " " +
JSON.stringify(graphPayload)
);
}
wonMessageBuilder.eventURI(eventUri); // replace placeholders with proper event-uri
const message = wonMessageBuilder.build();
=======
.hasSentTimestamp(new Date().getTime().toString());
if (chatMessage.startsWith("::msg::")) {
let candidateTripleString = chatMessage.replace(/</g,"<").replace(/>/g,">")
// triple syntax: parse chat message. if it has exactly three elements,
// separated by white space, interpret as triples:
const tripleCandidate = candidateTripleString.split(/\s+/);
if (tripleCandidate.length == 3){
const predicate = tripleCandidate[1];
let predicateUri = getUri(predicate);
if (!predicateUri){
predicateUri = expandPrefix(predicate);
}
const object = tripleCandidate[2];
const objectUri = getUri(object);
if (objectUri){
//object is an uri, add JSON-LD URI
wonMessageBuilder.addContentGraphData(predicateUri, {'@id':objectUri});
} else {
//object is interpreted as string
wonMessageBuilder.addContentGraphData(predicateUri, object);
}
}
}
//add the chatMessage as normal text message (even if it's a triple too).
wonMessageBuilder.addContentGraphData(won.WON.hasTextMessage, chatMessage)
const message = wonMessageBuilder.build();
>>>>>>>
.hasSentTimestamp(new Date().getTime().toString());
if(graphPayload) {
wonMessageBuilder.mergeIntoContentGraph(graphPayload);
} else if (chatMessage) {
//add the chatMessage as normal text message
wonMessageBuilder.addContentGraphData(won.WON.hasTextMessage, chatMessage)
} else {
throw new Exception(
"No textmessage or valid graph as payload of chat message:" +
JSON.stringify(chatMessage) + " " +
JSON.stringify(graphPayload)
);
}
wonMessageBuilder.eventURI(eventUri); // replace placeholders with proper event-uri
const message = wonMessageBuilder.build();
<<<<<<<
/*
* If the specified candidate is a string enclosed in '<' and '>', return the enclosed string.
* Returns null in any other case.
*/
function getUri(candidate){
const matched = candidate.match(/^<([^<>]+)>$/)
if (matched == null) return null;
if (matched.length != 2) return null;
return matched[1];
}
=======
/*
* If the specified candidate is a string enclosed in '<' and '>', return the enclosed string.
* Returns null in any other case.
*/
function getUri(candidate){
const matched = candidate.match(/^<([^<>]+)>$/)
if (matched == null) return null;
if (matched.length != 2) return null;
return matched[1];
}
function expandPrefix(candidate){
return candidate
.replace(/^won:/,'http://purl.org/webofneeds/model#')
.replace(/^msg:/,'http://purl.org/webofneeds/message#')
.replace(/^agr:/,'http://purl.org/webofneeds/agreement#')
.replace(/^mod:/,'http://purl.org/webofneeds/modification#');
}
>>>>>>> |
<<<<<<<
const paragraphsDom = Array.prototype.slice.call( // to normal Array
this.$element[0].querySelectorAll('p') // NodeList of paragraphs
);
=======
const paragraphsDom = this.$element.find('p').toArray();
>>>>>>>
const paragraphsDom = Array.prototype.slice.call( // to normal Array
this.$element[0].querySelectorAll('p') // NodeList of paragraphs
);
<<<<<<<
var description;
=======
let description;
let tags;
>>>>>>>
let description;
<<<<<<<
this.drafts__change__tags({
draftId: this.draftId,
tags: tags.toJS(),
});
}
valid() {
return true; //return this.charactersLeft() >= 0;
=======
const draft = {title, description, tags};
this.$scope.$apply(() => this.onDraftChange({draft}));
dispatchEvent(this.$element[0], 'draftChange', draft);
>>>>>>>
const draft = {title, description, tags};
this.$scope.$apply(() => this.onDraftChange({draft}));
dispatchEvent(this.$element[0], 'draftChange', draft); |
<<<<<<<
<div
class="won-cm__content__text"
title="{{ self.shouldShowRdf ? self.rdfToString(self.message.get('contentGraphs')) : undefined }}">
{{ self.message.get('text') }}
<br ng-show="self.shouldShowRdf && self.contentGraphsTrig"/>
<hr ng-show="self.shouldShowRdf && self.contentGraphsTrig"/>
<code ng-show="self.shouldShowRdf && self.contentGraphsTrig">
{{ self.contentGraphsTrig }}
</code>
=======
<div class="won-cm__content__text"
title="{{ self.shouldShowRdf ? self.rdfToString(self.message.get('contentGraphs')) : undefined }}"
ng-class="{'propose' : self.message.get('isProposeMessage')}">
<span ng-show="self.message.get('isProposeMessage')"><h3>Proposal</h3></span>
<span ng-show="self.message.get('isAcceptMessage')"><h3>Agreement</h3></span>
{{ self.message.get('text') }}
<div class="won-cm__content__button"
ng-if="self.message.get('isProposeMessage')
&& !self.message.get('outgoingMessage')
&& !self.message.get('isAcceptMessage')
&& !self.message.isAccepted
&& !self.clicked">
<button class="won-button--filled thin red" ng-click="self.acceptProposal()">Accept</button>
</div>
<div class="won-cm__content__button"
ng-if="self.message.get('outgoingMessage')
&& !self.message.get('isProposeMessage')
&& !self.message.get('isAcceptMessage')">
<button class="won-button--filled thin black" ng-click="self.sendProposal()">Propose</button>
</div>
>>>>>>>
<div class="won-cm__content__text"
title="{{ self.shouldShowRdf ? self.rdfToString(self.message.get('contentGraphs')) : undefined }}"
ng-class="{'propose' : self.message.get('isProposeMessage')}">
<span ng-show="self.message.get('isProposeMessage')"><h3>Proposal</h3></span>
<span ng-show="self.message.get('isAcceptMessage')"><h3>Agreement</h3></span>
{{ self.message.get('text') }}
<br ng-show="self.shouldShowRdf && self.contentGraphsTrig"/>
<hr ng-show="self.shouldShowRdf && self.contentGraphsTrig"/>
<code ng-show="self.shouldShowRdf && self.contentGraphsTrig">
{{ self.contentGraphsTrig }}
</code>
<div class="won-cm__content__button"
ng-if="self.message.get('isProposeMessage')
&& !self.message.get('outgoingMessage')
&& !self.message.get('isAcceptMessage')
&& !self.message.isAccepted
&& !self.clicked">
<button class="won-button--filled thin red" ng-click="self.acceptProposal()">Accept</button>
</div>
<div class="won-cm__content__button"
ng-if="self.message.get('outgoingMessage')
&& !self.message.get('isProposeMessage')
&& !self.message.get('isAcceptMessage')">
<button class="won-button--filled thin black" ng-click="self.sendProposal()">Propose</button>
</div>
<<<<<<<
ownNeed,
=======
ownNeed,
>>>>>>>
ownNeed, |
<<<<<<<
gulp.task('build', ['sass', 'iconsprite', 'bundlejs']);
gulp.task('watch', ['sass', 'iconsprite', 'bundlejs'], function() {
gulp.watch('./*.js', ['bundlejs']);
=======
gulp.task('build', ['sass', 'iconsprite', 'bundlejs', 'copy-static-res']);
gulp.task('watch', ['sass', 'iconsprite', 'bundlejs', 'copy-static-res'], function() {
>>>>>>>
gulp.task('build', ['sass', 'iconsprite', 'bundlejs', 'copy-static-res']);
gulp.task('watch', ['sass', 'iconsprite', 'bundlejs', 'copy-static-res'], function() {
gulp.watch('./*.js', ['bundlejs']); |
<<<<<<<
<li ng-class="{'ntb__tabs__selected' : self.selectedTab === self.WON.Connected}">
<a ui-sref="post({connectionType: self.WON.Connected, openConversation: null, connectionUri: null, postUri: self.postUri})"
ng-class="{'disabled' : !self.hasMessages}">
=======
<li ng-class="{'ntb__tabs__selected' : self.selection == 0}">
<a ui-sref="postConversations({myUri: self.myUri})"
ng-class="{'disabled' : !self.hasMessages || !self.isActive}">
>>>>>>>
<li ng-class="{'ntb__tabs__selected' : self.selectedTab === self.WON.Connected}">
<a ui-sref="post({connectionType: self.WON.Connected, openConversation: null, connectionUri: null, postUri: self.postUri})"
ng-class="{'disabled' : !self.hasMessages || !self.isActive}">
<<<<<<<
<li ng-class="{'ntb__tabs__selected' : self.selectedTab === self.WON.Suggested}">
<a ui-sref="post({connectionType: self.WON.Suggested, openConversation: null, connectionUri: null, postUri: self.postUri})"
ng-class="{'disabled' : !self.hasMatches}">
=======
<li ng-class="{'ntb__tabs__selected' : self.selection == 1}">
<a ui-sref="overviewMatches({viewType: 0, myUri: self.myUri})"
ng-class="{'disabled' : !self.hasMatches || !self.isActive}">
>>>>>>>
<li ng-class="{'ntb__tabs__selected' : self.selectedTab === self.WON.Suggested}">
<a ui-sref="post({connectionType: self.WON.Suggested, openConversation: null, connectionUri: null, postUri: self.postUri})"
ng-class="{'disabled' : !self.hasMatches || !self.isActive}">
<<<<<<<
<li ng-class="{'ntb__tabs__selected' : self.selectedTab === self.WON.RequestReceived}">
<a ui-sref="post({connectionType: self.WON.RequestReceived, openConversation: null, connectionUri: null, postUri: self.postUri})"
ng-class="{'disabled' : !self.hasIncomingRequests}">
=======
<li ng-class="{'ntb__tabs__selected' : self.selection == 2}">
<a ui-sref="overviewIncomingRequests({myUri: self.myUri})"
ng-class="{'disabled' : !self.hasIncomingRequests || !self.isActive}">
>>>>>>>
<li ng-class="{'ntb__tabs__selected' : self.selectedTab === self.WON.RequestReceived}">
<a ui-sref="post({connectionType: self.WON.RequestReceived, openConversation: null, connectionUri: null, postUri: self.postUri})"
ng-class="{'disabled' : !self.hasIncomingRequests || !self.isActive}">
<<<<<<<
<li ng-class="{'ntb__tabs__selected' : self.selectedTab === self.WON.RequestSent}">
<a ui-sref="post({connectionType: self.WON.RequestSent, openConversation: null, connectionUri: null, postUri: self.postUri})"
ng-class="{'disabled' : !self.hasSentRequests}">
=======
<li ng-class="{'ntb__tabs__selected' : self.selection == 3}">
<a ui-sref="overviewSentRequests({myUri: self.myUri})"
ng-class="{'disabled' : !self.hasSentRequests || !self.isActive}">
>>>>>>>
<li ng-class="{'ntb__tabs__selected' : self.selectedTab === self.WON.RequestSent}">
<a ui-sref="post({connectionType: self.WON.RequestSent, openConversation: null, connectionUri: null, postUri: self.postUri})"
ng-class="{'disabled' : !self.hasSentRequests || !self.isActive}"> |
<<<<<<<
//isAccepted: wonMessage.isAccepted(),
contentGraphTrig: {
prefixes: contentGraphTrigPrefixes,
body: contentGraphTrigBody,
},
contentGraphTrigRaw: wonMessage.contentGraphTrig,
contentGraphTrigError: wonMessage.contentGraphTrigError,
=======
isRejectMessage: wonMessage.isRejectMessage(),
isRetractMessage: wonMessage.isRetractMessage(),
contentGraphTrig: wonMessage.contentGraphTrig,
>>>>>>>
isRejectMessage: wonMessage.isRejectMessage(),
isRetractMessage: wonMessage.isRetractMessage(),
contentGraphTrig: {
prefixes: contentGraphTrigPrefixes,
body: contentGraphTrigBody,
},
contentGraphTrigRaw: wonMessage.contentGraphTrig,
contentGraphTrigError: wonMessage.contentGraphTrigError, |
<<<<<<<
<a class="pil__indicators__item clickable" ui-sref="overviewMatches({myUri: self.item.uri})">
<img src="generated/icon-sprite.svg#ico36_match_light"
ng-show="false && self.unreadMatchesCount()"
class="pil__indicators__item__icon">
=======
<a class="pil__indicators__item clickable" ui-sref="overviewMatches({viewType: 0, myUri: self.item.uri})">
>>>>>>>
<a class="pil__indicators__item clickable" ui-sref="overviewMatches({viewType: 0, myUri: self.item.uri})">
<img src="generated/icon-sprite.svg#ico36_match_light"
ng-show="false && self.unreadMatchesCount()"
class="pil__indicators__item__icon"> |
<<<<<<<
import { draftsReducer } from './drafts-reducer';
import { messagesReducer } from './message-reducers';
import reduceReducers from 'reduce-reducers';
=======
import draftsReducer from './drafts-reducer';
import postsReducer from './posts-reducer'
import { enqueuedMessagesReducer, sentMessagesReducer, receivedMessagesReducer } from './message-reducers'
>>>>>>>
import { draftsReducer } from './drafts-reducer';
import { messagesReducer } from './message-reducers'
import reduceReducers from 'reduce-reducers';
import postsReducer from './posts-reducer'
<<<<<<<
messages: messagesReducer,
=======
postOverview:postsReducer,
enqueuedMessages: enqueuedMessagesReducer,
sentMessages: sentMessagesReducer,
receivedMessages: receivedMessagesReducer,
>>>>>>>
postOverview:postsReducer,
messages: messagesReducer, |
<<<<<<<
<div class="post-info__footer" ng-if="!self.postLoading">
<won-feedback-grid ng-if="self.connection && !self.connection.get('isRated')" connection-uri="self.connectionUri"></won-feedback-grid>
=======
<div class="post-info__footer" ng-if="!self.isLoading()">
>>>>>>>
<div class="post-info__footer" ng-if="!self.postLoading"> |
<<<<<<<
const AnnotationWindow = ({annotation, dygraph, staticLegendHeight}) =>
=======
const AnnotationWindow = ({annotation, dygraph, active}) =>
>>>>>>>
const AnnotationWindow = ({annotation, dygraph, active, staticLegendHeight}) =>
<<<<<<<
className="annotation-window"
style={windowDimensions(annotation, dygraph, staticLegendHeight)}
=======
className={`annotation-window${active ? ' active' : ''}`}
style={windowDimensions(annotation, dygraph)}
>>>>>>>
className={`annotation-window${active ? ' active' : ''}`}
style={windowDimensions(annotation, dygraph, staticLegendHeight)}
<<<<<<<
const {number, shape} = PropTypes
=======
const {bool, shape} = PropTypes
>>>>>>>
const {bool, number, shape} = PropTypes
<<<<<<<
staticLegendHeight: number,
=======
active: bool,
>>>>>>>
staticLegendHeight: number,
active: bool, |
<<<<<<<
import { classifiedsGroup } from "./usecases/group-classifieds";
import { socialGroup } from "./usecases/group-social";
import { workGroup } from "./usecases/group-work";
import { academicGroup } from "./usecases/group-academic";
import { artistGroup } from "./usecases/group-artists";
import { realEstateGroup } from "./usecases/group-real-estate";
import { transportGroup } from "./usecases/group-transport";
import { otherGroup } from "./usecases/group-other";
import { personalMobilityGroup } from "./usecases/group-personal-mobility";
// import { customUseCase } from "./usecases/uc-custom.js";
=======
import won from "../app/service/won.js";
import { details, emptyDraft } from "./detail-definitions.js";
import { realEstateGroup } from "./usecases/real-estate.js";
import { transportGroup } from "./usecases/transport.js";
import { complainGroup } from "./usecases/complain.js";
import { socialGroup } from "./usecases/social.js";
import { professionalGroup } from "./usecases/professional/professional.js";
import { mobilityGroup } from "./usecases/mobility.js";
import { musicianGroup } from "./usecases/musician.js";
import { classifiedsGroup } from "./usecases/classifieds.js";
import { findLatestIntervallEndInJsonLdOrNowAndAddMillis } from "../app/won-utils.js";
>>>>>>>
import { classifiedsGroup } from "./usecases/group-classifieds";
import { socialGroup } from "./usecases/group-social";
import { workGroup } from "./usecases/group-work";
import { academicGroup } from "./usecases/group-academic";
import { artistGroup } from "./usecases/group-artists";
import { realEstateGroup } from "./usecases/group-real-estate";
import { transportGroup } from "./usecases/group-transport";
import { otherGroup } from "./usecases/group-other";
import { personalMobilityGroup } from "./usecases/group-personal-mobility";
// import { customUseCase } from "./usecases/uc-custom.js";
<<<<<<<
=======
const allDetailsUseCase = {
allDetails: {
identifier: "allDetails",
label: "New custom post",
icon: "#ico36_uc_custom",
doNotMatchAfter: findLatestIntervallEndInJsonLdOrNowAndAddMillis,
draft: { ...emptyDraft },
details: details,
seeksDetails: details,
},
};
const groupChatUsecase = {
groupChat: {
identifier: "groupChat",
label: "New Groupchat Post",
draft: {
...emptyDraft,
facet: { "@id": "#groupFacet", "@type": won.WON.GroupFacet },
},
details: details,
seeksDetails: details,
},
};
>>>>>>>
<<<<<<<
work: workGroup,
academic: academicGroup,
artists: artistGroup,
realEstate: realEstateGroup,
transport: transportGroup,
personalMobility: personalMobilityGroup,
other: otherGroup,
// FIXME: currently not shown
// customUsecase: {
// identifier: "custom",
// label: "Something Else",
// icon: undefined,
// useCases: { customUseCase },
// },
=======
other: {
identifier: "othergroup",
label: "Something Else",
icon: undefined,
useCases: { ...allDetailsUseCase, ...groupChatUsecase },
},
>>>>>>>
work: workGroup,
academic: academicGroup,
artists: artistGroup,
realEstate: realEstateGroup,
transport: transportGroup,
personalMobility: personalMobilityGroup,
other: otherGroup, |
<<<<<<<
"auctionhouse.js": [
"javascripts/auctionhouse.js"
],
=======
"network.js": [
"javascripts/network.js"
],
>>>>>>>
"auctionhouse.js": [
"javascripts/auctionhouse.js"
],
"network.js": [
"javascripts/network.js"
], |
<<<<<<<
var infoBoxHTMLOwnerPending = "<p>Right now this auction is <b>pending</b>. If you're the owner you can click the activate button, which will initiate two ethereum transactions. The first will transfer ownership of your asset to the <a href='https://github.com/dob/auctionhouse/contracts/AuctionHouse.sol'>AuctionHouse contract</a>. The second will activate the auction.</p><p>Don't worry, if the auction doesn't succeed by the deadline, then ownership of your asset will be transfered back to you.</p>";
=======
// function setStatus(message) {
// var status = document.getElementById("statusMessage");
// status.innerHTML = message;
// };
>>>>>>>
var infoBoxHTMLOwnerPending = "<p>Right now this auction is <b>pending</b>. If you're the owner you can click the activate button, which will initiate two ethereum transactions. The first will transfer ownership of your asset to the <a href='https://github.com/dob/auctionhouse/contracts/AuctionHouse.sol'>AuctionHouse contract</a>. The second will activate the auction.</p><p>Don't worry, if the auction doesn't succeed by the deadline, then ownership of your asset will be transfered back to you.</p>";
<<<<<<<
setStatus("Bid is being placed, hang tight...", "warning");
=======
setStatus("Bid is being placed, hang tight...")
showSpinner();
>>>>>>>
setStatus("Bid is being placed, hang tight...", "warning");
showSpinner();
<<<<<<<
setStatus("Bid has to be at least " + auction["currentBid"], "error");
return;
=======
setErrorMsg("Bid has to be at least " + web3.fromWei(auction["currentBid"], "ether"));
hideSpinner();
return;
>>>>>>>
setStatus("Bid has to be at least " + auction["currentBid"], "error");
return;
<<<<<<<
console.log("Bid txnId: " + txnId);
web3.eth.getTransactionReceipt(txnId, function(err, txnReceipt) {
if (txnReceipt.gasUsed == gas) {
console.log("We had a failed bid " + txnReceipt);
setStatus("Bid failed", "error");
} else {
console.log("We had a successful bid " + txnReceipt);
setStatus("Bid succeeded!", "success");
}
});
refreshAuction();
=======
console.log("Bid txnId: " + txnId);
web3.eth.getTransactionReceipt(txnId, function(err, txnReceipt) {
if (txnReceipt.gasUsed == gas) {
console.log("We had a failed bid " + txnReceipt);
setErrorMsg("Bid failed");
hideSpinner();
} else {
console.log("We had a successful bid " + txnReceipt);
setConfirmationMsg("Bid succeeded!");
hideSpinner();
}
});
refreshAuction();
>>>>>>>
console.log("Bid txnId: " + txnId);
web3.eth.getTransactionReceipt(txnId, function(err, txnReceipt) {
if (txnReceipt.gasUsed == gas) {
console.log("We had a failed bid " + txnReceipt);
setStatus("Bid failed", "error");
hideSpinner();
} else {
console.log("We had a successful bid " + txnReceipt);
setStatus("Bid succeeded!", "success");
hideSpinner();
}
});
refreshAuction(); |
<<<<<<<
exports.task = async function ({ reporter, port = 8545 }) {
const tasks = new TaskList([{
title: 'Starting a local chain',
=======
exports.task = async function ({ reporter, cwd, port = 8545 }) {
const tasks = new TaskList([
{
title: 'Setting up latest Aragon snapshot',
task: async (ctx, task) => {
return new Promise((resolve, reject) => {
rimraf(snapshotPath, err => {
if (err) return reject(err)
resolve()
})
})
.then(() => {
return new Promise((resolve, reject) => {
mkdirp(path.resolve(snapshotPath, '..'), err => {
if (err) return reject(err)
resolve()
})
})
})
.then(() => {
return new Promise((resolve, reject) => {
const aragen = path.resolve(require.resolve('@aragon/aragen'), '../aragon-ganache')
ncp(aragen, snapshotPath, err => {
if (err) return reject(err)
resolve()
})
})
})
}
},
{
title: 'Starting a local chain from snapshot',
>>>>>>>
exports.task = async function ({ reporter, port = 8545 }) {
const tasks = new TaskList([
{
title: 'Setting up latest Aragon snapshot',
task: async (ctx, task) => {
return new Promise((resolve, reject) => {
rimraf(snapshotPath, err => {
if (err) return reject(err)
resolve()
})
})
.then(() => {
return new Promise((resolve, reject) => {
mkdirp(path.resolve(snapshotPath, '..'), err => {
if (err) return reject(err)
resolve()
})
})
})
.then(() => {
return new Promise((resolve, reject) => {
const aragen = path.resolve(require.resolve('@aragon/aragen'), '../aragon-ganache')
ncp(aragen, snapshotPath, err => {
if (err) return reject(err)
resolve()
})
})
})
}
},
{
title: 'Starting a local chain from snapshot', |
<<<<<<<
var payload = new Dota2.schema.CMsgDOTAGetPlayerMatchHistory({
"account_id": account_id,
"start_at_match_id": match_id,
"matches_requested": 13,
"hero_id": 0,
"request_id": account_id
});
this._protoBufHeader.msg = Dota2.schema.EDOTAGCMsg.k_EMsgDOTAGetPlayerMatchHistory;
=======
var command = Dota2._parseOptions(options, Dota2._playerHistoryOptions);
command.account_id = account_id;
command.matches_requested = command.matches_requested || 1;
command.request_id = command.request_id || account_id;
var payload = new Dota2.schema.CMsgDOTAGetPlayerMatchHistory(command);
this._protoBufHeader.msg = Dota2.EDOTAGCMsg.k_EMsgDOTAGetPlayerMatchHistory;
>>>>>>>
var command = Dota2._parseOptions(options, Dota2._playerHistoryOptions);
command.account_id = account_id;
command.matches_requested = command.matches_requested || 1;
command.request_id = command.request_id || account_id;
var payload = new Dota2.schema.CMsgDOTAGetPlayerMatchHistory(command);
this._protoBufHeader.msg = Dota2.schema.EDOTAGCMsg.k_EMsgDOTAGetPlayerMatchHistory; |
<<<<<<<
finalRules.push(mediaQuery)
=======
if (mediaQuery.nodes.length) {
css.append(mediaQuery)
}
>>>>>>>
finalRules.push(mediaQuery)
if (mediaQuery.nodes.length) {
css.append(mediaQuery)
} |
<<<<<<<
.catch(function(err) {
return cb(new gutil.PluginError(PLUGIN_NAME, err));
})
.then(function(res) {
if (res.result !== undefined) {
file.path = rext(file.path, '.css');
file.contents = new Buffer(res.result);
if (res.sourcemap) {
makePathsRelative(file, res.sourcemap);
applySourceMap(file, res.sourcemap);
=======
.then(function(res) {
if (res.result !== undefined) {
file.path = rext(file.path, '.css');
file.contents = new Buffer(res.result);
if (res.sourcemap) {
applySourceMap(file, res.sourcemap);
}
return cb(null, file);
>>>>>>>
.then(function(res) {
if (res.result !== undefined) {
file.path = rext(file.path, '.css');
file.contents = new Buffer(res.result);
if (res.sourcemap) {
makePathsRelative(file, res.sourcemap);
applySourceMap(file, res.sourcemap);
}
return cb(null, file); |
<<<<<<<
};
=======
};
module.exports.stylus = require('stylus');
function makePathsRelative(file, sourcemap) {
for (var i = 0; i < sourcemap.sources.length; i++) {
sourcemap.sources[i] = path.relative(file.base, sourcemap.sources[i]);
}
}
>>>>>>>
};
module.exports.stylus = require('stylus'); |
<<<<<<<
=======
'use strict'
var Supermodel = {};
// Current version.
Supermodel.VERSION = '0.0.4';
>>>>>>>
// Current version.
Supermodel.VERSION = '0.0.4'; |
<<<<<<<
init: init
};
=======
init: init,
getDataTable: getDataTable,
getDataTableSelectedRowData: getDataTableSelectedRowData,
Tab: Tab
};
>>>>>>>
init: init,
Tab: Tab
}; |
<<<<<<<
return iMesh.length == 0 || iMesh[0].distance > iLm[0].distance;
}
=======
return iMesh.length === 0 || iMesh[0].distance > iLm[0].distance;
},
>>>>>>>
return iMesh.length === 0 || iMesh[0].distance > iLm[0].distance;
} |
<<<<<<<
import Portals from './portals';
import '../styles';
=======
import './modal';
>>>>>>>
import './modal';
import Portals from './portals';
import '../styles'; |
<<<<<<<
import StaticLegend from 'src/shared/components/StaticLegend'
import Annotations from 'src/shared/components/Annotations'
import getRange, {getStackedRange} from 'shared/parsing/getRangeForDygraph'
=======
import Annotations from 'src/shared/components/Annotations'
import getRange, {getStackedRange} from 'shared/parsing/getRangeForDygraph'
>>>>>>>
import StaticLegend from 'src/shared/components/StaticLegend'
import Annotations from 'src/shared/components/Annotations'
import getRange, {getStackedRange} from 'shared/parsing/getRangeForDygraph'
<<<<<<<
staticLegendHeight: null,
=======
>>>>>>>
staticLegendHeight: null,
<<<<<<<
handleAnnotationsRef = ref => (this.annotationsRef = ref)
handleReceiveStaticLegendHeight = staticLegendHeight => {
this.setState({staticLegendHeight})
}
=======
handleAnnotationsRef = ref => (this.annotationsRef = ref)
>>>>>>>
handleAnnotationsRef = ref => (this.annotationsRef = ref)
handleReceiveStaticLegendHeight = staticLegendHeight => {
this.setState({staticLegendHeight})
}
<<<<<<<
const {isHidden, staticLegendHeight} = this.state
const {staticLegend} = this.props
let dygraphStyle = {...this.props.containerStyle, zIndex: '2'}
if (staticLegend) {
const cellVerticalPadding = 16
dygraphStyle = {
...this.props.containerStyle,
zIndex: '2',
height: `calc(100% - ${staticLegendHeight + cellVerticalPadding}px)`,
}
}
=======
const {isHidden} = this.state
const {mode} = this.props
const hideLegend = mode === EDITING || mode === ADDING ? true : isHidden
>>>>>>>
const {isHidden, staticLegendHeight} = this.state
const {staticLegend,mode} = this.props
const hideLegend = mode === EDITING || mode === ADDING ? true : isHidden
let dygraphStyle = {...this.props.containerStyle, zIndex: '2'}
if (staticLegend) {
const cellVerticalPadding = 16
dygraphStyle = {
...this.props.containerStyle,
zIndex: '2',
height: `calc(100% - ${staticLegendHeight + cellVerticalPadding}px)`,
}
}
<<<<<<<
<Annotations
annotationsRef={this.handleAnnotationsRef}
staticLegendHeight={staticLegendHeight}
/>
{this.dygraph &&
<DygraphLegend
isHidden={isHidden}
dygraph={this.dygraph}
onHide={this.handleHideLegend}
onShow={this.handleShowLegend}
/>}
=======
<Annotations annotationsRef={this.handleAnnotationsRef} />
{this.dygraph &&
<DygraphLegend
isHidden={hideLegend}
dygraph={this.dygraph}
onHide={this.handleHideLegend}
onShow={this.handleShowLegend}
/>}
>>>>>>>
<Annotations
annotationsRef={this.handleAnnotationsRef}
staticLegendHeight={staticLegendHeight}
/>
{this.dygraph &&
<DygraphLegend
isHidden={isHidden}
dygraph={this.dygraph}
onHide={this.handleHideLegend}
onShow={this.handleShowLegend}
/>}
<<<<<<<
style={dygraphStyle}
=======
style={{...this.props.containerStyle, zIndex: '2'}}
>>>>>>>
style={dygraphStyle} |
<<<<<<<
import selectorPseudoClassFocus from './selector-pseudo-class-focus';
=======
import noDisplayNone from './no-display-none';
>>>>>>>
import selectorPseudoClassFocus from './selector-pseudo-class-focus';
import noDisplayNone from './no-display-none';
<<<<<<<
'selector-pseudo-class-focus': selectorPseudoClassFocus,
=======
'no-display-none': noDisplayNone,
>>>>>>>
'selector-pseudo-class-focus': selectorPseudoClassFocus,
'no-display-none': noDisplayNone, |
<<<<<<<
export const PLAYER_COLORS = [0xff0000, 0x00FF00, 0xBA55D3, 0xffae42,
0xbd00db, 0xFF69B4, 0xFFFF00, 0x009900,
0xFF8C00, 0xff0000, 0x00FF00, 0xBA55D3,
0xffae42, 0xbd00db, 0xFF69B4, 0xFFFF00];
export const PLANET_COLOR = 0xb7b7b7;
export const FISH_COLOR = 0xFFA500;
//export const HEALTH_BAR_COLOR = 0x990000;
//export const EXPLOSION_COLOR = 0xFF7607;
export const SPRITE_COLOR = 0xFFFFFF;
export const SPRITE_ALPHA = 0.8;
// export const HALO_COLOR = 0XD0D0D0;
// export const HALO_ALPHA = 0.8;
export const FACTORY_BASE_COLOR = 0xFFFFFF;
export const FACTORY_BASE_ALPHA = 0.8;
export const MAX_PRODUCTION = 255;
export const MAP_COLOR_LIGHT = 0x00FFFF;
export const MAP_COLOR_MEDIUM = 0x0000FF;
export const MAP_COLOR_DARK = 0x0000A0;
export const MAP_ALPHA = 0.1;
export const OWNER_TINT_ALPHA = 0.4;
export const MAP_SQUARE_SIZE = 10;
export const LINE_COLOR = 0x000000;
export const LINE_WIDTH = 1;
export const DRAW_LINES_BASE_MAP = true;
export const DRAW_LINES_OWNER_MAP = false;
export const MIN_FISH_SIZE = 1;
export const MAX_FISH_SIZE = 15;
export const MAX_FISH_SPEED = 5;
export let FISH_IMAGE = "";
=======
export const PLAYER_COLORS = [0xff0000, 0x00FF00, 0xBA55D3, 0xffae42, 0xbd00db, 0xFF69B4, 0xFFFF00, 0x009900, 0xFF8C00, 0xff0000, 0x00FF00, 0xBA55D3, 0xffae42, 0xbd00db, 0xFF69B4, 0xFFFF00, 0x009900, 0xFF8C00];
export const PLANET_COLOR = 0xb7b7b7
export const FISH_COLOR = 0xFFA500;
export const HEALTH_BAR_COLOR = 0x990000;
export const EXPLOSION_COLOR = 0xFF7607;
export const SPRITE_COLOR = 0xFFFFFF;
export const SPRITE_ALPHA = 0.8;
export const HALO_COLOR = 0XD0D0D0;
export const HALO_ALPHA = 0.8;
export const MAX_PRODUCTION = 255;
export const MAP_COLOR_LIGHT = 0x00FFFF;
export const MAP_COLOR_MEDIUM = 0x0000FF;
export const MAP_COLOR_DARK = 0x0000A0;
export const MAP_ALPHA = 0.1;
export const OWNER_TINT_ALPHA = 0.4;
export const MAP_SQUARE_SIZE = 10;
export const LINE_COLOR = 0x000000;
export const LINE_WIDTH = 1;
export const MIN_FISH_SIZE = 1;
export const MAX_FISH_SIZE = 15;
export const MAX_FISH_SPEED = 5;
export let BACKGROUND_IMAGES = [];
export let PLANET_IMAGE = null;
export let PLANET_HALO_IMAGE = null;
export let PLANET_IMAGE_SMALL = null;
export let PLANET_HALO_IMAGE_SMALL = null;
export let SHIP_IMAGE = "";
export let HALO_IMAGE = "";
export let EXHAUST_IMAGE = "";
export let FISH_IMAGE = "";
export let HALLOWEEN_PLANET_IMAGE = null;
export let WINTER_PLANET_IMAGE = null;
export let NEWYEAR_PLANET_IMAGE = null;
export let PLANET_SHEET = null;
export let PLANET_SHEET_SMALL = null;
>>>>>>>
export const PLAYER_COLORS = [0xff0000, 0x00FF00, 0xBA55D3, 0xffae42,
0xbd00db, 0xFF69B4, 0xFFFF00, 0x009900,
0xFF8C00, 0xff0000, 0x00FF00, 0xBA55D3,
0xffae42, 0xbd00db, 0xFF69B4, 0xFFFF00];
export const PLANET_COLOR = 0xb7b7b7;
export const FISH_COLOR = 0xFFA500;
export const SPRITE_COLOR = 0xFFFFFF;
export const SPRITE_ALPHA = 0.8;
export const FACTORY_BASE_COLOR = 0xFFFFFF;
export const FACTORY_BASE_ALPHA = 0.8;
export const MAX_PRODUCTION = 255;
export const MAP_COLOR_LIGHT = 0x00FFFF;
export const MAP_COLOR_MEDIUM = 0x0000FF;
export const MAP_COLOR_DARK = 0x0000A0;
export const MAP_ALPHA = 0.1;
export const OWNER_TINT_ALPHA = 0.4;
export const MAP_SQUARE_SIZE = 10;
export const LINE_COLOR = 0x000000;
export const LINE_WIDTH = 1;
export const DRAW_LINES_BASE_MAP = true;
export const DRAW_LINES_OWNER_MAP = false;
export const MIN_FISH_SIZE = 1;
export const MAX_FISH_SIZE = 15;
export const MAX_FISH_SPEED = 5;
export let FISH_IMAGE = "";
<<<<<<<
FISH_IMAGE = ASSET_ROOT + require("../assets/fish.png");
=======
BACKGROUND_IMAGES = [
ASSET_ROOT + require("../assets/backgrounds/Space001.png"),
];
HALO_IMAGE = ASSET_ROOT + require("../assets/halo.png");
FISH_IMAGE = ASSET_ROOT + require("../assets/fish.png");
ATTACK_SHEET = loadSpritesheet(
require("../assets/ship-battle.json"),
ASSET_ROOT + require("../assets/ship-battle.png"),
() => {}
);
PLANET_SHEET = loadSpritesheet(
require("../assets/planet-obj.json"),
ASSET_ROOT + require("../assets/planet-obj.png"),
() => {
PLANET_IMAGE = PIXI.Texture.fromFrame("Core.png");
PLANET_HALO_IMAGE = PIXI.Texture.fromFrame("Ring.png");
}
);
HALLOWEEN_PLANET_IMAGE = ASSET_ROOT + require("../assets/halloween-obj.png");
WINTER_PLANET_IMAGE = ASSET_ROOT + require("../assets/winter-obj.png");
NEWYEAR_PLANET_IMAGE = ASSET_ROOT + require("../assets/newyear-obj.png");
PLANET_SHEET_SMALL = loadSpritesheet(
require("../assets/planet-small.json"),
ASSET_ROOT + require("../assets/planet-small.png"),
() => {
PLANET_IMAGE_SMALL = PIXI.Texture.fromFrame("CoreSmall.png");
PLANET_HALO_IMAGE_SMALL = PIXI.Texture.fromFrame("RingSmall.png");
}
);
>>>>>>>
FISH_IMAGE = ASSET_ROOT + require("../assets/fish.png"); |
<<<<<<<
onSetHoverTime,
hoverTime,
queryASTs,
onNewQueryAST,
=======
>>>>>>>
queryASTs,
onNewQueryAST, |
<<<<<<<
import Dygraph from 'src/external/dygraph'
import OverlayTechnologies from 'src/shared/components/OverlayTechnologies'
=======
import OverlayTechnologies from 'shared/components/OverlayTechnologies'
>>>>>>>
import Dygraph from 'src/external/dygraph'
import OverlayTechnologies from 'shared/components/OverlayTechnologies'
<<<<<<<
this.synchronizer = ::this.synchronizer
=======
this.handleToggleTempVarControls = ::this.handleToggleTempVarControls
>>>>>>>
this.handleToggleTempVarControls = ::this.handleToggleTempVarControls
this.synchronizer = ::this.synchronizer
<<<<<<<
synchronizer(dygraph) {
const dygraphs = [...this.state.dygraphs, dygraph]
if (dygraphs.length > 1) {
Dygraph.synchronize(dygraphs)
}
this.setState({dygraphs})
}
=======
handleToggleTempVarControls() {
this.props.templateControlBarVisibilityToggled()
}
>>>>>>>
synchronizer(dygraph) {
const dygraphs = [...this.state.dygraphs, dygraph]
if (dygraphs.length > 1) {
Dygraph.synchronize(dygraphs)
}
this.setState({dygraphs})
}
handleToggleTempVarControls() {
this.props.templateControlBarVisibilityToggled()
}
<<<<<<<
<Dashboard
source={source}
dashboard={dashboard}
timeRange={timeRange}
autoRefresh={autoRefresh}
synchronizer={this.synchronizer}
onAddCell={this.handleAddCell}
inPresentationMode={inPresentationMode}
onEditCell={this.handleEditDashboardCell}
onPositionChange={this.handleUpdatePosition}
onDeleteCell={this.handleDeleteDashboardCell}
onRenameCell={this.handleRenameDashboardCell}
onUpdateCell={this.handleUpdateDashboardCell}
onOpenTemplateManager={this.handleOpenTemplateManager}
templatesIncludingDashTime={templatesIncludingDashTime}
onSummonOverlayTechnologies={this.handleSummonOverlayTechnologies}
onSelectTemplate={this.handleSelectTemplate}
/>
=======
{dashboard
? <Dashboard
source={source}
dashboard={dashboard}
timeRange={timeRange}
autoRefresh={autoRefresh}
onAddCell={this.handleAddCell}
inPresentationMode={inPresentationMode}
onEditCell={this.handleEditDashboardCell}
onPositionChange={this.handleUpdatePosition}
onDeleteCell={this.handleDeleteDashboardCell}
onRenameCell={this.handleRenameDashboardCell}
onUpdateCell={this.handleUpdateDashboardCell}
onOpenTemplateManager={this.handleOpenTemplateManager}
templatesIncludingDashTime={templatesIncludingDashTime}
onSummonOverlayTechnologies={this.handleSummonOverlayTechnologies}
onSelectTemplate={this.handleSelectTemplate}
showTemplateControlBar={showTemplateControlBar}
/>
: null}
>>>>>>>
{dashboard
? <Dashboard
source={source}
dashboard={dashboard}
timeRange={timeRange}
autoRefresh={autoRefresh}
synchronizer={this.synchronizer}
onAddCell={this.handleAddCell}
inPresentationMode={inPresentationMode}
onEditCell={this.handleEditDashboardCell}
onPositionChange={this.handleUpdatePosition}
onDeleteCell={this.handleDeleteDashboardCell}
onRenameCell={this.handleRenameDashboardCell}
onUpdateCell={this.handleUpdateDashboardCell}
onOpenTemplateManager={this.handleOpenTemplateManager}
templatesIncludingDashTime={templatesIncludingDashTime}
onSummonOverlayTechnologies={this.handleSummonOverlayTechnologies}
onSelectTemplate={this.handleSelectTemplate}
showTemplateControlBar={showTemplateControlBar}
/>
: null} |
<<<<<<<
assert.format('%A', 'Tuesday');
assert.format('%a', 'Tue');
assert.format('%B', 'June');
assert.format('%b', 'Jun');
assert.format('%C', '20');
assert.format('%D', '06/07/11');
assert.format('%d', '07');
assert.format('%-d', '7');
assert.format('%_d', ' 7');
assert.format('%0d', '07');
assert.format('%e', '7');
assert.format('%F', '2011-06-07');
assert.format('%H', null, '18');
assert.format('%h', 'Jun');
assert.format('%I', null, '06');
assert.format('%-I', null, '6');
assert.format('%_I', null, ' 6');
assert.format('%0I', null, '06');
assert.format('%j', null, '158');
assert.format('%k', null, '18');
assert.format('%L', '067');
assert.format('%l', null, ' 6');
assert.format('%-l', null, '6');
assert.format('%_l', null, ' 6');
assert.format('%0l', null, '06');
assert.format('%M', null, '51');
assert.format('%m', '06');
assert.format('%n', '\n');
assert.format('%o', '7th');
assert.format('%P', null, 'pm');
assert.format('%p', null, 'PM');
assert.format('%R', null, '18:51');
assert.format('%r', null, '06:51:45 PM');
assert.format('%S', '45');
assert.format('%s', '1307472705');
assert.format('%T', null, '18:51:45');
assert.format('%t', '\t');
assert.format('%U', '23');
assert.format('%U', '24', null, new Date(+Time + 5 * 86400000));
assert.format('%u', '2');
assert.format('%v', '7-Jun-2011');
assert.format('%W', '23');
assert.format('%W', '23', null, new Date(+Time + 5 * 86400000));
assert.format('%w', '2');
assert.format('%Y', '2011');
assert.format('%y', '11');
assert.format('%Z', null, 'GMT');
assert.format('%z', null, '+0000');
assert.format('%%', '%'); // any other char
ok('GMT');
=======
assert.format('%A', 'Tuesday')
assert.format('%a', 'Tue')
assert.format('%B', 'June')
assert.format('%b', 'Jun')
assert.format('%C', '20')
assert.format('%D', '06/07/11')
assert.format('%d', '07')
assert.format('%-d', '7')
assert.format('%_d', ' 7')
assert.format('%0d', '07')
assert.format('%e', ' 7')
assert.format('%F', '2011-06-07')
assert.format('%H', null, '18')
assert.format('%h', 'Jun')
assert.format('%I', null, '06')
assert.format('%-I', null, '6')
assert.format('%_I', null, ' 6')
assert.format('%0I', null, '06')
assert.format('%j', null, '158')
assert.format('%k', null, '18')
assert.format('%L', '067')
assert.format('%l', null, ' 6')
assert.format('%-l', null, '6')
assert.format('%_l', null, ' 6')
assert.format('%0l', null, '06')
assert.format('%M', null, '51')
assert.format('%m', '06')
assert.format('%n', '\n')
assert.format('%o', '7th')
assert.format('%P', null, 'pm')
assert.format('%p', null, 'PM')
assert.format('%R', null, '18:51')
assert.format('%r', null, '06:51:45 PM')
assert.format('%S', '45')
assert.format('%s', '1307472705')
assert.format('%T', null, '18:51:45')
assert.format('%t', '\t')
assert.format('%U', '23')
assert.format('%U', '24', null, new Date(+TestTime + 5 * 86400000))
assert.format('%u', '2')
assert.format('%v', ' 7-Jun-2011')
assert.format('%W', '23')
assert.format('%W', '23', null, new Date(+TestTime + 5 * 86400000))
assert.format('%w', '2')
assert.format('%Y', '2011')
assert.format('%y', '11')
assert.format('%Z', null, 'GMT')
assert.format('%z', null, '+0000')
assert.format('%:z', null, '+00:00')
assert.format('%%', '%') // any other char
assert.format('%F %T', null, '1970-01-01 00:00:00', new Date(0))
ok('GMT')
>>>>>>>
assert.format('%A', 'Tuesday');
assert.format('%a', 'Tue');
assert.format('%B', 'June');
assert.format('%b', 'Jun');
assert.format('%C', '20');
assert.format('%D', '06/07/11');
assert.format('%d', '07');
assert.format('%-d', '7');
assert.format('%_d', ' 7');
assert.format('%0d', '07');
assert.format('%e', ' 7');
assert.format('%F', '2011-06-07');
assert.format('%H', null, '18');
assert.format('%h', 'Jun');
assert.format('%I', null, '06');
assert.format('%-I', null, '6');
assert.format('%_I', null, ' 6');
assert.format('%0I', null, '06');
assert.format('%j', null, '158');
assert.format('%k', null, '18');
assert.format('%L', '067');
assert.format('%l', null, ' 6');
assert.format('%-l', null, '6');
assert.format('%_l', null, ' 6');
assert.format('%0l', null, '06');
assert.format('%M', null, '51');
assert.format('%m', '06');
assert.format('%n', '\n');
assert.format('%o', '7th');
assert.format('%P', null, 'pm');
assert.format('%p', null, 'PM');
assert.format('%R', null, '18:51');
assert.format('%r', null, '06:51:45 PM');
assert.format('%S', '45');
assert.format('%s', '1307472705');
assert.format('%T', null, '18:51:45');
assert.format('%t', '\t');
assert.format('%U', '23');
assert.format('%U', '24', null, new Date(+Time + 5 * 86400000));
assert.format('%u', '2');
assert.format('%v', ' 7-Jun-2011');
assert.format('%W', '23');
assert.format('%W', '23', null, new Date(+Time + 5 * 86400000));
assert.format('%w', '2');
assert.format('%Y', '2011');
assert.format('%y', '11');
assert.format('%Z', null, 'GMT');
assert.format('%z', null, '+0000');
assert.format('%:z', null, '+00:00');
assert.format('%%', '%'); // any other char
assert.format('%F %T', null, '1970-01-01 00:00:00', new Date(0));
ok('GMT');
<<<<<<<
assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', 0);
assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', '+0000');
assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', 120);
assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', '+0200');
assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', -420);
assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', '-0700');
assert.formatTZ('%F %r %z', '2011-06-07 11:21:45 AM -0730', '-0730');
ok('Time zone offset');
=======
assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', 0)
assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', '+0000')
assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', 120)
assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', '+0200')
assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', -420)
assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', '-0700')
assert.formatTZ('%F %r %z', '2011-06-07 11:21:45 AM -0730', '-0730')
assert.formatTZ('%F %r %:z', '2011-06-07 11:21:45 AM -07:30', '-0730')
ok('Time zone offset')
>>>>>>>
assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', 0);
assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', '+0000');
assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', 120);
assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', '+0200');
assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', -420);
assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', '-0700');
assert.formatTZ('%F %r %z', '2011-06-07 11:21:45 AM -0730', '-0730');
assert.formatTZ('%F %r %:z', '2011-06-07 11:21:45 AM -07:30', '-0730');
ok('Time zone offset');
<<<<<<<
regex = typeof regex === 'string' ? RegExp('\\((' + regex + ')\\)$') : regex;
var match = Time.toString().match(regex);
if (match) {
var off = Time.getTimezoneOffset(),
hourOff = off / 60,
hourDiff = Math.floor(hourOff),
hours = 18 - hourDiff,
padSpace24 = hours < 10 ? ' ' : '',
padZero24 = hours < 10 ? '0' : '',
hour24 = String(hours),
padSpace12 = (hours % 12) < 10 ? ' ' : '',
padZero12 = (hours % 12) < 10 ? '0' : '',
hour12 = String(hours % 12),
sign = hourDiff < 0 ? '+' : '-',
minDiff = Time.getTimezoneOffset() - (hourDiff * 60),
mins = String(51 - minDiff),
tz = match[1],
ampm = hour12 == hour24 ? 'AM' : 'PM',
R = hour24 + ':' + mins,
r = padZero12 + hour12 + ':' + mins + ':45 ' + ampm,
T = R + ':45';
assert.format('%H', padZero24 + hour24, '18');
assert.format('%I', padZero12 + hour12, '06');
assert.format('%k', padSpace24 + hour24, '18');
assert.format('%l', padSpace12 + hour12, ' 6');
assert.format('%M', mins);
assert.format('%P', ampm.toLowerCase(), 'pm');
assert.format('%p', ampm, 'PM');
assert.format('%R', R, '18:51');
assert.format('%r', r, '06:51:45 PM');
assert.format('%T', T, '18:51:45');
assert.format('%Z', tz, 'GMT');
assert.format('%z', sign + '0' + Math.abs(hourDiff) + '00', '+0000');
}
=======
regex = typeof regex === 'string' ? RegExp('\\((' + regex + ')\\)$') : regex
var match = TestTime.toString().match(regex)
if (match) {
var off = TestTime.getTimezoneOffset()
, hourOff = off / 60
, hourDiff = Math.floor(hourOff)
, hours = 18 - hourDiff
, padSpace24 = hours < 10 ? ' ' : ''
, padZero24 = hours < 10 ? '0' : ''
, hour24 = String(hours)
, padSpace12 = (hours % 12) < 10 ? ' ' : ''
, padZero12 = (hours % 12) < 10 ? '0' : ''
, hour12 = String(hours % 12)
, sign = hourDiff < 0 ? '+' : '-'
, minDiff = TestTime.getTimezoneOffset() - (hourDiff * 60)
, mins = String(51 - minDiff)
, tz = match[1]
, ampm = hour12 == hour24 ? 'AM' : 'PM'
, R = hour24 + ':' + mins
, r = padZero12 + hour12 + ':' + mins + ':45 ' + ampm
, T = R + ':45'
assert.format('%H', padZero24 + hour24, '18')
assert.format('%I', padZero12 + hour12, '06')
assert.format('%k', padSpace24 + hour24, '18')
assert.format('%l', padSpace12 + hour12, ' 6')
assert.format('%M', mins)
assert.format('%P', ampm.toLowerCase(), 'pm')
assert.format('%p', ampm, 'PM')
assert.format('%R', R, '18:51')
assert.format('%r', r, '06:51:45 PM')
assert.format('%T', T, '18:51:45')
assert.format('%Z', tz, 'GMT')
assert.format('%z', sign + '0' + Math.abs(hourDiff) + '00', '+0000')
assert.format('%:z', sign + '0' + Math.abs(hourDiff) + ':00', '+00:00')
}
>>>>>>>
regex = typeof regex === 'string' ? RegExp('\\((' + regex + ')\\)$') : regex;
var match = Time.toString().match(regex);
if (match) {
var off = Time.getTimezoneOffset(),
hourOff = off / 60,
hourDiff = Math.floor(hourOff),
hours = 18 - hourDiff,
padSpace24 = hours < 10 ? ' ' : '',
padZero24 = hours < 10 ? '0' : '',
hour24 = String(hours),
padSpace12 = (hours % 12) < 10 ? ' ' : '',
padZero12 = (hours % 12) < 10 ? '0' : '',
hour12 = String(hours % 12),
sign = hourDiff < 0 ? '+' : '-',
minDiff = Time.getTimezoneOffset() - (hourDiff * 60),
mins = String(51 - minDiff),
tz = match[1],
ampm = hour12 == hour24 ? 'AM' : 'PM',
R = hour24 + ':' + mins,
r = padZero12 + hour12 + ':' + mins + ':45 ' + ampm,
T = R + ':45';
assert.format('%H', padZero24 + hour24, '18');
assert.format('%I', padZero12 + hour12, '06');
assert.format('%k', padSpace24 + hour24, '18');
assert.format('%l', padSpace12 + hour12, ' 6');
assert.format('%M', mins);
assert.format('%P', ampm.toLowerCase(), 'pm');
assert.format('%p', ampm, 'PM');
assert.format('%R', R, '18:51');
assert.format('%r', r, '06:51:45 PM');
assert.format('%T', T, '18:51:45');
assert.format('%Z', tz, 'GMT');
assert.format('%z', sign + '0' + Math.abs(hourDiff) + '00', '+0000');
assert.format('%:z', sign + '0' + Math.abs(hourDiff) + ':00', '+00:00');
} |
<<<<<<<
{isUsingAuth
? <NavBlock icon="user" className="sidebar__square-last">
{customLinks
? this.renderUserMenuBlockWithCustomLinks(
customLinks,
logoutLink
)
: <NavHeader
useAnchor={true}
link={logoutLink}
title="Logout"
/>}
</NavBlock>
: null}
=======
<div className="sidebar--bottom">
<div className="sidebar--item">
<div className="sidebar--square">
<span className="sidebar--icon icon zap" />
</div>
<div className="sidebar-menu">
<div className="sidebar-menu--heading">
Version: {V_NUMBER}
</div>
</div>
</div>
{showLogout
? <NavBlock icon="user" className="sidebar--item-last">
<NavHeader
useAnchor={true}
link={logoutLink}
title="Logout"
/>
</NavBlock>
: null}
</div>
>>>>>>>
<div className="sidebar--bottom">
<div className="sidebar--item">
<div className="sidebar--square">
<span className="sidebar--icon icon zap" />
</div>
<div className="sidebar-menu">
<div className="sidebar-menu--heading">
Version: {V_NUMBER}
</div>
</div>
</div>
</div>
{isUsingAuth
? <NavBlock icon="user" className="sidebar--item-last">
{customLinks
? this.renderUserMenuBlockWithCustomLinks(
customLinks,
logoutLink
)
: <NavHeader
useAnchor={true}
link={logoutLink}
title="Logout"
/>}
</NavBlock>
: null} |
<<<<<<<
synchronizer,
=======
timeRange,
isInDataExplorer,
>>>>>>>
synchronizer,
timeRange,
<<<<<<<
synchronizer={synchronizer}
=======
timeRange={timeRange}
legendOnBottom={isInDataExplorer}
>>>>>>>
synchronizer={synchronizer}
timeRange={timeRange} |
<<<<<<<
const merge = (a, b) => {
const c = {};
for (const k in a) { c[k] = a[k]; }
for (const k in b) { c[k] = b[k]; }
return c;
};
=======
const stripTags = s => s.replace(/<[^>]+/g, '');
>>>>>>>
const merge = (a, b) => {
const c = {};
for (const k in a) { c[k] = a[k]; }
for (const k in b) { c[k] = b[k]; }
return c;
};
const stripTags = s => s.replace(/<[^>]+/g, ''); |
<<<<<<<
this.disposables.push(server);
this.disposables.push(status);
this.disposables.push(install);
// this.disposables.push(errorRescue);
=======
ctx.subscriptions.push(server);
ctx.subscriptions.push(status);
ctx.subscriptions.push(install);
// ctx.subscriptions.push(errorRescue);
>>>>>>>
this.disposables.push(server);
this.disposables.push(status);
this.disposables.push(install);
// this.disposables.push(errorRescue);
<<<<<<<
this.disposables.push(
=======
ctx.subscriptions.push(
>>>>>>>
this.disposables.push(
<<<<<<<
this.disposables.push(
vscode.languages.registerCompletionItemProvider(PYTHON_MODE, new KiteCompletionProvider(Kite), '.', ' '));
this.disposables.push(
=======
ctx.subscriptions.push(
vscode.languages.registerCompletionItemProvider(PYTHON_MODE, new KiteCompletionProvider(Kite), '.', ' '));
ctx.subscriptions.push(
>>>>>>>
this.disposables.push(
vscode.languages.registerCompletionItemProvider(PYTHON_MODE, new KiteCompletionProvider(Kite), '.', ' '));
this.disposables.push(
<<<<<<<
this.disposables.push(
=======
ctx.subscriptions.push(
>>>>>>>
this.disposables.push(
<<<<<<<
this.disposables.push(
vscode.languages.registerCompletionItemProvider(JAVASCRIPT_MODE, new KiteCompletionProvider(Kite), '.'));
this.disposables.push(
=======
ctx.subscriptions.push(
vscode.languages.registerCompletionItemProvider(JAVASCRIPT_MODE, new KiteCompletionProvider(Kite), '.', ' '));
ctx.subscriptions.push(
>>>>>>>
this.disposables.push(
vscode.languages.registerCompletionItemProvider(JAVASCRIPT_MODE, new KiteCompletionProvider(Kite), '.', ' '));
this.disposables.push(
<<<<<<<
this.disposables.push(vscode.commands.registerCommand('kite.search', () => {
search.clearCache();
vscode.commands.executeCommand('vscode.previewHtml', 'kite-vscode-search://search', vscode.ViewColumn.Two, 'Kite Search');
}));
this.disposables.push(vscode.commands.registerCommand('kite.reset-search-history', () => {
localconfig.set('searchHistory', []);
}));
this.disposables.push(vscode.commands.registerCommand('kite.login', () => {
=======
vscode.commands.registerCommand('kite.login', () => {
>>>>>>>
this.disposables.push(vscode.commands.registerCommand('kite.login', () => { |
<<<<<<<
const {AccountManager, Logger} = require('kite-installer');
const {PYTHON_MODE, NEW_PYTHON_MODE, ERROR_COLOR, SUPPORTED_EXTENSIONS} = require('./constants');
=======
const {Logger} = require('kite-installer');
const {PYTHON_MODE, ERROR_COLOR, SUPPORTED_EXTENSIONS} = require('./constants');
>>>>>>>
const {Logger} = require('kite-installer');
const {PYTHON_MODE, ERROR_COLOR, SUPPORTED_EXTENSIONS} = require('./constants');
<<<<<<<
this.disposables.push(
vscode.languages.registerHoverProvider(NEW_PYTHON_MODE, new KiteHoverProvider(Kite)));
this.disposables.push(
vscode.languages.registerDefinitionProvider(NEW_PYTHON_MODE, new KiteDefinitionProvider(Kite)));
this.disposables.push(
vscode.languages.registerCompletionItemProvider(NEW_PYTHON_MODE, new KiteCompletionProvider(Kite), '.', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'));
this.disposables.push(
vscode.languages.registerSignatureHelpProvider(NEW_PYTHON_MODE, new KiteSignatureProvider(Kite), '(', ','));
=======
>>>>>>>
<<<<<<<
=======
case KiteAPI.STATES.REACHABLE:
this.statusBarItem.text = '𝕜𝕚𝕥𝕖: not logged in'
this.statusBarItem.color = ERROR_COLOR;
this.statusBarItem.tooltip = 'Kite engine is not authenticated';
break;
>>>>>>> |
<<<<<<<
,"seUseHtml5ForAudio":"\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c HTML5 \u0430\u0443\u0434\u0438\u043e \u043f\u043b\u0435\u0435\u0440"
=======
,"seUseHTML5ForSave":"\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C HTML5 \u0434\u043B\u044F \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u0444\u0430\u0439\u043B\u043E\u0432"
>>>>>>>
,"seUseHtml5ForAudio":"\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c HTML5 \u0430\u0443\u0434\u0438\u043e \u043f\u043b\u0435\u0435\u0440"
,"seUseHTML5ForSave":"\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C HTML5 \u0434\u043B\u044F \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u0444\u0430\u0439\u043B\u043E\u0432"
<<<<<<<
,"seUseHtml5ForAudio":"Use HTML5 as audio player"
=======
,"seUseHTML5ForSave":"Use HTML5 for file saving"
>>>>>>>
,"seUseHtml5ForAudio":"Use HTML5 as audio player"
,"seUseHTML5ForSave":"Use HTML5 for file saving" |
<<<<<<<
else if (b.mozilla) spath='resource://vkopt/'+filename
if (!Components.classes) // Firefox Jetpack
spath = 'resource://vkopt-at-vkopt-dot-net/vkopt/data/scripts/' + filename;
else
spath = 'resource://vkopt/' + filename;
=======
else if (b.mozilla) spath='resource://vkopt/'+filename;
>>>>>>>
else if (b.mozilla)
if (!Components.classes) // Firefox Jetpack
spath = 'resource://vkopt-at-vkopt-dot-net/vkopt/data/scripts/' + filename;
else
spath = 'resource://vkopt/' + filename;
<<<<<<<
xhr.responseType = responseType;
xhr.onreadystatechange = function () {
if (xhr.readyState == 4) {
var response = {};
if (!responseType || responseType == 'text') response.text = xhr.responseText;
response.headers = xhr.getAllResponseHeaders();
response.status = xhr.status;
response.raw = (responseType == 'arraybuffer' ? [].slice.call(new Uint8Array(xhr.response)) : xhr.response);
callback(response);
}
};
xhr.send(data);
} catch (e) {
console.log('XHR ERROR', e);
callback({
error: e
});
}
}
=======
xhr.onreadystatechange = function() {
if (xhr.readyState == 4) {
var response = {};
if (!responseType || responseType=='text') response.text = xhr.responseText;
response.headers = xhr.getAllResponseHeaders();
response.status = xhr.status;
response.raw = (responseType == 'arraybuffer' ? [].slice.call(new Uint8Array(xhr.response)) : xhr.response);
callback(response);
}
};
xhr.send(data);
} catch (e) {
console.log('XHR ERROR', e);
callback({
error: e
});
}
>>>>>>>
xhr.responseType = responseType;
xhr.onreadystatechange = function () {
if (xhr.readyState == 4) {
var response = {};
if (!responseType || responseType == 'text') response.text = xhr.responseText;
response.headers = xhr.getAllResponseHeaders();
response.status = xhr.status;
response.raw = (responseType == 'arraybuffer' ? [].slice.call(new Uint8Array(xhr.response)) : xhr.response);
callback(response);
}
};
xhr.send(data);
} catch (e) {
console.log('XHR ERROR', e);
callback({
error: e
});
}
}
<<<<<<<
fp.appendFilter(fileType, "*." + fileType);
var rv = fp.show();
if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
var file = fp.file;
var path = fp.file.path;
return file;
}
return null;
}
=======
fp.appendFilter(fileType, "*." + fileType);
var rv = fp.show();
if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
var file = fp.file;
//var path = fp.file.path;
return file;
}
return null;
}
>>>>>>>
fp.appendFilter(fileType, "*." + fileType);
var rv = fp.show();
if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
var file = fp.file;
//var path = fp.file.path;
return file;
}
return null;
}
<<<<<<<
var persist = makeWebBrowserPersist();
const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
if (win && "undefined" != typeof(PrivateBrowsingUtils) && PrivateBrowsingUtils.privacyContextFromWindow) {
var privacyContext = PrivateBrowsingUtils.privacyContextFromWindow(win);
var isPrivate = privacyContext.usePrivateBrowsing;
} else {
// older than Firefox 19 or couldn't get window.
var privacyContext = null;
var isPrivate = false;
}
persist.persistFlags = flags;
if (aShouldBypassCache) {
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_BYPASS_CACHE;
}
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_DONT_CHANGE_FILENAMES
var tr = Components.classes["@mozilla.org/transfer;1"].createInstance(Components.interfaces.nsITransfer);
tr.init(uri, fileURL, "", null, null, null, persist, isPrivate);
persist.progressListener = tr;
if (browser.version < 36)
persist.saveURI(uri, null, null, null, null, fileURL, privacyContext);
else // В новых FF добавлен четвертый параметр aReferrerPolicy
persist.saveURI(uri, null, null, null, null, null, fileURL, privacyContext); }
=======
persist = makeWebBrowserPersist();
const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
if (win && "undefined" != typeof(PrivateBrowsingUtils) && PrivateBrowsingUtils.privacyContextFromWindow) {
var privacyContext = PrivateBrowsingUtils.privacyContextFromWindow(win);
var isPrivate = privacyContext.usePrivateBrowsing;
} else {
// older than Firefox 19 or couldn't get window.
var privacyContext = null;
var isPrivate = false;
}
persist.persistFlags = flags;
if (aShouldBypassCache) {
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_BYPASS_CACHE;
}
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_DONT_CHANGE_FILENAMES;
var tr = Components.classes["@mozilla.org/transfer;1"].createInstance(Components.interfaces.nsITransfer);
tr.init(uri, fileURL, "", null, null, null, persist, isPrivate);
persist.progressListener = tr;
if (browser.version < 36)
persist.saveURI(uri, null, null, null, null, fileURL, privacyContext);
else // В новых FF добавлен четвертый параметр aReferrerPolicy
persist.saveURI(uri, null, null, null, null, null, fileURL, privacyContext);
>>>>>>>
persist = makeWebBrowserPersist();
const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
if (win && "undefined" != typeof(PrivateBrowsingUtils) && PrivateBrowsingUtils.privacyContextFromWindow) {
var privacyContext = PrivateBrowsingUtils.privacyContextFromWindow(win);
var isPrivate = privacyContext.usePrivateBrowsing;
} else {
// older than Firefox 19 or couldn't get window.
var privacyContext = null;
var isPrivate = false;
}
persist.persistFlags = flags;
if (aShouldBypassCache) {
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_BYPASS_CACHE;
}
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_DONT_CHANGE_FILENAMES;
var tr = Components.classes["@mozilla.org/transfer;1"].createInstance(Components.interfaces.nsITransfer);
tr.init(uri, fileURL, "", null, null, null, persist, isPrivate);
persist.progressListener = tr;
if (browser.version < 36)
persist.saveURI(uri, null, null, null, null, fileURL, privacyContext);
else // В новых FF добавлен четвертый параметр aReferrerPolicy
persist.saveURI(uri, null, null, null, null, null, fileURL, privacyContext);
} |
<<<<<<<
if (window.opera && opera.extension) spath='scripts/'+filename;
else if (window.chrome && chrome.extension) spath=chrome.extension.getURL('scripts/'+filename);
else if (window.safari && safari.extension) spath=safari.extension.baseURI+'scripts/'+filename;
else if (window.navigator.userAgent.match('Mozilla'))
if (!Components.classes) // Firefox Jetpack
spath = 'resource://vkopt-at-vkopt-dot-net/vkopt/data/scripts/' + filename;
else
spath = 'resource://vkopt/' + filename;
=======
if (b.opera) spath='scripts/'+filename;
else if (b.chrome) spath=chrome.extension.getURL('scripts/'+filename);
else if (b.safari) spath=safari.extension.baseURI+'scripts/'+filename;
else if (b.mozilla) spath='resource://vkopt/'+filename
>>>>>>>
if (b.opera) spath='scripts/'+filename;
else if (b.chrome) spath=chrome.extension.getURL('scripts/'+filename);
else if (b.safari) spath=safari.extension.baseURI+'scripts/'+filename;
else if (b.mozilla) spath='resource://vkopt/'+filename
if (!Components.classes) // Firefox Jetpack
spath = 'resource://vkopt-at-vkopt-dot-net/vkopt/data/scripts/' + filename;
else
spath = 'resource://vkopt/' + filename;
<<<<<<<
var persist = makeWebBrowserPersist();
const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
if (win && "undefined" != typeof(PrivateBrowsingUtils) && PrivateBrowsingUtils.privacyContextFromWindow) {
var privacyContext = PrivateBrowsingUtils.privacyContextFromWindow(win);
var isPrivate = privacyContext.usePrivateBrowsing;
} else {
// older than Firefox 19 or couldn't get window.
var privacyContext = null;
var isPrivate = false;
}
persist.persistFlags = flags;
if (aShouldBypassCache) {
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_BYPASS_CACHE;
}
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_DONT_CHANGE_FILENAMES
var tr = Components.classes["@mozilla.org/transfer;1"].createInstance(Components.interfaces.nsITransfer);
tr.init(uri, fileURL, "", null, null, null, persist, isPrivate);
persist.progressListener = tr;
persist.saveURI(uri, null, null, null, null, fileURL, privacyContext);
}
=======
var persist = makeWebBrowserPersist();
const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
if (win && "undefined" != typeof(PrivateBrowsingUtils) && PrivateBrowsingUtils.privacyContextFromWindow) {
var privacyContext = PrivateBrowsingUtils.privacyContextFromWindow(win);
var isPrivate = privacyContext.usePrivateBrowsing;
} else {
// older than Firefox 19 or couldn't get window.
var privacyContext = null;
var isPrivate = false;
}
persist.persistFlags = flags;
if (aShouldBypassCache) {
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_BYPASS_CACHE;
}
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_DONT_CHANGE_FILENAMES
var tr = Components.classes["@mozilla.org/transfer;1"].createInstance(Components.interfaces.nsITransfer);
tr.init(uri, fileURL, "", null, null, null, persist, isPrivate);
persist.progressListener = tr;
if (browser.version < 36)
persist.saveURI(uri, null, null, null, null, fileURL, privacyContext);
else // В новых FF добавлен четвертый параметр aReferrerPolicy
persist.saveURI(uri, null, null, null, null, null, fileURL, privacyContext);
>>>>>>>
var persist = makeWebBrowserPersist();
const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
if (win && "undefined" != typeof(PrivateBrowsingUtils) && PrivateBrowsingUtils.privacyContextFromWindow) {
var privacyContext = PrivateBrowsingUtils.privacyContextFromWindow(win);
var isPrivate = privacyContext.usePrivateBrowsing;
} else {
// older than Firefox 19 or couldn't get window.
var privacyContext = null;
var isPrivate = false;
}
persist.persistFlags = flags;
if (aShouldBypassCache) {
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_BYPASS_CACHE;
}
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
persist.persistFlags |= nsIWBP.PERSIST_FLAGS_DONT_CHANGE_FILENAMES
var tr = Components.classes["@mozilla.org/transfer;1"].createInstance(Components.interfaces.nsITransfer);
tr.init(uri, fileURL, "", null, null, null, persist, isPrivate);
persist.progressListener = tr;
if (browser.version < 36)
persist.saveURI(uri, null, null, null, null, fileURL, privacyContext);
else // В новых FF добавлен четвертый параметр aReferrerPolicy
persist.saveURI(uri, null, null, null, null, null, fileURL, privacyContext); } |
<<<<<<<
,"seDisableLinkConvert":"\u041d\u0435 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u044b\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0438 \u0432 \u0434\u0438\u0430\u043b\u043e\u0433\u0430\u0445"
,"seSubscribeToWall":"\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 \u043d\u0430 \u0441\u0442\u0435\u043d\u044b"
,"atWall":"\u043d\u0430 \u0441\u0442\u0435\u043d\u0435"
=======
,"sortByDate":"\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e \u0434\u0430\u0442\u0435"
>>>>>>>
,"seDisableLinkConvert":"\u041d\u0435 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u044b\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0438 \u0432 \u0434\u0438\u0430\u043b\u043e\u0433\u0430\u0445"
,"seSubscribeToWall":"\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 \u043d\u0430 \u0441\u0442\u0435\u043d\u044b"
,"atWall":"\u043d\u0430 \u0441\u0442\u0435\u043d\u0435"
<<<<<<<
,"seDisableLinkConvert":"Don't convert links in dialogs"
,"seSubscribeToWall":"Subscribe to walls"
,"atWall":"at wall"
=======
,"sortByDate":"Sort by date"
>>>>>>>
,"seDisableLinkConvert":"Don't convert links in dialogs"
,"sortByDate":"Sort by date"
,"seSubscribeToWall":"Subscribe to walls"
,"atWall":"at wall" |
<<<<<<<
,"ColorSelector":"\u0412\u044b\u0431\u043e\u0440 \u0446\u0432\u0435\u0442\u0430"
=======
,"oldWhiteBackground":"\u0411\u0435\u043B\u044B\u0439 \u0444\u043E\u043D"
>>>>>>>
,"ColorSelector":"\u0412\u044b\u0431\u043e\u0440 \u0446\u0432\u0435\u0442\u0430"
,"oldWhiteBackground":"\u0411\u0435\u043B\u044B\u0439 \u0444\u043E\u043D"
<<<<<<<
,"ColorSelector":"Color selector"
=======
,"oldWhiteBackground":"White background"
>>>>>>>
,"ColorSelector":"Color selector"
,"oldWhiteBackground":"White background" |
<<<<<<<
,"LinkOrId":"\u0421\u0441\u044b\u043b\u043a\u0430 \u0438\u043b\u0438 id \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0430"
=======
,"seExceptConferences":"\u041a\u0440\u043e\u043c\u0435 \u043a\u043e\u043d\u0444\u0435\u0440\u0435\u043d\u0446\u0438\u0439"
>>>>>>>
,"LinkOrId":"\u0421\u0441\u044b\u043b\u043a\u0430 \u0438\u043b\u0438 id \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0430"
,"seExceptConferences":"\u041a\u0440\u043e\u043c\u0435 \u043a\u043e\u043d\u0444\u0435\u0440\u0435\u043d\u0446\u0438\u0439"
<<<<<<<
,"LinkOrId":"Link or owner id"
=======
,"seExceptConferences":"Except conferences"
>>>>>>>
,"LinkOrId":"Link or owner id"
,"seExceptConferences":"Except conferences" |
<<<<<<<
if (VIDEO_AUTOPLAY_DISABLE){
Inj.Start('showVideo', 'vk_videos.change_show_video_params(options);');
Inj.Before('showVideo','ajax.post','vk_videos.change_show_video_params(options);');
}
=======
if (VIDEO_AUTOPLAY_DISABLE) Inj.Before('showVideo','ajax.post','vk_videos.change_show_video_params(options);');
vk_groups.block_autoplay();
>>>>>>>
if (VIDEO_AUTOPLAY_DISABLE){
Inj.Start('showVideo', 'vk_videos.change_show_video_params(options);');
Inj.Before('showVideo','ajax.post','vk_videos.change_show_video_params(options);');
}
vk_groups.block_autoplay(); |
<<<<<<<
const debug = require("debug");
=======
const fs = require("fs");
>>>>>>>
const debug = require("debug");
const fs = require("fs"); |
<<<<<<<
"tap .logout": "logout_tapHandler",
"tap .favorites": "favorites_tapHandler"
=======
"tap .sharerooms": "sharerooms_tapHandler"
>>>>>>>
"tap .logout": "logout_tapHandler",
"tap .favorites": "favorites_tapHandler",
"tap .sharerooms": "sharerooms_tapHandler"
<<<<<<<
this.devicesCollection.url = spiderOakApp.accountModel.getStorageURL();
this.$(".devices").one("complete", function(event) {
if (spiderOakApp.navigator.viewsStack.length === 0) {
var $firstDevice = this.$(".devices").find("li a").first();
var firstDeviceModel = $firstDevice.data("model");
if (firstDeviceModel) {
var options = {
id: firstDeviceModel.cid,
title: firstDeviceModel.get("name"),
model: firstDeviceModel
};
$("#menusheet ul li").removeClass("current");
$firstDevice.closest("li").addClass("current");
spiderOakApp.navigator.pushView(
spiderOakApp.FolderView,
options,
spiderOakApp.noEffect
);
spiderOakApp.dialogView.hide();
}
}
else {
// Just in case...
spiderOakApp.dialogView.hide();
}
}.bind(this));
=======
this.devicesCollection.url =
spiderOakApp.accountModel.get("storageRootURL");
>>>>>>>
this.devicesCollection.url =
spiderOakApp.accountModel.get("storageRootURL");
this.$(".devices").one("complete", function(event) {
if (spiderOakApp.navigator.viewsStack.length === 0) {
var $firstDevice = this.$(".devices").find("li a").first();
var firstDeviceModel = $firstDevice.data("model");
if (firstDeviceModel) {
var options = {
id: firstDeviceModel.cid,
title: firstDeviceModel.get("name"),
model: firstDeviceModel
};
$("#menusheet ul li").removeClass("current");
$firstDevice.closest("li").addClass("current");
spiderOakApp.navigator.pushView(
spiderOakApp.FolderView,
options,
spiderOakApp.noEffect
);
spiderOakApp.dialogView.hide();
}
}
else {
// Just in case...
spiderOakApp.dialogView.hide();
}
}.bind(this)); |
<<<<<<<
if (spiderOakApp.accountModel.getLoginState() === true) {
=======
if ($("#main").hasClass("open")) {
event.preventDefault();
return;
}
if (spiderOakApp.accountModel.get("isLoggedIn")) {
>>>>>>>
if ($("#main").hasClass("open")) {
event.preventDefault();
return;
}
if (spiderOakApp.accountModel.getLoginState() === true) { |
<<<<<<<
grunt.registerTask('debug_ios', ['jshint', 'dot', 'concat', 'shell:mochadot', 'shell:debug_ios']);
grunt.registerTask('debug_android', ['jshint', 'dot', 'concat', 'shell:mochadot', 'shell:debug_android']);
=======
// Build tasks
grunt.registerTask('debug','Create a debug build', function(platform) {
grunt.task.run('jshint', 'concat', 'shell:mochadot');
grunt.task.run('shell:debug_' + platform);
});
grunt.registerTask('beta','Create a beta build', function(platform) {
grunt.log.writeln('Placeholder for beta build task');
});
grunt.registerTask('production','Create a production build', function(platform) {
grunt.log.writeln('Placeholder for production build task');
});
// deprecated
grunt.registerTask('debug_ios', ['jshint', 'concat', 'shell:mochadot', 'shell:debug_ios']);
grunt.registerTask('debug_android', ['jshint', 'concat', 'shell:mochadot', 'shell:debug_android']);
>>>>>>>
// Build tasks
grunt.registerTask('debug','Create a debug build', function(platform) {
grunt.task.run('jshint', 'dot', 'concat', 'shell:mochadot');
grunt.task.run('shell:debug_' + platform);
});
grunt.registerTask('beta','Create a beta build', function(platform) {
grunt.log.writeln('Placeholder for beta build task');
});
grunt.registerTask('production','Create a production build', function(platform) {
grunt.log.writeln('Placeholder for production build task');
});
// deprecated
grunt.registerTask('debug_ios', ['jshint', 'dot', 'concat', 'shell:mochadot', 'shell:debug_ios']);
grunt.registerTask('debug_android', ['jshint', 'dot', 'concat', 'shell:mochadot', 'shell:debug_android']); |
<<<<<<<
? <NavBlock icon="user" className="sidebar__square-last">
<NavHeader link={logoutLink} title="Logout" />
=======
? <NavBlock icon="user-outline" className="sidebar__square-last">
<NavHeader useAnchor={true} link={logoutLink} title="Logout" />
>>>>>>>
? <NavBlock icon="user" className="sidebar__square-last">
<NavHeader useAnchor={true} link={logoutLink} title="Logout" /> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.