conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
/* jshint maxdepth:7*/
=======
// # can.compute
//
// `can.compute` allows creation of observable values
// from the result of a funciton. Any time an observable
// value that the function depends on changes, the
// function automatically updates. This enables creating
// observable data that relies o... |
<<<<<<<
} else if (range.clientX != null || range.pageX != null || range.left != null) {
this.rangeFromPoint(range)
} else if (range.originalEvent && range.originalEvent.touches && range.originalEvent.touches.length) {
this.rangeFromPoint(range.originalEvent.touches[0])
} else if (range.originalEvent && range.or... |
<<<<<<<
import { titleBarHeight } from "../../util/globals";
=======
import ToggleTangle from "./toggle-tangle";
>>>>>>>
import ToggleTangle from "./toggle-tangle";
import { titleBarHeight } from "../../util/globals"; |
<<<<<<<
// can.Y is set as part of the build process
// YUI().use('*') is called for when YUI is statically loaded (like when running tests)
=======
// yui.js
// ---------
// _YUI node list._
// `can.Y` is set as part of the build process.
// `YUI().use('*')` is called for when `YUI` is statically ... |
<<<<<<<
test(".model on create and update (#301)", function() {
var MyModel = can.Model({
create: 'POST /todo',
update: 'PUT /todo',
model: function(data) {
return can.Model.model.call(this, data.item);
}
}, {}),
id = 0,
updateTime;
can.fixture('POST /todo', function(original, respo... |
<<<<<<<
steal("can/model", "can/view/mustache", "can/test", function() {
module("can/view/mustache, rendering",{
setup : function(){
this.animals = ['sloth', 'bear', 'monkey']
if(!this.animals.each){
this.animals.each = function(func){
for(var i =0; i < this.length; i++){
func(this[i])
=======
/* j... |
<<<<<<<
test("Model#save should not replace attributes with their default values (#560)", function () {
can.fixture("POST /person.json", function (request, response) {
return {
createdAt: "now"
};
});
var Person = can.Model.extend({
update: 'POST /person.json'
}, {
name: 'Example name'
})... |
<<<<<<<
can.isDOM = function(el) {
return (el.ownerDocument || el) === can.global.document;
};
can.childNodes = function(node) {
var childNodes = node.childNodes;
if("length" in childNodes) {
return childNodes;
} else {
var cur = node.firstChild;
var nodes = [];
while(cur) {
nodes.push(cur)... |
<<<<<<<
// can.Y is set as part of the build process
// YUI().use('*') is called for when YUI is statically loaded (like when running tests)
=======
// yui.js
// ---------
// _YUI node list._
// `can.Y` is set as part of the build process.
// `YUI().use('*')` is called for when `YUI` is statically ... |
<<<<<<<
test("checkboxes with can-value bind properly (#628)", function() {
can.Component({
tag: 'checkbox-value',
template: '<input type="checkbox" can-value="completed"/>'
});
var data = new can.Map({ completed: true }),
frag = can.view.mustache("<checkbox-value></checkbox-value>")(data);
can.append( can.... |
<<<<<<<
// handle hookup cases
if(status === 0){ // we are in between html tags
// return a span with a hookup function ...
return "<" +(tagMap[tagName] || "span")+" data-view-id='" + $View.hookup(function(el){
// remove child, bind on parent
var parent = el.parentNode,
node = document... |
<<<<<<<
steal("can/view/bindings", "can/map", "can/test", function (special) {
QUnit.module('can/view/bindings', {
=======
steal("can/view/bindings", "can/map", "can/test", "can/view/stache", function (special) {
module('can/view/bindings', {
>>>>>>>
steal("can/view/bindings", "can/map", "can/test", "can/view/stac... |
<<<<<<<
steal(function(){
module("can/util/object");
test("same", function(){
ok( can.Object.same({type: "FOLDER"},{type: "FOLDER", count: 5}, {
count: null
}), "count ignored" );
ok(can.Object.same({type: "folder"},{type: "FOLDER"}, {
type: "i"
}), "folder case ignored" );
})
test("subsets", function(){
... |
<<<<<<<
test("to virtual dom output", function(){
can.noDOM = true;
var template = can.stache("<h1>{{#test}}<span>{{name}}</span>{{/test}}</h1>");
var res = template({
test: true,
name: "Hello"
});
deepEqual(res, [
{
tag: "h1",
children: [{
tag: "span",
children: ["Hello"]
... |
<<<<<<<
showDownload: false,
=======
quickdraw: false, // if true, components may skip expensive computes.
>>>>>>>
showDownload: false,
quickdraw: false, // if true, components may skip expensive computes. |
<<<<<<<
export const NODE_NOT_VISIBLE = 0;
export const NODE_VISIBLE_TO_MAP_ONLY = 1;
export const NODE_VISIBLE = 2;
export const UNDEFINED_VALUE = "undefined";
export const invalidValues = [UNDEFINED_VALUE, undefined, "unknown", "?", "nan", "na", "n/a"];
export const isValueValid = (value) =>
!invalidValues.include... |
<<<<<<<
const SEARCH_OPERATORS = [
'added',
'age',
=======
var SEARCH_OPERATORS = [
'added:',
'age:',
>>>>>>>
const SEARCH_OPERATORS = [
'added:',
'age:',
<<<<<<<
'has:unresolved',
'hashtag',
'intopic',
'is',
=======
'intopic:',
'is:',
>>>>>>>
'has:unreso... |
<<<<<<<
err.message + "\n" + err.stack + "\n...resuming...\n");
=======
err.message + "\n" +
err.stack + "\n" +
"...resuming...\n");
>>>>>>>
err.message + "\n" +
err.stack + "\n" +
"...resuming...\n");
<<<<<<<
Trapezoid: function (state, container, buf) { return (this.polyg... |
<<<<<<<
if (json.maintainers) {
metadata.maintainers = json.maintainers;
}
if (json.author_info) {
metadata.authorInfo = json.author_info;
}
=======
metadata.maintainers = json.maintainers;
>>>>>>>
if (json.maintainers) {
metadata.maintainers = json.maintainers;
} |
<<<<<<<
import "../../css/mapbox.css";
=======
import ErrorBoundary from "../../util/errorBoundry";
import Legend from "../tree/legend/legend";
>>>>>>>
import ErrorBoundary from "../../util/errorBoundry";
import Legend from "../tree/legend/legend";
import "../../css/mapbox.css";
<<<<<<<
<Card center title={tr... |
<<<<<<<
* Prevents sprite from becoming invisible out of frame and losing mouse input connection.
*
* @property dragMode
* @type Boolean
* @default false
* @since 0.8.3
*/
tint: 0xFFFFFF,
/**
... |
<<<<<<<
const newState = {};
newState.tree = new PhyloTree(this.props.tree.nodes, "LEFT");
renderTree(this, true, newState.tree, this.props);
this.Viewer.fitToViewer();
=======
const tree = new PhyloTree(this.props.tree.nodes, "LEFT");
renderTree(this, true, tree, this.props);
... |
<<<<<<<
var dimensions = {};
var dt = {};
var parameters = {};
var size = {};
var screen = {};
=======
>>>>>>>
<<<<<<<
var movefunct={};
var canv ={};
var position = {};
var previous = {};
=======
>>>>>>>
<<<<<<<
function loop (i, delay, funct) {
setTimeout(function () {
//console.log(dt);
ev... |
<<<<<<<
const invalidScopeDisables = require("../invalidScopeDisables");
const path = require("path");
const replaceBackslashes = require("./replaceBackslashes");
const standalone = require("../standalone");
const stripIndent = require("common-tags").stripIndent;
=======
const invalidScopeDisables = require('../inval... |
<<<<<<<
"use strict";
const hash = require("../utils/hash");
const path = require("path");
const standalone = require("../standalone");
const fixturesPath = path.join(__dirname, "fixtures");
const cpFile = require("cp-file");
const fileExists = require("file-exists-promise");
const fs = require("fs");
const replaceBac... |
<<<<<<<
"use strict";
const _ = require("lodash");
const cpFile = require("cp-file");
const del = require("del");
const fs = require("fs");
const os = require("os");
const path = require("path");
const stylelint = require("../../lib");
const systemTestUtils = require("../systemTestUtils");
const { promisify } = requir... |
<<<<<<<
return replaceBackslashes(path.join(__dirname, caseNumber, fileName));
=======
return path.join(__dirname, caseNumber, fileName);
>>>>>>>
return replaceBackslashes(path.join(__dirname, caseNumber, fileName));
<<<<<<<
caseFilePath,
replaceBackslashes,
caseStylesheetGlob,
caseConfig,
prepResults... |
<<<<<<<
const watchers = {};
const bsConfig = utils.defaultsDeep(this._config.syncOptions || {}, {
=======
const bsConfig = _.defaultsDeep(this._config.syncOptions || {}, {
>>>>>>>
const bsConfig = utils.defaultsDeep(this._config.syncOptions || {}, { |
<<<<<<<
import { Home } from "./pages/Home";
import { NeedHelp } from "./pages/NeedHelp";
import { OfferHelp } from "./pages/OfferHelp";
import { About } from "./pages/About";
import { Medical } from "./pages/Medical";
import { SymptomsCheck } from "./pages/SymptomsCheck";
import { TermsConditions } from "./pages/Terms... |
<<<<<<<
import { theme } from "../constants/theme";
const { colors } = theme;
const { typography } = theme;
const Title = styled.h1`
align-items: center;
display: flex;
font-size: 2.2rem;
font-weight: bold;
height: 5rem;
justify-content: center;
`;
=======
// ICONS
import SvgIcon from "../components/Ico... |
<<<<<<<
export const CHANGE_ANALYSIS_VALUE = "CHANGE_ANALYSIS_VALUE";
export const CHANGE_ANIMATION_START = "CHANGE_ANIMATION_START";
export const CHANGE_ANIMATION_TIME = "CHANGE_ANIMATION_TIME";
export const CHANGE_ANIMATION_CUMULATIVE = "CHANGE_ANIMATION_CUMULATIVE";
export const DATA_VALID = "DATA_VALID";
export con... |
<<<<<<<
const StyledWelcome = styled.h2`
font-family: ${theme.typography.font.family.display}, sans-serif;
font-size: ${theme.typography.size.large};
font-style: normal;
font-weight: 300;
line-height: 3rem;
margin: 2.5rem auto 0;
text-align: center;
@media only screen and (min-width: 600px) {
fon... |
<<<<<<<
import CreateOrganizationProfile from "./pages/CreateOrganizationProfile";
import OrgProfileComplete from "./pages/OrgProfileComplete";
=======
import CreateOrganizationProfile from "./pages/CreateOrganizationProfile";
import EditOrganizationProfile from "./pages/EditOrganizationProfile";
import EditOrganizat... |
<<<<<<<
const renderFeedSocialIcons = (
<>
<div className="social-icon" onClick={() => handlePostLike(id, liked, true)}>
{renderLikeIcon()}
<span className="total-number">{numLikes}</span>
<span className="social-text">Like</span>
</div>
<span></span>
<div className... |
<<<<<<<
<NavList>
{isAuthenticated ? (
<>
<NavItem>
<Link to="/profile">Profile</Link>
</NavItem>
</>
) : (
<>
<NavItem history={history} link="/auth/login">
Login / Register
</NavItem>
... |
<<<<<<<
=======
import GTM from "constants/gtm-tags";
>>>>>>>
<<<<<<<
import { Menu, Dropdown } from "antd";
=======
>>>>>>>
import { Menu, Dropdown } from "antd";
import GTM from "constants/gtm-tags";
<<<<<<<
<li className="feedbackBtn">
<button onClick={onFeedbackIconClick}>
... |
<<<<<<<
export const ERROR_POSTS = "ERROR_POSTS";
export const NEXT_PAGE = "NEXT_PAGE";
=======
export const ERROR_POSTS = "ERROR_POSTS";
export const SET_LIKE = "SET_LIKE";
>>>>>>>
export const ERROR_POSTS = "ERROR_POSTS";
export const NEXT_PAGE = "NEXT_PAGE";
export const SET_LIKE = "SET_LIKE"; |
<<<<<<<
export const MANIFEST_RECEIVED = "MANIFEST_RECEIVED";
export const CHANGE_TREE_ROOT_IDX = "CHANGE_TREE_ROOT_IDX";
=======
export const MANIFEST_RECEIVED = "MANIFEST_RECEIVED";
export const POSTS_MANIFEST_RECEIVED = "POSTS_MANIFEST_RECEIVED";
>>>>>>>
export const MANIFEST_RECEIVED = "MANIFEST_RECEIVED";
expor... |
<<<<<<<
import axios from "axios";
import { Toast } from "antd-mobile";
import { GET_ERRORS } from "./types";
import { AUTH_LOGIN, AUTH_SIGNUP } from "constants/action-types";
import { setAuthToken, getAuthToken } from "utils/auth-token";
=======
import { AUTH_SUCCESS } from "constants/action-types";
import { getAut... |
<<<<<<<
const { userId } = req.query;
let user;
let userErr;
=======
// TODO: handle optional user if authenticated
const { userId } = req;
let user;
let userErr;
>>>>>>>
const { userId } = req;
let user;
let userErr;
<<<<<<<
: [{ $match: { $and: f... |
<<<<<<<
'onModeChange', 'onChangeTimeout', 'onChangeSuggestionDelay'
=======
'onModeChange', 'onChangeTimeout', 'onToggleShiftEnter'
>>>>>>>
'onModeChange', 'onChangeTimeout', 'onChangeSuggestionDelay', 'onToggleShiftEnter'
<<<<<<<
onChangeSuggestionDelay(e) {
ReplPreferencesStore.onSetSugge... |
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<... |
<<<<<<<
["nodemon", "npm:2.0.5"],
["react", "npm:17.0.1"],
["react-dom", "virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:17.0.1"],
=======
["nodemon", "npm:2.0.6"],
... |
<<<<<<<
metadata: state.metadata,
=======
totalStateCounts: state.tree.totalStateCounts,
metadata: state.metadata.metadata,
>>>>>>>
totalStateCounts: state.tree.totalStateCounts,
metadata: state.metadata, |
<<<<<<<
["virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:5.1.3", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-9b985c5e80/0/cache/webpack-npm-5.1.3-ee81460ee2-4c741af383.zip/node_modules/webpack/",
... |
<<<<<<<
["react-markdown", "virtual:65bbdbc833194d48af8b473ccb9eb396af4cb12a8148bcea865208cb4df1306b9afb0a62408cbd348e6f2af9b92764096868c744881c07da8a59708a1c9cb4f4#npm:4.3.1"],
["react-syntax-highlighter", "virtual:65bbdbc833194d48af8b473ccb9eb396af4cb12a8148bcea865208cb4df1306b9afb0a62408cbd34... |
<<<<<<<
["terser", "npm:5.3.3"],
["webpack", "virtual:e7dd2bdbec1b3ec399e5f3318d0a58728583b58181f43cb8f4f372a1b2b9707e2ffcf76bd80aad3c5c64a731754028a8070020628ca4fa0a02fe260c179762ae#npm:5.0.0-rc.3"],
=======
["terser", "npm:5.3.4"],
["webpack", "virtual:169dbf4f150c70e... |
<<<<<<<
$("input[data-control]").trigger("change");
=======
$("#bookDetailsModal")
.on("show.bs.modal", function(e) {
const $modalBody = $(this).find(".modal-body");
// Prevent static assets from loading multiple times
const useCache = (options) => {
... |
<<<<<<<
MenuManager,
initializePackageManager,
=======
createMenuManager,
PackageManager,
>>>>>>>
initializePackageManager,
createMenuManager,
<<<<<<<
class DesktopApplication {
constructor() {
app.setName(AppName);
this.platform = determinePlatform(process.platform);
this.isMac = this.pla... |
<<<<<<<
import trLocaleData from '../public/static/lang/tr.json';
=======
import zhcnLocaleData from '../public/static/lang/zh_cn.json';
>>>>>>>
import trLocaleData from '../public/static/lang/tr.json';
import zhcnLocaleData from '../public/static/lang/zh_cn.json';
<<<<<<<
uk: new i18n.Tools({ localeData: ukL... |
<<<<<<<
);
// console.log(transformedToString);
// console.log(tables.primaryKeys);
// let transformedToString = transform(tables);
fs.writeFileSync(
path.join(PATH, `mutationZip.js`),
mutationResolver(frontEndVersion, tables)
);
=======
);
// console.log(transformedToString);
// conso... |
<<<<<<<
import { filterAbbrRev, filterAbbrFwd } from "../../util/globals";
import { modifyURLquery } from "../../util/urlHelpers";
=======
import { filterAbbrRev, filterAbbrFwd, controlsWidth } from "../../util/globals";
>>>>>>>
import { filterAbbrRev, filterAbbrFwd, controlsWidth } from "../../util/globals";
impor... |
<<<<<<<
import { changeColorBy } from "../../actions/colors";
import { modifyURLquery } from "../../util/urlHelpers";
=======
import { changeColorBy } from "../../actions/controls";
import { dataFont, darkGrey } from "../../globalStyles";
>>>>>>>
import { changeColorBy } from "../../actions/colors";
import { modifyU... |
<<<<<<<
assert.emits(client, 'drain', function() {
client.end();
});
client.query("");
});
=======
var query = client.query("");
assert.emits(query, 'end');
client.on('drain', client.end.bind(client));
});
test('callback supported', assert.calls(function() {
client.query("", function(err, result) {... |
<<<<<<<
//creates datarow metatdata from the supplied
//data row information
var buildDataRowMetadata = function(msg, converters, names) {
var parsers = {
text: new TextParser(),
binary: new BinaryParser()
};
=======
//associates row metadata from the supplied
//message with this query object
//metadata ... |
<<<<<<<
super()
this._recipient = (config.recipient) ? new Recipient(config.recipient) : new Recipient()
this._emitter = (config.emitter) ? new Emitter(config.emitter) : new Emitter()
this._total_exc_taxes = 0
this._total_taxes = 0
this._total_inc_taxes = 0
this._article = []
this._i18nC... |
<<<<<<<
// Get api backend Id from the context
var backendId = (this.apiBackend) ? this.apiBackend._id : this._id;
=======
//Store api id being clicked
var backendId = this.apiBackend._id;
>>>>>>>
//Store api id being clicked
var backendId = this.apiBackend._id;
<<<<<<<
// Get current... |
<<<<<<<
}
=======
},
// Create API key & attach it for given user,
// Might throw errors, catch on client callback
createApiKeyForCurrentUser () {
// Get logged in user
const currentUser = Meteor.user();
// Check currentUser exists
if (currentUser) {
// Check apiUmbrellaWeb global obje... |
<<<<<<<
export const fastTransitionDuration = 300; // in milliseconds
export const mediumTransitionDuration = 600; // in milliseconds
export const slowTransitionDuration = 1200; // in milliseconds
export const mapAnimationDurationInMilliseconds = 5000;
=======
export const fastTransitionDuration = 350; // in millise... |
<<<<<<<
import fileNameEndsWith from '/core/helper_functions/file_name_ends_with';
=======
import DocumentationFiles from '/documentation/collection';
import { fileNameEndsWith } from '/core/helper_functions/file_name_ends_with';
>>>>>>>
import fileNameEndsWith from '/core/helper_functions/file_name_ends_with';
impo... |
<<<<<<<
import { Settings } from '/settings/collection';
import Proxies from '/proxies/collection';
=======
import Settings from '/settings/collection';
import { Proxies } from '/proxies/collection';
>>>>>>>
import Settings from '/settings/collection';
import Proxies from '/proxies/collection'; |
<<<<<<<
import { ReactiveVar } from 'meteor/reactive-var';
=======
import { ApiBackends } from '/apis/collection/backend';
>>>>>>>
import { ReactiveVar } from 'meteor/reactive-var';
import { ApiBackends } from '/apis/collection/backend'; |
<<<<<<<
instance.autorun(() => {
if (instance.subscriptionsReady()) {
// Update reactive vatiable with proxies cursor when subscription is ready
instance.proxies.set(Proxies.find());
// Get proxies count
const proxiesCount = Proxies.find().count();
// Set button disabled if at lea... |
<<<<<<<
// On default don't display editor
instance.displayEditor = new ReactiveVar(false);
=======
instance.documentationExists = new ReactiveVar();
>>>>>>>
// On default don't display editor
instance.displayEditor = new ReactiveVar(false);
instance.documentationExists = new ReactiveVar();
<<<<<<<
... |
<<<<<<<
import { Proxies } from '/proxies/collection';
import ProxyBackends from '/proxy_backends/collection';
=======
import Proxies from '/proxies/collection';
import { ProxyBackends } from '/proxy_backends/collection';
>>>>>>>
import Proxies from '/proxies/collection';
import ProxyBackends from '/proxy_backends/c... |
<<<<<<<
Meteor.publish('allApiBackends', function () {
// Check if the user is signed in
if (this.userId) {
// Return all API Backends
return Apis.find();
}
// Return nothing
return null;
});
Meteor.publish('userManagedApis', function () {
=======
Meteor.publish('myManagedApis', function () {
>>>... |
<<<<<<<
});
Meteor.publish('organizationApisCount', function (organizationId) {
// Make sure 'organizationId' is a String
check(organizationId, String);
// Publish count of organization apis
const organizationApisCount = OrganizationApis.find({ organizationId });
// Publish an Api Counter for each Organizati... |
<<<<<<<
redirect: '/apis',
=======
layoutRegions: {
bar: 'navbar',
},
>>>>>>>
redirect: '/apis',
layoutRegions: {
bar: 'navbar',
},
<<<<<<<
redirect: '/apis',
=======
layoutRegions: {
bar: 'navbar',
},
>>>>>>>
redirect: '/apis',
layoutRegions: {
bar: 'navbar',
}, |
<<<<<<<
var renderProjects = function (tags, currentPageNumber, tagsString) {
=======
var renderProjects = function (tags, names) {
>>>>>>>
var renderProjects = function (tags, currentPageNumber, tagsString) {
var renderProjects = function (tags, names) {
<<<<<<<
"selectedTags": tags,
"curre... |
<<<<<<<
dispatch(server$traitNotify_Start(game, animal, traitCooperation, linkedAnimal));
dispatch(server$startFeeding(gameId, linkedAnimal.id, 1, 'GAME', animal.id));
=======
dispatch(server$traitNotify_Start(game, animal, traitCooperation, linkedAnimal.id));
dispatch(server$startFeed... |
<<<<<<<
return {
'en': 'translations/en.json',
'fr': 'translations/fr.json',
'id': 'translations/id.json'
};
=======
return {
'en': 'translations/en.json',
'id': 'translations/id.json',
'de': 'translations/de.json'
};
>>>>>>>
return {
'en': 'translati... |
<<<<<<<
autofix_dryrun: { type: "boolean" },
=======
debug: { type: "boolean" },
>>>>>>>
autofix_dryrun: { type: "boolean" },
debug: { type: "boolean" }, |
<<<<<<<
"long-lines": "warning",
=======
"no-constant": "warning",
"no-experimental": "warning",
>>>>>>>
"no-constant": "warning",
"no-experimental": "warning",
"long-lines": "warning", |
<<<<<<<
xhr.open("POST", this._options.action + queryString, true);
xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
xhr.send(file);
=======
xhr.open("POST", this._options.action + queryString, true);
xhr.setRequestHeader("X-File-Name", encodeURIComponent(name));
xhr.s... |
<<<<<<<
if (metadata.author_info) {
for (const author of Object.keys(metadata.author_info)) {
body.push([
prettyString(author, {camelCase: false}),
metadata.author_info[author].n,
prettyString(metadata.author_info[author].title, {removeComma: true}),
prettyString(metadata.aut... |
<<<<<<<
const styles = this.getStyles();
return (
<div style={styles.container}>
<button
key={1}
style={materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "rect" });
modifyURLquery(this.context.router, {l: "rect"}, true);
... |
<<<<<<<
if (opt.maxDays > 0 && countDays(time, opt.start) > opt.maxDays) return false;
if (opt.minDays > 0 && countDays(time, opt.start) < opt.minDays) return false;
=======
var time = opt.start;
var firstInvalid = 0, lastInvalid = 143403840000000; //a really large number
box.find('.day.toMonth.in... |
<<<<<<<
, os = require('os')
, async = require('async')
=======
, extend = require('extend')
>>>>>>>
, os = require('os')
, async = require('async')
, extend = require('extend')
<<<<<<<
=======
if (sock) {
this.sock = sock
} else {
this.sock = this._createSocket((typeof opts.reuseAddr === ... |
<<<<<<<
this.sock = this._createSocket((typeof opts.reuseAddr === 'undefined') ? true : opts.reuseAddr)
=======
this.sock = this._createSocket()
this.sock.unref()
>>>>>>>
this.sock = this._createSocket((typeof opts.reuseAddr === 'undefined') ? true : opts.reuseAddr)
this.sock.unref() |
<<<<<<<
loadTex:loadTex,
textureSize:textureSize,
=======
loadTexture:loadTexture,
>>>>>>>
textureSize:textureSize,
loadTexture:loadTexture, |
<<<<<<<
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClas... |
<<<<<<<
ranges: [],
roundRanges: [],
mostRecentRoundRanges: []
=======
ranges: [],
statuses: []
>>>>>>>
ranges: [],
roundRanges: [],
mostRecentRoundRanges: [],
statuses: []
<<<<<<<
$scope.acquiredOnCo... |
<<<<<<<
acquired_on: d3.time.format('%x')(randomDate(new Date(2000, 1, 1), new Date())), //Random date between two dates
=======
founded_on: d3.time.format('%x')(randomDate(14)),
>>>>>>>
acquired_on: d3.time.format('%x')(randomDate(new Date(2000, 1, 1), new Date())), //Random date... |
<<<<<<<
this.totalFunding = _.memoize(function(companies, allCompanies) {
if(typeof allCompanies === 'undefined' || typeof companies === 'undefined') { return; }
function abbreviateNumber(value) {
var newValue = value;
if (value >= 1000) {
var suffixes = ["",... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
if(ranges.length === 0) { return true; }
if(company_funding.length === 0) { return false; }
for(var i = 0; i < ranges.length; i++) {
var range = ranges[i];
for(var j = 0; j < company_funding.leng... |
<<<<<<<
*
* Swagger Codegen version: 2.3.0-SNAPSHOT
*
=======
>>>>>>>
<<<<<<<
(function(factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', ... |
<<<<<<<
import Toast from '../../../components/toast/index'
import DocsHeader from '../../components/doc-header'
=======
import AtToast from '../../../components/toast/index'
import AtButton from '../../../components/button/index'
>>>>>>>
import DocsHeader from '../../components/doc-header'
import AtToast from '../.... |
<<<<<<<
<AtButton onClick={this.leftDrawerClick.bind(this)}>显示 Drawer</AtButton>
{this.state.leftDrawerShow && <AtDrawer show={this.state.leftDrawerShow} mask onClose={this.onClose.bind(this)} items={['菜单1', '菜单2']}>
=======
<AtButton onClick={this.leftDrawerClick.bind(... |
<<<<<<<
'pages/view/steps/index',
=======
'pages/view/curtain/index',
>>>>>>>
'pages/view/steps/index',
'pages/view/curtain/index', |
<<<<<<<
// import AtModalActionButton from '../../../components/modal/action//index'
import DocsHeader from '../../components/doc-header'
=======
>>>>>>>
import DocsHeader from '../../components/doc-header'
<<<<<<<
<View className='example-item'>
<Button onClick={this.handleClick}>打开 ... |
<<<<<<<
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClas... |
<<<<<<<
'!' + path + '_site/**/*'
=======
path + '_config.yml',
'!' + path + '_site/**/*.*'
>>>>>>>
path + '_config.yml',
'!' + path + '_site/**/*' |
<<<<<<<
=======
browserify2: { // grunt-browserify2
dev: {
entry: './<%= project.path.client %>/js/index.js',
compile: '<%= project.path.temp %>/js/main.js',
debug: true,
beforeHook: function (bundle) {
bundle.transform(coffeeify);
bundle.transform(hbsfy)... |
<<<<<<<
/**
* @module EventObject
* @author lifesinger@gmail.com
*/
KISSY.add('event-object', function(S, undefined) {
var doc = document,
props = 'altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode lay... |
<<<<<<<
=======
if (1 > 2) {
utils.isEmpty();
}
>>>>>>> |
<<<<<<<
} else if ((symbol === Clutter.KEY_Down) ||
(symbol === Clutter.KEY_Tab) ||
((symbol === Clutter.n) && ctrl)) {
cursor = cursor + 1 < boxes.length ? cursor + 1 : 0;
updateHighlight(boxes);
} else if ((symbol === Clutter.KEY_Up) ||
((symbol === Clutter.ISO_Left_Tab) &... |
<<<<<<<
const box = new St.BoxLayout({style_class : 'switcher-box'});
=======
const box = new St.BoxLayout({style_class: 'switcher-box'});
>>>>>>>
const box = new St.BoxLayout({style_class: 'switcher-box'});
<<<<<<<
return {whole : box, shortcutBox : shortcutBox};
=======
return {whole: box, shortcut... |
<<<<<<<
var ModeUtils = (function () {
=======
var ModeUtils = (function() {
let gnomeControlCenter;
let mainApplicationName;
// get gnome control center instance
gnomeControlCenter = new controlCenter.GnomeControlCenter();
if (gnomeControlCenter.mainApplicationId != '') {
try {
mainApplicationN... |
<<<<<<<
import FormRow from '../FormRow';
const styles = StyleSheet.create({
=======
const styles = StyleSheet.create( {
>>>>>>>
import FormRow from '../FormRow';
const styles = StyleSheet.create( {
<<<<<<<
<FormRow label={ this.props.name }>
<TouchableOpacity onPress={() => this.onPressValue()}>
<Tex... |
<<<<<<<
_getDefaultScaleProps(props) {
const {innerWidth, innerHeight} = getInnerDimensions(props);
=======
_getScaleDefaults(props) {
const {innerWidth, innerHeight} = getInnerDimensions(
props,
DEFAULT_MARGINS
);
>>>>>>>
_getDefaultScaleProps(props) {
const {innerWidth, innerHeigh... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.