conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
dblClickTimeThreshold: 300,
dblClickDistThreshold: 20,
springStiffness: 5.0,
=======
springStiffness: 6.5,
>>>>>>>
dblClickTimeThreshold: 300,
dblClickDistThreshold: 20,
springStiffness: 6.5,
<<<<<<<
gestureSettingsMouse: { scrollToZoom: true, clickToZoom: true, dblClickToZoom: false, pinchToZoom: false, flickEnabled: false, flickMinSpeed: 20, flickMomentum: 0.40 },
gestureSettingsTouch: { scrollToZoom: false, clickToZoom: false, dblClickToZoom: true, pinchToZoom: true, flickEnabled: true, flickMinSpeed: 20, flickMomentum: 0.40 },
gestureSettingsPen: { scrollToZoom: false, clickToZoom: true, dblClickToZoom: false, pinchToZoom: false, flickEnabled: false, flickMinSpeed: 20, flickMomentum: 0.40 },
gestureSettingsUnknown: { scrollToZoom: false, clickToZoom: false, dblClickToZoom: true, pinchToZoom: true, flickEnabled: true, flickMinSpeed: 20, flickMomentum: 0.40 },
=======
gestureSettingsMouse: { scrollToZoom: true, clickToZoom: true, pinchToZoom: false, flickEnabled: false, flickMinSpeed: 120, flickMomentum: 0.25 },
gestureSettingsTouch: { scrollToZoom: false, clickToZoom: false, pinchToZoom: true, flickEnabled: true, flickMinSpeed: 120, flickMomentum: 0.25 },
gestureSettingsPen: { scrollToZoom: false, clickToZoom: true, pinchToZoom: false, flickEnabled: false, flickMinSpeed: 120, flickMomentum: 0.25 },
gestureSettingsUnknown: { scrollToZoom: false, clickToZoom: false, pinchToZoom: true, flickEnabled: true, flickMinSpeed: 120, flickMomentum: 0.25 },
>>>>>>>
gestureSettingsMouse: { scrollToZoom: true, clickToZoom: true, dblClickToZoom: false, pinchToZoom: false, flickEnabled: false, flickMinSpeed: 120, flickMomentum: 0.25 },
gestureSettingsTouch: { scrollToZoom: false, clickToZoom: false, dblClickToZoom: true, pinchToZoom: true, flickEnabled: true, flickMinSpeed: 120, flickMomentum: 0.25 },
gestureSettingsPen: { scrollToZoom: false, clickToZoom: true, dblClickToZoom: false, pinchToZoom: false, flickEnabled: false, flickMinSpeed: 120, flickMomentum: 0.25 },
gestureSettingsUnknown: { scrollToZoom: false, clickToZoom: false, dblClickToZoom: true, pinchToZoom: true, flickEnabled: true, flickMinSpeed: 120, flickMomentum: 0.25 }, |
<<<<<<<
if (window.store.id) sendToTab(window.store.id, { options: options });
subscribers.forEach(s => s(options));
=======
toAllTabs({ options: options });
>>>>>>>
toAllTabs({ options: options });
subscribers.forEach(s => s(options));
<<<<<<<
export default {
save: save,
get: get,
subscribe: subscribe
};
=======
export default function syncOptions(toAllTabs) {
return {
save: save(toAllTabs),
get: get
};
}
>>>>>>>
export default function syncOptions(toAllTabs) {
return {
save: save(toAllTabs),
get: get,
subscribe: subscribe
};
} |
<<<<<<<
'query': 123,
'boost': vs['address:housenumber:boost'],
'analyzer': vs['address:housenumber:analyzer']
=======
'query': '123',
'boost': vs.var('address:housenumber:boost').get(),
'analyzer': vs.var('address:housenumber:analyzer').get()
>>>>>>>
'query': '123',
'boost': vs['address:housenumber:boost'],
'analyzer': vs['address:housenumber:analyzer']
<<<<<<<
'query': 10010,
'boost': vs['address:postcode:boost'],
'analyzer': vs['address:postcode:analyzer']
=======
'query': '10010',
'boost': vs.var('address:postcode:boost').get(),
'analyzer': vs.var('address:postcode:analyzer').get()
>>>>>>>
'query': '10010',
'boost': vs['address:postcode:boost'],
'analyzer': vs['address:postcode:analyzer'] |
<<<<<<<
// Affliction Azerite Trait effects
INEVITABLE_DEMISE_BUFF: {
id: 273525,
name: 'Inevitable Demise',
icon: 'spell_shadow_abominationexplosion',
},
=======
// Affliction Azerite Trait effects
CASCADING_CALAMITY_BUFF: {
id: 275378,
name: 'Cascading Calamity',
icon: 'spell_shadow_unstableaffliction_3',
},
WRACKING_BRILLIANCE_BUFF: {
id: 272893,
name: 'Wracking Brilliance',
icon: 'spell_shadow_felmending',
},
>>>>>>>
// Affliction Azerite Trait effects
CASCADING_CALAMITY_BUFF: {
id: 275378,
name: 'Cascading Calamity',
icon: 'spell_shadow_unstableaffliction_3',
},
WRACKING_BRILLIANCE_BUFF: {
id: 272893,
name: 'Wracking Brilliance',
icon: 'spell_shadow_felmending',
},
INEVITABLE_DEMISE_BUFF: {
id: 273525,
name: 'Inevitable Demise',
icon: 'spell_shadow_abominationexplosion',
}, |
<<<<<<<
layers: require('../sanitiser/_targets')('layers', type_mapping.layer_mapping),
sources: require('../sanitiser/_targets')('sources', type_mapping.source_mapping),
// depends on the layers and sources sanitisers, must be run after them
sources_and_layers: require('../sanitiser/_sources_and_layers'),
=======
layers: require('../sanitiser/_targets')('layers', type_mapping.layer_with_aliases_to_type),
sources: require('../sanitiser/_targets')('sources', type_mapping.source_to_type),
quattroshapes_warning: require('../sanitiser/_warn_quattroshapes')(),
>>>>>>>
layers: require('../sanitiser/_targets')('layers', type_mapping.layer_mapping),
sources: require('../sanitiser/_targets')('sources', type_mapping.source_mapping),
// depends on the layers and sources sanitisers, must be run after them
sources_and_layers: require('../sanitiser/_sources_and_layers'),
quattroshapes_warning: require('../sanitiser/_warn_quattroshapes')(), |
<<<<<<<
addMetaData(place, geocoding);
addDetails(place, geocoding);
addLabel(place, geocoding);
=======
addMetaData(place, output);
addDetails(details, place, output);
addLabel(place, output);
>>>>>>>
addMetaData(place, output);
addDetails(place, output);
addLabel(place, output); |
<<<<<<<
var expected = ['text', 'size', 'layers', 'sources', 'private', 'geo_search', 'categories' ];
=======
var expected = ['text', 'size', 'layers', 'sources', 'details', 'geo_search', 'categories', 'boundary_country' ];
>>>>>>>
var expected = ['text', 'size', 'layers', 'sources', 'private', 'geo_search', 'categories', 'boundary_country' ]; |
<<<<<<<
import GiftOfForgiveness from './modules/azeritetraits/GiftOfForgiveness';
import DepthOfTheShadows from './modules/azeritetraits/DepthOfTheShadows';
=======
>>>>>>>
import DepthOfTheShadows from './modules/azeritetraits/DepthOfTheShadows';
<<<<<<<
gift: GiftOfForgiveness,
depthOfTheShadows: DepthOfTheShadows,
=======
>>>>>>>
depthOfTheShadows: DepthOfTheShadows, |
<<<<<<<
var ngrams = function( vs ){
var view = peliasQuery.view.ngrams( vs );
view.match['name.default'].type = 'phrase';
view.match['name.default'].operator = 'and';
// console.log( JSON.stringify( view, null, 2 ) );
return view;
};
var ngrams_last_only = function( vs ){
// hack to disable ngrams when query parsing enabled
if( vs.var('parsed_text').get() ){
return null;
}
var name = vs.var('input:name').get();
var vs2 = new peliasQuery.Vars( vs.export() );
vs2.var('input:name').set( name.substr( name.lastIndexOf(' ')+1 ) );
var view = ngrams( vs2 );
view.match['name.default'].analyzer = 'peliasPhrase';
return view;
};
var phrase = function( vs ){
var view = peliasQuery.view.phrase( vs );
view.match['phrase.default'].type = 'phrase';
// console.log( JSON.stringify( view, null, 2 ) );
return view;
};
var phrase_first_only = function( vs ){
// hack to disable substr when query parsing enabled
if( !vs.var('parsed_text').get() ){
var name = vs.var('input:name').get();
var s = name.split(' ');
// single token only, abort
if( s.length < 2 ){
return null;
}
var vs2 = new peliasQuery.Vars( vs.export() );
vs2.var('input:name').set( name.substr(0, name.lastIndexOf(' ') ) );
return phrase( vs2 );
}
return phrase( vs );
};
var simpleNgramsView = function( vs ){
var view = ngrams( vs );
view.match['name.default'].analyzer = 'peliasPhrase';
delete view.match['name.default'].type;
delete view.match['name.default'].boost;
// console.log( JSON.stringify( view, null, 2 ) );
return view;
};
var focus = peliasQuery.view.focus( ngrams );
var localView = function( vs ){
var view = focus( vs );
if( view && view.hasOwnProperty('function_score') ){
view.function_score.query.match['name.default'].analyzer = 'peliasPhrase';
view.function_score.filter = {
'or': [
{ 'type': { 'value': 'osmnode' } },
{ 'type': { 'value': 'osmway' } },
{ 'type': { 'value': 'osmaddress' } },
{ 'type': { 'value': 'openaddresses' } }
]
};
}
// console.log( JSON.stringify( view, null, 2 ) );
return view;
};
=======
>>>>>>>
var ngrams = function( vs ){
var view = peliasQuery.view.ngrams( vs );
view.match['name.default'].type = 'phrase';
view.match['name.default'].operator = 'and';
// console.log( JSON.stringify( view, null, 2 ) );
return view;
};
var ngrams_last_only = function( vs ){
// hack to disable ngrams when query parsing enabled
if( vs.var('parsed_text').get() ){
return null;
}
var name = vs.var('input:name').get();
var vs2 = new peliasQuery.Vars( vs.export() );
vs2.var('input:name').set( name.substr( name.lastIndexOf(' ')+1 ) );
var view = ngrams( vs2 );
view.match['name.default'].analyzer = 'peliasPhrase';
return view;
};
var phrase = function( vs ){
var view = peliasQuery.view.phrase( vs );
view.match['phrase.default'].type = 'phrase';
// console.log( JSON.stringify( view, null, 2 ) );
return view;
};
var phrase_first_only = function( vs ){
// hack to disable substr when query parsing enabled
if( !vs.var('parsed_text').get() ){
var name = vs.var('input:name').get();
var s = name.split(' ');
// single token only, abort
if( s.length < 2 ){
return null;
}
var vs2 = new peliasQuery.Vars( vs.export() );
vs2.var('input:name').set( name.substr(0, name.lastIndexOf(' ') ) );
return phrase( vs2 );
}
return phrase( vs );
};
var simpleNgramsView = function( vs ){
var view = ngrams( vs );
view.match['name.default'].analyzer = 'peliasPhrase';
delete view.match['name.default'].type;
delete view.match['name.default'].boost;
// console.log( JSON.stringify( view, null, 2 ) );
return view;
};
var focus = peliasQuery.view.focus( ngrams );
var localView = function( vs ){
var view = focus( vs );
if( view && view.hasOwnProperty('function_score') ){
view.function_score.query.match['name.default'].analyzer = 'peliasPhrase';
view.function_score.filter = {
'or': [
{ 'type': { 'value': 'osmnode' } },
{ 'type': { 'value': 'osmway' } },
{ 'type': { 'value': 'osmaddress' } },
{ 'type': { 'value': 'openaddresses' } }
]
};
}
// console.log( JSON.stringify( view, null, 2 ) );
return view;
};
<<<<<<<
// run the address parser
if( clean.parsed_text ){
textParser( clean.parsed_text, vs );
}
var q = query.render( vs );
console.log( JSON.stringify( q, null, 2 ) );
return q;
=======
// run the address parser
if( clean.parsed_text ){
textParser( clean.parsed_text, vs );
}
return query.render( vs );
>>>>>>>
// run the address parser
if( clean.parsed_text ){
textParser( clean.parsed_text, vs );
}
return query.render( vs ); |
<<<<<<<
'borough_id': [
=======
'localadmin_gid': [
>>>>>>>
'localadmin_gid': [
<<<<<<<
'county_id': '102082361',
'borough': 'Brooklyn',
'borough_id': '404521211',
=======
'county_gid': '102082361',
'localadmin': 'Brooklyn',
'localadmin_gid': '404521211',
>>>>>>>
'borough': 'Brooklyn',
'county_gid': '102082361',
'localadmin_gid': '404521211',
<<<<<<<
'locality_id': '85977539',
'bounding_box': {
'min_lat': 40.6514712164,
'max_lat': 40.6737320588,
'min_lon': -73.8967895508,
'max_lon': -73.8665771484
},
'label': 'East New York, Brooklyn, New York, NY, United States'
=======
'locality_gid': '85977539',
'label': 'East New York, Brooklyn, NY, USA'
>>>>>>>
'locality_gid': '85977539',
'label': 'East New York, Brooklyn, New York, NY, United States' |
<<<<<<<
//clean URL from example if opened
var search = window.location.search;
var newsearch = search.replace(/([?&]url=)[^&]*/, '');
window.history.pushState(search, "Title", newsearch);
=======
var search = window.location.search;
search = search.replace(/([?&]url=)[^&]*/, '');
window.location = window.location.protocol + '//' + window.location.host + window.location.pathname + search;
//BlocklyDuino.renderContent();
>>>>>>>
//clean URL from example if opened
var search = window.location.search;
var newsearch = search.replace(/([?&]url=)[^&]*/, '');
window.history.pushState(search, "Title", newsearch);
BlocklyDuino.renderContent(); |
<<<<<<<
Blockly.Msg.ROMEO_HELPURL = "http://www.dfrobot.com/wiki/index.php/Romeo_V2-All_in_one_Controller_%28R3%29_%28SKU:DFR0225%29";
//pbra 20160613 L298N
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_TITLE = "L298N Contrôleur Moteur";
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_INIT_TITLE = "L298N Contrôleur Moteur Init";
Blockly.Msg.ROBOTS_MOTORS_L298N_ID = "Identifiant"
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_SPEED = "Vitesse";
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_PIN_IN1 = "Broche IN1 (direction)";
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_PIN_IN2 = "Broche IN2 (direction)";
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_PIN_EN = "Broche EN (pwm)";
Blockly.Msg.ROBOTS_MOTORS_L298N_STOP = "arrêt";
Blockly.Msg.ROBOTS_MOTORS_L298N_FORWARD = "avance";
Blockly.Msg.ROBOTS_MOTORS_L298N_BACKWARD = "recul";
Blockly.Msg.ROBOTS_MOTORS_L298N_BRAKE = "frein";
Blockly.Msg.ROBOTS_MOTORS_L298N_INIT_TOOLTIP = "L298N, bloc d'initialisation (1 par moteur)";
Blockly.Msg.ROBOTS_MOTORS_L298N_TOOLTIP = "Bloc L298N, utiliser le même id que dans le bloc d'initialisation";
//pbra 20160607 PinMode
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_HELPURL = "https://www.arduino.cc/en/Reference/PinMode";
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_INPUT1 = "Changer le mode de fonctionnement de la broche";
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_INPUT2 = "à";
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_DROPDOWN = [["ENTREE", "INPUT"], ["SORTIE", "OUTPUT"], ["ENTREE_PULLUP", "INPUT_PULLUP"]];
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_TOOLTIP = "Configurer la broche spécifée pour fonctionner comme une entrée ou une sortie";
=======
Blockly.Msg.ROMEO_HELPURL = "http://www.dfrobot.com/wiki/index.php/Romeo_V2-All_in_one_Controller_%28R3%29_%28SKU:DFR0225%29";
//Added august 20th 2016
Blockly.Msg.FLYCAM_SWITCH_HELPURL = "http://tic.technologiescollege.fr/wiki/doku.php/fr/arduino/flycam";
Blockly.Msg.FLYCAM_SWITCH_TEXT = "changer le mode";
Blockly.Msg.FLYCAM_SWITCH_INPUT = "de la Flycam sur la broche n°";
Blockly.Msg.FLYCAM_SWITCH_TOOLTIP = "patienter car la commande doit se fixer pendant 3s puis une pause de 1s avant la suite";
Blockly.Msg.FLYCAM_RECORD_HELPURL = Blockly.Msg.FLYCAM_SWITCH_HELPURL;
Blockly.Msg.FLYCAM_RECORD_TEXT = "lancer la capture";
Blockly.Msg.FLYCAM_RECORD_INPUT = Blockly.Msg.FLYCAM_SWITCH_INPUT;
Blockly.Msg.FLYCAM_RECORD_TOOLTIP = "envoi d'une impulsion d'1s de type servo=180°";
Blockly.Msg.FLYCAM_STOP_HELPURL = Blockly.Msg.FLYCAM_SWITCH_HELPURL;
Blockly.Msg.FLYCAM_STOP_TEXT = "arrêter la capture";
Blockly.Msg.FLYCAM_STOP_INPUT = Blockly.Msg.FLYCAM_SWITCH_INPUT;
Blockly.Msg.FLYCAM_STOP_TOOLTIP = "envoi d'une impulsion d'1s de type servo=0°";
//Added august 23th 2016
Blockly.Msg.MHK_ULTRASON_HELPURL = "http://www.gotronic.fr/art-module-de-detection-us-hc-sr04-20912.htm";
Blockly.Msg.MHK_ULTRASON1 = "la distance mesurée en cm ";
Blockly.Msg.MHK_ULTRASON2 = "TRIG sur la broche ";
Blockly.Msg.MHK_ULTRASON3 = "ECHO sur la broche ";
Blockly.Msg.MHK_ULTRASON_TOOLTIP = "Détection d'obstacle par ultrason";
Blockly.Msg.MHK_MOTEUR_VIBREUR_HELPURL = "http://www.gotronic.fr/art-vibreur-miniature-vm1201-20685.htm";
Blockly.Msg.MHK_MOTEUR_VIBREUR1 = " faire vibrer le moteur sur la broche";
Blockly.Msg.MHK_MOTEUR_VIBREUR2 = "à la valeur";
Blockly.Msg.MHK_CAPTEUR_MYOWARE_HELPURL = "http://www.robotshop.com/eu/fr/capteur-electrique-muscle-myoware.html";
Blockly.Msg.MHK_CAPTEUR_MYOWARE1 = "la valeur lue par le capteur myoware ";
Blockly.Msg.MHK_CAPTEUR_MYOWARE2 = "sur la broche analogique ";
Blockly.Msg.MHK_CAPTEUR_MYOWARE_TOOLTIP = "myoware capteur musculaire";
Blockly.Msg.MHK_SERVO_MOTEUR1 = "positionne le servo-moteur";
Blockly.Msg.MHK_SERVO_MOTEUR2 = "de la broche";
Blockly.Msg.MHK_SERVO_MOTEUR3 = "à un angle de [0~180°]";
Blockly.Msg.MHK_SERVO_MOTEUR_TOOLTIP = "Sortie Servo-moteur (réf : MINI-SERVO)";
// added august 28th 2016
// blocks from Ardublockly project
Blockly.Msg.SPI_SETUP = "Setup";
Blockly.Msg.SPI_SETUP_CONF = "configuration:";
Blockly.Msg.SPI_SETUP_DIVIDE = "clock divide";
Blockly.Msg.SPI_SETUP_LSBFIRST = "LSBFIRST";
Blockly.Msg.SPI_SETUP_MODE = "SPI mode (idle - edge)";
Blockly.Msg.SPI_SETUP_MODE0 = "0 (Low - Falling)";
Blockly.Msg.SPI_SETUP_MODE1 = "1 (Low - Rising)";
Blockly.Msg.SPI_SETUP_MODE2 = "2 (High - Falling)";
Blockly.Msg.SPI_SETUP_MODE3 = "3 (High - Rising)";
Blockly.Msg.SPI_SETUP_MSBFIRST = "MSBFIRST";
Blockly.Msg.SPI_SETUP_SHIFT = "data shift";
Blockly.Msg.SPI_SETUP_TIP = "Configures the SPI peripheral.";
Blockly.Msg.SPI_TRANSRETURN_TIP = "Send a SPI message to an specified slave device and get data back.";
Blockly.Msg.SPI_TRANS_NONE = "none";
Blockly.Msg.SPI_TRANS_SLAVE = "to slave pin";
Blockly.Msg.SPI_TRANS_TIP = "Send a SPI message to an specified slave device.";
Blockly.Msg.SPI_TRANS_VAL = "transfer";
Blockly.Msg.SPI_TRANS_WARN1 = "A setup block for %1 must be added to the workspace to use this block!";
Blockly.Msg.SPI_TRANS_WARN2 = "Old pin value %1 is no longer available.";
Blockly.Msg.STEPPER_MOTOR = "stepper motor:";
Blockly.Msg.STEPPER_PIN1 = "pin1#";
Blockly.Msg.STEPPER_PIN2 = "pin2#";
Blockly.Msg.STEPPER_REVOLVS = "how many steps per revolution";
Blockly.Msg.STEPPER_SETUP = "Setup";
Blockly.Msg.STEPPER_SETUP_TIP = "Configures a stepper motor pinout and other settings.";
Blockly.Msg.STEPPER_SPEED = "set speed (rpm) to";
Blockly.Msg.STEPPER_STEP = "move stepper";
Blockly.Msg.STEPPER_STEPS = "steps";
Blockly.Msg.STEPPER_STEP_TIP = "Turns the stepper motor a specific number of steps.";
Blockly.Msg.STEPPER_STEP_WARN1 = "A STEPPER configuration block must be added to use this block!";
Blockly.Msg.STEPPER_STEP_WARN2 = "A Name input must be added to the Stepper configuration block!";
Blockly.Msg.STEPPER_STEP_WARN3 = "Selected stepper does not exist any more, please select a new one.";
//******** Esus Board (Mace Robotics)
Blockly.Msg.ESUS_EsusBoard_init = "initialisation carte Esus";
Blockly.Msg.ESUS_MOTOR1_SPEED = "moteur 1, vitesse :";
Blockly.Msg.ESUS_MOTOR1_DIRECTION = "sens rotation :";
Blockly.Msg.ESUS_MOTOR2_SPEED = "moteur 2, vitesse :";
Blockly.Msg.ESUS_MOTOR2_DIRECTION = "sens rotation :";
Blockly.Msg.ESUS_ANALOG = "entrée analogique :";
Blockly.Msg.ESUS_WIFI_SSID = "configuration WiFi mode infra SSID :";
Blockly.Msg.ESUS_WIFI_PASSWORD = "mot de passe";
Blockly.Msg.ESUS_WIFI_IP = "configuration adresse WiFi :";
Blockly.Msg.ESUS_WIFI_READ_STREAM = "lecture donnée WiFi";
Blockly.Msg.ESUS_WIFI_CONTAIN2 = "contient";
Blockly.Msg.ESUS_WIFI_CONTAIN = "donnée WiFi";
Blockly.Msg.ESUS_WIFI_DATA_AVAILABLE = "donnée WiFi disponible ?";
Blockly.Msg.ESUS_WIFI_AP = "configuration WiFi mode AP SSID:";
Blockly.Msg.ESUS_WIFI_AP_IP = "adresse IP :";
Blockly.Msg.ESUS_WIFI_SEND_STREAM = "envoyer donnée WiFi (texte)";
Blockly.Msg.ESUS_WIFI_SEND_FLOAT_STREAM = "envoyer donnée WiFi (nombre)";
//******** APDS9960 couleurs et mouvements
Blockly.Msg.APDS9960_MISC_HELPURL = "https://www.sparkfun.com/products/12787";
Blockly.Msg.APDS9960_INIT_TITLE = "initialisation du capteur APDS-9960";
Blockly.Msg.APDS9960_INIT_TOOLTIP = "test pour se calibrer sur la luminosité ambiante";
Blockly.Msg.APDS9960_TEST_TITLE = "test du capteur";
Blockly.Msg.APDS9960_TEST_TOOLTIP = "renvoie FAUX en cas d'erreur matérielle";
Blockly.Msg.APDS9960_AMBIENT_TITLE = "luminosité ambiante";
Blockly.Msg.APDS9960_AMBIENT_TOOLTIP = "renvoie une valeur pour la quantité de lumière mesurée";
Blockly.Msg.APDS9960_RED_TITLE = "code RVB de Rouge (0~255)";
Blockly.Msg.APDS9960_GREEN_TITLE = "code RVB de Vert (0~255)";
Blockly.Msg.APDS9960_BLUE_TITLE = "code RVB de Bleu (0~255)";
Blockly.Msg.APDS9960_COLORSENSOR_TOOLTIP = "renvoie une valeur codée sur 10 bits pour le mélange RVB classique";
>>>>>>>
Blockly.Msg.ROMEO_HELPURL = "http://www.dfrobot.com/wiki/index.php/Romeo_V2-All_in_one_Controller_%28R3%29_%28SKU:DFR0225%29";
//Added august 20th 2016
Blockly.Msg.FLYCAM_SWITCH_HELPURL = "http://tic.technologiescollege.fr/wiki/doku.php/fr/arduino/flycam";
Blockly.Msg.FLYCAM_SWITCH_TEXT = "changer le mode";
Blockly.Msg.FLYCAM_SWITCH_INPUT = "de la Flycam sur la broche n°";
Blockly.Msg.FLYCAM_SWITCH_TOOLTIP = "patienter car la commande doit se fixer pendant 3s puis une pause de 1s avant la suite";
Blockly.Msg.FLYCAM_RECORD_HELPURL = Blockly.Msg.FLYCAM_SWITCH_HELPURL;
Blockly.Msg.FLYCAM_RECORD_TEXT = "lancer la capture";
Blockly.Msg.FLYCAM_RECORD_INPUT = Blockly.Msg.FLYCAM_SWITCH_INPUT;
Blockly.Msg.FLYCAM_RECORD_TOOLTIP = "envoi d'une impulsion d'1s de type servo=180°";
Blockly.Msg.FLYCAM_STOP_HELPURL = Blockly.Msg.FLYCAM_SWITCH_HELPURL;
Blockly.Msg.FLYCAM_STOP_TEXT = "arrêter la capture";
Blockly.Msg.FLYCAM_STOP_INPUT = Blockly.Msg.FLYCAM_SWITCH_INPUT;
Blockly.Msg.FLYCAM_STOP_TOOLTIP = "envoi d'une impulsion d'1s de type servo=0°";
//Added august 23th 2016
Blockly.Msg.MHK_ULTRASON_HELPURL = "http://www.gotronic.fr/art-module-de-detection-us-hc-sr04-20912.htm";
Blockly.Msg.MHK_ULTRASON1 = "la distance mesurée en cm ";
Blockly.Msg.MHK_ULTRASON2 = "TRIG sur la broche ";
Blockly.Msg.MHK_ULTRASON3 = "ECHO sur la broche ";
Blockly.Msg.MHK_ULTRASON_TOOLTIP = "Détection d'obstacle par ultrason";
Blockly.Msg.MHK_MOTEUR_VIBREUR_HELPURL = "http://www.gotronic.fr/art-vibreur-miniature-vm1201-20685.htm";
Blockly.Msg.MHK_MOTEUR_VIBREUR1 = " faire vibrer le moteur sur la broche";
Blockly.Msg.MHK_MOTEUR_VIBREUR2 = "à la valeur";
Blockly.Msg.MHK_CAPTEUR_MYOWARE_HELPURL = "http://www.robotshop.com/eu/fr/capteur-electrique-muscle-myoware.html";
Blockly.Msg.MHK_CAPTEUR_MYOWARE1 = "la valeur lue par le capteur myoware ";
Blockly.Msg.MHK_CAPTEUR_MYOWARE2 = "sur la broche analogique ";
Blockly.Msg.MHK_CAPTEUR_MYOWARE_TOOLTIP = "myoware capteur musculaire";
Blockly.Msg.MHK_SERVO_MOTEUR1 = "positionne le servo-moteur";
Blockly.Msg.MHK_SERVO_MOTEUR2 = "de la broche";
Blockly.Msg.MHK_SERVO_MOTEUR3 = "à un angle de [0~180°]";
Blockly.Msg.MHK_SERVO_MOTEUR_TOOLTIP = "Sortie Servo-moteur (réf : MINI-SERVO)";
// added august 28th 2016
// blocks from Ardublockly project
Blockly.Msg.SPI_SETUP = "Setup";
Blockly.Msg.SPI_SETUP_CONF = "configuration:";
Blockly.Msg.SPI_SETUP_DIVIDE = "clock divide";
Blockly.Msg.SPI_SETUP_LSBFIRST = "LSBFIRST";
Blockly.Msg.SPI_SETUP_MODE = "SPI mode (idle - edge)";
Blockly.Msg.SPI_SETUP_MODE0 = "0 (Low - Falling)";
Blockly.Msg.SPI_SETUP_MODE1 = "1 (Low - Rising)";
Blockly.Msg.SPI_SETUP_MODE2 = "2 (High - Falling)";
Blockly.Msg.SPI_SETUP_MODE3 = "3 (High - Rising)";
Blockly.Msg.SPI_SETUP_MSBFIRST = "MSBFIRST";
Blockly.Msg.SPI_SETUP_SHIFT = "data shift";
Blockly.Msg.SPI_SETUP_TIP = "Configures the SPI peripheral.";
Blockly.Msg.SPI_TRANSRETURN_TIP = "Send a SPI message to an specified slave device and get data back.";
Blockly.Msg.SPI_TRANS_NONE = "none";
Blockly.Msg.SPI_TRANS_SLAVE = "to slave pin";
Blockly.Msg.SPI_TRANS_TIP = "Send a SPI message to an specified slave device.";
Blockly.Msg.SPI_TRANS_VAL = "transfer";
Blockly.Msg.SPI_TRANS_WARN1 = "A setup block for %1 must be added to the workspace to use this block!";
Blockly.Msg.SPI_TRANS_WARN2 = "Old pin value %1 is no longer available.";
Blockly.Msg.STEPPER_MOTOR = "stepper motor:";
Blockly.Msg.STEPPER_PIN1 = "pin1#";
Blockly.Msg.STEPPER_PIN2 = "pin2#";
Blockly.Msg.STEPPER_REVOLVS = "how many steps per revolution";
Blockly.Msg.STEPPER_SETUP = "Setup";
Blockly.Msg.STEPPER_SETUP_TIP = "Configures a stepper motor pinout and other settings.";
Blockly.Msg.STEPPER_SPEED = "set speed (rpm) to";
Blockly.Msg.STEPPER_STEP = "move stepper";
Blockly.Msg.STEPPER_STEPS = "steps";
Blockly.Msg.STEPPER_STEP_TIP = "Turns the stepper motor a specific number of steps.";
Blockly.Msg.STEPPER_STEP_WARN1 = "A STEPPER configuration block must be added to use this block!";
Blockly.Msg.STEPPER_STEP_WARN2 = "A Name input must be added to the Stepper configuration block!";
Blockly.Msg.STEPPER_STEP_WARN3 = "Selected stepper does not exist any more, please select a new one.";
//******** Esus Board (Mace Robotics)
Blockly.Msg.ESUS_EsusBoard_init = "initialisation carte Esus";
Blockly.Msg.ESUS_MOTOR1_SPEED = "moteur 1, vitesse :";
Blockly.Msg.ESUS_MOTOR1_DIRECTION = "sens rotation :";
Blockly.Msg.ESUS_MOTOR2_SPEED = "moteur 2, vitesse :";
Blockly.Msg.ESUS_MOTOR2_DIRECTION = "sens rotation :";
Blockly.Msg.ESUS_ANALOG = "entrée analogique :";
Blockly.Msg.ESUS_WIFI_SSID = "configuration WiFi mode infra SSID :";
Blockly.Msg.ESUS_WIFI_PASSWORD = "mot de passe";
Blockly.Msg.ESUS_WIFI_IP = "configuration adresse WiFi :";
Blockly.Msg.ESUS_WIFI_READ_STREAM = "lecture donnée WiFi";
Blockly.Msg.ESUS_WIFI_CONTAIN2 = "contient";
Blockly.Msg.ESUS_WIFI_CONTAIN = "donnée WiFi";
Blockly.Msg.ESUS_WIFI_DATA_AVAILABLE = "donnée WiFi disponible ?";
Blockly.Msg.ESUS_WIFI_AP = "configuration WiFi mode AP SSID:";
Blockly.Msg.ESUS_WIFI_AP_IP = "adresse IP :";
Blockly.Msg.ESUS_WIFI_SEND_STREAM = "envoyer donnée WiFi (texte)";
Blockly.Msg.ESUS_WIFI_SEND_FLOAT_STREAM = "envoyer donnée WiFi (nombre)";
//******** APDS9960 couleurs et mouvements
Blockly.Msg.APDS9960_MISC_HELPURL = "https://www.sparkfun.com/products/12787";
Blockly.Msg.APDS9960_INIT_TITLE = "initialisation du capteur APDS-9960";
Blockly.Msg.APDS9960_INIT_TOOLTIP = "test pour se calibrer sur la luminosité ambiante";
Blockly.Msg.APDS9960_TEST_TITLE = "test du capteur";
Blockly.Msg.APDS9960_TEST_TOOLTIP = "renvoie FAUX en cas d'erreur matérielle";
Blockly.Msg.APDS9960_AMBIENT_TITLE = "luminosité ambiante";
Blockly.Msg.APDS9960_AMBIENT_TOOLTIP = "renvoie une valeur pour la quantité de lumière mesurée";
Blockly.Msg.APDS9960_RED_TITLE = "code RVB de Rouge (0~255)";
Blockly.Msg.APDS9960_GREEN_TITLE = "code RVB de Vert (0~255)";
Blockly.Msg.APDS9960_BLUE_TITLE = "code RVB de Bleu (0~255)";
Blockly.Msg.APDS9960_COLORSENSOR_TOOLTIP = "renvoie une valeur codée sur 10 bits pour le mélange RVB classique";
//pbra 20160613 L298N
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_TITLE = "L298N Contrôleur Moteur";
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_INIT_TITLE = "L298N Contrôleur Moteur Init";
Blockly.Msg.ROBOTS_MOTORS_L298N_ID = "Identifiant"
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_SPEED = "Vitesse";
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_PIN_IN1 = "Broche IN1 (direction)";
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_PIN_IN2 = "Broche IN2 (direction)";
Blockly.Msg.ROBOTS_MOTORS_L298N_MOTOR_PIN_EN = "Broche EN (pwm)";
Blockly.Msg.ROBOTS_MOTORS_L298N_STOP = "arrêt";
Blockly.Msg.ROBOTS_MOTORS_L298N_FORWARD = "avance";
Blockly.Msg.ROBOTS_MOTORS_L298N_BACKWARD = "recul";
Blockly.Msg.ROBOTS_MOTORS_L298N_BRAKE = "frein";
Blockly.Msg.ROBOTS_MOTORS_L298N_INIT_TOOLTIP = "L298N, bloc d'initialisation (1 par moteur)";
Blockly.Msg.ROBOTS_MOTORS_L298N_TOOLTIP = "Bloc L298N, utiliser le même id que dans le bloc d'initialisation";
//pbra 20160607 PinMode
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_HELPURL = "https://www.arduino.cc/en/Reference/PinMode";
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_INPUT1 = "Changer le mode de fonctionnement de la broche";
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_INPUT2 = "à";
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_DROPDOWN = [["ENTREE", "INPUT"], ["SORTIE", "OUTPUT"], ["ENTREE_PULLUP", "INPUT_PULLUP"]];
Blockly.Msg.ARDUINO_INOUT_DIGITAL_MODE_TOOLTIP = "Configurer la broche spécifée pour fonctionner comme une entrée ou une sortie"; |
<<<<<<<
"path": prefix,
"description": route.settings.description
});
=======
"path": prefix
})
>>>>>>>
"path": prefix
});
<<<<<<<
apiData.routes.forEach(function(route, indexA) {
var api = {
"path": route.path,
"description": route.description,
"operations": [{
"method": route.method,
"summary": route.description,
"nickname": route.path.replace(/\//gi, '').replace(/\{/gi, '').replace(/\}/gi, ''),
"notes": route.notes,
"type": 'void',
"parameters": []
}]
};
var op = api.operations[0];
// build up swagger properties for route validation
var pathProperties = internals.validatorsToProperties(route.pathParams, swagger.models);
var queryProperties = internals.validatorsToProperties(route.queryParams, swagger.models);
var payloadProperty = internals.validatorToProperty(op.nickname, route.payloadParams, swagger.models);
if(payloadProperty && payloadProperty.type !== 'void') {
payloadProperty.required = true;
=======
apiData.routes.forEach(function (route, indexA) {
var notesStatus = internals.getResponseMessages( route.notes ),
api = {
"path": route.path,
"description": route.description,
"operations": [{
"httpMethod": route.method,
"summary": route.description,
"nickname": route.path.replace(/\//gi,'').replace(/{/gi,'').replace(/}/gi,''),
"notes": notesStatus.notes,
"responseClass": "void"
}]
};
if( notesStatus.responseMessages.length > -1 ) {
api.operations[0].responseMessages = notesStatus.responseMessages;
}
// add the query parameters
api.operations[0].parameters = [];
if(route.pathParams){
route.pathParams.forEach(function (param, indexB) {
api.operations[0].parameters.push(convertParam(param, 'path'))
})
}
if(route.payloadParams){
route.payloadParams.forEach(function (param, indexB) {
api.operations[0].parameters.push(convertParam(param, 'payload'))
})
>>>>>>>
apiData.routes.forEach(function(route, indexA) {
var api = {
"path": route.path,
"description": route.description,
"operations": [{
"method": route.method,
"summary": route.description,
"nickname": route.path.replace(/\//gi, '').replace(/\{/gi, '').replace(/\}/gi, ''),
"notes": route.notes,
"type": 'void',
"parameters": []
}]
};
var op = api.operations[0];
var notesStatus = internals.getResponseMessages(route.notes);
if (notesStatus.responseMessages.length > -1) {
op.responseMessages = notesStatus.responseMessages;
}
// build up swagger properties for route validation
var pathProperties = internals.validatorsToProperties(route.pathParams, swagger.models);
var queryProperties = internals.validatorsToProperties(route.queryParams, swagger.models);
var payloadProperty = internals.validatorToProperty(op.nickname, route.payloadParams, swagger.models);
if (payloadProperty && payloadProperty.type !== 'void') {
payloadProperty.required = true; |
<<<<<<<
import OneWithThePack from './modules/talents/OneWithThePack';
=======
import AspectOfTheBeast from './modules/talents/AspectOfTheBeast';
import SpittingCobra from './modules/talents/SpittingCobra';
import ScentOfBlood from './modules/talents/ScentOfBlood';
>>>>>>>
import OneWithThePack from './modules/talents/OneWithThePack';
import AspectOfTheBeast from './modules/talents/AspectOfTheBeast';
import SpittingCobra from './modules/talents/SpittingCobra';
import ScentOfBlood from './modules/talents/ScentOfBlood';
<<<<<<<
oneWithThePack: OneWithThePack,
=======
aspectOfTheBeast: AspectOfTheBeast,
spittingCobra: SpittingCobra,
scentOfBlood: ScentOfBlood,
>>>>>>>
oneWithThePack: OneWithThePack,
aspectOfTheBeast: AspectOfTheBeast,
spittingCobra: SpittingCobra,
scentOfBlood: ScentOfBlood, |
<<<<<<<
export * from './video_list_item';
export * from './spinner';
=======
export * from './video_list_item';
export * from './progress_bar';
>>>>>>>
export * from './video_list_item';
export * from './spinner';
export * from './progress_bar'; |
<<<<<<<
UNBENDING_POTION: {
id: 127845,
name: 'Unbending Potion',
icon: 'inv_alchemy_70_flask04',
},
=======
SPIRIT_BERRIES: {
id: 223573,
name: 'Spirit Berries',
icon: 'inv_misc_food_93_skethylberries',
},
>>>>>>>
UNBENDING_POTION: {
id: 127845,
name: 'Unbending Potion',
icon: 'inv_alchemy_70_flask04',
},
SPIRIT_BERRIES: {
id: 223573,
name: 'Spirit Berries',
icon: 'inv_misc_food_93_skethylberries',
}, |
<<<<<<<
try {
const json = await fetchWcl(`report/fights/${code}`, {
_: refresh ? +new Date() : undefined,
translate: true, // so long as we don't have the entire site localized, it's better to have 1 consistent language
});
// console.log('Received report', code, ':', json);
if (this.reportCode === code) {
if (!json.fights) {
let message = 'Corrupt WCL response received.';
if (json.error) {
message = json.error;
if (json.message) {
try {
const errorMessage = JSON.parse(json.message);
if (errorMessage.error) {
message = errorMessage.error;
=======
return fetchWcl(`report/fights/${code}`, {
_: refresh ? +new Date() : undefined,
translate: true, // so long as we don't have the entire site localized, it's better to have 1 consistent language
})
.then(json => {
// console.log('Received report', code, ':', json);
if (this.reportCode === code) {
if (!json.fights) {
let message = 'Corrupt WCL response received.';
if (json.error) {
message = json.error;
if (json.message) {
try {
const errorMessage = JSON.parse(json.message);
if (errorMessage.error) {
message = errorMessage.error;
}
} catch (error) {
// We don't care about an error parsing the error, message's default value is fine
>>>>>>>
try {
const json = await fetchWcl(`report/fights/${code}`, {
_: refresh ? +new Date() : undefined,
translate: true, // so long as we don't have the entire site localized, it's better to have 1 consistent language
});
// console.log('Received report', code, ':', json);
if (this.reportCode === code) {
if (!json.fights) {
let message = 'Corrupt WCL response received.';
if (json.error) {
message = json.error;
if (json.message) {
try {
const errorMessage = JSON.parse(json.message);
if (errorMessage.error) {
message = errorMessage.error;
<<<<<<<
=======
})
.catch((err) => {
Raven && Raven.captureException(err); // eslint-disable-line no-undef
alert(`I'm so terribly sorry, an error occured. Try again later, in an updated Google Chrome and make sure that Warcraft Logs is up and functioning properly. Please let us know on Discord if the problem persists.\n\n${err}`);
console.error(err);
>>>>>>> |
<<<<<<<
import SoulOfTheSlayer from '../Shared/Modules/Items/SoulOfTheSlayer';
=======
import AngerOfTheHalfGiants from './Modules/Items/AngerOfTheHalfGiants';
>>>>>>>
import SoulOfTheSlayer from '../Shared/Modules/Items/SoulOfTheSlayer';
import AngerOfTheHalfGiants from './Modules/Items/AngerOfTheHalfGiants';
<<<<<<<
soulOfTheSlayer: SoulOfTheSlayer,
=======
angerOfTheHalfGiants: AngerOfTheHalfGiants,
>>>>>>>
soulOfTheSlayer: SoulOfTheSlayer,
angerOfTheHalfGiants: AngerOfTheHalfGiants, |
<<<<<<<
=======
var parse = function(type, eventType, ignore){
if (ignore && ignore.contains(type.toLowerCase())) return type;
type = type.toLowerCase().replace(/^(keyup|keydown):/, function($0, $1){
eventType = $1;
return '';
});
if (!parsed[type]){
var key = '', mods = {};
type.split('+').each(function(part){
if (regex.test(part)) mods[part] = true;
else key = part;
});
mods.control = mods.control || mods.ctrl; // allow both control and ctrl
var match = '';
modifiers.each(function(mod){
if (mods[mod]) match += mod + '+';
});
parsed[type] = match + key;
}
return eventType + ':' + parsed[type];
};
>>>>>>>
<<<<<<<
events: {},
nonParsedEvents: ["activate", "deactivate", "onactivate", "ondeactivate", "changed", "onchanged"]
=======
events: {},
nonParsedEvents: ["activate", "deactivate", "onactivate", "ondeactivate"]
>>>>>>>
events: {},
nonParsedEvents: ["activate", "deactivate", "onactivate", "ondeactivate", "changed", "onchanged"]
<<<<<<<
if (Keyboard.manager) Keyboard.manager.manage(this);
=======
this.setup();
},
setup: function(){
this.addEvents(this.options.events);
if (Keyboard.manager) Keyboard.manager.manage(this);
>>>>>>>
this.setup();
},
setup: function(){
this.addEvents(this.options.events);
if (Keyboard.manager) Keyboard.manager.manage(this);
<<<<<<<
return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn, internal);
=======
return this.parent(parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn, internal);
>>>>>>>
return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn, internal);
<<<<<<<
return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn);
=======
return this.parent(parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn);
>>>>>>>
return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn);
<<<<<<<
=======
if (this.active) return this;
this.active = true;
>>>>>>>
<<<<<<<
return this.disable();
=======
if (!this.active) return this;
this.active = false;
return this.fireEvent('deactivate');
>>>>>>>
return this.disable();
<<<<<<<
this.activeKB = instance.fireEvent('activate');
Keyboard.manager.fireEvent('changed');
=======
this.activeKB = instance;
if (instance.active) instance.fireEvent('activate');
>>>>>>>
this.activeKB = instance.fireEvent('activate');
Keyboard.manager.fireEvent('changed'); |
<<<<<<<
'<option value="US">United States</option>',
=======
'<option value="GB">United Kingdom</option>',
'<option value="IE">Ireland</option>',
>>>>>>>
'<option value="US">United States</option>',
<<<<<<<
it('France postal code', function() {
this.bv.updateOption('zc', 'zipCode', 'country', 'FR');
// Valid samples
var validSamples = ['12340', '01230', '75116'];
for (var i in validSamples) {
this.bv.resetForm();
this.$zipCode.val(validSamples[i]);
this.bv.validate();
expect(this.bv.isValid()).toBeTruthy();
}
// Invalid samples
var invalidSamples = ['123 45', '12 345', '123456', '1 2345', '1234 5', '12 3 45', '1234A'];
for (i in invalidSamples) {
this.bv.resetForm();
this.$zipCode.val(invalidSamples[i]);
this.bv.validate();
expect(this.bv.isValid()).toEqual(false);
}
});
=======
it('Eircode (Ireland postal code)', function() {
this.bv.updateOption('zc', 'zipCode', 'country', 'IE');
// Valid samples
var validSamples = ['A65 F4E2', 'D6W FNT4', 'T37 F8HK'];
for (var i in validSamples) {
this.bv.resetForm();
this.$zipCode.val(validSamples[i]);
this.bv.validate();
expect(this.bv.isValid()).toBeTruthy();
}
// Invalid samples
var invalidSamples = ['a65 f4e2', 'D6W FNTO', 'T37F8HK'];
for (i in invalidSamples) {
this.bv.resetForm();
this.$zipCode.val(invalidSamples[i]);
this.bv.validate();
expect(this.bv.isValid()).toEqual(false);
}
});
>>>>>>>
it('France postal code', function() {
this.bv.updateOption('zc', 'zipCode', 'country', 'FR');
// Valid samples
var validSamples = ['12340', '01230', '75116'];
for (var i in validSamples) {
this.bv.resetForm();
this.$zipCode.val(validSamples[i]);
this.bv.validate();
expect(this.bv.isValid()).toBeTruthy();
}
// Invalid samples
var invalidSamples = ['123 45', '12 345', '123456', '1 2345', '1234 5', '12 3 45', '1234A'];
for (i in invalidSamples) {
this.bv.resetForm();
this.$zipCode.val(invalidSamples[i]);
this.bv.validate();
expect(this.bv.isValid()).toEqual(false);
}
});
it('Eircode (Ireland postal code)', function() {
this.bv.updateOption('zc', 'zipCode', 'country', 'IE');
// Valid samples
var validSamples = ['A65 F4E2', 'D6W FNT4', 'T37 F8HK'];
for (var i in validSamples) {
this.bv.resetForm();
this.$zipCode.val(validSamples[i]);
this.bv.validate();
expect(this.bv.isValid()).toBeTruthy();
}
// Invalid samples
var invalidSamples = ['a65 f4e2', 'D6W FNTO', 'T37F8HK'];
for (i in invalidSamples) {
this.bv.resetForm();
this.$zipCode.val(invalidSamples[i]);
this.bv.validate();
expect(this.bv.isValid()).toEqual(false);
}
}); |
<<<<<<<
'BA', 'BG', 'BR', 'CH', 'CL', 'CZ', 'DK', 'EE', 'ES', 'FI', 'HR', 'IE', 'IS', 'LT', 'LV', 'ME', 'MK', 'NL',
'RO', 'RS', 'SE', 'SI', 'SK', 'SM', 'TH', 'ZA'
=======
'BA', 'BG', 'BR', 'CH', 'CL', 'CN', 'CZ', 'DK', 'EE', 'ES',
'FI', 'HR', 'IE', 'IS', 'LT', 'LV', 'ME', 'MK', 'NL', 'RO',
'RS', 'SE', 'SI', 'SK', 'SM', 'ZA'
>>>>>>>
'BA', 'BG', 'BR', 'CH', 'CL', 'CN', 'CZ', 'DK', 'EE', 'ES', 'FI', 'HR', 'IE', 'IS', 'LT', 'LV', 'ME', 'MK', 'NL',
'RO', 'RS', 'SE', 'SI', 'SK', 'SM', 'TH', 'ZA' |
<<<<<<<
isValidField = $allErrors.filter(function() {
var v = $(this).attr('data-bv-validator');
return $field.data('bv.result.' + v) != that.STATUS_VALID;
}).length == 0;
this.disableSubmitButtons(!isValidField);
=======
var validField = ($errors.filter(function() {
var display = $(this).css('display'), v = $(this).attr('data-bv-validator');
return ('block' == display) || ($field.data('bv.result.' + v) != that.STATUS_VALID);
}).length == 0);
this.disableSubmitButtons(this.isValid() ? false : true);
>>>>>>>
isValidField = $allErrors.filter(function() {
var v = $(this).attr('data-bv-validator');
return $field.data('bv.result.' + v) != that.STATUS_VALID;
}).length == 0;
this.disableSubmitButtons(this.isValid() ? false : true); |
<<<<<<<
BR: 'Codice postale Brasiliano',
CA: 'Codice postale Canadese',
DK: 'Codice postale Danese',
GB: 'Codice postale del Regno Unito',
IT: 'Codice postale Italiano',
NL: 'Codice postale Olandese',
SE: 'Codice postale Svizzero',
SG: 'Codice postale di Singapore',
US: 'Codice postale US'
=======
CA: 'Codice postale Canadese',
DK: 'Codice postale Danese',
GB: 'Codice postale del Regno Unito',
IT: 'Codice postale Italiano',
MA: 'Codice postale Marocco',
NL: 'Codice postale Olandese',
SE: 'Codice postale Svizzero',
SG: 'Codice postale di Singapore',
US: 'Codice postale US'
>>>>>>>
BR: 'Codice postale Brasiliano',
CA: 'Codice postale Canadese',
DK: 'Codice postale Danese',
GB: 'Codice postale del Regno Unito',
IT: 'Codice postale Italiano',
MA: 'Codice postale Marocco',
NL: 'Codice postale Olandese',
SE: 'Codice postale Svizzero',
SG: 'Codice postale di Singapore',
US: 'Codice postale US' |
<<<<<<<
},
/**
* Destroy the plugin
* It will remove all error messages, feedback icons and turn off the events
*/
destroy: function() {
var field, fields, $field, validator, $icon, container;
for (field in this.options.fields) {
fields = this.getFieldElements(field);
container = this.options.fields[field].container || this.options.container;
for (var i = 0; i < fields.length; i++) {
$field = $(fields[i]);
$field
// Remove all error messages
.data('bv.messages')
.find('.help-block[data-bv-validator][data-bv-for="' + field + '"]').remove().end()
.end()
.removeData('bv.messages')
// Remove feedback classes
.parents('.form-group')
.removeClass('has-feedback has-error has-success')
.end()
// Turn off events
.off('.bv')
.removeAttr('data-bv-field');
// Remove feedback icons, tooltip/popover container
$icon = $field.parents('.form-group').find('i[data-bv-icon-for="' + field + '"]');
if ($icon) {
switch (container) {
case 'tooltip':
$icon.tooltip('destroy').remove();
break;
case 'popover':
$icon.popover('destroy').remove();
break;
default:
$icon.remove();
break;
}
}
for (validator in this.options.fields[field].validators) {
$field.removeData('bv.result.' + validator).removeData('bv.dfs.' + validator);
}
}
}
// Enable submit buttons
this.disableSubmitButtons(false);
this.$form
.removeClass(this.options.elementClass)
.off('.bv')
.removeData('bootstrapValidator')
// Remove generated hidden elements
.find('[data-bv-submit-hidden]').remove();
=======
},
/**
* Add a new field validation
*
* @param {String} field The field name
* @param {Object} Map the field name with validator rules
*
* @return {BootstrapValidator}
*/
addField: function(field, properties) {
this.options.fields[field] = properties;
this._initField(field);
return this;
},
/**
* Remove a field validation
*
* @param {String} field The field name
*
* @return {BootstrapValidator}
*/
removeField: function(field) {
delete this.options.fields[field];
return this;
>>>>>>>
},
/**
* Destroy the plugin
* It will remove all error messages, feedback icons and turn off the events
*/
destroy: function() {
var field, fields, $field, validator, $icon, container;
for (field in this.options.fields) {
fields = this.getFieldElements(field);
container = this.options.fields[field].container || this.options.container;
for (var i = 0; i < fields.length; i++) {
$field = $(fields[i]);
$field
// Remove all error messages
.data('bv.messages')
.find('.help-block[data-bv-validator][data-bv-for="' + field + '"]').remove().end()
.end()
.removeData('bv.messages')
// Remove feedback classes
.parents('.form-group')
.removeClass('has-feedback has-error has-success')
.end()
// Turn off events
.off('.bv')
.removeAttr('data-bv-field');
// Remove feedback icons, tooltip/popover container
$icon = $field.parents('.form-group').find('i[data-bv-icon-for="' + field + '"]');
if ($icon) {
switch (container) {
case 'tooltip':
$icon.tooltip('destroy').remove();
break;
case 'popover':
$icon.popover('destroy').remove();
break;
default:
$icon.remove();
break;
}
}
for (validator in this.options.fields[field].validators) {
$field.removeData('bv.result.' + validator).removeData('bv.dfs.' + validator);
}
}
}
// Enable submit buttons
this.disableSubmitButtons(false);
this.$form
.removeClass(this.options.elementClass)
.off('.bv')
.removeData('bootstrapValidator')
// Remove generated hidden elements
.find('[data-bv-submit-hidden]').remove();
},
/**
* Add a new field validation
*
* @param {String} field The field name
* @param {Object} Map the field name with validator rules
*
* @return {BootstrapValidator}
*/
addField: function(field, properties) {
this.options.fields[field] = properties;
this._initField(field);
return this;
},
/**
* Remove a field validation
*
* @param {String} field The field name
*
* @return {BootstrapValidator}
*/
removeField: function(field) {
delete this.options.fields[field];
return this; |
<<<<<<<
_react2['default'].render(component, document.getElementById('test'));
=======
var instance = (0, _reactDom.render)(component, document.getElementById('test'));
>>>>>>>
(0, _reactDom.render)(component, document.getElementById('test')); |
<<<<<<<
import TwistedClaws from './modules/azeritetraits/TwistedClaws';
=======
import LayeredMane from './modules/azeritetraits/LayeredMane';
>>>>>>>
import TwistedClaws from './modules/azeritetraits/TwistedClaws';
import LayeredMane from './modules/azeritetraits/LayeredMane';
<<<<<<<
// Azerite Traits
twistedClaws: TwistedClaws,
=======
// Azerite
layeredMane: LayeredMane,
>>>>>>>
// Azerite Traits
twistedClaws: TwistedClaws,
layeredMane: LayeredMane, |
<<<<<<<
this.leafletElement = (0, _leaflet.imageOverlay)(url, bounds, this.getOptions(props));
}
}, {
key: 'componentDidUpdate',
value: function componentDidUpdate(prevProps) {
if (this.props.url !== prevProps.url) {
this.leafletElement.setUrl(this.props.url);
}
if (this.props.opacity !== prevProps.opacity) {
this.leafletElement.setOpacity(this.props.opacity);
}
=======
this.leafletElement = (0, _leaflet.imageOverlay)(url, bounds, props);
};
ImageOverlay.prototype.componentDidUpdate = function componentDidUpdate(prevProps) {
if (this.props.url !== prevProps.url) {
this.leafletElement.setUrl(this.props.url);
>>>>>>>
this.leafletElement = (0, _leaflet.imageOverlay)(url, bounds, this.getOptions(props));
};
ImageOverlay.prototype.componentDidUpdate = function componentDidUpdate(prevProps) {
if (this.props.url !== prevProps.url) {
this.leafletElement.setUrl(this.props.url); |
<<<<<<<
}
=======
removeLayerControl: PropTypes.func,
};
>>>>>>>
removeLayerControl: PropTypes.func,
}
<<<<<<<
removeLayer (layer) {
this.props.removeLayer(layer)
=======
componentWillUnmount() {
this.props.removeLayerControl(this.layer);
}
removeLayer(layer) {
this.props.removeLayer(layer);
>>>>>>>
componentWillUnmount () {
this.props.removeLayerControl(this.layer)
}
removeLayer (layer) {
this.props.removeLayer(layer)
<<<<<<<
static contextTypes = {
layerContainer: layerContainerType,
map: mapType,
};
componentWillMount () {
const { children: _children, ...options } = this.props
this.leafletElement = control.layers(undefined, undefined, options)
this.controlProps = {
addBaseLayer: ::this.addBaseLayer,
addOverlay: ::this.addOverlay,
removeLayer: ::this.removeLayer,
=======
componentWillMount() {
const {
baseLayers,
children: _children,
layerContainer: _lc,
map: _map,
overlays,
...options,
} = this.props;
// Pre-v0.11 behavior, warn in v0.11, remove in v0.12
this.legacy = !!(baseLayers || overlays);
if (this.legacy) {
warning(false, 'The "baseLayers" and "overlays" properties for "LayersControl" are deprecated and will be removed in the next version. You should use the "LayersControl.BaseLayer" and "LayersControl.Overlay" instead, see the documentation for more information.')
this.leafletElement = control.layers(baseLayers, overlays, options);
}
else {
this.leafletElement = control.layers(undefined, undefined, options);
this.controlProps = {
addBaseLayer: ::this.addBaseLayer,
addOverlay: ::this.addOverlay,
removeLayer: ::this.removeLayer,
removeLayerControl: ::this.removeLayerControl,
};
>>>>>>>
static contextTypes = {
layerContainer: layerContainerType,
map: mapType,
};
componentWillMount () {
const { children: _children, ...options } = this.props
this.leafletElement = control.layers(undefined, undefined, options)
this.controlProps = {
addBaseLayer: ::this.addBaseLayer,
addOverlay: ::this.addOverlay,
removeLayer: ::this.removeLayer,
removeLayerControl: ::this.removeLayerControl,
<<<<<<<
render () {
const children = Children.map(this.props.children, child => {
return child ? cloneElement(child, this.controlProps) : null
})
return <div style={{display: 'none'}}>{children}</div>
=======
removeLayerControl(layer) {
this.leafletElement.removeLayer(layer);
}
getClonedChildrenWithProps(extra) {
const { children, layerContainer, map } = this.props;
const props = assign({layerContainer, map}, extra);
return Children.map(children, child => {
return child ? cloneElement(child, props) : null;
});
}
render() {
if (this.legacy) {
return null;
}
const children = this.getClonedChildrenWithProps(this.controlProps);
return <div style={{display: 'none'}}>{children}</div>;
>>>>>>>
removeLayerControl (layer) {
this.leafletElement.removeLayer(layer)
}
render () {
const children = Children.map(this.props.children, child => {
return child ? cloneElement(child, this.controlProps) : null
})
return <div style={{display: 'none'}}>{children}</div> |
<<<<<<<
_createClass(LayerGroup, [{
key: 'getChildContext',
value: function getChildContext() {
return {
layerContainer: this.leafletElement
};
}
}, {
key: 'componentWillMount',
value: function componentWillMount() {
_get(LayerGroup.prototype.__proto__ || Object.getPrototypeOf(LayerGroup.prototype), 'componentWillMount', this).call(this);
this.leafletElement = (0, _leaflet.layerGroup)(this.getOptions());
}
}]);
=======
LayerGroup.prototype.getChildContext = function getChildContext() {
return {
layerContainer: this.leafletElement
};
};
LayerGroup.prototype.componentWillMount = function componentWillMount() {
_MapLayer.prototype.componentWillMount.call(this);
this.leafletElement = (0, _leaflet.layerGroup)();
};
>>>>>>>
LayerGroup.prototype.getChildContext = function getChildContext() {
return {
layerContainer: this.leafletElement
};
};
LayerGroup.prototype.componentWillMount = function componentWillMount() {
_MapLayer.prototype.componentWillMount.call(this);
this.leafletElement = (0, _leaflet.layerGroup)(this.getOptions());
}; |
<<<<<<<
targetBefore,
moveWithinTree;
=======
targetBefore,
targetBeforeBuffer,
targetHeight,
targetChildElm,
targetChildHeight;
>>>>>>>
targetBefore,
moveWithinTree,
targetBeforeBuffer,
targetHeight,
targetChildElm,
targetChildHeight;
<<<<<<<
targetBefore = eventObj.pageY < (targetOffset.top + UiTreeHelper.height(targetElm) / 2);
=======
targetHeight = UiTreeHelper.height(targetElm);
targetChildElm = targetNode.$childNodesScope ? targetNode.$childNodesScope.$element : null;
targetChildHeight = targetChildElm ? UiTreeHelper.height(targetChildElm) : 0;
targetHeight -= targetChildHeight;
targetBeforeBuffer = config.appendChildOnHover ? targetHeight * 0.25 : UiTreeHelper.height(targetElm) / 2;
targetBefore = targetNode.horizontal ? eventObj.pageX < (targetOffset.left + UiTreeHelper.width(targetElm) / 2)
: eventObj.pageY < (targetOffset.top + targetBeforeBuffer);
>>>>>>>
targetHeight = UiTreeHelper.height(targetElm);
targetChildElm = targetNode.$childNodesScope ? targetNode.$childNodesScope.$element : null;
targetChildHeight = targetChildElm ? UiTreeHelper.height(targetChildElm) : 0;
targetHeight -= targetChildHeight;
targetBeforeBuffer = config.appendChildOnHover ? targetHeight * 0.25 : UiTreeHelper.height(targetElm) / 2;
targetBefore = eventObj.pageY < (targetOffset.top + targetBeforeBuffer); |
<<<<<<<
* @name hippo.theme#height
* @methodOf ui.tree.service:UiTreeHelper
=======
* @name ui.tree#height
* @methodOf ui.tree.service:$helper
>>>>>>>
* @name ui.tree#height
* @methodOf ui.tree.service:UiTreeHelper
<<<<<<<
* @name hippo.theme#width
* @methodOf ui.tree.service:UiTreeHelper
=======
* @name ui.tree#width
* @methodOf ui.tree.service:$helper
>>>>>>>
* @name ui.tree#width
* @methodOf ui.tree.service:UiTreeHelper
<<<<<<<
* @name hippo.theme#offset
* @methodOf ui.nestedSortable.service:UiTreeHelper
=======
* @name ui.tree#offset
* @methodOf ui.nestedSortable.service:$helper
>>>>>>>
* @name ui.tree#offset
* @methodOf ui.nestedSortable.service:UiTreeHelper
<<<<<<<
* @name hippo.theme#positionStarted
* @methodOf ui.tree.service:UiTreeHelper
=======
* @name ui.tree#positionStarted
* @methodOf ui.tree.service:$helper
>>>>>>>
* @name ui.tree#positionStarted
* @methodOf ui.tree.service:UiTreeHelper |
<<<<<<<
import DogCard from './DogCard';
=======
import Dog from './Dog';
>>>>>>>
import Dog from './Dog';
<<<<<<<
<Box key={dog.id} p={2} width={[1, 1 / 2, 1 / 3, 1 / 4]}>
<DogCard id={dog.id} breed={dog.name} />
=======
<Box key={dog.id} p={2}>
<Dog dog={dog} />
>>>>>>>
<Box key={dog.id} p={2} width={[1, 1 / 2, 1 / 3, 1 / 4]}>
<Dog dog={dog} /> |
<<<<<<<
var transpiler = require('@babel/core');
var workerpool = require('workerpool');
var Promise = require('rsvp').Promise;
var ParallelApi = require('./parallel-api');
=======
const transpiler = require('babel-core');
const workerpool = require('workerpool');
const Promise = require('rsvp').Promise;
const ParallelApi = require('./parallel-api');
>>>>>>>
const transpiler = require('@babel/core');
const workerpool = require('workerpool');
const Promise = require('rsvp').Promise;
const ParallelApi = require('./parallel-api'); |
<<<<<<<
describe('_generateDepGraph', function() {
beforeEach(function() {
mockFs({
'tmp': {}
});
babel = new Babel('foo');
babel.outputPath = 'tmp'
});
afterEach(function() {
mockFs.restore();
babel.outputPath = null;
});
it('should generate a graph', function() {
babel._cache.keys = function() {
return ['foo.js', 'bar.js'];
};
babel.moduleMetadata = {
foo: {},
bar: {}
};
babel._generateDepGraph();
expect(fs.readFileSync(path.join(babel.outputPath, 'dep-graph.json'), 'utf8')).to.eql(stringify({
bar: {},
foo: {}
}, { space: 2 }));
});
it('should evict imports from the graph that are no longer in the tree', function() {
babel._cache.keys = function() {
return ['foo.js'];
};
babel.moduleMetadata = {
foo: {}
};
babel._generateDepGraph();
expect(fs.readFileSync(path.join(babel.outputPath, 'dep-graph.json'), 'utf8')).to.eql(stringify({
foo: {}
}, { space: 2 }));
});
});
=======
});
describe('consume broccoli-babel-transpiler options', function() {
it('enabled', function() {
var options = {
exportModuleMetadata: true,
browserPolyfill: true
};
babel = new Babel('foo', options);
var code = babel.processString('path', 'relativePath');
expect(code).to.be.ok;
});
it('explicitly disabled', function() {
var options = {
exportModuleMetadata: false,
browserPolyfill: false
};
babel = new Babel('foo', options);
var code = babel.processString('path', 'relativePath');
expect(code).to.be.ok;
});
>>>>>>>
describe('_generateDepGraph', function() {
beforeEach(function() {
mockFs({
'tmp': {}
});
babel = new Babel('foo');
babel.outputPath = 'tmp'
});
afterEach(function() {
mockFs.restore();
babel.outputPath = null;
});
it('should generate a graph', function() {
babel._cache.keys = function() {
return ['foo.js', 'bar.js'];
};
babel.moduleMetadata = {
foo: {},
bar: {}
};
babel._generateDepGraph();
expect(fs.readFileSync(path.join(babel.outputPath, 'dep-graph.json'), 'utf8')).to.eql(stringify({
bar: {},
foo: {}
}, { space: 2 }));
});
it('should evict imports from the graph that are no longer in the tree', function() {
babel._cache.keys = function() {
return ['foo.js'];
};
babel.moduleMetadata = {
foo: {}
};
babel._generateDepGraph();
expect(fs.readFileSync(path.join(babel.outputPath, 'dep-graph.json'), 'utf8')).to.eql(stringify({
foo: {}
}, { space: 2 }));
});
});
});
describe('consume broccoli-babel-transpiler options', function() {
it('enabled', function() {
var options = {
exportModuleMetadata: true,
browserPolyfill: true
};
babel = new Babel('foo', options);
var code = babel.processString('path', 'relativePath');
expect(code).to.be.ok;
});
it('explicitly disabled', function() {
var options = {
exportModuleMetadata: false,
browserPolyfill: false
};
babel = new Babel('foo', options);
var code = babel.processString('path', 'relativePath');
expect(code).to.be.ok;
}); |
<<<<<<<
var electron = __webpack_require__(2);
var Editor = __webpack_require__(6).default;
=======
var electron = __webpack_require__(3);
var Editor = __webpack_require__(7).default;
>>>>>>>
var electron = __webpack_require__(2);
var Editor = __webpack_require__(7).default;
<<<<<<<
/* 16 */
=======
/* 16 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
/**
* CodeX Note ShortCuts class
* Handles keyDowns on Note.
*
* Used to create shortcuts on element
*/
/**
* List of key codes
*/
var keyCodes = {
'0': 48,
'1': 49,
'2': 50,
'3': 51,
'4': 52,
'5': 53,
'6': 54,
'7': 55,
'8': 56,
'9': 57,
'A': 65,
'B': 66,
'C': 67,
'D': 68,
'E': 69,
'F': 70,
'G': 71,
'H': 72,
'I': 73,
'J': 74,
'K': 75,
'L': 76,
'M': 77,
'N': 78,
'O': 79,
'P': 80,
'Q': 81,
'R': 82,
'S': 83,
'T': 84,
'U': 85,
'V': 86,
'W': 87,
'X': 88,
'Y': 89,
'Z': 90,
'BACKSPACE': 8,
'ENTER': 13,
'ESCAPE': 27,
'LEFT': 37,
'UP': 38,
'RIGHT': 39,
'DOWN': 40,
'INSERT': 45,
'DELETE': 46
};
var supportedCommands = {
'CMD': ['CMD', 'CONTROL', 'COMMAND', 'WINDOWS', 'CTRL'],
'SHIFT': ['SHIFT'],
'ALT': ['ALT', 'OPTION']
};
/**
* @class ShortCuts
* @classdesc Callback will be fired with two params:
* - event: standard keyDown param
* - target: element which registered on shortcut creation
*
* @typedef {ShortCut} ShortCut
* @property {String} name - shortcut name
* @property {Element} on - element that passed on shortcut creation
* @property {Function} callback - custom user function
*/
var ShortCut = function () {
/**
* Create new shortcut
* @param {ShortCut} shortcut
* @constructor
*/
function ShortCut(shortcut) {
var _this = this;
_classCallCheck(this, ShortCut);
this.commands = {};
this.keys = {};
this.parseShortcutName(shortcut.name);
this.element = shortcut.on;
this.callback = shortcut.callback;
this.executeShortcut = function (event) {
_this.execute(event);
};
this.element.addEventListener('keydown', this.executeShortcut, false);
}
/**
* parses string to get shortcut commands in uppercase
* @param {String} shortcut
*
* @return {Array} keys
*/
_createClass(ShortCut, [{
key: 'parseShortcutName',
value: function parseShortcutName(shortcut) {
shortcut = shortcut.split('+');
for (var key = 0; key < shortcut.length; key++) {
shortcut[key] = shortcut[key].toUpperCase();
if (shortcut[key].length > 1) {
for (var command in supportedCommands) {
if (supportedCommands[command].includes(shortcut[key])) {
this.commands[command] = true;
}
}
} else {
this.keys[shortcut[key]] = true;
}
}
}
/**
* Check all passed commands and keys before firing callback
* @param event
*/
}, {
key: 'execute',
value: function execute(event) {
var cmdKey = event.ctrlKey || event.metaKey,
shiftKey = event.shiftKey,
altKey = event.altKey,
passed = {
'CMD': cmdKey,
'SHIFT': shiftKey,
'ALT': altKey
};
var command = void 0,
allCommandsPassed = true;
for (command in this.commands) {
allCommandsPassed = allCommandsPassed && passed[command];
}
var key = void 0,
allKeysPassed = true;
for (key in this.keys) {
allKeysPassed = allKeysPassed && event.keyCode === keyCodes[key];
}
if (allCommandsPassed && allKeysPassed) {
this.callback.call(null, event);
}
}
/**
* Destroy shortcut: remove listener from element
*/
}, {
key: 'remove',
value: function remove() {
this.element.removeEventListener('keydown', this.executeShortcut);
}
}]);
return ShortCut;
}();
exports.default = ShortCut;
/***/ }),
/* 17 */
>>>>>>>
/* 17 */ |
<<<<<<<
import ContributorDetails from './Contributors/ContributorDetails';
import Premium from './Premium';
import CharacterParses from './Character/CharacterParses';
=======
>>>>>>>
import Premium from './Premium'; |
<<<<<<<
noteClass.clear();
/**
* Set focus to the Editor
*/
window.setTimeout(function () {
let editor = document.querySelector('.ce-redactor');
editor.click();
}, 10);
=======
Note.clear();
>>>>>>>
/**
* Set focus to the Editor
*/
window.setTimeout(function () {
let editor = document.querySelector('.ce-redactor');
editor.click();
}, 10);
Note.clear();
<<<<<<<
noteClass.render(noteData);
/**
* Scroll to top
*/
let editorView = document.querySelector('[name="editor-view"]');
editorView.scrollIntoView();
=======
Note.render(noteData);
>>>>>>>
Note.render(noteData);
/**
* Scroll to top
*/
let editorView = document.querySelector('[name="editor-view"]');
editorView.scrollIntoView(); |
<<<<<<<
let Folder = require('./folders').default;
=======
let Autoresizer = require('./autoresizer').default;
>>>>>>>
let Folder = require('./folders').default;
let Autoresizer = require('./autoresizer').default; |
<<<<<<<
const UserModel = require('../models/user');
const utils = require('../utils/utils');
=======
const User = require('../models/user');
const isOnline = require('is-online');
const db = require('../utils/database');
>>>>>>>
const utils = require('../utils/utils');
const User = require('../models/user');
const isOnline = require('is-online');
const db = require('../utils/database');
<<<<<<<
global.app.syncObserver.refreshClient();
event.returnValue = global.user;
=======
webContents.executeJavaScript('document.body.textContent')
.then(async (jwt) => {
/** Decode JWT payload */
let payload = new Buffer(jwt.split('.')[1], 'base64');
/** Try to parse payload as JSON. If this step fails, it means that auth failed at all */
payload = JSON.parse(payload);
await global.user.update({
id: payload.user_id,
name: payload.name,
photo: payload.photo,
google_id: payload.google_id,
email: payload.email,
token: jwt
});
global.user.saveAvatar();
/**
* Refresh API client with the new token at the authorisation header;
*/
global.app.syncObserver.refreshClient();
event.returnValue = global.user;
window.close();
})
.catch (function (e) {
console.log('Google OAuth failed because of ', e);
window.close();
});
});
>>>>>>>
global.app.syncObserver.refreshClient();
global.user.saveAvatar();
event.returnValue = global.user;
authWindow.close();
global.app.sockets.leaveChannel(channel); |
<<<<<<<
var start = Math.floor(el.scrollTop / this.scrollHeight * d.itemCount / d.itemsPerRow) * d.itemsPerRow;
var end = Math.min(d.itemCount, Math.ceil(el.scrollTop / this.scrollHeight * d.itemCount / d.itemsPerRow) * d.itemsPerRow +
d.itemsPerRow * (d.itemsPerCol + 1));
var emitEvent = false;
=======
var indexByScrollTop = el.scrollTop / this.scrollHeight * d.itemCount / d.itemsPerRow;
var end = Math.min(d.itemCount, Math.ceil(indexByScrollTop) * d.itemsPerRow + d.itemsPerRow * (d.itemsPerCol + 1));
var maxStart = Math.max(0, end - d.itemsPerCol * d.itemsPerRow - d.itemsPerRow);
var start = Math.min(maxStart, Math.floor(indexByScrollTop) * d.itemsPerRow);
>>>>>>>
var emitEvent = false;
var indexByScrollTop = el.scrollTop / this.scrollHeight * d.itemCount / d.itemsPerRow;
var end = Math.min(d.itemCount, Math.ceil(indexByScrollTop) * d.itemsPerRow + d.itemsPerRow * (d.itemsPerCol + 1));
var maxStart = Math.max(0, end - d.itemsPerCol * d.itemsPerRow - d.itemsPerRow);
var start = Math.min(maxStart, Math.floor(indexByScrollTop) * d.itemsPerRow); |
<<<<<<<
Object.defineProperty(exports, "__esModule", { value: true });
=======
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
>>>>>>>
Object.defineProperty(exports, "__esModule", { value: true });
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
<<<<<<<
this.bufferAmount = 0;
this.refreshHandler = function () {
_this.refresh();
};
=======
this.bufferAmount = 0;
>>>>>>>
this.bufferAmount = 0;
this.refreshHandler = function () {
_this.refresh();
};
<<<<<<<
Object.defineProperty(VirtualScrollComponent.prototype, "parentScroll", {
get: function () {
return this._parentScroll;
},
set: function (element) {
if (this._parentScroll === element) {
return;
}
this.removeParentEventHandlers(this._parentScroll);
this._parentScroll = element;
this.addParentEventHandlers(this._parentScroll);
},
enumerable: true,
configurable: true
});
VirtualScrollComponent.prototype.onScroll = function () {
this.refresh();
=======
VirtualScrollComponent.prototype.onScroll = function (e) {
this.refresh();
>>>>>>>
Object.defineProperty(VirtualScrollComponent.prototype, "parentScroll", {
get: function () {
return this._parentScroll;
},
set: function (element) {
if (this._parentScroll === element) {
return;
}
this.removeParentEventHandlers(this._parentScroll);
this._parentScroll = element;
this.addParentEventHandlers(this._parentScroll);
},
enumerable: true,
configurable: true
});
VirtualScrollComponent.prototype.onScroll = function () {
this.refresh();
<<<<<<<
el.scrollTop = (Math.floor(index / d.itemsPerRow) * d.childHeight)
- (d.childHeight * Math.min(index, this.bufferAmount));
=======
this.element.nativeElement.scrollTop = (Math.floor(index / d.itemsPerRow) * d.childHeight)
- (d.childHeight * Math.min(index, this.bufferAmount));
>>>>>>>
el.scrollTop = (Math.floor(index / d.itemsPerRow) * d.childHeight)
- (d.childHeight * Math.min(index, this.bufferAmount));
<<<<<<<
=======
__decorate([
core_1.Input(),
__metadata("design:type", Array)
], VirtualScrollComponent.prototype, "items", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "scrollbarWidth", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "scrollbarHeight", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "childWidth", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "childHeight", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "bufferAmount", void 0);
__decorate([
core_1.Output(),
__metadata("design:type", core_1.EventEmitter)
], VirtualScrollComponent.prototype, "update", void 0);
__decorate([
core_1.Output(),
__metadata("design:type", core_1.EventEmitter)
], VirtualScrollComponent.prototype, "change", void 0);
__decorate([
core_1.Output(),
__metadata("design:type", core_1.EventEmitter)
], VirtualScrollComponent.prototype, "start", void 0);
__decorate([
core_1.Output(),
__metadata("design:type", core_1.EventEmitter)
], VirtualScrollComponent.prototype, "end", void 0);
__decorate([
core_1.ViewChild('content', { read: core_1.ElementRef }),
__metadata("design:type", core_1.ElementRef)
], VirtualScrollComponent.prototype, "contentElementRef", void 0);
__decorate([
core_1.HostListener('scroll'),
__metadata("design:type", Function),
__metadata("design:paramtypes", [Event]),
__metadata("design:returntype", void 0)
], VirtualScrollComponent.prototype, "onScroll", null);
VirtualScrollComponent = __decorate([
core_1.Component({
selector: 'virtual-scroll,[virtualScroll]',
exportAs: 'virtualScroll',
template: "\n <div class=\"total-padding\" [style.height]=\"scrollHeight + 'px'\"></div>\n <div class=\"scrollable-content\" #content [style.transform]=\"'translateY(' + topPadding + 'px)'\"\n [style.webkitTransform]=\"'translateY(' + topPadding + 'px)'\">\n <ng-content></ng-content>\n </div>\n ",
styles: ["\n :host {\n overflow: hidden;\n overflow-y: auto;\n position: relative;\n -webkit-overflow-scrolling: touch;\n }\n .scrollable-content {\n top: 0;\n left: 0;\n width: 100%;\n height: 100%;\n position: absolute;\n }\n .total-padding {\n width: 1px;\n opacity: 0;\n }\n "]
}),
__metadata("design:paramtypes", [core_1.ElementRef, core_1.Renderer])
], VirtualScrollComponent);
>>>>>>>
__decorate([
core_1.Input(),
__metadata("design:type", Array)
], VirtualScrollComponent.prototype, "items", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "scrollbarWidth", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "scrollbarHeight", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "childWidth", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "childHeight", void 0);
__decorate([
core_1.Input(),
__metadata("design:type", Number)
], VirtualScrollComponent.prototype, "bufferAmount", void 0);
__decorate([
core_1.Output(),
__metadata("design:type", core_1.EventEmitter)
], VirtualScrollComponent.prototype, "update", void 0);
__decorate([
core_1.Output(),
__metadata("design:type", core_1.EventEmitter)
], VirtualScrollComponent.prototype, "change", void 0);
__decorate([
core_1.Output(),
__metadata("design:type", core_1.EventEmitter)
], VirtualScrollComponent.prototype, "start", void 0);
__decorate([
core_1.Output(),
__metadata("design:type", core_1.EventEmitter)
], VirtualScrollComponent.prototype, "end", void 0);
__decorate([
core_1.ViewChild('content', { read: core_1.ElementRef }),
__metadata("design:type", core_1.ElementRef)
], VirtualScrollComponent.prototype, "contentElementRef", void 0);
__decorate([
core_1.HostListener('scroll'),
__metadata("design:type", Function),
__metadata("design:paramtypes", [Event]),
__metadata("design:returntype", void 0)
], VirtualScrollComponent.prototype, "onScroll", null);
VirtualScrollComponent = __decorate([
core_1.Component({
selector: 'virtual-scroll,[virtualScroll]',
exportAs: 'virtualScroll',
template: "\n <div class=\"total-padding\" [style.height]=\"scrollHeight + 'px'\"></div>\n <div class=\"scrollable-content\" #content [style.transform]=\"'translateY(' + topPadding + 'px)'\"\n [style.webkitTransform]=\"'translateY(' + topPadding + 'px)'\">\n <ng-content></ng-content>\n </div>\n ",
styles: ["\n :host {\n overflow: hidden;\n overflow-y: auto;\n position: relative;\n -webkit-overflow-scrolling: touch;\n }\n .scrollable-content {\n top: 0;\n left: 0;\n width: 100%;\n height: 100%;\n position: absolute;\n }\n .total-padding {\n width: 1px;\n opacity: 0;\n }\n "]
}),
__metadata("design:paramtypes", [core_1.ElementRef, core_1.Renderer])
], VirtualScrollComponent); |
<<<<<<<
'getInstanceIdByWrapperId', 'timer', 'timerPool', 'adList', 'adPool',
'isUserActive'],
=======
'getInstanceIdByWrapperId', 'timer', 'timerPool', 'adList', 'adPool'],
>>>>>>>
'getInstanceIdByWrapperId', 'timer', 'timerPool', 'adList', 'adPool',
'isUserActive'],
<<<<<<<
getInstanceIdByWrapperId: function(wrapperId) {
return typeof wrapperId != "undefined" ? wrapperId.replace('fluid_video_wrapper_', '') : null;
},
=======
getInstanceIdByWrapperId: function(wraperId) {
return wraperId.replace('fluid_video_wrapper_', '');
},
>>>>>>>
getInstanceIdByWrapperId: function(wrapperId) {
return typeof wrapperId != "undefined" ? wrapperId.replace('fluid_video_wrapper_', '') : null;
},
<<<<<<<
adList: {},
controlBar: {
autoHide: false,
autoHideTimeout: 3000,
animated: true
}
=======
adList: {},
keyboardControl: true
>>>>>>>
adList: {},
keyboardControl: true,
controlBar: {
autoHide: false,
autoHideTimeout: 3000,
animated: true
}
<<<<<<<
if (player.displayOptions.controlBar.autoHide) {
player.linkControlBarUserActivity();
}
=======
//Keyboard Controls
if (player.displayOptions.keyboardControl) {
player.keyboardControl();
}
>>>>>>>
//Keyboard Controls
if (player.displayOptions.keyboardControl) {
player.keyboardControl();
}
if (player.displayOptions.controlBar.autoHide) {
player.linkControlBarUserActivity();
} |
<<<<<<<
player.fluidStorage = {};
=======
player.fluidPseudoPause = false;
>>>>>>>
player.fluidStorage = {};
player.fluidPseudoPause = false; |
<<<<<<<
if (!this.isCurrentlyPlayingAd) {
var videoPlayer = document.getElementById(this.videoPlayerId);
videoPlayer.playbackRate = speed;
}
=======
var videoPlayer = document.getElementById(this.videoPlayerId);
videoPlayer.playbackRate = speed;
this.fluidStorage.fluidSpeed = speed;
>>>>>>>
if (!this.isCurrentlyPlayingAd) {
var videoPlayer = document.getElementById(this.videoPlayerId);
videoPlayer.playbackRate = speed;
this.fluidStorage.fluidSpeed = speed;
} |
<<<<<<<
player.removeAdPlayingText();
=======
player.removeCTAButton();
>>>>>>>
player.removeAdPlayingText();
player.removeCTAButton();
<<<<<<<
addAdPlayingText: function() {
var text = this.displayOptions.adText;
var adPlayingDiv = document.createElement('div');
adPlayingDiv.id = this.videoPlayerId + '_fluid_ad_playing';
adPlayingDiv.className = 'fluid_ad_playing';
adPlayingDiv.innerText = text;
document.getElementById('fluid_video_wrapper_' + this.videoPlayerId).appendChild(adPlayingDiv);
},
removeAdPlayingText: function() {
var div = document.getElementById(this.videoPlayerId + '_fluid_ad_playing');
if (div) {
div.parentElement.removeChild(div);
}
},
=======
addCTAButton: function() {
if (!this.displayOptions.adCTAText) {
return;
}
var player = this;
var videoPlayerTag = document.getElementById(this.videoPlayerId);
var ctaButton = document.createElement('div');
ctaButton.id = this.videoPlayerId + '_fluid_cta';
ctaButton.className = 'fluid_ad_cta';
var link = document.createElement('a');
link.href = player.vastOptions.clickthroughUrl;
link.target = '_blank';
link.innerText = this.displayOptions.adCTAText;
link.onclick = function() {
if (!videoPlayerTag.paused) {
videoPlayerTag.pause();
}
return true;
};
ctaButton.appendChild(link);
document.getElementById('fluid_video_wrapper_' + this.videoPlayerId).appendChild(ctaButton);
},
removeCTAButton: function() {
var btn = document.getElementById(this.videoPlayerId + '_fluid_cta');
if (btn) {
btn.parentElement.removeChild(btn);
}
},
>>>>>>>
addAdPlayingText: function() {
var text = this.displayOptions.adText;
var adPlayingDiv = document.createElement('div');
adPlayingDiv.id = this.videoPlayerId + '_fluid_ad_playing';
adPlayingDiv.className = 'fluid_ad_playing';
adPlayingDiv.innerText = text;
document.getElementById('fluid_video_wrapper_' + this.videoPlayerId).appendChild(adPlayingDiv);
},
removeAdPlayingText: function() {
var div = document.getElementById(this.videoPlayerId + '_fluid_ad_playing');
if (div) {
div.parentElement.removeChild(div);
}
},
addCTAButton: function() {
if (!this.displayOptions.adCTAText) {
return;
}
var player = this;
var videoPlayerTag = document.getElementById(this.videoPlayerId);
var ctaButton = document.createElement('div');
ctaButton.id = this.videoPlayerId + '_fluid_cta';
ctaButton.className = 'fluid_ad_cta';
var link = document.createElement('a');
link.href = player.vastOptions.clickthroughUrl;
link.target = '_blank';
link.innerText = this.displayOptions.adCTAText;
link.onclick = function() {
if (!videoPlayerTag.paused) {
videoPlayerTag.pause();
}
return true;
};
ctaButton.appendChild(link);
document.getElementById('fluid_video_wrapper_' + this.videoPlayerId).appendChild(ctaButton);
},
removeCTAButton: function() {
var btn = document.getElementById(this.videoPlayerId + '_fluid_cta');
if (btn) {
btn.parentElement.removeChild(btn);
}
},
<<<<<<<
this.removeAdPlayingText();
=======
this.removeCTAButton();
>>>>>>>
this.removeAdPlayingText();
this.removeCTAButton();
<<<<<<<
playerInitCallback: (function() {}),
autoPlay: false,
logo: null,
logoPosition: "top left",
logoOpacity: 1,
adText: null
=======
playerInitCallback: (function() {}),
adCTAText: null
>>>>>>>
playerInitCallback: (function() {}),
autoPlay: false,
logo: null,
logoPosition: "top left",
logoOpacity: 1,
adText: null,
adCTAText: null |
<<<<<<<
createVideoSourceSwitch: function() {
var player = this;
var videoPlayer = document.getElementById(player.videoPlayerId);
if (player.displayOptions.layout === 'browser') {
return;
}
var sources = [];
var sourcesList = videoPlayer.querySelectorAll('source');
[].forEach.call(sourcesList, function (source) {
if (source.title && source.src) {
sources.push({'title': source.title, 'url': source.src});
}
});
player.videoSources = sources;
if (player.videoSources.length > 1) {
var sourceChangeButton = document.getElementById(player.videoPlayerId + '_fluid_control_video_source');
var sourceChangeButtonTitle = document.createElement('div');
sourceChangeButtonTitle.id = player.videoPlayerId + '_fluid_control_video_source_title';
sourceChangeButtonTitle.className = 'fluid_video_sources_title';
sourceChangeButtonTitle.innerText = player.videoSources[0].title;
sourceChangeButton.appendChild(sourceChangeButtonTitle);
var sourceChangeList = document.createElement('div');
sourceChangeList.id = player.videoPlayerId + '_fluid_control_video_source_list';
sourceChangeList.className = 'fluid_video_sources_list';
sourceChangeList.style.display = 'none';
player.videoSources.forEach(function(source) {
var sourceChangeDiv = document.createElement('div');
sourceChangeDiv.className = 'fluid_video_source_list_item';
sourceChangeDiv.innerText = source.title;
sourceChangeDiv.addEventListener('click', function(event) {
event.stopPropagation();
var videoChangedTo = this;
player.videoSources.forEach(function(source) {
if (source.title == videoChangedTo.innerText) {
sourceChangeButtonTitle.innerText = source.title;
player.setVideoSource(source.url);
}
});
player.openCloseVideoSourceSwitch();
});
sourceChangeList.appendChild(sourceChangeDiv);
});
sourceChangeButton.appendChild(sourceChangeList);
sourceChangeButton.addEventListener('click', function() {
player.openCloseVideoSourceSwitch();
});
}
},
openCloseVideoSourceSwitch: function() {
var player = this;
var sourceChangeList = document.getElementById(this.videoPlayerId + '_fluid_control_video_source_list');
var sourceChangeListContainer = document.getElementById(this.videoPlayerId + '_fluid_control_video_source');
if (player.isCurrentlyPlayingAd) {
sourceChangeList.style.display = 'none';
return;
}
if (sourceChangeList.style.display == 'none') {
sourceChangeList.style.display = 'block';
var mouseOut = function(event) {
sourceChangeListContainer.removeEventListener('mouseleave', mouseOut);
sourceChangeList.style.display = 'none';
}
sourceChangeListContainer.addEventListener('mouseleave', mouseOut);
} else {
sourceChangeList.style.display = 'none';
}
},
setVideoSource: function(url) {
var player = this;
var videoPlayerTag = document.getElementById(player.videoPlayerId);
if (player.isCurrentlyPlayingAd) {
player.originalSrc = url;
} else {
var play = false;
if (!videoPlayerTag.paused) {
player.playPauseToggle(videoPlayerTag);
var play = true;
}
var currentTime = videoPlayerTag.currentTime;
var videoSwitchedEvent = function() {
//after new video is loaded setting time from what it should start play
videoPlayerTag.removeEventListener('loadedmetadata', videoSwitchedEvent);
videoPlayerTag.currentTime = currentTime;
if (play) {
player.playPauseToggle(videoPlayerTag);
}
}
videoPlayerTag.addEventListener('loadedmetadata', videoSwitchedEvent);
videoPlayerTag.src = url;
player.originalSrc = url;
}
},
initLogo: function() {
var player = this;
var videoPlayer = document.getElementById(player.videoPlayerId);
if (!player.displayOptions.logo) {
return;
}
var logoImage = document.createElement('img');
logoImage.src = player.displayOptions.logo;
logoImage.style.position = 'absolute';
var logoPosition = player.displayOptions.logoPosition.toLowerCase();
if (logoPosition.indexOf('bottom') !== -1) {
logoImage.style.bottom = 0;
} else {
logoImage.style.top = 0;
}
if (logoPosition.indexOf('right') !== -1) {
logoImage.style.right = 0;
} else {
logoImage.style.left = 0;
}
if (player.displayOptions.logoOpacity) {
logoImage.style.opacity = player.displayOptions.logoOpacity;
}
logoImage.style.pointerEvents = 'none';
videoPlayer.parentNode.insertBefore(logoImage, null);
},
=======
initHtmlOnPauseBlock: function() {
var player = this;
if (!player.displayOptions.htmlOnPauseBlock) {
return;
}
var videoPlayer = document.getElementById(player.videoPlayerId);
var containerDiv = document.createElement('div');
containerDiv.id = player.videoPlayerId + '_fluid_html_on_pause';
containerDiv.className = 'fluid_html_on_pause';
containerDiv.style.display = 'none';
containerDiv.innerHTML = player.displayOptions.htmlOnPauseBlock;
containerDiv.onclick = function(event) {
player.playPauseToggle(videoPlayer);
}
if (player.displayOptions.htmlOnPauseBlockWidth) {
containerDiv.style.width = player.displayOptions.htmlOnPauseBlockWidth + 'px';
}
if (player.displayOptions.htmlOnPauseBlockHeight) {
containerDiv.style.height = player.displayOptions.htmlOnPauseBlockHeight + 'px';
}
videoPlayer.parentNode.insertBefore(containerDiv, null);
},
>>>>>>>
createVideoSourceSwitch: function() {
var player = this;
var videoPlayer = document.getElementById(player.videoPlayerId);
if (player.displayOptions.layout === 'browser') {
return;
}
var sources = [];
var sourcesList = videoPlayer.querySelectorAll('source');
[].forEach.call(sourcesList, function (source) {
if (source.title && source.src) {
sources.push({'title': source.title, 'url': source.src});
}
});
player.videoSources = sources;
if (player.videoSources.length > 1) {
var sourceChangeButton = document.getElementById(player.videoPlayerId + '_fluid_control_video_source');
var sourceChangeButtonTitle = document.createElement('div');
sourceChangeButtonTitle.id = player.videoPlayerId + '_fluid_control_video_source_title';
sourceChangeButtonTitle.className = 'fluid_video_sources_title';
sourceChangeButtonTitle.innerText = player.videoSources[0].title;
sourceChangeButton.appendChild(sourceChangeButtonTitle);
var sourceChangeList = document.createElement('div');
sourceChangeList.id = player.videoPlayerId + '_fluid_control_video_source_list';
sourceChangeList.className = 'fluid_video_sources_list';
sourceChangeList.style.display = 'none';
player.videoSources.forEach(function(source) {
var sourceChangeDiv = document.createElement('div');
sourceChangeDiv.className = 'fluid_video_source_list_item';
sourceChangeDiv.innerText = source.title;
sourceChangeDiv.addEventListener('click', function(event) {
event.stopPropagation();
var videoChangedTo = this;
player.videoSources.forEach(function(source) {
if (source.title == videoChangedTo.innerText) {
sourceChangeButtonTitle.innerText = source.title;
player.setVideoSource(source.url);
}
});
player.openCloseVideoSourceSwitch();
});
sourceChangeList.appendChild(sourceChangeDiv);
});
sourceChangeButton.appendChild(sourceChangeList);
sourceChangeButton.addEventListener('click', function() {
player.openCloseVideoSourceSwitch();
});
}
},
openCloseVideoSourceSwitch: function() {
var player = this;
var sourceChangeList = document.getElementById(this.videoPlayerId + '_fluid_control_video_source_list');
var sourceChangeListContainer = document.getElementById(this.videoPlayerId + '_fluid_control_video_source');
if (player.isCurrentlyPlayingAd) {
sourceChangeList.style.display = 'none';
return;
}
if (sourceChangeList.style.display == 'none') {
sourceChangeList.style.display = 'block';
var mouseOut = function(event) {
sourceChangeListContainer.removeEventListener('mouseleave', mouseOut);
sourceChangeList.style.display = 'none';
}
sourceChangeListContainer.addEventListener('mouseleave', mouseOut);
} else {
sourceChangeList.style.display = 'none';
}
},
setVideoSource: function(url) {
var player = this;
var videoPlayerTag = document.getElementById(player.videoPlayerId);
if (player.isCurrentlyPlayingAd) {
player.originalSrc = url;
} else {
var play = false;
if (!videoPlayerTag.paused) {
player.playPauseToggle(videoPlayerTag);
var play = true;
}
var currentTime = videoPlayerTag.currentTime;
var videoSwitchedEvent = function() {
//after new video is loaded setting time from what it should start play
videoPlayerTag.removeEventListener('loadedmetadata', videoSwitchedEvent);
videoPlayerTag.currentTime = currentTime;
if (play) {
player.playPauseToggle(videoPlayerTag);
}
}
videoPlayerTag.addEventListener('loadedmetadata', videoSwitchedEvent);
videoPlayerTag.src = url;
player.originalSrc = url;
}
},
initLogo: function() {
var player = this;
var videoPlayer = document.getElementById(player.videoPlayerId);
if (!player.displayOptions.logo) {
return;
}
var logoImage = document.createElement('img');
logoImage.src = player.displayOptions.logo;
logoImage.style.position = 'absolute';
var logoPosition = player.displayOptions.logoPosition.toLowerCase();
if (logoPosition.indexOf('bottom') !== -1) {
logoImage.style.bottom = 0;
} else {
logoImage.style.top = 0;
}
if (logoPosition.indexOf('right') !== -1) {
logoImage.style.right = 0;
} else {
logoImage.style.left = 0;
}
if (player.displayOptions.logoOpacity) {
logoImage.style.opacity = player.displayOptions.logoOpacity;
}
logoImage.style.pointerEvents = 'none';
videoPlayer.parentNode.insertBefore(logoImage, null);
},
initHtmlOnPauseBlock: function() {
var player = this;
if (!player.displayOptions.htmlOnPauseBlock) {
return;
}
var videoPlayer = document.getElementById(player.videoPlayerId);
var containerDiv = document.createElement('div');
containerDiv.id = player.videoPlayerId + '_fluid_html_on_pause';
containerDiv.className = 'fluid_html_on_pause';
containerDiv.style.display = 'none';
containerDiv.innerHTML = player.displayOptions.htmlOnPauseBlock;
containerDiv.onclick = function(event) {
player.playPauseToggle(videoPlayer);
}
if (player.displayOptions.htmlOnPauseBlockWidth) {
containerDiv.style.width = player.displayOptions.htmlOnPauseBlockWidth + 'px';
}
if (player.displayOptions.htmlOnPauseBlockHeight) {
containerDiv.style.height = player.displayOptions.htmlOnPauseBlockHeight + 'px';
}
videoPlayer.parentNode.insertBefore(containerDiv, null);
},
<<<<<<<
playerInitCallback: (function() {}),
autoPlay: false,
logo: null,
logoPosition: "top left",
logoOpacity: 1,
adText: null,
adCTAText: null
=======
playerInitCallback: (function() {}),
htmlOnPauseBlock: null,
htmlOnPauseBlockWidth: null,
htmlOnPauseBlockHeight: null
>>>>>>>
playerInitCallback: (function() {}),
autoPlay: false,
logo: null,
logoPosition: "top left",
logoOpacity: 1,
adText: null,
adCTAText: null,
htmlOnPauseBlock: null,
htmlOnPauseBlockWidth: null,
htmlOnPauseBlockHeight: null
<<<<<<<
player.initLogo();
=======
player.initHtmlOnPauseBlock();
>>>>>>>
player.initLogo();
player.initHtmlOnPauseBlock(); |
<<<<<<<
'toggleElementText', 'getMobileOs', 'findClosestParent', 'isUserActive',
'getInstanceIdByWrapperId'],
=======
'toggleElementText', 'getMobileOs', 'findClosestParent', 'activeVideoPlayerId',
'timer', 'timerPool', 'adList', 'adPool'],
>>>>>>>
'toggleElementText', 'getMobileOs', 'findClosestParent', 'activeVideoPlayerId',
'getInstanceIdByWrapperId', 'timer', 'timerPool', 'adList', 'adPool'],
<<<<<<<
userActivityChecker: function () {
var player = this;
var videoPlayer = document.getElementById('fluid_video_wrapper_' + player.videoPlayerId);
player.newActivity = null;
var activity = function () {
player.newActivity = true;
};
activityCheck = setInterval(function () {
if (player.newActivity === true) {
player.newActivity = false;
var videoPlayerTag = document.getElementById(player.videoPlayerId);
if (player.isUserActive === false) {
var videoPlayerTag = document.getElementById(player.videoPlayerId);
var event = new CustomEvent("userActive");
videoPlayerTag.dispatchEvent(event);
player.isUserActive = true;
}
clearTimeout(player.inactivityTimeout);
player.inactivityTimeout = setTimeout(function () {
if (player.newActivity !== true) {
player.isUserActive = false;
event = new CustomEvent("userInactive");
videoPlayerTag.dispatchEvent(event);
} else {
clearTimeout(player.inactivityTimeout);
}
}, player.displayOptions.controlBar.autoHideTimeout);
}
}, 300);
var listenTo = (player.isTabletDevice()) ? 'tap' : 'mousemove';
videoPlayer.addEventListener(listenTo, activity);
},
hasControlBar: function () {
return (document.getElementById(this.videoPlayerId + '_fluid_controls_container') && this.displayOptions.layout != "browser") ? true : false;
},
hideControlBar: function () {
var videoInstanceId = fluidPlayerClass.getInstanceIdByWrapperId(this.getAttribute('id'));
var videoPlayerInstance = fluidPlayerClass.getInstanceById(videoInstanceId);
var videoPlayerTag = document.getElementById(videoInstanceId);
if (videoPlayerInstance.hasControlBar()) {
var divVastControls = document.getElementById(videoPlayerInstance.videoPlayerId + '_fluid_controls_container');
if (videoPlayerInstance.displayOptions.controlBar.animated) {
videoPlayerInstance.fadeOut(divVastControls);
} else {
divVastControls.style.display = 'none';
}
}
videoPlayerTag.style.cursor = 'none';
},
showControlBar: function () {
var videoInstanceId = fluidPlayerClass.getInstanceIdByWrapperId(this.getAttribute('id'));
var videoPlayerInstance = fluidPlayerClass.getInstanceById(videoInstanceId);
var videoPlayerTag = document.getElementById(videoInstanceId);
if (videoPlayerInstance.hasControlBar()) {
var divVastControls = document.getElementById(videoPlayerInstance.videoPlayerId + '_fluid_controls_container');
if (videoPlayerInstance.displayOptions.controlBar.animated) {
videoPlayerInstance.fadeIn(divVastControls);
} else {
divVastControls.style.display = 'block';
}
}
if (!videoPlayerInstance.isTabletDevice()) {
videoPlayerTag.style.cursor = 'default';
}
},
isTabletDevice: function () {
var ua = window.navigator.userAgent;
var isMobileChecks = fluidPlayerClass.getMobileOs();
return (isMobileChecks.userOs !== false || isMobileChecks.device !== false) && (!!window.chrome || -1 !== ua.indexOf("crios") || 0 === window.navigator.vendor.indexOf("Google") && -1 !== ua.indexOf("chrome"));
},
fadeOut: function (element) {
var opacity = 1;
var timer = setInterval(function () {
if (opacity <= 0.1) {
clearInterval(timer);
}
element.style.opacity = opacity;
opacity -= 0.1;
}, 50);
},
fadeIn: function (element) {
var opacity = 0.1;
var timer = setInterval(function () {
if (opacity >= 1) {
clearInterval(timer);
} else {
element.style.opacity = opacity;
opacity += 0.1;
}
}, 10);
},
linkControlBarUserActivity: function () {
var player = this;
var videoPlayerTag = document.getElementById(player.videoPlayerId);
videoPlayerTag.addEventListener('userInactive', player.hideControlBar);
videoPlayerTag.addEventListener('userActive', player.showControlBar);
},
init: function(idVideoPlayer, vastTag, options) {
=======
/**
* Set the mainVideoDuration property one the vide is loaded
*/
mainVideoReady: function() {
var videoPlayerTag = this;
var player = fluidPlayerClass.getInstanceById(this.id);
if(player.mainVideoDuration == 0) {
player.mainVideoDuration = videoPlayerTag.duration;
}
},
init: function(idVideoPlayer, options) {
>>>>>>>
/**
* Set the mainVideoDuration property one the vide is loaded
*/
mainVideoReady: function() {
var videoPlayerTag = this;
var player = fluidPlayerClass.getInstanceById(this.id);
if(player.mainVideoDuration == 0) {
player.mainVideoDuration = videoPlayerTag.duration;
}
},
userActivityChecker: function () {
var player = this;
var videoPlayer = document.getElementById('fluid_video_wrapper_' + player.videoPlayerId);
player.newActivity = null;
var activity = function () {
player.newActivity = true;
};
activityCheck = setInterval(function () {
if (player.newActivity === true) {
player.newActivity = false;
var videoPlayerTag = document.getElementById(player.videoPlayerId);
if (player.isUserActive === false) {
var videoPlayerTag = document.getElementById(player.videoPlayerId);
var event = new CustomEvent("userActive");
videoPlayerTag.dispatchEvent(event);
player.isUserActive = true;
}
clearTimeout(player.inactivityTimeout);
player.inactivityTimeout = setTimeout(function () {
if (player.newActivity !== true) {
player.isUserActive = false;
event = new CustomEvent("userInactive");
videoPlayerTag.dispatchEvent(event);
} else {
clearTimeout(player.inactivityTimeout);
}
}, player.displayOptions.controlBar.autoHideTimeout);
}
}, 300);
var listenTo = (player.isTabletDevice()) ? 'tap' : 'mousemove';
videoPlayer.addEventListener(listenTo, activity);
},
hasControlBar: function () {
return (document.getElementById(this.videoPlayerId + '_fluid_controls_container') && this.displayOptions.layout != "browser") ? true : false;
},
hideControlBar: function () {
var videoInstanceId = fluidPlayerClass.getInstanceIdByWrapperId(this.getAttribute('id'));
var videoPlayerInstance = fluidPlayerClass.getInstanceById(videoInstanceId);
var videoPlayerTag = document.getElementById(videoInstanceId);
if (videoPlayerInstance.hasControlBar()) {
var divVastControls = document.getElementById(videoPlayerInstance.videoPlayerId + '_fluid_controls_container');
if (videoPlayerInstance.displayOptions.controlBar.animated) {
videoPlayerInstance.fadeOut(divVastControls);
} else {
divVastControls.style.display = 'none';
}
}
videoPlayerTag.style.cursor = 'none';
},
showControlBar: function () {
var videoInstanceId = fluidPlayerClass.getInstanceIdByWrapperId(this.getAttribute('id'));
var videoPlayerInstance = fluidPlayerClass.getInstanceById(videoInstanceId);
var videoPlayerTag = document.getElementById(videoInstanceId);
if (videoPlayerInstance.hasControlBar()) {
var divVastControls = document.getElementById(videoPlayerInstance.videoPlayerId + '_fluid_controls_container');
if (videoPlayerInstance.displayOptions.controlBar.animated) {
videoPlayerInstance.fadeIn(divVastControls);
} else {
divVastControls.style.display = 'block';
}
}
if (!videoPlayerInstance.isTabletDevice()) {
videoPlayerTag.style.cursor = 'default';
}
},
isTabletDevice: function () {
var ua = window.navigator.userAgent;
var isMobileChecks = fluidPlayerClass.getMobileOs();
return (isMobileChecks.userOs !== false || isMobileChecks.device !== false) && (!!window.chrome || -1 !== ua.indexOf("crios") || 0 === window.navigator.vendor.indexOf("Google") && -1 !== ua.indexOf("chrome"));
},
fadeOut: function (element) {
var opacity = 1;
var timer = setInterval(function () {
if (opacity <= 0.1) {
clearInterval(timer);
}
element.style.opacity = opacity;
opacity -= 0.1;
}, 50);
},
fadeIn: function (element) {
var opacity = 0.1;
var timer = setInterval(function () {
if (opacity >= 1) {
clearInterval(timer);
} else {
element.style.opacity = opacity;
opacity += 0.1;
}
}, 10);
},
linkControlBarUserActivity: function () {
var player = this;
var videoPlayerTag = document.getElementById(player.videoPlayerId);
videoPlayerTag.addEventListener('userInactive', player.hideControlBar);
videoPlayerTag.addEventListener('userActive', player.showControlBar);
},
init: function(idVideoPlayer, options) {
<<<<<<<
player.inactivityTimeout = null;
player.isUserActive = null;
=======
player.mainVideoCurrentTime = 0;
player.mainVideoDuration = 0;
player.isTimer = false;
player.timer = null;
player.timerPool = {};
player.adList = {};
player.adPool = {};
player.autoplayAfterAd = true;
player.nonLinearDuration = 15;
player.supportedStaticTypes = ['image/gif', 'image/jpeg', 'image/png'];
>>>>>>>
player.mainVideoCurrentTime = 0;
player.mainVideoDuration = 0;
player.isTimer = false;
player.timer = null;
player.timerPool = {};
player.adList = {};
player.adPool = {};
player.autoplayAfterAd = true;
player.nonLinearDuration = 15;
player.supportedStaticTypes = ['image/gif', 'image/jpeg', 'image/png'];
player.inactivityTimeout = null;
player.isUserActive = null;
<<<<<<<
responsive: false,
controlBar: {
autoHide: false,
autoHideTimeout: 3000,
animated: true
}
=======
responsive: false,
adList: {}
>>>>>>>
responsive: false,
adList: {},
controlBar: {
autoHide: false,
autoHideTimeout: 3000,
animated: true
} |
<<<<<<<
case SPECS.RESTORATION_DRUID:
return 0.048 + this.masteryRating / 66666.6666666;
=======
case SPECS.RESTORATION_DRUID:
return 0.048 + this.masteryRating / 66666.6666666;
case SPECS.FROST_MAGE:
return 0.18 + this.masteryRating / 17777.7777777;
>>>>>>>
case SPECS.RESTORATION_DRUID:
return 0.048 + this.masteryRating / 66666.6666666;
case SPECS.RESTORATION_DRUID:
return 0.048 + this.masteryRating / 66666.6666666;
case SPECS.FROST_MAGE:
return 0.18 + this.masteryRating / 17777.7777777; |
<<<<<<<
it('enables tracing when opt variable is "true"', function() {
runPlugin({
functions: {
healthcheck: {
tracing: 'false'
},
mainFunction: {
tracing: 'true'
}
},
provider: {
tracing: 'true'
}
});
assert.deepEqual(logSpy.getCall(0).args[0], 'Tracing DISABLED for function "myService-test-healthcheck"');
assert.deepEqual(logSpy.getCall(1).args[0], 'Tracing ENABLED for function "myService-test-mainFunction"');
assert.deepEqual(requestSpy.getCall(1).args, [
'Lambda',
'updateFunctionConfiguration',
{
FunctionName: 'myService-test-mainFunction',
TracingConfig: {
Mode: 'Active'
}
}
]);
});
=======
it('noDeploy: enables tracing when function.tracing=true, but does not execute AWS request', function() {
runPlugin({
noDeploy: true,
functions: {
mainFunction: {
tracing: true
}
},
provider: {
}
});
assert.deepEqual(logSpy.getCall(0).args[0], 'Tracing ENABLED for function "myService-test-mainFunction"');
assert.isNull(requestSpy.getCall(0), 'no `aws.request`');
});
>>>>>>>
it('enables tracing when opt variable is "true"', function() {
runPlugin({
functions: {
healthcheck: {
tracing: 'false'
},
mainFunction: {
tracing: 'true'
}
},
provider: {
tracing: 'true'
}
});
assert.deepEqual(logSpy.getCall(0).args[0], 'Tracing DISABLED for function "myService-test-healthcheck"');
assert.deepEqual(logSpy.getCall(1).args[0], 'Tracing ENABLED for function "myService-test-mainFunction"');
assert.deepEqual(requestSpy.getCall(1).args, [
'Lambda',
'updateFunctionConfiguration',
{
FunctionName: 'myService-test-mainFunction',
TracingConfig: {
Mode: 'Active'
}
}
]);
});
it('noDeploy: enables tracing when function.tracing=true, but does not execute AWS request', function() {
runPlugin({
noDeploy: true,
functions: {
mainFunction: {
tracing: true
}
},
provider: {
}
});
assert.deepEqual(logSpy.getCall(0).args[0], 'Tracing ENABLED for function "myService-test-mainFunction"');
assert.isNull(requestSpy.getCall(0), 'no `aws.request`');
}); |
<<<<<<<
],
=======
},
fight: {
start_time: 0,
},
>>>>>>>
],
fight: {
start_time: 0,
}, |
<<<<<<<
import React, { useContext, useEffect, useState } from "react";
=======
import React, {
useContext, useEffect, useState
} from "react";
>>>>>>>
import React, {
useContext, useEffect, useState
} from "react";
<<<<<<<
import Reset from "./pages/Reset";
=======
import { baseUrl } from "./utils";
>>>>>>>
import { baseUrl } from "./utils";
<<<<<<<
<Route exact path="/" component={Home} />
=======
<Route exact path="/" component={Home} />
>>>>>>>
<Route exact path="/" component={Home} />
<<<<<<<
<Route exact path="/tickets" component={Ticket} />
<Route exact path="/monitor" component={Monitor} />
<Route exact path="/admin" component={Admin} />
<Route exact path="*" component={() => "404 NOT FOUND"} />
=======
<Route exact path="/tickets" component={Ticket} />
<Route exact path="/monitor" component={Monitor} />
<Route exact path="/admin" component={Admin} />
>>>>>>>
<Route exact path="/tickets" component={Ticket} />
<Route exact path="/monitor" component={Monitor} />
<Route exact path="/admin" component={Admin} />
<<<<<<<
<Route exact path="/reset">
<Reset />
</Route>
=======
>>>>>>>
<<<<<<<
return <Render />;
=======
return (
<Routing />
);
>>>>>>>
return (
<Routing />
); |
<<<<<<<
[
"autodesk.com",
"autodesk.net",
"circuits.io",
"tinkercad.com",
"autodesk.ae",
"autodesk.be",
"autodesk.ca",
"autodesk.ch",
"autodesk.co.jp",
"autodesk.co.kr",
"autodesk.com.au",
"autodesk.com.br",
"autodesk.com.cn",
"autodesk.com.hk",
"autodesk.com.my",
"autodesk.com.sg",
"autodesk.com.tr",
"autodesk.com.tw",
"autodesk.co.nz",
"autodesk.co.uk",
"autodesk.co.za",
"autodesk.cz",
"autodesk.de",
"autodesk.dk",
"autodesk.es",
"autodesk.eu",
"autodesk.fi",
"autodesk.fr",
"autodesk.hu",
"autodesk.in",
"autodesk.it",
"autodesk.mx",
"autodesk.nl",
"autodesk.no",
"autodesk.pl",
"autodesk.pt",
"autodesk.ru",
"autodesk.se",
],
=======
["autodesk.com", "tinkercad.com"],
["avito.ru", "avito.st"],
>>>>>>>
[
"autodesk.com",
"autodesk.net",
"circuits.io",
"tinkercad.com",
"autodesk.ae",
"autodesk.be",
"autodesk.ca",
"autodesk.ch",
"autodesk.co.jp",
"autodesk.co.kr",
"autodesk.com.au",
"autodesk.com.br",
"autodesk.com.cn",
"autodesk.com.hk",
"autodesk.com.my",
"autodesk.com.sg",
"autodesk.com.tr",
"autodesk.com.tw",
"autodesk.co.nz",
"autodesk.co.uk",
"autodesk.co.za",
"autodesk.cz",
"autodesk.de",
"autodesk.dk",
"autodesk.es",
"autodesk.eu",
"autodesk.fi",
"autodesk.fr",
"autodesk.hu",
"autodesk.in",
"autodesk.it",
"autodesk.mx",
"autodesk.nl",
"autodesk.no",
"autodesk.pl",
"autodesk.pt",
"autodesk.ru",
"autodesk.se",
],
["avito.ru", "avito.st"], |
<<<<<<<
=======
var pbStorage = require("storage");
var heuristicBlocking = require("heuristicblocking");
var Utils = require("utils").Utils;
>>>>>>>
var pbStorage = require("storage");
var Utils = require("utils").Utils;
<<<<<<<
*/
}
=======
},
migrateBlockedSubdomainsToCookieblock(){
setTimeout(function(){
console.log('MIGRATING BLOCKED SUBDOMAINS THAT ARE ON COOKIE BLOCK LIST');
var cbl = pbStorage.getBadgerStorageObject('cookieblock_list');
_.each(pbStorage.getAllDomainsByPresumedAction(pb.BLOCK), function(fqdn){
_.each(Utils.explodeSubdomains(fqdn, true), function(domain){
if(cbl.hasItem(domain)){
console.log('moving', fqdn, 'from block to cookie block');
pbStorage.setupHeuristicAction(fqdn, pb.COOKIEBLOCK);
}
});
});
}, 1000 * 30);
},
>>>>>>>
*/
},
migrateBlockedSubdomainsToCookieblock(){
setTimeout(function(){
console.log('MIGRATING BLOCKED SUBDOMAINS THAT ARE ON COOKIE BLOCK LIST');
var cbl = pbStorage.getBadgerStorageObject('cookieblock_list');
_.each(pbStorage.getAllDomainsByPresumedAction(pb.BLOCK), function(fqdn){
_.each(Utils.explodeSubdomains(fqdn, true), function(domain){
if(cbl.hasItem(domain)){
console.log('moving', fqdn, 'from block to cookie block');
pbStorage.setupHeuristicAction(fqdn, pb.COOKIEBLOCK);
}
});
});
}, 1000 * 30);
}, |
<<<<<<<
change(date(2020, 3, 20), <>Added <SpellLink id={SPELLS.REVEL_IN_PAIN.id} /> azerite trait.</>, [Torothin]),
=======
change(date(2020, 3, 13), <>Added <SpellLink id={SPELLS.INFERNAL_ARMOR.id} /> azerite trait.</>, [Torothin]),
>>>>>>>
change(date(2020, 3, 20), <>Added <SpellLink id={SPELLS.REVEL_IN_PAIN.id} /> azerite trait.</>, [Torothin]),
change(date(2020, 3, 13), <>Added <SpellLink id={SPELLS.INFERNAL_ARMOR.id} /> azerite trait.</>, [Torothin]), |
<<<<<<<
//chrome.tabs.onUpdated.addListener(onTabUpdated);
=======
chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["<all_urls>"]}, ["responseHeaders", "blocking"]);
chrome.cookies.onChanged.addListener(onCookieChanged);
chrome.tabs.onUpdated.addListener(onTabUpdated);
>>>>>>>
//chrome.tabs.onUpdated.addListener(onTabUpdated);
chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["<all_urls>"]}, ["responseHeaders", "blocking"]);
<<<<<<<
function onTabReplaced(addedTabId, removedTabId){
forgetTab(removedTabId);
}
=======
function onTabReplaced(addedTabId, removedTabId){
forgetTab(removedTabId);
}
>>>>>>>
function onTabReplaced(addedTabId, removedTabId){
forgetTab(removedTabId);
}
<<<<<<<
=======
//for an extension we try to load cookies for the domain that the extension
//actually cares about
if(_isTabAnExtension(details.tabId)){
var domain = _mappedBaseDomain(getHostForTab(details.tabId))
chrome.cookies.getAll({domain: domain}, function(cookies){
if(cookies.length === 0){
var fakeCookies = FakeCookieStore.getCookies(domain);
addCookiesToRealCookieStore(fakeCookies);
}
});
}
var frame = (type != "sub_frame" ? details.frameId : details.parentFrameId);
var requestAction = checkRequest(type, details.tabId, details.url, frame);
if (requestAction && Utils.isPrivacyBadgerEnabled(getHostForTab(details.tabId))) {
//add domain to list of blocked domains if it is not there already
if(requestAction == "block" || requestAction == "cookieBlock"){
BlockedDomainList.addDomain(extractHostFromURL(details.url));
}
if (requestAction == "block" || requestAction == "userblock") {
return {cancel: true};
}
}
>>>>>>>
var frame = (type != "sub_frame" ? details.frameId : details.parentFrameId);
var requestAction = checkRequest(type, details.tabId, details.url, frame);
if (requestAction && Utils.isPrivacyBadgerEnabled(getHostForTab(details.tabId))) {
//add domain to list of blocked domains if it is not there already
if(requestAction == "block" || requestAction == "cookieBlock"){
BlockedDomainList.addDomain(extractHostFromURL(details.url));
}
if (requestAction == "block" || requestAction == "userblock") {
return {cancel: true};
}
}
<<<<<<<
if(_isTabChromeInternal(details.tabId)){
return {};
}
var type = details.type;
// Type names match Mozilla's with main_frame and sub_frame being the only exceptions.
if (type == "sub_frame"){
type = "SUBDOCUMENT";
} else {
type = type.toUpperCase();
=======
if(_isTabChromeInternal(details.tabId)){
return {};
>>>>>>>
if(_isTabChromeInternal(details.tabId)){
return {};
<<<<<<<
//add domain to list of blocked domains if it is not there already
if(requestAction == "block" || requestAction == "cookieBlock"){
BlockedDomainList.addDomain(extractHostFromURL(details.url));
}
if (requestAction == "block" || requestAction == "userblock") {
return {cancel: true};
}
else if (requestAction == "cookieblock" || requestAction == "usercookieblock") {
=======
if (requestAction == "cookieblock" || requestAction == "usercookieblock") {
recordRequestId(details.requestId);
>>>>>>>
if (requestAction == "cookieblock" || requestAction == "usercookieblock") {
recordRequestId(details.requestId);
<<<<<<<
return (header.name.toLowerCase() != "cookie" && header.name.toLowerCase != "referer");
=======
return (header.name.toLowerCase() != "cookie" && header.name.toLowerCase() != "referer");
>>>>>>>
return (header.name.toLowerCase() != "cookie" && header.name.toLowerCase() != "referer");
<<<<<<<
chrome.webRequest.onHeadersReceived.addListener(function(details){
if (details.tabId == -1){
return {};
}
var type = details.type;
// Type names match Mozilla's with main_frame and sub_frame being the only exceptions.
if (type == "sub_frame"){
type = "SUBDOCUMENT";
} else {
type = type.toUpperCase();
}
var frame = (type != "SUBDOCUMENT" ? details.frameId : details.parentFrameId);
var requestAction = checkRequest(type, details.tabId, details.url, frame);
if (requestAction && Utils.isPrivacyBadgerEnabled(getHostForTab(details.tabId))) {
if (requestAction == "cookieblock" || requestAction == "usercookieblock") {
newHeaders = details.responseHeaders.filter(function(header) {
return (header.name.toLowerCase() != "set-cookie");
});
return {responseHeaders: newHeaders};
}
}
}, {urls: ["<all_urls>"]}, ["responseHeaders", "blocking"]);
=======
function onHeadersReceived(details){
if (details.tabId == -1){
return {};
}
var type = details.type;
// Type names match Mozilla's with main_frame and sub_frame being the only exceptions.
if (type == "sub_frame"){
type = "SUBDOCUMENT";
} else {
type = type.toUpperCase();
}
var frame = (type != "SUBDOCUMENT" ? details.frameId : details.parentFrameId);
var requestAction = checkRequest(type, details.tabId, details.url, frame);
if (requestAction && Utils.isPrivacyBadgerEnabled(getHostForTab(details.tabId))) {
if (requestAction == "cookieblock" || requestAction == "usercookieblock") {
newHeaders = details.responseHeaders.filter(function(header) {
return (header.name.toLowerCase() != "set-cookie");
});
return {responseHeaders: newHeaders};
}
}
}
>>>>>>>
function onHeadersReceived(details){
if (details.tabId == -1){
return {};
}
var type = details.type;
// Type names match Mozilla's with main_frame and sub_frame being the only exceptions.
if (type == "sub_frame"){
type = "SUBDOCUMENT";
} else {
type = type.toUpperCase();
}
var frame = (type != "SUBDOCUMENT" ? details.frameId : details.parentFrameId);
var requestAction = checkRequest(type, details.tabId, details.url, frame);
if (requestAction && Utils.isPrivacyBadgerEnabled(getHostForTab(details.tabId))) {
if (requestAction == "cookieblock" || requestAction == "usercookieblock") {
newHeaders = details.responseHeaders.filter(function(header) {
return (header.name.toLowerCase() != "set-cookie");
});
return {responseHeaders: newHeaders};
}
}
} |
<<<<<<<
// TODO "await" to set INITIALIZED until both below async functions resolve?
// see TODO in qunit_config.js
=======
self.loadFirstRunSeedData();
>>>>>>>
// TODO "await" to set INITIALIZED until both below async functions resolve?
// see TODO in qunit_config.js
self.loadFirstRunSeedData(); |
<<<<<<<
import KegSmash from './Modules/Spells/KegSmash';
import TigerPalm from './Modules/Spells/TigerPalm';
=======
import RushingJadeWind from './Modules/Spells/RushingJadeWind';
import BreathOfFire from './Modules/Spells/BreathOfFire';
>>>>>>>
import KegSmash from './Modules/Spells/KegSmash';
import TigerPalm from './Modules/Spells/TigerPalm';
import RushingJadeWind from './Modules/Spells/RushingJadeWind';
import BreathOfFire from './Modules/Spells/BreathOfFire';
<<<<<<<
import AnvilHardenedWristwraps from './Modules/Items/AnvilHardenedWristwraps';
=======
import StormstoutsLastGasp from './Modules/Items/StormstoutsLastGasp';
import SalsalabimsLostTunic from './Modules/Items/SalsalabimsLostTunic';
>>>>>>>
import AnvilHardenedWristwraps from './Modules/Items/AnvilHardenedWristwraps';
import StormstoutsLastGasp from './Modules/Items/StormstoutsLastGasp';
import SalsalabimsLostTunic from './Modules/Items/SalsalabimsLostTunic';
<<<<<<<
kegSmash: KegSmash,
tigerPalm: TigerPalm,
=======
rjw: RushingJadeWind,
bof: BreathOfFire,
>>>>>>>
kegSmash: KegSmash,
tigerPalm: TigerPalm,
rjw: RushingJadeWind,
bof: BreathOfFire,
<<<<<<<
ahw: AnvilHardenedWristwraps,
=======
stormstoutsLastGasp: StormstoutsLastGasp,
salsalabim: SalsalabimsLostTunic,
>>>>>>>
ahw: AnvilHardenedWristwraps,
stormstoutsLastGasp: StormstoutsLastGasp,
salsalabim: SalsalabimsLostTunic, |
<<<<<<<
reloadTrackingDomainsTab();
=======
refreshFilterPage();
$('html').css('visibility', 'visible');
>>>>>>>
reloadTrackingDomainsTab();
$('html').css('visibility', 'visible');
<<<<<<<
registerToggleHandlers($(this));
=======
var radios = $(this).children('input');
var value = $(this).children('input:checked').val();
var slider = $('<div></div>').slider({
min: 0,
max: 2,
value: value,
create: function(/*event, ui*/) {
$(this).children('.ui-slider-handle').css('margin-left', -16 * value + 'px');
},
slide: function(event, ui) {
radios.filter('[value=' + ui.value + ']').click();
},
stop: function(event, ui) {
$(ui.handle).css('margin-left', -16 * ui.value + 'px');
// Save change for origin.
var origin = radios.filter('[value=' + ui.value + ']')[0].name;
var setting = htmlUtils.getCurrentClass($(this).parents('.clicker'));
syncSettings(origin, setting);
},
}).appendTo(this);
radios.on("change", function() {
slider.slider('value', radios.filter(':checked').val());
});
>>>>>>>
registerToggleHandlers($(this)); |
<<<<<<<
/**
* Creates a rate-limited function that delays invoking `fn` until after
* `interval` milliseconds have elapsed since the last time the rate-limited
* function was invoked.
*
* Does not drop invocations (lossless), unlike `_.throttle`.
*
* The rate-limited function comes with a `cancel` method to cancel delayed
* `fn` invocations.
*
* Adapted from
* http://stackoverflow.com/questions/23072815/throttle-javascript-function-calls-but-with-queuing-dont-discard-calls
*
* @param {Function} fn The function to rate-limit.
* @param {number} interval The number of milliseconds to rate-limit invocations to.
* @param {Object} context The context object (optional).
* @returns {Function} Returns the new rate-limited function.
**/
function rateLimit(fn, interval, context) {
let canInvoke = true,
queue = [],
timer_id,
limited = function () {
queue.push({
context: context || this,
arguments: Array.prototype.slice.call(arguments)
});
if (canInvoke) {
canInvoke = false;
timeEnd();
}
};
function timeEnd() {
let item;
if (queue.length) {
item = queue.splice(0, 1)[0];
fn.apply(item.context, item.arguments); // invoke fn
timer_id = window.setTimeout(timeEnd, interval);
} else {
canInvoke = true;
}
}
limited.cancel = function () {
window.clearTimeout(timer_id);
queue = [];
canInvoke = true;
};
return limited;
}
=======
function buf2hex(buffer) { // buffer is an ArrayBuffer
return Array.prototype.map.call(new Uint8Array(buffer), x => ('00' + x.toString(16)).slice(-2)).join('');
}
function sha1(input, callback) {
return window.crypto.subtle.digest(
{ name: "SHA-1", },
new TextEncoder().encode(input)
).then(hashed => {
return callback(buf2hex(hashed));
});
}
>>>>>>>
/**
* Creates a rate-limited function that delays invoking `fn` until after
* `interval` milliseconds have elapsed since the last time the rate-limited
* function was invoked.
*
* Does not drop invocations (lossless), unlike `_.throttle`.
*
* The rate-limited function comes with a `cancel` method to cancel delayed
* `fn` invocations.
*
* Adapted from
* http://stackoverflow.com/questions/23072815/throttle-javascript-function-calls-but-with-queuing-dont-discard-calls
*
* @param {Function} fn The function to rate-limit.
* @param {number} interval The number of milliseconds to rate-limit invocations to.
* @param {Object} context The context object (optional).
* @returns {Function} Returns the new rate-limited function.
**/
function rateLimit(fn, interval, context) {
let canInvoke = true,
queue = [],
timer_id,
limited = function () {
queue.push({
context: context || this,
arguments: Array.prototype.slice.call(arguments)
});
if (canInvoke) {
canInvoke = false;
timeEnd();
}
};
function timeEnd() {
let item;
if (queue.length) {
item = queue.splice(0, 1)[0];
fn.apply(item.context, item.arguments); // invoke fn
timer_id = window.setTimeout(timeEnd, interval);
} else {
canInvoke = true;
}
}
limited.cancel = function () {
window.clearTimeout(timer_id);
queue = [];
canInvoke = true;
};
return limited;
}
function buf2hex(buffer) { // buffer is an ArrayBuffer
return Array.prototype.map.call(new Uint8Array(buffer), x => ('00' + x.toString(16)).slice(-2)).join('');
}
function sha1(input, callback) {
return window.crypto.subtle.digest(
{ name: "SHA-1", },
new TextEncoder().encode(input)
).then(hashed => {
return callback(buf2hex(hashed));
});
}
<<<<<<<
exports.makeURI = makeURI;
exports.nDaysFromNow = nDaysFromNow;
exports.oneDayFromNow = oneDayFromNow;
exports.oneDay = oneDay;
exports.oneHour = oneHour;
exports.oneMinute = oneMinute;
exports.oneSecond = oneSecond;
exports.rateLimit = rateLimit;
exports.removeElementFromArray = removeElementFromArray;
=======
exports.sha1 = sha1;
>>>>>>>
exports.makeURI = makeURI;
exports.nDaysFromNow = nDaysFromNow;
exports.oneDayFromNow = oneDayFromNow;
exports.oneDay = oneDay;
exports.oneHour = oneHour;
exports.oneMinute = oneMinute;
exports.oneSecond = oneSecond;
exports.rateLimit = rateLimit;
exports.removeElementFromArray = removeElementFromArray;
exports.sha1 = sha1; |
<<<<<<<
var error;
path = resolvePath(path, options);
options.__path = path,
=======
path = resolvePath(path, options);
options.__path = path;
>>>>>>>
var error;
path = resolvePath(path, options);
options.__path = path; |
<<<<<<<
$( document ).ready( function () {
var $document = $( document );
$document.on( 'click', '.fm-add-another', function( e ) {
=======
var fm_init = function () {
$( document ).on( 'click', '.fm-add-another', function( e ) {
>>>>>>>
var fm_init = function () {
var $document = $( document );
$document.on( 'click', '.fm-add-another', function( e ) {
<<<<<<<
$document.on( 'fm_activate_tab', init_sortable );
} );
=======
$( document ).on( 'fm_activate_tab', init_sortable );
};
fmLoadModule( fm_init );
>>>>>>>
$document.on( 'fm_activate_tab', init_sortable );
};
fmLoadModule( fm_init ); |
<<<<<<<
import LiadrinsFuryUnleashed from './Modules/Items/LiadrinsFuryUnleashed';
=======
import AshesToDust from './Modules/Items/AshesToDust';
>>>>>>>
import LiadrinsFuryUnleashed from './Modules/Items/LiadrinsFuryUnleashed';
import AshesToDust from './Modules/Items/AshesToDust';
<<<<<<<
liadrinsFuryUnleahed: LiadrinsFuryUnleashed,
=======
ashesToDust: AshesToDust,
>>>>>>>
liadrinsFuryUnleahed: LiadrinsFuryUnleashed,
ashesToDust: AshesToDust, |
<<<<<<<
=======
self.pdu_body = pdu_body;
if (command_status == undefined) {
command_status = 0;
}
self.header = exports.pack('NNNN', self.pdu_body.length + 16, self.command_id, command_status, self.sequence_number);
>>>>>>>
if (command_status == undefined) {
command_status = 0;
} |
<<<<<<<
});
// Remove onclick and call ourselves
var switch_html = $(s.switch_html);
switch_html.prop('onclick', null);
switch_html.click(function () {
// Remove selected pre class when switching to HTML editor
base.selectPreCSS(false);
switchEditors.go('content', 'html');
});
// Highlight selected
ed.onNodeChange.add(function (ed, cm, n, co) {
if (n != currPre) {
// We only care if we select another same object
if (currPre) {
// If we have a previous pre, remove it
base.selectPreCSS(false);
currPre = null;
}
if (te.isCrayon(n)) {
// Add new pre
currPre = n;
base.selectPreCSS(true);
base.setHighlight(true);
} else {
// No pre selected
base.setHighlight(false);
}
// var tooltip = currPre ? s.dialog_title_edit : s.dialog_title_add;
// $(s.tinymce_button).attr('title', tooltip);
}
});
ed.onBeforeSetContent.add(function (ed, o) {
// Remove all selected pre tags
var content = $(o.content);
var wrapper = $('<div>');
content.each(function () {
$(this).removeClass(s.css_selected);
wrapper.append($(this).clone());
});
o.content = wrapper.html();
});
ed.addButton(name, {
// TODO add translation
title: s.dialog_title,
cmd: 'showCrayon'
});
},
createControl: function (n, cm) {
return null;
},
getInfo: function () {
return {
longname: 'Crayon Syntax Highlighter',
author: 'Aram Kocharyan',
authorurl: 'http://aramk.com/',
infourl: 'https://github.com/aramk/crayon-syntax-highlighter',
version: "1.0"
};
}
=======
}
// cmd: 'showCrayon'
});
>>>>>>>
}
}); |
<<<<<<<
.add('transitions & loops', () => <TransitionLoop />)
.add('transitions with options', () => <TransitionWithOptions />);
=======
.add('transitions & loops', () => <TransitionLoop />)
.add('with segments', () => <LottieControlSegments />);
>>>>>>>
.add('transitions & loops', () => <TransitionLoop />)
.add('transitions with options', () => <TransitionWithOptions />)
.add('with segments', () => <LottieControlSegments />); |
<<<<<<<
Spice.registerHelper('CouponMountain_check_expiry', function(string, options) {
=======
function getExpiry (dateString) {
>>>>>>>
function getExpiry (dateString) {
<<<<<<<
Spice.registerHelper('CouponMountain_dateString', function(string) {
var date = DDG.getDateFromString(string),
months = [ 'Jan.','Feb.','Mar.','Apr.','May','Jun.','Jul.','Aug.','Sep.','Oct.','Nov.','Dec.'];
=======
var months = [ 'Jan.','Feb.','Mar.','Apr.','May','Jun.','Jul.','Aug.','Sep.','Oct.','Nov.','Dec.'],
date = DDG.getDateFromString(dateString);
>>>>>>>
Spice.registerHelper('CouponMountain_dateString', function(string) {
var months = [ 'Jan.','Feb.','Mar.','Apr.','May','Jun.','Jul.','Aug.','Sep.','Oct.','Nov.','Dec.'],
date = DDG.getDateFromString(dateString);
<<<<<<<
Spice.registerHelper('CouponMountain_stripExpiry', function(string) {
return string.replace(/(offer|good through|expires|ends|valid \w+) .+$/i, '');
});
=======
var couponCode = $('.zci--coupon_mountain input.tag');
if (couponCode) {
couponCode.click(function() {
couponCode.focus().select();
});
}
};
>>>>>>>
var couponCode = $('.zci--coupon_mountain input.tag');
if (couponCode) {
couponCode.click(function() {
couponCode.focus().select();
});
}
}; |
<<<<<<<
Spice.add({
data : api_result.results[0],
header1 : 'Members of the ' + state + ' ' + chamber,
sourceUrl : "http://topics.nytimes.com/top/reference/timestopics/" +
"organizations/c/congress/index.html",
sourceName : 'The New York Times',
=======
// sort by district for House members
if(chamber == 'house')
api_result.results = sortDistrict(api_result.results);
Spice.render({
data : api_result.results,
header1 : 'Members of the U.S. ' + capitalize(chamber) + ' ' + '(' + state + ')',
source_url : "https://www.govtrack.us/congress/members/"+state,
source_name : 'govtrack.us',
>>>>>>>
// sort by district for House members
if(chamber == 'house')
api_result.results = sortDistrict(api_result.results);
Spice.add({
data : api_result.results,
header1 : 'Members of the U.S. ' + capitalize(chamber) + ' ' + '(' + state + ')',
sourceUrl : "https://www.govtrack.us/congress/members/"+state,
sourceName : 'govtrack.us',
<<<<<<<
templates: {
items: api_result.results[0].members,
item: Spice.congress.congress,
=======
template_options: {
items: api_result.results,
template_item: "congress",
>>>>>>>
templates: {
items: api_result.results,
item: Spice.congress.congress,
<<<<<<<
id : "congress",
is_house : (chamber == "House")
=======
force_big_header : true,
force_no_fold : true,
spice_name : "congress"
>>>>>>>
id: 'congress',
force_big_header : true,
force_no_fold : true, |
<<<<<<<
var weatherData = {};
=======
"use strict";
>>>>>>>
"use strict";
var weatherData = {};
<<<<<<<
=======
// Render the container elements
Spice.render({
data : {},
header1 : r.flags['ddg-location'] ? 'Weather for '+r.flags['ddg-location'] : 'Weather',
source_url : 'http://forecast.io/#/f/'+r.latitude+','+r.longitude,
source_name : 'Forecast.io',
template_normal : 'forecast',
force_big_header : true,
force_no_fold : true,
});
>>>>>>>
<<<<<<<
// var set_skycons = function(elem_id, type) {
// var $elem = $('#'+elem_id),
// $img = $('<img />').attr('id', $elem.attr('id'))
// .attr('class', $elem.attr('class'))
// .attr('src', '/iu/?u=http://forecastsite.s3.amazonaws.com/skycons/'+type+'.gif') // DDG
// .css({
// 'width': $elem.width(),
// 'height': $elem.height()
// })
// $elem.replaceWith($img)
// };
var get_skycon = function(type) {
return 'http://forecastsite.s3.amazonaws.com/skycons/'+type+'.gif';
};
=======
var set_skycons = function(elem_id, type) {
var $elem = $('#'+elem_id),
$img = $('<img />').attr('id', $elem.attr('id'))
.attr('class', $elem.attr('class'))
.attr('src', '/iu/?u=http://forecastsite.s3.amazonaws.com/skycons/'+type+'.gif') // DDG
.css({
'width': $elem.width(),
'height': $elem.height()
});
$elem.replaceWith($img);
};
>>>>>>>
// var set_skycons = function(elem_id, type) {
// var $elem = $('#'+elem_id),
// $img = $('<img />').attr('id', $elem.attr('id'))
// .attr('class', $elem.attr('class'))
// .attr('src', '/iu/?u=http://forecastsite.s3.amazonaws.com/skycons/'+type+'.gif') // DDG
// .css({
// 'width': $elem.width(),
// 'height': $elem.height()
// })
// $elem.replaceWith($img)
// };
var get_skycon = function(type) {
return 'http://forecastsite.s3.amazonaws.com/skycons/'+type+'.gif';
};
<<<<<<<
speed_units = unit_labels[units].speed,
feel_str,
currentObj = {};
=======
speed_units = unit_labels[units].speed;
>>>>>>>
speed_units = unit_labels[units].speed,
feel_str,
currentObj = {};
<<<<<<<
var temp_str = '<span class="fe_temp_str">'+Math.round(f.currently.temperature)+'°</span>'
/*
if(temp_direction > 0)
temp_str += ' <span class="fe_dir">and rising</span>'
else if(temp_direction < 0)
temp_str += ' <span class="fe_dir">and falling</span>'
*/
if(f.currently.apparentTemperature)
feel_str = 'Feels like '+Math.round(f.currently.apparentTemperature)+'°'
currentObj.temp = temp_str;
currentObj.feelslike = feel_str;
if(current_summary.length > 45)
currentObj.summaryClass = 'fe_small';
else currentObj.summaryClass = '';
=======
var temp_str = '<span class="fe_temp_str">'+Math.round(f.currently.temperature)+'°</span><span class="fe_temp_unit">'+unit_labels[units].temperature+'</span>';
if(temp_direction > 0) {
temp_str += ' <span class="fe_dir">and rising</span>';
} else if(temp_direction < 0) {
temp_str += ' <span class="fe_dir">and falling</span>';
}
if(f.currently.apparentTemperature) {
temp_str += ' <span class="fe_feelslike">Feels like '+Math.round(f.currently.apparentTemperature)+'°'+'</span>';
}
$container.find('.fe_currently .fe_temp').html(temp_str);
if(current_summary.length > 45) {
$container.find('.fe_currently .fe_summary').addClass('fe_small');
} else {
$container.find('.fe_currently .fe_summary').removeClass('fe_small');
}
$container.find('.fe_currently .fe_summary').html(current_summary);
>>>>>>>
var temp_str = '<span class="fe_temp_str">'+Math.round(f.currently.temperature)+'°</span>'
/*
if(temp_direction > 0)
temp_str += ' <span class="fe_dir">and rising</span>'
else if(temp_direction < 0)
temp_str += ' <span class="fe_dir">and falling</span>'
*/
if(f.currently.apparentTemperature)
feel_str = 'Feels like '+Math.round(f.currently.apparentTemperature)+'°'
currentObj.temp = temp_str;
currentObj.feelslike = feel_str;
if(current_summary.length > 45)
currentObj.summaryClass = 'fe_small';
else currentObj.summaryClass = '';
<<<<<<<
var build_alerts = function(f) {
=======
var build_alerts = function(f) {
var $alert = $container.find('.fe_alert').empty();
>>>>>>>
var build_alerts = function(f) {
<<<<<<<
return "";
=======
$alert.hide();
return;
>>>>>>>
return "";
<<<<<<<
f.alerts[i].title.match(/Statement/i))
continue;
=======
f.alerts[i].title.match(/Statement/i)) {
continue;
}
>>>>>>>
f.alerts[i].title.match(/Statement/i))
continue;
<<<<<<<
if(alert_message)
return '<a href="'+alert_message.uri+'" class="fe_alert" target="_blank"><span class="fe_icon--flag">⚑</span> '+alert_message.title+'</a>';
=======
if(!alert_message) {
return;
}
$('<a target="_blank"></a>').html('<span class="fe_icon">⚑</span> '+alert_message.title).attr('href', alert_message.uri).appendTo($alert);
$container.addClass('alert')
$alert.show()
>>>>>>>
if(alert_message)
return '<a href="'+alert_message.uri+'" class="fe_alert" target="_blank"><span class="fe_icon--flag">⚑</span> '+alert_message.title+'</a>';
<<<<<<<
weatherData.current = build_currently(r);
weatherData.alerts = build_alerts(r);
weatherData.daily = build_daily(r);
// Render/Display
Spice.add({
id: 'forecast',
name: 'Weather',
data: [weatherData.current, weatherData.daily[0], weatherData.daily[1], weatherData.daily[2], weatherData.daily[3], weatherData.daily[4], weatherData.daily[5], weatherData.daily[6]],
signal: "high",
meta: {
heading: r.flags['ddg-location'] ? 'Weather for '+r.flags['ddg-location'] + weatherData.alerts : 'Weather' + weatherData.alerts,
sourceUrl: 'http://forecast.io/#/f/'+r.latitude+','+r.longitude,
sourceName: 'Forecast.io',
altMeta: 'Temperatures in '+unit_labels[units].temperature+'°',
variableTileWidth: true
},
view: 'Tiles',
templates: {
item: Spice.forecast.forecast_item
}
});
=======
build_currently(r)
build_daily(r)
build_alerts(r)
build_temp_switch(unit_labels[units].temperature);
var other_unit = unit_labels[units].temperature === 'F' ? 'C' : 'F';
var convertTemp = function(unit, d){
if (unit === 'C') {
return (d-32)*(5/9);
} else if (unit === 'F') {
return d*(9/5) + 32;
}
}
//when we press the small button, switch the temperature units
$('#fe_temp_switch').click(function(){
//initialize the temperatures with the API data
var temps = {};
temps.current = r.currently.temperature;
temps.feelslike = r.currently.apparentTemperature;
temps.daily = $.map(r.daily.data, function(e){
return {'tempMin': e.temperatureMin, 'tempMax': e.temperatureMax};
});
//if they want the units that aren't by the API, calculate the new temps
if (other_unit !== unit_labels[units].temperature) {
temps.current = convertTemp(other_unit, temps.current);
temps.feelslike = convertTemp(other_unit, temps.feelslike);
temps.daily = $.map(temps.daily, function(e){
var tempMin = convertTemp(other_unit, e.tempMin),
tempMax = convertTemp(other_unit, e.tempMax);
return {'tempMin': tempMin, 'tempMax': tempMax};
});
}
//insert the new temps in the html
var $fe_currently = $('.fe_currently');
$fe_currently.find('.fe_temp_str').html(Math.round(temps.current) + '°');
$fe_currently.find('.fe_temp_unit').html(other_unit);
$fe_currently.find('.fe_feelslike').html('Feels like '+Math.round(temps.feelslike)+'°');
$('.fe_temp_bar').each(function(i){
var day = temps.daily[i],
$this = $(this);
$this.find('.fe_high_temp').html(Math.round(day.tempMax) + '°');
$this.find('.fe_low_temp').html(Math.round(day.tempMin) + '°');
})
//switch the units on the button
build_temp_switch(other_unit);
other_unit = (other_unit === 'F') ? 'C' : 'F';
});
>>>>>>>
weatherData.current = build_currently(r);
weatherData.alerts = build_alerts(r);
weatherData.daily = build_daily(r);
// Render/Display
Spice.add({
id: 'forecast',
name: 'Weather',
data: [weatherData.current, weatherData.daily[0], weatherData.daily[1], weatherData.daily[2], weatherData.daily[3], weatherData.daily[4], weatherData.daily[5], weatherData.daily[6]],
signal: "high",
meta: {
heading: r.flags['ddg-location'] ? 'Weather for '+r.flags['ddg-location'] + weatherData.alerts : 'Weather' + weatherData.alerts,
sourceUrl: 'http://forecast.io/#/f/'+r.latitude+','+r.longitude,
sourceName: 'Forecast.io',
altMeta: 'Temperatures in '+unit_labels[units].temperature+'°',
variableTileWidth: true
},
view: 'Tiles',
templates: {
item: Spice.forecast.forecast_item
}
}); |
<<<<<<<
Ape.addEvent("init", function() {
include("framework/mootools.js");
include("framework/Http.js");
include("framework/userslist.js");
include("framework/log.js"); //Enhanced Ape.log() method, comment this line to disable it.
include("utils/utils.js");
include("commands/proxy.js");
include("commands/inlinepush.js");
include("examples/nickname.js");
include("examples/move.js");
include("utils/checkTool.js"); //Just needed for the APE JSF diagnostic tool, once APE is installed you can remove it
//include("examples/ircserver.js");
//include("framework/http_auth.js");
//Those file are used to test feature of APE.
//include("test/MySQL.js");
//include("test/Socket.js");
//include("test/Pipes.js");
=======
Ape.addEvent('init', function() {
try {
//This file is essential
include('framework/mootools.js');
//These 4 files are recommended
include('utils/utils.js');
include('framework/Http.js');
include('framework/userslist.js');
include('commands/proxy.js');
//These 5 files are meant for the demo's
//include('framework/http_auth.js');
//include('commands/inlinepush.js');
//include('examples/nickname.js');
//include('examples/move.js');
//include('examples/ircserver.js');
//This file is needed for the APE JSF diagnostic tool, once APE is installed you can remove it
///include('utils/checkTool.js');
//This file is used to test features of APE. Especially meant for develompment of APE Features
//include('test/_tests.js');
} catch (e) {
Ape.log(e.message + '\n\t' + e.fileName + ':' + e.lineNumber);
}
>>>>>>>
Ape.addEvent('init', function() {
try {
//This file is essential
include('framework/mootools.js');
//These 4 files are recommended
include('utils/utils.js');
include('framework/Http.js');
include('framework/userslist.js');
include('commands/proxy.js');
include("framework/log.js"); //Enhanced Ape.log() method, comment this line to disable it.
//These 5 files are meant for the demo's
//include('framework/http_auth.js');
//include('commands/inlinepush.js');
//include('examples/nickname.js');
//include('examples/move.js');
//include('examples/ircserver.js');
//This file is needed for the APE JSF diagnostic tool, once APE is installed you can remove it
///include('utils/checkTool.js');
//This file is used to test features of APE. Especially meant for develompment of APE Features
//include('test/_tests.js');
} catch (e) {
Ape.log(e.message + '\n\t' + e.fileName + ':' + e.lineNumber);
} |
<<<<<<<
$.mobiscroll.themes.frame.jqm = {
jqmBody: 'a',
=======
var ms = mobiscroll,
$ = ms.$;
ms.themes.frame.jqm = {
>>>>>>>
var ms = mobiscroll,
$ = ms.$;
ms.themes.frame.jqm = {
jqmBody: 'a', |
<<<<<<<
elm = $(ev.target),
=======
elm = event.target,
>>>>>>>
elm = $(ev.target),
<<<<<<<
=======
},
onProcessSettings: function (ev, inst) {
var buttons = inst.buttons;
buttons.set.icon = 'checkmark';
buttons.cancel.icon = 'close';
buttons.clear.icon = 'close';
// Widget
if (buttons.ok) {
buttons.ok.icon = 'checkmark';
}
if (buttons.close) {
buttons.close.icon = 'close';
}
// Date & Time
if (buttons.now) {
buttons.now.icon = 'loop2';
}
// Timer
if (buttons.toggle) {
buttons.toggle.icon = 'play3';
}
if (buttons.start) {
buttons.start.icon = 'play3';
}
if (buttons.stop) {
buttons.stop.icon = 'pause2';
}
if (buttons.reset) {
buttons.reset.icon = 'stop2';
}
if (buttons.lap) {
buttons.lap.icon = 'loop2';
}
if (buttons.hide) {
buttons.hide.icon = 'close';
}
>>>>>>> |
<<<<<<<
(function (undefined) {
var ms = mobiscroll,
$ = ms.$,
datetime = ms.util.datetime,
=======
(function ($, undefined) {
var ms = $.mobiscroll,
datetime = ms.datetime,
adjustedDate = datetime.adjustedDate,
>>>>>>>
(function (undefined) {
var ms = mobiscroll,
$ = ms.$,
datetime = ms.util.datetime,
adjustedDate = datetime.adjustedDate,
<<<<<<<
mind = s.min || new Date(s.startYear, 0, 1),
maxd = s.max || new Date(s.endYear, 11, 31, 23, 59, 59),
=======
mind = s.minDate || adjustedDate(s.startYear, 0, 1),
maxd = s.maxDate || adjustedDate(s.endYear, 11, 31, 23, 59, 59),
>>>>>>>
mind = s.min || adjustedDate(s.startYear, 0, 1),
maxd = s.max || adjustedDate(s.endYear, 11, 31, 23, 59, 59), |
<<<<<<<
angular.module('insight.system').controller('IndexController',
['$scope',
'Global',
'socket',
'Blocks',
'Transactions',
function($scope, Global, socket, Blocks, Transactions) {
=======
angular.module('insight.system').controller('IndexController', ['$scope', '$rootScope', 'Global', 'socket', 'Blocks', 'Transactions', function($scope, $rootScope, Global, socket, Blocks, Transactions) {
>>>>>>>
angular.module('insight.system').controller('IndexController',
['$scope',
'$rootScope',
'Global',
'socket',
'Blocks',
'Transactions',
function($scope, $rootScope, Global, socket, Blocks, Transactions) {
<<<<<<<
socket.on('connect', function() {
socket.emit('subscribe', 'inv');
});
=======
//show errors
$scope.flashMessage = $rootScope.flashMessage || null;
>>>>>>>
socket.on('connect', function() {
socket.emit('subscribe', 'inv');
});
//show errors
$scope.flashMessage = $rootScope.flashMessage || null; |
<<<<<<<
port: process.env.BITCOIND_PORT || '18332',
}
=======
port: process.env.BITCOIND_PORT || '8332',
},
network: 'testnet',
>>>>>>>
port: process.env.BITCOIND_PORT || '18332',
},
network: 'testnet', |
<<<<<<<
=======
import i18nMiddleware from 'i18next-express-middleware';
/* eslint-enable */
>>>>>>> |
<<<<<<<
=======
import PLATFORM from './platform';
import BUILD_DATE from './buildDate';
import URL from './url';
import REDIRECT from './redirect';
>>>>>>>
import URL from './url';
import REDIRECT from './redirect';
<<<<<<<
=======
PLATFORM,
BUILD_DATE,
URL,
REDIRECT,
>>>>>>>
URL,
REDIRECT, |
<<<<<<<
, fs = require('fs')
=======
, utils = require('utilities')
, errors = require('../response/errors')
>>>>>>>
, fs = require('fs')
, utils = require('utilities')
, errors = require('../response/errors') |
<<<<<<<
// NOTE: this file at this time is Microsoft-specific and needs to be updated
// and refactored to be useful by others. There are values stored in
// configuration that can be used instead of the hardcoded values within.
=======
const _ = require('lodash');
>>>>>>>
// NOTE: this file at this time is Microsoft-specific and needs to be updated
// and refactored to be useful by others. There are values stored in
// configuration that can be used instead of the hardcoded values within.
const _ = require('lodash'); |
<<<<<<<
getProfileCreatedDate() {
// legacy method that should probably be removed
if (this.created_at) {
return new Date(this.created_at);
}
}
getProfileUpdatedDate() {
// legacy method that should probably be removed
if (this.updated_at) {
return new Date(this.updated_at);
}
}
// ----------------------------------------------------------------------------
// Retrieves the URL for the user's avatar, if present. If the user's details
// have not been loaded, we will not yet have an avatar URL.
// ----------------------------------------------------------------------------
avatar(optionalSize) {
if (!optionalSize) {
optionalSize = 80;
}
if (this.avatar_url) {
return this.avatar_url + '&s=' + optionalSize;
}
}
=======
getMailAddress(callback) {
if (!this.id) {
return callback(new Error('No organization member ID'));
}
const operations = _private(this).operations;
operations.graphManager.getCachedLink(this.id, (getLinkError, link) => {
if (getLinkError || !link || !link.aadupn) {
return callback(getLinkError);
}
const providers = operations.providers;
if (!providers.mailAddressProvider) {
return callback(new Error('No mailAddressProvider is available in this application instance'));
}
providers.mailAddressProvider.getAddressFromUpn(link.aadupn, callback);
});
}
>>>>>>>
getProfileCreatedDate() {
// legacy method that should probably be removed
if (this.created_at) {
return new Date(this.created_at);
}
}
getProfileUpdatedDate() {
// legacy method that should probably be removed
if (this.updated_at) {
return new Date(this.updated_at);
}
}
// ----------------------------------------------------------------------------
// Retrieves the URL for the user's avatar, if present. If the user's details
// have not been loaded, we will not yet have an avatar URL.
// ----------------------------------------------------------------------------
avatar(optionalSize) {
if (!optionalSize) {
optionalSize = 80;
}
if (this.avatar_url) {
return this.avatar_url + '&s=' + optionalSize;
}
getMailAddress(callback) {
if (!this.id) {
return callback(new Error('No organization member ID'));
}
const operations = _private(this).operations;
operations.graphManager.getCachedLink(this.id, (getLinkError, link) => {
if (getLinkError || !link || !link.aadupn) {
return callback(getLinkError);
}
const providers = operations.providers;
if (!providers.mailAddressProvider) {
return callback(new Error('No mailAddressProvider is available in this application instance'));
}
providers.mailAddressProvider.getAddressFromUpn(link.aadupn, callback);
});
} |
<<<<<<<
* calendar.render('calendar-container');
* calendar.setDate(new Date());
* @return {Boolean} 当前选中日期是否设置成功
=======
* instance.render('calendar-container');
* instance.setDate(new Date());
>>>>>>>
* instance.render('calendar-container');
* instance.setDate(new Date());
* @return {Boolean} 当前选中日期是否设置成功 |
<<<<<<<
function updateElementTextUsingProperties(elementPropertiesObj) {
Object.keys(elementPropertiesObj).forEach(function(elementId){
$.get(
getVersion() + '/properties/' + elementPropertiesObj[elementId],
null,
function(propertyValue){
$('#'+ elementId).text(propertyValue);
}
)
})
}
function updateElementColourUsingProperties(elementPropertiesObj) {
Object.keys(elementPropertiesObj).forEach(function(elementId){
$.get(
getVersion() + '/properties/' + elementPropertiesObj[elementId],
null,
function(propertyBannerColour){
$('#' + elementId).css({'background-color': propertyBannerColour});
}
)
})
}
=======
>>>>>>>
<<<<<<<
updateElementColourUsingProperties({"banner": "gaffer.properties.app.banner.colour"});
updateElementTextUsingProperties({"title": "gaffer.properties.app.title", "banner": "gaffer.properties.app.banner.description"});
=======
initFromProperties(onPropertiesLoad);
>>>>>>>
initFromProperties(onPropertiesLoad); |
<<<<<<<
// Message deletions and updates, changes
.add('blue', 'string', { default: '#4B4BFF' }));
=======
// Message deletions and updates, user updates
.add('blue', 'string', { default: '#4B4BFF' }))
.add('moderation', folder => folder
.add('cases', 'any', { array: true }));
>>>>>>>
// Message deletions and updates, changes
.add('blue', 'string', { default: '#4B4BFF' }));
.add('moderation', folder => folder
.add('cases', 'any', { array: true })); |
<<<<<<<
async getAddress(address_n: Array<number>, coinInfo: BitcoinNetworkInfo, showOnTrezor: boolean): Promise<trezor.Address> {
=======
async getAddress(address_n: Array<number>, coinInfo: CoinInfo, showOnTrezor: boolean): Promise<trezor.Address> {
const scriptType: ?string = getScriptType(address_n);
>>>>>>>
async getAddress(address_n: Array<number>, coinInfo: BitcoinNetworkInfo, showOnTrezor: boolean): Promise<trezor.Address> {
const scriptType: ?string = getScriptType(address_n); |
<<<<<<<
exclude: [/node_modules/, /trezor-blockchain-link\/build\/workers/],
use: ['babel-loader'],
=======
exclude: /node_modules/,
use: ['babel-loader'],
>>>>>>>
exclude: [/node_modules/, /trezor-blockchain-link\/build\/workers/],
use: ['babel-loader'],
<<<<<<<
alias: {
},
=======
>>>>>>>
<<<<<<<
// { from: `${SRC}images`, to: 'images' },
=======
>>>>>>>
<<<<<<<
// optimization: {
// minimize: false
// },
=======
>>>>>>>
<<<<<<<
fs: 'empty',
path: 'empty',
net: 'empty',
tls: 'empty',
},
};
=======
fs: 'empty',
path: 'empty',
},
};
>>>>>>>
fs: 'empty',
path: 'empty',
net: 'empty',
tls: 'empty',
},
}; |
<<<<<<<
date: new Date('2018-05-21'),
changes: <React.Fragment>Added <ItemLink id={ITEMS.ZANDALARI_LOA_FIGURINE.id} /> to trinkets.</React.Fragment>,
contributors: [Fyruna],
},
{
=======
date: new Date('2018-05-20'),
changes: 'Update specializations list layout. Clicking a spec now opens the example report.',
contributors: [Zerotorescue],
},
{
>>>>>>>
date: new Date('2018-05-21'),
changes: <React.Fragment>Added <ItemLink id={ITEMS.ZANDALARI_LOA_FIGURINE.id} /> to trinkets.</React.Fragment>,
contributors: [Fyruna],
},
{
date: new Date('2018-05-20'),
changes: 'Update specializations list layout. Clicking a spec now opens the example report.',
contributors: [Zerotorescue],
},
{ |
<<<<<<<
},
{
from: '/dashboard-account-settings',
to: '/dashboard-tenant-settings'
=======
},
{
from: '/connections/database/mysql',
to: '/connections/database/custom-db'
>>>>>>>
},
{
from: '/connections/database/mysql',
to: '/connections/database/custom-db'
},
{
from: '/dashboard-account-settings',
to: '/dashboard-tenant-settings' |
<<<<<<<
},
{
from: '/libraries/lock/v9#api',
to: '/libraries/lock/v9/api'
},
{
from: '/libraries/lock/v9/events',
to: '/libraries/lock/v9/api#events'
},
{
from: '/libraries/lock/v9/initialization',
to: '/libraries/lock/v9#initialization'
=======
},
{
from: '/quickstart/native/ionic/00-intro',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/02-custom-login',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/03-user-profile',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/04-linking-accounts',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/05-rules',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/06-authorization',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/08-mfa',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/09-customizing-lock',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/backend/nodejs/00-getting-started',
to: '/quickstart/backend/nodejs'
},
{
from: '/quickstart/backend/aspnet-core-webapi/00-getting-started',
to: '/quickstart/backend/aspnet-core-webapi'
},
{
from: '/quickstart/backend/falcor/00-getting-started',
to: '/quickstart/backend/falcor'
},
{
from: '/quickstart/backend/golang/00-getting-started',
to: '/quickstart/backend/golang'
},
{
from: '/quickstart/backend/hapi/00-getting-started',
to: '/quickstart/backend/hapi'
},
{
from: '/quickstart/backend/java-spring-security/00-getting-started',
to: '/quickstart/backend/java-spring-security'
},
{
from: '/quickstart/backend/laravel/00-getting-started',
to: '/quickstart/backend/laravel'
},
{
from: '/quickstart/backend/php/00-getting-started',
to: '/quickstart/backend/php'
},
{
from: '/quickstart/backend/python/00-getting-started',
to: '/quickstart/backend/python'
},
{
from: '/quickstart/backend/rails/00-getting-started',
to: '/quickstart/backend/rails'
},
{
from: '/quickstart/backend/relay/00-getting-started',
to: '/quickstart/backend/relay'
},
{
from: '/quickstart/backend/ruby/00-getting-started',
to: '/quickstart/backend/ruby'
},
{
from: '/quickstart/backend/symfony/00-getting-started',
to: '/quickstart/backend/symfony'
},
{
from: '/quickstart/backend/webapi-owin/00-getting-started',
to: '/quickstart/backend/webapi-owin'
},
{
from: '/quickstart/webapp/rails/00-introduction',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/02-custom-login',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/03-session-handling',
to: '/quickstart/webapp/rails/02-session-handling'
},
{
from: '/quickstart/webapp/rails/04-user-profile',
to: '/quickstart/webapp/rails/03-user-profile'
},
{
from: '/quickstart/webapp/rails/05-linking-accounts',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/06-rules',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/07-authorization',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/08-mfa',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/09-customizing-lock',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/java/getting-started',
to: '/quickstart/webapp/java'
},
{
from: '/quickstart/webapp/java-spring-mvc/getting-started',
to: '/quickstart/webapp/java-spring-mvc'
},
{
from: '/quickstart/webapp/java-spring-security-mvc/00-intro',
to: '/quickstart/webapp/java-spring-security-mvc'
},
{
from: '/tutorials/step-up-authentication',
to: '/multifactor-authentication/developer/step-up-with-acr'
},
{
from: '/quickstart/spa/angular2/00-login',
to: '/quickstart/spa/angular2'
},
{
from: '/quickstart/spa/angular2/03-user-profile',
to: '/quickstart/spa/angular2/02-user-profile'
},
{
from: '/quickstart/spa/angular2/04-calling-an-api',
to: '/quickstart/spa/angular2/03-calling-an-api'
},
{
from: '/quickstart/spa/angular2/05-authorization',
to: '/quickstart/spa/angular2/04-authorization'
},
{
from: '/quickstart/spa/angular2/06-token-renewal',
to: '/quickstart/spa/angular2/05-token-renewal'
},
{
from: '/security/token-exp',
to: '/tokens'
>>>>>>>
},
{
from: '/quickstart/native/ionic/00-intro',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/02-custom-login',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/03-user-profile',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/04-linking-accounts',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/05-rules',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/06-authorization',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/08-mfa',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/native/ionic/09-customizing-lock',
to: '/quickstart/native/ionic'
},
{
from: '/quickstart/backend/nodejs/00-getting-started',
to: '/quickstart/backend/nodejs'
},
{
from: '/quickstart/backend/aspnet-core-webapi/00-getting-started',
to: '/quickstart/backend/aspnet-core-webapi'
},
{
from: '/quickstart/backend/falcor/00-getting-started',
to: '/quickstart/backend/falcor'
},
{
from: '/quickstart/backend/golang/00-getting-started',
to: '/quickstart/backend/golang'
},
{
from: '/quickstart/backend/hapi/00-getting-started',
to: '/quickstart/backend/hapi'
},
{
from: '/quickstart/backend/java-spring-security/00-getting-started',
to: '/quickstart/backend/java-spring-security'
},
{
from: '/quickstart/backend/laravel/00-getting-started',
to: '/quickstart/backend/laravel'
},
{
from: '/quickstart/backend/php/00-getting-started',
to: '/quickstart/backend/php'
},
{
from: '/quickstart/backend/python/00-getting-started',
to: '/quickstart/backend/python'
},
{
from: '/quickstart/backend/rails/00-getting-started',
to: '/quickstart/backend/rails'
},
{
from: '/quickstart/backend/relay/00-getting-started',
to: '/quickstart/backend/relay'
},
{
from: '/quickstart/backend/ruby/00-getting-started',
to: '/quickstart/backend/ruby'
},
{
from: '/quickstart/backend/symfony/00-getting-started',
to: '/quickstart/backend/symfony'
},
{
from: '/quickstart/backend/webapi-owin/00-getting-started',
to: '/quickstart/backend/webapi-owin'
},
{
from: '/quickstart/webapp/rails/00-introduction',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/02-custom-login',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/03-session-handling',
to: '/quickstart/webapp/rails/02-session-handling'
},
{
from: '/quickstart/webapp/rails/04-user-profile',
to: '/quickstart/webapp/rails/03-user-profile'
},
{
from: '/quickstart/webapp/rails/05-linking-accounts',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/06-rules',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/07-authorization',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/08-mfa',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/rails/09-customizing-lock',
to: '/quickstart/webapp/rails'
},
{
from: '/quickstart/webapp/java/getting-started',
to: '/quickstart/webapp/java'
},
{
from: '/quickstart/webapp/java-spring-mvc/getting-started',
to: '/quickstart/webapp/java-spring-mvc'
},
{
from: '/quickstart/webapp/java-spring-security-mvc/00-intro',
to: '/quickstart/webapp/java-spring-security-mvc'
},
{
from: '/tutorials/step-up-authentication',
to: '/multifactor-authentication/developer/step-up-with-acr'
},
{
from: '/quickstart/spa/angular2/00-login',
to: '/quickstart/spa/angular2'
},
{
from: '/quickstart/spa/angular2/03-user-profile',
to: '/quickstart/spa/angular2/02-user-profile'
},
{
from: '/quickstart/spa/angular2/04-calling-an-api',
to: '/quickstart/spa/angular2/03-calling-an-api'
},
{
from: '/quickstart/spa/angular2/05-authorization',
to: '/quickstart/spa/angular2/04-authorization'
},
{
from: '/quickstart/spa/angular2/06-token-renewal',
to: '/quickstart/spa/angular2/05-token-renewal'
},
{
from: '/security/token-exp',
to: '/tokens'
},
{
from: '/libraries/lock/v9#api',
to: '/libraries/lock/v9/api'
},
{
from: '/libraries/lock/v9/events',
to: '/libraries/lock/v9/api#events'
},
{
from: '/libraries/lock/v9/initialization',
to: '/libraries/lock/v9#initialization' |
<<<<<<<
},
{
from: '/tokens/concepts/token-best-practices',
to: '/best-practices/token-best-practices'
=======
},
{
from: '/logs/references/log-event-data',
to: '/logs/references/log-event-types-codes'
>>>>>>>
},
{
from: '/tokens/concepts/token-best-practices',
to: '/best-practices/token-best-practices'
},
from: '/logs/references/log-event-data',
to: '/logs/references/log-event-types-codes' |
<<<<<<<
=======
import sassConfig from '!json-loader!sassjson!sass-loader!../../scss/json.scss';
// Store keycode variables for easier readability
const KEYCODES = {
SPACE: 32,
ENTER: 13,
TAB: 9,
ESC: 27,
BACKSPACE: 8,
SHIFT: 16,
CTRL: 17,
ALT: 18,
CAPS: 20,
LEFT: 37,
UP: 38,
RIGHT: 39,
DOWN: 40,
DELETE: 46,
COMMA: 44,
};
>>>>>>>
import sassConfig from '!json-loader!sassjson!sass-loader!../../scss/json.scss'; |
<<<<<<<
var renderHerman = function (dest, ctx) {
=======
var renderHerman = function(dest, ctx) {
var base = path.resolve(__dirname, './templates');
>>>>>>>
var renderHerman = function(dest, ctx) {
<<<<<<<
var renderIframe = function (env, item) {
if (item.rendered) {
var nunjucksEnv = nunjucks.configure(base, { noCache: true });
var ctx = extend({}, env, { example: item });
item.iframed = nunjucksEnv.render(iframeTpl, ctx);
}
};
=======
>>>>>>>
var renderIframe = function(env, item) {
if (item.rendered) {
var nunjucksEnv = nunjucks.configure(base, { noCache: true });
var ctx = extend({}, env, { example: item });
item.iframed = nunjucksEnv.render(iframeTpl, ctx);
}
}; |
<<<<<<<
it('handles a log file that exists when onlySendNew is enabled', function (done) {
var nextData = '\n{"event":"request","timestamp"' +
':1469328953222,"id":"1469328953222-42369-62002","instance":"http://localhost:8080","labels":["api","http"],"method":"get","path":"/test2","query":{},"source":' +
'{"remoteAddress":"127.0.0.1"},"responseTime":19,"statusCode":200}';
var broadcast = null;
var stream = Fs.createWriteStream(logPath2, { flags: 'a' });
stream.write(data1, function () {
stream.write('\n' + data2, function () {
var server = Http.createServer(function (req, res) {
var result = '';
req.on('readable', function () {
var read = req.read();
if (read) {
result += read.toString();
}
});
req.once('end', function () {
var obj = JSON.parse(result);
expect(obj.schema).to.equal('good.v1');
expect(obj.events[0].id).to.equal('1469328953222-42369-62002');
broadcast.kill('SIGUSR2');
});
res.end();
}).listen(0);
server.once('listening', function () {
var url = 'http://127.0.0.1:' + server.address().port + '/';
broadcast = ChildProcess.spawn('node', [broadcastPath, '-l', logPath2, '-u', url, '-i', 5, '-p', 0, '-n', 1]);
broadcast.stderr.on('data', function (data) {
console.log(data.toString())
expect(data).to.not.exist;
});
broadcast.once('close', function (code) {
expect(code).to.equal(0);
done();
});
setTimeout(function () {
stream.write(nextData, function () {});
}, 150);
});
});
});
});
=======
it('sends ops log file to remote server', function (done) {
var stream = Fs.createWriteStream(opsLogPath1, { flags: 'a' });
stream.write(opsData1, function () {
stream.write('\n' + opsData1, function () {
var broadcast = null;
var server = Http.createServer(function (req, res) {
var result = '';
req.on('readable', function () {
var read = req.read();
if (read) {
result += read.toString();
}
});
req.once('end', function () {
var obj = JSON.parse(result);
expect(obj.schema).to.equal('good.v1');
expect(obj.events[1].timestamp).to.equal(1375466329196);
broadcast.kill('SIGUSR2');
});
res.end();
}).listen(0);
server.once('listening', function () {
var url = 'http://127.0.0.1:' + server.address().port + '/';
broadcast = ChildProcess.spawn('node', [broadcastPath, '-l', opsLogPath1, '-u', url, '-i', 5, '-p', 0]);
broadcast.stderr.on('data', function (data) {
expect(data.toString()).to.not.exist;
});
broadcast.once('close', function (code) {
expect(code).to.equal(0);
done();
});
});
});
});
});
>>>>>>>
it('sends ops log file to remote server', function (done) {
var stream = Fs.createWriteStream(opsLogPath1, { flags: 'a' });
stream.write(opsData1, function () {
stream.write('\n' + opsData1, function () {
var broadcast = null;
var server = Http.createServer(function (req, res) {
var result = '';
req.on('readable', function () {
var read = req.read();
if (read) {
result += read.toString();
}
});
req.once('end', function () {
var obj = JSON.parse(result);
expect(obj.schema).to.equal('good.v1');
expect(obj.events[1].timestamp).to.equal(1375466329196);
broadcast.kill('SIGUSR2');
});
res.end();
}).listen(0);
server.once('listening', function () {
var url = 'http://127.0.0.1:' + server.address().port + '/';
broadcast = ChildProcess.spawn('node', [broadcastPath, '-l', opsLogPath1, '-u', url, '-i', 5, '-p', 0]);
broadcast.stderr.on('data', function (data) {
expect(data.toString()).to.not.exist;
});
broadcast.once('close', function (code) {
expect(code).to.equal(0);
done();
});
});
});
});
});
it('handles a log file that exists when onlySendNew is enabled', function (done) {
var nextData = '\n{"event":"request","timestamp"' +
':1469328953222,"id":"1469328953222-42369-62002","instance":"http://localhost:8080","labels":["api","http"],"method":"get","path":"/test2","query":{},"source":' +
'{"remoteAddress":"127.0.0.1"},"responseTime":19,"statusCode":200}';
var broadcast = null;
var stream = Fs.createWriteStream(logPath2, { flags: 'a' });
stream.write(data1, function () {
stream.write('\n' + data2, function () {
var server = Http.createServer(function (req, res) {
var result = '';
req.on('readable', function () {
var read = req.read();
if (read) {
result += read.toString();
}
});
req.once('end', function () {
var obj = JSON.parse(result);
expect(obj.schema).to.equal('good.v1');
expect(obj.events[0].id).to.equal('1469328953222-42369-62002');
broadcast.kill('SIGUSR2');
});
res.end();
}).listen(0);
server.once('listening', function () {
var url = 'http://127.0.0.1:' + server.address().port + '/';
broadcast = ChildProcess.spawn('node', [broadcastPath, '-l', logPath2, '-u', url, '-i', 5, '-p', 0, '-n', 1]);
broadcast.stderr.on('data', function (data) {
console.log(data.toString())
expect(data).to.not.exist;
});
broadcast.once('close', function (code) {
expect(code).to.equal(0);
done();
});
setTimeout(function () {
stream.write(nextData, function () {});
}, 150);
});
});
});
}); |
<<<<<<<
httpAgents: Joi.array(),
httpsAgents: Joi.array(),
reporters: Joi.array().includes(Joi.object()).required()
=======
reporters: Joi.array().includes(Joi.object(), Joi.string()).required()
>>>>>>>
httpAgents: Joi.array(),
httpsAgents: Joi.array(),
reporters: Joi.array().includes(Joi.object(), Joi.string()).required() |
<<<<<<<
var methodColors = { 'get': 32, 'delete': 31, 'put': 36, 'post': 33 };
var color = methodColors[event.method] || 34;
var method = '\x1b[1;' + color + 'm' + event.method + '\x1b[0m';
var statusCode = event.statusCode;
=======
>>>>>>>
var methodColors = { 'get': 32, 'delete': 31, 'put': 36, 'post': 33 };
var color = methodColors[event.method] || 34;
var method = '\x1b[1;' + color + 'm' + event.method + '\x1b[0m';
<<<<<<<
data: event.instance + ': ' + method + ' ' + event.path + ' ' + query + (statusCode ? ' ' + statusCode : '') + ' (' + event.responseTime + 'ms)'
=======
data: event.instance + ': ' + event.method + ' ' + event.path + ' ' + query + statusCode + ' (' + event.responseTime + 'ms)' + responsePayload
>>>>>>>
data: event.instance + ': ' + method + ' ' + event.path + ' ' + query + statusCode + ' (' + event.responseTime + 'ms)' + responsePayload |
<<<<<<<
import { searchWorkflows, getWorkflowDefs, bulkRetryWorkflow, bulkPauseWorkflow, bulkResumeWorkflow, bulkRestartWorkflow, bulkTerminateWorkflow } from '../../../actions/WorkflowActions';
=======
>>>>>>>
import { searchWorkflows, getWorkflowDefs, bulkRetryWorkflow, bulkPauseWorkflow, bulkResumeWorkflow, bulkRestartWorkflow, bulkTerminateWorkflow } from '../../../actions/WorkflowActions';
<<<<<<<
start: start,
selectedWFEs:[],
bulkProcessOperation: "",
bulkProcessInFlight: false,
bulkProcessSuccess: false,
error:false,
bulkError:false,
bulkValidationMessage:"",
bulkPanelOpen:false,
bulkErrorMessages: [],
bulkSuccessResults:[]
}
},
componentWillMount(){
=======
start: !isNaN(start, 10) ? parseInt(start, 10) : start
};
}
componentWillMount() {
>>>>>>>
start: !isNaN(start, 10) ? parseInt(start, 10) : start,
selectedWFEs:[],
bulkProcessOperation: "",
bulkProcessInFlight: false,
bulkProcessSuccess: false,
error:false,
bulkError:false,
bulkValidationMessage:"",
bulkPanelOpen:false,
bulkErrorMessages: [],
bulkSuccessResults:[]
};
}
componentWillMount(){
<<<<<<<
search : search,
h : h,
update : update,
status : status,
workflows : workflowDefs,
bulkProcessInFlight : nextProps.bulkProcessInFlight,
bulkProcessSuccess : nextProps.bulkProcessSuccess,
bulkSuccessResults: nextProps.bulkSuccessResults,
start : start,
error: nextProps.error,
bulkError: ((!this.state.error && nextProps.error && this.state.bulkProcessInFlight) || nextProps.bulkServerErrors) ? true : this.state.bulkError
=======
search,
h: isNaN(h, 10) ? '' : h,
update,
status: status !== '' ? status.split(',') : [],
workflows: workflowDefs,
start: isNaN(start, 10) ? 0 : start
>>>>>>>
search : search,
h: isNaN(h, 10) ? '' : h,
update : update,
status : status !== '' ? status.split(',') : [],
workflows : workflowDefs,
bulkProcessInFlight : nextProps.bulkProcessInFlight,
bulkProcessSuccess : nextProps.bulkProcessSuccess,
bulkSuccessResults: nextProps.bulkSuccessResults,
start: isNaN(start, 10) ? 0 : start,
error: nextProps.error,
bulkError: ((!this.state.error && nextProps.error && this.state.bulkProcessInFlight) || nextProps.bulkServerErrors) ? true : this.state.bulkError
<<<<<<<
},
handleRowSelect(row, isSelected, e) {
let currWFEs = this.state.selectedWFEs;
this.setState({update:true});
if(isSelected){
currWFEs.push(row);
this.setState({selectedWFEs: currWFEs, bulkValidationMessage:""})
} else {
var index = this.state.selectedWFEs.filter((storedRow) => {
return row.workflowId === storedRow.workflowId
})[0] || -1;
if(index === -1){
return true;
}
currWFEs.splice(index, 1)
this.setState({selectedWFEs: currWFEs, bulkValidationMessage:""})
}
return true;
},
handleSelectAll(isSelected, rows, e) {
if(isSelected){
this.setState({selectedWFEs: rows,bulkValidationMessage:""})
} else {
this.setState({selectedWFEs: [],bulkValidationMessage:""})
}
return true;
},
onChangeBulkProcessSelection(e){
this.setState({bulkProcessOperation:e.target.value, bulkValidationMessage:""})
},
onBulkSuccess(){
this.refs.bulkProcessSelect.refs.input.value = "";
this.setState({selectedWFEs:[], bulkProcessOperation:""});
this.refs.table.cleanSelected();
},
removeSuccessfulWorkFlows(successfulWorkflows){
if(successfulWorkflows !== undefined && successfulWorkflows !== null){
this.refs.table.cleanSelected(),
this.setState({selectedWFEs: []});
}
},
bulkProcess(){
let wfes = this.state.selectedWFEs.map((wfe) => {return wfe.workflowId});
let operation = this.state.bulkProcessOperation;
this.setState({bulkProcessSuccess:false, bulkError:false, bulkValidationMessage: "", bulkErrorMessages:[], bulkSuccessResults:[]});
if(wfes.length === 0){
this.setState({bulkValidationMessage:"Error: No workflows selected"})
return;
}
switch(operation){
case "retry":
this.props.dispatch(bulkRetryWorkflow(wfes));
break;
case "restart":
this.props.dispatch(bulkRestartWorkflow(wfes))
break;
case "resume":
this.props.dispatch(bulkResumeWorkflow(wfes))
break;
case "terminate":
this.props.dispatch(bulkTerminateWorkflow(wfes))
break;
case "pause":
this.props.dispatch(bulkPauseWorkflow(wfes))
break;
default:
this.setState({bulkValidationMessage:"Error: No Workflow Operation selected"})
return;
}
},
constructBulkErrorMessages(props){
var messages = [];
if(props.bulkServerErrorMessage){
messages.push(props.bulkServerErrorMessage);
}
if(props.bulkErrorResults && props.bulkErrorResults.length > 0){
for(var i in props.bulkErrorResults){
for(var id in props.bulkErrorResults[i]){
messages.push(id + " - " + props.bulkErrorResults[i][id] + "");
}
}
}
this.setState({bulkErrorMessages: messages});
return null;
},
render() {
=======
};
render() {
>>>>>>>
};
handleRowSelect = (row, isSelected, e) => {
let currWFEs = this.state.selectedWFEs;
this.setState({update:true});
if(isSelected){
currWFEs.push(row);
this.setState({selectedWFEs: currWFEs, bulkValidationMessage:""})
} else {
var index = this.state.selectedWFEs.filter((storedRow) => {
return row.workflowId === storedRow.workflowId
})[0] || -1;
if(index === -1){
return true;
}
currWFEs.splice(index, 1)
this.setState({selectedWFEs: currWFEs, bulkValidationMessage:""})
}
return true;
};
handleSelectAll = (isSelected, rows, e) => {
if(isSelected){
this.setState({selectedWFEs: rows,bulkValidationMessage:""})
} else {
this.setState({selectedWFEs: [],bulkValidationMessage:""})
}
return true;
};
onChangeBulkProcessSelection = (e) => {
this.setState({bulkProcessOperation:e.target.value, bulkValidationMessage:""})
};
onBulkSuccess = () => {
this.refs.bulkProcessSelect.refs.input.value = "";
this.setState({selectedWFEs:[], bulkProcessOperation:""});
this.refs.table.cleanSelected();
};
removeSuccessfulWorkFlows = (successfulWorkflows) => {
if(successfulWorkflows !== undefined && successfulWorkflows !== null){
this.refs.table.cleanSelected(),
this.setState({selectedWFEs: []});
}
}
bulkProcess = () => {
let wfes = this.state.selectedWFEs.map((wfe) => {return wfe.workflowId});
let operation = this.state.bulkProcessOperation;
this.setState({bulkProcessSuccess:false, bulkError:false, bulkValidationMessage: "", bulkErrorMessages:[], bulkSuccessResults:[]});
if(wfes.length === 0){
this.setState({bulkValidationMessage:"Error: No workflows selected"})
return;
}
switch(operation){
case "retry":
this.props.dispatch(bulkRetryWorkflow(wfes));
break;
case "restart":
this.props.dispatch(bulkRestartWorkflow(wfes))
break;
case "resume":
this.props.dispatch(bulkResumeWorkflow(wfes))
break;
case "terminate":
this.props.dispatch(bulkTerminateWorkflow(wfes))
break;
case "pause":
this.props.dispatch(bulkPauseWorkflow(wfes))
break;
default:
this.setState({bulkValidationMessage:"Error: No Workflow Operation selected"})
return;
}
}
constructBulkErrorMessages = (props) => {
var messages = [];
if(props.bulkServerErrorMessage){
messages.push(props.bulkServerErrorMessage);
}
if(props.bulkErrorResults && props.bulkErrorResults.length > 0){
for(var i in props.bulkErrorResults){
for(var id in props.bulkErrorResults[i]){
messages.push(id + " - " + props.bulkErrorResults[i][id] + "");
}
}
}
this.setState({bulkErrorMessages: messages});
return null;
}
render = () => {
<<<<<<<
let totalHits = 0;
=======
let totalHits = 0;
>>>>>>>
let totalHits = 0;
<<<<<<<
const selectRow = {
mode: 'checkbox',
onSelect: this.handleRowSelect,
onSelectAll: this.handleSelectAll
};
let bulkErrors = this.state.bulkErrorMessages.length === 0 ? [] : this.state.bulkErrorMessages.map((mess) => {
return <p>{mess}</p>
});
const bulkSpin = (this.state.bulkProcessInFlight ? (<i style={{"fontSize":"150%"}} className="fa fa-spinner fa-spin"></i>) : "");
const bulkSuccess = (this.state.bulkProcessSuccess ? (<span style={{"fontSize":"150%", "color":"green"}}>All Successful!</span>) : "");
const bulkValidation = (this.state.bulkValidationMessage !== "" ? (<span style={{"fontSize":"150%", "color":"red"}}>{this.state.bulkValidationMessage}</span>) : "");
const bulkError = (this.state.bulkError ? (<span><span style={{"fontSize":"125%", "color":"green"}}>Successful: {this.state.bulkSuccessResults.map((mess) => {return <p key={mess}>{mess}</p>})}</span><span style={{"fontSize":"125%", "color":"red"}}>Errors: {this.state.bulkErrorMessages.map((mess) => {return <p key={mess}>{mess}</p>})}</span></span>) : "");
//secondary filter to match sure we only show workflows that match the the status
=======
// secondary filter to match sure we only show workflows that match the the status
>>>>>>>
const selectRow = {
mode: 'checkbox',
onSelect: this.handleRowSelect,
onSelectAll: this.handleSelectAll
};
let bulkErrors = this.state.bulkErrorMessages.length === 0 ? [] : this.state.bulkErrorMessages.map((mess) => {
return <p>{mess}</p>
});
const bulkSpin = (this.state.bulkProcessInFlight ? (<i style={{"fontSize":"150%"}} className="fa fa-spinner fa-spin"></i>) : "");
const bulkSuccess = (this.state.bulkProcessSuccess ? (<span style={{"fontSize":"150%", "color":"green"}}>All Successful!</span>) : "");
const bulkValidation = (this.state.bulkValidationMessage !== "" ? (<span style={{"fontSize":"150%", "color":"red"}}>{this.state.bulkValidationMessage}</span>) : "");
const bulkError = (this.state.bulkError ? (<span><span style={{"fontSize":"125%", "color":"green"}}>Successful: {this.state.bulkSuccessResults.map((mess) => {return <p key={mess}>{mess}</p>})}</span><span style={{"fontSize":"125%", "color":"red"}}>Errors: {this.state.bulkErrorMessages.map((mess) => {return <p key={mess}>{mess}</p>})}</span></span>) : "");
//secondary filter to match sure we only show workflows that match the the status |
<<<<<<<
case SPECS.FROST_MAGE:
return 0.18;
=======
case SPECS.SUBTLETY_ROGUE:
return 0.2208;
>>>>>>>
case SPECS.FROST_MAGE:
return 0.18;
case SPECS.SUBTLETY_ROGUE:
return 0.2208;
<<<<<<<
case SPECS.FROST_MAGE:
return 17778;
=======
case SPECS.SUBTLETY_ROGUE:
return 14492.61221;
>>>>>>>
case SPECS.FROST_MAGE:
return 17778;
case SPECS.SUBTLETY_ROGUE:
return 14492.61221; |
<<<<<<<
// Update parents in all children no matter the child
// is linked to the node or not.
me.fixChildren( child );
if( child.__.parents.length == 1 )
=======
// If the child is linked to the node,
// maybe its children are not linked
if( child.__.parents.indexOf( node ) !== -1 )
return me.fixChildren( child );
// If the child wasn't linked it is sure
// that it wasn't modified. Just link it
// to the new parent
if( child.__.parents.length === 1 )
>>>>>>>
// Update parents in all children no matter the child
// is linked to the node or not.
me.fixChildren( child );
if( child.__.parents.length === 1 ) |
<<<<<<<
this.request.headers['X-Amz-Date'] = AWS.util.date.rfc822(date);
=======
if (!this.request.headers['presigned-expires']) {
this.request.headers['Date'] = AWS.util.date.rfc822(date);
}
>>>>>>>
if (!this.request.headers['presigned-expires']) {
this.request.headers['X-Amz-Date'] = AWS.util.date.rfc822(date);
}
<<<<<<<
parts.push(''); // This is the "Date" header, but we use X-Amz-Date.
// The S3 signing mechanism requires us to pass an empty
// string for this Date header regardless.
=======
parts.push(r.headers['presigned-expires'] || r.headers['Date'] || '');
>>>>>>>
parts.push(''); // This is the "Date" header, but we use X-Amz-Date.
// The S3 signing mechanism requires us to pass an empty
// string for this Date header regardless. |
<<<<<<<
* @option options useAccelerateEndpoint [Boolean] Whether to use the
* S3 Transfer Acceleration endpoint with the S3 service. Default: `false`.
=======
* @option options clientSideMonitoring [Boolean] whether to collect and
* publish this client's performance metrics of all its API requests.
* @option options endpointDiscoveryEnabled [Boolean] whether to enable endpoint
* discovery for operations that allow optionally using an endpoint returned by
* the service.
* Defaults to 'false'
* @option options endpointCacheSize [Number] the size of the global cache storing
* endpoints from endpoint discovery operations. Once endpoint cache is created,
* updating this setting cannot change existing cache size.
* Defaults to 1000
* @option options hostPrefixEnabled [Boolean] whether to marshal request
* parameters to the prefix of hostname.
* Defaults to `true`.
>>>>>>>
* @option options useAccelerateEndpoint [Boolean] Whether to use the
* S3 Transfer Acceleration endpoint with the S3 service. Default: `false`.
* @option options clientSideMonitoring [Boolean] whether to collect and
* publish this client's performance metrics of all its API requests.
* @option options endpointDiscoveryEnabled [Boolean] whether to enable endpoint
* discovery for operations that allow optionally using an endpoint returned by
* the service.
* Defaults to 'false'
* @option options endpointCacheSize [Number] the size of the global cache storing
* endpoints from endpoint discovery operations. Once endpoint cache is created,
* updating this setting cannot change existing cache size.
* Defaults to 1000
* @option options hostPrefixEnabled [Boolean] whether to marshal request
* parameters to the prefix of hostname.
* Defaults to `true`. |
<<<<<<<
* @param [Object] options
* @return [AWS.AWSRequest] The +data+ property of the AWS.AWSResponse
* object that is passed to the registered callbacks has the
* following properties:
* * +Body+ - (<tt>String</tt>) Object data.
* * +DeleteMarker+ - (<tt>String</tt>) Specifies whether the object
* retrieved was (true) or was not (false) a Delete Marker. If
* false, this response header does not appear in the response.
* * +Expiration+ - (<tt>String</tt>) If the object expiration is
* configured (see PUT Bucket lifecycle), the response includes
* this header. It includes the expiry-date and rule-id key value
* pairs providing object expiration information. The value of the
* rule-id is URL encoded.
* * +WebsiteRedirectLocation+ - (<tt>String</tt>) When a bucket is
* configured as a website, you can set this metadata on the object
* so the website endpoint will evaluate the request for the object
* as a 301 redirect to another object in the same bucket or an
* external URL.
* * +LastModified+ - (<tt>Date</tt>) Last modified date of the
* object
* * +ContentType+ - (<tt>String</tt>) Content type of the object
* * +ContentLength+ - (<tt>Integer</tt>) Size of the body in bytes.
* * +ETag+ - (<tt>String</tt>) An ETag is an opaque identifier
* assigned by a web server to a specific version of a resource
* found at a URL
* * +MissingMeta+ - (<tt>Integer</tt>) This is set to the number of
* metadata entries not returned in x-amz-meta headers. This can
* happen if you create metadata using an API like SOAP that
* supports more flexible metadata than the REST API. For example,
* using SOAP, you can create metadata whose values are not legal
* HTTP headers.
* * +ServerSideEncryption+ - (<tt>String</tt>) The Server-side
* encryption algorithm used when storing this object in S3.
* * +VersionId+ - (<tt>String</tt>) Version of the object.
* * +Metadata+ - (<tt>Object<String></tt>) A map of metadata to
* store with the object in S3.
=======
* @callback callback function(err, data)
* Called when a response from the service is returned. If a
* callback is not supplied, you must call {AWS.AWSRequest.send}
* on the returned request object to initiate the request.
* @param err [Object] the error object returned from the request.
* Set to +null+ if the request is successful.
* @param data [Object] the de-serialized data returned from
* the request. Set to +null+ if a request error occurs.
* The +data+ object has the following properties:
* * +Body+ - (<tt>Base64 Encoded Data</tt>) Object data.
* * +DeleteMarker+ - (<tt>String</tt>) Specifies whether the object
* retrieved was (true) or was not (false) a Delete Marker. If
* false, this response header does not appear in the response.
* * +Expiration+ - (<tt>String</tt>) If the object expiration is
* configured (see PUT Bucket lifecycle), the response includes
* this header. It includes the expiry-date and rule-id key value
* pairs providing object expiration information. The value of the
* rule-id is URL encoded.
* * +WebsiteRedirectLocation+ - (<tt>String</tt>) When a bucket is
* configured as a website, you can set this metadata on the object
* so the website endpoint will evaluate the request for the object
* as a 301 redirect to another object in the same bucket or an
* external URL.
* * +LastModified+ - (<tt>Date</tt>) Last modified date of the
* object
* * +ContentType+ - (<tt>String</tt>) Content type of the object
* * +ContentLength+ - (<tt>Integer</tt>) Size of the body in bytes.
* * +ETag+ - (<tt>String</tt>) An ETag is an opaque identifier
* assigned by a web server to a specific version of a resource
* found at a URL
* * +MissingMeta+ - (<tt>Integer</tt>) This is set to the number of
* metadata entries not returned in x-amz-meta headers. This can
* happen if you create metadata using an API like SOAP that
* supports more flexible metadata than the REST API. For example,
* using SOAP, you can create metadata whose values are not legal
* HTTP headers.
* * +ServerSideEncryption+ - (<tt>String</tt>) The Server-side
* encryption algorithm used when storing this object in S3.
* * +VersionId+ - (<tt>String</tt>) Version of the object.
* * +Metadata+ - (<tt>Object<String></tt>) A map of metadata to
* store with the object in S3.
* @return [AWS.AWSRequest] a handle to the operation request for
* subsequent event callback registration.
>>>>>>>
* @callback callback function(err, data)
* Called when a response from the service is returned. If a
* callback is not supplied, you must call {AWS.AWSRequest.send}
* on the returned request object to initiate the request.
* @param err [Object] the error object returned from the request.
* Set to +null+ if the request is successful.
* @param data [Object] the de-serialized data returned from
* the request. Set to +null+ if a request error occurs.
* The +data+ object has the following properties:
* * +Body+ - (<tt>String</tt>) Object data.
* * +DeleteMarker+ - (<tt>String</tt>) Specifies whether the object
* retrieved was (true) or was not (false) a Delete Marker. If
* false, this response header does not appear in the response.
* * +Expiration+ - (<tt>String</tt>) If the object expiration is
* configured (see PUT Bucket lifecycle), the response includes
* this header. It includes the expiry-date and rule-id key value
* pairs providing object expiration information. The value of the
* rule-id is URL encoded.
* * +WebsiteRedirectLocation+ - (<tt>String</tt>) When a bucket is
* configured as a website, you can set this metadata on the object
* so the website endpoint will evaluate the request for the object
* as a 301 redirect to another object in the same bucket or an
* external URL.
* * +LastModified+ - (<tt>Date</tt>) Last modified date of the
* object
* * +ContentType+ - (<tt>String</tt>) Content type of the object
* * +ContentLength+ - (<tt>Integer</tt>) Size of the body in bytes.
* * +ETag+ - (<tt>String</tt>) An ETag is an opaque identifier
* assigned by a web server to a specific version of a resource
* found at a URL
* * +MissingMeta+ - (<tt>Integer</tt>) This is set to the number of
* metadata entries not returned in x-amz-meta headers. This can
* happen if you create metadata using an API like SOAP that
* supports more flexible metadata than the REST API. For example,
* using SOAP, you can create metadata whose values are not legal
* HTTP headers.
* * +ServerSideEncryption+ - (<tt>String</tt>) The Server-side
* encryption algorithm used when storing this object in S3.
* * +VersionId+ - (<tt>String</tt>) Version of the object.
* * +Metadata+ - (<tt>Object<String></tt>) A map of metadata to
* store with the object in S3.
* @return [AWS.AWSRequest] a handle to the operation request for
* subsequent event callback registration.
<<<<<<<
* @param [Object] options
* @return [AWS.AWSRequest] The +data+ property of the AWS.AWSResponse
* object that is passed to the registered callbacks has the
* following properties:
* * +Body+ - (<tt>String</tt>)
=======
* @callback callback function(err, data)
* Called when a response from the service is returned. If a
* callback is not supplied, you must call {AWS.AWSRequest.send}
* on the returned request object to initiate the request.
* @param err [Object] the error object returned from the request.
* Set to +null+ if the request is successful.
* @param data [Object] the de-serialized data returned from
* the request. Set to +null+ if a request error occurs.
* The +data+ object has the following properties:
* * +Body+ - (<tt>Base64 Encoded Data</tt>)
* @return [AWS.AWSRequest] a handle to the operation request for
* subsequent event callback registration.
>>>>>>>
* @callback callback function(err, data)
* Called when a response from the service is returned. If a
* callback is not supplied, you must call {AWS.AWSRequest.send}
* on the returned request object to initiate the request.
* @param err [Object] the error object returned from the request.
* Set to +null+ if the request is successful.
* @param data [Object] the de-serialized data returned from
* the request. Set to +null+ if a request error occurs.
* The +data+ object has the following properties:
* * +Body+ - (<tt>String</tt>)
* @return [AWS.AWSRequest] a handle to the operation request for
* subsequent event callback registration.
<<<<<<<
* * +Body+ - (<tt>String</tt>)
* @param [Object] options
* @return [AWS.AWSRequest] The +data+ property of the AWS.AWSResponse
* object that is passed to the registered callbacks has the
* following properties:
* * +ServerSideEncryption+ - (<tt>String</tt>) The Server-side
* encryption algorithm used when storing this object in S3.
* * +ETag+ - (<tt>String</tt>) Entity tag for the uploaded object.
=======
* * +Body+ - (<tt>Base64 Encoded Data</tt>)
* @callback callback function(err, data)
* Called when a response from the service is returned. If a
* callback is not supplied, you must call {AWS.AWSRequest.send}
* on the returned request object to initiate the request.
* @param err [Object] the error object returned from the request.
* Set to +null+ if the request is successful.
* @param data [Object] the de-serialized data returned from
* the request. Set to +null+ if a request error occurs.
* The +data+ object has the following properties:
* * +ServerSideEncryption+ - (<tt>String</tt>) The Server-side
* encryption algorithm used when storing this object in S3.
* * +ETag+ - (<tt>String</tt>) Entity tag for the uploaded object.
* @return [AWS.AWSRequest] a handle to the operation request for
* subsequent event callback registration.
>>>>>>>
* * +Body+ - (<tt>String</tt>)
* @callback callback function(err, data)
* Called when a response from the service is returned. If a
* callback is not supplied, you must call {AWS.AWSRequest.send}
* on the returned request object to initiate the request.
* @param err [Object] the error object returned from the request.
* Set to +null+ if the request is successful.
* @param data [Object] the de-serialized data returned from
* the request. Set to +null+ if a request error occurs.
* The +data+ object has the following properties:
* * +ServerSideEncryption+ - (<tt>String</tt>) The Server-side
* encryption algorithm used when storing this object in S3.
* * +ETag+ - (<tt>String</tt>) Entity tag for the uploaded object.
* @return [AWS.AWSRequest] a handle to the operation request for
* subsequent event callback registration. |
<<<<<<<
import { TooltipElement } from 'common/Tooltip';
=======
import TalentStatisticBox from 'interface/others/TalentStatisticBox';
>>>>>>>
import { TooltipElement } from 'common/Tooltip';
import TalentStatisticBox from 'interface/others/TalentStatisticBox';
<<<<<<<
icon={<SpellIcon id={SPELLS.SPIRIT_OF_THE_CRANE_TALENT.id} />}
value={formatNumber(this.manaReturnSotc)}
label={(
<TooltipElement
content={(
<>
You gained a raw total of {((this.manaReturnSotc + this.sotcWasted) / 1000).toFixed(0)}k mana from SotC with {(this.sotcWasted / 1000).toFixed(0)}k wasted. <br />
You lost {this.totmOverCap + this.totmBuffWasted} Teachings of the Monestery stacks
{(this.totmOverCap > 0 || this.totmBuffWasted > 0) && (
<ul>
{this.totmOverCap > 0 && <li>You overcapped Teachings {this.totmOverCap} times</li>}
{this.totmBuffWasted > 0 && <li>You let Teachings drop off {this.totmBuffWasted} times</li>}
</ul>
)}
</>
)}
>
Mana Returned
</TooltipElement>
)}
=======
value={`${formatNumber(this.manaReturnSotc)}`}
label="Mana Returned"
tooltip={`
You gained a raw total of ${((this.manaReturnSotc + this.sotcWasted) / 1000).toFixed(0)}k mana from SotC with ${(this.sotcWasted / 1000).toFixed(0)}k wasted.<br>
You lost ${(this.totmOverCap + this.totmBuffWasted)} Teachings of the Monestery stacks
<ul>
${this.totmOverCap > 0 ?
`<li>You overcapped Teachings ${(this.totmOverCap)} times</li>`
: ''
}
${this.totmBuffWasted > 0 ?
`<li>You let Teachings drop off ${(this.totmBuffWasted)} times</li>`
: ''
}
</ul>
`}
>>>>>>>
value={`${formatNumber(this.manaReturnSotc)}`}
label="Mana Returned"
tooltip={(
<>
You gained a raw total of {((this.manaReturnSotc + this.sotcWasted) / 1000).toFixed(0)}k mana from SotC with {(this.sotcWasted / 1000).toFixed(0)}k wasted.<br />
You lost {(this.totmOverCap + this.totmBuffWasted)} Teachings of the Monestery stacks.<br />
<ul>
{this.totmOverCap > 0 && <li>You overcapped Teachings {(this.totmOverCap)} times</li>}
{this.totmBuffWasted > 0 && <li>You let Teachings drop off {(this.totmBuffWasted)} times</li>}
</ul>
</>
)} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.