conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
const { ipcMain } = require('electron');
=======
const { protocol } = require('electron');
>>>>>>>
const { protocol } = require('electron');
const { ipcMain } = require('electron'); |
<<<<<<<
const staticFileGlobs = input.staticFileGlobs;
const globIgnores = input.globIgnores;
=======
const globPatterns = input.globPatterns;
const globIgnores = input.globIgnores ? input.globIgnores : [];
>>>>>>>
const staticFileGlobs = input.staticFileGlobs;
const globIgnores = input.globIgnores ? inp... |
<<<<<<<
// XXX: 设置监控的对象，域名在此之外的，会做客户端监控报告，但不发往服务器。
// .alipay.com
// .sit.alipay.net
domain: ".sit.alipay.net",
=======
checkProtocol: "https:" == location.protocol,
>>>>>>>
// XXX: 设置监控的对象，域名在此之外的，会做客户端监控报告，但不发往服务器。
// .alipay.com
// .sit.alipay.net
... |
<<<<<<<
loadFields,
NUMBER_TYPES
} from '@/lib/parser'
=======
loadFields
} from '../lib/parser'
>>>>>>>
loadFields,
NUMBER_TYPES
} from '../lib/parser' |
<<<<<<<
=======
const Todo = require('./todoModel');
>>>>>>>
<<<<<<<
todos(_, __, { client, req }) {
try {
// we have an incoming query
// we parse the query to find out what it is asking for:
// Case 1: if the incoming query is exactly same as a previous query, then return just fr... |
<<<<<<<
=======
//last element - current page
// @todo ugly solution - rework needed
>>>>>>>
// @todo ugly solution - rework needed |
<<<<<<<
'model/military/TacticalSymbol',
'model/weather/WeatherScout',
'model/util/WmtUtil',
=======
'model/util/WmtUtil',
>>>>>>>
'model/military/TacticalSymbol',
'model/util/WmtUtil',
<<<<<<<
TacticalSymbol,
WeatherScout,
util,
=======
util,
>>>>>>>
... |
<<<<<<<
'text!views/symbols.html',
'text!views/symbol-editor.html',
'text!views/weather.html',
=======
'text!views/weather-scouts.html',
>>>>>>>
'text!views/symbols.html',
'text!views/symbol-editor.html',
'text!views/weather-scouts.html',
<<<<<<<
symbolsHtml,
symbolEditor... |
<<<<<<<
store.currentBankId = null;
store.currentAccountId = null;
/*
{
'bankId': {
name: 'blabla',
accounts: {
'accountId1': {
name: 'something',
id: 'accountId1',
operations: [instanceof Operation]
},
'accountId2'... |
<<<<<<<
console.log('------------------------- CONNECTION');
console.log(user);
console.log('------------------------- CONNECTION');
if (!user) {
=======
if(!user) {
>>>>>>>
if (!user) {
<<<<<<<
socket.on('channel-join', function(params, callback) {
var err = serverUt... |
<<<<<<<
mongoPersister.registerUser(_param.app, _param.userId, _param.deviceType, _param.deviceId, _param.notiId, _param.datas,function (err, msg) {
=======
console.log(_param);
mongoPersister.registerUser(_param.app, _param.userId, _param.deviceType, _param.deviceId, _param.notiId, _param.datas, fun... |
<<<<<<<
=======
exports.ref = resolve; // XXX deprecated, use resolve
>>>>>>>
<<<<<<<
"apply": function (args) {
return object.apply(void 0, args);
},
=======
"apply": function (self, args) {
return object.apply(self, args);
},
"fapply": function (ar... |
<<<<<<<
=======
exports.ref = deprecate(resolve, "ref", "resolve"); // XXX deprecated, use resolve
>>>>>>>
<<<<<<<
}, function fallback(op, args) {
return dispatch(object, op, args);
=======
}, function fallback() {
var args = array_slice(arguments);
return send.apply(void 0, [obje... |
<<<<<<<
"apply", "call",
"all", "allResolved",
=======
"apply", "call", "bind",
"all",
>>>>>>>
"apply", "call", "bind",
"all", "allResolved",
<<<<<<<
var call = exports['try'] = exports.call = function (value, context) {
=======
exports.call = call;
function call(va... |
<<<<<<<
promise.promiseDispatch = function () {
var args = Array_slice(arguments);
=======
promise.promiseSend = function () {
var args = array_slice(arguments);
>>>>>>>
promise.promiseDispatch = function () {
var args = array_slice(arguments);
<<<<<<<
promise.promiseDispatch... |
<<<<<<<
const { getAccessKey, isLoggedIn, getDefaultOrgName, getTemplate } = require('./utils');
const { loadServerlessFile, fileExists, loadComponentConfig } = require('../utils');
=======
const { getAccessKey, isLoggedIn, getDefaultOrgName } = require('./utils');
const { fileExists, loadComponentConfig } = require(... |
<<<<<<<
console.log(os.EOL) // eslint-disable-line
let content = ` ${chalk.grey(this._.seconds + 's')}`
content += ` ${chalk.grey(figures.pointerSmall)} ${chalk.green(this._.stage)}`
content += ` ${chalk.grey(figures.pointerSmall)} ${this._.parentComponent}`
content += ` ${chalk.grey(figures.pointe... |
<<<<<<<
var recentCards = remote.getGlobal('recentCards');
=======
var port = remote.getGlobal('port');
>>>>>>>
var recentCards = remote.getGlobal('recentCards');
var port = remote.getGlobal('port'); |
<<<<<<<
db: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
facebook: {
clientID: process.env.FACEBOOK_ID || 'APP_ID',
clientSecret: process.env.FACEBOOK_SECRET || 'APP_SECRET',
callbackURL: '/api/auth... |
<<<<<<<
for (var itemIndex in service.menus[menuId].items) {
if (service.menus[menuId].items[itemIndex].state === parentItemState) {
// Push new submenu item
service.menus[menuId].items[itemIndex].items.push({
title: options.title || '',
state: options.state || ... |
<<<<<<<
switch (shape.constructor.name) {
case "Box":
geometry = pc.scene.procedural.createBox({
=======
switch (shape.type) {
case pc.shape.Type.BOX:
geometry = pc.graph.procedural.createBox({
>>>>>>>
switch (shape.type) {
c... |
<<<<<<<
this.forceFragmentPrecision = null;
=======
this.occludeDirect = false;
>>>>>>>
this.forceFragmentPrecision = null;
this.occludeDirect = false; |
<<<<<<<
// Private
function _onSet(entity, name, oldValue, newValue) {
/*
var component;
var functions = {
"asset": function (entity, name, oldValue, newValue) {
var componentData = this._getComponentData(entity);
if(componentData.model) {
... |
<<<<<<<
this.mainLight = -1;
this._activeShadowLights = [];
=======
>>>>>>>
this.mainLight = -1;
this._activeShadowLights = [];
<<<<<<<
var k;
=======
if (!pc._instanceVertexFormat) {
var formatDesc = [
{... |
<<<<<<<
var imagesys = new pc.ImageComponentSystem(this);
=======
var zonesys = new pc.ZoneComponentSystem(this);
>>>>>>>
var imagesys = new pc.ImageComponentSystem(this);
var zonesys = new pc.ZoneComponentSystem(this); |
<<<<<<<
=======
if (this._meshInstance) this._meshInstance.cull = false;
>>>>>>>
if (this._meshInstance) this._meshInstance.cull = false;
<<<<<<<
=======
if (this._meshInstance) this._meshInstance.cull = true;
>>>>>>>
if (this._meshInstance) this.... |
<<<<<<<
'$data.Object': function (o) { if (o === undefined) { return new $data.Object(); } return JSON.parse(o); },
'$data.Array': function (o) { if (o === undefined) { return new $data.Array(); } return JSON.parse(o); },
'$data.Guid': function (guid) { return typeof guid... |
<<<<<<<
this._scriptPrefix = options.scriptPrefix || '';
this._scripts = [];
this.loader.addHandler("animation", new pc.AnimationHandler());
this.loader.addHandler("model", new pc.ModelHandler(this.graphicsDevice));
this.loader.addHandler("material", new pc.MaterialHandler(this.... |
<<<<<<<
* @property {Number} occludeDirect Tells if AO should darken directional lighting.
=======
*
>>>>>>>
* @property {Number} occludeDirect Tells if AO should darken directional lighting.
*
<<<<<<<
var options;
var minimalOptions = pass > pc.SHADER_FORWARDHDR && pass ... |
<<<<<<<
this.fillMode = pc.FillMode.KEEP_ASPECT;
this.resolutionMode = pc.ResolutionMode.FIXED;
this.graphicsDevice = new pc.GraphicsDevice(canvas);
this.systems = new pc.ComponentSystemRegistry();
this.audioManager = new pc.AudioManager();
this.loader = new pc.resources.... |
<<<<<<<
* @property {Boolean} pixelSnap Align vertices to pixel co-ordinates when rendering. Useful for pixel perfect 2D graphics
=======
* @property {Boolean} twoSidedLighting Calculate proper normals (and therefore lighting) on backfaces
>>>>>>>
* @property {Boolean} pixelSnap Align vertices to pixe... |
<<<<<<<
// use METHOD if (shadowRead[pc.SHADOWREAD_METHOD] & light.mask) > 0
this.shadowReadMask = [0, 0xFFFFFFFF, 0]; // use PCF3x3 on everything by default
this.shadowReadMask.copy = function(from) {
for(var i=0; i<from.length; i++) {
this[i] = f... |
<<<<<<<
// Commit any samplers used by active program
for (i = 0, len = samplers.length; i < len; i++) {
sampler = samplers[i];
texture = sampler.scopeId.value;
if (this.textureUnits[i] !== texture) {
gl.activeTexture(gl.TEXTURE... |
<<<<<<<
* </ul>
* @property {pc.Vec3} halfExtents The half-extents of the box-shaped collision volume in the x, y and z axes. Defaults to [0.5, 0.5, 0.5]
* @property {Number} radius The radius of the sphere or capsule-shaped collision volumes. Defaults to 0.5
* @property {Number} axis The local spac... |
<<<<<<<
this.shadowWrite = pc.SHADOWWRITE_DEPTH;
=======
this.shadowUpdateMode = pc.SHADOWUPDATE_REALTIME;
this.mask = 1;
>>>>>>>
this.shadowWrite = pc.SHADOWWRITE_DEPTH;
this.shadowUpdateMode = pc.SHADOWUPDATE_REALTIME;
this.mask = 1; |
<<<<<<<
var scene = this.system.app.scene;
if (!scene.containsModel(model)) {
scene.addModel(model);
=======
var model = this.data.model;
if (model) {
var scene = this.system.context.scene;
if (!scene.containsModel(model)... |
<<<<<<<
this.defaultMaterial.pixelSnap = false;
=======
this.defaultMaterial.cull = pc.CULLFACE_NONE; // don't cull because we might flipX or flipY which uses negative scale on the graph node
>>>>>>>
this.defaultMaterial.pixelSnap = false;
this.defaultMaterial.cull = pc.CULLFACE_NONE;... |
<<<<<<<
'layers',
'mapping'
=======
'mapping',
'batchGroupId'
>>>>>>>
'layers',
'batchGroupId'
'mapping'
<<<<<<<
properties = ['enabled', 'material', 'materialAsset', 'asset', 'castShadows', 'receiveShadows', 'castShadowsLightmap', 'lightmapped', '... |
<<<<<<<
if (this.mask) {
var maskDepth = this._getMaskDepth();
if (maskDepth === 1) {
this._topMask = true;
if (topMasks.indexOf(this) < 0) topMasks.push(this);
}
}
=======
this.system.app.sce... |
<<<<<<<
unloadOld: function () {
this.resource = null;
this.loaded = false;
},
=======
reload: function() {
// no need to be reloaded
if (! this.loaded)
return;
if (this.type === 'cubemap') {
this.reg... |
<<<<<<<
name: "shadowUpdateMode",
exposed: false
}, {
=======
name: "mask",
displayName: "Mask",
description: "Bit mask",
type: "number",
defaultValue: 1,
exposed: false
}, {
>>>>>>>
name: "sha... |
<<<<<<<
var appc = require('node-appc'),
afs = appc.fs,
async = require('async'),
exec = require('child_process').exec,
os = require('os');
=======
var config = require('../config'),
appc = require('node-appc'),
i18n = appc.i18n(__dirname),
__ = i18n.__,
__n = i18n.__n;
>>>>>>>
var appc = require('node-appc'... |
<<<<<<<
=======
stats: process.env.JHI_DISABLE_WEBPACK_LOGS ? 'none' : options.stats,
>>>>>>>
stats: process.env.JHI_DISABLE_WEBPACK_LOGS ? 'none' : options.stats,
<<<<<<<
=======
process.env.JHI_DISABLE_WEBPACK_LOGS
? null
: new SimpleProgressWebpackPlugin({
... |
<<<<<<<
this.invisiblePins = [];
this.auto_evaluate = false;
this.dirty = true;
=======
this.invisiblePins = {} ;
this.defaultPinValues = {};
>>>>>>>
this.invisiblePins = {} ;
this.defaultPinValues = {};
this.auto_evaluate = false;
this.dirty = true; |
<<<<<<<
const converter = {};
=======
const converter = {}
>>>>>>>
const converter = {};
<<<<<<<
next();
};
=======
>>>>>>>
}; |
<<<<<<<
=======
console.log( {
ready: subscription.ready() && session && activity && object,
instances,
object,
activity,
dashboardData,
session,
users
});
>>>>>>> |
<<<<<<<
=======
// viewer.imageryLayers.addImageryProvider(new Cesium.SuperMapImageryProvider({
// url : "https://www.supermapol.com/iserver/services/map_China/rest/maps/China_Light"
// }));
>>>>>>> |
<<<<<<<
forCompareModels, // true when used by Compareprojections.js component.
stateId,
=======
forCompareModels, // true when used by CompareInterventions.js component.
location,
>>>>>>>
forCompareModels, // true when used by CompareInterventions.js component.
stateId,
<<<<<<<
<Wrapper
p... |
<<<<<<<
{!isEmbed ? <LocationSummary projections={projections} /> : ''}
=======
{!isEmbed && projections.getSummary()}
{projections.isCounty && !isEmbed && (
<HeaderSubCopy>
<strong>County data is currently in beta. </strong>
<span>
... |
<<<<<<<
var processErrors = function (errors, input, fullPath) {
var filename = path.basename(fullPath);
var lines = input.split('\n');
errors = errors.filter(function (error) {
return error !== null;
});
errors = flatten(errors);
errors = errors.map(function (error) {
var line... |
<<<<<<<
// remove test/distance.js (and this exception) when bumping to 0.9.0
tests: ["test/*.js", "!test/mock*", "!test/distance.js"]
=======
tests: [
"test/bootstrap/*.js",
"test/*.js"
]
>>>>>>>
tests: [
"test/bootstrap/*.js",
"test/*.js"
]
<<<<<... |
<<<<<<<
.attr('x', d => { return context.xScale(d[context.getxAxisLabel]); }) // start position before transition
.attr('y', context.getHeight)
=======
.attr('x', d => { return context.xScale(d[context.getxAxisLabel]); })
.attr('y', context.getChartHeight)
>>>>>>>
.attr(... |
<<<<<<<
var path = require('jsdoc/path');
var Syntax = require('jsdoc/src/syntax').Syntax;
=======
var path = require('jsdoc/path');
function filepathMinusPrefix(filepath) {
var sourceFiles = env.sourceFiles || [];
var commonPrefix = path.commonPrefix( sourceFiles.concat(env.opts._ || []) );
var result =... |
<<<<<<<
var runtime = require('jsdoc/util/runtime');
var parser = require( runtime.getModulePath('jsdoc/src/parser') );
var srcParser = new parser.Parser();
var doclets;
=======
var parser = require('jsdoc/src/parser');
var srcParser = null;
var doclets;
var sourcePaths = env.opts._.sl... |
<<<<<<<
expect(url).toBe('be9d9563a3.html#"*foo"');
});
});
describe("resolveAuthorLinks", function() {
// convert Jane Doe <jdoe@example.org> to a mailto link.
it('should convert email addresses in angle brackets *after* a name to mailto links', function() {
var... |
<<<<<<<
// TODO Define test once Core work is done
test.skip('has_current_token', () => {})
=======
// TODO Create tests once work is done in Core
test.skip('current_identity', () => {})
// TODO Add test once Core work has been done
test.skip('has_current_identity', () => {})
// TODO Finish test ... |
<<<<<<<
/**
* See the [docs](https://app.fauna.com/documentation/reference/queryapi#authentication).
*
* @return {Expr}
*/
function CurrentToken() {
arity.exact(0, arguments, CurrentToken.name)
return new Expr({ current_token: null })
}
=======
/**
* See the [docs](https://app.fauna.com/documentation/refere... |
<<<<<<<
/**
* See the [docs](https://app.fauna.com/documentation/reference/queryapi#authentication).
*
* @return {Expr}
*/
function HasCurrentToken() {
arity.exact(0, arguments, HasCurrentToken.name)
return new Expr({ has_current_token: null })
}
=======
/**
* See the [docs](https://app.fauna.com/documentat... |
<<<<<<<
// TODO Finish test after Core work is done
test.skip('current_token', () => {})
=======
// TODO Add test once Core work has been done
test.skip('has_current_identity', () => {})
// TODO Create tests once work is done in Core
test.skip('current_identity', () => {})
>>>>>>>
// TODO Create tes... |
<<<<<<<
* If the request with the same `Request.uniqueKey` property is already present in the queue,
* it will not be updated. You can find out this happened from the resulting
* {@linkcode RequestOperationInfo} object.
*
* @param {Request} request Request object
=======
* @param {Reques... |
<<<<<<<
/**
* Flushes the provided stream into a Buffer and transforms
* it to a String using the provided encoding or utf-8 as default.
*
* @param {stream.Readable} stream
* @param {String} [encoding]
* @returns {Promise<String>}
* @private
*/
async _readStreamIntoStrin... |
<<<<<<<
* Either {@link RequestList} or {@link RequestQueue} must be provided.
=======
* Either `requestList` or `requestQueue` option must be provided (or both).
* @param {Function} [options.requestFunction]
* Overrides the default function that performs the HTTP request to get the raw HTML needed for Chee... |
<<<<<<<
import { registerBrowserForLiveView } from './puppeteer_live_view_server';
import Stealth from './stealth/stealth';
=======
>>>>>>>
import Stealth from './stealth/stealth';
<<<<<<<
const puppeteer = getPuppeteerOrThrow();
// Add stealth
if (options.stealth) {
const prevLaunch = puppetee... |
<<<<<<<
getPublicUrl(fileName) {
ensureTokenOrLocalStorageEnvExists('key value store');
return `${publicUrl}/${this.storeId}/records/${fileName}`;
}
=======
/**
* Iterates over key value store keys, yielding each in turn to an `iteratee` function.
* Each invocation of `iteratee... |
<<<<<<<
* @property {String} [puppeteerModule]
* Require path to a module to be used instead of default `puppeteer`. This enables usage
* of various Puppeteer wrappers such as `puppeteer-extra`.
* @property {boolean} [stealth]
* This setting hides most of the know properties that identifies the headless Chro... |
<<<<<<<
import openKeyValueStore from './key-value-store';
=======
import { setDefaultToken, setDefaultUserId, getAllCrawlers, startCrawler } from './crawler';
>>>>>>>
import openKeyValueStore from './key-value-store';
import { setDefaultToken, setDefaultUserId, getAllCrawlers, startCrawler } from './crawler';
<<<... |
<<<<<<<
* @memberof module:Apify
* @function
* @description Gets a value from the default key-value store for the current act run.
* This store is created automatically for this run,
* whose ID is defined in the `APIFY_DEFAULT_KEY_VALUE_STORE_ID` environment variable.
* The result of the function is the body of t... |
<<<<<<<
=======
//webview配置titlebar
var globalConfig = require('../config');
if ( globalConfig.webview
&& /true|false/.test(globalConfig.webview.showTitleBar)
&& !globalConfig.webview.showTitleBar ) {
let routePath = 'pages/__web__view__';
display['pages'] = display['pag... |
<<<<<<<
var originalInitialCSS;
=======
/**
* Trigger to initialize the sticky
* Because of the `timeout()` method for the call of `initSticky()` method, the `onChange` method is called before!
* @type {Boolean}
*/
var toInitialize = true;
>>>... |
<<<<<<<
stickyClass: '@',
mediaQuery: '@'
=======
stickyClass: '@',
bodyClass: '@'
>>>>>>>
stickyClass: '@',
mediaQuery: '@',
bodyClass: '@'
<<<<<<<
mediaQuery = $scope.mediaQuery || 'min-width: 0',
=======
bodyClass = $scope.bodyClass || '',
>>>>>>>
mediaQuery = $scope.mediaQ... |
<<<<<<<
//replace
newNode = mountVnode(newVnode, parentContext)
removeVnode(vnode, node, newNode)
=======
//replace
disposeVnode(vnode, node)
newNode = mountVnode(newVnode, parentContext)
node
.parentNode
.replaceChild(newNode, node)
>... |
<<<<<<<
${this.randomClassName}.top img {
=======
.top, left, bottom, right, center, top-left, top-right, bottom-left, bottom-right {
width: ${this.state.containerWidth}px;
height: ${this.state.containerHeight}px;
}
.top img {
... |
<<<<<<<
if (dom) {
diffChildren(lastVnode, nextVnode, dom, context, updateQueue);
}
=======
diffChildren(lastVnode, flattenChildren(nextVnode), dom, context, updateQueue);
>>>>>>>
if (dom) {
diffChildren(lastVnode, flattenChildren(nextVnode), dom, context, upda... |
<<<<<<<
import Navigator from '@components/Navigator/index';
=======
>>>>>>>
<<<<<<<
title: '原生组件',
array: 'button,checkbox,input,slider,picker,radio,textarea,label,audio,camera,image,video'
.split(',')
.map(function (name) {
=======
title: "内... |
<<<<<<<
=======
//webview路由跳转
var globalConfig = require('../config');
if (globalConfig.webview && globalConfig.webview.pages.length) {
let routePath = 'pages/__web__view__';
manifest.router.pages[routePath] = {
component: 'index'
}
}
>>>>>>>
<<<<<<<
modul... |
<<<<<<<
const { resetNum, timerLog } = require('./logger/index');
const runBeforeParseTasks = require('../commands/runBeforeParseTasks');
const fs = require('fs-extra');
const cwd = process.cwd();
=======
const { resetNum, timerLog, errorLog, warningLog } = require('./logger/index');
const errorStack = require('./l... |
<<<<<<<
if (utils.isWebView(data.id)) {
this.webViewFiles.push({
id: data.id
});
} else {
this.jsFiles.push({
id: data.id,
originalCode: data.originalCode,... |
<<<<<<<
dragListen,// drag listen event.
=======
scrollableContainer, //the scrollable container
>>>>>>>
dragListen,// drag listen event.
scrollableContainer, //the scrollable container |
<<<<<<<
test('registerSimpleHelper', 3, function() {
can.Mustache.registerSimpleHelper('simple', function(first, second) {
equal(first, 2);
equal(second, 4);
return first + second;
});
var template = can.view.mustache('<div>Result: {{simple first second}}</div>');
var frag = template(new can.Map({
... |
<<<<<<<
false :
!this.leakScope) &&
!!this.template),
bindingsData = {},
//twoWayBindings = {},
=======
false :
!this.leakScope) &&
!!this.template),
twoWayBindings = {},
>>>>>>>
false :
!this.leakScope) &&
!!this.t... |
<<<<<<<
=======
test("can.Construct derived classes should be considered objects, not functions (#450)", function() {
var foostructor = can.Map({ text: "bar" }, {}),
obj = {
next_level: {
thing: foostructor,
text: "In the inner context"
}
},
read;
foostructor.self = foostructor;
... |
<<<<<<<
exprData: exprData
});
args.push(helperOptions);
// Call the helper.
helperEvaluator = function () {
return helper.fn.apply(context, args);
=======
exprData: exprData,
helpersScope: helperOptions
>>>>>>>
exprData: exprData,
helpersScope: helperOptions
<<<<<<<
... |
<<<<<<<
// It's handy if we pass this to comptues, because computes can have a default value.
var defaultValues = this._setupDefaults();
this._setupComputes(defaultValues);
=======
// Setup computed attributes.
this._setupComputes();
>>>>>>>
// It's handy if we pass this to comptues, because ... |
<<<<<<<
*
=======
* @release 2.0.4
*
>>>>>>>
* @release 2.0.4
*
<<<<<<<
list: function (el, compute, render, context, parentNode) {
=======
/**
* @function can.view.live.list
* @parent can.view.live
* @release 2.0.4
*
* Live binds a compute's [can.List] incrementally.
*
* ... |
<<<<<<<
store: function (count, make, filter) {
=======
// ## can.fixture.store
// Make a store of objects to use when making requests against fixtures.
store: function (types, count, make, filter) {
>>>>>>>
// ## can.fixture.store
// Make a store of objects to use when making requests against fixture... |
<<<<<<<
can.bind = function() {};
can.unbind = function() {};
can.trigger = function() {};
can.delegate = function() {};
can.undelegate = function() {};
=======
>>>>>>>
<<<<<<<
// Events
// can.bind = function( ev, cb){
// // if we can bind to it ...
// if(this.bind && this.bind !== can.bind){
// thi... |
<<<<<<<
} 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... |
<<<<<<<
steal("can/model", "can/view/ejs", "can/test", function() {
module("can/view/ejs, 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])
}
=======
(functio... |
<<<<<<<
steal('can/route/pushstate', "can/test", function(){
/*var orgTest = window.test;
var test = function(name, fn){
orgTest(name, function(){
console.log(name+"\n");
return fn.apply(this, arguments)
})
}*/
if(window.history && history.pushState) {
var originalPath = location.pathname;
module("can/rou... |
<<<<<<<
map: state.map,
splitTreeAndMap: state.controls.splitTreeAndMap,
=======
>>>>>>>
// map: state.map,
splitTreeAndMap: state.controls.splitTreeAndMap,
<<<<<<<
horizontal: this.props.browserDimensions && this.props.browserDimensions.width > globals.twoColumnBreakpoint && this.props.splitT... |
<<<<<<<
test("easy hookup", function(){
var div = $('<div/>').html("//jquery/view/ejs/easyhookup.ejs",{text: "yes"})
ok( div.find('div').hasClass('yes'), "has yes" )
});
test("helpers", function() {
$.EJS.Helpers.prototype.simpleHelper = function()
{
return 'Simple';
}
$.EJS.Helpers.prototype.elementHelper =... |
<<<<<<<
if (d.visibility !== "visible") return;
=======
if (this.props.narrativeMode) return;
>>>>>>>
if (d.visibility !== "visible") return;
if (this.props.narrativeMode) return;
<<<<<<<
if (d.visibility !== "visible") return;
=======
if (this.props.narrativeMode) return;
>>>>>>>
if (d.visibility ... |
<<<<<<<
steal("can/construct/proxy", "can/control", function() {
=======
(function () {
/* global Car */
>>>>>>>
steal("can/construct/proxy", "can/control", function() {
/* global Car */
<<<<<<<
});
=======
}());
>>>>>>>
}); |
<<<<<<<
},
// #### insertElementsAfter
// Appends elements after the last item in oldElements.
insertElementsAfter = function(oldElements, newFrag){
var last = oldElements[oldElements.length - 1];
// Insert it in the `document` or `documentFragment`
if( last.nextSibling ){
can.insertBefore(la... |
<<<<<<<
=======
/**
* @add can.prototype
*/
>>>>>>>
<<<<<<<
/**
* @hide
* @attribute pluginName
* Setting the <code>pluginName</code> property allows you
* to change the jQuery plugin helper name from its
* default value.
*
* can.Control("Mxui.Layout.Fill",{
* pluginName: "fillWith"
* ... |
<<<<<<<
});
=======
test("Test top level attributes", 7, function() {
var test = new can.Map({
'my.enable': false,
'my.item': true,
'my.count': 0,
'my.newCount': 1,
'my': {
'value': true,
'nested': {
'value': 100
}
}
});
equal( test.attr('my.value'), true, 'correct' );
equal( test.attr('... |
<<<<<<<
test("html takes promise", function(){
var d = new can.Deferred();
can.$("#qunit-test-area").html(d);
stop();
d.done(function(){
equal(can.$("#qunit-test-area").html(), "Hello World", "deferred is working");
start();
})
setTimeout(function(){
d.resolve("Hello World")
},10)
});
test("val set with ... |
<<<<<<<
steal("can/route", "can/test", function() {
module("can/route",{
setup: function(){
can.route._teardown();
can.route.defaultBinding = "hashchange";
=======
/* jshint asi:true*/
(function () {
module("can/route", {
setup: function () {
can.route._teardown();
can.route.defaultBinding = "hashchange... |
<<<<<<<
var ignoreAttributesRegExp = /^(dataViewId|class|id)$/i,
viewAttr = can.view.attr;
=======
// ## Helpers
// Attribute names to ignore for setting scope values.
var ignoreAttributesRegExp = /^(dataViewId|class|id)$/i;
>>>>>>>
// ## Helpers
// Attribute names to ignore for setting scope values.
var i... |
<<<<<<<
import { modifyURLquery } from "../../util/urlHelpers";
import { changeDateFilter } from "../../actions/treeProperties";
=======
import { CHANGE_DATE_MIN, CHANGE_DATE_MAX, CHANGE_ABSOLUTE_DATE_MIN,
CHANGE_ABSOLUTE_DATE_MAX } from "../../actions/controls";
import { controlsWidth } from "../../util/globals";
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.