conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
( extensions.derivatives || parameters.envMapCubeUV || parameters.bumpMap || parameters.tangentSpaceNormalMap || parameters.clearCoatNormalMap || parameters.flatShading ) ? '#extension GL_OES_standard_derivatives : enable' : '',
=======
( extensions.derivatives || parameters.envMapCubeUV || parameters.bumpMap || ( parameters.normalMap && ! parameters.objectSpaceNormalMap ) || parameters.clearcoatNormalMap || parameters.flatShading ) ? '#extension GL_OES_standard_derivatives : enable' : '',
>>>>>>>
( extensions.derivatives || parameters.envMapCubeUV || parameters.bumpMap || parameters.tangentSpaceNormalMap || parameters.clearcoatNormalMap || parameters.flatShading ) ? '#extension GL_OES_standard_derivatives : enable' : '',
<<<<<<<
( parameters.normalMap && parameters.tangentSpaceNormalMap ) ? '#define TANGENTSPACE_NORMALMAP' : '',
parameters.clearCoatNormalMap ? '#define USE_CLEARCOAT_NORMALMAP' : '',
=======
parameters.clearcoatNormalMap ? '#define USE_CLEARCOAT_NORMALMAP' : '',
>>>>>>>
( parameters.normalMap && parameters.tangentSpaceNormalMap ) ? '#define TANGENTSPACE_NORMALMAP' : '',
parameters.clearcoatNormalMap ? '#define USE_CLEARCOAT_NORMALMAP' : '',
<<<<<<<
( parameters.normalMap && parameters.tangentSpaceNormalMap ) ? '#define TANGENTSPACE_NORMALMAP' : '',
parameters.clearCoatNormalMap ? '#define USE_CLEARCOAT_NORMALMAP' : '',
=======
parameters.clearcoatNormalMap ? '#define USE_CLEARCOAT_NORMALMAP' : '',
>>>>>>>
( parameters.normalMap && parameters.tangentSpaceNormalMap ) ? '#define TANGENTSPACE_NORMALMAP' : '',
parameters.clearcoatNormalMap ? '#define USE_CLEARCOAT_NORMALMAP' : '', |
<<<<<<<
class Texture extends EventDispatcher {
=======
function Texture( image = Texture.DEFAULT_IMAGE, mapping = Texture.DEFAULT_MAPPING, wrapS = ClampToEdgeWrapping, wrapT = ClampToEdgeWrapping, magFilter = LinearFilter, minFilter = LinearMipmapLinearFilter, format = RGBAFormat, type = UnsignedByteType, anisotropy = 1, encoding = LinearEncoding ) {
>>>>>>>
class Texture extends EventDispatcher {
<<<<<<<
this.matrixAutoUpdate = true;
this.matrix = new Matrix3();
=======
// Values of encoding !== THREE.LinearEncoding only supported on map, envMap and emissiveMap.
//
// Also changing the encoding after already used by a Material will not automatically make the Material
// update. You need to explicitly call Material.needsUpdate to trigger it to recompile.
this.encoding = encoding;
>>>>>>>
this.matrixAutoUpdate = true;
this.matrix = new Matrix3();
// Values of encoding !== THREE.LinearEncoding only supported on map, envMap and emissiveMap.
//
// Also changing the encoding after already used by a Material will not automatically make the Material
// update. You need to explicitly call Material.needsUpdate to trigger it to recompile.
this.encoding = encoding;
<<<<<<<
set needsUpdate( value ) {
=======
} );
Object.defineProperty( Texture.prototype, 'needsUpdate', {
set: function ( value ) {
>>>>>>>
set needsUpdate( value ) {
<<<<<<<
}
=======
} );
function serializeImage( image ) {
if ( ( typeof HTMLImageElement !== 'undefined' && image instanceof HTMLImageElement ) ||
( typeof HTMLCanvasElement !== 'undefined' && image instanceof HTMLCanvasElement ) ||
( typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap ) ) {
// default images
return ImageUtils.getDataURL( image );
} else {
if ( image.data ) {
// images of DataTexture
return {
data: Array.prototype.slice.call( image.data ),
width: image.width,
height: image.height,
type: image.data.constructor.name
};
} else {
console.warn( 'THREE.Texture: Unable to serialize Texture.' );
return {};
}
}
}
>>>>>>>
serializeImage( image ) {
if ( ( typeof HTMLImageElement !== 'undefined' && image instanceof HTMLImageElement ) ||
( typeof HTMLCanvasElement !== 'undefined' && image instanceof HTMLCanvasElement ) ||
( typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap ) ) {
// default images
return ImageUtils.getDataURL( image );
} else {
if ( image.data ) {
// images of DataTexture
return {
data: Array.prototype.slice.call( image.data ),
width: image.width,
height: image.height,
type: image.data.constructor.name
};
} else {
console.warn( 'THREE.Texture: Unable to serialize Texture.' );
return {};
}
}
}
} |
<<<<<<<
var parameters = parseParameters( FBXTree, materialNode, textureMap, FBX_ID, connections );
=======
var parameters = parseParameters( FBXTree, materialNode.properties, textureMap, ID, connections );
>>>>>>>
var parameters = parseParameters( FBXTree, materialNode, textureMap, ID, connections );
<<<<<<<
// Parse single nodes in FBXTree.Objects.Deformer
// Generates a "Skeleton Representation" of FBX nodes based on an FBX Skin Deformer's connections
// and an object containing SubDeformer nodes.
function parseSkeleton( connections, DeformerNodes ) {
=======
// Parse single nodes in FBXTree.Objects.subNodes.Deformer
// The top level deformer nodes have type 'Skin' and subDeformer nodes have type 'Cluster'
// Each skin node represents a skeleton and each cluster node represents a bone
function parseSkeleton( connections, deformerNodes ) {
>>>>>>>
// Parse single nodes in FBXTree.Objects.Deformer
// The top level deformer nodes have type 'Skin' and subDeformer nodes have type 'Cluster'
// Each skin node represents a skeleton and each cluster node represents a bone
function parseSkeleton( connections, deformerNodes ) {
<<<<<<<
transform: new THREE.Matrix4().fromArray( subDeformerNode.Transform.a ),
transformLink: new THREE.Matrix4().fromArray( subDeformerNode.TransformLink.a ),
linkMode: subDeformerNode.Mode,
=======
// the global initial transform of the geometry node this bone is connected to
transform: new THREE.Matrix4().fromArray( subDeformerNode.subNodes.Transform.properties.a ),
// the global initial transform of this bone
transformLink: new THREE.Matrix4().fromArray( subDeformerNode.subNodes.TransformLink.properties.a ),
>>>>>>>
transform: new THREE.Matrix4().fromArray( subDeformerNode.Transform.a ),
transformLink: new THREE.Matrix4().fromArray( subDeformerNode.TransformLink.a ),
linkMode: subDeformerNode.Mode,
<<<<<<<
subDeformer.indices = subDeformerNode.Indexes.a;
subDeformer.weights = subDeformerNode.Weights.a;
=======
rawBone.indices = subDeformerNode.subNodes.Indexes.properties.a;
rawBone.weights = subDeformerNode.subNodes.Weights.properties.a;
>>>>>>>
rawBone.indices = subDeformerNode.Indexes.a;
rawBone.weights = subDeformerNode.Weights.a;
<<<<<<<
// Parse nodes in FBXTree.Objects.Geometry
function parseGeometries( FBXTree, connections, deformers ) {
=======
// Parse nodes in FBXTree.Objects.subNodes.Geometry
function parseGeometries( FBXTree, connections, skeletons ) {
>>>>>>>
// Parse nodes in FBXTree.Objects.Geometry
function parseGeometries( FBXTree, connections, skeletons ) {
<<<<<<<
// Parse single node in FBXTree.Objects.Geometry
function parseGeometry( FBXTree, relationships, geometryNode, deformers ) {
=======
// Parse single node in FBXTree.Objects.subNodes.Geometry
function parseGeometry( FBXTree, relationships, geometryNode, skeletons ) {
>>>>>>>
// Parse single node in FBXTree.Objects.Geometry
function parseGeometry( FBXTree, relationships, geometryNode, skeletons ) {
<<<<<<<
// Parse single node mesh geometry in FBXTree.Objects.Geometry
function parseMeshGeometry( FBXTree, relationships, geometryNode, deformers ) {
var deformer = relationships.children.reduce( function ( deformer, child ) {
if ( deformers[ child.ID ] !== undefined ) deformer = deformers[ child.ID ];
return deformer;
}, null );
=======
// Parse single node mesh geometry in FBXTree.Objects.subNodes.Geometry
function parseMeshGeometry( FBXTree, relationships, geometryNode, skeletons ) {
>>>>>>>
// Parse single node mesh geometry in FBXTree.Objects.Geometry
function parseMeshGeometry( FBXTree, relationships, geometryNode, skeletons ) {
<<<<<<<
var modelNode = FBXTree.Objects.Model[ parent.ID ];
return modelNode;
=======
return FBXTree.Objects.subNodes.Model[ parent.ID ];
>>>>>>>
return FBXTree.Objects.Model[ parent.ID ];
<<<<<<<
// Generate a THREE.BufferGeometry from a node in FBXTree.Objects.Geometry
function genGeometry( FBXTree, relationships, geometryNode, deformer, preTransform ) {
=======
// Generate a THREE.BufferGeometry from a node in FBXTree.Objects.subNodes.Geometry
function genGeometry( FBXTree, relationships, geometryNode, skeleton, preTransform ) {
>>>>>>>
// Generate a THREE.BufferGeometry from a node in FBXTree.Objects.Geometry
function genGeometry( FBXTree, relationships, geometryNode, skeleton, preTransform ) {
<<<<<<<
// parse nodes in FBXTree.Objects.Model
function parseModels( FBXTree, deformers, geometryMap, materialMap, connections ) {
=======
// parse nodes in FBXTree.Objects.subNodes.Model
function parseModels( FBXTree, skeletons, geometryMap, materialMap, connections ) {
>>>>>>>
// parse nodes in FBXTree.Objects.Model
function parseModels( FBXTree, skeletons, geometryMap, materialMap, connections ) {
<<<<<<<
if ( 'LookAtProperty' in modelNode ) {
var children = connections.get( model.FBX_ID ).children;
children.forEach( function ( child ) {
if ( child.relationship === 'LookAtProperty' ) {
var lookAtTarget = FBXTree.Objects.Model[ child.ID ];
if ( 'Lcl_Translation' in lookAtTarget ) {
var pos = lookAtTarget.Lcl_Translation.value;
// DirectionalLight, SpotLight
if ( model.target !== undefined ) {
model.target.position.fromArray( pos );
sceneGraph.add( model.target );
} else { // Cameras and other Object3Ds
model.lookAt( new THREE.Vector3().fromArray( pos ) );
}
}
}
} );
}
=======
>>>>>>> |
<<<<<<<
var path = new THREE.Path();
=======
>>>>>>>
var path = new THREE.Path(); |
<<<<<<<
THREE.ShaderChunk[ "lights_lambert_pars_vertex" ],
THREE.ShaderChunk[ "bsdfs" ],
THREE.ShaderChunk[ "lights" ],
=======
THREE.ShaderChunk[ "lights_pars" ],
>>>>>>>
THREE.ShaderChunk[ "bsdfs" ],
THREE.ShaderChunk[ "lights" ], |
<<<<<<<
=======
this.type = 'CatmullRomCurve3';
if ( points.length < 2 ) console.warn( 'THREE.CatmullRomCurve3: Points array needs at least two entries.' );
>>>>>>>
this.type = 'CatmullRomCurve3';
<<<<<<<
this.closed = closed || false;
this.tension = tension || 0.5;
=======
this.closed = false;
this.curveType = 'centripetal';
>>>>>>>
this.closed = closed || false;
this.tension = tension || 0.5;
this.curveType = 'centripetal'; |
<<<<<<<
var geometryAttributes = geometry.attributes;
=======
const index = geometry.index;
const geometryAttributes = geometry.attributes;
>>>>>>>
const geometryAttributes = geometry.attributes; |
<<<<<<<
var targetName = node.name ? node.name : node.uuid;
var interp = {
times: inputAccessor.array,
values: outputAccessor.array,
target: node,
type: INTERPOLATION[ sampler.interpolation ],
name: targetName + '.' + PATH_PROPERTIES[ target.path ]
};
=======
node.updateMatrix();
node.matrixAutoUpdate = true;
var TypedKeyframeTrack = PATH_PROPERTIES[ target.path ] === PATH_PROPERTIES.rotation
? THREE.QuaternionKeyframeTrack
: THREE.VectorKeyframeTrack;
>>>>>>>
node.updateMatrix();
node.matrixAutoUpdate = true;
var TypedKeyframeTrack = PATH_PROPERTIES[ target.path ] === PATH_PROPERTIES.rotation
? THREE.QuaternionKeyframeTrack
: THREE.VectorKeyframeTrack;
var targetName = node.name ? node.name : node.uuid; |
<<<<<<<
var index = geometry.index !== null ? geometry.index : undefined;
var attributes = geometry.attributes;
=======
const indices = geometry.index !== null ? geometry.index.array : undefined;
const attributes = geometry.attributes;
>>>>>>>
const index = geometry.index !== null ? geometry.index : undefined;
const attributes = geometry.attributes;
<<<<<<<
var position = attributes.position;
var normal = attributes.normal;
var color = attributes.color;
var uv = attributes.uv;
var uv2 = attributes.uv2;
=======
const positions = attributes.position.array;
const normals = attributes.normal !== undefined ? attributes.normal.array : undefined;
const colors = attributes.color !== undefined ? attributes.color.array : undefined;
const uvs = attributes.uv !== undefined ? attributes.uv.array : undefined;
const uvs2 = attributes.uv2 !== undefined ? attributes.uv2.array : undefined;
>>>>>>>
const position = attributes.position;
const normal = attributes.normal;
const color = attributes.color;
const uv = attributes.uv;
const uv2 = attributes.uv2;
<<<<<<<
for ( var i = 0; i < position.count; i ++ ) {
=======
for ( let i = 0; i < positions.length; i += 3 ) {
>>>>>>>
for ( let i = 0; i < position.count; i ++ ) {
<<<<<<<
var vertexColors = ( color === undefined ) ? [] : [
=======
const vertexColors = ( colors === undefined ) ? [] : [
>>>>>>>
const vertexColors = ( color === undefined ) ? [] : [
<<<<<<<
var vertexNormals = ( normal === undefined ) ? [] : [
new Vector3().fromBufferAttribute( normal, a ),
new Vector3().fromBufferAttribute( normal, b ),
new Vector3().fromBufferAttribute( normal, c )
=======
const vertexNormals = ( normals === undefined ) ? [] : [
new Vector3().fromArray( normals, a * 3 ),
new Vector3().fromArray( normals, b * 3 ),
new Vector3().fromArray( normals, c * 3 )
>>>>>>>
const vertexNormals = ( normal === undefined ) ? [] : [
new Vector3().fromBufferAttribute( normal, a ),
new Vector3().fromBufferAttribute( normal, b ),
new Vector3().fromBufferAttribute( normal, c )
<<<<<<<
for ( var i = 0; i < index.count; i += 3 ) {
=======
for ( let i = 0; i < indices.length; i += 3 ) {
>>>>>>>
for ( let i = 0; i < index.count; i += 3 ) {
<<<<<<<
for ( var i = 0; i < position.count; i += 3 ) {
=======
for ( let i = 0; i < positions.length / 3; i += 3 ) {
>>>>>>>
for ( let i = 0; i < position.count; i += 3 ) { |
<<<<<<<
if ( position && position.isGLBufferAttribute ) {
console.error( 'THREE.BufferGeometry.computeBoundingSphere(): GLBufferAttribute requires a manual bounding sphere. Alternatively set "mesh.frustumCulled" to "false".', this );
this.boundingSphere.set( new Vector3(), Infinity );
return;
}
if ( position ) {
=======
var position = this.attributes.position;
var morphAttributesPosition = this.morphAttributes.position;
>>>>>>>
var position = this.attributes.position;
var morphAttributesPosition = this.morphAttributes.position;
if ( position && position.isGLBufferAttribute ) {
console.error( 'THREE.BufferGeometry.computeBoundingSphere(): GLBufferAttribute requires a manual bounding sphere. Alternatively set "mesh.frustumCulled" to "false".', this );
this.boundingSphere.set( new Vector3(), Infinity );
return;
} |
<<<<<<<
message.channel.send(Text.playerManager.sellEmoji + mentionPlayer(player) + Text.playerManager.sell + value + Text.playerManager.sellEnd)
=======
if (displayName) {
message.channel.send(Text.playerManager.sellEmoji + message.author.username + Text.playerManager.sellItem1 + new ItemManager().getItemSimpleName(item, language) + Text.playerManager.sellItem2 + value + Text.playerManager.sellEnd);
} else {
message.channel.send(Text.playerManager.sellEmoji + message.author.username + Text.playerManager.sell + value + Text.playerManager.sellEnd);
}
>>>>>>>
if (displayName) {
message.channel.send(Text.playerManager.sellEmoji + mentionPlayer(player) + Text.playerManager.sellItem1 + new ItemManager().getItemSimpleName(item, language) + Text.playerManager.sellItem2 + value + Text.playerManager.sellEnd);
} else {
message.channel.send(Text.playerManager.sellEmoji + mentionPlayer(player) + Text.playerManager.sell + value + Text.playerManager.sellEnd);
} |
<<<<<<<
#ifdef CLEARCOAT
vec3 clearCoatNormal;
=======
#ifdef PHYSICAL
vec3 clearcoatNormal;
>>>>>>>
#ifdef CLEARCOAT
vec3 clearcoatNormal; |
<<<<<<<
"totalDiffuseLight += pointDistance * pointLightColor[ i ] * pointDiffuseWeight;",
"totalSpecularLight += pointDistance * pointLightColor[ i ] * specular * pointSpecularWeight * pointDiffuseWeight;",
=======
"pointDiffuse += attenuation * pointLightColor[ i ] * diffuse * pointDiffuseWeight;",
"pointSpecular += attenuation * pointLightColor[ i ] * specular * pointSpecularWeight * pointDiffuseWeight;",
>>>>>>>
"totalDiffuseLight += attenuation * pointLightColor[ i ] * pointDiffuseWeight;",
"totalSpecularLight += attenuation * pointLightColor[ i ] * specular * pointSpecularWeight * pointDiffuseWeight;",
<<<<<<<
//"gl_FragColor.xyz = gl_FragColor.xyz * ( totalDiffuse + ambientLightColor * ambient) + totalSpecular;",
"outgoingLight.rgb += diffuseColor.xyz * ( totalDiffuseLight + ambientLightColor * ambient + totalSpecularLight );",
=======
// all lights contribution summation
"vec3 totalDiffuse = vec3( 0.0 );",
"vec3 totalSpecular = vec3( 0.0 );",
"#if MAX_DIR_LIGHTS > 0",
"totalDiffuse += dirDiffuse;",
"totalSpecular += dirSpecular;",
"#endif",
"#if MAX_HEMI_LIGHTS > 0",
"totalDiffuse += hemiDiffuse;",
"totalSpecular += hemiSpecular;",
"#endif",
"#if MAX_POINT_LIGHTS > 0",
"totalDiffuse += pointDiffuse;",
"totalSpecular += pointSpecular;",
"#endif",
//"gl_FragColor.xyz = gl_FragColor.xyz * ( totalDiffuse + ambientLightColor * diffuse ) + totalSpecular;",
"gl_FragColor.xyz = gl_FragColor.xyz * ( totalDiffuse + ambientLightColor * diffuse + totalSpecular );",
>>>>>>>
"outgoingLight.rgb += diffuseColor.xyz * ( totalDiffuseLight + ambientLightColor * diffuse + totalSpecularLight );", |
<<<<<<<
const Config = require('./utils/Config');
const sql = require("sqlite");
sql.open("./modules/data/database.sqlite");
class DatabaseManager {
/**
* This function analyses the passed database and check if it is valid. if no : create the database
* @param sql - a sqlite file.
*/
checkDatabaseValidity(sql) {
console.log('Checking Database ...');
sql.get(`SELECT version FROM database`).catch(() => {
this.createDatabase(sql);
});
sql.get("SELECT guildId FROM player").catch(() => {
this.updateDatabase(sql);
}).then(() => {
console.log('... Database is valid !');
});
}
async updateDatabase(sql) {
console.log("Updating the database ...")
//Add weeklyScore column
await sql.run("ALTER TABLE player ADD weeklyScore INTEGER").catch(console.error);
//Add weeklyRank column
await sql.run("ALTER TABLE player ADD weeklyRank INTEGER").catch(console.error);
// add lastReset column
await sql.run("ALTER TABLE database ADD lastReset INTEGER").catch(console.error);
await sql.run("UPDATE database SET lastReset = 0").catch(console.error);
//Copy score value to weeklyScore
await sql.run("UPDATE player SET weeklyScore = 0").catch(console.error);
//Define default weeklyRank value
await sql.run("UPDATE player SET weeklyRank = 0").catch(console.error);
//adding the trigger
sql.run(`CREATE TRIGGER IF NOT EXISTS calcweeklyrankbis
AFTER UPDATE OF tampon ON player
BEGIN
UPDATE player SET weeklyRank=(select (select count(*)+1
from player as r
where r.weeklyScore > s.weeklyScore) as weeklyRank
from player as s WHERE discordId = old.discordId) WHERE discordId = old.discordId;
END;`);
//Add guildId column
await sql.run("ALTER TABLE player ADD guildId Text").catch(console.error);
//guild server
sql.run("CREATE TABLE IF NOT EXISTS guild (guildId TEXT, name TEXT, chief TEXT, score TEXT, level TEXT, experience TEXT, rank TEXT)").catch(console.error);
console.log("database updated !")
}
/**
* Allow to set the state of all the player to normal in order to allow them to play
*/
setEverybodyAsUnOccupied() {
console.log("Updating everybody ...");
sql.run(`UPDATE entity SET effect = ":smiley:" WHERE effect = ":clock10:"`).catch(console.error);
console.log("everybody updated !");
}
/**
* This function create the database
* @param sql - a sqlite file.
*/
createDatabase(sql) {
console.log("... Database is not valid !\nDatabase Generation ...");
//table entity
sql.run("CREATE TABLE IF NOT EXISTS entity (id TEXT, maxHealth INTEGER, health INTEGER, attack INTEGER, defense INTEGER, speed INTEGER, effect TEXT)").catch(console.error);
//table player
sql.run("CREATE TABLE IF NOT EXISTS player (discordId TEXT, score INTEGER, weeklyScore INTEGER, level INTEGER, experience INTEGER, money INTEGER, lastReport INTEGER, badges TEXT, tampon INTEGER, rank INTEGER, weeklyRank INTEGER, guildId Text)").then(() => {
//trigger to calculate the score of all the users at any moment
sql.run(`CREATE TRIGGER IF NOT EXISTS calcrank
AFTER UPDATE OF score ON player
BEGIN
UPDATE player SET tampon = tampon +1 where score > 1;
END;`);
sql.run(`CREATE TRIGGER IF NOT EXISTS calcrankbis
AFTER UPDATE OF tampon ON player
BEGIN
UPDATE player SET rank=(select (select count(*)+1
from player as r
where r.score > s.score) as rank
from player as s WHERE discordId = old.discordId) WHERE discordId = old.discordId;
END;`);
sql.run(`CREATE TRIGGER IF NOT EXISTS calcrankweekbis
AFTER UPDATE OF weeklyScore ON player
BEGIN
UPDATE player SET tampon = tampon +1 where score > 1;
END;`);
sql.run(`CREATE TRIGGER IF NOT EXISTS calcweeklyrankbis
AFTER UPDATE OF tampon ON player
BEGIN
UPDATE player SET weeklyRank=(select (select count(*)+1
from player as r
where r.weeklyScore > s.weeklyScore) as weeklyRank
from player as s WHERE discordId = old.discordId) WHERE discordId = old.discordId;
END;`);
}).catch(console.error);
//table server
sql.run("CREATE TABLE IF NOT EXISTS server (id TEXT, prefix TEXT, language TEXT)").catch(console.error);
//table inventory
sql.run("CREATE TABLE IF NOT EXISTS inventory (playerId TEXT, weaponId TEXT, armorId TEXT, potionId TEXT, objectId TEXT, backupItemId TEXT, lastDaily INTEGER)").catch(console.error);
//guild server
sql.run("CREATE TABLE IF NOT EXISTS guild (guildId TEXT, name TEXT, chief TEXT, score TEXT, level TEXT, experience TEXT, rank TEXT)").catch(console.error);
//table only used to store the version of the bot when the database was created
sql.run("CREATE TABLE IF NOT EXISTS database (version TEXT, lastReset INTEGER)").then(() => {
sql.run(`INSERT INTO database (version) VALUES (\"${Config.version}\")`).then(() => {
console.log("... Generation Complete !");
});
});
}
/**
* Allow to reset the weekly top.
*/
async resetWeeklyScoreAndRank() {
await sql.run("DROP TRIGGER calcrankweekbis").catch(console.error);
await sql.run("DROP TRIGGER calcweeklyrankbis").catch(console.error);
//Reset weeklyScore column.
await sql.run("UPDATE player SET weeklyScore = 0").catch(console.error);
//Reset weeklyRank column.
await sql.run("UPDATE player SET weeklyRank = 0").catch(console.error);
await sql.run(`CREATE TRIGGER IF NOT EXISTS calcrankweekbis
AFTER UPDATE OF weeklyScore ON player
BEGIN
UPDATE player SET tampon = tampon +1 where score > 1;
END;`);
await sql.run(`CREATE TRIGGER IF NOT EXISTS calcweeklyrankbis
AFTER UPDATE OF tampon ON player
BEGIN
UPDATE player SET weeklyRank=(select (select count(*)+1
from player as r
where r.weeklyScore > s.weeklyScore) as weeklyRank
from player as s WHERE discordId = old.discordId) WHERE discordId = old.discordId;
END;`);
}
}
=======
const Config = require('./utils/Config');
const sql = require("sqlite");
sql.open("./modules/data/database.sqlite");
class DatabaseManager {
/**
* This function analyses the passed database and check if it is valid. if no : create the database
* @param sql - a sqlite file.
*/
checkDatabaseValidity(sql) {
console.log('Checking Database ...');
sql.get(`SELECT version FROM database`).catch(() => {
this.createDatabase(sql);
}).then(() => {
console.log('... Database is valid !');
});
}
/**
* Allow to set the state of all the player to normal in order to allow them to play
*/
setEverybodyAsUnOccupied() {
console.log("Updating everybody ...");
sql.run(`UPDATE entity SET effect = ":smiley:" WHERE effect = ":clock10:"`).catch(console.error);
console.log("everybody updated !");
}
/**
* This function create the database
* @param sql - a sqlite file.
*/
createDatabase(sql) {
console.log("... Database is not valid !\nDatabase Generation ...");
//table entity
sql.run("CREATE TABLE IF NOT EXISTS entity (id TEXT, maxHealth INTEGER, health INTEGER, attack INTEGER, defense INTEGER, speed INTEGER, effect TEXT)").catch(console.error);
//table player
sql.run("CREATE TABLE IF NOT EXISTS player (discordId TEXT, score INTEGER, weeklyScore INTEGER, level INTEGER, experience INTEGER, money INTEGER, lastReport INTEGER, badges TEXT, tampon INTEGER)")
//table server
sql.run("CREATE TABLE IF NOT EXISTS server (id TEXT, prefix TEXT, language TEXT)").catch(console.error);
//table inventory
sql.run("CREATE TABLE IF NOT EXISTS inventory (playerId TEXT, weaponId TEXT, armorId TEXT, potionId TEXT, objectId TEXT, backupItemId TEXT, lastDaily INTEGER)").catch(console.error);
//table only used to store the version of the bot when the database was created
sql.run("CREATE TABLE IF NOT EXISTS database (version TEXT, lastReset INTEGER)").then(() => {
sql.run(`INSERT INTO database (version, lastReset) VALUES (\"${Config.version}\",0)`).then(() => {
console.log("... Generation Complete !");
});
});
}
/**
* Allow to reset the weekly top.
*/
async resetWeeklyScoreAndRank() {
//Reset weeklyScore column.
await sql.run("UPDATE player SET weeklyScore = 0").catch(console.error);
}
}
>>>>>>>
const Config = require('./utils/Config');
const sql = require("sqlite");
sql.open("./modules/data/database.sqlite");
class DatabaseManager {
/**
* This function analyses the passed database and check if it is valid. if no : create the database
* @param sql - a sqlite file.
*/
checkDatabaseValidity(sql) {
console.log('Checking Database ...');
sql.get(`SELECT version FROM database`).catch(() => {
this.createDatabase(sql);
});
sql.get("SELECT guildId FROM player").catch(() => {
this.updateDatabase(sql);
}).then(() => {
console.log('... Database is valid !');
});
}
//Add guildId column
await sql.run("ALTER TABLE player ADD guildId Text").catch(console.error);
//guild server
sql.run("CREATE TABLE IF NOT EXISTS guild (guildId TEXT, name TEXT, chief TEXT, score TEXT, level TEXT, experience TEXT, rank TEXT)").catch(console.error);
console.log("database updated !")
}
/**
* Allow to set the state of all the player to normal in order to allow them to play
*/
setEverybodyAsUnOccupied() {
console.log("Updating everybody ...");
sql.run(`UPDATE entity SET effect = ":smiley:" WHERE effect = ":clock10:"`).catch(console.error);
console.log("everybody updated !");
}
/**
* This function create the database
* @param sql - a sqlite file.
*/
createDatabase(sql) {
console.log("... Database is not valid !\nDatabase Generation ...");
//table entity
sql.run("CREATE TABLE IF NOT EXISTS entity (id TEXT, maxHealth INTEGER, health INTEGER, attack INTEGER, defense INTEGER, speed INTEGER, effect TEXT)").catch(console.error);
//table player
sql.run("CREATE TABLE IF NOT EXISTS player (discordId TEXT, score INTEGER, weeklyScore INTEGER, level INTEGER, experience INTEGER, money INTEGER, lastReport INTEGER, badges TEXT, tampon INTEGER)")
//table server
sql.run("CREATE TABLE IF NOT EXISTS server (id TEXT, prefix TEXT, language TEXT)").catch(console.error);
//table inventory
sql.run("CREATE TABLE IF NOT EXISTS inventory (playerId TEXT, weaponId TEXT, armorId TEXT, potionId TEXT, objectId TEXT, backupItemId TEXT, lastDaily INTEGER)").catch(console.error);
//guild server
sql.run("CREATE TABLE IF NOT EXISTS guild (guildId TEXT, name TEXT, chief TEXT, score TEXT, level TEXT, experience TEXT, rank TEXT)").catch(console.error);
//table only used to store the version of the bot when the database was created
sql.run("CREATE TABLE IF NOT EXISTS database (version TEXT, lastReset INTEGER)").then(() => {
sql.run(`INSERT INTO database (version, lastReset) VALUES (\"${Config.version}\",0)`).then(() => {
console.log("... Generation Complete !");
});
});
}
/**
* Allow to reset the weekly top.
*/
async resetWeeklyScoreAndRank() {
//Reset weeklyScore column.
await sql.run("UPDATE player SET weeklyScore = 0").catch(console.error);
}
} |
<<<<<<<
const Help = require('./commands/Help');
const Ping = require('./commands/Ping');
const Invite = require('./commands/Invite');
const Profile = require('./commands/Profile');
const Respawn = require('./commands/Respawn');
const Report = require('./commands/Report');
const Inventory = require('./commands/Inventory');
const Switch = require('./commands/Switch');
const Drink = require('./commands/Drink');
const Daily = require('./commands/Daily');
const Top = require('./commands/Top');
const TopWeek = require('./commands/TopWeek');
const Sell = require('./commands/Sell');
const Fight = require('./commands/Fight');
const Shop = require('./commands/Shop');
const Items = require('./commands/Items');
const Guild = require('./commands/guild/Guild');
const GuildAdd = require('./commands/guild/GuildAdd');
const GuildCreate = require('./commands/guild/GuildCreate');
const Reset = require('./commands/admin/Reset');
const Give = require('./commands/admin/Give');
const Servers = require('./commands/admin/Servers');
const GiveBadge = require('./commands/admin/GiveBadge');
const ResetBadge = require('./commands/admin/ResetBadge');
const ChangePrefix = require('./commands/admin/ChangePrefix');
const SendData = require('./commands/admin/SendData');
const Invitations = require('./commands/admin/Invitations');
const Points = require('./commands/admin/Points');
const Send = require('./commands/admin/Send');
const Language = require('./commands/admin/Language');
const CommandTable = new Map(
[
["help", Help.HelpCommand],
["ping", Ping.PingCommand],
["invite", Invite.InviteCommand],
["profile", Profile.ProfileCommand],
["p", Profile.ProfileCommand],
["report", Report.ReportCommand],
["r", Report.ReportCommand],
["respawn", Respawn.RespawnCommand],
["inventory", Inventory.InventoryCommand],
["inv", Inventory.InventoryCommand],
["switch", Switch.SwitchCommand],
["drink", Drink.DrinkCommand],
["dr", Drink.DrinkCommand],
["daily", Daily.DailyCommand],
["da", Daily.DailyCommand],
["top", Top.TopCommand],
["topweek", TopWeek.TopWeekCommand],
["topw", TopWeek.TopWeekCommand],
["tw", TopWeek.TopWeekCommand],
["sell", Sell.SellCommand],
["fight", Fight.FightCommand],
["f", Fight.FightCommand],
["s", Shop.ShopCommand],
["shop", Shop.ShopCommand],
["prefix", ChangePrefix.ChangePrefixCommand],
["language", Language.ChangeLanguageCommand],
["guild", Guild.guildCommand],
["g", Guild.guildCommand],
["guildadd", GuildAdd.guildAddCommand],
["gadd", GuildAdd.guildAddCommand],
["guildcreate", GuildCreate.guildCreateCommand],
["gcreate", GuildCreate.guildCreateCommand],
["items", Items.displayItems],
["reset", Reset.ResetCommand],
["invi", Invitations.InvitationsCommand],
["points", Points.PointsCommand],
["servs", Servers.ServersCommand],
["gb", GiveBadge.GiveBadgeCommand],
["give", Give.GiveCommand],
["cp", ChangePrefix.ChangePrefixCommand],
["rb", ResetBadge.ResetBadgeCommand],
["senddata", SendData.SendDataCommand],
["dm", Send.SendCommand],
]
);
=======
const Help = require('./commands/Help');
const Ping = require('./commands/Ping');
const Invite = require('./commands/Invite');
const Profile = require('./commands/Profile');
const Respawn = require('./commands/Respawn');
const Report = require('./commands/Report');
const Inventory = require('./commands/Inventory');
const Switch = require('./commands/Switch');
const Drink = require('./commands/Drink');
const Daily = require('./commands/Daily');
const Top = require('./commands/Top');
const TopWeek = require('./commands/TopWeek');
const TopServ = require('./commands/TopServ');
const Sell = require('./commands/Sell');
const Fight = require('./commands/Fight');
const Shop = require('./commands/Shop');
const Reset = require('./commands/admin/Reset');
const Give = require('./commands/admin/Give');
const ListItems = require('./commands/admin/ListItems');
const Servers = require('./commands/admin/Servers');
const GiveBadge = require('./commands/admin/GiveBadge');
const ResetBadge = require('./commands/admin/ResetBadge');
const ChangePrefix = require('./commands/admin/ChangePrefix');
const SendData = require('./commands/admin/SendData');
const Invitations = require('./commands/admin/Invitations');
const Points = require('./commands/admin/Points');
const PointsWeek = require('./commands/admin/PointsWeek');
const Send = require('./commands/admin/Send');
const Language = require('./commands/admin/Language');
const CommandTable = new Map(
[
["help", Help.HelpCommand],
["ping", Ping.PingCommand],
["invite", Invite.InviteCommand],
["profile", Profile.ProfileCommand],
["p", Profile.ProfileCommand],
["report", Report.ReportCommand],
["r", Report.ReportCommand],
["respawn", Respawn.RespawnCommand],
["inventory", Inventory.InventoryCommand],
["inv", Inventory.InventoryCommand],
["switch", Switch.SwitchCommand],
["drink", Drink.DrinkCommand],
["dr", Drink.DrinkCommand],
["daily", Daily.DailyCommand],
["da", Daily.DailyCommand],
["top", Top.TopCommand],
["topweek", TopWeek.TopWeekCommand],
["topw", TopWeek.TopWeekCommand],
["tops", TopServ.TopServCommand],
["topserv", TopServ.TopServCommand],
["tw", TopWeek.TopWeekCommand],
["sell", Sell.SellCommand],
["fight", Fight.FightCommand],
["f", Fight.FightCommand],
["s", Shop.ShopCommand],
["shop", Shop.ShopCommand],
["prefix", ChangePrefix.ChangePrefixCommand],
["language", Language.ChangeLanguageCommand],
["list", ListItems.ListItemsCommand],
["destroy", Reset.ResetCommand],
["invi", Invitations.InvitationsCommand],
["points", Points.PointsCommand],
["pointsw", PointsWeek.PointsWeekCommand],
["servs", Servers.ServersCommand],
["gb", GiveBadge.GiveBadgeCommand],
["give", Give.GiveCommand],
["cp", ChangePrefix.ChangePrefixCommand],
["rb", ResetBadge.ResetBadgeCommand],
["senddata", SendData.SendDataCommand],
["dm", Send.SendCommand],
]
);
>>>>>>>
const Help = require('./commands/Help');
const Ping = require('./commands/Ping');
const Invite = require('./commands/Invite');
const Profile = require('./commands/Profile');
const Respawn = require('./commands/Respawn');
const Report = require('./commands/Report');
const Inventory = require('./commands/Inventory');
const Switch = require('./commands/Switch');
const Drink = require('./commands/Drink');
const Daily = require('./commands/Daily');
const Top = require('./commands/Top');
const TopWeek = require('./commands/TopWeek');
const TopServ = require('./commands/TopServ');
const Sell = require('./commands/Sell');
const Fight = require('./commands/Fight');
const Shop = require('./commands/Shop');
const Items = require('./commands/Items');
const Guild = require('./commands/guild/Guild');
const GuildAdd = require('./commands/guild/GuildAdd');
const GuildCreate = require('./commands/guild/GuildCreate');
const Reset = require('./commands/admin/Reset');
const Give = require('./commands/admin/Give');
const ListItems = require('./commands/admin/ListItems');
const Servers = require('./commands/admin/Servers');
const GiveBadge = require('./commands/admin/GiveBadge');
const ResetBadge = require('./commands/admin/ResetBadge');
const ChangePrefix = require('./commands/admin/ChangePrefix');
const SendData = require('./commands/admin/SendData');
const Invitations = require('./commands/admin/Invitations');
const Points = require('./commands/admin/Points');
const PointsWeek = require('./commands/admin/PointsWeek');
const Send = require('./commands/admin/Send');
const Language = require('./commands/admin/Language');
const CommandTable = new Map(
[
["help", Help.HelpCommand],
["ping", Ping.PingCommand],
["invite", Invite.InviteCommand],
["profile", Profile.ProfileCommand],
["p", Profile.ProfileCommand],
["report", Report.ReportCommand],
["r", Report.ReportCommand],
["respawn", Respawn.RespawnCommand],
["inventory", Inventory.InventoryCommand],
["inv", Inventory.InventoryCommand],
["switch", Switch.SwitchCommand],
["drink", Drink.DrinkCommand],
["dr", Drink.DrinkCommand],
["daily", Daily.DailyCommand],
["da", Daily.DailyCommand],
["top", Top.TopCommand],
["topweek", TopWeek.TopWeekCommand],
["topw", TopWeek.TopWeekCommand],
["tops", TopServ.TopServCommand],
["topserv", TopServ.TopServCommand],
["tw", TopWeek.TopWeekCommand],
["sell", Sell.SellCommand],
["fight", Fight.FightCommand],
["f", Fight.FightCommand],
["s", Shop.ShopCommand],
["shop", Shop.ShopCommand],
["prefix", ChangePrefix.ChangePrefixCommand],
["language", Language.ChangeLanguageCommand],
["list", ListItems.ListItemsCommand],
["destroy", Reset.ResetCommand],
["gcreate", GuildCreate.guildCreateCommand],
["guildcreate", GuildCreate.guildCreateCommand],
["gadd", GuildAdd.guildAddCommand],
["guildadd", GuildAdd.guildAddCommand],
["g", Guild.guildCommand],
["guild", Guild.guildCommand],
["invi", Invitations.InvitationsCommand],
["points", Points.PointsCommand],
["pointsw", PointsWeek.PointsWeekCommand],
["servs", Servers.ServersCommand],
["gb", GiveBadge.GiveBadgeCommand],
["give", Give.GiveCommand],
["cp", ChangePrefix.ChangePrefixCommand],
["rb", ResetBadge.ResetBadgeCommand],
["senddata", SendData.SendDataCommand],
["dm", Send.SendCommand],
]
); |
<<<<<<<
it('should provide dispatch-bound blur() that modifies values', () => {
const store = makeStore({})
const formRender = createSpy()
class Form extends Component {
render() {
formRender(this.props)
return (
<form>
<Field name="foo" component="input" type="text"/>
</form>
)
}
}
const Decorated = reduxForm({ form: 'testForm' })(Form)
TestUtils.renderIntoDocument(
<Provider store={store}>
<Decorated/>
</Provider>
)
expect(store.getState()).toEqualMap({
form: {
testForm: {
registeredFields: [ { name: 'foo', type: 'Field' } ]
}
}
})
expect(formRender).toHaveBeenCalled()
expect(formRender.calls.length).toBe(1)
expect(formRender.calls[0].arguments[0].blur).toBeA('function')
formRender.calls[0].arguments[0].blur('foo', 'newValue')
// check modified state
expect(store.getState()).toEqualMap({
form: {
testForm: {
registeredFields: [ { name: 'foo', type: 'Field' } ],
values: { foo: 'newValue' },
fields: { foo: { touched: true } },
anyTouched: true
}
}
})
// rerendered again because now dirty
expect(formRender.calls.length).toBe(2)
})
it('should provide dispatch-bound change() that modifies values', () => {
const store = makeStore({})
const formRender = createSpy()
class Form extends Component {
render() {
formRender(this.props)
return (
<form>
<Field name="foo" component="input" type="text"/>
</form>
)
}
}
const Decorated = reduxForm({ form: 'testForm' })(Form)
TestUtils.renderIntoDocument(
<Provider store={store}>
<Decorated/>
</Provider>
)
expect(store.getState()).toEqualMap({
form: {
testForm: {
registeredFields: [ { name: 'foo', type: 'Field' } ]
}
}
})
expect(formRender).toHaveBeenCalled()
expect(formRender.calls.length).toBe(1)
expect(formRender.calls[0].arguments[0].change).toBeA('function')
formRender.calls[0].arguments[0].change('foo', 'newValue')
// check modified state
expect(store.getState()).toEqualMap({
form: {
testForm: {
registeredFields: [ { name: 'foo', type: 'Field' } ],
values: { foo: 'newValue' }
}
}
})
// rerendered again because now dirty
expect(formRender.calls.length).toBe(2)
})
=======
it('startSubmit in onSubmit promise', () => {
const store = makeStore({})
class Form extends Component {
render() {
const { handleSubmit } = this.props
return (
<form onSubmit={handleSubmit}>
<Field name="foo" component="input" type="text"/>
</form>
)
}
}
const resolvedProm = Promise.resolve()
const Decorated = reduxForm({
form: 'testForm',
destroyOnUnmount: false,
onSubmit(data, dispatch) {
dispatch(startSubmit('testForm'))
return resolvedProm
}
})(Form)
const dom = TestUtils.renderIntoDocument(
<Provider store={store}>
<Decorated/>
</Provider>
)
// unmount form
const stub = TestUtils.findRenderedComponentWithType(dom, Decorated)
stub.submit()
return resolvedProm.then(() => {
// form state not destroyed (just fields unregistered)
expect(store.getState()).toEqualMap({
form: {
testForm: {
anyTouched: true,
fields: {
foo: {
touched: true
}
},
registeredFields: [
{
name: 'foo',
type: 'Field'
}
],
submitSucceeded: true
}
}
})
})
})
it('startSubmit in onSubmit sync', () => {
const store = makeStore({})
class Form extends Component {
render() {
const { handleSubmit } = this.props
return (
<form onSubmit={handleSubmit}>
<Field name="foo" component="input" type="text"/>
</form>
)
}
}
const Decorated = reduxForm({
form: 'testForm',
destroyOnUnmount: false,
onSubmit(data, dispatch) {
dispatch(startSubmit('testForm'))
}
})(Form)
const dom = TestUtils.renderIntoDocument(
<Provider store={store}>
<Decorated/>
</Provider>
)
// unmount form
const stub = TestUtils.findRenderedComponentWithType(dom, Decorated)
stub.submit()
// form state not destroyed (just fields unregistered)
expect(store.getState()).toEqualMap({
form: {
testForm: {
anyTouched: true,
fields: {
foo: {
touched: true
}
},
registeredFields: [
{
name: 'foo',
type: 'Field'
}
],
submitting: true,
submitSucceeded: true
}
}
})
})
>>>>>>>
it('should provide dispatch-bound blur() that modifies values', () => {
const store = makeStore({})
const formRender = createSpy()
class Form extends Component {
render() {
formRender(this.props)
return (
<form>
<Field name="foo" component="input" type="text"/>
</form>
)
}
}
const Decorated = reduxForm({ form: 'testForm' })(Form)
TestUtils.renderIntoDocument(
<Provider store={store}>
<Decorated/>
</Provider>
)
expect(store.getState()).toEqualMap({
form: {
testForm: {
registeredFields: [ { name: 'foo', type: 'Field' } ]
}
}
})
expect(formRender).toHaveBeenCalled()
expect(formRender.calls.length).toBe(1)
expect(formRender.calls[0].arguments[0].blur).toBeA('function')
formRender.calls[0].arguments[0].blur('foo', 'newValue')
// check modified state
expect(store.getState()).toEqualMap({
form: {
testForm: {
registeredFields: [ { name: 'foo', type: 'Field' } ],
values: { foo: 'newValue' },
fields: { foo: { touched: true } },
anyTouched: true
}
}
})
// rerendered again because now dirty
expect(formRender.calls.length).toBe(2)
})
it('should provide dispatch-bound change() that modifies values', () => {
const store = makeStore({})
const formRender = createSpy()
class Form extends Component {
render() {
formRender(this.props)
return (
<form>
<Field name="foo" component="input" type="text"/>
</form>
)
}
}
const Decorated = reduxForm({ form: 'testForm' })(Form)
TestUtils.renderIntoDocument(
<Provider store={store}>
<Decorated/>
</Provider>
)
expect(store.getState()).toEqualMap({
form: {
testForm: {
registeredFields: [ { name: 'foo', type: 'Field' } ]
}
}
})
expect(formRender).toHaveBeenCalled()
expect(formRender.calls.length).toBe(1)
expect(formRender.calls[0].arguments[0].change).toBeA('function')
formRender.calls[0].arguments[0].change('foo', 'newValue')
// check modified state
expect(store.getState()).toEqualMap({
form: {
testForm: {
registeredFields: [ { name: 'foo', type: 'Field' } ],
values: { foo: 'newValue' }
}
}
})
// rerendered again because now dirty
expect(formRender.calls.length).toBe(2)
})
it('startSubmit in onSubmit promise', () => {
const store = makeStore({})
class Form extends Component {
render() {
const { handleSubmit } = this.props
return (
<form onSubmit={handleSubmit}>
<Field name="foo" component="input" type="text"/>
</form>
)
}
}
const resolvedProm = Promise.resolve()
const Decorated = reduxForm({
form: 'testForm',
destroyOnUnmount: false,
onSubmit(data, dispatch) {
dispatch(startSubmit('testForm'))
return resolvedProm
}
})(Form)
const dom = TestUtils.renderIntoDocument(
<Provider store={store}>
<Decorated/>
</Provider>
)
// unmount form
const stub = TestUtils.findRenderedComponentWithType(dom, Decorated)
stub.submit()
return resolvedProm.then(() => {
// form state not destroyed (just fields unregistered)
expect(store.getState()).toEqualMap({
form: {
testForm: {
anyTouched: true,
fields: {
foo: {
touched: true
}
},
registeredFields: [
{
name: 'foo',
type: 'Field'
}
],
submitSucceeded: true
}
}
})
})
})
it('startSubmit in onSubmit sync', () => {
const store = makeStore({})
class Form extends Component {
render() {
const { handleSubmit } = this.props
return (
<form onSubmit={handleSubmit}>
<Field name="foo" component="input" type="text"/>
</form>
)
}
}
const Decorated = reduxForm({
form: 'testForm',
destroyOnUnmount: false,
onSubmit(data, dispatch) {
dispatch(startSubmit('testForm'))
}
})(Form)
const dom = TestUtils.renderIntoDocument(
<Provider store={store}>
<Decorated/>
</Provider>
)
// unmount form
const stub = TestUtils.findRenderedComponentWithType(dom, Decorated)
stub.submit()
// form state not destroyed (just fields unregistered)
expect(store.getState()).toEqualMap({
form: {
testForm: {
anyTouched: true,
fields: {
foo: {
touched: true
}
},
registeredFields: [
{
name: 'foo',
type: 'Field'
}
],
submitting: true,
submitSucceeded: true
}
}
})
}) |
<<<<<<<
'angle opacity cornersize fill overlayFill originX originY ' +
=======
'angle opacity cornerSize fill overlayFill ' +
>>>>>>>
'angle opacity cornerSize fill overlayFill originX originY ' + |
<<<<<<<
* Horizontal origin of transformation of an object (one of "left", "right", "center")
* @property
* @type String
*/
originX: 'center',
/**
* Vertical origin of transformation of an object (one of "top", "bottom", "center")
* @property
* @type String
*/
originY: 'center',
/**
* Top position of an object
=======
* Object top offset
>>>>>>>
* Horizontal origin of transformation of an object (one of "left", "right", "center")
* @property
* @type String
*/
originX: 'center',
/**
* Vertical origin of transformation of an object (one of "top", "bottom", "center")
* @property
* @type String
*/
originY: 'center',
/**
* Top position of an object
<<<<<<<
* Left position of an object
=======
* Object left offset
>>>>>>>
* Left position of an object
<<<<<<<
* Width of an object
=======
* Object width
>>>>>>>
* Width of an object
<<<<<<<
* Height of an object
=======
* Object height
>>>>>>>
* Height of an object
<<<<<<<
* Horizontal scale of an object
=======
* Object scale factor (horizontal)
>>>>>>>
* Object scale factor (horizontal)
<<<<<<<
* Vertical scale of an object
=======
* Object scale factor (vertical)
>>>>>>>
* Object scale factor (vertical)
<<<<<<<
* Angle of an object (in degrees)
=======
* Angle of rotation of an object
>>>>>>>
* Angle of rotation of an object (in degrees)
<<<<<<<
* Color of object's borders (when in active state)
=======
* Border color of an object (when it's active)
>>>>>>>
* Border color of an object (when it's active)
<<<<<<<
* Color of object's corners (when in active state)
=======
* Corner color of an object (when it's active)
>>>>>>>
* Corner color of an object (when it's active)
<<<<<<<
* Dash pattern of a stroke for this object
=======
* Array specifying dash pattern of an object's stroke
>>>>>>>
* Array specifying dash pattern of an object's stroke
<<<<<<<
* Border opacity when object is active and moving
=======
* Opacity of a border when moving an object
>>>>>>>
* Border opacity when object is active and moving
<<<<<<<
* When `false`, default object's values are not included in its serialization
=======
* When false, default values are not included in serialization result
>>>>>>>
* When `false`, default object's values are not included in its serialization
<<<<<<<
NUM_FRACTION_DIGITS: 2
=======
NUM_FRACTION_DIGITS: 2,
/**
* Minimum allowed scale value of an object
* @static
* @constant
* @type Number
*/
MIN_SCALE_LIMIT: 0.1
>>>>>>>
NUM_FRACTION_DIGITS: 2 |
<<<<<<<
deepEqual(polygon.get('points'), [ { x: 5, y: 7 }, { x: 15, y: 17 } ]);
=======
deepEqual([ { x: -5, y: -5 }, { x: 5, y: 5 } ], polygon.get('points'));
>>>>>>>
deepEqual(polygon.get('points'), [ { x: -5, y: -5 }, { x: 5, y: 5 } ]); |
<<<<<<<
fill: this.points[i].fill
=======
originX: 'center',
originY: 'center',
fill: point.fill
>>>>>>>
originX: 'center',
originY: 'center',
fill: this.points[i].fill
<<<<<<<
var group = new fabric.Group(circles);
group.canvas = this.canvas;
=======
var group = new fabric.Group(circles, { originX: 'center', originY: 'center' });
>>>>>>>
var group = new fabric.Group(circles, { originX: 'center', originY: 'center' });
group.canvas = this.canvas; |
<<<<<<<
const path_1 = __importDefault(__webpack_require__(622));
=======
const ssh2_streams_1 = __webpack_require__(139);
>>>>>>>
const path_1 = __importDefault(__webpack_require__(622));
const ssh2_streams_1 = __webpack_require__(139);
<<<<<<<
const rmRemote = !!core.getInput('rmRemote') || false;
=======
const atomicPut = core.getInput('atomicPut');
if (atomicPut) {
// patch SFTPStream to atomically rename files
const originalFastPut = ssh2_streams_1.SFTPStream.prototype.fastPut;
ssh2_streams_1.SFTPStream.prototype.fastPut = function (localPath, remotePath, opts, cb) {
const parsedPath = path_1.default.posix.parse(remotePath);
parsedPath.base = '.' + parsedPath.base;
const tmpRemotePath = path_1.default.posix.format(parsedPath);
const that = this;
originalFastPut.apply(this, [localPath, tmpRemotePath, opts, function (error, result) {
if (error) {
cb(error, result);
}
else {
that.ext_openssh_rename(tmpRemotePath, remotePath, cb);
}
}]);
};
}
>>>>>>>
const rmRemote = !!core.getInput('rmRemote') || false;
const atomicPut = core.getInput('atomicPut');
if (atomicPut) {
// patch SFTPStream to atomically rename files
const originalFastPut = ssh2_streams_1.SFTPStream.prototype.fastPut;
ssh2_streams_1.SFTPStream.prototype.fastPut = function (localPath, remotePath, opts, cb) {
const parsedPath = path_2.default.posix.parse(remotePath);
parsedPath.base = '.' + parsedPath.base;
const tmpRemotePath = path_2.default.posix.format(parsedPath);
const that = this;
originalFastPut.apply(this, [
localPath,
tmpRemotePath,
opts,
function (error, result) {
if (error) {
cb(error, result);
}
else {
that.ext_openssh_rename(tmpRemotePath, remotePath, cb);
}
}
]);
};
} |
<<<<<<<
{
name: 'Adam Urban',
description:
"coder, father, left-handed",
url: 'https://urbanisierung.dev/uses/',
twitter: '@urbanisierung',
emoji: '🚀',
country: '🇩🇪',
computer: 'linux',
phone: 'iphone',
tags: [
'Engineer',
'Full Stack',
'Designer',
'TypeScript',
'Angular',
'Node',
'i3',
'Serverless',
'GCP',
],
},
=======
{
name: 'Amit Merchant',
description: 'Maker of things. Open-source enthusiast. Blogger. ',
url: 'https://www.amitmerchant.com/uses',
twitter: '@amit_merchant',
emoji: '🔥',
country: '🇮🇳',
computer: 'linux',
phone: 'android',
tags: [
'Developer',
'Full Stack',
'Entrepreneur',
'Blogger',
'JavaScript',
'React',
'PHP',
'Laravel',
'CSS',
],
},
{
name: 'Junaid Qadir',
description:'A Full Stack #Laravel Developer',
url: 'https://junaidqadir.com/uses',
twitter: '@junaidqadirb',
emoji: '⌨',
country: '🇨🇦',
computer: 'linux',
phone: 'android',
tags: [
'Blogger',
'Developer',
'Full Stack',
'Laravel',
'PHP',
'JavaScript',
'VueJS',
'React',
'CSS',
],
},
{
name: 'Yurui Zhang',
description:
'Full-stack developer. Dark mode enthusiast. Quality software devotee.',
url: 'https://gist.github.com/pallymore/6e12133b5c2fa2856a8a6b288e579c01',
twitter: '@yuruiology',
emoji: '🐙',
country: '🇨🇳',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'JavaScript',
'TypeScript',
'React',
'Node',
'CSS',
'Ruby',
'Testing'
],
},
{
name: 'Eduardo Reveles',
description: 'Web Engineer, Husband, Gamer.',
url: 'https://www.osiux.ws/about/uses',
twitter: '@osiux',
emoji: '🐈',
country: '🇲🇽',
computer: 'linux',
phone: 'android',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'Laravel', 'React'],
},
{
name: 'Thomas Maximini',
description: 'Freelance software developer from Germany.',
url: 'https://www.maxi.io/uses/',
twitter: '@tmaximini',
emoji: '🐍',
country: '🇩🇪',
computer: 'apple',
phone: 'iphone',
tags: [
'JavaScript',
'React',
'Blogger',
'GraphQL',
'serverless',
'Node',
'Full Stack',
],
},
{
name: 'Philip Theobald',
description: 'Guitar player, motorcyclist, software engineer, entreprenuer',
url: 'https://www.philiptheobald.com/uses/',
twitter: '@fylzero',
emoji: '🤑',
country: '🇺🇸',
computer: 'apple',
phone: 'android',
tags: ['Software Engineer', 'Laravel', 'Vue', 'WordPress'],
},
{
name: 'Alejandro G. Anglada',
description:
'Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌',
url: 'https://aganglada.com/uses/',
twitter: '@aganglada',
emoji: '🔥',
country: '🇪🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Front End',
'Mentor',
'YouTuber',
'Writer',
'JavaScript',
'TypeScript',
'Performance',
'PWA',
'React',
'Node',
'CSS',
],
},
{
name: 'Antoni Kepinski',
description: 'Node Fetch maintainer // Into Node.js and Rust',
url: 'https://kepinski.me/uses/',
twitter: '@dokwadratu',
emoji: '⚡',
country: '🇵🇱',
computer: 'linux',
phone: 'iphone',
tags: ['JavaScript', 'Developer', 'TypeScript', 'React', 'Rust', 'Node'],
},
{
name: 'Marcus Obst',
description: 'Webdeveloper, Music Lover',
url: 'https://marcus-obst.de/uses',
emoji: '🍊',
country: '🇩🇪',
computer: 'windows',
phone: 'iphone',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'CSS', 'Vue'],
},
{
name: 'Pawel Grzybek',
description: 'Software Engineer',
url: 'https://pawelgrzybek.com/uses/',
twitter: '@pawelgrzybek',
emoji: '🥑',
country: '🇵🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'HTML',
'CSS',
'JavaScript',
'Node',
'Software Engineer',
'Front End',
'Back End',
'Full Stack',
'Blogger',
],
},
{
name: 'Eric McCormick',
description:
'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
url: 'https://edm00se.codes/uses/',
twitter: '@edm00se',
emoji: '🤔',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'Blogger',
'Speaker',
'YouTuber',
'JavaScript',
'Vue',
'Node',
'CSS',
],
},
{
name: 'Ben Congdon',
description: 'Golang, Python, Rust. Runs in the Cloud.',
url: 'https://benjamincongdon.me/uses',
twitter: '@BenRCongdon',
emoji: '🤷♂️',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Engineer',
'Go',
'Rust',
'Serverless',
'Python',
'JavaScript',
'React',
],
},
{
name: 'Jens van Wijhe',
description: 'Creative web developer and entrepreneur',
url: 'https://jens.ai/uses',
twitter: '@jvanwijhe',
emoji: '👨🏻🚀',
country: '🇳🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'JavaScript',
'Vue',
'Angular',
'Ionic',
'Firebase',
'PHP',
'Laravel',
'Wordpress',
'CSS',
'Tailwind',
],
},
{
name: 'Jacob Herper',
description:
'Senior Front-End Engineer with a passion for all things digital. I create amazing web apps to make the internet a better place.',
url: 'https://herper.io/uses/',
twitter: '@jakeherp',
emoji: '👨💻',
country: '🇬🇧',
computer: 'apple',
phone: 'iphone',
tags: [
'JavaScript',
'React',
'Gatsby',
'Front End',
'Engineer',
'TypeScript',
'Performance',
'Entrepreneur',
],
},
{
name: 'Ryan Warner',
description: 'Software Engineer and Interface Designer. Leader and Mentor.',
url: 'https://ryan.warner.codes/uses',
emoji: '😄',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Designer',
'Entrepreneur',
'JavaScript',
'React',
'Gatsby',
'Firebase',
'Node',
'CSS',
],
},
>>>>>>>
{
name: 'Amit Merchant',
description: 'Maker of things. Open-source enthusiast. Blogger. ',
url: 'https://www.amitmerchant.com/uses',
twitter: '@amit_merchant',
emoji: '🔥',
country: '🇮🇳',
computer: 'linux',
phone: 'android',
tags: [
'Developer',
'Full Stack',
'Entrepreneur',
'Blogger',
'JavaScript',
'React',
'PHP',
'Laravel',
'CSS',
],
},
{
name: 'Junaid Qadir',
description:'A Full Stack #Laravel Developer',
url: 'https://junaidqadir.com/uses',
twitter: '@junaidqadirb',
emoji: '⌨',
country: '🇨🇦',
computer: 'linux',
phone: 'android',
tags: [
'Blogger',
'Developer',
'Full Stack',
'Laravel',
'PHP',
'JavaScript',
'VueJS',
'React',
'CSS',
],
},
{
name: 'Yurui Zhang',
description:
'Full-stack developer. Dark mode enthusiast. Quality software devotee.',
url: 'https://gist.github.com/pallymore/6e12133b5c2fa2856a8a6b288e579c01',
twitter: '@yuruiology',
emoji: '🐙',
country: '🇨🇳',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'JavaScript',
'TypeScript',
'React',
'Node',
'CSS',
'Ruby',
'Testing'
],
},
{
name: 'Eduardo Reveles',
description: 'Web Engineer, Husband, Gamer.',
url: 'https://www.osiux.ws/about/uses',
twitter: '@osiux',
emoji: '🐈',
country: '🇲🇽',
computer: 'linux',
phone: 'android',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'Laravel', 'React'],
},
{
name: 'Thomas Maximini',
description: 'Freelance software developer from Germany.',
url: 'https://www.maxi.io/uses/',
twitter: '@tmaximini',
emoji: '🐍',
country: '🇩🇪',
computer: 'apple',
phone: 'iphone',
tags: [
'JavaScript',
'React',
'Blogger',
'GraphQL',
'serverless',
'Node',
'Full Stack',
],
},
{
name: 'Philip Theobald',
description: 'Guitar player, motorcyclist, software engineer, entreprenuer',
url: 'https://www.philiptheobald.com/uses/',
twitter: '@fylzero',
emoji: '🤑',
country: '🇺🇸',
computer: 'apple',
phone: 'android',
tags: ['Software Engineer', 'Laravel', 'Vue', 'WordPress'],
},
{
name: 'Alejandro G. Anglada',
description:
'Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌',
url: 'https://aganglada.com/uses/',
twitter: '@aganglada',
emoji: '🔥',
country: '🇪🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Front End',
'Mentor',
'YouTuber',
'Writer',
'JavaScript',
'TypeScript',
'Performance',
'PWA',
'React',
'Node',
'CSS',
],
},
{
name: 'Antoni Kepinski',
description: 'Node Fetch maintainer // Into Node.js and Rust',
url: 'https://kepinski.me/uses/',
twitter: '@dokwadratu',
emoji: '⚡',
country: '🇵🇱',
computer: 'linux',
phone: 'iphone',
tags: ['JavaScript', 'Developer', 'TypeScript', 'React', 'Rust', 'Node'],
},
{
name: 'Marcus Obst',
description: 'Webdeveloper, Music Lover',
url: 'https://marcus-obst.de/uses',
emoji: '🍊',
country: '🇩🇪',
computer: 'windows',
phone: 'iphone',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'CSS', 'Vue'],
},
{
name: 'Pawel Grzybek',
description: 'Software Engineer',
url: 'https://pawelgrzybek.com/uses/',
twitter: '@pawelgrzybek',
emoji: '🥑',
country: '🇵🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'HTML',
'CSS',
'JavaScript',
'Node',
'Software Engineer',
'Front End',
'Back End',
'Full Stack',
'Blogger',
],
},
{
name: 'Eric McCormick',
description:
'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
url: 'https://edm00se.codes/uses/',
twitter: '@edm00se',
emoji: '🤔',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'Blogger',
'Speaker',
'YouTuber',
'JavaScript',
'Vue',
'Node',
'CSS',
],
},
{
name: 'Ben Congdon',
description: 'Golang, Python, Rust. Runs in the Cloud.',
url: 'https://benjamincongdon.me/uses',
twitter: '@BenRCongdon',
emoji: '🤷♂️',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Engineer',
'Go',
'Rust',
'Serverless',
'Python',
'JavaScript',
'React',
],
},
{
name: 'Jens van Wijhe',
description: 'Creative web developer and entrepreneur',
url: 'https://jens.ai/uses',
twitter: '@jvanwijhe',
emoji: '👨🏻🚀',
country: '🇳🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'JavaScript',
'Vue',
'Angular',
'Ionic',
'Firebase',
'PHP',
'Laravel',
'Wordpress',
'CSS',
'Tailwind',
],
},
{
name: 'Jacob Herper',
description:
'Senior Front-End Engineer with a passion for all things digital. I create amazing web apps to make the internet a better place.',
url: 'https://herper.io/uses/',
twitter: '@jakeherp',
emoji: '👨💻',
country: '🇬🇧',
computer: 'apple',
phone: 'iphone',
tags: [
'JavaScript',
'React',
'Gatsby',
'Front End',
'Engineer',
'TypeScript',
'Performance',
'Entrepreneur',
],
},
{
name: 'Ryan Warner',
description: 'Software Engineer and Interface Designer. Leader and Mentor.',
url: 'https://ryan.warner.codes/uses',
emoji: '😄',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Designer',
'Entrepreneur',
'JavaScript',
'React',
'Gatsby',
'Firebase',
'Node',
'CSS',
],
},
{
name: 'Adam Urban',
description:
"coder, father, left-handed",
url: 'https://urbanisierung.dev/uses/',
twitter: '@urbanisierung',
emoji: '🚀',
country: '🇩🇪',
computer: 'linux',
phone: 'iphone',
tags: [
'Engineer',
'Full Stack',
'Designer',
'TypeScript',
'Angular',
'Node',
'i3',
'Serverless',
'GCP',
],
}, |
<<<<<<<
{
name: 'Yurui Zhang',
description:
'Full-stack developer. Dark mode enthusiast. Quality software devotee.',
url: 'https://gist.github.com/pallymore/6e12133b5c2fa2856a8a6b288e579c01',
twitter: '@yuruiology',
emoji: '🐙',
country: '🇨🇳',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'JavaScript',
'TypeScript',
'React',
'Node',
'CSS',
'Ruby',
'Testing'
],
},
=======
{
name: 'Eduardo Reveles',
description: 'Web Engineer, Husband, Gamer.',
url: 'https://www.osiux.ws/about/uses',
twitter: '@osiux',
emoji: '🐈',
country: '🇲🇽',
computer: 'linux',
phone: 'android',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'Laravel', 'React'],
},
{
name: 'Oscar Sánchez',
description: 'Passionate developer, traveler and drummer from Perú',
url: 'https://devlusaja.com',
twitter: '@dev_lusaja',
emoji: '💻🛩💪',
country: '🇵🇪',
computer: 'linux',
phone: 'android',
tags: [
'Developer',
'Software Architect',
'Python',
'PHP',
'Docker',
'Graphql',
'AWS',
'Open Source',
],
},
{
name: 'Thomas Maximini',
description: 'Freelance software developer from Germany.',
url: 'https://www.maxi.io/uses/',
twitter: '@tmaximini',
emoji: '🐍',
country: '🇩🇪',
computer: 'apple',
phone: 'iphone',
tags: [
'JavaScript',
'React',
'Blogger',
'GraphQL',
'serverless',
'Node',
'Full Stack',
],
},
{
name: 'Philip Theobald',
description: 'Guitar player, motorcyclist, software engineer, entreprenuer',
url: 'https://www.philiptheobald.com/uses/',
twitter: '@fylzero',
emoji: '🤑',
country: '🇺🇸',
computer: 'apple',
phone: 'android',
tags: ['Software Engineer', 'Laravel', 'Vue', 'WordPress'],
},
{
name: 'Alejandro G. Anglada',
description:
'Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌',
url: 'https://aganglada.com/uses/',
twitter: '@aganglada',
emoji: '🔥',
country: '🇪🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Front End',
'Mentor',
'YouTuber',
'Writer',
'JavaScript',
'TypeScript',
'Performance',
'PWA',
'React',
'Node',
'CSS',
],
},
{
name: 'Antoni Kepinski',
description: 'Node Fetch maintainer // Into Node.js and Rust',
url: 'https://kepinski.me/uses/',
twitter: '@dokwadratu',
emoji: '⚡',
country: '🇵🇱',
computer: 'linux',
phone: 'iphone',
tags: ['JavaScript', 'Developer', 'TypeScript', 'React', 'Rust', 'Node'],
},
{
name: 'Marcus Obst',
description: 'Webdeveloper, Music Lover',
url: 'https://marcus-obst.de/uses',
emoji: '🍊',
country: '🇩🇪',
computer: 'windows',
phone: 'iphone',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'CSS', 'Vue'],
},
{
name: 'Pawel Grzybek',
description: 'Software Engineer',
url: 'https://pawelgrzybek.com/uses/',
twitter: '@pawelgrzybek',
emoji: '🥑',
country: '🇵🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'HTML',
'CSS',
'JavaScript',
'Node',
'Software Engineer',
'Front End',
'Back End',
'Full Stack',
'Blogger',
],
},
{
name: 'Eric McCormick',
description:
'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
url: 'https://edm00se.codes/uses/',
twitter: '@edm00se',
emoji: '🤔',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'Blogger',
'Speaker',
'YouTuber',
'JavaScript',
'Vue',
'Node',
'CSS',
],
},
{
name: 'Ben Congdon',
description: 'Golang, Python, Rust. Runs in the Cloud.',
url: 'https://benjamincongdon.me/uses',
twitter: '@BenRCongdon',
emoji: '🤷♂️',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Engineer',
'Go',
'Rust',
'Serverless',
'Python',
'JavaScript',
'React',
],
},
>>>>>>>
{
name: 'Yurui Zhang',
description:
'Full-stack developer. Dark mode enthusiast. Quality software devotee.',
url: 'https://gist.github.com/pallymore/6e12133b5c2fa2856a8a6b288e579c01',
twitter: '@yuruiology',
emoji: '🐙',
country: '🇨🇳',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'JavaScript',
'TypeScript',
'React',
'Node',
'CSS',
'Ruby',
'Testing'
],
},
{
name: 'Eduardo Reveles',
description: 'Web Engineer, Husband, Gamer.',
url: 'https://www.osiux.ws/about/uses',
twitter: '@osiux',
emoji: '🐈',
country: '🇲🇽',
computer: 'linux',
phone: 'android',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'Laravel', 'React'],
},
{
name: 'Oscar Sánchez',
description: 'Passionate developer, traveler and drummer from Perú',
url: 'https://devlusaja.com',
twitter: '@dev_lusaja',
emoji: '💻🛩💪',
country: '🇵🇪',
computer: 'linux',
phone: 'android',
tags: [
'Developer',
'Software Architect',
'Python',
'PHP',
'Docker',
'Graphql',
'AWS',
'Open Source',
],
},
{
name: 'Thomas Maximini',
description: 'Freelance software developer from Germany.',
url: 'https://www.maxi.io/uses/',
twitter: '@tmaximini',
emoji: '🐍',
country: '🇩🇪',
computer: 'apple',
phone: 'iphone',
tags: [
'JavaScript',
'React',
'Blogger',
'GraphQL',
'serverless',
'Node',
'Full Stack',
],
},
{
name: 'Philip Theobald',
description: 'Guitar player, motorcyclist, software engineer, entreprenuer',
url: 'https://www.philiptheobald.com/uses/',
twitter: '@fylzero',
emoji: '🤑',
country: '🇺🇸',
computer: 'apple',
phone: 'android',
tags: ['Software Engineer', 'Laravel', 'Vue', 'WordPress'],
},
{
name: 'Alejandro G. Anglada',
description:
'Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌',
url: 'https://aganglada.com/uses/',
twitter: '@aganglada',
emoji: '🔥',
country: '🇪🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Front End',
'Mentor',
'YouTuber',
'Writer',
'JavaScript',
'TypeScript',
'Performance',
'PWA',
'React',
'Node',
'CSS',
],
},
{
name: 'Antoni Kepinski',
description: 'Node Fetch maintainer // Into Node.js and Rust',
url: 'https://kepinski.me/uses/',
twitter: '@dokwadratu',
emoji: '⚡',
country: '🇵🇱',
computer: 'linux',
phone: 'iphone',
tags: ['JavaScript', 'Developer', 'TypeScript', 'React', 'Rust', 'Node'],
},
{
name: 'Marcus Obst',
description: 'Webdeveloper, Music Lover',
url: 'https://marcus-obst.de/uses',
emoji: '🍊',
country: '🇩🇪',
computer: 'windows',
phone: 'iphone',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'CSS', 'Vue'],
},
{
name: 'Pawel Grzybek',
description: 'Software Engineer',
url: 'https://pawelgrzybek.com/uses/',
twitter: '@pawelgrzybek',
emoji: '🥑',
country: '🇵🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'HTML',
'CSS',
'JavaScript',
'Node',
'Software Engineer',
'Front End',
'Back End',
'Full Stack',
'Blogger',
],
},
{
name: 'Eric McCormick',
description:
'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
url: 'https://edm00se.codes/uses/',
twitter: '@edm00se',
emoji: '🤔',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'Blogger',
'Speaker',
'YouTuber',
'JavaScript',
'Vue',
'Node',
'CSS',
],
},
{
name: 'Ben Congdon',
description: 'Golang, Python, Rust. Runs in the Cloud.',
url: 'https://benjamincongdon.me/uses',
twitter: '@BenRCongdon',
emoji: '🤷♂️',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Engineer',
'Go',
'Rust',
'Serverless',
'Python',
'JavaScript',
'React',
],
}, |
<<<<<<<
},
{
name: 'Timothy Miller',
description:
'Web Designer/Developer for hire. Wears lots of hats.',
url: 'https://timothymiller.dev/uses',
twitter: '@WebInspectInc',
emoji: '🥓',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Designer',
'Front End',
'Full Stack',
'Entrepreneur',
'YouTuber',
'JavaScript',
'CSS',
'PHP',
'Blogger'
],
}
=======
},
{
name: 'Kilian Valkhof',
description: 'User experience developer',
url: 'https://kilianvalkhof.com/using/',
twitter: '@kilianvalkhof',
emoji: '🐧',
country: '🇳🇱',
computer: 'linux',
phone: 'iphone',
tags: [
'Developer',
'Designer',
'Full stack',
'Front-end',
'Entrepreneur',
'JavaScript',
'React',
'Node',
'Electron',
'Polypane',
'Devtools',
],
},
>>>>>>>
},
{
name: 'Kilian Valkhof',
description: 'User experience developer',
url: 'https://kilianvalkhof.com/using/',
twitter: '@kilianvalkhof',
emoji: '🐧',
country: '🇳🇱',
computer: 'linux',
phone: 'iphone',
tags: [
'Developer',
'Designer',
'Full stack',
'Front-end',
'Entrepreneur',
'JavaScript',
'React',
'Node',
'Electron',
'Polypane',
'Devtools',
],
},
{
name: 'Timothy Miller',
description:
'Web Designer/Developer for hire. Wears lots of hats.',
url: 'https://timothymiller.dev/uses',
twitter: '@WebInspectInc',
emoji: '🥓',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Designer',
'Front End',
'Full Stack',
'Entrepreneur',
'YouTuber',
'JavaScript',
'CSS',
'PHP',
'Blogger'
],
} |
<<<<<<<
{
name: 'Amit Merchant',
description: 'Maker of things. Open-source enthusiast. Blogger. ',
url: 'https://www.amitmerchant.com/uses',
twitter: '@amit_merchant',
emoji: '🔥',
country: '🇮🇳',
computer: 'linux',
phone: 'android',
tags: [
'Developer',
'Full Stack',
'Entrepreneur',
'Blogger',
'JavaScript',
'React',
'PHP',
'Laravel',
'CSS',
],
}
=======
{
name: 'Junaid Qadir',
description:'A Full Stack #Laravel Developer',
url: 'https://junaidqadir.com/uses',
twitter: '@junaidqadirb',
emoji: '⌨',
country: '🇨🇦',
computer: 'linux',
phone: 'android',
tags: [
'Blogger',
'Developer',
'Full Stack',
'Laravel',
'PHP',
'JavaScript',
'VueJS',
'React',
'CSS',
],
},
{
name: 'Yurui Zhang',
description:
'Full-stack developer. Dark mode enthusiast. Quality software devotee.',
url: 'https://gist.github.com/pallymore/6e12133b5c2fa2856a8a6b288e579c01',
twitter: '@yuruiology',
emoji: '🐙',
country: '🇨🇳',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'JavaScript',
'TypeScript',
'React',
'Node',
'CSS',
'Ruby',
'Testing'
],
},
{
name: 'Eduardo Reveles',
description: 'Web Engineer, Husband, Gamer.',
url: 'https://www.osiux.ws/about/uses',
twitter: '@osiux',
emoji: '🐈',
country: '🇲🇽',
computer: 'linux',
phone: 'android',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'Laravel', 'React'],
},
{
name: 'Thomas Maximini',
description: 'Freelance software developer from Germany.',
url: 'https://www.maxi.io/uses/',
twitter: '@tmaximini',
emoji: '🐍',
country: '🇩🇪',
computer: 'apple',
phone: 'iphone',
tags: [
'JavaScript',
'React',
'Blogger',
'GraphQL',
'serverless',
'Node',
'Full Stack',
],
},
{
name: 'Philip Theobald',
description: 'Guitar player, motorcyclist, software engineer, entreprenuer',
url: 'https://www.philiptheobald.com/uses/',
twitter: '@fylzero',
emoji: '🤑',
country: '🇺🇸',
computer: 'apple',
phone: 'android',
tags: ['Software Engineer', 'Laravel', 'Vue', 'WordPress'],
},
{
name: 'Alejandro G. Anglada',
description:
'Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌',
url: 'https://aganglada.com/uses/',
twitter: '@aganglada',
emoji: '🔥',
country: '🇪🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Front End',
'Mentor',
'YouTuber',
'Writer',
'JavaScript',
'TypeScript',
'Performance',
'PWA',
'React',
'Node',
'CSS',
],
},
{
name: 'Antoni Kepinski',
description: 'Node Fetch maintainer // Into Node.js and Rust',
url: 'https://kepinski.me/uses/',
twitter: '@dokwadratu',
emoji: '⚡',
country: '🇵🇱',
computer: 'linux',
phone: 'iphone',
tags: ['JavaScript', 'Developer', 'TypeScript', 'React', 'Rust', 'Node'],
},
{
name: 'Marcus Obst',
description: 'Webdeveloper, Music Lover',
url: 'https://marcus-obst.de/uses',
emoji: '🍊',
country: '🇩🇪',
computer: 'windows',
phone: 'iphone',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'CSS', 'Vue'],
},
{
name: 'Pawel Grzybek',
description: 'Software Engineer',
url: 'https://pawelgrzybek.com/uses/',
twitter: '@pawelgrzybek',
emoji: '🥑',
country: '🇵🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'HTML',
'CSS',
'JavaScript',
'Node',
'Software Engineer',
'Front End',
'Back End',
'Full Stack',
'Blogger',
],
},
{
name: 'Eric McCormick',
description:
'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
url: 'https://edm00se.codes/uses/',
twitter: '@edm00se',
emoji: '🤔',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'Blogger',
'Speaker',
'YouTuber',
'JavaScript',
'Vue',
'Node',
'CSS',
],
},
{
name: 'Ben Congdon',
description: 'Golang, Python, Rust. Runs in the Cloud.',
url: 'https://benjamincongdon.me/uses',
twitter: '@BenRCongdon',
emoji: '🤷♂️',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Engineer',
'Go',
'Rust',
'Serverless',
'Python',
'JavaScript',
'React',
],
},
>>>>>>>
{
name: 'Amit Merchant',
description: 'Maker of things. Open-source enthusiast. Blogger. ',
url: 'https://www.amitmerchant.com/uses',
twitter: '@amit_merchant',
emoji: '🔥',
country: '🇮🇳',
computer: 'linux',
phone: 'android',
tags: [
'Developer',
'Full Stack',
'Entrepreneur',
'Blogger',
'JavaScript',
'React',
'PHP',
'Laravel',
'CSS',
],
},
{
name: 'Junaid Qadir',
description:'A Full Stack #Laravel Developer',
url: 'https://junaidqadir.com/uses',
twitter: '@junaidqadirb',
emoji: '⌨',
country: '🇨🇦',
computer: 'linux',
phone: 'android',
tags: [
'Blogger',
'Developer',
'Full Stack',
'Laravel',
'PHP',
'JavaScript',
'VueJS',
'React',
'CSS',
],
},
{
name: 'Yurui Zhang',
description:
'Full-stack developer. Dark mode enthusiast. Quality software devotee.',
url: 'https://gist.github.com/pallymore/6e12133b5c2fa2856a8a6b288e579c01',
twitter: '@yuruiology',
emoji: '🐙',
country: '🇨🇳',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'JavaScript',
'TypeScript',
'React',
'Node',
'CSS',
'Ruby',
'Testing'
],
},
{
name: 'Eduardo Reveles',
description: 'Web Engineer, Husband, Gamer.',
url: 'https://www.osiux.ws/about/uses',
twitter: '@osiux',
emoji: '🐈',
country: '🇲🇽',
computer: 'linux',
phone: 'android',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'Laravel', 'React'],
},
{
name: 'Thomas Maximini',
description: 'Freelance software developer from Germany.',
url: 'https://www.maxi.io/uses/',
twitter: '@tmaximini',
emoji: '🐍',
country: '🇩🇪',
computer: 'apple',
phone: 'iphone',
tags: [
'JavaScript',
'React',
'Blogger',
'GraphQL',
'serverless',
'Node',
'Full Stack',
],
},
{
name: 'Philip Theobald',
description: 'Guitar player, motorcyclist, software engineer, entreprenuer',
url: 'https://www.philiptheobald.com/uses/',
twitter: '@fylzero',
emoji: '🤑',
country: '🇺🇸',
computer: 'apple',
phone: 'android',
tags: ['Software Engineer', 'Laravel', 'Vue', 'WordPress'],
},
{
name: 'Alejandro G. Anglada',
description:
'Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌',
url: 'https://aganglada.com/uses/',
twitter: '@aganglada',
emoji: '🔥',
country: '🇪🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Front End',
'Mentor',
'YouTuber',
'Writer',
'JavaScript',
'TypeScript',
'Performance',
'PWA',
'React',
'Node',
'CSS',
],
},
{
name: 'Antoni Kepinski',
description: 'Node Fetch maintainer // Into Node.js and Rust',
url: 'https://kepinski.me/uses/',
twitter: '@dokwadratu',
emoji: '⚡',
country: '🇵🇱',
computer: 'linux',
phone: 'iphone',
tags: ['JavaScript', 'Developer', 'TypeScript', 'React', 'Rust', 'Node'],
},
{
name: 'Marcus Obst',
description: 'Webdeveloper, Music Lover',
url: 'https://marcus-obst.de/uses',
emoji: '🍊',
country: '🇩🇪',
computer: 'windows',
phone: 'iphone',
tags: ['Developer', 'Full Stack', 'PHP', 'JavaScript', 'CSS', 'Vue'],
},
{
name: 'Pawel Grzybek',
description: 'Software Engineer',
url: 'https://pawelgrzybek.com/uses/',
twitter: '@pawelgrzybek',
emoji: '🥑',
country: '🇵🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'HTML',
'CSS',
'JavaScript',
'Node',
'Software Engineer',
'Front End',
'Back End',
'Full Stack',
'Blogger',
],
},
{
name: 'Eric McCormick',
description:
'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
url: 'https://edm00se.codes/uses/',
twitter: '@edm00se',
emoji: '🤔',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'Blogger',
'Speaker',
'YouTuber',
'JavaScript',
'Vue',
'Node',
'CSS',
],
},
{
name: 'Ben Congdon',
description: 'Golang, Python, Rust. Runs in the Cloud.',
url: 'https://benjamincongdon.me/uses',
twitter: '@BenRCongdon',
emoji: '🤷♂️',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Engineer',
'Go',
'Rust',
'Serverless',
'Python',
'JavaScript',
'React',
],
}, |
<<<<<<<
},
{
name: 'Dean Harris',
description: 'Front End Developer. Husband. Skateboarder. Occasional blogger',
url: 'https://deanacus.com/uses/',
twitter: '@deanacus',
emoji: '🛹',
country: '🇦🇺',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Font End',
'JavaScript',
'React',
'Node',
'PHP',
],
},
=======
},
{
name: 'Michael Hoffmann',
description: 'Freelance Software Engineer',
url: 'https://www.mokkapps.de/blog/my-development-setup/',
twitter: '@mokkapps',
emoji: '🍺',
country: '🇩🇪',
computer: 'apple',
phone: 'iphone',
tags: [ 'Developer', 'Blogger', 'Angular' ],
}
>>>>>>>
},
{
name: 'Dean Harris',
description: 'Front End Developer. Husband. Skateboarder. Occasional blogger',
url: 'https://deanacus.com/uses/',
twitter: '@deanacus',
emoji: '🛹',
country: '🇦🇺',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Font End',
'JavaScript',
'React',
'Node',
'PHP',
],
},
{
name: 'Michael Hoffmann',
description: 'Freelance Software Engineer',
url: 'https://www.mokkapps.de/blog/my-development-setup/',
twitter: '@mokkapps',
emoji: '🍺',
country: '🇩🇪',
computer: 'apple',
phone: 'iphone',
tags: [ 'Developer', 'Blogger', 'Angular' ],
} |
<<<<<<<
name: 'Danilo Barion',
description:
'Father, developer, blog writer, classical guitar player and searching for the meaning of life!',
url: 'https://danilobarion.com/uses',
twitter: '@daniloinfo86',
emoji: '🤔',
country: '🇧🇷',
computer: 'linux',
phone: 'android',
tags: [
'Developer',
'Blogger',
'Speaker',
'Ruby',
'Rails',
'JavaScript',
'React',
],
},
{
name: 'Gant Laborde',
=======
name: 'Eliezer Steinbock',
>>>>>>>
name: 'Danilo Barion',
description:
'Father, developer, blog writer, classical guitar player and searching for the meaning of life!',
url: 'https://danilobarion.com/uses',
twitter: '@daniloinfo86',
emoji: '🤔',
country: '🇧🇷',
computer: 'linux',
phone: 'android',
tags: [
'Developer',
'Blogger',
'Speaker',
'Ruby',
'Rails',
'JavaScript',
'React',
],
},
{
name: 'Eliezer Steinbock', |
<<<<<<<
{
name: 'Alejandro G. Anglada',
description:
'Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌',
url: 'https://aganglada.com/uses/',
twitter: '@aganglada',
emoji: '🔥',
country: '🇪🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Front End',
'Mentor',
'YouTuber',
'Writer',
'JavaScript',
'TypeScript',
'Performance',
'PWA',
'React',
'Node',
'CSS',
],
},
=======
{
name: 'Antoni Kepinski',
description:
'Node Fetch maintainer // Into Node.js and Rust',
url: 'https://kepinski.me/uses/',
twitter: '@dokwadratu',
emoji: '⚡',
country: '🇵🇱',
computer: 'linux',
phone: 'iphone',
tags: [
'JavaScript',
'Developer',
'TypeScript',
'React',
'Rust',
'Node'
],
},
{
name: 'Marcus Obst',
description: 'Webdeveloper, Music Lover',
url: 'https://marcus-obst.de/uses',
emoji: '🍊',
country: '🇩🇪',
computer: 'windows',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'PHP',
'JavaScript',
'CSS',
'Vue'
],
},
{
name: 'Pawel Grzybek',
description: 'Software Engineer',
url: 'https://pawelgrzybek.com/uses/',
twitter: '@pawelgrzybek',
emoji: '🥑',
country: '🇵🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'HTML',
'CSS',
'JavaScript',
'Node',
'Software Engineer',
'Front End',
'Back End',
'Full Stack',
'Blogger',
],
},
{
name: 'Eric McCormick',
description: 'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
url: 'https://edm00se.codes/uses/',
twitter: '@edm00se',
emoji: '🤔',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'Blogger',
'Speaker',
'YouTuber',
'JavaScript',
'Vue',
'Node',
'CSS',
]
},
>>>>>>>
{
name: 'Alejandro G. Anglada',
description:
'Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌',
url: 'https://aganglada.com/uses/',
twitter: '@aganglada',
emoji: '🔥',
country: '🇪🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Engineer',
'Front End',
'Mentor',
'YouTuber',
'Writer',
'JavaScript',
'TypeScript',
'Performance',
'PWA',
'React',
'Node',
'CSS',
],
},
{
name: 'Antoni Kepinski',
description:
'Node Fetch maintainer // Into Node.js and Rust',
url: 'https://kepinski.me/uses/',
twitter: '@dokwadratu',
emoji: '⚡',
country: '🇵🇱',
computer: 'linux',
phone: 'iphone',
tags: [
'JavaScript',
'Developer',
'TypeScript',
'React',
'Rust',
'Node'
],
},
{
name: 'Marcus Obst',
description: 'Webdeveloper, Music Lover',
url: 'https://marcus-obst.de/uses',
emoji: '🍊',
country: '🇩🇪',
computer: 'windows',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'PHP',
'JavaScript',
'CSS',
'Vue'
],
},
{
name: 'Pawel Grzybek',
description: 'Software Engineer',
url: 'https://pawelgrzybek.com/uses/',
twitter: '@pawelgrzybek',
emoji: '🥑',
country: '🇵🇱',
computer: 'apple',
phone: 'iphone',
tags: [
'HTML',
'CSS',
'JavaScript',
'Node',
'Software Engineer',
'Front End',
'Back End',
'Full Stack',
'Blogger',
],
},
{
name: 'Eric McCormick',
description: 'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
url: 'https://edm00se.codes/uses/',
twitter: '@edm00se',
emoji: '🤔',
country: '🇺🇸',
computer: 'apple',
phone: 'iphone',
tags: [
'Developer',
'Full Stack',
'Blogger',
'Speaker',
'YouTuber',
'JavaScript',
'Vue',
'Node',
'CSS',
]
}, |
<<<<<<<
//= require docs/docs
//= require docs/icons
//= require docs/_search
=======
//= require docs/_docs
//= require docs/_icons
//= require docs/_guided-tour-demo
>>>>>>>
//= require docs/_search
//= require docs/_docs
//= require docs/_icons
//= require docs/_guided-tour-demo |
<<<<<<<
],
},
plugins: [
// Define useful constants like TNS_WEBPACK
new webpack.DefinePlugin({
"global.TNS_WEBPACK": "true",
"process": undefined,
}),
// Remove all files from the out dir.
new CleanWebpackPlugin([`${dist}/**/*`]),
// Copy native app resources to out dir.
new CopyWebpackPlugin([{
from: `${appResourcesFullPath}/projects-assets/${env.project}/${appResourcesPlatformDir}`,
to: `${dist}/App_Resources/${appResourcesPlatformDir}`
},
{
from: `${appResourcesFullPath}/${appResourcesPlatformDir}`,
to: `${dist}/App_Resources/${appResourcesPlatformDir}`,
context: projectRoot
}
]),
// Copy assets to out dir. Add your own globs as needed.
new CopyWebpackPlugin([
{ from: { glob: "fonts/**" } },
{ from: { glob: "**/*.jpg" } },
{ from: { glob: "**/*.png" } },
{ from: { glob: "**/*.gif" } },
], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }),
// Generate a bundle starter script and activate it in package.json
new nsWebpack.GenerateBundleStarterPlugin([
"./vendor",
"./bundle",
]),
// For instructions on how to set up workers with webpack
// check out https://github.com/nativescript/worker-loader
new NativeScriptWorkerPlugin(),
ngCompilerPlugin,
// Does IPC communication with the {N} CLI to notify events when running in watch mode.
new nsWebpack.WatchStateLoggerPlugin(),
],
};
=======
plugins: [
// Define useful constants like TNS_WEBPACK
new webpack.DefinePlugin({
"global.TNS_WEBPACK": "true",
"process": undefined,
}),
// Remove all files from the out dir.
new CleanWebpackPlugin([`${dist}/**/*`]),
// Copy native app resources to out dir.
new CopyWebpackPlugin([
{
from: `${appResourcesFullPath}/${appResourcesPlatformDir}`,
to: `${dist}/App_Resources/${appResourcesPlatformDir}`,
context: projectRoot
},
]),
// Copy assets to out dir. Add your own globs as needed.
new CopyWebpackPlugin([
{ from: { glob: "fonts/**" } },
{ from: { glob: "**/*.jpg" } },
{ from: { glob: "**/*.png" } },
{ from: { glob: "**/*.gif" } },
{ from: { glob: "**/katex.scss" } },
>>>>>>>
],
},
plugins: [
// Define useful constants like TNS_WEBPACK
new webpack.DefinePlugin({
"global.TNS_WEBPACK": "true",
"process": undefined,
}),
// Remove all files from the out dir.
new CleanWebpackPlugin([`${dist}/**/*`]),
// Copy native app resources to out dir.
new CopyWebpackPlugin([{
from: `${appResourcesFullPath}/projects-assets/${env.project}/${appResourcesPlatformDir}`,
to: `${dist}/App_Resources/${appResourcesPlatformDir}`
},
{
from: `${appResourcesFullPath}/${appResourcesPlatformDir}`,
to: `${dist}/App_Resources/${appResourcesPlatformDir}`,
context: projectRoot
}
]),
// Copy assets to out dir. Add your own globs as needed.
new CopyWebpackPlugin([
{ from: { glob: "fonts/**" } },
{ from: { glob: "**/*.jpg" } },
{ from: { glob: "**/*.png" } },
{ from: { glob: "**/*.gif" } },
{ from: { glob: "**/katex.scss" } },
], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }),
// Generate a bundle starter script and activate it in package.json
new nsWebpack.GenerateBundleStarterPlugin([
"./vendor",
"./bundle",
]),
// For instructions on how to set up workers with webpack
// check out https://github.com/nativescript/worker-loader
new NativeScriptWorkerPlugin(),
ngCompilerPlugin,
// Does IPC communication with the {N} CLI to notify events when running in watch mode.
new nsWebpack.WatchStateLoggerPlugin(),
],
}; |
<<<<<<<
if (this.widgets[i].facetOperator == 'OR') {
query += '&fq={!tag='+i+'}' + groups[i].join(' || ');
tags.push(i);
=======
if (this.widgets[i].operator == 'OR') {
query += '&fq=' + groups[i].join('||');
>>>>>>>
if (this.widgets[i].operator == 'OR') {
query += '&fq={!tag='+i+'}' + groups[i].join(' || ');
tags.push(i);
<<<<<<<
// Fields is the list of facets that will have counts and such returned
for (var i in queryObj.fields) {
var exclude = '';
if (tags.size != 0) {
exclude = '{!ex='+tags.join(' ex=')+'}';
}
query += '&facet.field=' + exclude + encodeURIComponent(queryObj.fields[i]);
}
=======
>>>>>>>
// Fields is the list of facets that will have counts and such returned
for (var i in queryObj.fields) {
var exclude = '';
if (tags.size != 0) {
exclude = '{!ex='+tags.join(' ex=')+'}';
}
query += '&facet.field=' + exclude + encodeURIComponent(queryObj.fields[i]);
} |
<<<<<<<
$scope.txs.unshift(tx);
=======
$scope.processTX(tx);
$scope.txs.push(tx);
>>>>>>>
$scope.processTX(tx);
$scope.txs.unshift(tx); |
<<<<<<<
var question_container = $('<div class="question span12 show" style="overflow: hidden; position: relative;"></div>');
=======
var question_container = jQuery('<div class="question col-12 show" style="overflow: hidden; position: relative;"></div>');
>>>>>>>
var question_container = $('<div class="question col-12 show" style="overflow: hidden; position: relative;"></div>');
<<<<<<<
var answers_container = $('<ul class="span12 possible_answers possible_answers_' +
question_index + '"></ul>');
function bindClick(question_index, answer_index, possible_answer) {
possible_answer.bind('click', function() {
// was it the right answer?
var was_correct = self.quiz_data[question_index].possible_answers[answer_index].correct;
// Add correct classes to possible answers
answers_container.find('.selected').removeClass('selected');
$(this).addClass('selected');
$(this).removeClass('possible_answer');
answers_container
.find('.answer_' + answer_index)
.addClass(
was_correct ? 'correct_answer' : 'wrong_answer'
);
=======
var answers_container = jQuery('<ul class="col-12 possible_answers possible_answers_'
+ question_index + '"></ul>');
for (var i = 0; i < question.possible_answers.length; i++) {
var answer_data = question.possible_answers[i];
var possible_answer = jQuery('<li class="possible_answer col-12 answer_'
+ i
+ '">'
+ answer_data.answer
+ '</li>');
(function(question_index, answer_index, possible_answer) {
possible_answer.bind('click', function() {
// was it the right answer?
var was_correct = self.quiz_data[question_index].possible_answers[answer_index].correct;
>>>>>>>
var answers_container = $('<ul class="col-12 possible_answers possible_answers_' +
question_index + '"></ul>');
function bindClick(question_index, answer_index, possible_answer) {
possible_answer.bind('click', function() {
// was it the right answer?
var was_correct = self.quiz_data[question_index].possible_answers[answer_index].correct;
// Add correct classes to possible answers
answers_container.find('.selected').removeClass('selected');
$(this).addClass('selected');
$(this).removeClass('possible_answer');
answers_container
.find('.answer_' + answer_index)
.addClass(
was_correct ? 'correct_answer' : 'wrong_answer'
); |
<<<<<<<
ios.sockets.in('inv').emit('block', block);
};
module.exports.broadcast_address_tx = function(address, tx) {
ios.sockets.in(address).emit('tx', tx);
};
=======
ios.sockets.emit('block', block);
};
module.exports.broadcastSyncInfo = function(syncInfo) {
ios.sockets.emit('block', syncInfo);
};
>>>>>>>
ios.sockets.in('inv').emit('block', block);
};
module.exports.broadcast_address_tx = function(address, tx) {
ios.sockets.in(address).emit('tx', tx);
};
module.exports.broadcastSyncInfo = function(syncInfo) {
ios.sockets.emit('block', syncInfo);
}; |
<<<<<<<
angular.module('insight.system').controller('IndexController',
['$scope',
'Global',
'socket',
'Blocks',
'Transactions',
function($scope, Global, socket, Blocks, Transactions) {
=======
angular.module('insight.system').controller('IndexController', ['$scope', '$rootScope', 'Global', 'socket', 'Blocks', 'Transactions', function($scope, $rootScope, Global, socket, Blocks, Transactions) {
>>>>>>>
angular.module('insight.system').controller('IndexController',
['$scope',
'$rootScope',
'Global',
'socket',
'Blocks',
'Transactions',
function($scope, $rootScope, Global, socket, Blocks, Transactions) {
<<<<<<<
socket.on('connect', function() {
socket.emit('subscribe', 'inv');
});
=======
//show errors
$scope.flashMessage = $rootScope.flashMessage || null;
>>>>>>>
socket.on('connect', function() {
socket.emit('subscribe', 'inv');
});
//show errors
$scope.flashMessage = $rootScope.flashMessage || null; |
<<<<<<<
var option = req.query.q;
var statusObject = Status.new();
var returnJsonp = function (err) {
if(err) return next(err);
res.jsonp(statusObject);
};
switch(option) {
case 'getInfo':
statusObject.getInfo(returnJsonp);
break;
case 'getDifficulty':
statusObject.getDifficulty(returnJsonp);
break;
case 'getTxOutSetInfo':
statusObject.getTxOutSetInfo(returnJsonp);
break;
case 'getBestBlockHash':
statusObject.getBestBlockHash(returnJsonp);
break;
case 'getLastBlockHash':
statusObject.getLastBlockHash(returnJsonp);
break;
default:
res.status(400).send('Bad Request');
=======
var s = req.query.q;
var d = Status.new();
if (s === 'getInfo') {
d.getInfo(function(err) {
if (err) next(err);
res.jsonp(d);
});
}
else if (s === 'getDifficulty') {
d.getDifficulty(function(err) {
if (err) next(err);
res.jsonp(d);
});
}
else if (s === 'getTxOutSetInfo') {
d.getTxOutSetInfo(function(err) {
if (err) next(err);
res.jsonp(d);
});
}
else if (s === 'getBestBlockHash') {
d.getBestBlockHash(function(err) {
if (err) next(err);
res.jsonp(d);
});
}
else if (s === 'getLastBlockHash') {
d.getLastBlockHash(function(err) {
if (err) next(err);
res.jsonp(d);
});
}
else {
res.status(400).send('Bad Request');
>>>>>>>
var option = req.query.q;
var statusObject = Status.new();
var returnJsonp = function (err) {
if(err) return next(err);
res.jsonp(statusObject);
};
switch(option) {
case 'getInfo':
statusObject.getInfo(returnJsonp);
break;
case 'getDifficulty':
statusObject.getDifficulty(returnJsonp);
break;
case 'getTxOutSetInfo':
statusObject.getTxOutSetInfo(returnJsonp);
break;
case 'getBestBlockHash':
statusObject.getBestBlockHash(returnJsonp);
break;
case 'getLastBlockHash':
statusObject.getLastBlockHash(returnJsonp);
break;
default:
res.status(400).send('Bad Request');
<<<<<<<
=======
exports.sync = function(req, res, next) {
if (req.syncInfo)
res.jsonp(req.syncInfo);
next();
};
>>>>>>>
exports.sync = function(req, res, next) {
if (req.syncInfo)
res.jsonp(req.syncInfo);
next();
}; |
<<<<<<<
if (client) {
client.fetch_transaction(txHash||$scope.txHash, onFetchTransaction);
}
=======
var tx = DarkWallet.getIdentity().txdb.getBody(txHash);
if (tx) {
onFetchTransaction(false, tx);
} else {
client.fetch_transaction(txHash, onFetchTransaction);
}
>>>>>>>
var tx = DarkWallet.getIdentity().txdb.getBody(txHash);
if (tx) {
onFetchTransaction(false, tx);
} else if (client) {
client.fetch_transaction(txHash, onFetchTransaction);
} |
<<<<<<<
goog.provide('p3rf.perfkit.explorer.models.perfkit_simple_builder.QueryTablePartitioning');
=======
goog.require('p3rf.perfkit.explorer.models.perfkit_simple_builder.QueryTablePartitioning');
>>>>>>>
goog.require('p3rf.perfkit.explorer.models.perfkit_simple_builder.QueryTablePartitioning');
<<<<<<<
/** @export @type {string} */
this.DEFAULT_TABLE_PARTITION = QueryTablePartitioning.ONETABLE;
/** @export @type {Array.<!ErrorModel>} */
=======
/** @export @type {string} */
this.DEFAULT_TABLE_PARTITION = QueryTablePartitioning.ONETABLE;
/** @export @type {string} */
this.DEFAULT_TABLE_PARTITION = QueryTablePartitioning.ONETABLE;
/** @export @type {Array.<!QueryTablePartitioning>} */
this.TABLE_PARTITIONS = [
QueryTablePartitioning.ONETABLE,
QueryTablePartitioning.PERDAY,
];
/** @export @type {Array.<!ErrorModel>} */
>>>>>>>
/** @export @type {string} */
this.DEFAULT_TABLE_PARTITION = QueryTablePartitioning.ONETABLE;
/** @export @type {Array.<!QueryTablePartitioning>} */
this.TABLE_PARTITIONS = [
QueryTablePartitioning.ONETABLE,
QueryTablePartitioning.PERDAY,
];
/** @export @type {Array.<!ErrorModel>} */
<<<<<<<
<<<<<<< HEAD
this.rewriteQuery(widget);
=======
widget.model.datasource.query = this.queryBuilderService_.getSql(
widget.model.datasource.config,
this.current.model.project_id,
this.current.model.dataset_name || this.DEFAULT_DATASET_NAME,
this.current.model.table_name || this.DEFAULT_TABLE_NAME);
>>>>>>> master
=======
this.rewriteQuery(widget);
>>>>>>>
this.rewriteQuery(widget); |
<<<<<<<
ios: async () => await RNIapIos.buyProductWithoutAutoConfirm(sku),
android: () => RNIapModule.buyItemByType(ANDROID_ITEM_TYPE_IAP, sku, null),
=======
ios: () => RNIapIos.buyProductWithoutAutoConfirm(sku),
android: () => RNIapModule.buyItemByType(ANDROID_ITEM_TYPE_IAP, sku, null, 0),
>>>>>>>
ios: async () => await RNIapIos.buyProductWithoutAutoConfirm(sku),
android: () => RNIapModule.buyItemByType(ANDROID_ITEM_TYPE_IAP, sku, null, 0), |
<<<<<<<
explorer.application.module.controller('WidgetEditorCtrl',
explorer.components.widget.data_viz.WidgetEditorCtrl);
explorer.application.module.controller('CodeEditorCtrl',
explorer.components.code_editor.CodeEditorCtrl);
=======
explorer.application.module.controller('QueryEditorCtrl',
explorer.components.widget.query.QueryEditorCtrl);
explorer.application.module.controller('WidgetEditorCtrl',
explorer.components.widget.data_viz.WidgetEditorCtrl);
>>>>>>>
explorer.application.module.controller('WidgetEditorCtrl',
explorer.components.widget.data_viz.WidgetEditorCtrl);
<<<<<<<
=======
explorer.application.module.directive('fileModel',
explorer.components.util.FileModelDirective);
>>>>>>>
explorer.application.module.directive('fileModel',
explorer.components.util.FileModelDirective);
<<<<<<<
explorer.application.module.directive('widgetConfig',
explorer.components.widget.WidgetConfigDirective);
/** BQ PerfKit Widget directives. */
=======
explorer.application.module.directive('queryEditor',
explorer.components.widget.query.QueryEditorDirective);
>>>>>>>
explorer.application.module.directive('widgetConfig',
explorer.components.widget.WidgetConfigDirective);
/** BQ PerfKit Widget directives. */
explorer.application.module.directive('chartConfig',
explorer.components.widget.data_viz.gviz.ChartConfigDirective);
explorer.application.module.directive('gvizChartWidget',
explorer.components.widget.data_viz.gviz.gvizChart);
<<<<<<<
explorer.application.module.directive('gvizChartWidget',
explorer.components.widget.data_viz.gviz.gvizChart);
explorer.application.module.directive('chartConfig',
explorer.components.widget.data_viz.gviz.ChartConfigDirective);
=======
>>>>>>> |
<<<<<<<
goog.require('p3rf.perfkit.explorer.components.widget.WidgetConfigDirective');
=======
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.FieldCubeDataService');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.MetadataPickerDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.QueryBuilderService');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.QueryBuilderColumnConfigDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.QueryBuilderDatasourceConfigDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.QueryBuilderFilterConfigDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.RelativeDatepickerDirective');
>>>>>>>
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.FieldCubeDataService');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.MetadataPickerDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.QueryBuilderService');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.QueryBuilderColumnConfigDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.QueryBuilderDatasourceConfigDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.QueryBuilderFilterConfigDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.builder.RelativeDatepickerDirective');
<<<<<<<
goog.require('p3rf.perfkit.explorer.components.widget.query.FieldCubeDataService');
goog.require('p3rf.perfkit.explorer.components.widget.query.MetadataPickerDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.QueryDatasourceDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.QueryFilterDirective');
=======
goog.require('p3rf.perfkit.explorer.components.widget.query.QueryResultConfigDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.QueryEditorCtrl');
goog.require('p3rf.perfkit.explorer.components.widget.query.QueryEditorDirective');
>>>>>>>
goog.require('p3rf.perfkit.explorer.components.widget.query.QueryResultConfigDirective');
<<<<<<<
goog.require('p3rf.perfkit.explorer.components.widget.query.QueryResultDirective');
goog.require('p3rf.perfkit.explorer.components.widget.query.RelativeDatepickerDirective');
=======
>>>>>>>
<<<<<<<
/** Register all directives. **/
explorer.application.module.directive('chartConfig',
explorer.components.widget.data_viz.gviz.ChartConfigDirective);
explorer.application.module.directive('widgetConfig',
explorer.components.widget.WidgetConfigDirective);
explorer.application.module.directive('alertLog',
explorer.components.alert.AlertLogDirective);
explorer.application.module.directive('gvizChartWidget',
explorer.components.widget.data_viz.gviz.gvizChart);
explorer.application.module.directive('explorerConfig',
explorer.components.config.ConfigDirective);
explorer.application.module.directive('container',
explorer.components.container.ContainerDirective);
explorer.application.module.directive('containerConfig',
explorer.components.container.ContainerConfigDirective);
explorer.application.module.directive('dashboard',
explorer.components.dashboard.DashboardDirective);
=======
/**
* Register all directives.
* First, general-use directives.
*/
>>>>>>>
/**
* Register all directives.
* First, general-use directives.
*/
<<<<<<<
explorer.application.module.directive('explorerHeader',
explorer.components.explorer.ExplorerHeaderDirective);
explorer.application.module.directive('sidebarTabs',
explorer.components.explorer.sidebar.SidebarTabsDirective);
explorer.application.module.directive('sidebar',
explorer.components.explorer.sidebar.SidebarDirective);
explorer.application.module.directive('explorerPage',
explorer.components.explorer.ExplorerPageDirective);
=======
>>>>>>>
<<<<<<<
explorer.application.module.directive('queryDatasource',
explorer.components.widget.query.QueryDatasourceDirective);
explorer.application.module.directive('queryFilter',
explorer.components.widget.query.QueryFilterDirective);
explorer.application.module.directive('queryResult',
explorer.components.widget.query.QueryResultDirective);
explorer.application.module.directive('relativeDatepicker',
explorer.components.widget.query.RelativeDatepickerDirective);
explorer.application.module.directive('perfkitWidget',
explorer.components.widget.perfkitWidget);
=======
>>>>>>> |
<<<<<<<
=======
/*
generate by [email protected]: https://github.com/thx/magix-combine
author: [email protected]
loader: cmd_es
*/
define("mx-table/sort",["$","magix"],(require,exports,module)=>{
/*$,Magix*/
>>>>>>> |
<<<<<<<
import Geolocation from './components/geolocation'
class Demo extends Component {
render() {
return (
<div>
<h1>Reach Browser Hooks Examples</h1>
<FullScreen />
<Resize />
<Geolocation />
</div>
)
}
}
=======
import Orientation from './components/orientation'
const Demo = () => (
<div>
<h1>Reach Browser Hooks Examples</h1>
<FullScreen />
<Resize />
<Orientation />
</div>
)
>>>>>>>
import Orientation from './components/orientation'
import Geolocation from './components/geolocation'
const Demo = () => (
<div>
<h1>Reach Browser Hooks Examples</h1>
<FullScreen />
<Resize />
<Orientation />
<Geolocation />
</div>
) |
<<<<<<<
=======
/**
* Wait for page render the elements (content is rendered via Ajax)
* and highlight the source code.
* @return {void}
*/
function highlightWhenReady() {
const intervalId = setInterval(() => {
const container = document.getElementById('pullrequest-diff');
if (!container) return;
// If main container is rendered, stop the interval and continue.
clearInterval(intervalId);
addLanguageClass();
addCodeTag();
insertStyles();
Prism.highlightAll();
}, INTERVAL);
}
function bindRehighlightHandler() {
let menuDiff = document.querySelector('#pr-menu-diff');
menuDiff.addEventListener('click', () => {
highlightWhenReady();
});
}
return {
run: function() {
highlightWhenReady();
bindRehighlightHandler();
}
};
>>>>>>> |
<<<<<<<
/*
generate by [email protected]: https://github.com/thx/magix-combine
author: [email protected]
loader: cmd_es
*/
define("mx-collapse/__test__/3",["magix","__test__/example","$","../index","mx-copy/index","__test__/hl"],(require,exports,module)=>{
/*Magix,Base,$*/
require("../index");
require("mx-copy/index");
require("__test__/hl");
var Magix = require("magix");
var Base = require("__test__/example");
var $ = require("$");
module.exports = Base.extend({
tmpl: function ($$, $viewId, $$ref, $e, $n, $eu, $i, $eq) { if (!$$ref)
$$ref = $$; if (!$n) {
var $em_1 = { '&': 'amp', '<': 'lt', '>': 'gt', '"': '#34', '\'': '#39', '`': '#96' }, $er_1 = /[&<>"'`]/g, $ef_1 = function (m) { return "&" + $em_1[m] + ";"; };
$n = function (v) { return '' + (v == null ? '' : v); };
$e = function (v) { return $n(v).replace($er_1, $ef_1); };
} if (!$eu) {
var $um_1 = { '!': '%21', '\'': '%27', '(': '%28', ')': '%29', '*': '%2A' }, $uf_1 = function (m) { return $um_1[m]; }, $uq_1 = /[!')(*]/g;
$eu = function (v) { return encodeURIComponent($n(v)).replace($uq_1, $uf_1); };
} if (!$eq) {
var $qr_1 = /[\\'"]/g;
$eq = function (v) { return $n(v).replace($qr_1, '\\$&'); };
} if (!$i) {
$i = function (ref, v, k, f) { for (f = ref[$g]; --f;)
if (ref[k = $g + f] === v)
return k; ref[k = $g + ref[$g]++] = v; return k; };
} ; var $g = ' ', $_temp, $p = '', list = $$.list, viewId = $$.viewId, text1 = $$.text1; var $expr, $art, $line; try {
$p += '<div mxv mxa="_zs_galleryac:_" class="_zs_gallery___test___layout_-example"><div mxv mxa="_zs_galleryac:a" class="_zs_gallery___test___layout_-eg-content"><div mxs="_zs_galleryac:_" class="mb20"><span class="color-9">以下示例：</span><span>第二项的展示为自定义view，</span><span class="color-brand">默认带入参数data=当前实体</span></div><div mxv="list" mx-view="mx-collapse/index?list=';
$line = 9;
$art = '@list';
;
$p += ($expr = '<%@list%>', $i($$ref, list)) + '"></div></div><div mxa="_zs_galleryac:b" class="_zs_gallery___test___layout_-eg-desc"><div mxs="_zs_galleryac:a" class="_zs_gallery___test___layout_-eg-title">HTML Code</div><div class="_zs_gallery___test___layout_-desc-oper" mx-success="' + $viewId + ' done({id:1})" mx-view="mx-copy/index?copyNode=';
$line = 13;
$art = '=viewId';
;
$p += ($expr = '<%!$eu(viewId)%>', $eu(viewId)) + '_text_1"><span mxa="_zs_galleryac:c" class="_zs_gallery___test___layout_-desc-tip">';
$line = 15;
$art = '!text1';
;
$p += ($expr = '<%!text1%>', $n(text1)) + '</span><i mxs="_zs_galleryac:b" class="mc-iconfont _zs_gallery___test___layout_-desc-icon"></i></div><pre mx-view="__test__/hl" id="';
$line = 18;
$art = '=viewId';
;
$p += ($expr = '<%=viewId%>', $e(viewId)) + '_text_1">\n<mx-collapse \n list="{{@[{\n title: \'标题1\',\n content: \'内容1\'\n }, {\n expand: true,\n title: \'标题2\',\n view: \'mx-collapse/__test__/content\',\n content: \'内容2\'\n }, {\n title: \'标题3\',\n content: \'内容3\'\n }]}}"/></pre></div></div>';
}
catch (ex) {
var msg = 'render view error:' + (ex.message || ex);
if ($art)
msg += '\r\n\tsrc art:{{' + $art + '}}\r\n\tat line:' + $line;
msg += '\r\n\t' + ($art ? 'translate to:' : 'expr:');
msg += $expr + '\r\n\tat file:mx-collapse/__test__/3.html';
throw msg;
} return $p; },
render: function () {
var list = [{
title: '笑一笑，十年少',
content: '1、岁月磨平了你的棱角，其实就是你被生活盘了。<br/>2、你不是真的胖，只是女娲捏土造你的时候土用多了。<br/>3、当员工好累埃平时做牛做马，到年底了还要表演节目给领导逗乐子。'
}, {
expand: true,
title: '是幽默的深刻，还是深刻的幽默',
view: 'mx-collapse/__test__/content'
}, {
title: '冷段一组，凉意浓',
content: '1、过夜的叫酒店，喝酒的却叫夜店。<br/>2、打呼噜的人能在自己的呼噜声中睡着也太不公平了。<br/>3、友谊其实很简单，就是在自己吃到好吃的食物的时候想着对方，然后拍下来发给他。'
}];
this.updater.digest({
list: list
});
}
});
});
=======
/*
generate by [email protected]: https://github.com/thx/magix-combine
author: [email protected]
loader: cmd_es
*/
define("mx-collapse/__test__/3",["magix","__test__/example","$","../index","mx-copy/index","__test__/hl"],(require,exports,module)=>{
/*Magix,Base,$*/
require("../index");
require("mx-copy/index");
require("__test__/hl");
var Magix = require("magix");
var Base = require("__test__/example");
var $ = require("$");
module.exports = Base.extend({
tmpl: function ($$, $viewId, $$ref, $e, $n, $eu, $i, $eq) { if (!$$ref)
$$ref = $$; if (!$n) {
var $em_1 = { '&': 'amp', '<': 'lt', '>': 'gt', '"': '#34', '\'': '#39', '`': '#96' }, $er_1 = /[&<>"'`]/g, $ef_1 = function (m) { return "&" + $em_1[m] + ";"; };
$n = function (v) { return '' + (v == null ? '' : v); };
$e = function (v) { return $n(v).replace($er_1, $ef_1); };
} if (!$eu) {
var $um_1 = { '!': '%21', '\'': '%27', '(': '%28', ')': '%29', '*': '%2A' }, $uf_1 = function (m) { return $um_1[m]; }, $uq_1 = /[!')(*]/g;
$eu = function (v) { return encodeURIComponent($n(v)).replace($uq_1, $uf_1); };
} if (!$eq) {
var $qr_1 = /[\\'"]/g;
$eq = function (v) { return $n(v).replace($qr_1, '\\$&'); };
} if (!$i) {
$i = function (ref, v, k, f) { for (f = ref[$g]; --f;)
if (ref[k = $g + f] === v)
return k; ref[k = $g + ref[$g]++] = v; return k; };
} ; var $g = ' ', $_temp, $p = '', list = $$.list, viewId = $$.viewId, text1 = $$.text1; var $expr, $art, $line; try {
$p += '<div mxv mxa="_zs_galleryah:_" class="_zs_gallery___test___layout_-example"><div mxv mxa="_zs_galleryah:a" class="_zs_gallery___test___layout_-eg-content"><div mxs="_zs_galleryah:_" class="mb20"><span class="color-9">以下示例：</span><span>第二项的展示为自定义view，</span><span class="color-brand">默认带入参数data=当前实体</span></div><div mxv="list" mx-view="mx-collapse/index?list=';
$line = 9;
$art = '@list';
;
$p += ($expr = '<%@list%>', $i($$ref, list)) + '"></div></div><div mxa="_zs_galleryah:b" class="_zs_gallery___test___layout_-eg-desc"><div mxs="_zs_galleryah:a" class="_zs_gallery___test___layout_-eg-title">HTML Code</div><div class="_zs_gallery___test___layout_-desc-oper" mx-success="' + $viewId + ' done({id:1})" mx-view="mx-copy/index?copyNode=';
$line = 13;
$art = '=viewId';
;
$p += ($expr = '<%!$eu(viewId)%>', $eu(viewId)) + '_text_1"><span mxa="_zs_galleryah:c" class="_zs_gallery___test___layout_-desc-tip">';
$line = 15;
$art = '!text1';
;
$p += ($expr = '<%!text1%>', $n(text1)) + '</span><i mxs="_zs_galleryah:b" class="mc-iconfont _zs_gallery___test___layout_-desc-icon"></i></div><pre mx-view="__test__/hl" id="';
$line = 18;
$art = '=viewId';
;
$p += ($expr = '<%=viewId%>', $e(viewId)) + '_text_1">\n<mx-collapse \n list="{{@[{\n title: \'标题1\',\n content: \'内容1\'\n }, {\n expand: true,\n title: \'标题2\',\n view: \'mx-collapse/__test__/content\',\n content: \'内容2\'\n }, {\n title: \'标题3\',\n content: \'内容3\'\n }]}}"/></pre></div></div>';
}
catch (ex) {
var msg = 'render view error:' + (ex.message || ex);
if ($art)
msg += '\r\n\tsrc art:{{' + $art + '}}\r\n\tat line:' + $line;
msg += '\r\n\t' + ($art ? 'translate to:' : 'expr:');
msg += $expr + '\r\n\tat file:mx-collapse/__test__/3.html';
throw msg;
} return $p; },
render: function () {
var that = this;
var list = [{
title: '笑一笑，十年少',
content: '1、岁月磨平了你的棱角，其实就是你被生活盘了。<br/>2、你不是真的胖，只是女娲捏土造你的时候土用多了。<br/>3、当员工好累埃平时做牛做马，到年底了还要表演节目给领导逗乐子。'
}, {
expand: true,
title: '是幽默的深刻，还是深刻的幽默',
view: 'mx-collapse/__test__/content'
}, {
title: '冷段一组，凉意浓',
content: '1、过夜的叫酒店，喝酒的却叫夜店。<br/>2、打呼噜的人能在自己的呼噜声中睡着也太不公平了。<br/>3、友谊其实很简单，就是在自己吃到好吃的食物的时候想着对方，然后拍下来发给他。'
}];
that.updater.digest({
list: list
});
}
});
});
>>>>>>>
/*
generate by [email protected]: https://github.com/thx/magix-combine
author: [email protected]
loader: cmd_es
*/
define("mx-collapse/__test__/3",["magix","__test__/example","$","../index","mx-copy/index","__test__/hl"],(require,exports,module)=>{
/*Magix,Base,$*/
require("../index");
require("mx-copy/index");
require("__test__/hl");
var Magix = require("magix");
var Base = require("__test__/example");
var $ = require("$");
module.exports = Base.extend({
tmpl: function ($$, $viewId, $$ref, $e, $n, $eu, $i, $eq) { if (!$$ref)
$$ref = $$; if (!$n) {
var $em_1 = { '&': 'amp', '<': 'lt', '>': 'gt', '"': '#34', '\'': '#39', '`': '#96' }, $er_1 = /[&<>"'`]/g, $ef_1 = function (m) { return "&" + $em_1[m] + ";"; };
$n = function (v) { return '' + (v == null ? '' : v); };
$e = function (v) { return $n(v).replace($er_1, $ef_1); };
} if (!$eu) {
var $um_1 = { '!': '%21', '\'': '%27', '(': '%28', ')': '%29', '*': '%2A' }, $uf_1 = function (m) { return $um_1[m]; }, $uq_1 = /[!')(*]/g;
$eu = function (v) { return encodeURIComponent($n(v)).replace($uq_1, $uf_1); };
} if (!$eq) {
var $qr_1 = /[\\'"]/g;
$eq = function (v) { return $n(v).replace($qr_1, '\\$&'); };
} if (!$i) {
$i = function (ref, v, k, f) { for (f = ref[$g]; --f;)
if (ref[k = $g + f] === v)
return k; ref[k = $g + ref[$g]++] = v; return k; };
} ; var $g = ' ', $_temp, $p = '', list = $$.list, viewId = $$.viewId, text1 = $$.text1; var $expr, $art, $line; try {
$p += '<div mxv mxa="_zs_galleryac:_" class="_zs_gallery___test___layout_-example"><div mxv mxa="_zs_galleryac:a" class="_zs_gallery___test___layout_-eg-content"><div mxs="_zs_galleryac:_" class="mb20"><span class="color-9">以下示例：</span><span>第二项的展示为自定义view，</span><span class="color-brand">默认带入参数data=当前实体</span></div><div mxv="list" mx-view="mx-collapse/index?list=';
$line = 9;
$art = '@list';
;
$p += ($expr = '<%@list%>', $i($$ref, list)) + '"></div></div><div mxa="_zs_galleryac:b" class="_zs_gallery___test___layout_-eg-desc"><div mxs="_zs_galleryac:a" class="_zs_gallery___test___layout_-eg-title">HTML Code</div><div class="_zs_gallery___test___layout_-desc-oper" mx-success="' + $viewId + ' done({id:1})" mx-view="mx-copy/index?copyNode=';
$line = 13;
$art = '=viewId';
;
$p += ($expr = '<%!$eu(viewId)%>', $eu(viewId)) + '_text_1"><span mxa="_zs_galleryac:c" class="_zs_gallery___test___layout_-desc-tip">';
$line = 15;
$art = '!text1';
;
$p += ($expr = '<%!text1%>', $n(text1)) + '</span><i mxs="_zs_galleryac:b" class="mc-iconfont _zs_gallery___test___layout_-desc-icon"></i></div><pre mx-view="__test__/hl" id="';
$line = 18;
$art = '=viewId';
;
$p += ($expr = '<%=viewId%>', $e(viewId)) + '_text_1">\n<mx-collapse \n list="{{@[{\n title: \'标题1\',\n content: \'内容1\'\n }, {\n expand: true,\n title: \'标题2\',\n view: \'mx-collapse/__test__/content\',\n content: \'内容2\'\n }, {\n title: \'标题3\',\n content: \'内容3\'\n }]}}"/></pre></div></div>';
}
catch (ex) {
var msg = 'render view error:' + (ex.message || ex);
if ($art)
msg += '\r\n\tsrc art:{{' + $art + '}}\r\n\tat line:' + $line;
msg += '\r\n\t' + ($art ? 'translate to:' : 'expr:');
msg += $expr + '\r\n\tat file:mx-collapse/__test__/3.html';
throw msg;
} return $p; },
render: function () {
var that = this;
var list = [{
title: '笑一笑，十年少',
content: '1、岁月磨平了你的棱角，其实就是你被生活盘了。<br/>2、你不是真的胖，只是女娲捏土造你的时候土用多了。<br/>3、当员工好累埃平时做牛做马，到年底了还要表演节目给领导逗乐子。'
}, {
expand: true,
title: '是幽默的深刻，还是深刻的幽默',
view: 'mx-collapse/__test__/content'
}, {
title: '冷段一组，凉意浓',
content: '1、过夜的叫酒店，喝酒的却叫夜店。<br/>2、打呼噜的人能在自己的呼噜声中睡着也太不公平了。<br/>3、友谊其实很简单，就是在自己吃到好吃的食物的时候想着对方，然后拍下来发给他。'
}];
that.updater.digest({
list: list
});
}
});
}); |
<<<<<<<
var mid = lo + hi >> 1,
y = f(a[mid]);
if (x <= y || !(y <= y)) hi = mid;
else lo = mid + 1;
=======
var mid = lo + hi >>> 1;
if (f(a[mid]) < x) lo = mid + 1;
else hi = mid;
>>>>>>>
var mid = lo + hi >>> 1,
y = f(a[mid]);
if (x <= y || !(y <= y)) hi = mid;
else lo = mid + 1;
<<<<<<<
var mid = lo + hi >> 1,
y = f(a[mid]);
if (x < y || !(y <= y)) hi = mid;
=======
var mid = lo + hi >>> 1;
if (x < f(a[mid])) hi = mid;
>>>>>>>
var mid = lo + hi >>> 1,
y = f(a[mid]);
if (x < y || !(y <= y)) hi = mid; |
<<<<<<<
var mid = lo + hi >> 1,
y = f(a[mid]);
if (x <= y || !(y <= y)) hi = mid;
else lo = mid + 1;
=======
var mid = lo + hi >>> 1;
if (f(a[mid]) < x) lo = mid + 1;
else hi = mid;
>>>>>>>
var mid = lo + hi >>> 1,
y = f(a[mid]);
if (x <= y || !(y <= y)) hi = mid;
else lo = mid + 1;
<<<<<<<
var mid = lo + hi >> 1,
y = f(a[mid]);
if (x < y || !(y <= y)) hi = mid;
=======
var mid = lo + hi >>> 1;
if (x < f(a[mid])) hi = mid;
>>>>>>>
var mid = lo + hi >>> 1,
y = f(a[mid]);
if (x < y || !(y <= y)) hi = mid; |
<<<<<<<
export function connectVPN(account_addr, vpn_addr, os, data, cb) {
=======
export async function connectVPN(account_addr, vpn_addr, os, cb) {
>>>>>>>
export async function connectVPN(account_addr, vpn_addr, os, data, cb) {
<<<<<<<
if (localStorage.getItem('isTM'))
await tmConnect(account_addr, vpn_addr, data, (res) => { cb(res) });
else
await testConnect(account_addr, vpn_addr, (res) => { cb(res) });
=======
await linuxConnect(account_addr, vpn_addr, (res) => { cb(res) });
>>>>>>>
if (localStorage.getItem('isTM'))
await tmConnect(account_addr, vpn_addr, data, (res) => { cb(res) });
else
await testConnect(account_addr, vpn_addr, (res) => { cb(res) });
<<<<<<<
=======
let command;
if (remote.process.platform === 'darwin') {
let ovpncommand = 'export PATH=$PATH:/usr/local/opt/openvpn/sbin && openvpn ' + OVPN_FILE;
command = `/usr/bin/osascript -e 'do shell script "${ovpncommand}" with administrator privileges'`
} else if (remote.process.platform === 'win32') {
command = 'resources\\extras\\bin\\openvpn.exe ' + OVPN_FILE;
} else {
command = 'sudo openvpn ' + OVPN_FILE;
}
console.log("IN Linux")
>>>>>>>
<<<<<<<
connectwithOVPN(err, resp.data, cb);
=======
if (err) cb(err, false, false, false, null);
else {
if (OVPNDelTimer) clearInterval(OVPNDelTimer);
if (remote.process.platform === 'win32') {
sudo.exec(command, connect,
function (error, stdout, stderr) {
console.log('Err...', error, 'Stdout..', stdout, 'Stderr..', stderr)
OVPNDelTimer = setTimeout(function () {
fs.unlinkSync(OVPN_FILE);
}, 5 * 1000);
}
);
} else {
exec(command, function (err, stdout, stderr) {
console.log('Err...', err, 'Stdout..', stdout, 'Stderr..', stderr)
OVPNDelTimer = setTimeout(function () {
fs.unlinkSync(OVPN_FILE);
}, 1000);
});
} // internal else ends here
// setTimeout(function () {
if (remote.process.platform === 'win32') { checkWindows(resp,cb) }
// else if (remote.process.platform === 'darwin') checkVPNConnection();
else{
getVPNPIDs(async (err, pids) => {
if (err) {}
else {
getConfig(async function (err, confdata) {
let data = confdata ? JSON.parse(confdata) : {};
data.isConnected = true;
data.ipConnected = localStorage.getItem('IPGENERATED');
data.location = localStorage.getItem('LOCATION');
data.speed = localStorage.getItem('SPEED');
data.connectedAddr = localStorage.getItem('CONNECTED_VPN');
data.session_name = localStorage.getItem('SESSION_NAME');
data.vpn_type = 'openvpn';
let keystore = JSON.stringify(data);
await fs.writeFile(CONFIG_FILE, keystore, (err) => {
cb(err)
});
cb({ 'message': resp.data.message, 'success': resp.data.success });
})
}
})
// }, 1000)
}
}// parent else ends here
>>>>>>>
connectwithOVPN(err, resp.data, cb); |
<<<<<<<
=======
/*
generate by [email protected]: https://github.com/thx/magix-combine
author: [email protected]
loader: cmd_es
*/
define("mx-tabs/index",["magix","mx-tabs/base","mx-effects/icon","mx-popover/index"],(require,exports,module)=>{
/*Magix,Base*/
require("mx-effects/icon");
require("mx-popover/index");
>>>>>>>
<<<<<<<
let Magix = require('magix');
let Base = require('@./base');
Magix.applyStyle('@index.less');
=======
var Magix = require("magix");
var Base = require("mx-tabs/base");
Magix.applyStyle("_zs_gallery_mx-tabs_index_","[mx-view*=\"mx-tabs/box\"] {\n display: inline-block;\n}\n._zs_gallery_mx-tabs_index_-border {\n position: relative;\n border-bottom: 1px solid var(--color-border);\n}\n._zs_gallery_mx-tabs_index_-border ._zs_gallery_mx-tabs_index_-border-item {\n position: relative;\n float: left;\n padding: 10px 24px;\n font-size: calc(4px + var(--font-size));\n line-height: var(--input-height);\n -webkit-transition: color var(--duration) ease-out;\n transition: color var(--duration) ease-out;\n color: #666;\n}\n._zs_gallery_mx-tabs_index_-border ._zs_gallery_mx-tabs_index_-border-item:hover {\n color: #333;\n}\n._zs_gallery_mx-tabs_index_-border ._zs_gallery_mx-tabs_index_-border-item._zs_gallery_mx-tabs_index_-selected {\n color: var(--color-brand);\n}\n._zs_gallery_mx-tabs_index_-border ._zs_gallery_mx-tabs_index_-border-item ._zs_gallery_mx-tabs_index_-tag-content {\n position: absolute;\n top: 50%;\n left: 100%;\n z-index: 3;\n display: inline-block;\n margin-top: calc(4px - var(--input-height));\n margin-left: -24px;\n}\n._zs_gallery_mx-tabs_index_-border ._zs_gallery_mx-tabs_index_-underline {\n position: absolute;\n width: 0;\n height: 0;\n bottom: -1px;\n border-bottom: 2px solid var(--color-brand);\n -webkit-transition: width var(--duration) cubic-bezier(0.645, 0.045, 0.355, 1), left var(--duration) cubic-bezier(0.645, 0.045, 0.355, 1);\n transition: width var(--duration) cubic-bezier(0.645, 0.045, 0.355, 1), left var(--duration) cubic-bezier(0.645, 0.045, 0.355, 1);\n}\n._zs_gallery_mx-tabs_index_-box {\n position: relative;\n display: inline-block;\n height: var(--input-height);\n vertical-align: middle;\n}\n._zs_gallery_mx-tabs_index_-box ._zs_gallery_mx-tabs_index_-box-tip {\n position: relative;\n top: 1px;\n font-size: calc(2px + var(--font-size));\n}\n._zs_gallery_mx-tabs_index_-box ._zs_gallery_mx-tabs_index_-box-item {\n position: relative;\n padding: 0 12px;\n font-size: var(--font-size);\n text-align: center;\n cursor: pointer;\n -webkit-transition: all var(--duration);\n transition: all var(--duration);\n}\n._zs_gallery_mx-tabs_index_-box ._zs_gallery_mx-tabs_index_-box-item:first-child {\n border-top-left-radius: var(--border-radius);\n border-bottom-left-radius: var(--border-radius);\n}\n._zs_gallery_mx-tabs_index_-box ._zs_gallery_mx-tabs_index_-box-item:last-child {\n border-top-right-radius: var(--border-radius);\n border-bottom-right-radius: var(--border-radius);\n}\n._zs_gallery_mx-tabs_index_-box._zs_gallery_mx-tabs_index_-box-disabled ._zs_gallery_mx-tabs_index_-box-item {\n color: #999;\n cursor: not-allowed;\n}\n._zs_gallery_mx-tabs_index_-box._zs_gallery_mx-tabs_index_-box-disabled ._zs_gallery_mx-tabs_index_-box-item:hover {\n color: #999;\n}\n._zs_gallery_mx-tabs_index_-box._zs_gallery_mx-tabs_index_-box-disabled ._zs_gallery_mx-tabs_index_-box-item._zs_gallery_mx-tabs_index_-selected {\n color: #999;\n background-color: var(--color-disabled);\n border-color: var(--color-border);\n}\n._zs_gallery_mx-tabs_index_-hollow-box ._zs_gallery_mx-tabs_index_-box-item {\n position: relative;\n z-index: 2;\n display: inline-block;\n height: var(--input-height);\n line-height: calc(var(--input-height) - 2px);\n border-radius: var(--border-radius);\n color: #666;\n border: 1px solid transparent;\n}\n._zs_gallery_mx-tabs_index_-hollow-box ._zs_gallery_mx-tabs_index_-box-item:hover {\n color: #333;\n}\n._zs_gallery_mx-tabs_index_-hollow-box ._zs_gallery_mx-tabs_index_-box-item._zs_gallery_mx-tabs_index_-selected {\n color: #333;\n background-color: var(--color-brand-opacity);\n border: 1px solid var(--color-brand);\n}\n._zs_gallery_mx-tabs_index_-hollow-box::after {\n content: ' ';\n position: absolute;\n top: 0;\n left: 0;\n z-index: 1;\n width: 100%;\n height: 100%;\n border-radius: var(--border-radius);\n border: 1px solid var(--border-highlight);\n}\n._zs_gallery_mx-tabs_index_-solid-box {\n border: 1px solid var(--border-highlight);\n border-radius: var(--border-radius);\n}\n._zs_gallery_mx-tabs_index_-solid-box ._zs_gallery_mx-tabs_index_-box-item {\n display: inline-block;\n height: calc(var(--input-height) - 2px);\n line-height: calc(var(--input-height) - 2px);\n color: #999;\n background-color: #fff;\n}\n._zs_gallery_mx-tabs_index_-solid-box ._zs_gallery_mx-tabs_index_-box-item:hover {\n color: #333;\n}\n._zs_gallery_mx-tabs_index_-solid-box ._zs_gallery_mx-tabs_index_-box-item._zs_gallery_mx-tabs_index_-selected {\n color: var(--color-brand);\n background-color: var(--color-brand-opacity);\n}\n");
>>>>>>>
<<<<<<<
tmpl: '@index.html',
render() {
let that = this;
=======
tmpl: function ($$, $viewId, $$ref, $e, $n, $eu, $i, $eq) { if (!$$ref)
$$ref = $$; if (!$n) {
var $em_1 = { '&': 'amp', '<': 'lt', '>': 'gt', '"': '#34', '\'': '#39', '`': '#96' }, $er_1 = /[&<>"'`]/g, $ef_1 = function (m) { return "&" + $em_1[m] + ";"; };
$n = function (v) { return '' + (v == null ? '' : v); };
$e = function (v) { return $n(v).replace($er_1, $ef_1); };
} if (!$eu) {
var $um_1 = { '!': '%21', '\'': '%27', '(': '%28', ')': '%29', '*': '%2A' }, $uf_1 = function (m) { return $um_1[m]; }, $uq_1 = /[!')(*]/g;
$eu = function (v) { return encodeURIComponent($n(v)).replace($uq_1, $uf_1); };
} if (!$eq) {
var $qr_1 = /[\\'"]/g;
$eq = function (v) { return $n(v).replace($qr_1, '\\$&'); };
} if (!$i) {
$i = function (ref, v, k, f) { for (f = ref[$g]; --f;)
if (ref[k = $g + f] === v)
return k; ref[k = $g + ref[$g]++] = v; return k; };
} ; var $g = ' ', $_temp, $p = '', list = $$.list, selected = $$.selected, viewId = $$.viewId, spm = $$.spm, left = $$.left, width = $$.width; var $expr, $art, $line; try {
$p += '<div mxa="_zs_galleryfr:_" class="_zs_gallery_mx-tabs_index_-border clearfix">';
$line = 2;
$art = 'each list as item index';
;
$expr = '<%for (var index = 0, $art_cqwdbeosr$art_c = list.length; index < $art_cqwdbeosr$art_c; index++) { var item = list[index]%>';
for (var index = 0, $art_cqwdbeosr$art_c = list.length; index < $art_cqwdbeosr$art_c; index++) {
var item = list[index];
$p += '<a class="_zs_gallery_mx-tabs_index_-border-item ';
$line = 3;
$art = '= (item.value == selected) ? \'selected\' : \'\'';
;
$p += ($expr = '<%=(item.value == selected) ? \'_zs_gallery_mx-tabs_index_-selected\' : \'\'%>', $e((item.value == selected) ? '_zs_gallery_mx-tabs_index_-selected' : '')) + '" href="javascript:;" id="';
$line = 3;
$art = '=viewId';
;
$p += ($expr = '<%=viewId%>', $e(viewId)) + '_';
$line = 3;
$art = '=item.value';
;
$p += ($expr = '<%=item.value%>', $e(item.value)) + '" mx-mouseover="' + $viewId + ' @{over}({value:\'';
$line = 4;
$art = '=item.value';
;
$p += ($expr = '<%=$eq(item.value)%>', $e($eq(item.value))) + '\'})" mx-mouseout="' + $viewId + ' @{out}()" mx-click="' + $viewId + ' @{select}({item:\'';
$line = 6;
$art = '@item';
;
$p += ($expr = '<%@item%>', $i($$ref, item)) + '\'})" ';
$line = 7;
$art = 'if spm';
;
$expr = '<%if (spm) {%>';
if (spm) {
;
$p += ' data-spm-click="';
$line = 7;
$art = '=spm';
;
$p += ($expr = '<%=spm%>', $e(spm)) + '';
$line = 7;
$art = '=index';
;
$p += ($expr = '<%=index%>', $e(index)) + '" ';
$line = 7;
$art = '/if';
;
$expr = '<%}%>';
}
;
$p += '>';
$line = 8;
$art = '!item.text';
;
$p += ($expr = '<%!item.text%>', $n(item.text)) + ' ';
$line = 11;
$art = 'if item.tagContent';
;
$expr = '<%if (item.tagContent) {%>';
if (item.tagContent) {
;
$p += '<span mxa="_zs_galleryfr:a" class="_zs_gallery_mx-tabs_index_-tag-content">';
$line = 12;
$art = '!item.tagContent';
;
$p += ($expr = '<%!item.tagContent%>', $n(item.tagContent)) + '</span>';
$line = 13;
$art = 'else';
;
$expr = '<%} else {%>';
}
else {
;
$p += ' ';
$line = 14;
$art = 'if item.tag';
;
$expr = '<%if (item.tag) {%>';
if (item.tag) {
;
$p += '<span mx-view="mx-effects/icon?type=error&color=';
$line = 15;
$art = '=item.color';
;
$p += ($expr = '<%!$eu(item.color)%>', $eu(item.color)) + '&content=';
$line = 15;
$art = '=item.tag';
;
$p += ($expr = '<%!$eu(item.tag)%>', $eu(item.tag)) + '"></span>';
$line = 16;
$art = '/if';
;
$expr = '<%}%>';
}
;
$p += ' ';
$line = 17;
$art = '/if';
;
$expr = '<%}%>';
}
;
$p += ' ';
$line = 18;
$art = 'if item.tips';
;
$expr = '<%if (item.tips) {%>';
if (item.tips) {
;
$p += '<i class="mc-iconfont color-c" mx-view="mx-popover/index?width=280&content=';
$line = 22;
$art = '=item.tips';
;
$p += ($expr = '<%!$eu(item.tips)%>', $eu(item.tips)) + '"></i>';
$line = 23;
$art = '/if';
;
$expr = '<%}%>';
}
;
$p += '</a>';
$line = 25;
$art = '/each';
;
$expr = '<%}%>';
}
;
$p += '<span class="_zs_gallery_mx-tabs_index_-underline" style="left: ';
$line = 26;
$art = '=left';
;
$p += ($expr = '<%=left%>', $e(left)) + 'px; width: ';
$line = 26;
$art = '=width';
;
$p += ($expr = '<%=width%>', $e(width)) + 'px;"></span></div>';
}
catch (ex) {
var msg = 'render view error:' + (ex.message || ex);
if ($art)
msg += '\r\n\tsrc art:{{' + $art + '}}\r\n\tat line:' + $line;
msg += '\r\n\t' + ($art ? 'translate to:' : 'expr:');
msg += $expr + '\r\n\tat file:mx-tabs/index.html';
throw msg;
} return $p; },
render: function () {
var that = this;
>>>>>>> |
<<<<<<<
componentWillMount() {
this.setState({ token: 'SENT'});
if (this.props.isVPN) {
this.props.token('SENT');
}
}
=======
handlePIVXMenuItemClick = (event) => {
this.setState({ [event.target.name]: event.target.value });
console.log('pivx menu', event.target.value)
let tokens = event.target.value.split('to')
this.props.setSwap(tokens[0].trim(),tokens[1].trim());
this.props.rate()
}
>>>>>>>
componentWillMount() {
this.setState({ token: 'SENT'});
if (this.props.isVPN) {
this.props.token('SENT');
}
}
handlePIVXMenuItemClick = (event) => {
this.setState({ [event.target.name]: event.target.value });
console.log('pivx menu', event.target.value)
let tokens = event.target.value.split('to')
this.props.setSwap(tokens[0].trim(),tokens[1].trim());
this.props.rate()
} |
<<<<<<<
sessionHistory,
isConnectionEstablishing,
=======
sessionHistory,
getDockerImages,
getDockerContainers,
getImagesClients,
isLoggedOutNode,
connectionStatus,
isNMConnected,
isAccountVerified,
>>>>>>>
sessionHistory,
isConnectionEstablishing,
getDockerImages,
getDockerContainers,
getImagesClients,
isLoggedOutNode,
connectionStatus,
isNMConnected,
isAccountVerified, |
<<<<<<<
import { setListViewType, setVpnType, getVpnList, setVpnStatus, payVPNTM } from './vpnlist.reducer';
=======
import { swixRateInState } from './swixReducer';
import { setListViewType, setVpnType, getVpnList, setVpnStatus } from './vpnlist.reducer';
>>>>>>>
import { setListViewType, setVpnType, getVpnList, setVpnStatus, payVPNTM } from './vpnlist.reducer';
import { swixRateInState } from './swixReducer'; |
<<<<<<<
"sort_pages":"Sort Pages",
"sort_pages_tips":"After selecting a specific catalog, you can drag and sort the pages in that catalog",
=======
"cat_tips":"Drag to sort",
"cat_limite_tips":"Only up to three levels of directories are supported",
>>>>>>>
"sort_pages":"Sort Pages",
"sort_pages_tips":"After selecting a specific catalog, you can drag and sort the pages in that catalog",
"cat_tips":"Drag to sort",
"cat_limite_tips":"Only up to three levels of directories are supported", |
<<<<<<<
import Tile from './tile/Tile'
=======
import Slider from './slider/Slider'
>>>>>>>
import Tile from './tile/Tile'
import Slider from './slider/Slider'
<<<<<<<
Tile,
=======
Slider,
>>>>>>>
Tile,
Slider, |
<<<<<<<
=======
const PROTOCOL = '/Users/Katie/Documents/OPENTRONS/opentrons/api/opentrons/server/tests/data/dinosaur.py'
>>>>>>> |
<<<<<<<
textNumberOfLines,
textEllipsizeMode,
=======
allowFontScaling,
>>>>>>>
textNumberOfLines,
textEllipsizeMode,
allowFontScaling,
<<<<<<<
{...textOptions}
=======
allowFontScaling={allowFontScaling}
>>>>>>>
{...textOptions}
allowFontScaling={allowFontScaling}
<<<<<<<
textNumberOfLines: PropTypes.number,
textEllipsizeMode: PropTypes.string,
=======
containerViewStyle: View.propTypes.style,
rounded: PropTypes.bool,
outline: PropTypes.bool,
transparent: PropTypes.bool,
allowFontScaling: PropTypes.bool,
>>>>>>>
containerViewStyle: View.propTypes.style,
rounded: PropTypes.bool,
outline: PropTypes.bool,
transparent: PropTypes.bool,
allowFontScaling: PropTypes.bool,
textNumberOfLines: PropTypes.number,
textEllipsizeMode: PropTypes.string |
<<<<<<<
let sizesAttr = attributes.sizes ? ` sizes="${attributes.sizes}"` : "";
let missingSizesErrorMessage = `Missing \`sizes\` attribute on eleventy-img shortcode from: ${originalSrc || attributes.src}`;
=======
let missingSizesErrorMessage = `Missing \`sizes\` attribute on eleventy-img shortcode from: ${attributes.src}`;
>>>>>>>
let missingSizesErrorMessage = `Missing \`sizes\` attribute on eleventy-img shortcode from: ${originalSrc || attributes.src}`; |
<<<<<<<
if (customQualityConfiguration) {
qualityPath = ['-f', customQualityConfiguration];
} else if (selectedHeight && selectedHeight !== '' && !is_audio) {
qualityPath = ['-f', `'(mp4)[height=${selectedHeight}'`];
} else if (maxBitrate && is_audio) {
qualityPath = ['--audio-quality', maxBitrate]
}
if (customOutput) {
customOutput = options.noRelativePath ? customOutput : path.join(fileFolderPath, customOutput);
downloadConfig = ['-o', `${customOutput}.%(ext)s`, '--write-info-json', '--print-json'];
} else {
downloadConfig = ['-o', path.join(fileFolderPath, videopath + (is_audio ? '.%(ext)s' : '.mp4')), '--write-info-json', '--print-json'];
}
=======
downloadConfig = ['-o', path.join(fileFolderPath, videopath + (is_audio ? '.%(ext)s' : '.mp4')), '--write-info-json', '--print-json'];
}
>>>>>>>
downloadConfig = ['-o', path.join(fileFolderPath, videopath + (is_audio ? '.%(ext)s' : '.mp4')), '--write-info-json', '--print-json'];
}
<<<<<<<
} else if (req.query.apiKey && config_api.getConfigItem('ytdl_use_api_key') && req.query.apiKey === config_api.getConfigItem('ytdl_api_key')) {
next();
} else if (req.path.includes('/api/stream/')) {
=======
} else if (req.query.apiKey && config_api.getConfigItem('ytdl_use_api_key')) {
if (req.query.apiKey === config_api.getConfigItem('ytdl_api_key')) {
next();
} else {
res.status(401).send('Invalid API key');
}
} else if (req.path.includes('/api/video/') || req.path.includes('/api/audio/')) {
>>>>>>>
} else if (req.query.apiKey && config_api.getConfigItem('ytdl_use_api_key') && req.query.apiKey === config_api.getConfigItem('ytdl_api_key')) {
next();
} else if (req.path.includes('/api/stream/')) {
<<<<<<<
const file = !req.query.id ? auth_api.getUserVideo(uuid, uid, type, true, !!req.body) : auth_api.getUserPlaylist(uuid, req.query.id, null, true);
const is_shared = file ? file['sharingEnabled'] : false;
if (is_shared) {
=======
const playlist_id = using_body ? req.body.id : req.query.id;
const file = !playlist_id ? auth_api.getUserVideo(uuid, uid, type, true, req.body) : auth_api.getUserPlaylist(uuid, playlist_id, null, false);
if (file) {
>>>>>>>
const playlist_id = using_body ? req.body.id : req.query.id;
const file = !playlist_id ? auth_api.getUserVideo(uuid, uid, type, true, req.body) : auth_api.getUserPlaylist(uuid, playlist_id, null, false);
if (file) {
<<<<<<<
if (config_api.getConfigItem('ytdl_include_thumbnail')) {
// add thumbnails if present
mp3s.forEach(mp3 => {
if (mp3['thumbnailPath'] && fs.existsSync(mp3['thumbnailPath']))
mp3['thumbnailBlob'] = fs.readFileSync(mp3['thumbnailPath']);
});
}
=======
// add thumbnails if present
await addThumbnails(mp3s);
>>>>>>>
if (config_api.getConfigItem('ytdl_include_thumbnail')) {
// add thumbnails if present
await addThumbnails(mp3s);
}
<<<<<<<
if (config_api.getConfigItem('ytdl_include_thumbnail')) {
// add thumbnails if present
mp4s.forEach(mp4 => {
if (mp4['thumbnailPath'] && fs.existsSync(mp4['thumbnailPath']))
mp4['thumbnailBlob'] = fs.readFileSync(mp4['thumbnailPath']);
});
}
=======
// add thumbnails if present
await addThumbnails(mp4s);
>>>>>>>
if (config_api.getConfigItem('ytdl_include_thumbnail')) {
// add thumbnails if present
await addThumbnails(mp4s);
}
<<<<<<<
if (config_api.getConfigItem('ytdl_include_thumbnail')) {
// add thumbnails if present
files.forEach(file => {
if (file['thumbnailPath'] && fs.existsSync(file['thumbnailPath']))
file['thumbnailBlob'] = fs.readFileSync(file['thumbnailPath']);
});
}
=======
// add thumbnails if present
await addThumbnails(files);
>>>>>>>
if (config_api.getConfigItem('ytdl_include_thumbnail')) {
// add thumbnails if present
await addThumbnails(files);
}
<<<<<<<
// deletes non-subscription files
app.post('/api/deleteFile', optionalJwt, async (req, res) => {
=======
// deletes mp3 file
app.post('/api/deleteMp3', optionalJwt, async (req, res) => {
// var name = req.body.name;
var uid = req.body.uid;
var blacklistMode = req.body.blacklistMode;
if (req.isAuthenticated()) {
let success = await auth_api.deleteUserFile(req.user.uid, uid, 'audio', blacklistMode);
res.send(success);
return;
}
var audio_obj = db.get('files.audio').find({uid: uid}).value();
var name = audio_obj.id;
var fullpath = audioFolderPath + name + ".mp3";
var wasDeleted = false;
if (await fs.pathExists(fullpath))
{
deleteAudioFile(name, null, blacklistMode);
db.get('files.audio').remove({uid: uid}).write();
wasDeleted = true;
res.send(wasDeleted);
} else if (audio_obj) {
db.get('files.audio').remove({uid: uid}).write();
wasDeleted = true;
res.send(wasDeleted);
} else {
wasDeleted = false;
res.send(wasDeleted);
}
});
// deletes mp4 file
app.post('/api/deleteMp4', optionalJwt, async (req, res) => {
>>>>>>>
// deletes non-subscription files
app.post('/api/deleteFile', optionalJwt, async (req, res) => {
<<<<<<<
let success = auth_api.deleteUserFile(req.user.uid, uid, type, blacklistMode);
=======
let success = await auth_api.deleteUserFile(req.user.uid, uid, 'video', blacklistMode);
>>>>>>>
let success = auth_api.deleteUserFile(req.user.uid, uid, type, blacklistMode); |
<<<<<<<
var md5 = require('md5');
=======
const NodeID3 = require('node-id3')
const downloader = require('youtube-dl/lib/downloader')
const fetch = require('node-fetch');
>>>>>>>
var md5 = require('md5');
const NodeID3 = require('node-id3')
const downloader = require('youtube-dl/lib/downloader')
const fetch = require('node-fetch'); |
<<<<<<<
renames[fmtPath(file.revOrigBase, file.revOrigPath)] = options.prefix + fmtPath(file.base, file.path);
=======
renames.push({
unreved: fmtPath(file.revOrigBase, file.revOrigPath),
reved: fmtPath(file.base, file.path)
});
>>>>>>>
renames.push({
unreved: fmtPath(file.revOrigBase, file.revOrigPath),
reved: options.prefix + fmtPath(file.base, file.path)
});
<<<<<<<
var file;
var contents;
for (var i = 0, ii = cache.length; i !== ii; i++) {
file = cache[i];
contents = file.contents.toString();
for (var rename in renames) {
if (renames.hasOwnProperty(rename)) {
contents = contents.split(rename).join(renames[rename]);
}
}
if (options.prefix) {
contents = contents.split('/' + options.prefix).join(options.prefix + '/');
}
=======
cache.forEach(function replaceInFile(file) {
var contents = file.contents.toString();
renames.forEach(function replaceOnce(rename) {
contents = contents.split(rename.unreved).join(rename.reved);
});
>>>>>>>
cache.forEach(function replaceInFile(file) {
var contents = file.contents.toString();
renames.forEach(function replaceOnce(rename) {
contents = contents.split(rename.unreved).join(rename.reved);
if (options.prefix) {
contents = contents.split('/' + options.prefix).join(options.prefix + '/');
}
}); |
<<<<<<<
var join = require('path').join;
var karma = require('karma').server;
=======
var path = require('path');
var join = path.join;
>>>>>>>
var path = require('path');
var join = path.join;
var karma = require('karma').server;
<<<<<<<
// TODO: Make ng2 build DRY-er
=======
var tinylr = require('tiny-lr')();
var connectLivereload = require('connect-livereload');
>>>>>>>
var tinylr = require('tiny-lr')();
var connectLivereload = require('connect-livereload'); |
<<<<<<<
this.keepAlive = keepAlive;
// Events to signal TO the front-end
this.events = {
'join': ['channel', 'nick'],
'part': ['channel', 'nick'],
'quit': ['nick', 'reason', 'channels', 'message'],
'topic': ['channel', 'topic', 'nick'],
'nick': ['oldNick', 'newNick', 'channels'],
'names': ['channel', 'nicks'],
'action': ['from', 'to', 'text'],
'message': ['from', 'to', 'text'],
'+mode': ['channel', 'by', 'mode', 'argument', 'message'],
'-mode': ['channel', 'by', 'mode', 'argument', 'message'],
'notice': ['nick', 'to', 'text', 'message'],
'pm': ['nick', 'text'],
'registered': ['message'],
'motd': ['motd'],
'whois': ['info'],
'error': ['message'],
'netError': ['message']
};
// store the instance
=======
// establish db models
var User = app.db.models.user;
var Connection = app.db.models.connection;
var Message = app.db.models.message;
var PM = app.db.models.pm;
var Channel = app.db.models.channel;
// hold our reference
>>>>>>>
// establish db models
var User = app.db.models.user;
var Connection = app.db.models.connection;
var Message = app.db.models.message;
var PM = app.db.models.pm;
var Channel = app.db.models.channel; |
<<<<<<<
const runEndpoint = window.location.pathname.startsWith('/published') ? '/published/run' : '/run';
=======
const runEndpoint = window.location.pathname.startsWith('/examples') ? '/runhosted' : '/run';
>>>>>>>
const runEndpoint = window.location.pathname.startsWith('/published') ? '/published/run' : '/run';
<<<<<<<
run(isHosted ? '/published/runCell' : '/runCell', JSON.stringify({ text: $(cell)[0].outerHTML, stepIndex: stepIndex, name: exampleName, pageVariables }), stepIndex);
=======
run(runEndpoint == '/run' ? '/runCell' : '/runhosted', JSON.stringify({ text: $(block)[0].outerHTML, stepIndex: stepIndex, name: exampleName, pageVariables }), stepIndex);
>>>>>>>
run(isHosted ? '/published/runCell' : '/runCell', JSON.stringify({ text: $(block)[0].outerHTML, stepIndex: stepIndex, name: exampleName, pageVariables }), stepIndex); |
<<<<<<<
YUI.add('flickrModel', function(Y) {
var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
Y.mojito.models.flickr = {
init: function(config) {
this.config = config;
},
getData: function(callback) {
callback({some:'data'});
},
// Search for Flickr Images
search: function (search, start, count, callback) { // Handle empty.
if (null == search || 0 == search.length) {
callback([]);
}
// Build YQL select.
start /= 1; count /= 1;
var select = 'select * from '+ 'flickr.photos.search ' + '(' + (start || 0) + ',' + (count || 20) + ') ' + 'where '+ 'text="%' + (search || 'muppet') + '%" and api_key="' + API_KEY + '"';
// Execute against YQL
Y.YQL (select, function(rawYql) {
// Handle empty response.
if (null == rawYql || !rawYql.query.count || !rawYql.query.results) {
callback ([]);
=======
/*jslint anon:true, sloppy:true, nomen:true*/
YUI.add('flickrModel', function (Y) {
var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
Y.mojito.models.flickr = {
init: function (config) {
this.config = config;
},
getData: function (callback) {
callback({some: 'data'});
},
// Search for Flickr Images
search: function (search, start, count, callback) { // Handle empty.
if (null === search || 0 === search.length) {
callback([]);
}
// Build YQL select.
start /= 1;
count /= 1;
var select = 'select * from ' + 'flickr.photos.search ' + '(' + (start || 0) + ',' + (count || 20) + ') ' + 'where ' + 'text="%' + (search || 'muppet') + '%" and api_key="' + API_KEY + '"';
// Execute against YQL
Y.YQL(select, function(rawYql) {
// Handle empty response.
if (null === rawYql || 0 === rawYql.query.count) {
callback([]);
}
// Process data.
var photos = [], item = null, i;
// Force array.
if (!rawYql.query.results.photo.length) {
rawYql.query.results.photo = [rawYql.query.results.photo];
}
// Assume array
for (i = 0; i < rawYql.query.count; i += 1) {
// Fix up the item.
item = rawYql.query.results.photo[i];
item.url = 'http://farm' + item.farm + '.static.flickr.com/' + item.server + '/' + item.id + '_' + item.secret + '.jpg';
item.title = (!item.title) ? search + ':' + i : item.title;
// Attach the result.
photos.push({
id: item.id,
title: item.title,
url: item.url
});
}
callback(photos);
});
>>>>>>>
/*jslint anon:true, sloppy:true, nomen:true*/
YUI.add('flickrModel', function (Y) {
var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
Y.mojito.models.flickr = {
init: function (config) {
this.config = config;
},
getData: function (callback) {
callback({some: 'data'});
},
// Search for Flickr Images
search: function (search, start, count, callback) { // Handle empty.
if (null === search || 0 === search.length) {
callback([]);
}
// Build YQL select.
start /= 1;
count /= 1;
var select = 'select * from ' + 'flickr.photos.search ' + '(' + (start || 0) + ',' + (count || 20) + ') ' + 'where ' + 'text="%' + (search || 'muppet') + '%" and api_key="' + API_KEY + '"';
// Execute against YQL
Y.YQL(select, function(rawYql) {
// Handle empty response.
if (null === rawYql || !rawYql.query.count || !rawYql.query.results) {
callback([]);
}
// Process data.
var photos = [], item = null, i;
// Force array.
if (!rawYql.query.results.photo.length) {
rawYql.query.results.photo = [rawYql.query.results.photo];
}
// Assume array
for (i = 0; i < rawYql.query.count; i += 1) {
// Fix up the item.
item = rawYql.query.results.photo[i];
item.url = 'http://farm' + item.farm + '.static.flickr.com/' + item.server + '/' + item.id + '_' + item.secret + '.jpg';
item.title = (!item.title) ? search + ':' + i : item.title;
// Attach the result.
photos.push({
id: item.id,
title: item.title,
url: item.url
});
}
callback(photos);
}); |
<<<<<<<
config,
newInst;
if (cacheValue) {
newInst = Y.mojito.util.blend(cacheValue, instance);
// Always create a new instance ID, otherwise the old instance
// ID bleeds out of the cache.
newInst.instanceId = Y.guid();
//DEBUGGING: newInst.instanceId += '-instance-server(cache)-' + [newInst.base||'', newInst.type||''].join('-');
cb(null, newInst);
return;
}
=======
newInst,
perf;
>>>>>>>
newInst;
<<<<<<<
// HookSystem::StartBlock
Y.mojito.hooks.hook('storeTypeDetails', instance.hook, 'start', spec);
// HookSystem::EndBlock
this.getMojitTypeDetails(env, ctx, spec.type, spec);
=======
perf = Y.mojito.perf.timeline('mojito', 'store:getMojitTypeDetails',
'expand mojit spec', spec.type);
typeDetails = this.getMojitTypeDetails(env, ctx, spec.type, null, true);
>>>>>>>
// HookSystem::StartBlock
Y.mojito.hooks.hook('storeTypeDetails', instance.hook, 'start', spec);
// HookSystem::EndBlock
typeDetails = this.getMojitTypeDetails(env, ctx, spec.type, null, true); |
<<<<<<<
clientConfig.routes = this.ac.url.getRouteMaker().getComputedRoutes();
clientConfig.page = {
data: pageData && pageData.toJSON ? pageData.toJSON() : undefined
};
=======
clientConfig.routes = store.getRoutes(contextClient);
>>>>>>>
clientConfig.routes = store.getRoutes(contextClient);
clientConfig.page = {
data: pageData && pageData.toJSON ? pageData.toJSON() : undefined
}; |
<<<<<<<
YUI.add('flickrModel', function(Y, NAME) {
var API_KEY = '9cc79c8bf1942c683b0d4e30b838ee9c';
=======
YUI.add('flickrModel', function(Y) {
var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
>>>>>>>
YUI.add('flickrModel', function(Y, NAME) {
var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e'; |
<<<<<<<
render: function (data, instance, template, adapter, meta, more) {
var cacheTemplates = (this.options.cacheTemplates === false ? false : true),
perf = Y.mojito.perf.timeline('mojito', 'hb:render',
'time to render a template', {instance: instance}),
=======
render: function (data, mojitType, tmpl, adapter, meta, more) {
var cacheTemplates = meta && meta.view && meta.view.cacheTemplates,
>>>>>>>
render: function (data, instance, template, adapter, meta, more) {
var cacheTemplates = (this.options.cacheTemplates === false ? false : true),
<<<<<<<
output = obj.compiled(data, {
partials: obj.partials
});
=======
output = obj.compiled(data);
// HookSystem::StartBlock
Y.mojito.hooks.hook('hb', adapter.hook, 'end', tmpl);
// HookSystem::EndBlock
>>>>>>>
output = obj.compiled(data, {
partials: obj.partials
});
// HookSystem::StartBlock
Y.mojito.hooks.hook('hb', adapter.hook, 'end', template);
// HookSystem::EndBlock
<<<<<<<
=======
// HookSystem::StartBlock
Y.mojito.hooks.hook('hb', adapter.hook, 'start', tmpl);
// HookSystem::EndBlock
this._getTemplateObj(tmpl, !cacheTemplates, handler);
>>>>>>>
<<<<<<<
}, '0.1.0', {requires: ['mojito', 'parallel']});
=======
}, '0.1.0', {requires: [
'mojito-hooks'
]});
>>>>>>>
}, '0.1.0', {requires: [
'mojito',
'parallel',
'mojito-hooks'
]}); |
<<<<<<<
YUI.add('FlickrModel', function(Y, NAME) {
var API_KEY = '9cc79c8bf1942c683b0d4e30b838ee9c';
=======
YUI.add('FlickrModel', function(Y) {
var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
>>>>>>>
YUI.add('FlickrModel', function(Y, NAME) {
var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e'; |
<<<<<<<
YUI.add('FlickrModel', function(Y, NAME) {
var API_KEY = '9cc79c8bf1942c683b0d4e30b838ee9c';
=======
YUI.add('FlickrModel', function(Y) {
var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
>>>>>>>
YUI.add('FlickrModel', function(Y, NAME) {
var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e'; |
<<<<<<<
if (cmd.reportFolder.indexOf(cwd) !== -1 && !cmd.unit) {
console.log('Please specify a report directory outside of tests/');
process.exit(1);
}
=======
>>>>>>> |
<<<<<<<
=======
/*
* @private
* @method _processRawBundle
* @param {object} bundle
* @return {object}
*/
_processRawBundle: function(bundle){
var pos,
settings = {},
dimensions = {},
schema = {},
part, kv, context, key;
// Extract each section from the bundle
for(pos=0; pos<bundle.length; pos++){
if(bundle[pos].dimensions){
dimensions = bundle[pos].dimensions;
}
else if(bundle[pos].schema){
schema = bundle[pos].schema;
}
else if(bundle[pos].settings){
context = {};
for(part=0; part<bundle[pos].settings.length; part++){
kv = bundle[pos].settings[part].split(':');
context[kv[0]] = kv[1];
}
// Remove the settings key now we are done with it
delete bundle[pos].settings;
// Build the full context path
key = this._getLookupPath(dimensions, context);
// Add the section to the settings list with it's full key
// IMY Bug 5439377 configuration does not accept neither null nor false values?
if(!settings[key]){
settings[key] = bundle[pos];
}
else{
throw new Error("The settings group '"+Y.JSON.stringify(context)+"' has already been added.");
}
}
}
return {
dimensions: dimensions,
settings: settings,
schema: schema
};
},
>>>>>>>
<<<<<<<
}
return build;
=======
}//console.log(Y.JSON.stringify(dimensionPaths,null,4));
return dimensionPaths;
>>>>>>>
}
return build; |
<<<<<<<
=======
// HookSystem::StartBlock
if (!req.hook) {
req.hook = null;
}
outputHandler.hook = req.hook;
command.hook = req.hook;
// HookSystem::EndBlock
if (appConfig.debugMemory) {
outputHandler.setMemoryDebugObjects({
'YUI.Env': YUI.Env,
'YUI.config': YUI.config,
'YUI.process': YUI.process,
Y: Y,
store: store
});
}
>>>>>>>
// HookSystem::StartBlock
if (!req.hook) {
req.hook = null;
}
outputHandler.hook = req.hook;
command.hook = req.hook;
// HookSystem::EndBlock
if (appConfig.debugMemory) {
outputHandler.setMemoryDebugObjects({
'YUI.Env': YUI.Env,
'YUI.config': YUI.config,
'YUI.process': YUI.process,
Y: Y,
store: store
});
}
<<<<<<<
Y.mojito.Dispatcher.init(store).dispatch(command, outputHandler);
=======
= MIDDLEWARE mojito -- " +
// "builtin mojito-handler-dispatcher");
app.use(dispatcher);
} else {
midPath = libpath.join(__dirname, 'app', 'middleware', midName);
//console.log("======== MIDDLEWARE mojito " + midPath);
midFactory = require(midPath);
app.use(midFactory(midConfig));
}
} else {
// backwards-compatibility: user-provided middleware is
// specified by path
midPath = libpath.join(options.dir, midName);
//console.log("======== MIDDLEWARE user " + midPath);
midBase = libpath.basename(midPath);
if (0 === midBase.indexOf('mojito-')) {
// Same as above (case of Mojito's special middlewares)
// Gives a user-provided middleware access to the YUI
// instance, resource store, logger, context, etc.
midFactory = require(midPath);
app.use(midFactory(midConfig));
} else {
app.use(require(midPath));
}
}
=======
singleton_dispatcher.dispatch(command, outputHandler);
};
// HookSystem::StartBlock
if (appConfig.perf) {
app.use(function(req, res, next) {
Y.mojito.hooks.enableHookGroup(req, 'mojito-perf');
next();
});
}
// HookSystem::EndBlock
// attaching middleware pieces
for (m = 0; m < middleware.length; m += 1) {
midName = middleware[m];
if (0 === midName.indexOf('mojito-')) {
// one special one, since it might be difficult to move to a
// separate file
if (midName === 'mojito-handler-dispatcher') {
//console.log("======== MIDDLEWARE mojito -- " +
// "builtin mojito-handler-dispatcher");
app.use(dispatcher);
} else {
midPath = libpath.join(__dirname, 'app', 'middleware', midName);
//console.log("======== MIDDLEWARE mojito " + midPath);
midFactory = require(midPath);
app.use(midFactory(midConfig));
}
} else {
// backwards-compatibility: user-provided middleware is
// specified by path
midPath = libpath.join(options.dir, midName);
//console.log("======== MIDDLEWARE user " + midPath);
midBase = libpath.basename(midPath);
if (0 === midBase.indexOf('mojito-')) {
// Same as above (case of Mojito's special middlewares)
// Gives a user-provided middleware access to the YUI
// instance, resource store, logger, context, etc.
midFactory = require(midPath);
app.use(midFactory(midConfig));
} else {
app.use(require(midPath));
}
}
>>>>>>>
Y.mojito.Dispatcher.init(store).dispatch(command, outputHandler);
singleton_dispatcher.dispatch(command, outputHandler);
};
// HookSystem::StartBlock
if (appConfig.perf) {
app.use(function(req, res, next) {
Y.mojito.hooks.enableHookGroup(req, 'mojito-perf');
next();
});
}
// HookSystem::EndBlock
// attaching middleware pieces
for (m = 0; m < middleware.length; m += 1) {
midName = middleware[m];
if (0 === midName.indexOf('mojito-')) {
// one special one, since it might be difficult to move to a
// separate file
if (midName === 'mojito-handler-dispatcher') {
//console.log("======== MIDDLEWARE mojito -- " +
// "builtin mojito-handler-dispatcher");
app.use(dispatcher);
} else {
midPath = libpath.join(__dirname, 'app', 'middleware', midName);
//console.log("======== MIDDLEWARE mojito " + midPath);
midFactory = require(midPath);
app.use(midFactory(midConfig));
}
} else {
// backwards-compatibility: user-provided middleware is
// specified by path
midPath = libpath.join(options.dir, midName);
//console.log("======== MIDDLEWARE user " + midPath);
midBase = libpath.basename(midPath);
if (0 === midBase.indexOf('mojito-')) {
// Same as above (case of Mojito's special middlewares)
// Gives a user-provided middleware access to the YUI
// instance, resource store, logger, context, etc.
midFactory = require(midPath);
app.use(midFactory(midConfig));
} else {
app.use(require(midPath));
}
} |
<<<<<<<
'read JSON files': function() {
var fixtures = libpath.join(__dirname, '../../../../../fixtures/store');
var store = new MockRS({ root: fixtures });
store.plug(Y.mojito.addons.rs.config, { appRoot: fixtures, mojitoRoot: mojitoRoot } );
var path = libpath.join(fixtures, 'application.json');
var have = store.config.readConfigSimple(path);
var want = readJSON(fixtures, 'application.json');
Y.TEST_CMP(have, want);
},
=======
>>>>>>>
<<<<<<<
Y.TEST_CMP(have, want);
},
=======
cmp(have, want);
},
>>>>>>>
Y.TEST_CMP(have, want);
},
<<<<<<<
"readConfigSync YAML file": function () {
=======
"readConfigSimple YAML file": function () {
>>>>>>>
"readConfigSimple YAML file": function () {
<<<<<<<
"readConfigSync YML file": function () {
=======
"readConfigSimple YML file": function () {
>>>>>>>
"readConfigSimple YML file": function () {
<<<<<<<
"readConfigSync no ext file": function () {
=======
"readConfigSimple no ext file": function () {
>>>>>>>
"readConfigSimple no ext file": function () {
<<<<<<<
"readConfigSync YAML file with TAB not space": function () {
=======
"readConfigSimple YAML file with TAB not space": function () {
>>>>>>>
"readConfigSimple YAML file with TAB not space": function () { |
<<<<<<<
contentType?: string,
=======
cause?: CauseBacktrace,
>>>>>>>
cause?: CauseBacktrace,
contentType?: string, |
<<<<<<<
import { getSelectedThreadIndex } from '../../selectors/url-state';
import { getRightClickedCallNodeIndexForThread } from '../../selectors/right-clicked-call-node';
=======
import {
getShowUserTimings,
getSelectedThreadIndex,
} from '../../selectors/url-state';
>>>>>>>
import {
getShowUserTimings,
getSelectedThreadIndex,
} from '../../selectors/url-state';
import { getRightClickedCallNodeIndexForThread } from '../../selectors/right-clicked-call-node';
<<<<<<<
const stackTimingByDepth = selectedThreadSelectors.getStackTimingByDepth(
state
);
const threadIndex = getSelectedThreadIndex(state);
=======
const showUserTimings = getShowUserTimings(state);
const combinedTimingRows = showUserTimings
? selectedThreadSelectors.getCombinedTimingRows(state)
: selectedThreadSelectors.getStackTimingByDepth(state);
>>>>>>>
const showUserTimings = getShowUserTimings(state);
const combinedTimingRows = showUserTimings
? selectedThreadSelectors.getCombinedTimingRows(state)
: selectedThreadSelectors.getStackTimingByDepth(state);
const threadIndex = getSelectedThreadIndex(state); |
<<<<<<<
isAddonInstalled: boolean,
=======
isDragging: boolean,
popupAddonInstallPhase: PopupAddonInstallPhase,
>>>>>>>
popupAddonInstallPhase: PopupAddonInstallPhase,
<<<<<<<
_supportsWebExtensionAPI: boolean = _supportsWebExtensionAPI();
_isFirefox: boolean = _isFirefox();
state = {
isAddonInstalled: Boolean(window.isGeckoProfilerAddonInstalled),
};
=======
constructor(props: HomeProps) {
super(props);
// Start by suggesting that we install the add-on.
let popupAddonInstallPhase = 'other-browser';
if (_isFirefox()) {
if (window.isGeckoProfilerAddonInstalled) {
popupAddonInstallPhase = 'addon-installed';
} else {
popupAddonInstallPhase = 'suggest-install-addon';
}
// Query the browser to see if the menu button is available.
queryIsMenuButtonEnabled().then(
isMenuButtonEnabled => {
this.setState({
popupAddonInstallPhase: isMenuButtonEnabled
? 'popup-enabled'
: 'suggest-enable-popup',
});
},
() => {
// Do nothing if this request returns an error. It probably just means
// that we're talking to an older version of the browser.
}
);
}
>>>>>>>
constructor(props: HomeProps) {
super(props);
// Start by suggesting that we install the add-on.
let popupAddonInstallPhase = 'other-browser';
if (_isFirefox()) {
if (window.isGeckoProfilerAddonInstalled) {
popupAddonInstallPhase = 'addon-installed';
} else {
popupAddonInstallPhase = 'suggest-install-addon';
}
// Query the browser to see if the menu button is available.
queryIsMenuButtonEnabled().then(
isMenuButtonEnabled => {
this.setState({
popupAddonInstallPhase: isMenuButtonEnabled
? 'popup-enabled'
: 'suggest-enable-popup',
});
},
() => {
// Do nothing if this request returns an error. It probably just means
// that we're talking to an older version of the browser.
}
);
}
<<<<<<<
function _supportsWebExtensionAPI(): boolean {
const matched = navigator.userAgent.match(/Firefox\/(\d+\.\d+)/);
const minimumSupportedFirefox = 55;
return matched ? parseFloat(matched[1]) >= minimumSupportedFirefox : false;
}
=======
function _dragPreventDefault(event: DragEvent) {
event.preventDefault();
}
>>>>>>> |
<<<<<<<
describe('#hasAccess()', function() {
it('should use the lock to prevent concurrend access', function(done) {
var token = {
granted_time: 100,
expires_in: 100,
refresh_token: 'bar'
};
var properties = new MockProperties({
'oauth2.test': JSON.stringify(token)
});
mocks.UrlFetchApp.delay = 100;
mocks.UrlFetchApp.resultFunction = () =>
JSON.stringify({
access_token: Math.random().toString(36)
});
var getAccessToken = function() {
var service = OAuth2.createService('test')
.setClientId('abc')
.setClientSecret('def')
.setTokenUrl('http://www.example.com')
.setPropertyStore(properties)
.setLock(new MockLock());
if (service.hasAccess()) {
return service.getAccessToken();
} else {
throw new Error('No access: ' + service.getLastError());
};
}.future();
Future.task(function() {
var first = getAccessToken();
var second = getAccessToken();
Future.wait(first, second);
return [first.get(), second.get()];
}).resolve(function(err, accessTokens) {
if (err) {
done(err);
}
assert.equal(accessTokens[0], accessTokens[1]);
done();
});
});
});
=======
});
describe('Utilities', function() {
describe('#extend_()', function() {
var extend_ = OAuth2.extend_;
var baseObj = {foo: [3]}; // An object with a non-primitive key-value
it('should extend (left) an object', function() {
var o = extend_(baseObj, {bar: 2});
assert.deepEqual(o, {foo: [3], bar: 2});
});
it('should extend (right) an object', function() {
var o = extend_({bar: 2}, baseObj);
assert.deepEqual(o, {foo: [3], bar: 2});
});
it('should extend (merge) an object', function() {
var o = extend_(baseObj, {foo: [100], bar: 2, baz: {}});
assert.deepEqual(o, {foo: [100], bar: 2, baz: {}});
});
});
>>>>>>>
describe('#hasAccess()', function() {
it('should use the lock to prevent concurrend access', function(done) {
var token = {
granted_time: 100,
expires_in: 100,
refresh_token: 'bar'
};
var properties = new MockProperties({
'oauth2.test': JSON.stringify(token)
});
mocks.UrlFetchApp.delay = 100;
mocks.UrlFetchApp.resultFunction = () =>
JSON.stringify({
access_token: Math.random().toString(36)
});
var getAccessToken = function() {
var service = OAuth2.createService('test')
.setClientId('abc')
.setClientSecret('def')
.setTokenUrl('http://www.example.com')
.setPropertyStore(properties)
.setLock(new MockLock());
if (service.hasAccess()) {
return service.getAccessToken();
} else {
throw new Error('No access: ' + service.getLastError());
};
}.future();
Future.task(function() {
var first = getAccessToken();
var second = getAccessToken();
Future.wait(first, second);
return [first.get(), second.get()];
}).resolve(function(err, accessTokens) {
if (err) {
done(err);
}
assert.equal(accessTokens[0], accessTokens[1]);
done();
});
});
});
});
describe('Utilities', function() {
describe('#extend_()', function() {
var extend_ = OAuth2.extend_;
var baseObj = {foo: [3]}; // An object with a non-primitive key-value
it('should extend (left) an object', function() {
var o = extend_(baseObj, {bar: 2});
assert.deepEqual(o, {foo: [3], bar: 2});
});
it('should extend (right) an object', function() {
var o = extend_({bar: 2}, baseObj);
assert.deepEqual(o, {foo: [3], bar: 2});
});
it('should extend (merge) an object', function() {
var o = extend_(baseObj, {foo: [100], bar: 2, baz: {}});
assert.deepEqual(o, {foo: [100], bar: 2, baz: {}});
});
}); |
<<<<<<<
this.room = room;
this.name = this.room.name;
this.channel = 'game:' + this.name;
this.frame = null;
this.avatars = this.room.players.map(function () { return this.getAvatar(); });
this.size = this.getSize(this.avatars.count());
this.rendered = null;
this.maxScore = this.getMaxScore(this.avatars.count());
this.fps = new FPSLogger();
this.started = false;
this.bonusManager = new BonusManager(this);
=======
this.room = room;
this.name = this.room.name;
this.channel = 'game:' + this.name;
this.frame = null;
this.avatars = this.room.players.map(function () { return this.getAvatar(); });
this.size = this.getSize(this.avatars.count());
this.rendered = null;
this.maxScore = this.getMaxScore(this.avatars.count());
this.fps = new FPSLogger();
this.started = false;
this.running = false;
>>>>>>>
this.room = room;
this.name = this.room.name;
this.channel = 'game:' + this.name;
this.frame = null;
this.avatars = this.room.players.map(function () { return this.getAvatar(); });
this.size = this.getSize(this.avatars.count());
this.rendered = null;
this.maxScore = this.getMaxScore(this.avatars.count());
this.fps = new FPSLogger();
this.started = false;
this.bonusManager = new BonusManager(this);
<<<<<<<
this.bonusManager.stop();
=======
this.running = false;
>>>>>>>
this.running = false;
this.bonusManager.stop();
<<<<<<<
this.frame = setTimeout(this.loop.bind(this), this.framerate);
=======
this.frame = setTimeout(this.loop, this.framerate * 1000);
};
/**
* Clear frame
*/
BaseGame.prototype.clearFrame = function()
{
clearTimeout(this.frame);
>>>>>>>
this.frame = setTimeout(this.loop, this.framerate);
};
/**
* Clear frame
*/
BaseGame.prototype.clearFrame = function()
{
clearTimeout(this.frame); |
<<<<<<<
<label><input id="includeNsfw" type="checkbox">NSFW Channel</label>
=======
<label><input id="includeNsfw" type="checkbox">Include NSFW</label><br>
<label><input id="includePinned" type="checkbox" checked>Include pinned</label>
>>>>>>>
<label><input id="includeNsfw" type="checkbox">NSFW Channel</label>
<label><input id="includePinned" type="checkbox" checked>Include pinned</label>
<<<<<<<
const $ = s => popup.document.querySelector(s);
const logArea = $('pre');
const startBtn = $('button#start');
const stopBtn = $('button#stop');
const autoScroll = $('#autoScroll');
startBtn.onclick = async e => {
const authToken = $('input#authToken').value.trim();
const authorId = $('input#authorId').value.trim();
const guildId = $('input#guildId').value.trim();
const channelIds = $('input#channelId').value.trim().split(/\s*,\s*/);
const afterMessageId = $('input#afterMessageId').value.trim();
const beforeMessageId = $('input#beforeMessageId').value.trim();
const minId = $('input#minId').value.trim();
const maxId = $('input#maxId').value.trim();
const content = $('input#content').value.trim();
const hasLink = $('input#hasLink').checked;
const hasFile = $('input#hasFile').checked;
const includeNsfw = $('input#includeNsfw').checked;
const fileSelection = $("input#file");
fileSelection.addEventListener("change", () => {
const files = fileSelection.files;
const channelIdField = $('input#channelId');
if (files.length > 0) {
const file = files[0];
file.text().then(text => {
let json = JSON.parse(text);
let channels = Object.keys(json);
channelIdField.value = channels.join(",");
});
}
}, false);
=======
const logArea = popup.document.querySelector('pre');
const startBtn = popup.document.querySelector('button#start');
const stopBtn = popup.document.querySelector('button#stop');
const autoScroll = popup.document.querySelector('#autoScroll');
startBtn.onclick = e => {
const authToken = popup.document.querySelector('input#authToken').value.trim();
const authorId = popup.document.querySelector('input#authorId').value.trim();
const guildId = popup.document.querySelector('input#guildId').value.trim();
const channelId = popup.document.querySelector('input#channelId').value.trim();
const afterMessageId = popup.document.querySelector('input#afterMessageId').value.trim();
const beforeMessageId = popup.document.querySelector('input#beforeMessageId').value.trim();
const content = popup.document.querySelector('input#content').value.trim();
const hasLink = popup.document.querySelector('input#hasLink').checked;
const hasFile = popup.document.querySelector('input#hasFile').checked;
const includeNsfw = popup.document.querySelector('input#includeNsfw').checked;
const includePinned = popup.document.querySelector('input#includePinned').checked;
>>>>>>>
const $ = s => popup.document.querySelector(s);
const logArea = $('pre');
const startBtn = $('button#start');
const stopBtn = $('button#stop');
const autoScroll = $('#autoScroll');
startBtn.onclick = async e => {
const authToken = $('input#authToken').value.trim();
const authorId = $('input#authorId').value.trim();
const guildId = $('input#guildId').value.trim();
const channelIds = $('input#channelId').value.trim().split(/\s*,\s*/);
const afterMessageId = $('input#afterMessageId').value.trim();
const beforeMessageId = $('input#beforeMessageId').value.trim();
const minId = $('input#minId').value.trim();
const maxId = $('input#maxId').value.trim();
const content = $('input#content').value.trim();
const hasLink = $('input#hasLink').checked;
const hasFile = $('input#hasFile').checked;
const includeNsfw = $('input#includeNsfw').checked;
const includePinned = $('input#includePinned').checked;
const fileSelection = $("input#file");
fileSelection.addEventListener("change", () => {
const files = fileSelection.files;
const channelIdField = $('input#channelId');
if (files.length > 0) {
const file = files[0];
file.text().then(text => {
let json = JSON.parse(text);
let channels = Object.keys(json);
channelIdField.value = channels.join(",");
});
}
}, false);
<<<<<<<
for (let i = 0; i < channelIds.length; i++) {
await deleteMessages(authToken, authorId, guildId, channelIds[i], afterMessageId, beforeMessageId, content, hasLink, hasFile, includeNsfw, logger, () => !(stop === true || popup.closed)).then(() => {
stop = stopBtn.disabled = !(startBtn.disabled = false);
});
}
=======
deleteMessages(authToken, authorId, guildId, channelId, afterMessageId, beforeMessageId, content, hasLink, hasFile, includeNsfw, includePinned, logger, () => !(stop === true || popup.closed)).then(() => {
stop = stopBtn.disabled = !(startBtn.disabled = false);
});
>>>>>>>
for (let i = 0; i < channelIds.length; i++) {
await deleteMessages(authToken, authorId, guildId, channelIds[i], afterMessageId, beforeMessageId, content, hasLink, hasFile, includeNsfw, includePinned, logger, () => !(stop === true || popup.closed)).then(() => {
stop = stopBtn.disabled = !(startBtn.disabled = false);
});
} |
<<<<<<<
text = (this.protectedFromFratigue) ? "Prodected" : text ;
text = (this.materializeSickness) ? "Sickened" : text ;
=======
text = (this.protectedFromFratigue) ? "Protected" : text ;
>>>>>>>
text = (this.protectedFromFratigue) ? "Protected" : text ;
text = (this.materializeSickness) ? "Sickened" : text ; |
<<<<<<<
if (scanner.getTemplateTag) {
var lastPos = -1;
// Try to parse a template tag by calling out to the provided
// `getTemplateTag` function. If the function returns `null` but
// consumes characters, it must have parsed a comment or something,
// so we loop and try it again. If it ever returns `null` without
=======
if (scanner.getSpecialTag) {
// Try to parse a "special tag" by calling out to the provided
// `getSpecialTag` function. If the function returns `null` but
// consumes characters, it must have parsed a comment, so we return null
// and allow the lexer to continue. If it ever returns `null` without
>>>>>>>
if (scanner.getTemplateTag) {
// Try to parse a template tag by calling out to the provided
// `getTemplateTag` function. If the function returns `null` but
// consumes characters, it must have parsed a comment or something,
// so we loop and try it again. If it ever returns `null` without
<<<<<<<
// the value must be instanceof HTMLTools.TemplateTag.
while ((! result) && scanner.pos > lastPos) {
lastPos = scanner.pos;
result = scanner.getTemplateTag(
scanner,
(dataMode === 'rcdata' ? TEMPLATE_TAG_POSITION.IN_RCDATA :
(dataMode === 'rawtext' ? TEMPLATE_TAG_POSITION.IN_RAWTEXT :
TEMPLATE_TAG_POSITION.ELEMENT)));
}
=======
// the value must be an object. We wrap it in a Special token.
var lastPos = scanner.pos;
result = scanner.getSpecialTag(
scanner,
(dataMode === 'rcdata' ? TEMPLATE_TAG_POSITION.IN_RCDATA :
(dataMode === 'rawtext' ? TEMPLATE_TAG_POSITION.IN_RAWTEXT :
TEMPLATE_TAG_POSITION.ELEMENT)));
>>>>>>>
// the value must be instanceof HTMLTools.TemplateTag. We wrap it
// in a Special token.
var lastPos = scanner.pos;
result = scanner.getTemplateTag(
scanner,
(dataMode === 'rcdata' ? TEMPLATE_TAG_POSITION.IN_RCDATA :
(dataMode === 'rawtext' ? TEMPLATE_TAG_POSITION.IN_RAWTEXT :
TEMPLATE_TAG_POSITION.ELEMENT)));
<<<<<<<
return { t: 'TemplateTag', v: assertIsTemplateTag(result) };
=======
return { t: 'Special', v: result };
else if (scanner.pos > lastPos)
return null;
>>>>>>>
return { t: 'TemplateTag', v: assertIsTemplateTag(result) };
else if (scanner.pos > lastPos)
return null; |
<<<<<<<
var c = Deps.autorun(function viewAutorun(c) {
return Blaze._withCurrentView(_inViewScope || self, function () {
=======
var c = Tracker.autorun(function viewAutorun(c) {
return Blaze.withCurrentView(_inViewScope || self, function () {
>>>>>>>
var c = Tracker.autorun(function viewAutorun(c) {
return Blaze._withCurrentView(_inViewScope || self, function () {
<<<<<<<
Blaze._withCurrentView(view, function () {
Deps.nonreactive(function fireCallbacks() {
=======
Blaze.withCurrentView(view, function () {
Tracker.nonreactive(function fireCallbacks() {
>>>>>>>
Blaze._withCurrentView(view, function () {
Tracker.nonreactive(function fireCallbacks() {
<<<<<<<
Blaze._materializeView = function (view, parentView) {
Blaze._createView(view, parentView);
=======
var domrange;
var needsRenderedCallback = false;
var scheduleRenderedCallback = function () {
if (needsRenderedCallback && ! view.isDestroyed &&
view._callbacks.rendered && view._callbacks.rendered.length) {
Tracker.afterFlush(function callRendered() {
if (needsRenderedCallback && ! view.isDestroyed) {
needsRenderedCallback = false;
Blaze._fireCallbacks(view, 'rendered');
}
});
}
};
>>>>>>>
Blaze._materializeView = function (view, parentView) {
Blaze._createView(view, parentView);
<<<<<<<
Deps.nonreactive(function doMaterialize() {
var materializer = new Blaze._DOMMaterializer({parentView: view});
=======
Tracker.nonreactive(function doMaterialize() {
var materializer = new Blaze.DOMMaterializer({parentView: view});
>>>>>>>
Tracker.nonreactive(function doMaterialize() {
var materializer = new Blaze._DOMMaterializer({parentView: view});
<<<<<<<
if (Deps.active) {
Deps.onInvalidate(function () {
Blaze._destroyView(view);
=======
if (Tracker.active) {
Tracker.onInvalidate(function () {
Blaze.destroyView(view);
>>>>>>>
if (Tracker.active) {
Tracker.onInvalidate(function () {
Blaze._destroyView(view); |
<<<<<<<
"spacebars-tests - template_tests - UI._parentData from helper",
=======
"spacebars-tests - template_tests - UI._parentData from helpers",
>>>>>>>
"spacebars-tests - template_tests - UI._parentData from helpers",
<<<<<<<
);
Tinytest.add(
"spacebars-tests - template_tests - created/rendered/destroyed by each",
function (test) {
var outerTmpl =
Template.spacebars_test_template_created_rendered_destroyed_each;
var innerTmpl =
Template.spacebars_test_template_created_rendered_destroyed_each_sub;
var buf = '';
innerTmpl.created = function () { buf += 'C' + String(this.data).toLowerCase(); };
innerTmpl.rendered = function () { buf += 'R' + String(this.data).toLowerCase(); };
innerTmpl.destroyed = function () { buf += 'D' + String(this.data).toLowerCase(); };
var R = ReactiveVar([{_id: 'A'}]);
outerTmpl.items = function () {
return R.get();
};
var div = renderToDiv(outerTmpl);
divRendersTo(test, div, '<div>A</div>');
test.equal(buf, 'CaRa');
R.set([{_id: 'B'}]);
divRendersTo(test, div, '<div>B</div>');
test.equal(buf, 'CaRaDaCbRb');
R.set([{_id: 'C'}]);
divRendersTo(test, div, '<div>C</div>');
test.equal(buf, 'CaRaDaCbRbDbCcRc');
$(div).remove();
test.equal(buf, 'CaRaDaCbRbDbCcRcDc');
});
=======
);
Tinytest.add(
"spacebars-tests - template_tests - UI.render/UI.insert",
function (test) {
var div = document.createElement("DIV");
document.body.appendChild(div);
var created = false, rendered = false, destroyed = false;
var R = ReactiveVar('aaa');
var tmpl = Template.spacebars_test_ui_render;
tmpl.greeting = function () { return this.greeting || 'Hello'; };
tmpl.r = function () { return R.get(); };
tmpl.created = function () { created = true; };
tmpl.rendered = function () { rendered = true; };
tmpl.destroyed = function () { destroyed = true; };
test.equal([created, rendered, destroyed], [false, false, false]);
var renderedTmpl = UI.render(tmpl);
test.equal([created, rendered, destroyed], [true, false, false]);
UI.insert(renderedTmpl, div);
// Flush now. We fire the rendered callback in an afterFlush block,
// to ensure that the DOM is completely updated.
Deps.flush();
test.equal([created, rendered, destroyed], [true, true, false]);
UI.render(tmpl); // can run a second time without throwing
UI.insert(UI.renderWithData(tmpl, {greeting: 'Bye'}), div);
test.equal(canonicalizeHtml(div.innerHTML),
"<span>Hello aaa</span><span>Bye aaa</span>");
R.set('bbb');
Deps.flush();
test.equal(canonicalizeHtml(div.innerHTML),
"<span>Hello bbb</span><span>Bye bbb</span>");
test.equal([created, rendered, destroyed], [true, true, false]);
$(div).remove();
test.equal([created, rendered, destroyed], [true, true, true]);
});
Tinytest.add(
"spacebars-tests - template_tests - UI.insert fails on jQuery objects",
function (test) {
var tmpl = Template.spacebars_test_ui_render;
test.throws(function () {
UI.insert(UI.render(tmpl), $('body'));
}, /'parentElement' must be a DOM node/);
test.throws(function () {
UI.insert(UI.render(tmpl), document.body, $('body'));
}, /'nextNode' must be a DOM node/);
});
Tinytest.add(
"spacebars-tests - template_tests - UI.getElementData",
function (test) {
var div = document.createElement("DIV");
var tmpl = Template.spacebars_test_ui_getElementData;
UI.insert(UI.renderWithData(tmpl, {foo: "bar"}), div);
var span = div.querySelector('SPAN');
test.isTrue(span);
test.equal(UI.getElementData(span), {foo: "bar"});
});
>>>>>>>
);
Tinytest.add(
"spacebars-tests - template_tests - created/rendered/destroyed by each",
function (test) {
var outerTmpl =
Template.spacebars_test_template_created_rendered_destroyed_each;
var innerTmpl =
Template.spacebars_test_template_created_rendered_destroyed_each_sub;
var buf = '';
innerTmpl.created = function () { buf += 'C' + String(this.data).toLowerCase(); };
innerTmpl.rendered = function () { buf += 'R' + String(this.data).toLowerCase(); };
innerTmpl.destroyed = function () { buf += 'D' + String(this.data).toLowerCase(); };
var R = ReactiveVar([{_id: 'A'}]);
outerTmpl.items = function () {
return R.get();
};
var div = renderToDiv(outerTmpl);
divRendersTo(test, div, '<div>A</div>');
test.equal(buf, 'CaRa');
R.set([{_id: 'B'}]);
divRendersTo(test, div, '<div>B</div>');
test.equal(buf, 'CaRaDaCbRb');
R.set([{_id: 'C'}]);
divRendersTo(test, div, '<div>C</div>');
test.equal(buf, 'CaRaDaCbRbDbCcRc');
$(div).remove();
test.equal(buf, 'CaRaDaCbRbDbCcRcDc');
});
Tinytest.add(
"spacebars-tests - template_tests - UI.render/UI.insert",
function (test) {
var div = document.createElement("DIV");
document.body.appendChild(div);
var created = false, rendered = false, destroyed = false;
var R = ReactiveVar('aaa');
var tmpl = Template.spacebars_test_ui_render;
tmpl.greeting = function () { return this.greeting || 'Hello'; };
tmpl.r = function () { return R.get(); };
tmpl.created = function () { created = true; };
tmpl.rendered = function () { rendered = true; };
tmpl.destroyed = function () { destroyed = true; };
test.equal([created, rendered, destroyed], [false, false, false]);
var renderedTmpl = UI.render(tmpl);
test.equal([created, rendered, destroyed], [true, false, false]);
UI.insert(renderedTmpl, div);
// Flush now. We fire the rendered callback in an afterFlush block,
// to ensure that the DOM is completely updated.
Deps.flush();
test.equal([created, rendered, destroyed], [true, true, false]);
UI.render(tmpl); // can run a second time without throwing
UI.insert(UI.renderWithData(tmpl, {greeting: 'Bye'}), div);
test.equal(canonicalizeHtml(div.innerHTML),
"<span>Hello aaa</span><span>Bye aaa</span>");
R.set('bbb');
Deps.flush();
test.equal(canonicalizeHtml(div.innerHTML),
"<span>Hello bbb</span><span>Bye bbb</span>");
test.equal([created, rendered, destroyed], [true, true, false]);
$(div).remove();
test.equal([created, rendered, destroyed], [true, true, true]);
});
Tinytest.add(
"spacebars-tests - template_tests - UI.insert fails on jQuery objects",
function (test) {
var tmpl = Template.spacebars_test_ui_render;
test.throws(function () {
UI.insert(UI.render(tmpl), $('body'));
}, /'parentElement' must be a DOM node/);
test.throws(function () {
UI.insert(UI.render(tmpl), document.body, $('body'));
}, /'nextNode' must be a DOM node/);
});
Tinytest.add(
"spacebars-tests - template_tests - UI.getElementData",
function (test) {
var div = document.createElement("DIV");
var tmpl = Template.spacebars_test_ui_getElementData;
UI.insert(UI.renderWithData(tmpl, {foo: "bar"}), div);
var span = div.querySelector('SPAN');
test.isTrue(span);
test.equal(UI.getElementData(span), {foo: "bar"});
}); |
<<<<<<<
=======
try {
var ast = Handlebars.to_json_ast(contents);
} catch (e) {
if (e instanceof Handlebars.ParseError) {
if (typeof(e.line) === "number")
// subtract one from e.line because it is one-based but we
// need it to be an offset from contentsStartIndex
throwParseError(e.message, contentsStartIndex, e.line - 1);
else
// No line number available from Handlebars parser, so
// generate the parse error at the <template> tag itself
throwParseError("error in template: " + e.message, tagStartIndex);
}
else
throw e;
}
var code = 'Package.handlebars.Handlebars.json_ast_to_func(' +
JSON.stringify(ast) + ')';
>>>>>>> |
<<<<<<<
api.use('htmljs');
api.use('spacebars-compiler'); // for `HTML.toJS`
=======
api.use('blaze-tools'); // for `toJS`
>>>>>>>
api.use('htmljs');
api.use('blaze-tools'); // for `toJS` |
<<<<<<<
var sweetAlertInitialize = function() {
var sweetHTML = '<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="icon error"><span class="x-mark"><span class="line left"></span><span class="line right"></span></span></div><div class="icon warning"> <span class="body"></span> <span class="dot"></span> </div> <div class="icon info"></div> <div class="icon success"> <span class="line tip"></span> <span class="line long"></span> <div class="placeholder"></div> <div class="fix"></div> </div> <div class="icon custom"></div> <h2>Title</h2><p>Text</p><button class="cancel" tabIndex="2">Cancel</button><button class="confirm" tabIndex="1">OK</button></div>',
=======
window.sweetAlertInitialize = function() {
var sweetHTML = '<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="sa-icon sa-error"><span class="sa-x-mark"><span class="sa-line sa-left"></span><span class="sa-line sa-right"></span></span></div><div class="sa-icon sa-warning"> <span class="sa-body"></span> <span class="sa-dot"></span> </div> <div class="sa-icon sa-info"></div> <div class="sa-icon sa-success"> <span class="sa-line sa-tip"></span> <span class="sa-line sa-long"></span> <div class="sa-placeholder"></div> <div class="sa-fix"></div> </div> <div class="sa-icon sa-custom"></div> <h2>Title</h2><p>Text</p><button class="cancel" tabIndex="2">Cancel</button><button class="confirm" tabIndex="1">OK</button></div>',
>>>>>>>
var sweetAlertInitialize = function() {
var sweetHTML = '<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="sa-icon sa-error"><span class="sa-x-mark"><span class="sa-line sa-left"></span><span class="sa-line sa-right"></span></span></div><div class="sa-icon sa-warning"> <span class="sa-body"></span> <span class="sa-dot"></span> </div> <div class="sa-icon sa-info"></div> <div class="sa-icon sa-success"> <span class="sa-line sa-tip"></span> <span class="sa-line sa-long"></span> <div class="sa-placeholder"></div> <div class="sa-fix"></div> </div> <div class="sa-icon sa-custom"></div> <h2>Title</h2><p>Text</p><button class="cancel" tabIndex="2">Cancel</button><button class="confirm" tabIndex="1">OK</button></div>', |
<<<<<<<
const zoom = d3.behavior.zoom().scaleExtent([0.1, 5]).on('zoom', () => {
svg.attr('transform', `translate(${[0, (-minYCoordinate + 25) * d3.event.scale]}) scale(${d3.event.scale})`);
const svg2 = d3.select(svgID);
svg2.attr('width', Math.max(maxXCoordinate * d3.event.scale, $(svgID).parent().width()));
svg2.attr('height', (maxYCoordinate - minYCoordinate + 50) * d3.event.scale);
=======
zoom = d3.behavior.zoom().scaleExtent([0.1, 8]).on('zoom', () => {
svg.attr('transform', `translate(${d3.event.translate}) scale(${d3.event.scale})`);
>>>>>>>
zoom = d3.behavior.zoom().scaleExtent([0.1, 8]).on('zoom', () => {
svg.attr('transform', `translate(${[0, (-minYCoordinate + 25) * d3.event.scale]}) scale(${d3.event.scale})`);
const svg2 = d3.select(svgID);
svg2.attr('width', Math.max(maxXCoordinate * d3.event.scale, $(svgID).parent().width()));
svg2.attr('height', (maxYCoordinate - minYCoordinate + 50) * d3.event.scale); |
<<<<<<<
addresses: MF.fragmentArray('address', { defaultValue: null })
=======
addresses: DS.hasManyFragments('address')
>>>>>>>
addresses: MF.fragmentArray('address')
<<<<<<<
var data = getWithDefault(internalModel, key, options, 'array');
=======
var data = internalModel._data[key];
if (data === undefined) {
data = getDefaultValue(internalModel, options, 'array');
}
>>>>>>>
var data = getWithDefault(internalModel, key, options, 'array');
<<<<<<<
Ember.warn("The default value of fragment array properties will change from `null` to an empty array in v1.0. " +
"This warning can be silenced by explicitly setting a default value with the option `{ defaultValue: null }`", type !== 'array' || 'defaultValue' in options);
=======
>>>>>>>
<<<<<<<
} else if ('defaultValue' in options) {
=======
} else if (options.defaultValue !== undefined) {
>>>>>>>
} else if ('defaultValue' in options) {
<<<<<<<
Ember.assert("The fragment's default value must be an " + type, (typeOf(value) == type) || (value === null));
=======
Ember.assert("The fragment's default value must be an " + type, (Ember.typeOf(value) == type) || (value === null));
>>>>>>>
Ember.assert("The fragment's default value must be an " + type, (typeOf(value) == type) || (value === null)); |
<<<<<<<
this.views.queryForm = new QueryFormView({searchControlView: this, el: this.$el.children('#searchPages')});
this.views.resultList = new MetacardList.MetacardListView({searchControlView: this, el: this.$el.children('#searchPages')});
this.views.map = options.map;
=======
this.views.queryForm = new QueryFormView({searchControlView: this});
this.views.map = mapView;
>>>>>>>
this.views.queryForm = new QueryFormView({searchControlView: this});
this.views.map = options.map;
<<<<<<<
this.views.resultList = new MetacardList.MetacardListView({ result: result, mapView: this.mapView, searchControlView: this, el: this.$el.children('#searchPages') });
=======
if(this.views.resultList) {
this.views.resultList.close();
}
this.views.resultList = new MetacardListView({ result: result, mapView: this.mapView, searchControlView: this });
>>>>>>>
if(this.views.resultList) {
this.views.resultList.close();
}
this.views.resultList = new MetacardList.MetacardListView({ result: result, mapView: this.mapView, searchControlView: this }); |
<<<<<<<
},
stop : function(){
if(!this.stopped){
this.enableInput();
this.mouseHandler.destroy();
this.model.trigger("EndExtent", this.model);
}
this.stopped = true;
=======
>>>>>>>
},
stop : function(){
if(!this.stopped){
this.enableInput();
this.mouseHandler.destroy();
this.model.trigger("EndExtent", this.model);
}
this.stopped = true;
<<<<<<<
this.view = view;
=======
this.notificationEl.empty();
$('<span>Extent Mode</span>').appendTo(this.notificationEl);
this.notificationEl.animate({
height: 'show'
},425, function() {
});
>>>>>>>
this.view = view;
this.notificationEl.empty();
$('<span>Extent Mode</span>').appendTo(this.notificationEl);
this.notificationEl.animate({
height: 'show'
},425, function() {
}); |
<<<<<<<
ddf.app.controllers.drawExentController = new DrawExtent.Controller({
viewer: ddf.app.mapView.mapViewer
});
ddf.app.controllers.drawCircleController = new DrawCircle.Controller({
viewer: ddf.app.mapView.mapViewer
});
=======
ddf.app.controllers.drawExentController = new DrawExtent.Controller(
{
viewer: ddf.app.mapView.mapViewer,
notificationEl: $("#notificationBar")
});
>>>>>>>
ddf.app.controllers.drawExentController = new DrawExtent.Controller({
viewer: ddf.app.mapView.mapViewer,
notificationEl: $("#notificationBar")
});
ddf.app.controllers.drawCircleController = new DrawCircle.Controller({
viewer: ddf.app.mapView.mapViewer,
notificationEl: $("#notificationBar")
}); |
<<<<<<<
],function (ich, _, Marionette, Service, ConfigurationEdit, EmptyView, wreqr, serviceList, serviceRow, configurationRow, servicePage, configurationList) {
=======
],function (ich, _, Marionette, Service, ConfigurationEdit, wreqr, Utils, serviceList, serviceRow, configurationRow, servicePage, configurationList) {
>>>>>>>
],function (ich, _, Marionette, Service, ConfigurationEdit, EmptyView, wreqr, Utils, serviceList, serviceRow, configurationRow, servicePage, configurationList) {
<<<<<<<
this.model.get("value").comparator = function( model ) {
return model.get('name');
};
var collection = this.model.get("value").sort();
this.collectionRegion.show(new ServiceView.ServiceTable({ collection: collection, showWarnings: this.showWarnings }));
=======
this.collectionRegion.show(new ServiceView.ServiceTable({ collection: this.model.get("value"), showWarnings: this.showWarnings }));
>>>>>>>
this.model.get("value").comparator = function( model ) {
return model.get('name');
};
var collection = this.model.get("value").sort();
this.collectionRegion.show(new ServiceView.ServiceTable({ collection: collection, showWarnings: this.showWarnings })); |
<<<<<<<
// if we have got this far, then we are good to go with processing the command passed in via the click-outside attribute
$scope.$eval($scope.clickOutside);
});
// when the scope is destroyed, clean up the documents click handler as we don't want it hanging around
$scope.$on('$destroy', function() {
clickHandler();
});
}
};
}
=======
$scope.$eval($scope.clickOutside);
});
}
};
}
})();
>>>>>>>
// if we have got this far, then we are good to go with processing the command passed in via the click-outside attribute
$scope.$eval($scope.clickOutside);
});
// when the scope is destroyed, clean up the documents click handler as we don't want it hanging around
$scope.$on('$destroy', function() {
clickHandler();
});
}
};
}
})(); |
<<<<<<<
var currentDescriptor = Object.getOwnPropertyDescriptor(target, key);
// Someone could have replaced us with a new property. If so, don't trample
// over them.
if (
currentDescriptor &&
(currentDescriptor.get === descriptor.get) &&
(currentDescriptor.set === descriptor.set)
)
Object.defineProperty(target, key, {
configurable: true,
enumerable: true,
writable: true,
value: target[key]
});
=======
var currentDescriptor = Object.getOwnPropertyDescriptor(target, key);
// Someone could have replaced us with a new property. If so, don't trample
// over them.
if (
currentDescriptor &&
(currentDescriptor.get === descriptor.get) &&
(currentDescriptor.set === descriptor.set)
)
Object.defineProperty(target, key, {
configurable: true,
enumerable: true,
writable: true,
value: target[key]
});
>>>>>>>
var currentDescriptor = Object.getOwnPropertyDescriptor(target, key);
// Someone could have replaced us with a new property. If so, don't trample
// over them.
if (
currentDescriptor &&
(currentDescriptor.get === descriptor.get) &&
(currentDescriptor.set === descriptor.set)
)
Object.defineProperty(target, key, {
configurable: true,
enumerable: true,
writable: true,
value: target[key]
});
<<<<<<<
var currentDescriptor = Object.getOwnPropertyDescriptor(target, key);
// Someone could have replaced us with a new property. If so, don't trample
// over them.
if (
currentDescriptor &&
(currentDescriptor.get === descriptor.get)
)
JSIL.SetValueProperty(target, key, state);
=======
var currentDescriptor = Object.getOwnPropertyDescriptor(target, key);
// Someone could have replaced us with a new property. If so, don't trample
// over them.
if (
currentDescriptor &&
(currentDescriptor.get === descriptor.get)
)
JSIL.SetValueProperty(target, key, state);
>>>>>>>
var currentDescriptor = Object.getOwnPropertyDescriptor(target, key);
// Someone could have replaced us with a new property. If so, don't trample
// over them.
if (
currentDescriptor &&
(currentDescriptor.get === descriptor.get)
)
JSIL.SetValueProperty(target, key, state);
<<<<<<<
JSIL.$CreateMethodMembranes = function (typeObject, publicInterface) {
var maybeRunCctors = function MaybeRunStaticConstructors () {
JSIL.RunStaticConstructors(publicInterface, typeObject);
};
var makeReturner = function (value) {
return function () { return value; };
};
var methods = JSIL.GetMembersInternal(
typeObject, 0, "MethodInfo", true
);
// We need to ensure that all the mangled method names have membranes applied.
// This can't be done before now due to generic types.
for (var i = 0, l = methods.length; i < l; i++) {
var method = methods[i];
var isStatic = method._descriptor.Static;
// FIXME: I'm not sure this is right for open generic methods.
// I think it might be looking up the old open form of the method signature
// instead of the closed form.
var key = method._data.signature.GetKey(method._descriptor.EscapedName);
var useMembrane = isStatic &&
($jsilcore.cctorKeys.indexOf(method._descriptor.Name) < 0) &&
($jsilcore.cctorKeys.indexOf(method._descriptor.EscapedName) < 0);
if (useMembrane) {
var originalFunction = publicInterface[key];
if (typeof (originalFunction) !== "function") {
// throw new Error("No function with key '" + key + "' found");
continue;
}
JSIL.DefinePreInitMethod(
publicInterface, key, makeReturner(originalFunction), maybeRunCctors
);
}
}
};
=======
JSIL.$GroupMethodsByName = function (methods) {
var methodsByName = {};
for (var i = 0, l = methods.length; i < l; i++) {
var method = methods[i];
var key = (method._descriptor.Static ? "static" : "instance") + "$" + method._descriptor.EscapedName;
var methodList = methodsByName[key];
if (!JSIL.IsArray(methodList))
methodList = methodsByName[key] = [];
// Don't add duplicate copies of the same method to the method list.
if (methodList.indexOf(method) < 0)
methodList.push(method);
}
return methodsByName;
};
>>>>>>>
JSIL.$CreateMethodMembranes = function (typeObject, publicInterface) {
var maybeRunCctors = function MaybeRunStaticConstructors () {
JSIL.RunStaticConstructors(publicInterface, typeObject);
};
var makeReturner = function (value) {
return function () { return value; };
};
var methods = JSIL.GetMembersInternal(
typeObject, 0, "MethodInfo", true
);
// We need to ensure that all the mangled method names have membranes applied.
// This can't be done before now due to generic types.
for (var i = 0, l = methods.length; i < l; i++) {
var method = methods[i];
var isStatic = method._descriptor.Static;
// FIXME: I'm not sure this is right for open generic methods.
// I think it might be looking up the old open form of the method signature
// instead of the closed form.
var key = method._data.signature.GetKey(method._descriptor.EscapedName);
var useMembrane = isStatic &&
($jsilcore.cctorKeys.indexOf(method._descriptor.Name) < 0) &&
($jsilcore.cctorKeys.indexOf(method._descriptor.EscapedName) < 0);
if (useMembrane) {
var originalFunction = publicInterface[key];
if (typeof (originalFunction) !== "function") {
// throw new Error("No function with key '" + key + "' found");
continue;
}
JSIL.DefinePreInitMethod(
publicInterface, key, makeReturner(originalFunction), maybeRunCctors
);
}
}
};
JSIL.$GroupMethodsByName = function (methods) {
var methodsByName = {};
for (var i = 0, l = methods.length; i < l; i++) {
var method = methods[i];
var key = (method._descriptor.Static ? "static" : "instance") + "$" + method._descriptor.EscapedName;
var methodList = methodsByName[key];
if (!JSIL.IsArray(methodList))
methodList = methodsByName[key] = [];
// Don't add duplicate copies of the same method to the method list.
if (methodList.indexOf(method) < 0)
methodList.push(method);
}
return methodsByName;
}; |
<<<<<<<
this._refs = [this.field.get(this._graph).accessor];
return Aggregate.prototype.transform.call(this, input, reset);
=======
this._refs = [this.on.get(this._graph).accessor];
return GroupBy.prototype.transform.call(this, input, reset);
>>>>>>>
this._refs = [this.field.get(this._graph).accessor];
return GroupBy.prototype.transform.call(this, input, reset); |
<<<<<<<
if (!disableInMemMessage) log.debug('inMem message ', pattern, channel, message);
=======
log.debug(settings.namespace + ' inMem message ', pattern, channel, message);
>>>>>>>
if (!disableInMemMessage) log.debug(settings.namespace + ' inMem message ', pattern, channel, message); |
<<<<<<<
// Ein paar Attribute die jeder Adapter mitbringen muss
=======
>>>>>>>
// Ein paar Attribute die jeder Adapter mitbringen muss
<<<<<<<
// Event-Handler für Adapter-Installation
install: function (callback) {
if (typeof callback === 'function') callback();
},
// Wird aufgerufen wenn sich ein Objekt - das via adapter.subscribeObjects aboniert wurde - ändert.
=======
install: function (callback) {
if (typeof callback === 'function') callback();
},
>>>>>>>
install: function (callback) {
if (typeof callback === 'function') callback();
},
// Event-Handler fur Adapter-Installation
install: function (callback) {
if (typeof callback === 'function') callback();
},
// Wird aufgerufen wenn sich ein Objekt - das via adapter.subscribeObjects aboniert wurde - andert.
<<<<<<<
// Wird aufgerufen wenn sich ein Status - der via adapter.subscribeStates aboniert wurde - ändert.
=======
>>>>>>>
// Wird aufgerufen wenn sich ein Status - der via adapter.subscribeStates aboniert wurde - andert.
<<<<<<<
// Wird aufgerufen bevor der Adapter beendet wird - callback muss unbedingt aufgerufen werden!
=======
>>>>>>>
// Wird aufgerufen bevor der Adapter beendet wird - callback muss unbedingt aufgerufen werden!
<<<<<<<
// Wird aufgerufen wenn der Adapter mit den Datenbanken verbunden ist und seine Konfiguration erhalten hat.
// Hier einsteigen!
=======
>>>>>>>
// Wird aufgerufen wenn der Adapter mit den Datenbanken verbunden ist und seine Konfiguration erhalten hat.
// Hier einsteigen!
<<<<<<<
if (adapter.config.cache) {
app.use('/', express.static(__dirname + '/www', {maxAge: 30758400000}));
} else {
app.use('/', express.static(__dirname + '/www'));
}
=======
>>>>>>>
if (adapter.config.cache) {
app.use('/', express.static(__dirname + '/www', {maxAge: 30758400000}));
} else {
app.use('/', express.static(__dirname + '/www'));
} |
<<<<<<<
var express = require('express');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
var session = require('express-session');
var AdapterStore = require(__dirname + '/../../lib/session.js')(session);
var socketio = require('socket.io');
var passportSocketIo = require("passport.socketio");
var password = require(__dirname + '/../../lib/password.js');
var passport = require('passport');
var LocalStrategy = require('passport-local').Strategy;
=======
var express = require('express');
var socketio = require('socket.io');
var crypto = require('crypto');
var password = require(__dirname + '/../../lib/password.js');
>>>>>>>
var express = require('express');
var socketio = require('socket.io');
var crypto = require('crypto');
var password = require(__dirname + '/../../lib/password.js');
<<<<<<<
=======
// Ein paar Attribute die jeder Adapter mitbringen muss
>>>>>>>
<<<<<<<
=======
install: function (callback) {
if (typeof callback === 'function') callback();
},
// Event-Handler fur Adapter-Installation
>>>>>>>
<<<<<<<
=======
// Wird aufgerufen wenn sich ein Objekt - das via adapter.subscribeObjects aboniert wurde - andert.
>>>>>>>
<<<<<<<
=======
// Wird aufgerufen wenn sich ein Status - der via adapter.subscribeStates aboniert wurde - andert.
>>>>>>>
<<<<<<<
=======
// Wird aufgerufen bevor der Adapter beendet wird - callback muss unbedingt aufgerufen werden!
>>>>>>>
<<<<<<<
=======
// Wird aufgerufen wenn der Adapter mit den Datenbanken verbunden ist und seine Konfiguration erhalten hat.
// Hier einsteigen!
>>>>>>>
<<<<<<<
// route middleware to make sure a user is logged in
function isLoggedIn(req, res, next) {
if (req.isAuthenticated() || req.originalUrl === '/login/') return next();
res.redirect('/login/');
}
=======
if ((adapter.config.listenPort && adapter.config.auth) ||
(adapter.config.listenPortSsl && adapter.config.authSsl)) {
// Check if "admin" user exists
adapter.getForeignObject('system.user.admin', function (err, obj) {
if (err) {
adapter.addUser("admin", "password");
}
});
}
>>>>>>>
// route middleware to make sure a user is logged in
function isLoggedIn(req, res, next) {
if (req.isAuthenticated() || req.originalUrl === '/login/') return next();
res.redirect('/login/');
}
<<<<<<<
app = express();
if (adapter.config.auth) {
passport.use(new LocalStrategy(
function (username, password, done) {
adapter.checkPassword(username, password, function (res) {
if (res) {
return done(null, username);
} else {
return done(null, false);
}
});
}
));
passport.serializeUser(function (user, done) {
done(null, user);
});
passport.deserializeUser(function (user, done) {
done(null, user);
});
app.use(cookieParser());
app.use(bodyParser.urlencoded({
extended: true
}));
app.use(bodyParser.json());
app.use(session({
secret: 'Zgfr56gFe87jJOM',
saveUninitialized: true,
resave: true,
store: new AdapterStore({adapter:adapter})
}));
app.use(passport.initialize());
app.use(passport.session());
app.post('/login',
passport.authenticate('local', { successRedirect: '/',
failureRedirect: '/login',
failureFlash: true })
);
app.get('/logout', function (req, res) {
req.logout();
res.redirect('/index/login.html');
});
app.use(isLoggedIn);
}
=======
app = express();
if (adapter.config.auth) {
// Authenticator
app.use(basicAuth(function(user, pass, callback) {
adapter.checkPassword(user, pass, function (res) {
adapter.log.debug('Authenticate "' + user + '": result - ' + res);
callback (!res, user);
});
}));
}
if (adapter.config.cache) {
app.use('/', express.static(__dirname + '/www', {maxAge: 30758400000}));
} else {
app.use('/', express.static(__dirname + '/www'));
}
app.get('/auth/*', authFile(false));
>>>>>>>
app = express();
if (adapter.config.auth) {
passport.use(new LocalStrategy(
function (username, password, done) {
adapter.checkPassword(username, password, function (res) {
if (res) {
return done(null, username);
} else {
return done(null, false);
}
});
}
));
passport.serializeUser(function (user, done) {
done(null, user);
});
passport.deserializeUser(function (user, done) {
done(null, user);
});
app.use(cookieParser());
app.use(bodyParser.urlencoded({
extended: true
}));
app.use(bodyParser.json());
app.use(session({
secret: 'Zgfr56gFe87jJOM',
saveUninitialized: true,
resave: true,
store: new AdapterStore({adapter:adapter})
}));
app.use(passport.initialize());
app.use(passport.session());
app.post('/login',
passport.authenticate('local', { successRedirect: '/',
failureRedirect: '/login',
failureFlash: true })
);
app.get('/logout', function (req, res) {
req.logout();
res.redirect('/index/login.html');
});
app.use(isLoggedIn);
}
<<<<<<<
if (adapter.config.auth && adapter.config.authUser) {
appSsl.use(express.basicAuth(adapter.config.authUser, adapter.config.authPassword));
}
=======
if (adapter.config.authSsl) {
// Authenticator
appSsl.use(basicAuth(function(user, pass, callback) {
adapter.checkPassword(user, pass, function (res) {
adapter.log.debug('Authenticate SSL "' + user + '": result - ' + res);
callback (!res, user);
});
}));
}
if (adapter.config.cache) {
appSsl.use('/', express.static(__dirname + '/www', {maxAge: 30758400000}));
} else {
appSsl.use('/', express.static(__dirname + '/www'));
}
appSsl.get('/auth/*', authFile(true));
>>>>>>>
if (adapter.config.cache) {
appSsl.use('/', express.static(__dirname + '/www', {maxAge: 30758400000}));
} else {
appSsl.use('/', express.static(__dirname + '/www'));
}
appSsl.get('/auth/*', authFile(true));
<<<<<<<
function onAuthorizeSuccess(data, accept){
adapter.log.info('successful connection to socket.io');
adapter.log.info(JSON.stringify(data));
accept();
}
function onAuthorizeFail(data, message, error, accept){
if (error) adapter.log.error('failed connection to socket.io:', message);
accept(null, false);
if (error) accept(new Error(message));
// this error will be sent to the user as a special error-package
// see: http://socket.io/docs/client-api/#socket > error-object
}
=======
function authSocket(socket, next) {
var handshakeData = socket.handshake;
if (socket.authorized) {
next();
} else
// do not check if localhost
if(handshakeData.address.address.toString() == "127.0.0.1") {
socket.authorized = true;
adapter.log.debug("local authentication 127.0.0.1");
next();
} else {
var error = false;
if (handshakeData.query["key"] === undefined) {
error = true;
adapter.log.warn("authentication failed. No key found.");
} else {
var text = handshakeData.query["key"];
var random = text.substring(0, 32);
text = text.substring(32);
var pos = text.indexOf('|');
if (pos != -1) {
var user = text.substring(0, pos);
text = text.substring(pos + 1);
adapter.getForeignObject('system.user.' + user, function (err, obj) {
var _error = false;
if (err || !obj || !obj.common || !obj.common.password) {
_error = true;
} else {
var authHash = crypto.createHash('md5').update(handshakeData.address.address.toString() + random + user + obj.common.password).digest("hex");
if (authHash != text) {
_error = true;
}
}
if (_error) {
adapter.log.warn("authetication error on " + handshakeData.address.address);
next(new Error("Invalid session key"));
} else{
adapter.log.debug("authetication successful on " + handshakeData.address.address);
socket.authorized = true;
next();
}
});
} else {
error = true;
}
}
if (error) {
adapter.log.warn("authetication error on " + handshakeData.address.address);
next(new Error("not authorized"));
}
}
}
>>>>>>>
function onAuthorizeSuccess(data, accept){
adapter.log.info('successful connection to socket.io');
adapter.log.info(JSON.stringify(data));
accept();
}
function onAuthorizeFail(data, message, error, accept){
if (error) adapter.log.error('failed connection to socket.io:', message);
accept(null, false);
if (error) accept(new Error(message));
// this error will be sent to the user as a special error-package
// see: http://socket.io/docs/client-api/#socket > error-object
} |
<<<<<<<
const LIST_COMMUNITIES = 'fetchDataSaga/LIST_COMMUNITIES';
=======
const GET_ACCOUNT_NOTIFICATIONS = 'fetchDataSaga/GET_ACCOUNT_NOTIFICATIONS';
>>>>>>>
const LIST_COMMUNITIES = 'fetchDataSaga/LIST_COMMUNITIES';
const GET_ACCOUNT_NOTIFICATIONS = 'fetchDataSaga/GET_ACCOUNT_NOTIFICATIONS';
<<<<<<<
takeEvery(LIST_COMMUNITIES, listCommunities),
=======
takeEvery(GET_ACCOUNT_NOTIFICATIONS, getAccountNotifications),
>>>>>>>
takeEvery(LIST_COMMUNITIES, listCommunities),
takeEvery(GET_ACCOUNT_NOTIFICATIONS, getAccountNotifications), |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.