conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
var crypto= require("crypto");
=======
var dns = require('dns');
>>>>>>>
var crypto= require("crypto");
var dns = require('dns');
<<<<<<<
if (this.forceClose) this.forceClose(e);
=======
self.destroy(e);
>>>>>>>
if (this.forceClose) this.forceClose(e);
self.destroy(e);
<<<<<<<
... |
<<<<<<<
const [format, setFormat] = useState('json');
=======
const [showCombinatorsBetweenRules, setShowCombinatorsBetweenRules] = useState(false);
>>>>>>>
const [format, setFormat] = useState('json');
const [showCombinatorsBetweenRules, setShowCombinatorsBetweenRules] = useState(false); |
<<<<<<<
import hyperid from 'hyperid'
import { enableCORS, serveIndex } from './util'
=======
import { enableCORS, serveIndex, getRealIp } from './util'
>>>>>>>
import hyperid from 'hyperid'
import { enableCORS, serveIndex, getRealIp } from './util'
<<<<<<<
level: process.env.NODE_ENV === 'production' ? 'info' ... |
<<<<<<<
<div class='row u-center'>
<Form class={`${classes.root} col-6`} onSubmit={this.handleSubmit} disabled={disabledButton} errors={errors} buttonText='Register'>
<input
autofocus
required
autocomplete='username'
autocorrect='off'
i... |
<<<<<<<
import { getOwner } from '@ember/application';
import { assign } from '@ember/polyfills';
=======
>>>>>>>
import { assign } from '@ember/polyfills';
<<<<<<<
const POPPER_DEFAULT_MODIFIERS = {
flip: {
enabled: true,
},
preventOverflow: {
escapeWithReference: true
}
};
=======
const { enviro... |
<<<<<<<
// borders look really bad, if someone wants it they can put it on their div target
img.style.borderStyle = "none";
=======
// borders look really bad, if someone wants it they can put it on their div target
img.style.borderStyle = "none";
>>>>>>>
// bor... |
<<<<<<<
Vue.prototype.$host = 'http://192.168.31.34:8080';
//Vue.prototype.$host = 'http://m1.baobaofarm.com';
=======
>>>>>>> |
<<<<<<<
var assert = require('assert');
var step = require('step');
var cors = require('../middleware/cors');
var userMiddleware = require('../middleware/user');
var allowQueryParams = require('../middleware/allow-query-params');
var vectorError = require('../middleware/vector-error');
const rateLimit = require('../mi... |
<<<<<<<
var overrideParams = _.reduce(_.pick(params, 'start', 'end', 'bins', 'timezone'),
function castNumbers(overrides, val, k) {
if (!Number.isFinite(+val)) {
throw new Error('Invalid number format for parameter \'' + k + '\'');
... |
<<<<<<<
const user = require('../middleware/user');
const locals = require('../middleware/locals');
const credentials = require('../middleware/credentials');
=======
const userMiddleware = require('../middleware/user');
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rat... |
<<<<<<<
module.exports = PreviewTemplateController;
PreviewTemplateController.prototype.register = function (mapRouter) {
mapRouter.get(
`/static/named/:template_id/:width/:height.:format`,
credentials(),
authorize(this.authBackend),
dbConnSetup(this.pgConnection),
rateLimit... |
<<<<<<<
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
var MapConfig = windshaft.model.MapConfig;
var Datasource = windshaft.model.Datasource;
var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
var NamedMapMapConfigProvider = require('../m... |
<<<<<<<
var req = {headers: { host:'localhost' }, query: {} };
var res = {};
=======
var req = {headers: { host:'localhost' }, query: {}, locals: {} };
var res = { set: function () {} };
>>>>>>>
var req = {headers: { host:'localhost' }, query: {} };
var res = { set: function () {}... |
<<<<<<<
const locals = require('../middleware/locals');
const cleanUpQueryParams = require('../middleware/clean-up-query-params');
const layergroupToken = require('../middleware/layergroup-token');
const credentials = require('../middleware/credentials');
const dbConnSetup = require('../middleware/db-conn-setup');
cons... |
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_CREATE),
apikeyMiddleware,
=======
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
userMiddleware(),
localsMiddleware(),
credentialsMi... |
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_TILES),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_TILES),
<<<<<<<
userMiddleware,
rateLimit(this.u... |
<<<<<<<
app.get(
app.base_url_mapconfig + '/static/named/:template_id/:width/:height.:format',
cors(),
userMiddleware,
allowQueryParams(['layer']),
this.prepareContext,
this.staticMap.bind(this)
);
=======
app.get(app.base_url_mapconfig +
'/static/na... |
<<<<<<<
function NamedMapsController(namedMapProviderCache, tileBackend, previewBackend,
surrogateKeysCache, tablesExtentApi, metadataBackend, pgConnection, authApi) {
=======
function NamedMapsController(
prepareContext,
namedMapProviderCache,
tileBackend,
previewBacke... |
<<<<<<<
=======
if(serverOptions.cache_enabled) {
console.log("cache invalidation enabled, varnish on ", serverOptions.varnish_host, ' ',
serverOptions.varnish_port);
Cache.init(serverOptions.varnish_host, serverOptions.varnish_port, serverOptions.varnish_secret);
serverOptions... |
<<<<<<<
// TODO: 测试: 有 extract.all.[*].css
=======
// TODO: 测试: inject 的函数用法
// TODO: 测试: extend connect 的 Array 用法
>>>>>>>
// TODO: 测试: 有 extract.all.[*].css
// TODO: 测试: inject 的函数用法
// TODO: 测试: extend connect 的 Array 用法 |
<<<<<<<
const port = await waitForPort(
child,
/ started on.*http:.*:([0-9]+)/
);
child.stderr.on('data', err => {
=======
const port = await waitForPort(child, / on.*http:.*:([0-9]+)/);
child.stder... |
<<<<<<<
const port = require(path.resolve(dir, 'koot.config.spa.js'))
.port;
const origin = isNaN(port) ? port : `http://127.0.0.1:${port}`;
const errors = [];
=======
const origin = isNaN(port) ? port : `http://127.0.0.1:${port}`;
... |
<<<<<<<
const path = require('path')
// Note: always use `path.join()` to make sure delimiters work cross-platform
// Some platform-specific logic may be needed here, ex using geth.exe on Windows,
// for this you can use electron-util: https://github.com/sindresorhus/electron-util/blob/master/index.js#L17-L19
const dat... |
<<<<<<<
type DB = {
=======
type State = {
actions: { [ID]: Action },
>>>>>>>
type State = {
<<<<<<<
const db: DB = {
address: '',
contactRequests: new Map(),
contacts: new Map(),
convos: new Map(),
profile: undefined,
typings: new Map(),
=======
const store = new Store()
const resetState = () => {... |
<<<<<<<
exports.addMessage = exports.upsertContact = exports.updateConversationPointer = exports.setConversation = exports.setContact = exports.getViewer = exports.getChannels = exports.getConversations = exports.getContacts = exports.getContact = exports.getConversation = exports.setContactRequest = exports.getContact... |
<<<<<<<
exports.setupContactTopic = exports.requestContact = exports.addContactRequest = exports.createChannel = exports.joinChannel = exports.acceptContact = exports.setTyping = exports.sendMessage = exports.joinDirectTopic = exports.joinChannelTopic = exports.createRandomTopic = exports.createContactTopic = exports.s... |
<<<<<<<
/**
* Gravity in the world. This is applied on all bodies in the beginning of each step().
* @member {vec2}
* @memberof p2.World
*/
this.gravity = options.gravity || V.create(0, -9.78);
/**
* Whether to do timing measurements during the step... |
<<<<<<<
import getSchema from './getSchema'
import getWriter from './getWriter'
import getFilepathsFromGlob from './getFilepathsFromGlob'
import { getRelayCompilerPluginHooks } from './hooks'
import type { GraphQLSchema } from 'graphql'
import type { Compiler, Compilation } from 'webpack'
import type { WriterConfig } ... |
<<<<<<<
const chai = require('chai')
const expect = chai.expect
const sinon = require('sinon')
const sinonChai = require('sinon-chai')
const utils = require('../utils.js')
chai.use(sinonChai)
=======
const utils = require('../utils.js')
>>>>>>>
const utils = require('../utils.js')
<<<<<<<
expect(notific... |
<<<<<<<
import { Card } from 'reactstrap'
=======
import { translate } from 'react-i18next'
import queryString from 'query-string'
import Icon from 'components/Common/Icon'
>>>>>>>
import { Card } from 'reactstrap'
import { translate } from 'react-i18next'
import queryString from 'query-string'
import Icon from 'co... |
<<<<<<<
Share: require('./share'),
};
=======
}
>>>>>>>
Share: require('./share'),
} |
<<<<<<<
test('convert markdown', () => {
const markdown = '# ほげほげ\n\n* aaa\n* bbb\n* ccc\n\n## ほげほげほげ\n\n[Yahoo! Japan](http://www.yahoo.co.jp/) is here\n**Bold** and *Italic*'
const markdownConverted = '\n*ほげほげ*\n\n• aaa\n• bbb\n• ccc\n\n\n*ほげほげほげ*\n\n<http://www.yahoo.co.jp/|Yahoo! Japan> is here\n**Bold** ... |
<<<<<<<
import NotificationPage from './components/NotificationPage';
import HeaderNotification from './components/HeaderNotification';
=======
import PageAttachment from './components/PageAttachment';
>>>>>>>
import NotificationPage from './components/NotificationPage';
import HeaderNotification from './component... |
<<<<<<<
import SearchPage from './components/SearchPage';
import PageListSearch from './components/PageListSearch';
import NotificationPage from './components/NotificationPage';
import HeaderNotification from './components/HeaderNotification';
import SeenUserList from './components/SeenUserList';
=======
import Sea... |
<<<<<<<
async apiGet(path, params) {
return await this.apiRequest('get', path, {params: params});
=======
apiGet(path, params) {
return this.apiRequest('get', path, { params: params })
>>>>>>>
async apiGet(path, params) {
return await this.apiRequest('get', path, { params: params }) |
<<<<<<<
const { encodeSpace } = require('../util/path')
=======
const { parseAccessToken } = require('./accessTokenParser')
>>>>>>>
const { encodeSpace } = require('../util/path')
const { parseAccessToken } = require('./accessTokenParser')
<<<<<<<
/**
* Extract Bearer token from Authorization header.
*
* @param ... |
<<<<<<<
const shareData = await self
.findOne(query)
.populate([
...optionalDocs,
{ path: 'page' },
{
path: 'creator',
select: User.USER_PUBLIC_FIELDS,
},
])
.exec()
=======
const shareData = await this.findOne(query)
.populate(... |
<<<<<<<
Share: require('./share'),
Tracking: require('./tracking'),
ShareAccess: require('./shareAccess'),
}
=======
Activity: require('./activity'),
Notification: require('./notification'),
NotificationStatus: require('./notificationStatus'),
};
>>>>>>>
Share: require('./share'),
Tracking: require('... |
<<<<<<<
bundled: ['jquery', 'bootstrap-sass', 'inline-attachment/src/inline-attachment.js', 'jquery.cookie', 'jquery.selection.js', '@babel/polyfill'],
=======
bundled: [
'jquery',
'bootstrap/dist/js/bootstrap.bundle.min.js',
'inline-attachment/src/inline-attachment.js',
'jquery.cookie... |
<<<<<<<
var multer = require('multer')
var uploads = multer({ dest: crowi.tmpDir + 'uploads' })
var form = require('../form')
var page = require('./page')(crowi, app)
var login = require('./login')(crowi, app)
var logout = require('./logout')(crowi, app)
var me = require('./me')(crowi, app)
var admin = ... |
<<<<<<<
/**
* Bulk get (for internal only)
*/
pageSchema.statics.getStreamOfFindAll = function(options) {
var Page = this
, options = options || {}
, publicOnly = options.publicOnly || true
, criteria = {redirectTo: null,}
;
if (publicOnly) {
criteria.grant = GRANT_PUBLI... |
<<<<<<<
const DEFAULT_THEME = 'substrate';
=======
const ENV = process.env.NODE_ENV || 'development';
>>>>>>>
const DEFAULT_THEME = 'substrate';
const ENV = process.env.NODE_ENV || 'development'; |
<<<<<<<
this.collectStatsStartTime = Date.now();
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), this.encoderSetupTime_.bind(this), 100);
setTimeoutWithProgressBar(function() {
=======
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), 1000);
setTimeoutWithProgressBar(function() {... |
<<<<<<<
var endTime = null;
var webSocket;
=======
var signalingReady = false;
var socket;
var started = false;
>>>>>>>
var webSocket;
<<<<<<<
=======
var prevStats;
var turnDone = false;
var xmlhttp;
>>>>>>>
var prevStats; |
<<<<<<<
}
// Start shims for fullscreen
document.cancelFullScreen = document.webkitCancelFullScreen ||
document.mozCancelFullScreen || document.cancelFullScreen;
document.body.requestFullScreen = document.body.webkitRequestFullScreen ||
document.body.mozRequestFullScreen || document.body.requestFullScreen;
document... |
<<<<<<<
const {direction, width, height, wrapAfter} = options
=======
const {direction, width, height, scale = 1} = options
>>>>>>>
const {direction, width, height, wrapAfter, scale = 1} = options
<<<<<<<
let row, col
if (typeof wrapAfter === 'undefined') {
row = isHorizontal ? 0 : frame
... |
<<<<<<<
/*
* Copyright (c) 2017 American Express Travel Related Services Company, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*... |
<<<<<<<
$('#pixel-viewer-interactive-show-pixel-fill').change(function() {
scroller.finishPullToRefresh();
});
=======
// Caches data about the image
function init_cache(width, height){
piccache = Array()
ctx = source_canvas.getContext('2d');
for (var col = 0; col<width; col++){
next_col = Array(height)
pi... |
<<<<<<<
import { GL, WEBGL_INFO } from "./constants";
import { Query } from "./query";
=======
import { GL } from "./constants.js";
import { Query } from "./query.js";
>>>>>>>
import { GL, WEBGL_INFO } from "./constants.js";
import { Query } from "./query.js"; |
<<<<<<<
import { GL, WEBGL_INFO } from "./constants";
import { Shader } from "./shader";
import {
=======
import { GL } from "./constants.js";
import { Shader } from "./shader.js";
import {
>>>>>>>
import { GL, WEBGL_INFO } from "./constants.js";
import { Shader } from "./shader.js";
import { |
<<<<<<<
const allTags = [...totalAgg.archs, ...db.archetypes.map(arch => arch.name)];
=======
const totalAgg = getLocalState().totalAgg;
const allTags = [
...totalAgg.archs.filter(arch => arch !== NO_ARCH && arch !== DEFAULT_ARCH),
...db.archetypes.map(arch => arch.name)
];
>>>>>>>
const allTags = ... |
<<<<<<<
import Aggregator from "./aggregator";
import FilterPanel from "./FilterPanel";
=======
import Aggregator, { dateMaxValid } from "./aggregator";
import FilterPanel from "./filter-panel";
>>>>>>>
import Aggregator, { dateMaxValid } from "./aggregator";
import FilterPanel from "./FilterPanel"; |
<<<<<<<
function changePriority(previous, current, time) {
globals.currentMatch.priorityTimers[previous] +=
time - globals.currentMatch.lastPriorityChangeTime;
globals.currentMatch.lastPriorityChangeTime = time;
globals.currentMatch.priorityTimers[0] =
globals.currentMatch.lastPriorityChangeTime;
glob... |
<<<<<<<
ipc.on("player_data_updated", () => {
if (sidebarActive !== MAIN_LOGIN) {
updateTopBar();
}
});
//
=======
>>>>>>> |
<<<<<<<
=======
div.appendTo(wrap_r);
$("#ux_0").append(wrap_l);
$("#ux_0").append(wrap_r);
$(".ss" + openSection).show();
$(".sn" + openSection).addClass("nav_selected");
$(".resetOverlayPos").click(function() {
ipcSend("reset_overlay_pos", true);
});
$(".top_logo_about").click(function() {
... |
<<<<<<<
=======
const DATE_LAST_30 = "Last 30 Days";
const DATE_SEASON = "Current Season";
const DATE_ALL_TIME = "All Time";
const NO_ARCH = "No Archetype";
>>>>>>>
const NO_ARCH = "No Archetype";
<<<<<<<
=======
Aggregator.DATE_LAST_30 = DATE_LAST_30;
Aggregator.DATE_SEASON = DATE_SEASON;
Aggregator.DATE_ALL_TI... |
<<<<<<<
it('should update styling', function() {
expect(this.typeaheadView.$node).toHaveCss({ direction: 'rtl' });
expect(this.dropdownView.setLanguageDirection)
.toHaveBeenCalledWith('rtl');
=======
it('should update language class name', function() {
expect(this.typeahead... |
<<<<<<<
// release tasks
// 1. grunt build
// 2. grunt bump
// 3. grunt component
// 4. grunt publish_assets
var jsFiles = [
'src/version.js',
'src/utils.js',
'src/event_target.js',
'src/persistent_storage.js',
'src/request_cache.js',
'src/transport.js',
'src/dataset.js',
... |
<<<<<<<
describe('#destroy', function() {
beforeEach(function() {
this.dropdownView.destroy();
});
it('should remove event listeners', function() {
expect($._data(this.$menu, 'events')).toBeUndefined();
});
it('should drop references to DOM elements', function() {
expect(this.d... |
<<<<<<<
deviceMockingHooks.sendMetadata(this._mediaPlayer, 0, { start: 0, end: 100 });
assertTrue(stubCreateElementResults.video.play.called);
=======
deviceMockingHooks.sendMetadata(this.mediaPlayer, 0, { start: 0, end: 100 });
assert(stubCreateElementResults.video.pla... |
<<<<<<<
grunt.loadNpmTasks('grunt-contrib-jasmine');
grunt.registerTask("hint", ["jshint"]);
grunt.registerTask("test", ["jasmine"]);
grunt.registerTask("full", ["jshint", "jasmine"]);
grunt.registerTask("spec", ["jasmine:src:build", "openspec"]);
grunt.registerTask("openspec", "Open the gene... |
<<<<<<<
mixins.testSeekableIsNotUsedUntilMetadataIsSet = function(queue) {
expectAsserts(2);
var self = this;
runMediaPlayerTest(this, queue, function (MediaPlayer) {
self._mediaPlayer.setSource(MediaPlayer.TYPE.VIDEO, 'http://testurl/', 'video/mp4');
self._mediaPlaye... |
<<<<<<<
=======
this._sentinelLimits.pause.currentAttemptCount = 0;
>>>>>>> |
<<<<<<<
=======
// change selected webserver on "webserver" tab change
$('.webserver-configuration a[data-toggle="tab"]').on('shown', function (e) {
var selectedWebserver = e.target.getAttribute('rel');
$('input[name="webserver"]').attr('value', selectedWebserver);
});
// change sele... |
<<<<<<<
async: zk.ie //conservative, though it shall be (!zk.safari || zk.ff >= 4)
}, zAu.ajaxSettings), null, true/*fixed IE memory issue for jQuery 1.6.x*/);
=======
async: !!zk.ie // (!!) coerce to boolean, undefined will be wrong for safari and chrome.
// conservative, though it shall be (!zk.safari ... |
<<<<<<<
_initDefault = _portrait[window.orientation], //default orientation
_aftAuResp = []; //store callbacks to be triggered when au is back
=======
_initDefault = _portrait[window.orientation]; //default orientation
_aftAuResp = []; //store callbacks to be triggered when au is back
>>>>>>>
_initDefault ... |
<<<<<<<
_onVisibilityChange: function () { //Called by mount.js when page visibility changed
if (zk.visibilitychange) zAu.cmd0.visibilityChange();
},
=======
//Bug ZK-1596: native will be transfer to stub in EE, store the widget for used in mount.js
_storeStub: function (wgt) {
if (wgt)
_detached.push(wgt... |
<<<<<<<
.replace(/EmmanuelMacron/gi, 'Manu')
=======
.replace(/M\. Macron/gi, 'Manu')
.replace(/Président Macron/gi, 'Manu')
.replace(/Emmanuel et Brigitte Macron/gi, 'Manu et Brigitte')
>>>>>>>
.replace(/EmmanuelMacron/gi, 'Manu')
.replace(/M\. Macron/gi, 'Manu')
.replace(/Président Macr... |
<<<<<<<
getIconClass_: function () {
return 'z-icon-caret-down';
},
=======
onChildAdded_: function (child) {
this.$supers('onChildAdded_', arguments);
this._shallSyncPopupPosition = true; // Bug ZK-2409
},
>>>>>>>
getIconClass_: function () {
return 'z-icon-caret-down';
},
onChildAdded_: function (ch... |
<<<<<<<
var msg = _exmsg(e);
errCode = "[Receive] " + msg;
//if (e.fileName) errCode += ", "+e.fileName;
//if (e.lineNumber) errCode += ", "+e.lineNumber;
=======
var msg = e.message;
_errCode = "[Receive] " + msg;
//if (e.fileName) _errCode += ", "+e.fileName;
//if (e.lineNumber) _err... |
<<<<<<<
var NEWFOLDER = '%s/createItem/?name=%s&mode=%s&Submit=OK';
var DELETE = '%s/job/%s/doDelete';
var BUILD = '%s/job/%s/build' + API;
var STOP_BUILD = '%s/job/%s/%s/stop' + API;
var BUILD_INFO = '%s/job/%s/%s' + API;
var DISABLE = '%s/job/%s/disable';
var ENABLE = '%s/job/%s/enable';
var BUILDWITHPARAMS = '%s/job... |
<<<<<<<
if (!zk.mobile)
zk(cb.getInputNode()).focus();
=======
if (!zk.ios) // prevent ios native keyboard showed
zk(cb.getInputNode()).focus();
>>>>>>>
if (!zk.mobile) // prevent ios native keyboard showed
zk(cb.getInputNode()).focus(); |
<<<<<<<
},
getCollapseOpenIconClass_: function () {
return 'z-icon-caret-up';
},
getCollapseCloseIconClass_: function () {
return 'z-icon-caret-down';
},
getClosableIconClass_: function () {
return 'z-icon-times';
},
getMaximizableIconClass_: function () {
return 'z-icon-resize-full';
},
getMaximizedI... |
<<<<<<<
if (zkie || zk.edge || zk.safari) {
// ZK_3789: refine ZK-3695, fire down onRestore after the wrapper was removed
zWatch.fireDown('onRestore', wgt);
if (zkie == 10) zk(self.jq[0]).redoCSS();
}
=======
// ZK_3789: refine ZK-3695, fire down onRestore after the wrapper was removed
... |
<<<<<<<
QUEUE = '%s/queue' + API;
COMPUTERS = '%s/computer' + API;
=======
JOB_OUTPUT = '%s/job/%s/consoleText' + API;
>>>>>>>
QUEUE = '%s/queue' + API;
COMPUTERS = '%s/computer' + API;
JOB_OUTPUT = '%s/job/%s/consoleText' + API;
<<<<<<<
queue: function(callback) {
/*
Get all queue... |
<<<<<<<
_doScroll: function (n) {
var p = this.parent, num;
if (p._nativebar)
num = Math.ceil(this.$n('scrollX').scrollLeft / 50);
else
num = Math.ceil(n);
=======
bind_: function () {
this.$supers(zul.mesh.Frozen, 'bind_', arguments);
zWatch.listen({onSize: this, beforeSize: this});
var scroll = ... |
<<<<<<<
var LAST_SUCCESS = '%s/job/%s/lastSuccessfulBuild' + API + '%s';
var TEST_REPORT = '%s/job/%s/lastSuccessfulBuild/testReport' + API + '%s';
var LAST_BUILD = '%s/job/%s/lastBuild' + API + '%s';
var LAST_COMPLETED_BUILD = '%s/job/%s/lastCompletedBuild' + API + '%s';
var LAST_REPORT = '%s/job/%s/lastBuild' + API +... |
<<<<<<<
node.style.width = pn.clientWidth + 'px'; //all wd the same
=======
//Note: when the browser resizes, it might adjust splitter's wd/hgh
//Note: the real wd/hgh might be bigger than 8px (since the width
//of total content is smaller than pn's width)
//We 'cheat' by align to top or bottom de... |
<<<<<<<
hdcol = hdfaker.firstChild,
var ftcol = ftfaker ? ftfaker.firstChild : null,
=======
hdcol = hdfaker.firstChild;
var ftcol = ftfaker ? ftfaker.firstChild : null,
>>>>>>>
var ftcol = ftfaker ? ftfaker.firstChild : null, |
<<<<<<<
else if (!zk.mobile)
zk(db.getInputNode()).focus();
=======
else
if (!zk.ios) // prevent ios native keyboard showed
zk(db.getInputNode()).focus();
>>>>>>>
else if (!zk.mobile) // prevent ios native keyboard showed
zk(db.getInputNode()).focus(); |
<<<<<<<
if (this._shadow) this._shadow.hide();
pp.style.display = 'none';
pp.className = db.$s('popup');
=======
if (this._shadow) {
// B65-ZK-1904: Make shadow behavior the same as ComboWidget
this._shadow.destroy();
this._shadow = null;
}
var zcls = db.getZclass();
pp.style.display = "none";... |
<<<<<<<
)))
.add('Warning', withInfo()(() => (
<Snackbar status='warning' onDismiss={action('Dismissed')}>Yer suspended</Snackbar>
=======
)))
.add('Large', withInfo()(() => (
<Snackbar maxWidth={700}>This one is large enough to get into some bacon ipsum dolor amet pork loin tri-tip turkey capicola.... |
<<<<<<<
=======
<div className="links">
<a
href="https://github.com/zeit/use-swr"
target="_blank"
rel="noopener noreferrer"
>
<GitHub />
</a>
</div>
>>>>>>>
<div className="links">
<a
href="h... |
<<<<<<<
=======
template.pageTransitioningOut = true;
template.fullscreenVideoActive = false;
>>>>>>>
template.fullscreenVideoActive = false; |
<<<<<<<
resizeRipple(ripple);
=======
>>>>>>>
resizeRipple(ripple);
<<<<<<<
var footer = document.querySelector('footer');
var i18n = document.createElement('io-i18n');
i18n.msgid = 'home';
=======
var i18n = document.createElement('i18n-msg');
>>>>>>>
var footer = document.querySel... |
<<<<<<<
"issue342.svg": "Issue #342: text gradient",
=======
"issue620.svg": "Issue #620: em font size",
"issue320.svg": "Issue #320: rem font size",
>>>>>>>
"issue342.svg": "Issue #342: text gradient",
"issue620.svg": "Issue #620: em font size",
"issue320.svg": "Issue #320: rem font size", |
<<<<<<<
if (typeof(CanvasRenderingContext2D) != 'undefined') {
CanvasRenderingContext2D.prototype.drawSvg = function(s, dx, dy, dw, dh, opts) {
var cOpts = {
=======
if (typeof CanvasRenderingContext2D != 'undefined') {
CanvasRenderingContext2D.prototype.drawSvg = function(s, dx, dy, dw, dh) {
canvg(this.... |
<<<<<<<
import week13 from './race-times/week13';
import special from './race-times/special';
=======
// import week13 from './race-times/week13';
>>>>>>>
// import week13 from './race-times/week13';
import special from './race-times/special';
<<<<<<<
...week13,
...special,
=======
// ...week13,
>>>>>>>
... |
<<<<<<<
// whether to use fullscreen flag dropdown for mobile useragents
useMobileFullscreenDropdown: true,
=======
autoComplete: 'off',
>>>>>>>
// whether to use fullscreen flag dropdown for mobile useragents
useMobileFullscreenDropdown: true,
autoComplete: 'off', |
<<<<<<<
=======
$(".ia-single--screenshots").addClass("hide");
$(".ia-single--left").removeClass("ia-single--left").addClass("ia-single--left--wide");
$(".dev_milestone-container__body").removeClass("hide");
... |
<<<<<<<
},
{
name: 'Data Structures',
instructor: 'freeCodeCamp',
url: 'https://www.youtube.com/watch?v=RBSGKlAvoiM&ab_channel=freeCodeCamp.org',
description: 'Data Structures Easy to Advanced Course. This course teaches data structures to beginners using high quality animations to represent the dat... |
<<<<<<<
{
name:"Learn C++",
instructor: "Alex",
url:"https://www.learncpp.com/",
description:"LearnCpp.com is a free website devoted to teaching you how to program in C++.",
image: "",
tags:["C++"]
},
=======
{
name: "Flutter Tutorial",
instructor: "MTECHVIRAL",
url: "https:/... |
<<<<<<<
},
{
name:'Ethical Hacking using Python',
instructor: 'Alexis Ahmed',
url:'https://www.mindsmapped.com/courses/python-for-ethical-hacking-beginners-to-advanced-level/',
description:'Ethical Hacking is the process of identifying potential threats and vulnerabilities on a computer or network through advan... |
<<<<<<<
{
name: "Python Tutorial for Beginners",
instructor: "Codewithharry",
url:
"https://www.youtube.com/playlist?list=PLu0W_9lII9ajLcqRcj4PoEihkukF_OTzA",
description:
"This is python tutorial for beginners in hindi",
image: "",
tags: ["Python", "Hindi"],
},
=======
{
... |
<<<<<<<
name: "Laravel PHP Framework Tutorial - Full Course 6.5 Hours (2020)",
instructor: "Sarthak",
url:
"https://www.youtube.com/watch?v=BXiHvgrJfkg",
description:
"Learn Laravel PHP framework from very basics to advanced using Laravel Livewire by creating advanced todo list project in th... |
<<<<<<<
return Promise.resolve();
})
.then(function() {
return Page.checkIfTemplatesExist(originalPath);
})
.then(function(templateInfo) {
renderVars.localTemplateExists = templateInfo.localTemplateExists;
renderVars.globalTemplateExists = template... |
<<<<<<<
const ErrorV3 = require('../../models/vo/error-apiv3');
=======
const { body } = require('express-validator/check');
>>>>>>>
const ErrorV3 = require('../../models/vo/error-apiv3');
const { body } = require('express-validator/check'); |
<<<<<<<
import md5 from 'md5';
=======
import PropTypes from 'prop-types';
>>>>>>>
import md5 from 'md5';
import PropTypes from 'prop-types'; |
<<<<<<<
const currentUserElem = document.getElementById('growi-current-user');
if (currentUserElem != null) {
this.currentUser = JSON.parse(currentUserElem.textContent);
}
const isSharedPageElem = document.getElementById('is-shared-page');
this.isSharedUser = (isSharedPageElem != null);
===... |
<<<<<<<
/**
* Change restrictGuestMode
*/
changeRestrictGuestMode(restrictGuestModeLabel) {
this.setState({ currentRestrictGuestMode: restrictGuestModeLabel });
}
/**
* Change pageCompleteDeletionAuthority
*/
changePageCompleteDeletionAuthority(pageCompleteDeletionAuthorityLabel) {
this.s... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.