conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
/** extension
* Selection.substractPoint(pos) -> Range
* - pos (Range): The position to remove, as a `{row, column}` object
=======
/**
* Selection.addRange(pos) -> Range
* pos: {row, column}
>>>>>>>
/** extension
* Selection.substractPoint(pos) -> Range
* - pos (Range): The position to remove, as a `{row, column}` object
<<<<<<<
/** extension
* Editor.exitMultiSelectMode()
=======
/**
* Editor.exitMultiSelectMode() -> Void
>>>>>>>
/** extension
* Editor.exitMultiSelectMode() -> Void
<<<<<<<
/** extension
* Editor.findAll(needle, dir, additive) -> Number
* - needle (String): The text to find
* - options (Object): Any of the additional [[Search search options]]
* - additive (Boolean): TODO
* + (Number): The number of found ranges.
=======
this.onPaste = function(text) {
this._emit("paste", text);
if (!this.inMultiSelectMode)
return this.insert(text);
var lines = text.split(this.session.getDocument().getNewLineCharacter());
var ranges = this.selection.rangeList.ranges;
if (lines.length > ranges.length) {
this.commands.exec("insertstring", this, text);
return;
}
for (var i = ranges.length; i--; ) {
var range = ranges[i];
if (!range.isEmpty())
this.session.remove(range);
this.session.insert(range.start, lines[i]);
}
};
/**
* Editor.findAll(dir, options) -> Number
* - needle: text to find
* - options: search options
* - additive: keeps
>>>>>>>
this.onPaste = function(text) {
this._emit("paste", text);
if (!this.inMultiSelectMode)
return this.insert(text);
var lines = text.split(this.session.getDocument().getNewLineCharacter());
var ranges = this.selection.rangeList.ranges;
if (lines.length > ranges.length) {
this.commands.exec("insertstring", this, text);
return;
}
for (var i = ranges.length; i--; ) {
var range = ranges[i];
if (!range.isEmpty())
this.session.remove(range);
this.session.insert(range.start, lines[i]);
}
};
/** extension
* Editor.findAll(dir, options) -> Number
* - needle: text to find
* - options: search options
* - additive: keeps
<<<<<<<
* Transposes the selected ranges.
*
=======
* contents
* empty ranges are expanded to word
>>>>>>>
* Transposes the selected ranges. |
<<<<<<<
if (!this.$size.width)
return this.onResize(true);
=======
if ((!this.session || !this.container.offsetWidth) || (!changes && !force)) {
this.$changes |= changes;
return;
}
>>>>>>>
if ((!this.session || !this.container.offsetWidth) || (!changes && !force)) {
this.$changes |= changes;
return;
}
if (!this.$size.width)
return this.onResize(true); |
<<<<<<<
// when util is required, it will modify the node ENV with
// whatever variables from config it feels are needed
util.appendNodeENV( );
=======
util.capitalize = function( string ) {
return string.charAt( 0 ).toUpperCase( ) +
string.substring( 1 ).toLowerCase( );
};
util.paramArray = function( param ) {
if( !param ) { return param; }
var p = _.clone( param );
if( _.isString( p ) ) {
p = _.filter( p.split(","), _.identity );
}
return _.flatten([ p ]);
};
util.dateRangeFilter = function( timeField, from, to, dateField ) {
if( !from && !to ) { return; }
var d1 = from ? moment.utc( from ).parseZone( ) : null;
var d2 = to ? moment.utc( to ).parseZone( ) : null;
if( d1 && !d1.isValid( ) ) { d1 = null; }
if( d2 && !d2.isValid( ) ) { d2 = null; }
if( d1 || d2 ) {
d1 = d1 || moment.utc( "1800-01-01T00:00:00+00:00" );
d2 = d2 || moment.utc( ).add( 2, "day");
var filter;
var timeFilter = { };
timeFilter[ timeField ] = {
gte: d1.format( "YYYY-MM-DDTHH:mm:ssZ" ),
lte: d2.format( "YYYY-MM-DDTHH:mm:ssZ" ) };
if( dateField ) {
var dateFilter = { };
dateFilter[ dateField ] = {
gte: d1.format( "YYYY-MM-DD" ),
lte: d2.format( "YYYY-MM-DD" ) }
// check if the input parameters are dates without times
var queryByDate = (
( from && d1.format( ).match( /T00:00:00/ ) && !from.match( /00:00:00/ )) ||
( to && d2.format( ).match( /T00:00:00/ ) && !to.match( /00:00:00/ )));
if( queryByDate ) {
filter = { range: dateFilter };
} else {
// querying with time, which needs a more complicated query. For
// observations with times, use them, otherwise just use dates
filter = { or: [
{ and: [ { range: timeFilter }, { exists: { field: timeField } } ] },
{ and: [ { range: dateFilter }, { missing: { field: timeField } } ] }
]};
}
} else {
filter = { range: timeFilter };
}
return filter;
}
};
>>>>>>>
// when util is required, it will modify the node ENV with
// whatever variables from config it feels are needed
util.appendNodeENV( );
util.capitalize = function( string ) {
return string.charAt( 0 ).toUpperCase( ) +
string.substring( 1 ).toLowerCase( );
};
util.paramArray = function( param ) {
if( !param ) { return param; }
var p = _.clone( param );
if( _.isString( p ) ) {
p = _.filter( p.split(","), _.identity );
}
return _.flatten([ p ]);
};
util.dateRangeFilter = function( timeField, from, to, dateField ) {
if( !from && !to ) { return; }
var d1 = from ? moment.utc( from ).parseZone( ) : null;
var d2 = to ? moment.utc( to ).parseZone( ) : null;
if( d1 && !d1.isValid( ) ) { d1 = null; }
if( d2 && !d2.isValid( ) ) { d2 = null; }
if( d1 || d2 ) {
d1 = d1 || moment.utc( "1800-01-01T00:00:00+00:00" );
d2 = d2 || moment.utc( ).add( 2, "day");
var filter;
var timeFilter = { };
timeFilter[ timeField ] = {
gte: d1.format( "YYYY-MM-DDTHH:mm:ssZ" ),
lte: d2.format( "YYYY-MM-DDTHH:mm:ssZ" ) };
if( dateField ) {
var dateFilter = { };
dateFilter[ dateField ] = {
gte: d1.format( "YYYY-MM-DD" ),
lte: d2.format( "YYYY-MM-DD" ) }
// check if the input parameters are dates without times
var queryByDate = (
( from && d1.format( ).match( /T00:00:00/ ) && !from.match( /00:00:00/ )) ||
( to && d2.format( ).match( /T00:00:00/ ) && !to.match( /00:00:00/ )));
if( queryByDate ) {
filter = { range: dateFilter };
} else {
// querying with time, which needs a more complicated query. For
// observations with times, use them, otherwise just use dates
filter = { or: [
{ and: [ { range: timeFilter }, { exists: { field: timeField } } ] },
{ and: [ { range: dateFilter }, { missing: { field: timeField } } ] }
]};
}
} else {
filter = { range: timeFilter };
}
return filter;
}
}; |
<<<<<<<
"use strict";
var _ = require( "lodash" ),
squel = require( "squel" ),
URL = require( "url" ),
util = require( "../util" ),
ControlledTerm = require( "./controlled_term" ),
ObservationField = require( "./observation_field" ),
ESModel = require( "./es_model" ),
pgClient = require( "../pg_client" ),
Identification = require( "./identification" ),
Project = require( "./project" ),
Taxon = require( "./taxon" ),
User = require( "./user" ),
Model = require( "./model" ),
TaxaController = require( "../controllers/v1/taxa_controller" );
const LICENSE_INFO = {
0: {code: "c", short: "(c)" },
1: {code: "cc-by-nc-sa", short: "CC BY-NC-SA" },
2: {code: "cc-by-nc", short: "CC BY-NC" },
3: {code: "cc-by-nc-nd", short: "CC BY-NC-ND" },
4: {code: "cc-by", short: "CC BY" },
5: {code: "cc-by-sa", short: "CC BY-SA" },
6: {code: "cc-by-nd", short: "CC BY-ND" },
7: {code: "pd", short: "PD" },
8: {code: "gfdl", short: "GFDL" },
9: {code: "cc0", short: "CC0" },
}
var Observation = class Observation extends Model {
=======
const _ = require( "lodash" );
const squel = require( "squel" );
const URL = require( "url" );
const util = require( "../util" );
const ControlledTerm = require( "./controlled_term" );
const ObservationField = require( "./observation_field" );
const ESModel = require( "./es_model" );
const pgClient = require( "../pg_client" );
const Project = require( "./project" );
const Taxon = require( "./taxon" );
const User = require( "./user" );
const Model = require( "./model" );
const TaxaController = require( "../controllers/v1/taxa_controller" );
>>>>>>>
const _ = require( "lodash" );
const squel = require( "squel" );
const URL = require( "url" );
const util = require( "../util" );
const ControlledTerm = require( "./controlled_term" );
const ObservationField = require( "./observation_field" );
const ESModel = require( "./es_model" );
const pgClient = require( "../pg_client" );
const Identification = require( "./identification" );
const Project = require( "./project" );
const Taxon = require( "./taxon" );
const User = require( "./user" );
const Model = require( "./model" );
const TaxaController = require( "../controllers/v1/taxa_controller" );
const LICENSE_INFO = {
0: { code: "c", short: "(c)" },
1: { code: "cc-by-nc-sa", short: "CC BY-NC-SA" },
2: { code: "cc-by-nc", short: "CC BY-NC" },
3: { code: "cc-by-nc-nd", short: "CC BY-NC-ND" },
4: { code: "cc-by", short: "CC BY" },
5: { code: "cc-by-sa", short: "CC BY-SA" },
6: { code: "cc-by-nd", short: "CC BY-ND" },
7: { code: "pd", short: "PD" },
8: { code: "gfdl", short: "GFDL" },
9: { code: "cc0", short: "CC0" }
};
<<<<<<<
=======
prepareProjects( ) {
if ( this.project_observations ) {
_.each( this.project_observations, po => {
po.project = { id: po.project_id };
delete po.project_id;
} );
}
}
prepareObservationPhotos( ) {
if ( this.observation_photos ) {
const photosByID = _.fromPairs( _.map( this.photos, p => [p.id, p] ) );
_.each( this.observation_photos, op => {
op.photo = photosByID[op.photo_id];
if ( op.photo ) {
op.photo.url = util.fixHttps( op.photo.url );
}
delete op.photo_id;
} );
}
}
>>>>>>>
<<<<<<<
var observations = _.compact( _.map( arr, "obseravtion" ) );
var preloadCallback = options.minimal ?
Observation.preloadMinimal : Observation.preloadAllAssociations;
=======
const observations = _.map( arr, "observation" );
const preloadCallback = options.minimal
? Observation.preloadMinimal : Observation.preloadAllAssociations;
>>>>>>>
const observations = _.compact( _.map( arr, "observation" ) );
const preloadCallback = options.minimal
? Observation.preloadMinimal : Observation.preloadAllAssociations;
<<<<<<<
if( err ) { return callback( err ); }
Observation.preloadMinimal( obs, localeOpts, err => {
if( err ) { return callback( err ); }
Observation.preloadObservationFields( obs, err => {
if( err ) { return callback( err ); }
var withProjects = _.filter(
_.flattenDeep( [
_.map( obs, o => {
_.each( o.project_observations, po => ( po.project_id = po.project.id ) );
return o.project_observations;
} ),
_.map( obs, "non_traditional_projects" )
] ), _.identity
);
ESModel.fetchBelongsTo( withProjects, Project, { source: Project.returnFields }, err => {
if( err ) { return callback( err ); }
_.each( obs, o => {
// remove any projectObservation which for whatever reason has no associated
// project instance, or is associated with a new-style project
o.project_observations = _.filter( o.project_observations, po => (
po.project && po.project.project_type !== "collection" && po.project_type !== "umbrella"
));
});
Observation.preloadProjectMembership( obs, localeOpts, err => {
if( err ) { return callback( err ); }
Observation.preloadObservationUserPreferences( obs, err => {
if( err ) { return callback( err ); }
Observation.preloadObservationApplications( obs, err => {
if( err ) { return callback( err ); }
=======
if ( err ) { return void callback( err ); }
Observation.preloadObservationFields( obs, err2 => {
if ( err2 ) { return void callback( err2 ); }
const withProjects = _.filter(
_.flattenDeep( [
_.map( obs, o => {
_.each( o.project_observations, po => { po.project_id = po.project.id; } );
return o.project_observations;
} ),
_.map( obs, "non_traditional_projects" )
] ), _.identity
);
ESModel.fetchBelongsTo( withProjects, Project, { source: Project.returnFields }, err3 => {
if ( err3 ) { return void callback( err3 ); }
_.each( obs, o => {
// remove any projectObservation which for whatever reason has no associated
// project instance, or is associated with a new-style project
o.project_observations = _.filter( o.project_observations, po => (
po.project && po.project.project_type !== "collection" && po.project_type !== "umbrella"
) );
} );
Observation.preloadProjectMembership( obs, localeOpts, err4 => {
if ( err4 ) { return void callback( err4 ); }
Observation.preloadObservationUserPreferences( obs, err5 => {
if ( err5 ) { return void callback( err5 ); }
Observation.preloadObservationApplications( obs, err6 => {
if ( err6 ) { return void callback( err6 ); }
Observation.preloadMinimal( obs, localeOpts, err7 => {
if ( err7 ) { return void callback( err7 ); }
>>>>>>>
if ( err ) { return void callback( err ); }
Observation.preloadMinimal( obs, localeOpts, err2 => {
if ( err2 ) { return void callback( err2 ); }
Observation.preloadObservationFields( obs, err3 => {
if ( err3 ) { return void callback( err3 ); }
const withProjects = _.filter(
_.flattenDeep( [
_.map( obs, o => {
_.each( o.project_observations, po => { po.project_id = po.project.id; } );
return o.project_observations;
} ),
_.map( obs, "non_traditional_projects" )
] ), _.identity
);
ESModel.fetchBelongsTo( withProjects, Project, { source: Project.returnFields }, err4 => {
if ( err4 ) { return void callback( err4 ); }
_.each( obs, o => {
// remove any projectObservation which for whatever reason has no associated
// project instance, or is associated with a new-style project
o.project_observations = _.filter( o.project_observations, po => (
po.project && po.project.project_type !== "collection" && po.project_type !== "umbrella"
) );
} );
Observation.preloadProjectMembership( obs, localeOpts, err5 => {
if ( err5 ) { return void callback( err5 ); }
Observation.preloadObservationUserPreferences( obs, err6 => {
if ( err6 ) { return void callback( err6 ); }
Observation.preloadObservationApplications( obs, err7 => {
if ( err7 ) { return void callback( err7 ); }
<<<<<<<
});
});
});
});
});
});
});
});
=======
} );
} );
} );
} );
} );
} );
} );
} );
>>>>>>>
} );
} );
} );
} );
} );
} );
} );
} );
<<<<<<<
}
var taxonOpts = {
=======
};
const ids = _.flattenDeep( _.map( obs, "identifications" ) );
const comments = _.flattenDeep( _.map( obs, "comments" ) );
const ofvs = _.flattenDeep( _.map( obs, "ofvs" ) );
const withTaxa = _.filter(
_.flattenDeep( [obs, ids, ofvs] ), wt => (
wt
&& ( ( wt.taxon && Number( wt.taxon.id ) )
|| ( wt.taxon_id && Number( wt.taxon_id ) )
)
)
);
const annotations = _.flattenDeep( _.map( obs, "annotations" ) );
const annotationVotes = _.flattenDeep( _.map( annotations, "votes" ) );
const withUsers = _.filter(
_.flattenDeep( [obs,
ids,
annotations,
annotationVotes,
comments,
_.map( comments, "flags" ),
_.map( ids, "flags" ),
_.map( obs, "flags" ),
_.map( obs, "faves" ),
_.map( obs, "votes" ),
_.map( obs, "ofvs" ),
_.map( obs, "project_observations" ),
_.map( obs, "quality_metrics" )] ), _.identity
);
const taxonOpts = {
>>>>>>>
};
const taxonOpts = {
<<<<<<<
ESModel.fetchHasMany( obs, Identification, "observation.id", { modelOptions: { forObs: true } }, err => {
if( err ) { return callback( err ); }
Observation.preloadProjectObservations( obs, err => {
if( err ) { return callback( err ); }
const ids = _.flattenDeep( _.map( obs, "identifications" ) );
const comments = _.flattenDeep( _.map( obs, "comments" ) );
const ofvs = _.flattenDeep( _.map( obs, "ofvs" ) );
var withTaxa = _.filter(
_.flattenDeep( [ obs, ids, ofvs ] ), wt => ( wt && (
( wt.taxon && Number( wt.taxon.id ) ) ||
( wt.taxon_id && Number( wt.taxon_id ) ) ) )
);
var annotations = _.flattenDeep( _.map( obs, "annotations" ) );
var annotationVotes = _.flattenDeep( _.map( annotations, "votes" ) );
var withUsers = _.filter(
_.flattenDeep( [ obs,
ids,
annotations,
annotationVotes,
comments,
_.map( comments, "flags" ),
_.map( ids, "flags" ),
_.map( obs, "flags" ),
_.map( obs, "faves" ),
_.map( obs, "votes" ),
_.map( obs, "ofvs" ),
_.map( obs, "project_observations" ),
_.map( obs, "quality_metrics" ) ] ), _.identity
);
ESModel.fetchBelongsTo( withTaxa, Taxon, taxonOpts, err => {
if( err ) { return callback( err ); }
const taxa = _.compact( _.map( ids, "taxon" ) );
TaxaController.assignAncestors( { }, taxa, { localeOpts, ancestors: true }, err => {
if( err ) { return callback( err ); }
ESModel.fetchBelongsTo( withUsers, User, { }, err => {
if( err ) { return callback( err ); }
Observation.preloadObservationPhotos( obs, callback );
});
});
});
});
});
=======
ESModel.fetchBelongsTo( withTaxa, Taxon, taxonOpts, err => {
if ( err ) { return void callback( err ); }
const taxa = _.compact( _.map( ids, "taxon" ) );
TaxaController.assignAncestors( { }, taxa, { localeOpts, ancestors: true }, errr => {
if ( errr ) { return void callback( errr ); }
ESModel.fetchBelongsTo( withUsers, User, { }, callback );
} );
} );
>>>>>>>
ESModel.fetchHasMany( obs, Identification, "observation.id", { modelOptions: { forObs: true } }, err => {
if ( err ) { return void callback( err ); }
Observation.preloadProjectObservations( obs, err2 => {
if ( err2 ) { return void callback( err2 ); }
const ids = _.flattenDeep( _.map( obs, "identifications" ) );
const comments = _.flattenDeep( _.map( obs, "comments" ) );
const ofvs = _.flattenDeep( _.map( obs, "ofvs" ) );
const withTaxa = _.filter(
_.flattenDeep( [obs, ids, ofvs] ), wt => ( wt
&& ( ( wt.taxon && Number( wt.taxon.id ) )
|| ( wt.taxon_id && Number( wt.taxon_id ) )
) )
);
const annotations = _.flattenDeep( _.map( obs, "annotations" ) );
const annotationVotes = _.flattenDeep( _.map( annotations, "votes" ) );
const withUsers = _.filter(
_.flattenDeep( [obs,
ids,
annotations,
annotationVotes,
comments,
_.map( comments, "flags" ),
_.map( ids, "flags" ),
_.map( obs, "flags" ),
_.map( obs, "faves" ),
_.map( obs, "votes" ),
_.map( obs, "ofvs" ),
_.map( obs, "project_observations" ),
_.map( obs, "quality_metrics" )
] ), _.identity
);
ESModel.fetchBelongsTo( withTaxa, Taxon, taxonOpts, err3 => {
if ( err3 ) { return void callback( err3 ); }
const taxa = _.compact( _.map( ids, "taxon" ) );
TaxaController.assignAncestors( { }, taxa, { localeOpts, ancestors: true }, err4 => {
if ( err4 ) { return void callback( err4 ); }
ESModel.fetchBelongsTo( withUsers, User, { }, err5 => {
if ( err5 ) { return void callback( err5 ); }
Observation.preloadObservationPhotos( obs, callback );
} );
} );
} );
} );
} ); |
<<<<<<<
static setTTL( req, options ) {
options = options || { };
options.allTTL = options.allTTL || 7200;
options.ttl = options.ttl || 300;
var p = Object.assign( { }, req.query );
// locale and verifiable are ignored when checking for empty params
delete p.locale;
delete p.verifiable;
req.query.ttl = _.isEmpty( p ) ?
options.allTTL : ( req.query.ttl || options.ttl );
}
=======
util.setTTL = function( req, options ) {
options = options || { };
options.allTTL = options.allTTL || 7200;
options.ttl = options.ttl || 300;
var p = Object.assign( { }, req.query );
// locale and verifiable are ignored when checking for empty params
delete p.locale;
delete p.verifiable;
delete p.preferred_place_id;
req.query.ttl = _.isEmpty( p ) ?
options.allTTL : ( req.query.ttl || options.ttl );
};
>>>>>>>
static setTTL( req, options ) {
options = options || { };
options.allTTL = options.allTTL || 7200;
options.ttl = options.ttl || 300;
var p = Object.assign( { }, req.query );
// locale and verifiable are ignored when checking for empty params
delete p.locale;
delete p.verifiable;
delete p.preferred_place_id;
req.query.ttl = _.isEmpty( p ) ?
options.allTTL : ( req.query.ttl || options.ttl );
} |
<<<<<<<
dfault( "put", "/v1/users/update_session", UsersController.updateSession );
dfault( "put", "/v1/users/:id", UsersController.update );
=======
dfault( "get", "/v1/users/me", UsersController.me );
>>>>>>>
dfault( "put", "/v1/users/update_session", UsersController.updateSession );
dfault( "put", "/v1/users/:id", UsersController.update );
dfault( "get", "/v1/users/me", UsersController.me ); |
<<<<<<<
let json;
try {
json = JSON.parse( body );
} catch( e ) {
console.log( `Failed to score image: ${uploadPath}` );
json = { };
}
const scores = _.map( json, ( score, id ) => ( {
=======
let json;
try {
json = JSON.parse( body );
} catch ( e ) {
return callback({ error: "Error scoring image", status: 500 });
}
var scores = _.map( json, ( score, id ) => ( {
>>>>>>>
let json;
try {
json = JSON.parse( body );
} catch ( e ) {
return callback({ error: "Error scoring image", status: 500 });
}
const scores = _.map( json, ( score, id ) => ( {
<<<<<<<
if ( req.inat && req.inat.visionCacheKey ) {
FileCache.cacheFile( uploadPath, JSON.stringify( scores ) );
}
callback( null, scores );
});
}
static scoreImageUpload( uploadPath, req, callback ) {
InaturalistAPI.setPerPage( req, { default: 10, max: 100 } );
ComputervisionController.scoreImagePath( uploadPath, req, ( err, scores ) => {
if ( err ) { return callback( err ); }
scores = _.filter( scores, s => ( s.count > 0 ) );
=======
scores = _.filter( scores, s => ( s.count > 0 ) );
>>>>>>>
if ( req.inat && req.inat.visionCacheKey ) {
FileCache.cacheFile( uploadPath, JSON.stringify( scores ) );
}
callback( null, scores );
});
}
static scoreImageUpload( uploadPath, req, callback ) {
InaturalistAPI.setPerPage( req, { default: 10, max: 100 } );
ComputervisionController.scoreImagePath( uploadPath, req, ( err, scores ) => {
if ( err ) { return callback( err ); }
scores = _.filter( scores, s => ( s.count > 0 ) );
<<<<<<<
if ( req.inat.visionStats ) {
return callback( null, { results: top10, common_ancestor: commonAncestor } );
}
req.inat.taxonPhotos = true;
req.inat.taxonAncestries = true;
TaxaController.speciesCountsResponse( req, top10, ( err, response ) => {
=======
req.inat.similarToImage = true;
TaxaController.speciesCountsResponse( req, top10, { }, ( err, response ) => {
>>>>>>>
if ( req.inat.visionStats ) {
return callback( null, { results: top10, common_ancestor: commonAncestor } );
}
req.inat.taxonPhotos = true;
req.inat.taxonAncestries = true;
TaxaController.speciesCountsResponse( req, top10, { }, ( err, response ) => {
<<<<<<<
if ( req.body.skip_frequencies === true ) {
return callback( );
}
const topScores = scores.slice( 0, req.body.ancestor_window || DEFAULT_ANCESTOR_WINDOW );
const speciesCountsReq = {
query: Object.assign( { }, req.query, { per_page: topScores.length } ),
inat: Object.assign( { }, req.inat, {
taxonPhotos: true,
taxonAncestries: true
})
};
ComputervisionController.normalizeScores( topScores );
ComputervisionController.addTaxa( speciesCountsReq, topScores, ( err, results ) => {
=======
scores = scores.slice( 0, 20 );
req.inat.similarToImage = true;
var sumScores = _.reduce( scores, ( sum, r ) => ( sum + r.count ), 0 );
_.each( scores, r => ( r.count = ( ( r.count * 100 ) / sumScores ) ) );
TaxaController.speciesCountsResponse( req, scores, { }, ( err, response ) => {
>>>>>>>
if ( req.body.skip_frequencies === true ) {
return callback( );
}
const topScores = scores.slice( 0, req.body.ancestor_window || DEFAULT_ANCESTOR_WINDOW );
const speciesCountsReq = {
query: Object.assign( { }, req.query, { per_page: topScores.length } ),
inat: Object.assign( { }, req.inat, {
taxonPhotos: true,
taxonAncestries: true
})
};
ComputervisionController.normalizeScores( topScores );
ComputervisionController.addTaxa( speciesCountsReq, topScores, ( err, results ) => {
<<<<<<<
module.exports = ComputervisionController;
=======
module.exports = {
scoreObservation: ComputervisionController.scoreObservation,
scoreImage: ComputervisionController.scoreImage,
scoreImageURL: ComputervisionController.scoreImageURL
};
>>>>>>>
module.exports = ComputervisionController; |
<<<<<<<
DOMbufferRowClass: null,
inUrlBBCode: null,
debug: null,
init: function(config, lang, initSettings, initStyle, initialize, initializeFunction, finalizeFunction) {
=======
DOMbufferRowClass: 'rowOdd',
flashSounds: null,
init: function(config, lang, initSettings, initStyle, initialize, initializeFunction, finalizeFunction) {
>>>>>>>
DOMbufferRowClass: null,
inUrlBBCode: null,
debug: null,
flashSounds: null,
init: function(config, lang, initSettings, initStyle, initialize, initializeFunction, finalizeFunction) {
<<<<<<<
this.lang = lang;
this.requestStatus = 'ok';
this.DOMbufferRowClass = 'rowOdd';
this.inUrlBBCode = false;
=======
this.lang = lang;
this.flashSounds = true;
>>>>>>>
this.lang = lang;
this.requestStatus = 'ok';
this.DOMbufferRowClass = 'rowOdd';
this.inUrlBBCode = false;
this.flashSounds = true;
<<<<<<<
loadFlashInterface: function() {
if(this.dom['flashInterfaceContainer']) {
=======
loadAudioInterface: function() {
if(this.settings['audioBackend'] < 0) {
if(navigator.appVersion.indexOf("MSIE") != -1) {
try {
flash = new ActiveXObject('ShockwaveFlash.ShockwaveFlash');
} catch(e) {
this.flashSounds = false;
}
} else if((navigator.plugins && !navigator.plugins["Shockwave Flash"]) || (navigator.mimeTypes && !navigator.mimeTypes['application/x-shockwave-flash'])) {
this.flashSounds = false;
}
} else
this.flashSounds = !!this.settings['audioBackend'];
if(this.flashSounds) {
>>>>>>>
loadAudioInterface: function() {
if(this.settings['audioBackend'] < 0) {
if(navigator.appVersion.indexOf("MSIE") != -1) {
try {
flash = new ActiveXObject('ShockwaveFlash.ShockwaveFlash');
} catch(e) {
this.flashSounds = false;
}
} else if((navigator.plugins && !navigator.plugins["Shockwave Flash"]) || (navigator.mimeTypes && !navigator.mimeTypes['application/x-shockwave-flash'])) {
this.flashSounds = false;
}
} else
this.flashSounds = !!this.settings['audioBackend'];
if(this.flashSounds) {
<<<<<<<
try {
// play() parameters are
// startTime:Number (default = 0),
// loops:int (default = 0) and
// sndTransform:SoundTransform (default = null)
return this.sounds[soundID].play(0, 0, this.soundTransform);
} catch(e) {
this.debugMessage('playSound', e);
=======
if(this.flashSounds) {
try {
// play() parameters are
// startTime:Number (default = 0),
// loops:int (default = 0) and
// sndTransform:SoundTransform (default = null)
return this.sounds[soundID].play(0, 0, this.soundTransform);
} catch(e) {
//alert(e);
}
} else {
try {
this.sounds[soundID].currentTime = 0;
return this.sounds[soundID].play();
} catch(e) {
//alert(e);
}
>>>>>>>
if(this.flashSounds) {
try {
// play() parameters are
// startTime:Number (default = 0),
// loops:int (default = 0) and
// sndTransform:SoundTransform (default = null)
return this.sounds[soundID].play(0, 0, this.soundTransform);
} catch(e) {
this.debugMessage('playSound', e);
}
} else {
try {
this.sounds[soundID].currentTime = 0;
return this.sounds[soundID].play();
} catch(e) {
this.debugMessage('playSound', e);
} |
<<<<<<<
/*
Copyright (c) 2014, Intel Corporation
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Intel Corporation nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
var config = require('./config.json');
=======
/**
* Created by ammarch on 6/2/14.
*/
var fs = require('fs'),
logger = require("../lib/logger").init(),
localConf = "./config.json",
systemConf = "/etc/iotkit-agent/config.json";
if (fs.existsSync("./config/" + localConf)) {
var config = require(localConf);
logger.debug("Using local config file");
}
else if (fs.existsSync(systemConf)) {
var config = require(systemConf);
logger.debug("Using system config file");
}
else {
logger.error("Failed to find conig file");
}
>>>>>>>
/*
Copyright (c) 2014, Intel Corporation
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Intel Corporation nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
var fs = require('fs'),
logger = require("../lib/logger").init(),
localConf = "./config.json",
systemConf = "/etc/iotkit-agent/config.json";
if (fs.existsSync("./config/" + localConf)) {
var config = require(localConf);
logger.debug("Using local config file");
}
else if (fs.existsSync(systemConf)) {
var config = require(systemConf);
logger.debug("Using system config file");
}
else {
logger.error("Failed to find conig file");
} |
<<<<<<<
var configFileKey = {
gatewayId : 'gateway_id',
deviceId: 'device_id',
dataDirectory: 'data_directory',
activationCode: 'activation_code',
defaultConnector: 'default_connector',
loggerLevel: 'logger.LEVEL',
connectorRestProxyHost: 'connector.rest.proxy.host',
connectorRestProxyPort: 'connector.rest.proxy.port'
};
=======
function readFromConfig (property) {
var fullFilename = common.getConfigName();
return common.readFileToJson(fullFilename)[property];
}
>>>>>>>
var configFileKey = {
gatewayId : 'gateway_id',
deviceId: 'device_id',
dataDirectory: 'data_directory',
activationCode: 'activation_code',
defaultConnector: 'default_connector',
loggerLevel: 'logger.LEVEL',
connectorRestProxyHost: 'connector.rest.proxy.host',
connectorRestProxyPort: 'connector.rest.proxy.port'
};
function readFromConfig (property) {
var fullFilename = common.getConfigName();
return common.readFileToJson(fullFilename)[property];
}; |
<<<<<<<
import { act } from 'preact/test-utils';
import { setupScratch, teardown, clearOptions } from '../../../test/_util/helpers';
=======
import { setupScratch, teardown, clearOptions, serializeHtml } from '../../../test/_util/helpers';
>>>>>>>
import { act } from 'preact/test-utils';
import { setupScratch, teardown, clearOptions, serializeHtml } from '../../../test/_util/helpers'; |
<<<<<<<
if (oldTree) diff(oldTree._el, parent, parent._previousVTree = coerceToVNode(vnode), oldTree, EMPTY_OBJ, false, true, null, 0, [], null);
=======
if (oldTree) diff(oldTree._el, parent, parent._previousVTree = coerceToVNode(vnode), oldTree, EMPTY_OBJ, false, true, null, true, [] );
>>>>>>>
if (oldTree) diff(oldTree._el, parent, parent._previousVTree = coerceToVNode(vnode), oldTree, EMPTY_OBJ, false, true, null, true, [], null);
<<<<<<<
diffChildren(parent, [vnode], EMPTY_ARR, EMPTY_OBJ, false, EMPTY_ARR.slice.call(parent.childNodes), 0, [], null);
=======
diffChildren(parent, [vnode], EMPTY_ARR, EMPTY_OBJ, false, EMPTY_ARR.slice.call(parent.childNodes), true, []);
>>>>>>>
diffChildren(parent, [vnode], EMPTY_ARR, EMPTY_OBJ, false, EMPTY_ARR.slice.call(parent.childNodes), true, [], null); |
<<<<<<<
import preact, { createElement, createContext, Component, Fragment, render, hydrate, cloneElement } from '../../src/index';
=======
import { createElement, h, Component, Fragment, render, hydrate, cloneElement, options } from '../../src/index';
>>>>>>>
import { createElement, h, createContext, Component, Fragment, render, hydrate, cloneElement, options } from '../../src/index';
<<<<<<<
it('should be available as a default export', () => {
expect(preact).to.be.an('object');
expect(preact).to.have.property('createElement', createElement);
expect(preact).to.have.property('Component', Component);
expect(preact).to.have.property('Fragment', Fragment);
expect(preact).to.have.property('render', render);
expect(preact).to.have.property('hydrate', hydrate);
expect(preact).to.have.property('cloneElement', cloneElement);
expect(preact).to.have.property('createContext', createContext);
// expect(preact).to.have.property('rerender', rerender);
// expect(preact).to.have.property('options', options);
});
=======
>>>>>>>
<<<<<<<
expect(createContext).to.be.a('function');
=======
expect(options).to.exist.and.be.an('object');
>>>>>>>
expect(createContext).to.be.a('function');
expect(options).to.exist.and.be.an('object'); |
<<<<<<<
app.post( "/v1/comments", routesV1.comments_create );
app.put( "/v1/comments/:id", routesV1.comments_update );
app.delete( "/v1/comments/:id", routesV1.comments_delete );
=======
app.get( "/v1/projects/:id/members", routesV1.projects_members );
>>>>>>>
app.get( "/v1/projects/:id/members", routesV1.projects_members );
app.post( "/v1/comments", routesV1.comments_create );
app.put( "/v1/comments/:id", routesV1.comments_update );
app.delete( "/v1/comments/:id", routesV1.comments_delete ); |
<<<<<<<
import {
Component,
createElement,
_unmount as unmount,
options,
cloneElement
} from 'preact';
import { removeNode } from '../../src/util';
import { suspenseDidResolve, suspenseWillResolve } from './suspense-list-utils';
=======
import { Component, createElement, options, Fragment } from 'preact';
import { assign } from '../../src/util';
>>>>>>>
import { Component, createElement, options, Fragment } from 'preact';
import { assign } from '../../src/util';
import { suspenseDidResolve, suspenseWillResolve } from './suspense-list-utils';
<<<<<<<
this._suspensions = [];
this._fallback = props.fallback;
this._isSuspenseResolved = true;
=======
this._suspensions = 0;
this._detachOnNextRender = null;
>>>>>>>
this._suspensions = 0;
this._detachOnNextRender = null;
this._isSuspenseResolved = true;
<<<<<<<
c._suspensions.push(promise);
this._isSuspenseResolved = false;
=======
>>>>>>>
<<<<<<<
// From https://twitter.com/Rich_Harris/status/1125850391155965952
c._suspensions[c._suspensions.indexOf(promise)] =
c._suspensions[c._suspensions.length - 1];
c._suspensions.pop();
if (c._suspensions.length == 0) {
// If fallback is null, don't try to unmount it
// `unmount` expects a real VNode, not null values
if (c._fallback) {
// Unmount current children (should be fallback)
unmount(c._fallback);
}
c._vnode._dom = null;
c._vnode._children = c.state._parkedChildren;
c.setState({ _parkedChildren: null }, () => {
this._isSuspenseResolved = true;
suspenseDidResolve(c._vnode);
});
=======
if (!--c._suspensions) {
c._vnode._children[0] = c.state._suspended;
c.setState({ _suspended: (c._detachOnNextRender = null) });
>>>>>>>
if (!--c._suspensions) {
c._vnode._children[0] = c.state._suspended;
c.setState({ _suspended: (c._detachOnNextRender = null) }, () => {
this._isSuspenseResolved = true;
});
<<<<<<<
// This option enables any extra wait required before resolving the suspended promise.
promise.then(() => {
suspenseWillResolve(c._vnode, onSuspensionComplete);
}, onSuspensionComplete);
=======
promise.then(onSuspensionComplete, onSuspensionComplete);
>>>>>>>
promise.then(() => {
suspenseWillResolve(c._vnode, onSuspensionComplete);
}, onSuspensionComplete); |
<<<<<<<
import { render, hydrate } from './render';
import { createElement, Fragment } from './create-element';
import { Component } from './component';
import { cloneElement } from './clone-element';
import { createContext } from './create-context';
=======
>>>>>>>
<<<<<<<
export { createContext } from './create-context';
export default {
render,
hydrate,
createElement,
Fragment,
Component,
cloneElement,
createContext
};
=======
export { toChildArray } from './diff/index';
export { default as options } from './options';
>>>>>>>
export { createContext } from './create-context';
export { toChildArray } from './diff/index';
export { default as options } from './options'; |
<<<<<<<
// isProvider
if (newTag.context) {
newTag.context.Provider = c;
}
c._vnode = newTree;
=======
c._vnode = newVNode;
>>>>>>>
// isProvider
if (newTag.context) {
newTag.context.Provider = c;
}
c._vnode = newVNode;
<<<<<<<
if (newTag.Provider) {
c.props = {
children: c.props.children,
value: newTag.Provider.props ? newTag.Provider.props.value : newTag.defaultValue
};
}
let prev = c._previousVTree;
let vnode = c._previousVTree = coerceToVNode(c.render(c.props, c.state, c.context));
=======
let prev = c._prevVNode;
let vnode = c._prevVNode = coerceToVNode(c.render(c.props, c.state, c.context));
>>>>>>>
if (newTag.Provider) {
c.props = {
children: c.props.children,
value: newTag.Provider.props ? newTag.Provider.props.value : newTag.defaultValue
};
}
let prev = c._prevVNode;
let vnode = c._prevVNode = coerceToVNode(c.render(c.props, c.state, c.context));
<<<<<<<
if (newTree.ref) applyRef(newTree.ref, c, ancestorComponent);
// context = assign({}, context);
// context.__depth = (context.__depth || 0) + 1;
// context = assign({
// __depth: (context.__depth || 0) + 1
// }, context);
// if (c.getChildContext!=null) {
// assign(context, c.getChildContext());
// }
// if (c.id==20) {
// // console.trace('diffing '+c.id);
// console.log('diffing '+c.id, vnode, prev);
// }
// newTree.tag.$precache = c.base;
// if (dom!=null && c.base!=null && c.base!==dom) {
// parent.replaceChild(c.base, dom);
// }
// if (dom!=null && (c.base!==dom || !dom.parentNode)) {
// if (c.base==null) unmount(prev);
// else if (dom.parentNode!==parent) parent.appendChild(c.base);
// else parent.replaceChild(c.base, dom);
// }
// if (isNew) {
// mounts.push(c);
// // if (c.componentDidMount!=null) c.componentDidMount();
// }
// else if (c.componentDidUpdate!=null) {
// c.componentDidUpdate(oldProps, oldState, oldContext);
// }
// }
=======
if (newVNode.ref) applyRef(newVNode.ref, c, ancestorComponent);
>>>>>>>
if (newVNode.ref) applyRef(newVNode.ref, c, ancestorComponent); |
<<<<<<<
root = render(<BadContainer ref={c=>bad=c} />, scratch, root);
expect(scratch.textContent, 'new component without key').to.equal('DE');
=======
render(<BadContainer ref={c=>bad=c} />, scratch, root);
expect(scratch.innerText, 'new component without key').to.equal('D\nE');
>>>>>>>
render(<BadContainer ref={c=>bad=c} />, scratch, root);
expect(scratch.textContent, 'new component without key').to.equal('DE'); |
<<<<<<<
diffChildren(parent, vnode, prev==null ? EMPTY_ARR : prev, EMPTY_OBJ, isSvg, excessChildren, false, mounts, c);
=======
diffChildren(parent, vnode, prev==null ? EMPTY_ARR : prev, context, isSvg, excessChildren, false, mounts);
>>>>>>>
diffChildren(parent, vnode, prev==null ? EMPTY_ARR : prev, context, isSvg, excessChildren, false, mounts, c); |
<<<<<<<
=======
if (options.cmd === 'coffee') {
grunt.log.writeln('You are using cmd: coffee'.red);
grunt.log.writeln('coffee does not allow a restart of the server'.red);
grunt.log.writeln('use opts: ["path/to/your/coffee"] instead'.red);
}
>>>>>>>
if (options.cmd === 'coffee') {
grunt.log.writeln('You are using cmd: coffee'.red);
grunt.log.writeln('coffee does not allow a restart of the server'.red);
grunt.log.writeln('use opts: ["path/to/your/coffee"] instead'.red);
}
<<<<<<<
if(options.debug) {
options.args.unshift('--debug');
if(options.cmd === 'coffee') {
options.args.unshift('--nodejs');
=======
if (options.debug) {
options.opts.unshift('--debug');
if (options.cmd === 'coffee') {
options.opts.unshift('--nodejs');
>>>>>>>
if (options.debug) {
options.opts.unshift('--debug');
if (options.cmd === 'coffee') {
options.opts.unshift('--nodejs');
<<<<<<<
args: options.args,
=======
args: options.opts.concat(options.args),
>>>>>>>
args: options.opts.concat(options.args), |
<<<<<<<
describe('Keep the current topic when a special topic is matched', function(){
it("Should redirect to the first gambit", function(done) {
bot.reply("user1", "first flow match", function(err, reply) {
reply.string.should.eql("You are in the first reply.");
bot.reply("user1", "second flow match", function(err, reply) {
reply.string.should.eql("You are in the second reply. You are in the first reply.");
done();
});
});
});
it("Should redirect to the first gambit after matching __pre__", function(done) {
bot.reply("user1", "first flow match", function(err, reply) {
reply.string.should.eql("You are in the first reply.");
bot.reply("user1", "flow redirection test", function(err, reply) {
reply.string.should.eql("Going back. You are in the first reply.");
done();
});
});
});
});
=======
describe("gh-172", function(){
it("should keep topic though sequence", function(done){
bot.reply("user1", "name", function(err, reply) {
reply.string.should.eql("What is your first name?");
reply.topicName.should.eql("set_name");
bot.reply("user1", "Bob Hope", function(err, reply) {
reply.topicName.should.eql("set_name");
reply.string.should.eql("Ok Bob Hope, what is your last name?");
done();
});
});
});
});
>>>>>>>
describe('Keep the current topic when a special topic is matched', function(){
it("Should redirect to the first gambit", function(done) {
bot.reply("user1", "first flow match", function(err, reply) {
reply.string.should.eql("You are in the first reply.");
bot.reply("user1", "second flow match", function(err, reply) {
reply.string.should.eql("You are in the second reply. You are in the first reply.");
done();
});
});
});
it("Should redirect to the first gambit after matching __pre__", function(done) {
bot.reply("user1", "first flow match", function(err, reply) {
reply.string.should.eql("You are in the first reply.");
bot.reply("user1", "flow redirection test", function(err, reply) {
reply.string.should.eql("Going back. You are in the first reply.");
done();
});
});
});
});
describe("gh-172", function(){
it("should keep topic though sequence", function(done){
bot.reply("user1", "name", function(err, reply) {
reply.string.should.eql("What is your first name?");
reply.topicName.should.eql("set_name");
bot.reply("user1", "Bob Hope", function(err, reply) {
reply.topicName.should.eql("set_name");
reply.string.should.eql("Ok Bob Hope, what is your last name?");
done();
});
});
});
}); |
<<<<<<<
} else {
window.location.hash = '';
=======
else if( config.hash ) {
window.history.replaceState(null, null, '#' + locationHash());
}
>>>>>>>
else if( config.hash ) {
window.history.replaceState(null, null, '#' + locationHash());
}
else {
window.location.hash = '';
} |
<<<<<<<
updateParallax();
=======
updateSlideNumber();
>>>>>>>
updateParallax();
updateSlideNumber();
<<<<<<<
updateBackground( true );
=======
updateBackground();
updateSlideNumber();
>>>>>>>
updateBackground( true );
updateSlideNumber(); |
<<<<<<<
self.focus(element);
=======
assertCanTypeIntoElement(element);
>>>>>>>
assertCanTypeIntoElement(element);
self.focus(element); |
<<<<<<<
el.value = '';
sendkey(el, '');
=======
sendkey(el, '');
el.val('');
>>>>>>>
el.val('');
sendkey(el, ''); |
<<<<<<<
//should the video controls buttons be added
//TODO: If invidious gets video controls, change the code where this is set from chrome.sync as well.
var hideVideoPlayerControls = onInvidious;
var hideInfoButtonPlayerControls = onInvidious;
var hideDeleteButtonPlayerControls = onInvidious;
=======
>>>>>>>
//should the video controls buttons be added
//TODO: If invidious gets video controls, change the code where this is set from chrome.sync as well.
var hideVideoPlayerControls = onInvidious;
var hideInfoButtonPlayerControls = onInvidious;
var hideDeleteButtonPlayerControls = onInvidious;
<<<<<<<
//see if video controls buttons should be added
if (!onInvidious) {
chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
if (result.hideVideoPlayerControls != undefined) {
hideVideoPlayerControls = result.hideVideoPlayerControls;
}
updateVisibilityOfPlayerControlsButton();
});
chrome.storage.sync.get(["hideInfoButtonPlayerControls"], function(result) {
if (result.hideInfoButtonPlayerControls != undefined) {
hideInfoButtonPlayerControls = result.hideInfoButtonPlayerControls;
}
updateVisibilityOfPlayerControlsButton();
});
chrome.storage.sync.get(["hideDeleteButtonPlayerControls"], function(result) {
if (result.hideDeleteButtonPlayerControls != undefined) {
hideDeleteButtonPlayerControls = result.hideDeleteButtonPlayerControls;
}
updateVisibilityOfPlayerControlsButton(false);
});
}
=======
updateVisibilityOfPlayerControlsButton();
updateVisibilityOfPlayerControlsButton(false);
>>>>>>>
//see if video controls buttons should be added
if (!onInvidious) {
updateVisibilityOfPlayerControlsButton();
}
<<<<<<<
if (document.getElementById("startSponsorImage").style.display != "none" && uploadButtonVisible && !hideVideoPlayerControls) {
=======
if (document.getElementById("startSponsorImage").style.display != "none" && uploadButtonVisible && !SB.config.hideInfoButtonPlayerControls) {
>>>>>>>
if (document.getElementById("startSponsorImage").style.display != "none" && uploadButtonVisible && !SB.config.hideInfoButtonPlayerControls) { |
<<<<<<<
if (options.custom) {
for (option in options.custom) {
command += ' --' + option + '=' + options.custom[option];
}
}
command += " " + filepath;
=======
args.push(filepath);
>>>>>>>
if (options.custom) {
for (option in options.custom) {
command += ' --' + option + '=' + options.custom[option];
}
}
args.push(filepath); |
<<<<<<<
addButtons();
//see if there is a video start time
youtubeVideoStartTime = sponsorVideoID;
=======
resetValues();
>>>>>>>
//see if there is a video start time
youtubeVideoStartTime = sponsorVideoID;
<<<<<<<
=======
//Adds a sponsorship starts button to the player controls
function addPlayerControlsButton() {
if (document.getElementById("startSponsorButton") != null) {
//it's already added
return;
}
let startSponsorButton = document.createElement("button");
startSponsorButton.id = "startSponsorButton";
startSponsorButton.draggable = false;
startSponsorButton.className = "ytp-button playerButton";
startSponsorButton.setAttribute("title", chrome.i18n.getMessage("sponsorStart"));
startSponsorButton.addEventListener("click", startSponsorClicked);
let startSponsorImage = document.createElement("img");
startSponsorImage.id = "startSponsorImage";
startSponsorImage.draggable = false;
startSponsorImage.className = "playerButtonImage";
startSponsorImage.src = chrome.extension.getURL("icons/PlayerStartIconSponsorBlocker256px.png");
//add the image to the button
startSponsorButton.appendChild(startSponsorImage);
let controls = document.getElementsByClassName("ytp-right-controls");
let referenceNode = controls[controls.length - 1];
if (referenceNode == undefined) {
//page not loaded yet
setTimeout(addPlayerControlsButton, 100);
return;
}
referenceNode.prepend(startSponsorButton);
}
>>>>>>>
<<<<<<<
=======
//shows the info button on the video player
function addInfoButton() {
if (document.getElementById("infoButton") != null) {
//it's already added
return;
}
//make a submit button
let infoButton = document.createElement("button");
infoButton.id = "infoButton";
infoButton.draggable = false;
infoButton.className = "ytp-button playerButton";
infoButton.setAttribute("title", "Open SponsorBlock Popup");
infoButton.addEventListener("click", openInfoMenu);
let infoImage = document.createElement("img");
infoImage.id = "infoButtonImage";
infoImage.draggable = false;
infoImage.className = "playerButtonImage";
infoImage.src = chrome.extension.getURL("icons/PlayerInfoIconSponsorBlocker256px.png");
//add the image to the button
infoButton.appendChild(infoImage);
let controls = document.getElementsByClassName("ytp-right-controls");
let referenceNode = controls[controls.length - 1];
if (referenceNode == undefined) {
//page not loaded yet
setTimeout(addInfoButton, 100);
return;
}
referenceNode.prepend(infoButton);
}
//shows the delete button on the video player
function addDeleteButton() {
if (document.getElementById("deleteButton") != null) {
//it's already added
return;
}
//make a submit button
let deleteButton = document.createElement("button");
deleteButton.id = "deleteButton";
deleteButton.draggable = false;
deleteButton.className = "ytp-button playerButton";
deleteButton.setAttribute("title", "Clear Sponsor Times");
deleteButton.addEventListener("click", clearSponsorTimes);
//hide it at the start
deleteButton.style.display = "none";
let deleteImage = document.createElement("img");
deleteImage.id = "deleteButtonImage";
deleteImage.draggable = false;
deleteImage.className = "playerButtonImage";
deleteImage.src = chrome.extension.getURL("icons/PlayerDeleteIconSponsorBlocker256px.png");
//add the image to the button
deleteButton.appendChild(deleteImage);
let controls = document.getElementsByClassName("ytp-right-controls");
let referenceNode = controls[controls.length - 1];
if (referenceNode == undefined) {
//page not loaded yet
setTimeout(addDeleteButton, 100);
return;
}
referenceNode.prepend(deleteButton);
}
//shows the submit button on the video player
function addSubmitButton() {
if (document.getElementById("submitButton") != null) {
//it's already added
return;
}
//make a submit button
let submitButton = document.createElement("button");
submitButton.id = "submitButton";
submitButton.draggable = false;
submitButton.className = "ytp-button playerButton";
submitButton.setAttribute("title", "Submit Sponsor Times");
submitButton.addEventListener("click", submitSponsorTimes);
//hide it at the start
submitButton.style.display = "none";
let submitImage = document.createElement("img");
submitImage.id = "submitButtonImage";
submitImage.draggable = false;
submitImage.className = "playerButtonImage";
submitImage.src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png");
//add the image to the button
submitButton.appendChild(submitImage);
let controls = document.getElementsByClassName("ytp-right-controls");
let referenceNode = controls[controls.length - 1];
if (referenceNode == undefined) {
//page not loaded yet
setTimeout(addSubmitButton, 100);
return;
}
referenceNode.prepend(submitButton);
}
>>>>>>> |
<<<<<<<
setAutoRemoveAsync() {
const removeQuery = {expires: {$lt: new Date()}}
switch (this.autoRemove) {
case 'native':
return this.collection.ensureIndexAsync({expires: 1}, {expireAfterSeconds: 0})
case 'interval':
this.timer = setInterval(() => this.collection.remove(removeQuery, {w: 0}), this.autoRemoveInterval * 1000 * 60)
this.timer.unref()
return bluebird.resolve()
default:
return bluebird.resolve()
}
}
=======
setAutoRemoveAsync() {
let removeQuery = { expires: { $lt: new Date() } };
switch (this.autoRemove) {
case 'native':
return this.collection.createIndexAsync({ expires: 1 }, { expireAfterSeconds: 0 });
case 'interval':
this.timer = setInterval(() => this.collection.remove(removeQuery, { w: 0 }), this.autoRemoveInterval * 1000 * 60);
this.timer.unref();
return Promise.resolve();
default:
return Promise.resolve();
}
}
>>>>>>>
setAutoRemoveAsync() {
const removeQuery = {expires: {$lt: new Date()}}
switch (this.autoRemove) {
case 'native':
return this.collection.createIndexAsync({expires: 1}, {expireAfterSeconds: 0})
case 'interval':
this.timer = setInterval(() => this.collection.remove(removeQuery, {w: 0}), this.autoRemoveInterval * 1000 * 60)
this.timer.unref()
return bluebird.resolve()
default:
return bluebird.resolve()
}
}
<<<<<<<
['count', 'findOne', 'remove', 'drop', 'ensureIndex'].forEach(method => {
collection[method + 'Async'] = bluebird.promisify(collection[method], {context: collection})
})
collection.updateAsync = bluebird.promisify(collection.update, {context: collection, multiArgs: true})
=======
['count', 'findOne', 'remove', 'drop', 'createIndex'].forEach(method => {
collection[method + 'Async'] = Promise.promisify(collection[method], { context: collection });
});
collection.updateAsync = Promise.promisify(collection.update, { context: collection, multiArgs: true });
>>>>>>>
['count', 'findOne', 'remove', 'drop', 'createIndex'].forEach(method => {
collection[method + 'Async'] = bluebird.promisify(collection[method], {context: collection})
})
collection.updateAsync = bluebird.promisify(collection.update, {context: collection, multiArgs: true}) |
<<<<<<<
if (r.get("opaque") === true) {
// an opaque layer can be considered as a baselayer
// as a result, we apply a transitionEffect, which suits well for baselayers
r.get('layer').transitionEffect = 'resize';
}
=======
/*
Lesson learned with http://applis-bretagne.fr/redmine/issues/2886 :
Do not try to be more intelligent than the WMS server
// Note: queryable is required in addition to opaque,
// because opaque is not a standard WMC feature
// This enables us to remove rasters from legend panel
if (r.get("opaque") === true || r.get("queryable") === false) {
// this record is valid, set its "hideInLegend"
// data field to true if the corresponding layer
// is a raster layer, i.e. its "opaque" data
// field is true
r.set("hideInLegend", true);
// we set opaque to true so that non queryable
// layers are considered as baselayers
r.set("opaque", true);
}
*/
// Note that the ultimate solution would be to do a getCapabilities
// request for each OGC server advertised in the WMC
// r.get('layer').transitionEffect = resize would have been set in WMC,
// not by the default openlayers GRID layer type,
// see the overriding in the first lines of this file.
r.get('layer').transitionEffect =
(r.get("opaque") === true || r.get('layer').transitionEffect === 'resize') ?
'resize' : 'map-resize';
// note: an opaque layer can be considered as a baselayer
// as a result, we apply a transitionEffect, which suits well for baselayers
>>>>>>>
// r.get('layer').transitionEffect = resize would have been set in WMC,
// not by the default openlayers GRID layer type,
// see the overriding in the first lines of this file.
r.get('layer').transitionEffect =
(r.get("opaque") === true || r.get('layer').transitionEffect === 'resize') ?
'resize' : 'map-resize';
// note: an opaque layer can be considered as a baselayer
// as a result, we apply a transitionEffect, which suits well for baselayers |
<<<<<<<
// put the mappanel up-front:
this.mapPanel.el.dom.style.zIndex = 9999;
=======
// put the header in the back:
this.headerIframe.style.zIndex = 0;
>>>>>>>
// put the header in the back:
this.headerIframe.style.zIndex = 0;
<<<<<<<
var p = this.mapPanel.ownerCt;
=======
var p = GeoExt.MapPanel.guess().ownerCt;
>>>>>>>
var p = this.mapPanel.ownerCt;
<<<<<<<
// put the mappanel back in place:
this.mapPanel.el.dom.style.zIndex = 1;
var p = this.mapPanel.ownerCt;
=======
// put the header to the front:
this.headerIframe.style.zIndex = this.originalZIndex;
var p = GeoExt.MapPanel.guess().ownerCt;
>>>>>>>
// put the header to the front:
this.headerIframe.style.zIndex = this.originalZIndex;
var p = this.mapPanel.ownerCt; |
<<<<<<<
tr("not any available attribute")
=======
tr("no WFS service associated to that layer")
>>>>>>>
tr("no available attribute")
<<<<<<<
=======
} else {
var store = GEOR.ows.WFSDescribeFeatureType(wfsInfo, {
success: function(st, recs, opts) {
// extract & remove geometry column name
var idx = st.find('type', GEOR.ows.matchGeomProperty);
if (idx > -1) {
// we have a geometry
var r = st.getAt(idx);
geometryName = r.get('name');
st.remove(r);
}
if (st.getCount() > 0) {
// we have at least one attribute that we can style
getSymbolType(initStyler);
} else {
// give up
giveup([ // FIXME: one key translation
tr("Impossible to complete the " +
"operation:"),
tr("no available attribute")
].join(" "));
}
},
failure: function() {
mask && mask.hide();
win.close();
}
});
// store a reference to the store in a
// private attribute of the instance
attributes = store;
>>>>>>> |
<<<<<<<
if (api.supportsFullScreen) {
api.requestFullScreen(
this.map.div.childNodes[0]
);
} else {
var p = this.mapPanel.ownerCt;
=======
if (this.options.toolbars || !api.supportsFullScreen) {
var p = GeoExt.MapPanel.guess().ownerCt; // TODO: improve this for 15.12, with https://github.com/georchestra/georchestra/issues/1006
>>>>>>>
if (this.options.toolbars || !api.supportsFullScreen) {
var p = this.mapPanel.ownerCt; |
<<<<<<<
if (isWMS || isWFS) {
insertSep();
menuItems.push({
iconCls: 'geor-btn-download',
text: tr("Download data"),
handler: function() {
submitData({
layers: [{
layername: layerRecord.get('name'),
metadataURL: url || "",
owstype: isWMS ? "WMS" : "WFS",
owsurl: isWMS ? layer.url : layer.protocol.url
}]
})
}
});
=======
menuItems.push({
iconCls: 'geor-btn-download',
text: tr("Download data"),
handler: function() {
submitData({
layers: [{
layername: layerRecord.get('name'),
metadataURL: layer.metadataURL || "",
owstype: isWMS ? "WMS" : "WFS",
owsurl: isWMS ? layer.url : layer.protocol.url
}]
})
}
});
if (menuItems.length > 2) {
menuItems.push("-");
>>>>>>>
if (isWMS || isWFS) {
insertSep();
menuItems.push({
iconCls: 'geor-btn-download',
text: tr("Download data"),
handler: function() {
submitData({
layers: [{
layername: layerRecord.get('name'),
metadataURL: layer.metadataURL || "",
owstype: isWMS ? "WMS" : "WFS",
owsurl: isWMS ? layer.url : layer.protocol.url
}]
})
}
}); |
<<<<<<<
{t('back')}
=======
<span className={style.label}>
{i18n.t('back')}
</span>
>>>>>>>
<span className={style.label}>
{t('back')}
</span> |
<<<<<<<
'jquery', 'playlist', 'track', 'api', 'notification', 'playercallback'
], function ($, Playlist, Track, api, notify, playerCallback) {
=======
'jquery', 'playlist', 'api', 'notification',
'playermanager', 'playercallback'
], function ($, Playlist, api, notify, playerManager, playerCallback) {
/**
* Playlist filter.
*
* Find tracks by their name.
* Callbacks should be provided as `function (filteredPlaylist)`.
*/
function PlaylistFilter (playlist) {
var originalPlaylist = playlist;
// filter a playlist matching pattern.
// show only tracks whose name contains pattern.
this.query = function (pattern, callback) {
var filteredPlaylist =
new Playlist(originalPlaylist.uid, originalPlaylist.name, []);
for (var i=0; i < originalPlaylist.size(); i+=1) {
var track = originalPlaylist.get(i),
name = track.name;
if (name.toLowerCase().indexOf(pattern.toLowerCase()) !== -1) {
filteredPlaylist.add(track);
}
}
callback(filteredPlaylist);
};
// Revoke playlist filterd to originalPlaylist.
this.revoke = function (callback) {
callback(originalPlaylist);
};
};
/**
* This controller manages what to be played next.
*/
function PlayOrderControl (playlistManager) {
var RepeatStatus = {
noRepeat: 0,
repeatPlaylist: 1,
repeatOne: 2
};
var ShuffleStatus = {
noShuffle: 0,
shuffle: 1
}
this.playQueue = [];
this.repeatStatus = RepeatStatus.noRepeat;
this.shuffleStatus = ShuffleStatus.noShuffle;
this.repeatBtn = $('.controls .ctrl-repeat');
this.shuffleBtn = $('.controls .ctrl-shuffle');
this.init = function () {
var that = this;
// Add player callback so that this module picks next track
// when the track finished.
playerCallback.addCallbacks({
onFinish: function () {
var nextTrack = that.popNext(playerManager.getCurrentTrack());
if (nextTrack !== null) {
playerManager.play(nextTrack);
}
}
})
};
this.onRepeatClicked = function () {
this.repeatStatus = (this.repeatStatus + 1) % 3;
switch (this.repeatStatus) {
case RepeatStatus.noRepeat:
this.repeatBtn.removeClass('repeat-one');
break;
case RepeatStatus.repeatPlaylist:
this.repeatBtn.addClass('repeat');
break;
case RepeatStatus.repeatOne:
this.repeatBtn.removeClass('repeat');
this.repeatBtn.addClass('repeat-one');
break;
}
};
this.onShuffleClicked = function () {
this.shuffleStatus = (this.shuffleStatus + 1) % 2;
this.reloadQueue();
switch (this.shuffleStatus) {
case ShuffleStatus.noShuffle:
this.shuffleBtn.removeClass('shuffle');
break;
case ShuffleStatus.shuffle:
this.shuffleBtn.addClass('shuffle');
break;
}
};
this.reloadQueue = function () {
var playlistTracks = playlistManager.currentPlaylist.tracks;
if (this.shuffleStatus === ShuffleStatus.shuffle) {
var i, j, temp;
for (i = playlistTracks.length - 1; i > 0; i -= 1) {
// Shuffle array.
j = Math.floor(Math.random() * (i + 1));
temp = playlistTracks[i];
playlistTracks[i] = playlistTracks[j];
playlistTracks[j] = temp;
}
}
this.playQueue = playlistTracks;
};
this.getCurPosition = function (track) {
for (var i = 0; i < this.playQueue.length; i += 1) {
if (this.playQueue[i].uid === track.uid) {
return i;
}
}
};
this.popNext = function (curTrack) {
if (this.repeatStatus === RepeatStatus.repeatOne) {
// Should repeat current music regardless of shuffle status.
return curTrack;
} else {
// Pick next.
var pos = this.getCurPosition(curTrack);
if (pos < this.playQueue.length - 1) {
// If there is remaining track, play it.
return this.playQueue[pos + 1];
} else {
// No remaining track.
if (this.repeatStatus === RepeatStatus.repeatPlaylist) {
// Fill the queue again and returns first track.
this.reloadQueue();
if (this.playQueue.length > 0) {
return this.playQueue[0];
}
}
return null;
}
}
};
};
>>>>>>>
'jquery', 'playlist', 'track', 'api', 'notification', 'playercallback'
], function ($, Playlist, Track, api, notify, playerCallback) {
/**
* Playlist filter.
*
* Find tracks by their name.
* Callbacks should be provided as `function (filteredPlaylist)`.
*/
function PlaylistFilter (playlist) {
var originalPlaylist = playlist;
// filter a playlist matching pattern.
// show only tracks whose name contains pattern.
this.query = function (pattern, callback) {
var filteredPlaylist =
new Playlist(originalPlaylist.uid, originalPlaylist.name, []);
for (var i=0; i < originalPlaylist.size(); i+=1) {
var track = originalPlaylist.get(i),
name = track.name;
if (name.toLowerCase().indexOf(pattern.toLowerCase()) !== -1) {
filteredPlaylist.add(track);
}
}
callback(filteredPlaylist);
};
// Revoke playlist filterd to originalPlaylist.
this.revoke = function (callback) {
callback(originalPlaylist);
};
}; |
<<<<<<<
const copyWelcome = welcome.copyWelcome()
=======
const copy = welcome.copy()
>>>>>>>
const copyWelcome = welcome.copyWelcome()
<<<<<<<
const welcomeTitleText = await welcome.welcomeTitle.getText()
expect(welcomeTitleText).to.equal(copyWelcome["title"]);
await welcome.welcomeTitle.isDisplayed()
=======
const welcomeTitleText = welcome.welcomeTitle.getText()
expect(welcomeTitleText).to.equal(copy["title"]);
welcome.welcomeTitle.isDisplayed()
>>>>>>>
const welcomeTitleText = welcome.welcomeTitle.getText()
expect(welcomeTitleText).to.equal(copyWelcome["title"]);
welcome.welcomeTitle.isDisplayed()
<<<<<<<
const welcomeSubtitleText = await welcome.welcomeSubtitle.getText()
expect(welcomeSubtitleText).to.equal(copyWelcome["description_p_1"] + "\n" + copyWelcome["description_p_2"]);
await welcome.welcomeSubtitle.isDisplayed()
=======
const welcomeSubtitleText = welcome.welcomeSubtitle.getText()
expect(welcomeSubtitleText).to.equal(copy["description_p_1"] + "\n" + copy["description_p_2"]);
welcome.welcomeSubtitle.isDisplayed()
>>>>>>>
const welcomeSubtitleText = welcome.welcomeSubtitle.getText()
expect(welcomeSubtitleText).to.equal(copyWelcome["description_p_1"] + "\n" + copyWelcome["description_p_2"]);
welcome.welcomeSubtitle.isDisplayed()
<<<<<<<
const verifyIdentityBtnText = await welcome.primaryBtn.getText()
expect(verifyIdentityBtnText).to.equal(copyWelcome["next_button"]);
await welcome.primaryBtn.isDisplayed()
=======
const verifyIdentityBtnText = welcome.primaryBtn.getText()
expect(verifyIdentityBtnText).to.equal(copy["next_button"]);
welcome.primaryBtn.isDisplayed()
>>>>>>>
const verifyIdentityBtnText = welcome.primaryBtn.getText()
expect(verifyIdentityBtnText).to.equal(copyWelcome["next_button"]);
welcome.primaryBtn.isDisplayed() |
<<<<<<<
render ({useWebcam, back, i18n, termsAccepted, useFullScreen, liveness, ...other}) {
=======
render ({useWebcam, back, i18n, termsAccepted, ...other}) {
>>>>>>>
render ({useWebcam, back, i18n, termsAccepted, liveness, ...other}) { |
<<<<<<<
get identityCardLabel() { return this.$('.onfido-sdk-ui-DocumentSelector-option:nth-child(3) .onfido-sdk-ui-DocumentSelector-label')}
get identityCardHint() { return this.$('.onfido-sdk-ui-DocumentSelector-option:nth-child(3) .onfido-sdk-ui-DocumentSelector-hint')}
/* eslint-disable no-undef */
copy(lang) { return locale(lang) }
verifyDocumentSelectionScreenTitle() {
const documentSelectionScreenStrings = copy(lang).document_selector.identity
verifyElementCopy(title, documentSelectionScreenStrings.title)
}
verifyDocumentSelectionScreenSubtitle() {
const documentSelectionScreenStrings = copy(lang).document_selector.identity
verifyElementCopy(subtitle, documentSelectionScreenStrings.hint)
}
verifyDocumentSelectionScreenDocumentsLabels() {
const documentTypesStrings = copy(lang)
verifyElementCopy(documentSelectionLabel, documentTypesStrings.passport)
verifyElementCopy(drivingLicenceLabel, documentTypesStrings.driving_licence)
verifyElementCopy(identityCardLabel, documentTypesStrings.national_identity_card)
}
verifyDocumentSelectionScreenDocumentsHints() {
const documentSelectionScreenStrings = copy(lang).document_selector.identity
verifyElementCopy(documentSelectionHint, documentSelectionScreenStrings.passport_hint)
verifyElementCopy(drivingLicenceHint, documentSelectionScreenStrings.driving_licence_hint)
verifyElementCopy(identityCardHint, documentSelectionScreenStrings.national_identity_card_hint)
}
verifyDocumentSelectionScreenDocumentsIcons() {
passportIcon.isDisplayed()
drivingLicenceIcon.isDisplayed()
identityCardIcon.isDisplayed()
}
=======
get identityCardLabel() { return this.$('li:nth-child(3) .onfido-sdk-ui-DocumentSelector-label')}
get identityCardHint() { return this.$('li:nth-child(3) .onfido-sdk-ui-DocumentSelector-hint')}
>>>>>>>
get identityCardLabel() { return this.$('li:nth-child(3) .onfido-sdk-ui-DocumentSelector-label')}
get identityCardHint() { return this.$('li:nth-child(3) .onfido-sdk-ui-DocumentSelector-hint')}
/* eslint-disable no-undef */
copy(lang) { return locale(lang) }
verifyDocumentSelectionScreenTitle() {
const documentSelectionScreenStrings = copy(lang).document_selector.identity
verifyElementCopy(title, documentSelectionScreenStrings.title)
}
verifyDocumentSelectionScreenSubtitle() {
const documentSelectionScreenStrings = copy(lang).document_selector.identity
verifyElementCopy(subtitle, documentSelectionScreenStrings.hint)
}
verifyDocumentSelectionScreenDocumentsLabels() {
const documentTypesStrings = copy(lang)
verifyElementCopy(documentSelectionLabel, documentTypesStrings.passport)
verifyElementCopy(drivingLicenceLabel, documentTypesStrings.driving_licence)
verifyElementCopy(identityCardLabel, documentTypesStrings.national_identity_card)
}
verifyDocumentSelectionScreenDocumentsHints() {
const documentSelectionScreenStrings = copy(lang).document_selector.identity
verifyElementCopy(documentSelectionHint, documentSelectionScreenStrings.passport_hint)
verifyElementCopy(drivingLicenceHint, documentSelectionScreenStrings.driving_licence_hint)
verifyElementCopy(identityCardHint, documentSelectionScreenStrings.national_identity_card_hint)
}
verifyDocumentSelectionScreenDocumentsIcons() {
passportIcon.isDisplayed()
drivingLicenceIcon.isDisplayed()
identityCardIcon.isDisplayed()
} |
<<<<<<<
const DesktopUploadArea = ({ translate, onFileSelected, error, uploadIcon, changeFlowTo, mobileFlow }) =>
<div className={ style.crossDeviceInstructionsContainer }>
<div className={style.iconContainer}>
<i className={ classNames(theme.icon, style.icon, style[uploadIcon]) } />
</div>
=======
const PassportMobileUploadArea = ({ nextStep, children, translate }) =>
<div className={classNames(style.uploadArea, style.uploadAreaMobile)}>
{ children }
<div className={style.buttons}>
<Button
variants={['centered', 'primary', 'lg']}
onClick={nextStep}
>
{translate('capture.take_photo')}
</Button>
</div>
</div>
const DesktopUploadArea = ({
translate,
uploadType,
changeFlowTo,
mobileFlow,
children
}) => (
<div className={style.crossDeviceInstructionsContainer}>
<i className={classNames(theme.icon, style.icon, style[`${camelCase(uploadType)}Icon`])} />
>>>>>>>
const PassportMobileUploadArea = ({ nextStep, children, translate }) =>
<div className={classNames(style.uploadArea, style.uploadAreaMobile)}>
{ children }
<div className={style.buttons}>
<Button
variants={['centered', 'primary', 'lg']}
onClick={nextStep}
>
{translate('capture.take_photo')}
</Button>
</div>
</div>
const DesktopUploadArea = ({
translate,
uploadType,
changeFlowTo,
mobileFlow,
children
}) => (
<div className={style.crossDeviceInstructionsContainer}>
<div className={style.iconContainer}>
<i className={classNames(theme.icon, style.icon, style[`${camelCase(uploadType)}Icon`])} />
</div>
<<<<<<<
subTitle={ allowCrossDeviceFlow ? translate('cross_device.switch_device.header') : subTitle } />
<div className={ classNames(style.uploaderWrapper, { [style.crossDeviceClient]: !allowCrossDeviceFlow }) }>
{isDesktop ? (
<DesktopUploadArea
onFileSelected={ this.handleFileSelected }
changeFlowTo={ changeFlowTo }
uploadIcon={ `${camelCase(uploadType)}Icon` }
error={error}
translate={translate}
mobileFlow={mobileFlow} />
) : (
<MobileUploadArea
onFileSelected={ this.handleFileSelected }
translate={translate}
{ ...{ isPoA } }
>
<div className={ style.instructions }>
<div className={classNames(style.iconContainer, {[style.poaIconContainer]: isPoA})}>
<span className={ classNames(theme.icon, style.icon, style[`${camelCase(uploadType)}Icon`]) } />
</div>
{ error ?
<UploadError { ...{ error, translate } } /> :
<div className={ style.instructionsCopy }>{ instructions }</div>
}
</div>
</MobileUploadArea>
)}
=======
subTitle={
allowCrossDeviceFlow ?
translate('cross_device.switch_device.header') :
subTitle
}
/>
<div
className={classNames(style.uploaderWrapper, {
[style.crossDeviceClient]: !allowCrossDeviceFlow,
})}
>
{isPassportUpload ?
this.renderPassportUploadIntro() :
this.renderUploadArea()}
>>>>>>>
subTitle={
allowCrossDeviceFlow ?
translate('cross_device.switch_device.header') :
subTitle
}
/>
<div
className={classNames(style.uploaderWrapper, {
[style.crossDeviceClient]: !allowCrossDeviceFlow,
})}
>
{isPassportUpload ?
this.renderPassportUploadIntro() :
this.renderUploadArea()} |
<<<<<<<
const {i18n, documentTypes, defaultOptions, country = 'GBR' } = this.props
const defaultDocOptions = defaultOptions(i18n).filter(
({ checkAvailableInCountry = always }) => checkAvailableInCountry(country)
)
=======
const {documentTypes, defaultOptions, country = 'GBR' } = this.props
const defaultDocOptions = defaultOptions()
>>>>>>>
const {documentTypes, defaultOptions, country = 'GBR' } = this.props
const defaultDocOptions = defaultOptions(i18n).filter(
({ checkAvailableInCountry = always }) => checkAvailableInCountry(country)
) |
<<<<<<<
FrontDocument: appendToTracking(withOptions(Document), 'front_capture'),
BackDocument: appendToTracking(withOptions(Document, { side: 'back' }), 'back_capture'),
Selfie: appendToTracking(withOptions(Face), 'capture'),
Liveness: appendToTracking(withOptions(Face, { requestedVariant: 'video'}), 'liveness_capture'),
PoADocument: appendToTracking(withPoAGuidanceScreen(Document), 'poa'),
=======
FrontDocumentCapture: appendToTracking(FrontDocumentCapture, 'front_capture'),
BackDocumentCapture: appendToTracking(BackDocumentCapture, 'back_capture'),
FaceCapture: appendToTracking(FaceCapture, 'selfie_capture'),
LivenessCapture: appendToTracking(LivenessCapture, 'video_capture'),
>>>>>>>
FrontDocument: appendToTracking(withOptions(Document), 'front_capture'),
BackDocument: appendToTracking(withOptions(Document, { side: 'back' }), 'back_capture'),
Selfie: appendToTracking(withOptions(Face), 'selfie_capture'),
Liveness: appendToTracking(withOptions(Face, { requestedVariant: 'video'}), 'video_capture'),
PoADocument: appendToTracking(withPoAGuidanceScreen(Document), 'poa'), |
<<<<<<<
// NOTE: please leave the BASE_32_VERSION be! It is updated automatically by
// the release script 🤖
'BASE_32_VERSION': 'AP',
=======
'BASE_32_VERSION' : 'AR',
>>>>>>>
// NOTE: please leave the BASE_32_VERSION be! It is updated automatically by
// the release script 🤖
'BASE_32_VERSION': 'AR', |
<<<<<<<
export const DocumentFrontCapture = appendToTracking(
withOptions(Document),
=======
export const FrontDocumentCapture = appendToTracking(
withCaptureVariant(Document),
>>>>>>>
export const DocumentFrontCapture = appendToTracking(
withCaptureVariant(Document),
<<<<<<<
export const DocumentBackCapture = appendToTracking(
withOptions(Document, { side: 'back' }),
=======
export const BackDocumentCapture = appendToTracking(
withCaptureVariant(Document, { side: 'back' }),
>>>>>>>
export const DocumentBackCapture = appendToTracking(
withCaptureVariant(Document, { side: 'back' }), |
<<<<<<<
import { getWoopraCookie, setWoopraCookie, sendError } from '../../Tracker'
import { LocaleProvider } from '../../locales'
=======
import { initializeI18n } from '../../locales'
import { getWoopraCookie, setWoopraCookie, trackException } from '../../Tracker'
>>>>>>>
import { getWoopraCookie, setWoopraCookie, trackException } from '../../Tracker'
import { LocaleProvider } from '../../locales' |
<<<<<<<
render() {
const {
translate,
isFullScreen,
containerId,
shouldCloseOnOverlayClick,
} = this.props
=======
render () {
const { translate, isFullScreen, containerId, containerEl, shouldCloseOnOverlayClick } = this.props
>>>>>>>
render() {
const {
translate,
isFullScreen,
containerId,
containerEl,
shouldCloseOnOverlayClick,
} = this.props |
<<<<<<<
/*
* Cached reference to article url DOM
* @type {?Array.<Element>}
*/
this.currentURL = null;
=======
/**
* @type {?Element}
*/
this.sidebar = null;
>>>>>>>
/*
* Cached reference to article url DOM
* @type {?Array.<Element>}
*/
this.currentURL = null;
/**
* @type {?Element}
*/
this.sidebar = null;
<<<<<<<
var toc = [],
tocTemplates = [],
menus = [],
tocTemplates = [];
=======
var sidebars = [];
>>>>>>>
var toc = [],
tocTemplates = [],
menus = [],
sidebars = [];
<<<<<<<
this.currentURL = treesaver.dom.getElementsByClassName('current-url', this.node);
menus = treesaver.dom.getElementsByClassName('menu', this.node);
if (menus.length > 0) {
this.menu = menus[0];
}
this.currentURL = treesaver.dom.getElementsByClassName('article-url', this.node);
toc = treesaver.dom.getElementsByClassName('toc', this.node);
// TODO: We might want to do something smarter than just selecting the first
// TOC template.
if (toc.length === 1) {
this.toc = /** @type {!Element} */ (toc[0]);
tocTemplates = treesaver.dom.getElementsByClassName('template', this.toc);
if (tocTemplates.length > 0) {
this.tocTemplate = tocTemplates[0];
}
// Remove anything inside TOC
treesaver.dom.clearChildren(this.toc);
}
=======
sidebars = treesaver.dom.getElementsByClassName('sidebar', this.node);
if (sidebars.length > 0) {
this.sidebar = sidebars[0];
}
>>>>>>>
this.currentURL = treesaver.dom.getElementsByClassName('current-url', this.node);
menus = treesaver.dom.getElementsByClassName('menu', this.node);
if (menus.length > 0) {
this.menu = menus[0];
}
this.currentURL = treesaver.dom.getElementsByClassName('article-url', this.node);
toc = treesaver.dom.getElementsByClassName('toc', this.node);
// TODO: We might want to do something smarter than just selecting the first
// TOC template.
if (toc.length === 1) {
this.toc = /** @type {!Element} */ (toc[0]);
tocTemplates = treesaver.dom.getElementsByClassName('template', this.toc);
if (tocTemplates.length > 0) {
this.tocTemplate = tocTemplates[0];
}
// Remove anything inside TOC
treesaver.dom.clearChildren(this.toc);
}
sidebars = treesaver.dom.getElementsByClassName('sidebar', this.node);
if (sidebars.length > 0) {
this.sidebar = sidebars[0];
}
<<<<<<<
this.menu = null;
this.currentURL = null;
this.toc = null;
this.tocTemplate = null;
=======
this.sidebar = null;
>>>>>>>
this.menu = null;
this.currentURL = null;
this.toc = null;
this.tocTemplate = null;
this.sidebar = null;
<<<<<<<
handled = false,
menuActivated = false;
=======
sidebarActivated = false,
handled = false;
>>>>>>>
handled = false,
sidebarActivated = false,
menuActivated = false;
<<<<<<<
else if (treesaver.dom.hasClass(el, 'menu')) {
if (this.menu === el) {
if (this.isMenuActive()) {
this.menuInactive();
}
else {
this.menuActive();
menuActivated = true;
}
handled = true;
}
}
=======
else if (treesaver.dom.hasClass(el, 'sidebar')) {
if (this.sidebar === el) {
if (!this.isSidebarActive()) {
this.sidebarActive();
sidebarActivated = true;
}
handled = true;
}
}
else if (treesaver.dom.hasClass(el, 'close-sidebar')) {
if (this.isSidebarActive()) {
this.sidebarInactive();
handled = true;
}
}
>>>>>>>
else if (treesaver.dom.hasClass(el, 'menu')) {
if (this.menu === el) {
if (this.isMenuActive()) {
this.menuInactive();
}
else {
this.menuActive();
menuActivated = true;
}
handled = true;
}
}
else if (treesaver.dom.hasClass(el, 'sidebar')) {
if (this.sidebar === el) {
if (!this.isSidebarActive()) {
this.sidebarActive();
sidebarActivated = true;
}
handled = true;
}
}
else if (treesaver.dom.hasClass(el, 'close-sidebar')) {
if (this.isSidebarActive()) {
this.sidebarInactive();
handled = true;
}
}
<<<<<<<
if (!menuActivated && this.isMenuActive()) {
this.menuInactive();
}
=======
if (!sidebarActivated && this.isSidebarActive() && !handled) {
this.sidebarInactive();
}
>>>>>>>
if (!menuActivated && this.isMenuActive()) {
this.menuInactive();
}
if (!sidebarActivated && this.isSidebarActive() && !handled) {
this.sidebarInactive();
}
<<<<<<<
* Show menu
*/
treesaver.ui.Chrome.prototype.menuActive = function() {
treesaver.dom.addClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Hide menu
*/
treesaver.ui.Chrome.prototype.menuInactive = function() {
treesaver.dom.removeClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Returns the current state of the menu.
*/
treesaver.ui.Chrome.prototype.isMenuActive = function() {
return treesaver.dom.hasClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
=======
* Show sidebar
*/
treesaver.ui.Chrome.prototype.sidebarActive = function() {
treesaver.dom.addClass(/** @type {!Element} */ (this.node), 'sidebar-active');
};
/**
* Hide sidebar
*/
treesaver.ui.Chrome.prototype.sidebarInactive = function() {
treesaver.dom.removeClass(/** @type {!Element} */ (this.node), 'sidebar-active');
};
/**
* Determines whether or not the sidebar is active.
*
* @return {boolean} true if the sidebar is active, false otherwise.
*/
treesaver.ui.Chrome.prototype.isSidebarActive = function() {
return treesaver.dom.hasClass(/** @type {!Element} */ (this.node), 'sidebar-active');
};
/**
>>>>>>>
* Show menu
*/
treesaver.ui.Chrome.prototype.menuActive = function() {
treesaver.dom.addClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Hide menu
*/
treesaver.ui.Chrome.prototype.menuInactive = function() {
treesaver.dom.removeClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Returns the current state of the menu.
*/
treesaver.ui.Chrome.prototype.isMenuActive = function() {
return treesaver.dom.hasClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Show sidebar
*/
treesaver.ui.Chrome.prototype.sidebarActive = function() {
treesaver.dom.addClass(/** @type {!Element} */ (this.node), 'sidebar-active');
};
/**
* Hide sidebar
*/
treesaver.ui.Chrome.prototype.sidebarInactive = function() {
treesaver.dom.removeClass(/** @type {!Element} */ (this.node), 'sidebar-active');
};
/**
* Determines whether or not the sidebar is active.
*
* @return {boolean} true if the sidebar is active, false otherwise.
*/
treesaver.ui.Chrome.prototype.isSidebarActive = function() {
return treesaver.dom.hasClass(/** @type {!Element} */ (this.node), 'sidebar-active');
};
/** |
<<<<<<<
<div className={style.buttonInstructions}>
<p className={style.instructions}>{translate('webcam_permissions.click_allow')}</p>
<Button
variants={["centered", "primary", "lg"]}
onClick={onNext}
>
{translate('webcam_permissions.enable_webcam')}
</Button>
</div>
=======
<p className={style.instructions}>{translate('webcam_permissions.click_allow')}</p>
</div>
<div className={classNames(theme.thickWrapper, style.actions)}>
<Button
variants={["centered", "primary"]}
onClick={onNext}
>
{translate('webcam_permissions.enable_webcam')}
</Button>
>>>>>>>
<p className={style.instructions}>{translate('webcam_permissions.click_allow')}</p>
</div>
<div className={classNames(theme.thickWrapper, style.actions)}>
<Button
variants={["centered", "primary", "lg"]}
onClick={onNext}
>
{translate('webcam_permissions.enable_webcam')}
</Button> |
<<<<<<<
{ error.type ? <Error {...{error, withArrow: true, role: "alert", focusOnMount: false}} /> :
<PageTitle title={title} subTitle={subTitle} smaller={true} className={style.title}/> }
<CaptureViewer {...{ capture, method, isFullScreen, altTag }} />
=======
{ isFullScreen ? null :
error.type ?
<Error {...{error, withArrow: true}} /> :
<PageTitle title={title} subTitle={subTitle} smaller={true} className={style.title}/> }
<CaptureViewer {...{ capture, method, isFullScreen, altTag, enlargedAltTag }} />
>>>>>>>
{ isFullScreen ? null :
error.type ?
<Error {...{error, withArrow: true, role: "alert", focusOnMount: false}} /> :
<PageTitle title={title} subTitle={subTitle} smaller={true} className={style.title}/> }
<CaptureViewer {...{ capture, method, isFullScreen, altTag, enlargedAltTag }} /> |
<<<<<<<
const withDefaultOptions = (iconCopyDisplayByType: Object) => (
props: Props
) => (
<LocalisedDocumentSelector
{...props}
defaultOptions={() => {
const typeList = Object.keys(iconCopyDisplayByType)
const group = props.group
return typeList.map((type) => {
const {
icon = `icon-${kebabCase(type)}`,
hint,
warning,
} = iconCopyDisplayByType[type]
return {
icon,
type,
label: props.translate(type),
hint: hint
? props.translate(`document_selector.${group}.${hint}`)
: '',
warning: warning
? props.translate(`document_selector.${group}.${warning}`)
: '',
}
})
}}
/>
)
=======
const withDefaultOptions = (types: Object) => {
const DefaultOptionedDocumentSelector = (props: Props) => (
<LocalisedDocumentSelector
{...props}
defaultOptions={() => {
const typeList = Object.keys(types)
const group = props.group
return typeList.map((value) => {
const {
icon = `icon-${kebabCase(value)}`,
hint,
warning,
...other
} = types[value]
return {
...other,
icon,
value,
label: props.translate(value),
hint: hint
? props.translate(`document_selector.${group}.${hint}`)
: '',
warning: warning
? props.translate(`document_selector.${group}.${warning}`)
: '',
}
})
}}
/>
)
return DefaultOptionedDocumentSelector
}
>>>>>>>
const withDefaultOptions = (iconCopyDisplayByType: Object) => {
const DefaultOptionedDocumentSelector = (props: Props) => (
<LocalisedDocumentSelector
{...props}
defaultOptions={() => {
const typeList = Object.keys(iconCopyDisplayByType)
const group = props.group
return typeList.map((type) => {
const {
icon = `icon-${kebabCase(type)}`,
hint,
warning,
} = iconCopyDisplayByType[type]
return {
icon,
type,
label: props.translate(type),
hint: hint
? props.translate(`document_selector.${group}.${hint}`)
: '',
warning: warning
? props.translate(`document_selector.${group}.${warning}`)
: '',
}
})
}}
/>
)
return DefaultOptionedDocumentSelector
} |
<<<<<<<
const Error = ({className, error, t, withArrow, renderMessage = identity, renderInstruction = identity, renderAction}) => {
const errorList = errors(t)
=======
const Error = ({className, error, i18n, withArrow, renderMessage = identity, renderInstruction = identity}) => {
const errorList = errors(i18n)
>>>>>>>
const Error = ({className, error, t, withArrow, renderMessage = identity, renderInstruction = identity}) => {
const errorList = errors(t) |
<<<<<<<
=======
import { find } from '../utils/object'
import { fileToLossyBase64Image, isOfFileType } from '../utils/file.js'
>>>>>>>
import { find } from '../utils/object'
import { fileToLossyBase64Image, isOfFileType } from '../utils/file.js' |
<<<<<<<
var toc = [],
tocTemplates = [],
menus = [];
=======
var toc = [],
tocTemplates = [],
sidebars = [];
>>>>>>>
var toc = [],
tocTemplates = [],
menus = [],
sidebars = [];
<<<<<<<
this.currentURL = treesaver.dom.getElementsByClassName('current-url', this.node);
menus = treesaver.dom.getElementsByClassName('menu', this.node);
if (menus.length > 0) {
this.menu = menus[0];
}
=======
this.articleURL = treesaver.dom.getElementsByClassName('article-url', this.node);
this.sidebar = treesaver.dom.getElementsByClassName('sidebar', this.node);
toc = treesaver.dom.getElementsByClassName('toc', this.node);
// TODO: We might want to do something smarter than just selecting the first
// TOC template.
if (toc.length === 1) {
this.toc = toc[0];
tocTemplates = treesaver.dom.getElementsByClassName('template', this.toc);
if (tocTemplates.length > 0) {
this.tocTemplate = tocTemplates[0];
}
// Remove anything inside TOC
treesaver.dom.clearChildren(this.toc);
}
>>>>>>>
this.currentURL = treesaver.dom.getElementsByClassName('current-url', this.node);
menus = treesaver.dom.getElementsByClassName('menu', this.node);
if (menus.length > 0) {
this.menu = menus[0];
}
this.articleURL = treesaver.dom.getElementsByClassName('article-url', this.node);
this.sidebar = treesaver.dom.getElementsByClassName('sidebar', this.node);
toc = treesaver.dom.getElementsByClassName('toc', this.node);
// TODO: We might want to do something smarter than just selecting the first
// TOC template.
if (toc.length === 1) {
this.toc = toc[0];
tocTemplates = treesaver.dom.getElementsByClassName('template', this.toc);
if (tocTemplates.length > 0) {
this.tocTemplate = tocTemplates[0];
}
// Remove anything inside TOC
treesaver.dom.clearChildren(this.toc);
}
<<<<<<<
this.menu = null;
this.currentURL = null;
=======
this.articleURL = null;
this.toc = null;
this.tocTemplate = null;
this.sidebar = null;
>>>>>>>
this.menu = null;
this.currentURL = null;
this.articleURL = null;
this.toc = null;
this.tocTemplate = null;
this.sidebar = null;
<<<<<<<
else if (treesaver.dom.hasClass(el, 'zoomable')) {
// TODO: What if it's not in the current page?
// check element.contains on current page ...
// Counts as handling the event only if showing is successful
handled = this.showLightBox(el);
}
else if (treesaver.dom.hasClass(el, 'menu')) {
if (this.menu === el) {
if (this.isMenuActive()) {
this.menuInactive();
}
else {
this.menuActive();
menuActivated = true;
}
handled = true;
}
}
else if (el.href) {
=======
else if (treesaver.dom.hasClass(el, 'showSidebar')) {
this.showSidebar();
handled = true;
}
else if (treesaver.dom.hasClass(el, 'hideSidebar')) {
this.hideSidebar();
handled = true;
}
else if ('href' in el) {
>>>>>>>
else if (treesaver.dom.hasClass(el, 'zoomable')) {
// TODO: What if it's not in the current page?
// check element.contains on current page ...
// Counts as handling the event only if showing is successful
handled = this.showLightBox(el);
}
else if (treesaver.dom.hasClass(el, 'menu')) {
if (this.menu === el) {
if (this.isMenuActive()) {
this.menuInactive();
}
else {
this.menuActive();
menuActivated = true;
}
handled = true;
}
}
else if (treesaver.dom.hasClass(el, 'showSidebar')) {
this.showSidebar();
handled = true;
}
else if (treesaver.dom.hasClass(el, 'hideSidebar')) {
this.hideSidebar();
handled = true;
}
else if (el.href) {
<<<<<<<
* Show menu
*/
treesaver.ui.Chrome.prototype.menuActive = function() {
treesaver.dom.addClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Hide menu
*/
treesaver.ui.Chrome.prototype.menuInactive = function() {
treesaver.dom.removeClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Returns the current state of the menu.
*/
treesaver.ui.Chrome.prototype.isMenuActive = function() {
return treesaver.dom.hasClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Show sidebars
* Show lightbox
*
* @private
* @param {!Element} el
* @return {boolean} True if content can be shown
*/
treesaver.ui.Chrome.prototype.showLightBox = function(el) {
var figure = treesaver.ui.ArticleManager.getFigure(el);
if (!figure) {
return false;
}
if (!this.lightBoxActive) {
this.lightBox = treesaver.ui.StateManager.getLightBox();
if (!this.lightBox) {
// No lightbox, nothing to show
return false;
}
this.lightBoxActive = true;
this.lightBox.activate();
// Lightbox is a sibling of the chrome root
this.node.parentNode.appendChild(this.lightBox.node);
}
// Closure compiler cast
this.lightBox.node = /** @type {!Element} */ (this.lightBox.node);
// Cover entire chrome with the lightbox
treesaver.dimensions.setCssPx(this.lightBox.node, 'width', this.node.offsetWidth);
treesaver.dimensions.setCssPx(this.lightBox.node, 'height', this.node.offsetHeight);
if (!this.lightBox.showFigure(figure)) {
// Showing failed
this.hideLightBox();
return false;
}
// Successfully showed the figure
return true;
};
/**
* Dismiss lightbox
*
* @private
*/
treesaver.ui.Chrome.prototype.hideLightBox = function() {
if (this.lightBoxActive) {
this.lightBoxActive = false;
this.node.parentNode.removeChild(this.lightBox.node);
this.lightBox.deactivate();
this.lightBox = null;
}
};
/**
=======
* Show sidebars
*/
treesaver.ui.Chrome.prototype.showSidebar = function() {
this.sidebar.forEach(function(sidebar) {
treesaver.dom.addClass(/** @type {!Element} */ (sidebar), 'sidebar-active');
});
};
/**
* Hide sidebars
*/
treesaver.ui.Chrome.prototype.hideSidebar = function() {
this.sidebar.forEach(function(sidebar) {
treesaver.dom.removeClass(/** @type {!Element} */ (sidebar), 'sidebar-active')
});
};
/**
>>>>>>>
* Show menu
*/
treesaver.ui.Chrome.prototype.menuActive = function() {
treesaver.dom.addClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Hide menu
*/
treesaver.ui.Chrome.prototype.menuInactive = function() {
treesaver.dom.removeClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Returns the current state of the menu.
*/
treesaver.ui.Chrome.prototype.isMenuActive = function() {
return treesaver.dom.hasClass(/** @type {!Element} */ (this.node), 'menu-active');
};
/**
* Show sidebars
* Show lightbox
*
* @private
* @param {!Element} el
* @return {boolean} True if content can be shown
*/
treesaver.ui.Chrome.prototype.showLightBox = function(el) {
var figure = treesaver.ui.ArticleManager.getFigure(el);
if (!figure) {
return false;
}
if (!this.lightBoxActive) {
this.lightBox = treesaver.ui.StateManager.getLightBox();
if (!this.lightBox) {
// No lightbox, nothing to show
return false;
}
this.lightBoxActive = true;
this.lightBox.activate();
// Lightbox is a sibling of the chrome root
this.node.parentNode.appendChild(this.lightBox.node);
}
// Closure compiler cast
this.lightBox.node = /** @type {!Element} */ (this.lightBox.node);
// Cover entire chrome with the lightbox
treesaver.dimensions.setCssPx(this.lightBox.node, 'width', this.node.offsetWidth);
treesaver.dimensions.setCssPx(this.lightBox.node, 'height', this.node.offsetHeight);
if (!this.lightBox.showFigure(figure)) {
// Showing failed
this.hideLightBox();
return false;
}
// Successfully showed the figure
return true;
};
/**
* Dismiss lightbox
*
* @private
*/
treesaver.ui.Chrome.prototype.hideLightBox = function() {
if (this.lightBoxActive) {
this.lightBoxActive = false;
this.node.parentNode.removeChild(this.lightBox.node);
this.lightBox.deactivate();
this.lightBox = null;
}
};
/**
* Show sidebars
*/
treesaver.ui.Chrome.prototype.showSidebar = function() {
this.sidebar.forEach(function(sidebar) {
treesaver.dom.addClass(/** @type {!Element} */ (sidebar), 'sidebar-active');
});
};
/**
* Hide sidebars
*/
treesaver.ui.Chrome.prototype.hideSidebar = function() {
this.sidebar.forEach(function(sidebar) {
treesaver.dom.removeClass(/** @type {!Element} */ (sidebar), 'sidebar-active')
});
};
/** |
<<<<<<<
async verifyTitle (copy) {
=======
verifyTitle (copy) {
>>>>>>>
async verifyTitle (copy) {
<<<<<<<
async verifySubtitle(copy) {
=======
async verifyFocusManagement() {
testFocusManagement(this.welcomeTitle, this.driver)
}
verifySubtitle(copy) {
>>>>>>>
async verifyFocusManagement() {
testFocusManagement(this.welcomeTitle, this.driver)
}
async verifySubtitle(copy) { |
<<<<<<<
copyToClipboard = (mobileUrl) => {
let tempInput = document.createElement('input')
document.body.appendChild(tempInput);
tempInput.setAttribute('value', mobileUrl)
tempInput.select()
document.execCommand("copy")
document.body.removeChild(tempInput)
this.onCopySuccess()
}
onCopySuccess() {
=======
sendLinkClickTimeoutId = null
copyToClipboard = (e) => {
this.linkText.select()
document.execCommand('copy')
e.target.focus()
>>>>>>>
copyToClipboard = (mobileUrl) => {
let tempInput = document.createElement('input')
document.body.appendChild(tempInput);
tempInput.setAttribute('value', mobileUrl)
tempInput.select()
document.execCommand("copy")
document.body.removeChild(tempInput)
this.onCopySuccess()
}
onCopySuccess() {
<<<<<<<
=======
clearSendLinkClickTimeout() {
if (this.sendLinkClickTimeoutId) {
clearTimeout(this.sendLinkClickTimeoutId)
}
}
componentWillUnmount() {
this.clearSendLinkClickTimeout()
}
>>>>>>>
clearSendLinkClickTimeout() {
if (this.sendLinkClickTimeoutId) {
clearTimeout(this.sendLinkClickTimeoutId)
}
}
componentWillUnmount() {
this.clearSendLinkClickTimeout()
} |
<<<<<<<
import { isDesktop } from '../utils'
import { jwtExpired } from '../utils/jwt'
import { createSocket } from '../utils/crossDeviceSync'
=======
>>>>>>> |
<<<<<<<
goog.addDependency("../../../src/core.js", ['treesaver.core'], ['treesaver.debug']);
goog.addDependency("../../../src/treesaver.js", ['treesaver'], ['treesaver.capabilities', 'treesaver.constants', 'treesaver.debug', 'treesaver.dom', 'treesaver.domready', 'treesaver.events', 'treesaver.history', 'treesaver.html5', 'treesaver.resources', 'treesaver.scheduler', 'treesaver.styles', 'treesaver.ui.Article', 'treesaver.ui.ArticleManager', 'treesaver.ui.Chrome', 'treesaver.ui.StateManager']);
goog.addDependency("../../../src/externs/animationframe.js", [], []);
=======
goog.addDependency("../../../src/core.js", ['treesaver.core'], ['treesaver.debug', 'treesaver.styles', 'treesaver.ui.Article', 'treesaver.ui.ArticleManager', 'treesaver.ui.Chrome', 'treesaver.ui.StateManager']);
goog.addDependency("../../../src/init.js", ['treesaver'], ['treesaver.boot', 'treesaver.capabilities', 'treesaver.constants', 'treesaver.debug', 'treesaver.history', 'treesaver.html5']);
goog.addDependency("../../../src/modules.js", ['treesaver.modules'], []);
goog.addDependency("../../../src/externs/animationframe.js", [], []);
>>>>>>>
goog.addDependency("../../../src/modules.js", ['treesaver.modules'], []);
goog.addDependency("../../../src/treesaver.js", ['treesaver'], ['treesaver.capabilities', 'treesaver.constants', 'treesaver.debug', 'treesaver.dom', 'treesaver.domready', 'treesaver.events', 'treesaver.history', 'treesaver.html5', 'treesaver.resources', 'treesaver.scheduler', 'treesaver.styles', 'treesaver.ui.Article', 'treesaver.ui.ArticleManager', 'treesaver.ui.Chrome', 'treesaver.ui.StateManager']);
goog.addDependency("../../../src/externs/animationframe.js", [], []); |
<<<<<<<
import { localised } from '../../locales'
import type { LocalisedType } from '../../locales'
type DocumentTypeOption = {
eStatementAccepted?: boolean,
warning?: string,
hint?: string,
icon: string,
label: string,
value: string,
}
=======
import { idDocumentOptions, poaDocumentOptions } from './documentTypes'
import type { DocumentOptionsType, GroupType } from './documentTypes'
>>>>>>>
import { idDocumentOptions, poaDocumentOptions } from './documentTypes'
import type { DocumentOptionsType, GroupType } from './documentTypes'
import { localised } from '../../locales'
import type { LocalisedType } from '../../locales'
<<<<<<<
documentTypes: { [string]: any },
=======
documentTypes: Object,
country?: string,
i18n: Object,
>>>>>>>
documentTypes: Object,
country?: string,
<<<<<<<
defaultOptions: () => DocumentTypeOption[],
=======
defaultOptions: Object => DocumentOptionsType[],
>>>>>>>
defaultOptions: Object => DocumentOptionsType[],
<<<<<<<
const {documentTypes, defaultOptions} = this.props
const defaultDocOptions = defaultOptions()
const options = defaultDocOptions.filter((option) => documentTypes && documentTypes[option.value])
=======
const {i18n, documentTypes, defaultOptions, country = 'GBR' } = this.props
const defaultDocOptions = defaultOptions(i18n)
const checkAvailableType = isEmpty(documentTypes) ? always : type => documentTypes[type]
const options = defaultDocOptions.filter(({ value: type, checkAvailableInCountry = always }) =>
checkAvailableType(type) && checkAvailableInCountry(country))
>>>>>>>
const {translate, documentTypes, defaultOptions, country = 'GBR' } = this.props
const defaultDocOptions = defaultOptions()
const checkAvailableType = isEmpty(documentTypes) ? always : type => documentTypes[type]
const options = defaultDocOptions.filter(({ value: type, checkAvailableInCountry = always }) =>
checkAvailableType(type) && checkAvailableInCountry(country))
<<<<<<<
const LocalisedDocumentSelector = localised(DocumentSelector)
const documentWithDefaultOptions = (types: Object, group: groupType) =>
=======
const withDefaultOptions = (types: Object, group: GroupType) =>
>>>>>>>
const LocalisedDocumentSelector = localised(DocumentSelector)
const withDefaultOptions = (types: Object, group: GroupType) => |
<<<<<<<
=======
import { uploadDocument, uploadLivePhoto } from '../utils/onfidoApi'
>>>>>>>
<<<<<<<
error: false,
hasWebcam: hasWebcamStartupValue
=======
error: {},
captureId: null,
onfidoId: null,
hasWebcam: hasWebcamStartupValue,
documentValidations: true,
uploadInProgress: false
>>>>>>>
error: {},
hasWebcam: hasWebcamStartupValue,
<<<<<<<
createCaptureAndProceed(payload) {
const { actions, method, side, nextStep } = this.props
=======
uploadCaptureToOnfido = () => {
this.setState({uploadInProgress: true})
const {validCaptures, method, side, token} = this.props
const {blob, documentType, id} = validCaptures[0]
this.setState({captureId: id})
if (method === 'document') {
const data = { file: blob, type: documentType, side}
if (this.state.documentValidations) {
data['sdk_validations'] = {'detect_document': 'error', 'detect_glare': 'warn'}
}
uploadDocument(data, token, this.onApiSuccess, this.onApiError)
}
else if (method === 'face') {
const data = { file: blob }
uploadLivePhoto(data, token, this.onApiSuccess, this.onApiError)
}
}
confirmAndProceed = () => {
const {method, side, nextStep, actions: {confirmCapture}} = this.props
this.clearErrors()
confirmCapture({method, id: this.state.captureId, onfidoId: this.state.onfidoId})
this.confirmEvent(method, side)
nextStep()
}
confirmEvent = (method, side) => {
if (method === 'document') {
if (side === 'front') events.emit('documentCapture')
else if (side === 'back') events.emit('documentBackCapture')
}
else if (method === 'face') events.emit('faceCapture')
}
createCapture(payload) {
const { actions, method, side } = this.props
>>>>>>>
createCaptureAndProceed(payload) {
const { actions, method, side, nextStep } = this.props
<<<<<<<
postToBackend(this.createJSONPayload(payload), token,
(response) => this.onValidationServiceResponse(payload, response),
this.onValidationServerError
)
=======
payload = {...payload, documentType}
if (this.props.useWebcam) {
postToBackend(this.createJSONPayload(payload), token,
(response) => this.onValidationServiceResponse(payload.id, response),
this.onValidationServerError
)
this.setState({documentValidations: false})
}
else {
payload = {...payload, valid: true}
}
this.createCapture(payload)
>>>>>>>
postToBackend(this.createJSONPayload(payload), token,
(response) => this.onValidationServiceResponse(payload, response),
this.onValidationServerError
)
<<<<<<<
handleFace(payload) {
this.createCaptureAndProceed({...payload, valid: true})
}
=======
>>>>>>>
handleFace(payload) {
this.createCaptureAndProceed({...payload, valid: true})
}
<<<<<<<
=======
onApiSuccess = (apiResponse) => {
this.setState({onfidoId: apiResponse.id})
const warnings = apiResponse.sdk_warnings
if (warnings && !warnings.detect_glare.valid) {
this.onGlareWarning()
}
else {
this.confirmAndProceed(apiResponse)
}
this.setState({uploadInProgress: false})
}
onfidoErrorFieldMap = ([key, val]) => {
if (key === 'document_detection') return 'INVALID_CAPTURE'
// on corrupted PDF or other unsupported file types
if (key === 'file') return 'INVALID_TYPE'
// hit on PDF/invalid file type submission for face detection
if (key === 'attachment' || key === 'attachment_content_type') return 'UNSUPPORTED_FILE'
if (key === 'face_detection') {
return val.indexOf('Multiple faces') === -1 ? 'NO_FACE_ERROR' : 'MULTIPLE_FACES_ERROR'
}
}
onfidoErrorReduce = ({fields}) => {
const [first] = Object.entries(fields).map(this.onfidoErrorFieldMap)
return first
}
onApiError = ({status, response}) => {
let errorKey;
if (status === 422){
errorKey = this.onfidoErrorReduce(response.error)
}
else {
sendError(`${status} - ${response}`)
errorKey = 'SERVER_ERROR'
}
this.setState({uploadInProgress: false})
this.setError(errorKey)
}
>>>>>>>
<<<<<<<
=======
const uploadInProgress = this.state.uploadInProgress
const onConfirm = this.state.error.type === 'warn' ?
this.confirmAndProceed : this.uploadCaptureToOnfido
>>>>>>>
<<<<<<<
<CaptureScreen {...{method, side, validCaptures, useCapture,
onScreenshot: this.onScreenshot,
onUploadFallback: this.onUploadFallback,
onImageSelected: this.onImageFileSelected,
onWebcamError: this.onWebcamError,
error: this.state.error,
...other}}/>
=======
uploadInProgress ?
<ProcessingApiRequest /> :
<CaptureScreen {...{method, side, validCaptures, useCapture,
onScreenshot: this.onScreenshot,
onUploadFallback: this.onUploadFallback,
onImageSelected: this.onImageFileSelected,
onWebcamError: this.onWebcamError,
onRetake: this.clearErrors,
onConfirm,
error: this.state.error,
...other}}/>
>>>>>>>
<CaptureScreen {...{method, side, validCaptures, useCapture,
onScreenshot: this.onScreenshot,
onUploadFallback: this.onUploadFallback,
onImageSelected: this.onImageFileSelected,
onWebcamError: this.onWebcamError,
error: this.state.error,
...other}}/> |
<<<<<<<
import { isDesktop, isHybrid, addDeviceRelatedProperties, getUnsupportedMobileBrowserError } from '~utils'
=======
import {
isDesktop,
addDeviceRelatedProperties,
getUnsupportedMobileBrowserError,
} from '~utils'
>>>>>>>
import {
isDesktop,
isHybrid,
addDeviceRelatedProperties,
getUnsupportedMobileBrowserError,
} from '~utils'
<<<<<<<
enableLiveDocumentCapture = this.props.useLiveDocumentCapture && (!isDesktop || isHybrid)
handleCapture = payload => {
=======
handleCapture = (payload) => {
>>>>>>>
enableLiveDocumentCapture =
this.props.useLiveDocumentCapture && (!isDesktop || isHybrid)
handleCapture = (payload) => {
<<<<<<<
withCrossDeviceWhenNoCamera
=======
withCrossDeviceWhenNoCamera,
withHybridDetection
>>>>>>>
withCrossDeviceWhenNoCamera |
<<<<<<<
const projects = require('../data/projects.json')
const search = require('../lib/search')
=======
const projects = require('../lib/projects')
const goodFirstIssue = require('..')
>>>>>>>
const projects = require('../data/projects.json')
const goodFirstIssue = require('..') |
<<<<<<<
buttons.push(new GalleryComponentButton({
componentType: 'Chart',
icon: 'fa fa-signal',
name: lang.chart,
tag: 'iframe',
title: lang.insert_chart,
=======
buttons.push(new Button({
componentType: 'iframe',
icon: 'charts',
name: lang.insert_chart,
>>>>>>>
buttons.push(new GalleryComponentButton({
componentType: 'Chart',
icon: 'charts',
name: lang.chart,
tag: 'iframe',
title: lang.insert_chart, |
<<<<<<<
// @compatible firefox(86.0)+violentmonkey(2.12.7)
// @compatible vivaldi(3.6.2165.40)+violentmonkey(2.12.9)
// @compatible chromium(88.0.4324.186)+violentmonkey(2.12.9) Vivaldi’s engine
=======
// @compatible opera(12.18.1872)+violentmonkey my oldest setup
>>>>>>>
// @compatible firefox(86.0)+violentmonkey(2.12.7)
// @compatible vivaldi(3.6.2165.40)+violentmonkey(2.12.9)
// @compatible chromium(88.0.4324.186)+violentmonkey(2.12.9) Vivaldi’s engine
// @compatible opera(12.18.1872)+violentmonkey my oldest setup
<<<<<<<
}
// TODO: find last page as soon as it is known
let lastPage;
=======
};
var lastPage;
>>>>>>>
};
// TODO: find last page as soon as it is known
var lastPage;
<<<<<<<
// hide caa icons (only )
css.all.insertRule("a[href$='/cover-art'] { display: none; }", 0);
// hide irrelevant pagination buttons
css.all.insertRule("div#content > form > nav > ul { display: none; }");
=======
css.all.insertRule("div#content > form > nav > ul { display: none; }", 0);
>>>>>>>
// hide caa icons (only )
css.all.insertRule("a[href$='/cover-art'] { display: none; }", 0);
// hide irrelevant pagination buttons
css.all.insertRule("div#content > form > nav > ul { display: none; }", 0);
<<<<<<<
function appendPage(page, last) {
let loading = document.getElementById(userjs.id + "loading");
=======
function appendPage(page) {
var loading = document.getElementById(userjs.id + "loading");
>>>>>>>
function appendPage(page, last) {
var loading = document.getElementById(userjs.id + "loading");
<<<<<<<
loading.lastChild.replaceChildren(document.createTextNode("Loading page " + page + (last ? "/" + last : "") + "…"));
// WORK IN PROGRESS // adapted from mb_COLLECTION-HIGHLIGHTER
var xhr = new XMLHttpRequest();
xhr.addEventListener("load", function() {
if (this.status === 200) {
var responseDOM = document.createElement("html");
responseDOM.innerHTML = this.responseText;
// append each page releases to expanding release table of page 1
var releaseTable = document.querySelector("div#content table.tbl > tbody");
var pageReleaseRows = responseDOM.querySelectorAll("div#content table.tbl > tbody > tr");
for (var r = 0; r < pageReleaseRows.length; r++) {
releaseTable.appendChild(pageReleaseRows[r].cloneNode(true));
}
// determine next page and last page
var nextPage = responseDOM.querySelector("ul.pagination > li:last-of-type > a");
// TODO: find last page as soon as it is known
var lastPage = last;
if (
nextPage
&& (nextPage = parseInt(nextPage.getAttribute("href").match(/\d+$/)[0], 10))
&& nextPage > page
) {
appendPage(nextPage, last);
} else {
// last page loaded
removeNode(loading);
}
} else {
alert("Error " + this.status + "(" + this.statusText + ") while loading page " + page + ".");
}
});
xhr.open("GET", collectionBaseURL + "?page=" + page, true);
xhr.send(null);
=======
replaceChildren(document.createTextNode("Loading page " + page + "…"), loading.lastChild);
// WORK IN PROGRESS
if (page < 5) {
setTimeout(function() { appendPage(page + 1)}, 1100);
} else {
setTimeout(function() {replaceChildren(document.createTextNode("Thanks for testing, I have yet to copy my page loader from mb_COLLECTION-HIGHLIGHTER. Stay tuned."), document.getElementById(userjs.id + "loading") ) ; }, 1000);
}
>>>>>>>
replaceChildren(document.createTextNode("Loading page " + page + (last ? "/" + last : "") + "…"), loading.lastChild);
var xhr = new XMLHttpRequest();
xhr.addEventListener("load", function() {
if (this.status === 200) {
var responseDOM = document.createElement("html");
responseDOM.innerHTML = this.responseText;
// append each page releases to expanding release table of page 1
var releaseTable = document.querySelector("div#content table.tbl > tbody");
var pageReleaseRows = responseDOM.querySelectorAll("div#content table.tbl > tbody > tr");
for (var r = 0; r < pageReleaseRows.length; r++) {
releaseTable.appendChild(pageReleaseRows[r].cloneNode(true));
}
// determine next page and last page
var nextPage = responseDOM.querySelector("ul.pagination > li:last-of-type > a");
// TODO: find last page as soon as it is known
var lastPage = last;
if (
nextPage
&& (nextPage = parseInt(nextPage.getAttribute("href").match(/\d+$/)[0], 10))
&& nextPage > page
) {
appendPage(nextPage, last);
} else {
// last page loaded
removeNode(loading);
}
} else {
alert("Error " + this.status + "(" + this.statusText + ") while loading page " + page + ".");
}
});
xhr.open("GET", collectionBaseURL + "?page=" + page, true);
xhr.send(null); |
<<<<<<<
comboTestArray.push({value: 'value ' + i, label: 'Label ' + Math.random() + ' ' + i});
=======
comboTestArray.push({value: {val: 'value ' + i, id: i}, label: 'Label ' + i});
>>>>>>>
comboTestArray.push({value: {val: 'value ' + i, id: i}, label: 'Label ' + Math.random() + i}); |
<<<<<<<
function requiresFacet(facetName) {
// 'this' refers to the Facet Class
var facetRequire = this.prototype.require;
return facetRequire && (facetRequire.indexOf(_.firstUpperCase(facetName)) >= 0
|| facetRequire.indexOf(_.firstLowerCase(facetName)) >= 0);
}
},{"../abstract/facet":2,"../messenger":47,"../util/error":64,"./c_utils":30,"mol-proto":72}],14:[function(require,module,exports){
=======
},{"../abstract/facet":2,"../messenger":47,"../util/error":66,"./c_utils":30,"mol-proto":74}],14:[function(require,module,exports){
>>>>>>>
function requiresFacet(facetName) {
// 'this' refers to the Facet Class
var facetRequire = this.prototype.require;
return facetRequire && (facetRequire.indexOf(_.firstUpperCase(facetName)) >= 0
|| facetRequire.indexOf(_.firstLowerCase(facetName)) >= 0);
}
},{"../abstract/facet":2,"../messenger":47,"../util/error":66,"./c_utils":30,"mol-proto":74}],14:[function(require,module,exports){
<<<<<<<
function _any() {
var key = Object.keys(this)[0];
return key && this[key];
}
},{"../util/check":60,"../util/error":64,"mol-proto":72}],38:[function(require,module,exports){
=======
},{"../util/check":62,"../util/error":66,"mol-proto":74}],38:[function(require,module,exports){
>>>>>>>
function _any() {
var key = Object.keys(this)[0];
return key && this[key];
}
},{"../util/check":62,"../util/error":66,"mol-proto":74}],38:[function(require,module,exports){ |
<<<<<<<
/**
* Private method
* Retrieves the data-value attribute value from the element and returns it as an index of
* the filteredOptions
*
* @param {Element} el
* @return {Number}
*/
function _getDataValueFromElement(el) {
return Number(el.getAttribute('data-value')) + this._startIndex;
}
/**
* Private method
* Sets the data of the SuperCombo, taking care to reset some things and temporarily
* unsubscribe data listeners.
*/
function _setData() {
delete this._selected.selected;
this.hideOptions();
this._comboInput.data.off('', { subscriber: onDataChange, context: this });
this.data.set(this._selected);
this.data.getMessageSource().dispatchMessage(COMBO_CHANGE_MESSAGE);
this._comboInput.data.on('', { subscriber: onDataChange, context: this });
this._selected = null;
this.setFilteredOptions(this._optionsData);
}
},{"../c_class":12,"../c_registry":28,"dot":89,"mol-proto":90}],48:[function(require,module,exports){
=======
},{"../c_class":12,"../c_registry":28,"dot":90,"mol-proto":91}],48:[function(require,module,exports){
>>>>>>>
/**
* Private method
* Retrieves the data-value attribute value from the element and returns it as an index of
* the filteredOptions
*
* @param {Element} el
* @return {Number}
*/
function _getDataValueFromElement(el) {
return Number(el.getAttribute('data-value')) + this._startIndex;
}
/**
* Private method
* Sets the data of the SuperCombo, taking care to reset some things and temporarily
* unsubscribe data listeners.
*/
function _setData() {
delete this._selected.selected;
this.hideOptions();
this._comboInput.data.off('', { subscriber: onDataChange, context: this });
this.data.set(this._selected);
this.data.getMessageSource().dispatchMessage(COMBO_CHANGE_MESSAGE);
this._comboInput.data.on('', { subscriber: onDataChange, context: this });
this._selected = null;
this.setFilteredOptions(this._optionsData);
}
},{"../c_class":12,"../c_registry":28,"dot":90,"mol-proto":91}],48:[function(require,module,exports){ |
<<<<<<<
function _setMessageSource(messageSource) {
this._messenger._setMessageSource(messageSource);
}
function _createMessageSource(MessageSourceClass) {
var messageSource = new MessageSourceClass(this, undefined, this.owner);
this._setMessageSource(messageSource)
Object.defineProperty(this, '_messageSource', { value: messageSource });
}
},{"../facets/f_class":27,"../messenger":32,"../util/error":36,"mol-proto":41}],10:[function(require,module,exports){
=======
},{"../facets/f_class":28,"../messenger":33,"../util/error":37,"mol-proto":42}],10:[function(require,module,exports){
>>>>>>>
function _setMessageSource(messageSource) {
this._messenger._setMessageSource(messageSource);
}
function _createMessageSource(MessageSourceClass) {
var messageSource = new MessageSourceClass(this, undefined, this.owner);
this._setMessageSource(messageSource)
Object.defineProperty(this, '_messageSource', { value: messageSource });
}
},{"../facets/f_class":28,"../messenger":33,"../util/error":37,"mol-proto":42}],10:[function(require,module,exports){
<<<<<<<
},{"../c_facet":9,"../c_message_sources/dom_events_source":22,"./cf_registry":19,"mol-proto":41}],14:[function(require,module,exports){
=======
},{"../c_facet":9,"./cf_registry":19,"mol-proto":42}],14:[function(require,module,exports){
>>>>>>>
},{"../c_facet":9,"../c_message_sources/dom_events_source":22,"./cf_registry":19,"mol-proto":42}],14:[function(require,module,exports){
<<<<<<<
function _setMessageSource(messageSource) {
check(messageSource, MessageSource);
Object.defineProperties(this, {
_messageSource: { value: messageSource }
});
messageSource.messenger = this;
}
},{"../abstract/mixin":1,"../util/check":35,"../util/error":36,"./message_source":33,"mol-proto":41}],33:[function(require,module,exports){
=======
},{"../abstract/mixin":1,"../util/check":36,"../util/error":37,"./message_source":34,"mol-proto":42}],34:[function(require,module,exports){
>>>>>>>
function _setMessageSource(messageSource) {
check(messageSource, MessageSource);
Object.defineProperties(this, {
_messageSource: { value: messageSource }
});
messageSource.messenger = this;
}
},{"../abstract/mixin":1,"../util/check":36,"../util/error":37,"./message_source":34,"mol-proto":42}],34:[function(require,module,exports){ |
<<<<<<<
},{}],20:[function(require,module,exports){
// In browserify context, fall back to a no op.
=======
},{}],16:[function(require,module,exports){
// In browserify context, fall back to a no op.
>>>>>>>
},{}],20:[function(require,module,exports){
// In browserify context, fall back to a no op.
<<<<<<<
},{"indices-permutations":11,"multidim-array-index":24}],24:[function(require,module,exports){
arguments[4][22][0].apply(exports,arguments)
},{"dup":22}],25:[function(require,module,exports){
const CayleyDickson = require('cayley-dickson')
const createScalar = require('./createScalar')
const no = require('not-defined')
=======
},{"indices-permutations":7,"multidim-array-index":20}],20:[function(require,module,exports){
arguments[4][18][0].apply(exports,arguments)
},{"dup":18}],21:[function(require,module,exports){
var CayleyDickson = require('cayley-dickson')
var createScalar = require('./createScalar')
var no = require('not-defined')
>>>>>>>
},{"indices-permutations":11,"multidim-array-index":24}],24:[function(require,module,exports){
arguments[4][22][0].apply(exports,arguments)
},{"dup":22}],25:[function(require,module,exports){
var CayleyDickson = require('cayley-dickson')
var createScalar = require('./createScalar')
var no = require('not-defined')
<<<<<<<
},{"./createScalar":31,"cayley-dickson":6,"not-defined":18}],26:[function(require,module,exports){
const algebraCyclic = require('algebra-cyclic')
const createScalar = require('./createScalar')
=======
},{"./createScalar":27,"cayley-dickson":6,"not-defined":14}],22:[function(require,module,exports){
var algebraCyclic = require('algebra-cyclic')
var createScalar = require('./createScalar')
>>>>>>>
},{"./createScalar":31,"cayley-dickson":6,"not-defined":18}],26:[function(require,module,exports){
var algebraCyclic = require('algebra-cyclic')
var createScalar = require('./createScalar')
<<<<<<<
},{"./createScalar":31,"algebra-cyclic":1}],27:[function(require,module,exports){
const determinant = require('laplace-determinant')
const inherits = require('inherits')
const itemsPool = require('./itemsPool')
const matrixMultiplication = require('matrix-multiplication')
const multiDimArrayIndex = require('multidim-array-index')
const no = require('not-defined')
const operators = require('./operators.json')
const staticProps = require('static-props')
const TensorSpace = require('./TensorSpace')
const tensorContraction = require('tensor-contraction')
const toData = require('./toData')
=======
},{"./createScalar":27,"algebra-cyclic":1}],23:[function(require,module,exports){
var determinant = require('laplace-determinant')
var inherits = require('inherits')
var itemsPool = require('./itemsPool')
var matrixMultiplication = require('matrix-multiplication')
var multiDimArrayIndex = require('multidim-array-index')
var no = require('not-defined')
var operators = require('./operators.json')
var staticProps = require('static-props')
var TensorSpace = require('./TensorSpace')
var tensorContraction = require('tensor-contraction')
var toData = require('./toData')
>>>>>>>
},{"./createScalar":31,"algebra-cyclic":1}],27:[function(require,module,exports){
var determinant = require('laplace-determinant')
var inherits = require('inherits')
var itemsPool = require('./itemsPool')
var matrixMultiplication = require('matrix-multiplication')
var multiDimArrayIndex = require('multidim-array-index')
var no = require('not-defined')
var operators = require('./operators.json')
var staticProps = require('static-props')
var TensorSpace = require('./TensorSpace')
var tensorContraction = require('tensor-contraction')
var toData = require('./toData')
<<<<<<<
},{"./TensorSpace":28,"./itemsPool":32,"./operators.json":33,"./toData":35,"inherits":12,"laplace-determinant":13,"matrix-multiplication":14,"multidim-array-index":16,"not-defined":18,"static-props":19,"tensor-contraction":21}],28:[function(require,module,exports){
const operators = require('./operators.json')
const staticProps = require('static-props')
const toData = require('./toData')
const tensorProduct = require('tensor-product')
=======
},{"./TensorSpace":24,"./itemsPool":28,"./operators.json":29,"./toData":31,"inherits":8,"laplace-determinant":9,"matrix-multiplication":10,"multidim-array-index":12,"not-defined":14,"static-props":15,"tensor-contraction":17}],24:[function(require,module,exports){
var operators = require('./operators.json')
var staticProps = require('static-props')
var toData = require('./toData')
var tensorProduct = require('tensor-product')
>>>>>>>
},{"./TensorSpace":28,"./itemsPool":32,"./operators.json":33,"./toData":35,"inherits":12,"laplace-determinant":13,"matrix-multiplication":14,"multidim-array-index":16,"not-defined":18,"static-props":19,"tensor-contraction":21}],28:[function(require,module,exports){
var operators = require('./operators.json')
var staticProps = require('static-props')
var toData = require('./toData')
var tensorProduct = require('tensor-product')
<<<<<<<
},{"./operators.json":33,"./toData":35,"static-props":19,"tensor-product":23}],29:[function(require,module,exports){
const inherits = require('inherits')
const itemsPool = require('./itemsPool')
const matrixMultiplication = require('matrix-multiplication')
const operators = require('./operators.json')
const staticProps = require('static-props')
const TensorSpace = require('./TensorSpace')
const toData = require('./toData')
=======
},{"./operators.json":29,"./toData":31,"static-props":15,"tensor-product":19}],25:[function(require,module,exports){
var inherits = require('inherits')
var itemsPool = require('./itemsPool')
var matrixMultiplication = require('matrix-multiplication')
var operators = require('./operators.json')
var staticProps = require('static-props')
var TensorSpace = require('./TensorSpace')
var toData = require('./toData')
>>>>>>>
},{"./operators.json":33,"./toData":35,"static-props":19,"tensor-product":23}],29:[function(require,module,exports){
var inherits = require('inherits')
var itemsPool = require('./itemsPool')
var matrixMultiplication = require('matrix-multiplication')
var operators = require('./operators.json')
var staticProps = require('static-props')
var TensorSpace = require('./TensorSpace')
var toData = require('./toData')
<<<<<<<
},{"./toData":35}],31:[function(require,module,exports){
const coerced = require('./coerced')
const operators = require('./operators.json')
const staticProps = require('static-props')
const toData = require('./toData')
=======
},{"./toData":31}],27:[function(require,module,exports){
var coerced = require('./coerced')
var operators = require('./operators.json')
var staticProps = require('static-props')
var toData = require('./toData')
>>>>>>>
},{"./toData":35}],31:[function(require,module,exports){
var coerced = require('./coerced')
var operators = require('./operators.json')
var staticProps = require('static-props')
var toData = require('./toData')
<<<<<<<
},{"./coerced":30,"./operators.json":33,"./toData":35,"static-props":19}],32:[function(require,module,exports){
const itemsPool = new Map()
=======
},{"./coerced":26,"./operators.json":29,"./toData":31,"static-props":15}],28:[function(require,module,exports){
var itemsPool = new Map()
>>>>>>>
},{"./coerced":30,"./operators.json":33,"./toData":35,"static-props":19}],32:[function(require,module,exports){
var itemsPool = new Map()
<<<<<<<
},{}],34:[function(require,module,exports){
const realField = {
=======
},{}],30:[function(require,module,exports){
var realField = {
>>>>>>>
},{}],34:[function(require,module,exports){
var realField = {
<<<<<<<
},{}],35:[function(require,module,exports){
const no = require('not-defined')
=======
},{}],31:[function(require,module,exports){
var no = require('not-defined')
>>>>>>>
},{}],35:[function(require,module,exports){
var no = require('not-defined') |
<<<<<<<
const { format, outDir, input, roots, excludes, modelsOnly, forceAll, noReact } = mergeConfigs(args, config);
=======
const format = args["--format"] || "js"
const outDir = path.resolve(process.cwd(), args["--outDir"] || "src/models")
const input = args._[0] || "graphql-schema.json"
const roots = args["--roots"]
? args["--roots"].split(",").map(s => s.trim())
: []
const excludes = args["--excludes"]
? args["--excludes"].split(",").map(s => s.trim())
: []
const modelsOnly = !!args["--modelsOnly"]
const forceAll = !!args["--force"]
const noReact = !!args["--noReact"]
const separate = !!args["--separate"]
>>>>>>>
const { format, outDir, input, roots, excludes, modelsOnly, forceAll, noReact } = mergeConfigs(args, config);
const separate = !!args["--separate"] |
<<<<<<<
/* ========================================================================
* bootstrap-tour - v0.9.0
* http://bootstraptour.com
* ========================================================================
* Copyright 2012-2013 Ulrich Sossou
*
* ========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================================
*/
=======
====================================================
# bootstrap-tour - v0.9.0
# http://bootstraptour.com
# ==============================================================
# Copyright 2012-2013 Ulrich Sossou
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
*/
=======
/* ===========================================================
# bootstrap-tour - v0.9.3
# http://bootstraptour.com
# ==============================================================
# Copyright 2012-2013 Ulrich Sossou
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
*/
>>>>>>>
/* ========================================================================
* bootstrap-tour - v0.9.3
* http://bootstraptour.com
* ========================================================================
* Copyright 2012-2013 Ulrich Sossou
*
* ========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================================
*/
<<<<<<<
basePath: '',
template: '<div class="popover"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">« Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next »</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
=======
delay: false,
basePath: "",
template: "<div class='popover' role='tooltip'> <div class='arrow'></div> <h3 class='popover-title'></h3> <div class='popover-content'></div> <div class='popover-navigation'> <div class='btn-group'> <button class='btn btn-sm btn-default' data-role='prev'>« Prev</button> <button class='btn btn-sm btn-default' data-role='next'>Next »</button> <button class='btn btn-sm btn-default' data-role='pause-resume' data-pause-text='Pause' data-resume-text='Resume'>Pause</button> </div> <button class='btn btn-sm btn-default' data-role='end'>End tour</button> </div> </div>",
>>>>>>>
delay: false,
basePath: '',
template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">« Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next »</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
<<<<<<<
this._removeState('current_step');
this._removeState('end');
this.setCurrentStep(0);
=======
this._removeState("current_step");
this._removeState("end");
>>>>>>>
this._removeState('current_step');
this._removeState('end');
<<<<<<<
switch (toString.call(step.path)) {
case '[object Function]':
=======
switch ({}.toString.call(step.path)) {
case "[object Function]":
>>>>>>>
switch ({}.toString.call(step.path)) {
case '[object Function]':
<<<<<<<
return (path != null) && path !== '' && ((toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || (toString.call(path) === '[object String]' && path.replace(/\?.*$/, '').replace(/\/?$/, '') !== currentPath.replace(/\/?$/, '')));
=======
return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
>>>>>>>
return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path.replace(/\?.*$/, '').replace(/\/?$/, '') !== currentPath.replace(/\/?$/, '')));
<<<<<<<
$template = $.isFunction(step.template) ? $(step.template(i, step)) : $(step.template);
$navigation = $template.find('.popover-navigation');
=======
>>>>>>>
<<<<<<<
step.element = 'body';
step.placement = 'top';
$template = $template.addClass('orphan');
=======
step.element = "body";
step.placement = "top";
>>>>>>>
step.element = 'body';
step.placement = 'top'; |
<<<<<<<
/* ========================================================================
* bootstrap-tour - v0.9.0
* http://bootstraptour.com
* ========================================================================
* Copyright 2012-2013 Ulrich Sossou
*
* ========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================================
*/
=======
====================================================
# bootstrap-tour - v0.9.0
# http://bootstraptour.com
# ==============================================================
# Copyright 2012-2013 Ulrich Sossou
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
*/
=======
/* ===========================================================
# bootstrap-tour - v0.9.3
# http://bootstraptour.com
# ==============================================================
# Copyright 2012-2013 Ulrich Sossou
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
*/
>>>>>>>
/* ========================================================================
* bootstrap-tour - v0.9.3
* http://bootstraptour.com
* ========================================================================
* Copyright 2012-2013 Ulrich Sossou
*
* ========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================================
*/
<<<<<<<
basePath: '',
template: '<div class="popover"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">« Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next »</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
=======
delay: false,
basePath: "",
template: "<div class='popover' role='tooltip'> <div class='arrow'></div> <h3 class='popover-title'></h3> <div class='popover-content'></div> <div class='popover-navigation'> <div class='btn-group'> <button class='btn btn-sm btn-default' data-role='prev'>« Prev</button> <button class='btn btn-sm btn-default' data-role='next'>Next »</button> <button class='btn btn-sm btn-default' data-role='pause-resume' data-pause-text='Pause' data-resume-text='Resume'>Pause</button> </div> <button class='btn btn-sm btn-default' data-role='end'>End tour</button> </div> </div>",
>>>>>>>
delay: false,
basePath: '',
template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">« Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next »</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
<<<<<<<
this._removeState('current_step');
this._removeState('end');
this.setCurrentStep(0);
=======
this._removeState("current_step");
this._removeState("end");
>>>>>>>
this._removeState('current_step');
this._removeState('end');
<<<<<<<
switch (toString.call(step.path)) {
case '[object Function]':
=======
switch ({}.toString.call(step.path)) {
case "[object Function]":
>>>>>>>
switch ({}.toString.call(step.path)) {
case '[object Function]':
<<<<<<<
return (path != null) && path !== '' && ((toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || (toString.call(path) === '[object String]' && path.replace(/\?.*$/, '').replace(/\/?$/, '') !== currentPath.replace(/\/?$/, '')));
=======
return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
>>>>>>>
return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path.replace(/\?.*$/, '').replace(/\/?$/, '') !== currentPath.replace(/\/?$/, '')));
<<<<<<<
$template = $.isFunction(step.template) ? $(step.template(i, step)) : $(step.template);
$navigation = $template.find('.popover-navigation');
=======
>>>>>>>
<<<<<<<
step.element = 'body';
step.placement = 'top';
$template = $template.addClass('orphan');
=======
step.element = "body";
step.placement = "top";
>>>>>>>
step.element = 'body';
step.placement = 'top'; |
<<<<<<<
test("Tour.getState should return null after Tour.removeState with null value using cookies", function() {
this.tour = new Tour({
useLocalStorage: false
});
this.tour.setState("test", "test");
this.tour.removeState("test");
return strictEqual(this.tour.getState("test"), null, "tour returns null after null setState");
});
test("Tour.getState should return null after Tour.removeState with null value using localStorage", function() {
this.tour = new Tour({
useLocalStorage: true
});
this.tour.setState("test", "test");
this.tour.removeState("test");
return strictEqual(this.tour.getState("test"), null, "tour returns null after null setState");
});
test("Tour.removeState should call afterRemoveState callback", function() {
var sentinel;
sentinel = false;
this.tour = new Tour({
afterRemoveState: function() {
return sentinel = true;
}
});
this.tour.removeState("current_step");
return strictEqual(sentinel, true, "removeState calls callback");
});
=======
test("Tour shouldn't move to the next state until the onShow promise is resolved", function() {
var deferred;
this.tour = new Tour();
deferred = $.Deferred();
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture")
});
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture"),
onShow: function() {
return deferred;
}
});
this.tour.start();
this.tour.next();
strictEqual(this.tour._current, 0, "tour shows old state until resolving of onShow promise");
deferred.resolve();
return strictEqual(this.tour._current, 1, "tour shows new state after resolving onShow promise");
});
test("Tour shouldn't hide popover until the onHide promise is resolved", function() {
var deferred;
this.tour = new Tour();
deferred = $.Deferred();
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture"),
onHide: function() {
return deferred;
}
});
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture")
});
this.tour.start();
this.tour.next();
strictEqual(this.tour._current, 0, "tour shows old state until resolving of onHide promise");
deferred.resolve();
return strictEqual(this.tour._current, 1, "tour shows new state after resolving onShow promise");
});
test("Tour shouldn't start until the onStart promise is resolved", function() {
var deferred;
deferred = $.Deferred();
this.tour = new Tour({
onStart: function() {
return deferred;
}
});
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture")
});
this.tour.start();
strictEqual($(".popover").length, 0, "Tour does not start before onStart promise is resolved");
deferred.resolve();
return strictEqual($(".popover").length, 1, "Tour starts after onStart promise is resolved");
});
>>>>>>>
test("Tour.getState should return null after Tour.removeState with null value using cookies", function() {
this.tour = new Tour({
useLocalStorage: false
});
this.tour.setState("test", "test");
this.tour.removeState("test");
return strictEqual(this.tour.getState("test"), null, "tour returns null after null setState");
});
test("Tour.getState should return null after Tour.removeState with null value using localStorage", function() {
this.tour = new Tour({
useLocalStorage: true
});
this.tour.setState("test", "test");
this.tour.removeState("test");
return strictEqual(this.tour.getState("test"), null, "tour returns null after null setState");
});
test("Tour.removeState should call afterRemoveState callback", function() {
var sentinel;
sentinel = false;
this.tour = new Tour({
afterRemoveState: function() {
return sentinel = true;
}
});
this.tour.removeState("current_step");
return strictEqual(sentinel, true, "removeState calls callback");
});
test("Tour shouldn't move to the next state until the onShow promise is resolved", function() {
var deferred;
this.tour = new Tour();
deferred = $.Deferred();
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture")
});
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture"),
onShow: function() {
return deferred;
}
});
this.tour.start();
this.tour.next();
strictEqual(this.tour._current, 0, "tour shows old state until resolving of onShow promise");
deferred.resolve();
return strictEqual(this.tour._current, 1, "tour shows new state after resolving onShow promise");
});
test("Tour shouldn't hide popover until the onHide promise is resolved", function() {
var deferred;
this.tour = new Tour();
deferred = $.Deferred();
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture"),
onHide: function() {
return deferred;
}
});
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture")
});
this.tour.start();
this.tour.next();
strictEqual(this.tour._current, 0, "tour shows old state until resolving of onHide promise");
deferred.resolve();
return strictEqual(this.tour._current, 1, "tour shows new state after resolving onShow promise");
});
test("Tour shouldn't start until the onStart promise is resolved", function() {
var deferred;
deferred = $.Deferred();
this.tour = new Tour({
onStart: function() {
return deferred;
}
});
this.tour.addStep({
element: $("<div></div>").appendTo("#qunit-fixture")
});
this.tour.start();
strictEqual($(".popover").length, 0, "Tour does not start before onStart promise is resolved");
deferred.resolve();
return strictEqual($(".popover").length, 1, "Tour starts after onStart promise is resolved");
}); |
<<<<<<<
* bootstrap-tour - v0.9.0
* http://bootstraptour.com
* ========================================================================
* Copyright 2012-2013 Ulrich Sossou
*
* ========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================================
*/
/* ========================================================================
* Bootstrap: tooltip.js v3.2.0
=======
* Bootstrap: transition.js v3.1.1
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
+function ($) {
'use strict';
// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
// ============================================================
function transitionEnd() {
var el = document.createElement('bootstrap')
var transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd',
'MozTransition' : 'transitionend',
'OTransition' : 'oTransitionEnd otransitionend',
'transition' : 'transitionend'
}
for (var name in transEndEventNames) {
if (el.style[name] !== undefined) {
return { end: transEndEventNames[name] }
}
}
return false // explicit for ie8 ( ._.)
}
// http://blog.alexmaccaw.com/css-transitions
$.fn.emulateTransitionEnd = function (duration) {
var called = false, $el = this
$(this).one($.support.transition.end, function () { called = true })
var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
setTimeout(callback, duration)
return this
}
$(function () {
$.support.transition = transitionEnd()
})
}(jQuery);
/* ========================================================================
* Bootstrap: tooltip.js v3.1.1
>>>>>>>
* bootstrap-tour - v0.9.3
* http://bootstraptour.com
* ========================================================================
* Copyright 2012-2013 Ulrich Sossou
*
* ========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================================
*/
/* ========================================================================
* Bootstrap: tooltip.js v3.2.0
<<<<<<<
* Bootstrap: popover.js v3.2.0
=======
* Bootstrap: popover.js v3.1.1
>>>>>>>
* Bootstrap: popover.js v3.2.0
<<<<<<<
basePath: '',
template: '<div class="popover"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">« Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next »</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
=======
delay: false,
basePath: "",
template: "<div class='popover' role='tooltip'> <div class='arrow'></div> <h3 class='popover-title'></h3> <div class='popover-content'></div> <div class='popover-navigation'> <div class='btn-group'> <button class='btn btn-sm btn-default' data-role='prev'>« Prev</button> <button class='btn btn-sm btn-default' data-role='next'>Next »</button> <button class='btn btn-sm btn-default' data-role='pause-resume' data-pause-text='Pause' data-resume-text='Resume'>Pause</button> </div> <button class='btn btn-sm btn-default' data-role='end'>End tour</button> </div> </div>",
>>>>>>>
delay: false,
basePath: '',
template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">« Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next »</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
<<<<<<<
this._removeState('current_step');
this._removeState('end');
this.setCurrentStep(0);
=======
this._removeState("current_step");
this._removeState("end");
>>>>>>>
this._removeState('current_step');
this._removeState('end');
<<<<<<<
switch (toString.call(step.path)) {
case '[object Function]':
=======
switch ({}.toString.call(step.path)) {
case "[object Function]":
>>>>>>>
switch ({}.toString.call(step.path)) {
case '[object Function]':
<<<<<<<
return (path != null) && path !== '' && ((toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || (toString.call(path) === '[object String]' && path.replace(/\?.*$/, '').replace(/\/?$/, '') !== currentPath.replace(/\/?$/, '')));
=======
return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
>>>>>>>
return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path.replace(/\?.*$/, '').replace(/\/?$/, '') !== currentPath.replace(/\/?$/, '')));
<<<<<<<
$template = $.isFunction(step.template) ? $(step.template(i, step)) : $(step.template);
$navigation = $template.find('.popover-navigation');
=======
>>>>>>>
<<<<<<<
step.element = 'body';
step.placement = 'top';
$template = $template.addClass('orphan');
=======
step.element = "body";
step.placement = "top";
>>>>>>>
step.element = 'body';
step.placement = 'top'; |
<<<<<<<
template: "<div class='popover tour'> <div class='arrow'></div> <h3 class='popover-title'></h3> <div class='popover-content'></div> <div class='popover-navigation'> <a class='prev'>« Prev</a> <span class='separator'>|</span> <a class='next'>Next »</a> <a class='end'>End tour</a> </div> </div>",
=======
labels: {
end: 'End tour',
next: 'Next »',
prev: '« Prev'
},
>>>>>>>
<<<<<<<
var $tip, options, rendered,
=======
var $element, $tip, content, options,
>>>>>>>
var $element, $tip, options, rendered,
<<<<<<<
rendered = this._renderNavigation(step, options);
$(step.element).popover('destroy').popover({
=======
content += this._renderNavigation(step, options);
$element = $(step.element);
if ($element.data('popover')) {
$element.popover('destroy');
}
$element.popover({
>>>>>>>
rendered = this._renderNavigation(step, options);
$element = $(step.element);
if ($element.data('popover')) {
$element.popover('destroy');
}
$element.popover({
<<<<<<<
template: rendered,
=======
template: step.template(i, step),
>>>>>>>
template: rendered, |
<<<<<<<
showStepHelper = function(e) {
var current_path, path;
_this.setCurrentStep(i);
path = (function() {
switch ({}.toString.call(step.path)) {
case "[object Function]":
return step.path();
case "[object String]":
return this._options.basePath + step.path;
default:
return step.path;
}
}).call(_this);
current_path = [document.location.pathname, document.location.hash].join("");
if (_this._isRedirect(path, current_path)) {
_this._redirect(step, path);
return;
}
if (_this._isOrphan(step)) {
if (!step.orphan) {
_this._debug("Skip the orphan step " + (_this._current + 1) + ". Orphan option is false and the element doesn't exist or is hidden.");
if (skipToPrevious) {
_this._showPrevStep();
} else {
_this._showNextStep();
=======
showStepHelper = (function(_this) {
return function(e) {
var current_path, path;
_this.setCurrentStep(i);
path = (function() {
switch (toString.call(step.path)) {
case "[object Function]":
return step.path();
case "[object String]":
return this._options.basePath + step.path;
default:
return step.path;
>>>>>>>
showStepHelper = (function(_this) {
return function(e) {
var current_path, path;
_this.setCurrentStep(i);
path = (function() {
switch ({}.toString.call(step.path)) {
case "[object Function]":
return step.path();
case "[object String]":
return this._options.basePath + step.path;
default:
return step.path; |
<<<<<<<
listener = self.addEventListener("message", evt =>
{
if (evt.data.source === "apollo-devtools-proxy" && evt.data.payload) {
=======
self.addEventListener('message', evt => {
if (evt.data.source === 'apollo-devtools-proxy') {
>>>>>>>
listener = self.addEventListener('message', evt => {
if (evt.data.source === 'apollo-devtools-proxy') {
<<<<<<<
bridge.on("shutdown", () => {
self.removeEventListener('message', listener);
});
=======
bridge.on('init', () => {
sendBridgeReady();
});
>>>>>>>
bridge.on('init', () => {
sendBridgeReady();
});
bridge.on("shutdown", () => {
self.removeEventListener('message', listener);
}); |
<<<<<<<
// Note: Snapshots have 1-based ids.
Blockchain.prototype.snapshot = function() {
this.snapshots.push(this.stateTrie.root);
console.log("Saved snapshot #" + this.snapshots.length);
return this.toHex(this.snapshots.length);
};
Blockchain.prototype.revert = function(snapshot_id) {
// Convert from hex.
snapshot_id = utils.bufferToInt(snapshot_id);
console.log("Reverting to snapshot #" + snapshot_id);
if (snapshot_id > this.snapshots.length) {
return false;
}
// Convert to zero based.
snapshot_id = snapshot_id - 1;
// Revert to previous state.
this.stateTrie.root = this.snapshots[snapshot_id];
// Remove all snapshots after and including the one we reverted to.
this.snapshots.splice(snapshot_id);
return true;
};
=======
Blockchain.prototype.updateCurrentTime = function() {
var block = this.latestBlock();
block.header.timestamp = this.toHex(this.currentTime());
}
>>>>>>>
// Note: Snapshots have 1-based ids.
Blockchain.prototype.snapshot = function() {
this.snapshots.push(this.stateTrie.root);
console.log("Saved snapshot #" + this.snapshots.length);
return this.toHex(this.snapshots.length);
};
Blockchain.prototype.revert = function(snapshot_id) {
// Convert from hex.
snapshot_id = utils.bufferToInt(snapshot_id);
console.log("Reverting to snapshot #" + snapshot_id);
if (snapshot_id > this.snapshots.length) {
return false;
}
// Convert to zero based.
snapshot_id = snapshot_id - 1;
// Revert to previous state.
this.stateTrie.root = this.snapshots[snapshot_id];
// Remove all snapshots after and including the one we reverted to.
this.snapshots.splice(snapshot_id);
return true;
};
Blockchain.prototype.updateCurrentTime = function() {
var block = this.latestBlock();
block.header.timestamp = this.toHex(this.currentTime());
} |
<<<<<<<
for (y = y; y <= canvas.height - (height * 3); y += increment) {
imageMode && Math.floor(y % imageFrequency) == 0 && ctx.drawImage(canvasImage, x - (imageSize / 4), y , imageSize, imageSize);
=======
for (; y <= canvas.height - (height * 3); y += increment) {
>>>>>>>
for (; y <= canvas.height - (height * 3); y += increment) {
imageMode && Math.floor(y % imageFrequency) == 0 && ctx.drawImage(canvasImage, x - (imageSize / 4), y , imageSize, imageSize);
<<<<<<<
for (x = x; x >= (height * 3); x -= increment) {
imageMode && Math.floor(x % imageFrequency) == 0 && ctx.drawImage(canvasImage, x, y - (imageSize / 4 ) , imageSize, imageSize);
=======
for (; x >= (height * 3); x -= increment) {
>>>>>>>
for (; x >= (height * 3); x -= increment) {
imageMode && Math.floor(x % imageFrequency) == 0 && ctx.drawImage(canvasImage, x, y - (imageSize / 4 ) , imageSize, imageSize);
<<<<<<<
for (y = y; y >= (height * 2) + thickness; y -= increment) {
imageMode && Math.floor(y % imageFrequency) == 0 && ctx.drawImage(canvasImage, x + (imageSize / 8), y , imageSize, imageSize);
=======
for (; y >= (height * 2) + thickness; y -= increment) {
>>>>>>>
for (; y >= (height * 2) + thickness; y -= increment) {
imageMode && Math.floor(y % imageFrequency) == 0 && ctx.drawImage(canvasImage, x + (imageSize / 8), y , imageSize, imageSize); |
<<<<<<<
addOfflinePack, resumeOfflinePack, suspendOfflinePack, getOfflinePacks, removeOfflinePack,
=======
setConnected,
initializeOfflinePacks,
addOfflinePack,
getOfflinePacks,
removeOfflinePack,
>>>>>>>
setConnected,
initializeOfflinePacks,
addOfflinePack,
getOfflinePacks,
removeOfflinePack,
resumeOfflinePack,
suspendOfflinePack, |
<<<<<<<
import { setElementregistry, getElementRegistry } from '../../../app/domain-story-modeler/features/canvasElements/canvasElementRegistry';
=======
import { activateTestMode } from '../../../app/domain-story-modeler/language/testmode';
import { initTypeDictionaries } from '../../../app/domain-story-modeler/language/icon/dictionaries';
>>>>>>>
import { initTypeDictionaries } from '../../../app/domain-story-modeler/language/icon/dictionaries';
import { setElementregistry, getElementRegistry } from '../../../app/domain-story-modeler/features/canvasElements/canvasElementRegistry'; |
<<<<<<<
import { initActorIconDictionary } from '../../../app/domain-story-modeler/language/icon/actorIconDictionary';
=======
import { activateTestMode } from '../../../app/domain-story-modeler/language/testmode';
import { initTypeDictionaries } from '../../../app/domain-story-modeler/language/icon/dictionaries';
>>>>>>>
import { initTypeDictionaries } from '../../../app/domain-story-modeler/language/icon/dictionaries'; |
<<<<<<<
=======
this.offlineDirty = false;
this.hasProvider = false;
>>>>>>>
this.hasProvider = false; |
<<<<<<<
import fragmentShader from "./destinationnode.frag";
import vertexShader from "./destinationnode.vert";
=======
const TYPE = "DestinationNode";
>>>>>>>
import fragmentShader from "./destinationnode.frag";
import vertexShader from "./destinationnode.vert";
const TYPE = "DestinationNode"; |
<<<<<<<
var _containerDOM = map._containerDOM;
preventDefault(evt);
stopPropagation(evt);
if (map._zooming) {
return false;
}
var _levelValue = 0;
_levelValue += (evt.wheelDelta ? evt.wheelDelta : evt.detail) > 0 ? 1 : -1;
=======
var container = map._containerDOM;
maptalks.DomUtil.preventDefault(evt);
maptalks.DomUtil.stopPropagation(evt);
if (map._zooming) { return false; }
var levelValue = (evt.wheelDelta ? evt.wheelDelta : evt.detail) > 0 ? 1 : -1;
>>>>>>>
var container = map._containerDOM;
preventDefault(evt);
stopPropagation(evt);
if (map._zooming) { return false; }
var levelValue = (evt.wheelDelta ? evt.wheelDelta : evt.detail) > 0 ? 1 : -1;
<<<<<<<
var mouseOffset = getEventContainerPoint(evt, _containerDOM);
if (this._wheelExecutor) {
clearTimeout(this._wheelExecutor);
=======
var mouseOffset = maptalks.DomUtil.getEventContainerPoint(evt, container);
if (this._scrollZoomFrame) {
maptalks.Util.cancelAnimFrame(this._scrollZoomFrame);
>>>>>>>
var mouseOffset = getEventContainerPoint(evt, container);
if (this._scrollZoomFrame) {
cancelAnimFrame(this._scrollZoomFrame);
<<<<<<<
/*_onWheelScroll: function (evt) {
var map = this.target;
var containerDOM = map._containerDOM;
preventDefault(evt);
stopPropagation(evt);
if (map._zooming || this._scaling) {return;}
if (this._wheelExecutor) {
clearTimeout(this._wheelExecutor);
}
this._scaling = true;
var level = 0;
level += (evt.wheelDelta?evt.wheelDelta:evt.detail) > 0 ? 1 : -1;
if (evt.detail) {
level *= -1;
}
var zoomPoint = getEventContainerPoint(evt, containerDOM);
if (isNil(this._targetZoom)) {
this._targetZoom = map.getZoom();
}
var preZoom = this._targetZoom;
this._targetZoom += level;
this._targetZoom = map._checkZoomLevel(this._targetZoom);
var scale = map._getResolution(map.getZoom())/map._getResolution(this._targetZoom);
var preScale = map._getResolution(map.getZoom())/map._getResolution(preZoom);
var render = map._getRenderer();
var me = this;
render.animateZoom(preScale, scale, zoomPoint, 100, function() {
me._scaling = false;
map._zoom(me._targetZoom, zoomPoint);
me._wheelExecutor = setTimeout(function () {
map.onZoomEnd(me._targetZoom);
delete me._targetZoom;
},100);
});
return false;
}*/
=======
>>>>>>> |
<<<<<<<
var MatrixSubView = require('./views/sub');
var MatrixSelectionView = require('./views/selection');
=======
var MatrixColumnView = require('./views/column');
var MatrixFlipRowView = require('./views/flipRow');
var MatrixFlipColumnView = require('./views/flipColumn');
>>>>>>>
var MatrixSubView = require('./views/sub');
var MatrixSelectionView = require('./views/selection');
var MatrixColumnView = require('./views/column');
var MatrixFlipRowView = require('./views/flipRow');
var MatrixFlipColumnView = require('./views/flipColumn');
<<<<<<<
util.checkRange(this, startRow, endRow, startColumn, endColumn);
var newMatrix = new this.constructor(endRow - startRow + 1, endColumn - startColumn + 1);
=======
if ((startRow > endRow) || (startColumn > endColumn) || (startRow < 0) || (startRow >= this.rows) || (endRow < 0) || (endRow >= this.rows) || (startColumn < 0) || (startColumn >= this.columns) || (endColumn < 0) || (endColumn >= this.columns)) {
throw new RangeError('Argument out of range');
}
var newMatrix = new this.constructor[Symbol.species](endRow - startRow + 1, endColumn - startColumn + 1);
>>>>>>>
util.checkRange(this, startRow, endRow, startColumn, endColumn);
var newMatrix = new this.constructor[Symbol.species](endRow - startRow + 1, endColumn - startColumn + 1);
<<<<<<<
subMatrixView(startRow, endRow, startColumn, endColumn) {
return new MatrixSubView(this, startRow, endRow, startColumn, endColumn);
}
selectionView(rowIndices, columnIndices) {
return new MatrixSelectionView(this, rowIndices, columnIndices);
}
=======
columnView(column) {
util.checkColumnIndex(this, column);
return new MatrixColumnView(this, column);
}
flipRowView() {
return new MatrixFlipRowView(this);
}
flipColumnView() {
return new MatrixFlipColumnView(this);
}
>>>>>>>
columnView(column) {
util.checkColumnIndex(this, column);
return new MatrixColumnView(this, column);
}
flipRowView() {
return new MatrixFlipRowView(this);
}
flipColumnView() {
return new MatrixFlipColumnView(this);
} |
<<<<<<<
inspect,
=======
spec,
>>>>>>>
inspect,
spec,
<<<<<<<
inspect = inspect || false;
=======
spec = spec || null;
>>>>>>>
inspect = inspect || false;
spec = spec || null; |
<<<<<<<
cp('internals/templates/notFoundPage/notFoundPage.js', 'app/containers/NotFoundPage/index.js');
cp('internals/templates/notFoundPage/messages.js', 'app/containers/NotFoundPage/messages.js');
cp('internals/templates/homePage/homePage.js', 'app/containers/HomePage/index.js');
cp('internals/templates/homePage/messages.js', 'app/containers/HomePage/messages.js');
// Handle Translations
mkdir('-p', 'app/translations');
cp('internals/templates/translations/en.json',
'app/translations/en.json');
// move i18n file
cp('internals/templates/i18n.js',
'app/i18n.js');
// Copy LanguageProvider
mkdir('-p', 'app/containers/LanguageProvider');
mkdir('-p', 'app/containers/LanguageProvider/tests');
cp('internals/templates/languageProvider/actions.js',
'app/containers/LanguageProvider/actions.js');
cp('internals/templates/languageProvider/constants.js',
'app/containers/LanguageProvider/constants.js');
cp('internals/templates/languageProvider/languageProvider.js',
'app/containers/LanguageProvider/index.js');
cp('internals/templates/languageProvider/reducer.js',
'app/containers/LanguageProvider/reducer.js');
cp('internals/templates/languageProvider/selectors.js',
'app/containers/LanguageProvider/selectors.js');
=======
cp('internals/templates/styles.css', 'app/containers/App/styles.css');
cp('internals/templates/notFoundPage.js', 'app/containers/NotFoundPage/index.js');
cp('internals/templates/homePage.js', 'app/containers/HomePage/index.js');
>>>>>>>
cp('internals/templates/notFoundPage/notFoundPage.js', 'app/containers/NotFoundPage/index.js');
cp('internals/templates/notFoundPage/messages.js', 'app/containers/NotFoundPage/messages.js');
cp('internals/templates/homePage/homePage.js', 'app/containers/HomePage/index.js');
cp('internals/templates/homePage/messages.js', 'app/containers/HomePage/messages.js');
// Handle Translations
mkdir('-p', 'app/translations');
cp('internals/templates/translations/en.json',
'app/translations/en.json');
// move i18n file
cp('internals/templates/i18n.js',
'app/i18n.js');
// Copy LanguageProvider
mkdir('-p', 'app/containers/LanguageProvider');
mkdir('-p', 'app/containers/LanguageProvider/tests');
cp('internals/templates/languageProvider/actions.js',
'app/containers/LanguageProvider/actions.js');
cp('internals/templates/languageProvider/constants.js',
'app/containers/LanguageProvider/constants.js');
cp('internals/templates/languageProvider/languageProvider.js',
'app/containers/LanguageProvider/index.js');
cp('internals/templates/languageProvider/reducer.js',
'app/containers/LanguageProvider/reducer.js');
cp('internals/templates/languageProvider/selectors.js',
'app/containers/LanguageProvider/selectors.js');
cp('internals/templates/styles.css', 'app/containers/App/styles.css'); |
<<<<<<<
import messages from './messages';
import { createSelector } from 'reselect';
=======
import { createStructuredSelector } from 'reselect';
>>>>>>>
import messages from './messages';
import { createStructuredSelector } from 'reselect'; |
<<<<<<<
import { Router, browserHistory } from 'react-router';
import { createStore, applyMiddleware } from 'redux';
import { routerMiddleware, syncHistoryWithStore } from 'react-router-redux';
=======
import { Router } from 'react-router';
>>>>>>>
import { Router, browserHistory } from 'react-router';
import { syncHistoryWithStore } from 'react-router-redux';
<<<<<<<
=======
import { browserHistory } from 'react-router';
>>>>>>>
<<<<<<<
import { fromJS } from 'immutable';
import sagaMiddleware from 'redux-saga';
=======
import configureStore from './store';
>>>>>>>
import configureStore from './store';
<<<<<<<
// Create the store with two middlewares
// 1. sagaMiddleware: Imports all the asynchronous flows ("sagas") from the
// sagas folder and triggers them
// 2. routerMiddleware: Syncs the location/URL path to the state
import rootReducer from './rootReducer';
import sagas from './sagas';
const createStoreWithMiddleware = applyMiddleware(
routerMiddleware(browserHistory), sagaMiddleware(...sagas)
)(createStore);
const store = createStoreWithMiddleware(rootReducer, fromJS({}));
const history = syncHistoryWithStore(browserHistory, store, {
selectLocationState: selectLocationSelector,
});
// Make reducers hot reloadable, see http://mxs.is/googmo
if (module.hot) {
module.hot.accept('./rootReducer', () => {
const nextRootReducer = require('./rootReducer').default;
store.replaceReducer(nextRootReducer);
});
}
=======
const store = configureStore();
>>>>>>>
// Create redux store with history
// this uses the singleton browserHistory provided by react-router
// Optionally, this could be changed to leverage a created history
// e.g. `const browserHistory = useRouterHistory(createBrowserHistory)();`
const initialState = {};
const store = configureStore(initialState, browserHistory);
// Sync history and store, as the react-router-redux reducer
// is under the non-default key ("routing"), selectLocationState
// must be provided for resolving how to retrieve the "route" in the state
const history = syncHistoryWithStore(browserHistory, store, {
selectLocationState: selectLocationSelector,
}); |
<<<<<<<
} else {
lexer = new Lexer;
tokens = [];
quote = str.charAt(0);
_ref2 = [1, 1];
i = _ref2[0];
pi = _ref2[1];
end = str.length - 1;
while (i < end) {
if (str.charAt(i) === '\\') {
i += 1;
} else if (expr = this.balancedString(str.slice(i), [['#{', '}']])) {
if (pi < i) {
tokens.push(['STRING', quote + str.slice(pi, i) + quote]);
=======
}
lexer = new Lexer();
tokens = [];
i = (pi = 1);
end = str.length - 1;
while (i < end) {
if (str.charAt(i) === '\\') {
i += 1;
} else if (expr = this.balancedString(str.slice(i), [['#{', '}']])) {
if (pi < i) {
s = quote + this.escapeLines(str.slice(pi, i), heredoc) + quote;
tokens.push(['STRING', s]);
}
inner = expr.slice(2, -1).replace(/^[ \t]*\n/, '');
if (inner.length) {
if (heredoc) {
inner = inner.replace(RegExp('\\\\' + quote, 'g'), quote);
>>>>>>>
}
lexer = new Lexer;
tokens = [];
i = (pi = 1);
end = str.length - 1;
while (i < end) {
if (str.charAt(i) === '\\') {
i += 1;
} else if (expr = this.balancedString(str.slice(i), [['#{', '}']])) {
if (pi < i) {
s = quote + this.escapeLines(str.slice(pi, i), heredoc) + quote;
tokens.push(['STRING', s]);
}
inner = expr.slice(2, -1).replace(/^[ \t]*\n/, '');
if (inner.length) {
if (heredoc) {
inner = inner.replace(RegExp('\\\\' + quote, 'g'), quote);
<<<<<<<
NO_NEWLINE = /^(?:[-+*&|\/%=<>!.\\][<>=&|]*|and|or|is(?:nt)?|n(?:ot|ew)|delete|typeof|instanceof)$/;
HEREDOC_INDENT = /\n+([ \t]*)|^([ \t]+)/g;
ASSIGNED = /^\s*((?:[a-zA-Z$_@]\w*|["'][^\n]+?["']|\d+)[ \t]*?[:=][^:=])/;
NEXT_CHARACTER = /^\s*(\S)/;
=======
NO_NEWLINE = /^(?:[-+*&|\/%=<>!.\\][<>=&|]*|and|or|is(?:nt)?|not|delete|typeof|instanceof)$/;
HEREDOC_INDENT = /\n+([ \t]*)/g;
ASSIGNED = /^\s*@?[$A-Za-z_][$\w]*[ \t]*?[:=][^:=>]/;
NEXT_CHARACTER = /^\s*(\S?)/;
>>>>>>>
NO_NEWLINE = /^(?:[-+*&|\/%=<>!.\\][<>=&|]*|and|or|is(?:nt)?|n(?:ot|ew)|delete|typeof|instanceof)$/;
HEREDOC_INDENT = /\n+([ \t]*)/g;
ASSIGNED = /^\s*@?[$A-Za-z_][$\w]*[ \t]*?[:=][^:=>]/;
NEXT_CHARACTER = /^\s*(\S?)/; |
<<<<<<<
var _l, _ref, index, other;
=======
var _cache, _length, index, other;
>>>>>>>
var _len, _ref, index, other;
<<<<<<<
_ref = array;
for (index = 0, _l = _ref.length; index < _l; index++) {
other = _ref[index];
=======
_cache = array;
for (index = 0, _length = _cache.length; index < _length; index++) {
other = _cache[index];
>>>>>>>
_ref = array;
for (index = 0, _len = _ref.length; index < _len; index++) {
other = _ref[index];
<<<<<<<
var _i, _l, _ref, _result, item;
_result = []; _ref = array;
for (_i = 0, _l = _ref.length; _i < _l; _i++) {
item = _ref[_i];
=======
var _cache, _index, _length, _result, item;
_result = []; _cache = array;
for (_index = 0, _length = _cache.length; _index < _length; _index++) {
item = _cache[_index];
>>>>>>>
var _i, _len, _ref, _result, item;
_result = []; _ref = array;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
item = _ref[_i];
<<<<<<<
var _ref, _ref2, fresh, key, val;
=======
var _cache, fresh, key, val;
>>>>>>>
var _ref, fresh, key, val;
<<<<<<<
_ref2 = overrides;
for (key in _ref2) {
val = _ref2[key];
=======
_cache = overrides;
for (key in _cache) {
val = _cache[key];
>>>>>>>
_ref = overrides;
for (key in _ref) {
val = _ref[key];
<<<<<<<
var _i, _l, _ref, item, memo;
=======
var _cache, _index, _length, item, memo;
>>>>>>>
var _i, _len, _ref, item, memo;
<<<<<<<
_ref = array;
for (_i = 0, _l = _ref.length; _i < _l; _i++) {
item = _ref[_i];
=======
_cache = array;
for (_index = 0, _length = _cache.length; _index < _length; _index++) {
item = _cache[_index];
>>>>>>>
_ref = array;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
item = _ref[_i]; |
<<<<<<<
static listSprocsSql() {
return mstring(function () {/***
SELECT
SPECIFIC_CATALOG [database],
SPECIFIC_SCHEMA [schema],
SPECIFIC_NAME name,
ROUTINE_TYPE type
FROM INFORMATION_SCHEMA.ROUTINES
WHERE ROUTINE_TYPE = 'PROCEDURE'
ORDER BY SPECIFIC_NAME;
***/});
}
=======
static searchSql(search) {
return sprintf(mstring(function () {/***
DECLARE @SearchStr nvarchar(100)
SET @SearchStr = '%s'
CREATE TABLE #Results (ColumnName nvarchar(370), ColumnValue nvarchar(3630))
SET NOCOUNT ON
DECLARE @TableName nvarchar(256), @ColumnName nvarchar(128), @SearchStr2 nvarchar(110)
SET @TableName = ''
SET @SearchStr2 = QUOTENAME('%%' + @SearchStr + '%%','''')
WHILE @TableName IS NOT NULL
BEGIN
SET @ColumnName = ''
SET @TableName =
(
SELECT MIN(QUOTENAME(TABLE_SCHEMA) + '.' + QUOTENAME(TABLE_NAME))
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_TYPE = 'BASE TABLE'
AND QUOTENAME(TABLE_SCHEMA) + '.' + QUOTENAME(TABLE_NAME) > @TableName
AND OBJECTPROPERTY(
OBJECT_ID(
QUOTENAME(TABLE_SCHEMA) + '.' + QUOTENAME(TABLE_NAME)
), 'IsMSShipped'
) = 0
)
WHILE (@TableName IS NOT NULL) AND (@ColumnName IS NOT NULL)
BEGIN
SET @ColumnName =
(
SELECT MIN(QUOTENAME(COLUMN_NAME))
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_SCHEMA = PARSENAME(@TableName, 2)
AND TABLE_NAME = PARSENAME(@TableName, 1)
AND DATA_TYPE IN ('char', 'varchar', 'nchar', 'nvarchar', 'int', 'decimal')
AND QUOTENAME(COLUMN_NAME) > @ColumnName
)
IF @ColumnName IS NOT NULL
BEGIN
INSERT INTO #Results
EXEC
(
'SELECT ''' + @TableName + '.' + @ColumnName + ''', LEFT(' + @ColumnName + ', 150) FROM ' + @TableName + ' (NOLOCK) ' +
' WHERE ' + @ColumnName + ' LIKE ' + @SearchStr2
)
END
END
END
SELECT ColumnName, ColumnValue FROM #Results
DROP TABLE #Results
***/}), search);
}
>>>>>>>
static listSprocsSql() {
return mstring(function () {/***
SELECT
SPECIFIC_CATALOG [database],
SPECIFIC_SCHEMA [schema],
SPECIFIC_NAME name,
ROUTINE_TYPE type
FROM INFORMATION_SCHEMA.ROUTINES
WHERE ROUTINE_TYPE = 'PROCEDURE'
ORDER BY SPECIFIC_NAME;
***/});
}
static searchSql(search) {
return sprintf(mstring(function () {/***
DECLARE @SearchStr nvarchar(100)
SET @SearchStr = '%s'
CREATE TABLE #Results (ColumnName nvarchar(370), ColumnValue nvarchar(3630))
SET NOCOUNT ON
DECLARE @TableName nvarchar(256), @ColumnName nvarchar(128), @SearchStr2 nvarchar(110)
SET @TableName = ''
SET @SearchStr2 = QUOTENAME('%%' + @SearchStr + '%%','''')
WHILE @TableName IS NOT NULL
BEGIN
SET @ColumnName = ''
SET @TableName =
(
SELECT MIN(QUOTENAME(TABLE_SCHEMA) + '.' + QUOTENAME(TABLE_NAME))
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_TYPE = 'BASE TABLE'
AND QUOTENAME(TABLE_SCHEMA) + '.' + QUOTENAME(TABLE_NAME) > @TableName
AND OBJECTPROPERTY(
OBJECT_ID(
QUOTENAME(TABLE_SCHEMA) + '.' + QUOTENAME(TABLE_NAME)
), 'IsMSShipped'
) = 0
)
WHILE (@TableName IS NOT NULL) AND (@ColumnName IS NOT NULL)
BEGIN
SET @ColumnName =
(
SELECT MIN(QUOTENAME(COLUMN_NAME))
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_SCHEMA = PARSENAME(@TableName, 2)
AND TABLE_NAME = PARSENAME(@TableName, 1)
AND DATA_TYPE IN ('char', 'varchar', 'nchar', 'nvarchar', 'int', 'decimal')
AND QUOTENAME(COLUMN_NAME) > @ColumnName
)
IF @ColumnName IS NOT NULL
BEGIN
INSERT INTO #Results
EXEC
(
'SELECT ''' + @TableName + '.' + @ColumnName + ''', LEFT(' + @ColumnName + ', 150) FROM ' + @TableName + ' (NOLOCK) ' +
' WHERE ' + @ColumnName + ' LIKE ' + @SearchStr2
)
END
END
END
SELECT ColumnName, ColumnValue FROM #Results
DROP TABLE #Results
***/}), search);
} |
<<<<<<<
<H1>
<FormattedMessage {...messages.header} />
</H1>
=======
<Helmet
title="Feature Page"
meta={[
{ name: 'description', content: 'Feature page of React.js Boilerplate application' },
]}
/>
<H1>Features</H1>
>>>>>>>
<Helmet
title="Feature Page"
meta={[
{ name: 'description', content: 'Feature page of React.js Boilerplate application' },
]}
/>
<H1>
<FormattedMessage {...messages.header} />
</H1> |
<<<<<<<
* @param {!Array<!Gerrit.DiffChunk>} chunks
* @param {boolean} isBinary
* @return {!Promise<!Array<!Object>>} A promise that resolves with an
* array of GrDiffGroups when the diff is completely processed.
=======
*
* @return {Promise} A promise that resolves when the diff is completely
* processed.
>>>>>>>
*
* @param {!Array<!Gerrit.DiffChunk>} chunks
* @param {boolean} isBinary
*
* @return {!Promise<!Array<!Object>>} A promise that resolves with an
* array of GrDiffGroups when the diff is completely processed.
<<<<<<<
_linesLeft(chunk) {
return chunk.ab || chunk.a || [];
},
_linesRight(chunk) {
return chunk.ab || chunk.b || [];
},
=======
/**
* Take rows of a shared diff section and produce an array of corresponding
* (potentially collapsed) groups.
*
* @param {!Array<string>} rows
* @param {number} context
* @param {number} startLineNumLeft
* @param {number} startLineNumRight
* @param {?string=} opt_sectionEnd String representing whether this is the
* first section or the last section or neither. Use the values 'first',
* 'last' and null respectively.
* @return {!Array<!Object>} Array of GrDiffGroup
*/
_sharedGroupsFromRows(rows, context, startLineNumLeft,
startLineNumRight, opt_sectionEnd) {
const result = [];
const lines = [];
let line;
// Map each row to a GrDiffLine.
for (let i = 0; i < rows.length; i++) {
line = new GrDiffLine(GrDiffLine.Type.BOTH);
line.text = rows[i];
line.beforeNumber = ++startLineNumLeft;
line.afterNumber = ++startLineNumRight;
lines.push(line);
}
>>>>>>>
_linesLeft(chunk) {
return chunk.ab || chunk.a || [];
},
_linesRight(chunk) {
return chunk.ab || chunk.b || [];
},
<<<<<<<
* @param {!Object} chunk
* @param {number} offsetLeft
* @param {number} offsetRight
* @return {!Object} (GrDiffGroup)
=======
* Take the rows of a delta diff section and produce the corresponding
* group.
*
* @param {!Array<string>} rowsAdded
* @param {!Array<string>} rowsRemoved
* @param {number} startLineNumLeft
* @param {number} startLineNumRight
* @return {!Object} (Gr-Diff-Group)
>>>>>>>
* @param {!Object} chunk
* @param {number} offsetLeft
* @param {number} offsetRight
* @return {!Object} (GrDiffGroup)
<<<<<<<
* In order to show key locations, such as comments, out of the bounds of
* the selected context, treat them as separate chunks within the model so
* that the content (and context surrounding it) renders correctly.
=======
* In order to show comments out of the bounds of the selected context,
* treat them as separate chunks within the model so that the content (and
* context surrounding it) renders correctly.
*
>>>>>>>
* In order to show key locations, such as comments, out of the bounds of
* the selected context, treat them as separate chunks within the model so
* that the content (and context surrounding it) renders correctly.
*
<<<<<<<
* @param {!Gerrit.DiffChunk} chunk A raw chunk from a diff response.
=======
*
* @param {!Object} group A raw chunk from a diff response.
>>>>>>>
*
* @param {!Gerrit.DiffChunk} chunk A raw chunk from a diff response. |
<<<<<<<
const defaults = {
webroot: '',
serverroot: '',
accessUrl: '',
autoJoin: false,
autoJoinServer: '',
autoJoinRoom: '',
autoJoinPassword: '',
authentication: {
mechanism: 'none'
}
};
=======
>>>>>>>
<<<<<<<
'webroot',
'serverroot',
'accessUrl',
'autoJoin',
'autoJoinServer',
'autoJoinRoom',
'autoJoinPassword',
'authentication'
=======
{
local: 'webroot',
env: 'WEB_ROOT',
default: ''
},
{
local: 'webapp_port',
env: 'WEB_PORT',
default: '8088'
},
{
local: 'accessUrl',
env: 'WEB_ACCESSURL',
default: ''
},
{
local: 'serverroot',
env: 'SERVER_ROOT',
default: ''
},
{
local: 'server_port',
env: 'SERVER_PORT',
default: '8089'
},
{
local: 'autoJoin',
env: 'AUTOJOIN_ENABLED',
default: 'false'
},
{
local: 'autoJoinServer',
env: 'AUTOJOIN_SERVERURL',
default: ''
},
{
local: 'autoJoinRoom',
env: 'AUTOJOIN_ROOM',
default: ''
},
{
local: 'autoJoinPassword',
env: 'AUTOJOIN_PASSWORD',
default: ''
}
>>>>>>>
{
local: 'webroot',
env: 'WEB_ROOT',
default: ''
},
{
local: 'webapp_port',
env: 'WEB_PORT',
default: '8088'
},
{
local: 'accessUrl',
env: 'WEB_ACCESSURL',
default: ''
},
{
local: 'serverroot',
env: 'SERVER_ROOT',
default: ''
},
{
local: 'server_port',
env: 'SERVER_PORT',
default: '8089'
},
{
local: 'autoJoin',
env: 'AUTOJOIN_ENABLED',
default: 'false'
},
{
local: 'autoJoinServer',
env: 'AUTOJOIN_SERVERURL',
default: ''
},
{
local: 'autoJoinRoom',
env: 'AUTOJOIN_ROOM',
default: ''
},
{
local: 'autoJoinPassword',
env: 'AUTOJOIN_PASSWORD',
default: ''
},
{
local: 'authentication',
env: 'AUTHENTICATION',
default: {
mechanism: 'none'
}
} |
<<<<<<<
PTPLAYERQUALITY: null,
// This tracks whether the upnext screen was triggered for this playback already.
// It is reset to false when the player gets out of the upNext time zone (at the end of episode)
upNextTriggered: false,
// This stores the postplay data and controls whether the upnext component is visible
upNextPostPlayData: null,
plexServerId: null,
};
=======
});
>>>>>>>
// This tracks whether the upnext screen was triggered for this playback already.
// It is reset to false when the player gets out of the upNext time zone (at the end of episode)
upNextTriggered: false,
// This stores the postplay data and controls whether the upnext component is visible
upNextPostPlayData: null,
plexServerId: null,
});
<<<<<<<
// Set up our client poller
let commandInProgress = false;
function clientPoller(time) {
if (!state.chosenClient) {
return;
}
if (state.chosenClientTimeSet !== time) {
// We have a new chosen client, we need to stop
return;
}
if (state.chosenClient.clientIdentifier !== 'PTPLAYER9PLUS10') {
if (!commandInProgress) {
state.chosenClient
.getTimeline()
.then(() => {
commandInProgress = false;
})
.catch((e) => {
commandInProgress = false;
});
commandInProgress = true;
}
} else {
state.chosenClient.getTimeline();
}
setTimeout(() => {
clientPoller(time);
}, state.settings.CLIENTPOLLINTERVAL);
}
// Check if we need to remove old handlers
if (state.chosenClient) {
state.chosenClient.events.removeAllListeners();
}
=======
>>>>>>>
<<<<<<<
if (state.chosenClient && state.chosenClient.lastTimelineObject) {
state.chosenClient.lastTimelineObject.ratingKey = -1;
}
if (state.chosenClient == null) {
return;
}
state.chosenClientTimeSet = new Date().getTime();
clientPoller(state.chosenClientTimeSet);
state.chosenClient.getTimeline((timeline) => { });
=======
>>>>>>>
<<<<<<<
SET_UP_NEXT_TRIGGERED: (state, triggered) => {
state.upNextTriggered = triggered;
},
SET_UP_NEXT_POST_PLAY_DATA: (state, data) => {
state.upNextPostPlayData = data;
},
SET_PLEX_SERVER_ID: (state, id) => {
state.plexServerId = id;
}
=======
SET_BLOCK_AUTOPLAY(state, block) {
state.blockAutoPlay = block;
},
SET_MANUAL_SYNC_QUEUED(state, queued) {
state.manualSyncQueued = queued;
},
>>>>>>>
SET_UP_NEXT_TRIGGERED: (state, triggered) => {
state.upNextTriggered = triggered;
},
SET_UP_NEXT_POST_PLAY_DATA: (state, data) => {
state.upNextPostPlayData = data;
},
SET_PLEX_SERVER_ID: (state, id) => {
state.plexServerId = id;
},
SET_BLOCK_AUTOPLAY(state, block) {
state.blockAutoPlay = block;
},
SET_MANUAL_SYNC_QUEUED(state, queued) {
state.manualSyncQueued = queued;
},
<<<<<<<
GET_UP_NEXT_TRIGGERED: (state) => state.upNextTriggered,
GET_UP_NEXT_POST_PLAY_DATA: (state) => state.upNextPostPlayData,
GET_PLEX_SERVER_ID: (state) => state.plexServerId,
=======
GET_SYNCLOUNGE_SERVERS: (state, getters) => {
if (getters['config/GET_CONFIG'].servers && getters['config/GET_CONFIG'].servers.length > 0) {
if (getters['config/GET_CONFIG'].customServer) {
console.error(
"'customServer' setting provided with 'servers' setting. Ignoring 'customServer' setting.",
);
}
return getters['config/GET_CONFIG'].servers;
} else if (getters['config/GET_CONFIG'].customServer) {
return defaultSyncloungeServers.concat([getters['config/GET_CONFIG'].customServer]);
}
return defaultSyncloungeServers.concat([getters['settings/GET_CUSTOMSERVER']]);
},
GET_MANUAL_SYNC_QUEUED: (state) => state.manualSyncQueued,
GET_ME: (state) => state.me,
>>>>>>>
GET_UP_NEXT_TRIGGERED: (state) => state.upNextTriggered,
GET_UP_NEXT_POST_PLAY_DATA: (state) => state.upNextPostPlayData,
GET_PLEX_SERVER_ID: (state) => state.plexServerId,
GET_SYNCLOUNGE_SERVERS: (state, getters) => {
if (getters['config/GET_CONFIG'].servers && getters['config/GET_CONFIG'].servers.length > 0) {
if (getters['config/GET_CONFIG'].customServer) {
console.error(
"'customServer' setting provided with 'servers' setting. Ignoring 'customServer' setting.",
);
}
return getters['config/GET_CONFIG'].servers;
} else if (getters['config/GET_CONFIG'].customServer) {
return defaultSyncloungeServers.concat([getters['config/GET_CONFIG'].customServer]);
}
return defaultSyncloungeServers.concat([getters['settings/GET_CUSTOMSERVER']]);
},
GET_MANUAL_SYNC_QUEUED: (state) => state.manualSyncQueued,
GET_ME: (state) => state.me, |
<<<<<<<
=======
>>>>>>>
<<<<<<<
item = carousel._itemsTable.items[firstVisible].id;
=======
item = carousel._itemsTable.items[firstVisible].id;
>>>>>>>
item = carousel._itemsTable.items[firstVisible].id;
<<<<<<<
carousel._syncUiItems();
},
/**
* Redraw the UI for item positioning.
*
* @method _syncUiItems
* @protected
*/
_syncUiItems: function () {
var carousel = this,
numItems = carousel.get("numItems"),
itemsTable = carousel._itemsTable,
item,
styles;
for (var i = 0; i<numItems; i++) {
styles = getCarouselItemPosition.call(carousel, i);
item = itemsTable.items[i] || itemsTable.loading[i];
if (item && item.id) {
item.styles = item.styles || {};
for (var attr in styles) {
item.styles[attr] = styles[attr];
}
setStyles(Dom.get(item.id), styles);
}
}
=======
carousel._syncUiItems();
},
/**
* Redraw the UI for item positioning.
*
* @method _syncUiItems
* @protected
*/
_syncUiItems: function () {
var attr,
carousel = this,
numItems = carousel.get("numItems"),
i,
itemsTable = carousel._itemsTable,
item,
styles;
for (i = 0; i < numItems; i++) {
styles = getCarouselItemPosition.call(carousel, i);
item = itemsTable.items[i] || itemsTable.loading[i];
if (item && item.id) {
item.styles = item.styles || {};
for (attr in styles) {
if (styles.hasOwnProperty(attr)) {
item.styles[attr] = styles[attr];
}
}
setStyles(Dom.get(item.id), styles);
}
}
>>>>>>>
carousel._syncUiItems();
},
/**
* Redraw the UI for item positioning.
*
* @method _syncUiItems
* @protected
*/
_syncUiItems: function () {
var attr,
carousel = this,
numItems = carousel.get("numItems"),
i,
itemsTable = carousel._itemsTable,
item,
styles;
for (i = 0; i < numItems; i++) {
styles = getCarouselItemPosition.call(carousel, i);
item = itemsTable.items[i] || itemsTable.loading[i];
if (item && item.id) {
item.styles = item.styles || {};
for (attr in styles) {
if (styles.hasOwnProperty(attr)) {
item.styles[attr] = styles[attr];
}
}
setStyles(Dom.get(item.id), styles);
}
} |
<<<<<<<
import VueObserveVisibility from 'vue-observe-visibility';
import VueVideoPlayer from 'vue-video-player';
import VueClipboard from 'vue-clipboard2';
import VueCookies from 'vue-cookies';
import moment from 'moment';
=======
import Vuetify from 'vuetify';
import { ObserveVisibility } from 'vue-observe-visibility/dist/vue-observe-visibility';
import VideojsPlayer from 'vue-videojs-player';
import VueResource from 'vue-resource';
import VueClipboards from 'vue-clipboards';
import VueCookies from 'vue-cookies'
>>>>>>>
import VueObserveVisibility from 'vue-observe-visibility';
import VideojsPlayer from 'vue-videojs-player';
import VueClipboard from 'vue-clipboard2';
import VueCookies from 'vue-cookies';
import moment from 'moment';
<<<<<<<
// require('videojs-contrib-hls/dist/videojs-contrib-hls.js');
// require('vanilla-tilt');
=======
require('vanilla-tilt');
>>>>>>>
require('vanilla-tilt');
<<<<<<<
Vue.use(VueClipboard);
Vue.use(VueObserveVisibility);
Vue.use(VueVideoPlayer);
=======
Vue.use(VueClipboards);
Vue.use(VueResource);
Vue.directive('observe-visibility', ObserveVisibility);
Vue.use(VideojsPlayer);
>>>>>>>
Vue.use(VueClipboard);
Vue.use(VueObserveVisibility);
Vue.use(VideojsPlayer); |
<<<<<<<
import VueObserveVisibility from 'vue-observe-visibility';
import VideojsPlayer from 'vue-videojs-player';
import VueClipboard from 'vue-clipboard2';
import VueCookies from 'vue-cookies';
import moment from 'moment';
=======
import Vuetify from 'vuetify';
import { ObserveVisibility } from 'vue-observe-visibility/dist/vue-observe-visibility';
import VueResource from 'vue-resource';
import VueClipboards from 'vue-clipboards';
import VueCookies from 'vue-cookies';
import { sync } from 'vuex-router-sync';
>>>>>>>
import VueObserveVisibility from 'vue-observe-visibility';
import VueClipboard from 'vue-clipboard2';
import VueCookies from 'vue-cookies';
import moment from 'moment';
import { sync } from 'vuex-router-sync';
<<<<<<<
Vue.use(VueClipboard);
Vue.use(VueObserveVisibility);
Vue.use(VideojsPlayer);
=======
Vue.use(VueClipboards);
Vue.use(VueResource);
Vue.directive('observe-visibility', ObserveVisibility);
>>>>>>>
Vue.use(VueClipboard);
Vue.use(VueObserveVisibility); |
<<<<<<<
=======
// Externals
>>>>>>>
<<<<<<<
import Products from '../Items';
=======
import Items from '../Items';
// Internals
import './index.css';
>>>>>>>
import Products from '../Items';
import './index.css';
<<<<<<<
<Products addItemToCart={this.addItemToCart} />
<Cart products={this.state.cartProducts} />
=======
<Items addItemToCart={this.addItemToCart} />
<Cart items={this.state.items}/>
>>>>>>>
<Products addItemToCart={this.addItemToCart} />
<Cart products={this.state.cartProducts} /> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.