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;
... |
<<<<<<<
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
=======
>>>>>>>
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
<<<<<<<
/**
* @override
* @inheritdoc
* @... |
<<<<<<<
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("use... |
<<<<<<<
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,... |
<<<<<<<
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.queu... |
<<<<<<<
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()... |
<<<<<<<
const isBrokenBrowserHistory = device.ie || device.edge || (device.firefox && !device.ios);
const needHistoryBack =
router.params.browserHistory && navigateOptions.browserHistory !== false;
if (needHistoryBack && !isBrokenBrowserHistory) {
=======
const isBrokenPushState = Devi... |
<<<<<<<
const {
topHeightPixels,
bottomHeightPixels,
topHeight,
bottomHeight,
isDragging,
} = this.state
const {containerClass, children} = this.props
=======
const {bottomHeightPixels, topHeight, bottomHeight, isDragging} = this.state
const {containerClass, children,... |
<<<<<<<
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.materialPageLo... |
<<<<<<<
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-butt... |
<<<<<<<
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');
pan... |
<<<<<<<
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 = cl... |
<<<<<<<
// 人民邮电出版社
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/boo... |
<<<<<<<
// 果壳网
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/appl... |
<<<<<<<
'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... |
<<<<<<<
// 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?/:s... |
<<<<<<<
// 眾新聞
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('./r... |
<<<<<<<
// 辽宁工程技术大学教务在线公告
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/jwne... |
<<<<<<<
// 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... |
<<<<<<<
hoverTime,
onSetHoverTime,
onNewQueryAST,
=======
>>>>>>>
onNewQueryAST,
<<<<<<<
hoverTime={hoverTime}
onSetHoverTime={onSetHoverTime}
inView={inView}
onNewQueryAST={onNewQueryAST}
=======
resizerTopHeight={resizerTopHeight}
handleSetHoverTime={handl... |
<<<<<<<
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
... |
<<<<<<<
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 = ... |
<<<<<<<
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} ... |
<<<<<<<
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={t... |
<<<<<<<
'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';
impo... |
<<<<<<<
@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... |
<<<<<<<
<View>
<EmailConfirmation user={this.props.user} />
<BannerInfo user={this.props.user} logged={true} />
</View>
=======
<EmailConfirmation user={this.props.user} />
>>>>>>>
<EmailConfirmation user={this.props.user} />
<B... |
<<<<<<<
useEffect(() => {
if (inputRef.current) {
inputRef.current.focus();
}
}, [inputRef]);
=======
const showOptions = !(
keyboard.keyboardShown && props.store.attachment.hasAttachment
);
>>>>>>>
useEffect(() => {
if (inputRef.current) {
inputRef.current.focus();
}
},... |
<<<<<<<
import OnboardingScreenNew from '../onboarding/OnboardingScreenNew';
import LoginScreenNew from '../auth/LoginScreenNew';
import featuresService from '../common/services/features.service';
=======
import EmailConfirmationScreen from '../onboarding/EmailConfirmationScreen';
>>>>>>>
import OnboardingScreenNew ... |
<<<<<<<
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 (blocke... |
<<<<<<<
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})
=======
... |
<<<<<<<
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"
styl... |
<<<<<<<
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.servic... |
<<<<<<<
<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... |
<<<<<<<
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 {... |
<<<<<<<
<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.numbe... |
<<<<<<<
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, ... |
<<<<<<<
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/... |
<<<<<<<
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 connectionC... |
<<<<<<<
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;
`;
c... |
<<<<<<<
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.953... |
<<<<<<<
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);
}
... |
<<<<<<<
"} order by desc(?timestamp) ";//limit " + limit;
=======
//" filter ( ?timestamp >= " + timestamp + " ) \n" +
"} order by asc(?timestamp) ";//limit " + limit;
>>>>>>>
"} order by ... |
<<<<<<<
}
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... |
<<<<<<<
applicationStateService.getBaseUrl = function(){
return baseUrl;
}
applicationStateService.getPublicLink = function(needUri){
return applicationStateService.getBaseUrl() + '/post-detail?need=' + encodeURIComponent(needUri);
}
applicationStateService.getPrivateLink = functi... |
<<<<<<<
class wrapper extends Component {
constructor() {
super()
this.state = {
=======
const wrapper = React.createClass({
propTypes: {
children: element,
autoRefresh: number.isRequired,
templates: arrayOf(
shape({
type: string.isRequired,
tempVa... |
<<<<<<<
// 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... |
<<<<<<<
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
a... |
<<<<<<<
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.con... |
<<<<<<<
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.proto... |
<<<<<<<
<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"/... |
<<<<<<<
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-sta... |
<<<<<<<
<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'... |
<<<<<<<
//isAccepted: wonMessage.isAccepted(),
contentGraphTrig: {
prefixes: contentGraphTrigPrefixes,
body: contentGraphTrigBody,
},
contentGraphTrigRaw: wonMessage.contentGraphTrig,
contentGraphTrigError: wonMessage.contentGra... |
<<<<<<<
<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__ic... |
<<<<<<<
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, received... |
<<<<<<<
<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 ... |
<<<<<<<
const AnnotationWindow = ({annotation, dygraph, staticLegendHeight}) =>
=======
const AnnotationWindow = ({annotation, dygraph, active}) =>
>>>>>>>
const AnnotationWindow = ({annotation, dygraph, active, staticLegendHeight}) =>
<<<<<<<
className="annotation-window"
style={windowDimensions(annotation... |
<<<<<<<
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 }... |
<<<<<<<
"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'>Auctio... |
<<<<<<<
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, tas... |
<<<<<<<
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;
===... |
<<<<<<<
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, ... |
<<<<<<<
};
=======
};
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 's... |
<<<<<<<
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': selectorPseudoCla... |
<<<<<<<
export const PLAYER_COLORS = [0xff0000, 0x00FF00, 0xBA55D3, 0xffae42,
0xbd00db, 0xFF69B4, 0xFFFF00, 0x009900,
0xFF8C00, 0xff0000, 0x00FF00, 0xBA55D3,
0xffae42, 0xbd00db, 0xFF69B4, 0xFFFF00];
export const PLANET_COLOR... |
<<<<<<<
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/Overla... |
<<<<<<<
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');... |
<<<<<<<
{isUsingAuth
? <NavBlock icon="user" className="sidebar__square-last">
{customLinks
? this.renderUserMenuBlockWithCustomLinks(
customLinks,
logoutLink
)
: <NavHeader
... |
<<<<<<<
synchronizer,
=======
timeRange,
isInDataExplorer,
>>>>>>>
synchronizer,
timeRange,
<<<<<<<
synchronizer={synchronizer}
=======
timeRange={timeRange}
legendOnBottom={isInDataExplorer}
>>>>>>>
synchronizer={synchronizer}
timeR... |
<<<<<<<
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] =... |
<<<<<<<
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);... |
<<<<<<<
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 {Log... |
<<<<<<<
,"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\u043... |
<<<<<<<
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;
=======... |
<<<<<<<
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 ... |
<<<<<<<
,"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... |
<<<<<<<
,"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\u04... |
<<<<<<<
,"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\u... |
<<<<<<<
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.cha... |
<<<<<<<
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"
<<<<<<<
t... |
<<<<<<<
if (spiderOakApp.accountModel.getLoginState() === true) {
=======
if ($("#main").hasClass("open")) {
event.preventDefault();
return;
}
if (spiderOakApp.accountModel.get("isLoggedIn")) {
>>>>>>>
if ($("#main").hasClass("open")) {
event.preventDefault();
... |
<<<<<<<
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) {
... |
<<<<<<<
? <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" />
>>>>>>>
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.