conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
this.numberOfNodesRemoved = 0;
=======
this.numberOfAccessorsRemoved = 0;
>>>>>>>
this.numberOfNodesRemoved = 0;
this.numberOfAccessorsRemoved = 0;
<<<<<<<
process.stdout.write('Nodes removed: ' + this.numberOfNodesRemoved + '\n');
=======
process.stdout.write('Accessors removed: ' + this.numberOfAccessorsRemoved + '\n');
>>>>>>>
process.stdout.write('Nodes removed: ' + this.numberOfNodesRemoved + '\n');
process.stdout.write('Accessors removed: ' + this.numberOfAccessorsRemoved + '\n'); |
<<<<<<<
module.exports = {
'build-cesium': buildCesium,
test: test,
'test-watch': testWatch,
coverage: coverage,
cloc: cloc
};
function test(done) {
var jasmine = new Jasmine();
=======
gulp.task('test', function (done) {
const jasmine = new Jasmine();
>>>>>>>
module.exports = {
'build-cesium': buildCesium,
test: test,
'test-watch': testWatch,
coverage: coverage,
cloc: cloc
};
function test(done) {
const jasmine = new Jasmine();
<<<<<<<
return Promise.resolve();
}
function cloc() {
var cmdLine;
var clocPath = path.join('node_modules', 'cloc', 'lib', 'cloc');
=======
gulp.task('cloc', function() {
let cmdLine;
const clocPath = path.join('node_modules', 'cloc', 'lib', 'cloc');
>>>>>>>
return Promise.resolve();
}
function cloc() {
let cmdLine;
const clocPath = path.join('node_modules', 'cloc', 'lib', 'cloc');
<<<<<<<
function buildCesium() {
var basePath = 'lib';
var outputDir = 'dist/cesium';
var files = [
=======
gulp.task('build-cesium', function () {
const basePath = 'lib';
const outputDir = 'dist/cesium';
const files = [
>>>>>>>
function buildCesium() {
const basePath = 'lib';
const outputDir = 'dist/cesium';
const files = [ |
<<<<<<<
Kuzzle = require.main.require('lib/api/Kuzzle'),
Profile = require.main.require('lib/api/core/models/security/profile'),
Role = require.main.require('lib/api/core/models/security/role');
=======
Kuzzle = require('../../../../lib/api/Kuzzle'),
ForbiddenError = require.main.require('lib/api/core/errors/forbiddenError');
>>>>>>>
Kuzzle = require.main.require('lib/api/Kuzzle'),
ForbiddenError = require.main.require('lib/api/core/errors/forbiddenError'),
Profile = require.main.require('lib/api/core/models/security/profile'),
Role = require.main.require('lib/api/core/models/security/role');
<<<<<<<
context = {
connection: connection,
user: null
},
roomName = 'roomName',
=======
>>>>>>>
context = {
connection: connection,
user: null
},
roomName = 'roomName',
<<<<<<<
return should(kuzzle.hotelClerk.addSubscription(requestObject, context)).be.fulfilled();
=======
delete requestObject.data.body;
return should(kuzzle.hotelClerk.addSubscription(requestObject, connection)).be.fulfilled();
>>>>>>>
delete requestObject.data.body;
return should(kuzzle.hotelClerk.addSubscription(requestObject, context)).be.fulfilled(); |
<<<<<<<
expect(bufferEqual(gltf.shaders.CesiumTexturedBoxTest0FS.extras.source, fragmentShaderData)).toBe(true);
=======
expect(gltf.shaders.CesiumTexturedBoxTest0FS.extras.source.toString()).toEqual(fragmentShaderData.toString());
expect(gltf.shaders.CesiumTexturedBoxTest0FS.extras.extension).toEqual('.glsl');
>>>>>>>
expect(bufferEqual(gltf.shaders.CesiumTexturedBoxTest0FS.extras.source, fragmentShaderData)).toBe(true);
expect(gltf.shaders.CesiumTexturedBoxTest0FS.extras.extension).toEqual('.glsl');
<<<<<<<
expect(bufferEqual(gltf.shaders.box0FS.extras.source, fragmentShaderData)).toBe(true);
=======
expect(gltf.shaders.box0FS.extras.source.toString()).toEqual(fragmentShaderData.toString());
expect(gltf.shaders.box0FS.extras.extension).toEqual('.glsl');
>>>>>>>
expect(bufferEqual(gltf.shaders.box0FS.extras.source, fragmentShaderData)).toBe(true);
expect(gltf.shaders.box0FS.extras.extension).toEqual('.glsl');
<<<<<<<
expect(bufferEqual(gltf.shaders.embeddedBox0FS.extras.source, fragmentShaderData)).toBe(true);
=======
expect(gltf.shaders.embeddedBox0FS.extras.source.toString()).toEqual(fragmentShaderData.toString());
expect(gltf.shaders.embeddedBox0FS.extras.extension).toEqual('.glsl');
>>>>>>>
expect(bufferEqual(gltf.shaders.embeddedBox0FS.extras.source, fragmentShaderData)).toBe(true);
expect(gltf.shaders.embeddedBox0FS.extras.extension).toEqual('.glsl');
<<<<<<<
expect(bufferEqual(gltf.shaders.externalBox0FS.extras.source, fragmentShaderData)).toBe(true);
=======
expect(gltf.shaders.externalBox0FS.extras.source.toString()).toEqual(fragmentShaderData.toString());
expect(gltf.shaders.externalBox0FS.extras.extension).toEqual('.glsl');
>>>>>>>
expect(bufferEqual(gltf.shaders.externalBox0FS.extras.source, fragmentShaderData)).toBe(true);
expect(gltf.shaders.externalBox0FS.extras.extension).toEqual('.glsl'); |
<<<<<<<
var removeUnusedTechniques = require('../').removeUnusedTechniques;
=======
var removeUnusedPrograms = require('../').removeUnusedPrograms;
var removeUnusedBufferViews = require('../').removeUnusedBufferViews;
>>>>>>>
var removeUnusedTechniques = require('../').removeUnusedTechniques;
var removeUnusedPrograms = require('../').removeUnusedPrograms;
var removeUnusedBufferViews = require('../').removeUnusedBufferViews;
<<<<<<<
removeUnusedTechniques(gltf, stats);
=======
removeUnusedPrograms(gltf, stats);
removeUnusedBufferViews(gltf, stats);
>>>>>>>
removeUnusedTechniques(gltf, stats);
removeUnusedPrograms(gltf, stats);
removeUnusedBufferViews(gltf, stats); |
<<<<<<<
var writeSource = require('./writeSource');
=======
var removePipelineExtras = require('./removePipelineExtras');
>>>>>>>
var writeSource = require('./writeSource');
var removePipelineExtras = require('./removePipelineExtras');
<<<<<<<
=======
}
function writeSource(gltf, filePath, name, isEmbedded, callback) {
var objects = gltf[name];
//Iterate through each object and write out its uri
if (defined(objects)) {
var ids = Object.keys(objects);
async.each(ids, function(id, asyncCallback) {
var object = objects[id];
if (defined(object.extras._pipeline.source)) {
var source = object.extras._pipeline.source;
var extension = object.extras._pipeline.extension;
//Write the source object as a data or file uri depending on the isEmbedded flag
if (isEmbedded) {
var sourceDataUri = new dataUri();
if (name === 'shaders') {
sourceDataUri.format('.txt', source);
}
else {
sourceDataUri.format(extension, source);
}
object.uri = sourceDataUri.content;
process.nextTick(function() {
asyncCallback();
});
}
else {
var fileName = id + extension;
object.uri = fileName;
var outputPath = path.join(filePath, fileName);
fs.writeFile(outputPath, source, function (err) {
asyncCallback(err);
});
}
}
}, function(err) {
if (err) {
if (callback) {
callback(err);
}
else{
throw err;
}
}
else if (callback) {
callback();
}
});
}
else {
if (callback) {
callback();
}
}
>>>>>>> |
<<<<<<<
var removeUnusedPrograms = require('../').removeUnusedPrograms;
=======
var removeUnusedBufferViews = require('../').removeUnusedBufferViews;
>>>>>>>
var removeUnusedPrograms = require('../').removeUnusedPrograms;
var removeUnusedBufferViews = require('../').removeUnusedBufferViews;
<<<<<<<
removeUnusedPrograms(gltf, stats);
=======
removeUnusedBufferViews(gltf, stats);
>>>>>>>
removeUnusedPrograms(gltf, stats);
removeUnusedBufferViews(gltf, stats); |
<<<<<<<
expect(gltf.images[0].extras).not.toBeDefined();
expect(gltf.images[0].uri).toEqual('Cesium_Logo_Flat_Low.png');
return fsReadFile(outputImagePath);
=======
expect(gltf.images.Cesium_Logo_Flat_Low.extras).not.toBeDefined();
expect(gltf.images.Cesium_Logo_Flat_Low.uri).toEqual('Cesium_Logo_Flat_Low.png');
return fsExtra.readFile(outputImagePath);
>>>>>>>
expect(gltf.images[0].extras).not.toBeDefined();
expect(gltf.images[0].uri).toEqual('Cesium_Logo_Flat_Low.png');
return fsExtra.readFile(outputImagePath); |
<<<<<<<
var generateNormals = require('./generateNormals');
var Cesium = require('cesium');
var defaultValue = Cesium.defaultValue;
=======
>>>>>>>
var generateNormals = require('./generateNormals');
<<<<<<<
generateNormals(gltfWithExtras);
addDefaults(gltfWithExtras, stats);
=======
addDefaults(gltfWithExtras, options);
>>>>>>>
generateNormals(gltfWithExtras);
addDefaults(gltfWithExtras, stats); |
<<<<<<<
this.validatorShare = deployer.validatorShare
=======
this.slashingManager = contracts.slashingManager
>>>>>>>
this.validatorShare = deployer.validatorShare
this.slashingManager = contracts.slashingManager |
<<<<<<<
url:'xxxxx',
failTime : 3
=======
url:'xxxxx',
tryPeep: true,
peepSystem: true,
repeat:10000
>>>>>>>
url:'xxxxx',
failTime : 3
tryPeep: true,
peepSystem: true,
repeat:10000
<<<<<<<
localStorage.setItem('a', '123245678');
=======
setTimeout(function(){
console.log(1111)
},1000);
>>>>>>>
localStorage.setItem('a', '123245678');
setTimeout(function(){
console.log(1111)
},1000); |
<<<<<<<
class Peep extends Config {
constructor(options) {
super(options);
console.log(options);
=======
class Peep /* extends LocalStorage*/ {
constructor( options ) {
//super(options);
console.log( options );
>>>>>>>
class Peep extends Config {
constructor( options ) {
//super(options);
console.log( options ); |
<<<<<<<
=======
* @author suman
* @fileoverview report
* @date 2017/02/15
*/
var utils = {
typeDecide: function typeDecide(o, type) {
return Object.prototype.toString.call(o) === "[object " + type + "]";
},
serializeObj: function serializeObj(obj) {
var parames = '';
Object.keys(obj).forEach(function (name) {
parames += name + '=' + obj[name] + '&';
});
return parames;
},
stringify: function stringify(obj) {
if (JSON.stringify) {
return JSON.stringify(obj);
} else {
var _ret = function () {
var sep = '';
return {
v: '{' + Object.keys(obj).map(function (k) {
sep = typeof obj[k] === 'number' ? '' : '"';
return '"' + k + '"' + ':' + sep + obj[k] + sep;
}).join(',') + '}'
};
}();
if ((typeof _ret === "undefined" ? "undefined" : _typeof(_ret)) === "object") return _ret.v;
}
},
parse: function parse(str) {
return JSON.parse ? JSON.parse(str) : eval('(' + str + ')');
},
getServerPort: function getServerPort() {
return window.location.port === '' ? window.location.protocol === 'http:' ? '80' : '443' : window.location.port;
},
getUserAgent: function getUserAgent() {
return navigator.userAgent;
},
getPlatType: function getPlatType() {
return !!utils.getUserAgent().match(/Mobile/) ? 'Mobile' : 'PC';
},
getSystemParams: function getSystemParams() {
return {
userAgent: utils.getUserAgent(),
currentUrl: document.location.href,
timestamp: +new Date(),
projectType: utils.getPlatType()
};
}
};
/**
>>>>>>> |
<<<<<<<
ApiRT.prototype.count = function (query, index, collection) {
=======
ApiRT.prototype.scroll = function (scrollId) {
var
msg = {
controller: 'read',
action: 'scroll',
body: {
scrollId
}
};
return this.send(msg);
};
ApiRT.prototype.count = function (filters, index, collection) {
>>>>>>>
ApiRT.prototype.scroll = function (scrollId) {
var
msg = {
controller: 'read',
action: 'scroll',
body: {
scrollId
}
};
return this.send(msg);
};
ApiRT.prototype.count = function (query, index, collection) { |
<<<<<<<
import Report from './Report';
class GER extends Report {
constructor(options) {
super(options);
=======
import events from './events';
import utils from './utils';
class GER extends events {
constructor() {
super();
>>>>>>>
import Report from './Report';
import utils from './utils';
class GER extends Report {
constructor(options) {
super(options);
super(); |
<<<<<<<
if (darwin()) {
systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
if (mainWindow != null) {
mainWindow.setVibrancy(systemPreferences.isDarkMode()? "ultra-dark": "light");
mainWindow.webContents.reload();
}
})
}
=======
systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
if (mainWindow != null) {
console.log(`Dark mode: ${systemPreferences.isDarkMode()}`)
if (!catalina()) {
mainWindow.setVibrancy(systemPreferences.isDarkMode()? "ultra-dark": "light");
}
mainWindow.webContents.reload();
}
})
>>>>>>>
if (darwin()) {
systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
if (mainWindow != null) {
if (!catalina()) {
mainWindow.setVibrancy(systemPreferences.isDarkMode()? "ultra-dark": "light");
}
mainWindow.webContents.reload();
}
})
} |
<<<<<<<
export const uuid = () => uuidv4();
export const shortUuid = () => {
const data = new Uint8Array(16);
uuidv4(null, data, 0);
const base64 = btoa(String.fromCharCode.apply(null, data));
return base64
.replace(/\+/g, "-") // Replace + with - (see RFC 4648, sec. 5)
.replace(/\//g, "_") // Replace / with _ (see RFC 4648, sec. 5)
.substring(0, 22); // Drop '==' padding;
};
=======
// uuid generator taken from: https://gist.github.com/jed/982883
export const uuid = a =>
a
? (a ^ ((Math.random() * 16) >> (a / 4))).toString(16)
: ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
export const isChildOf = (node, parentId) => {
while (node !== null) {
if (node.id === parentId) {
return true;
}
node = node.parentNode;
}
return false;
};
export const getCurrentCursorPosition = parentId => {
var selection = window.getSelection(),
charCount = -1,
node;
console.log(selection);
if (selection.focusNode) {
if (isChildOf(selection.focusNode, parentId)) {
node = selection.focusNode;
charCount = selection.focusOffset;
while (node) {
if (node.id === parentId) {
break;
}
if (node.previousSibling) {
node = node.previousSibling;
charCount += node.textContent.length;
} else {
node = node.parentNode;
if (node === null) {
break;
}
}
}
}
}
return charCount;
};
export const createRange = (node, chars, range) => {
if (!range) {
range = document.createRange();
range.selectNode(node);
range.setStart(node, 0);
}
if (chars.count === 0) {
range.setEnd(node, chars.count);
} else if (node && chars.count > 0) {
if (node.nodeType === Node.TEXT_NODE) {
if (node.textContent.length < chars.count) {
chars.count -= node.textContent.length;
} else {
range.setEnd(node, chars.count);
chars.count = 0;
}
} else {
for (var lp = 0; lp < node.childNodes.length; lp++) {
range = createRange(node.childNodes[lp], chars, range);
if (chars.count === 0) {
break;
}
}
}
}
return range;
};
>>>>>>>
export const uuid = () => uuidv4();
export const shortUuid = () => {
const data = new Uint8Array(16);
uuidv4(null, data, 0);
const base64 = btoa(String.fromCharCode.apply(null, data));
return base64
.replace(/\+/g, "-") // Replace + with - (see RFC 4648, sec. 5)
.replace(/\//g, "_") // Replace / with _ (see RFC 4648, sec. 5)
.substring(0, 22); // Drop '==' padding;
};
export const isChildOf = (node, parentId) => {
while (node !== null) {
if (node.id === parentId) {
return true;
}
node = node.parentNode;
}
return false;
};
export const getCurrentCursorPosition = parentId => {
var selection = window.getSelection(),
charCount = -1,
node;
console.log(selection);
if (selection.focusNode) {
if (isChildOf(selection.focusNode, parentId)) {
node = selection.focusNode;
charCount = selection.focusOffset;
while (node) {
if (node.id === parentId) {
break;
}
if (node.previousSibling) {
node = node.previousSibling;
charCount += node.textContent.length;
} else {
node = node.parentNode;
if (node === null) {
break;
}
}
}
}
}
return charCount;
};
export const createRange = (node, chars, range) => {
if (!range) {
range = document.createRange();
range.selectNode(node);
range.setStart(node, 0);
}
if (chars.count === 0) {
range.setEnd(node, chars.count);
} else if (node && chars.count > 0) {
if (node.nodeType === Node.TEXT_NODE) {
if (node.textContent.length < chars.count) {
chars.count -= node.textContent.length;
} else {
range.setEnd(node, chars.count);
chars.count = 0;
}
} else {
for (var lp = 0; lp < node.childNodes.length; lp++) {
range = createRange(node.childNodes[lp], chars, range);
if (chars.count === 0) {
break;
}
}
}
}
return range;
}; |
<<<<<<<
/**
* An Expand is defined as two inputs moving farther away from each other. This gesture does not
* account for any start/end events to allow for the event to interact with the Pan and Pinch events.
* @class Expand
* @extends Gesture
*/
=======
/**
* An Expand is defined as two inputs moving farther away from each other. This gesture does not
* account for any start/end events to allow for the event to interact with the Pan and Pinch events.
* @class Expand
*/
>>>>>>>
/**
* An Expand is defined as two inputs moving farther away from each other. This gesture does
* not account for any start/end events to allow for the event to interact with the Pan and Pinch
* events.
* @class Expand
*/ |
<<<<<<<
import { setStreamUMITreatment, recalculateUMI } from "./actions/stream";
=======
import { setStreamUMITreatment } from "./actions/stream";
import { commitNewMarkerLocations, refreshMarkersAndLocations } from "./actions/marker-location";
>>>>>>>
import { setStreamUMITreatment, recalculateUMI } from "./actions/stream";
import { commitNewMarkerLocations, refreshMarkersAndLocations } from "./actions/marker-location"; |
<<<<<<<
import { fetchStreams, fetchLatestForStream } from "./stream";
import UUID from "uuid/v1";
=======
import { fetchStreams, fetchLatestForCurrentStream } from "./stream";
>>>>>>>
import { fetchStreams, fetchLatestForCurrentStream } from "./stream";
import UUID from "uuid/v1"; |
<<<<<<<
(function () {
var supportExternalLinks = function (e) {
var href;
var isExternal = false;
var checkDomElement = function (element) {
if (element.nodeName === 'A') {
href = element.getAttribute('href');
}
if (element.classList.contains('js-external-link')) {
isExternal = true;
}
if (href && isExternal) {
nw.Shell.openExternal(href);
e.preventDefault();
} else if (element.parentElement) {
checkDomElement(element.parentElement);
}
}
checkDomElement(e.target);
=======
(function() {
'use strict';
if (typeof nw == 'undefined') return;
const gui = require('nw.gui');
const supportExternalLinks = function(e) {
let href;
let isExternal = false;
const checkDomElement = function(element) {
if (element.nodeName === 'A') {
href = element.getAttribute('href');
>>>>>>>
(function() {
'use strict';
if (typeof nw == 'undefined') return;
const supportExternalLinks = function(e) {
let href;
let isExternal = false;
const checkDomElement = function(element) {
if (element.nodeName === 'A') {
href = element.getAttribute('href'); |
<<<<<<<
this.ignoreGameMessageSent = false;
this.variant = variant;
=======
>>>>>>>
this.variant = variant;
<<<<<<<
if(pgn.moves.length<=2) {
if(!this.ignoreGameMessageSent) {
showError("Ignoring games with only one move made", null, null,
Constants.ERROR_ACTION_NONE, Constants.ERROR_SEVERITY_WARNING)
this.ignoreGameMessageSent = true
}
}else if(pgn.moves[0] && pgn.moves[0].move_number === 1) {
let chess = chessLogic(this.variant)
=======
if(pgn.moves.length>2 && pgn.moves[0] && pgn.moves[0].move_number === 1) {
let chess = new Chess()
>>>>>>>
if(pgn.moves.length>2 && pgn.moves[0] && pgn.moves[0].move_number === 1) {
let chess = chessLogic(this.variant) |
<<<<<<<
const fetch = (sort, type, id, range = null) => (dispatch, getState) => {
const columns = getState().columns;
const currentColumn = columns.filter(column => column.id === id)[0];
const index = columns.indexOf(currentColumn);
const { user } = getState().auth;
let uid = getUID();
let page = 0;
let oldSort = '';
let prevSet = 0;
let oldRange = '';
let authToken = null;
if (user) {
authToken = user.authToken;
}
if (currentColumn) {
uid = currentColumn.id;
prevSet = currentColumn.prev_set;
oldSort = currentColumn.sort;
oldRange = currentColumn.range;
console.log(oldRange !== range);
page = oldSort !== sort || oldRange !== range ? 0 : currentColumn.page;
}
const newColumns = getState().columns.slice();
if (page === 0) {
const loadingColumn = getState().columns.slice();
loadingColumn[index].items = [];
dispatch({
type: FEED.ACTION.FETCH,
state: STATE.SUCCESS,
columns: loadingColumn,
});
}
switch (type) {
case FEED.RANTS.NAME:
rantscript
.rants(sort, AMOUNT, AMOUNT * page, prevSet, authToken)
=======
const fetchRants = (sort, page, range, authToken) => (dispatch) => {
rantscript
.rants(sort, AMOUNT, AMOUNT * page, 0, authToken)
>>>>>>>
const fetch = (sort, type, id, range = null) => (dispatch, getState) => {
const columns = getState().columns;
const currentColumn = columns.filter(column => column.id === id)[0];
const index = columns.indexOf(currentColumn);
const { user } = getState().auth;
let uid = getUID();
let page = 0;
let oldSort = '';
let prevSet = 0;
let oldRange = '';
let authToken = null;
if (user) {
authToken = user.authToken;
}
if (currentColumn) {
uid = currentColumn.id;
prevSet = currentColumn.prev_set;
oldSort = currentColumn.sort;
oldRange = currentColumn.range;
page = oldSort !== sort || oldRange !== range ? 0 : currentColumn.page;
}
const newColumns = getState().columns.slice();
if (page === 0) {
const loadingColumn = getState().columns.slice();
loadingColumn[index].items = [];
dispatch({
type: FEED.ACTION.FETCH,
state: STATE.SUCCESS,
columns: loadingColumn,
});
}
switch (type) {
case FEED.RANTS.NAME:
rantscript
.rants(sort, AMOUNT, AMOUNT * page, prevSet, authToken)
<<<<<<<
columns: newColumns,
=======
itemType: FEED.COLLABS.NAME,
items: res,
page,
sort,
range,
>>>>>>>
columns: newColumns,
<<<<<<<
=======
};
const fetch = (sort, type, range = null) => (dispatch, getState) => {
const { user } = getState().auth;
let page = 0;
let oldSort = '';
let oldRange = '';
if (getState().items) {
oldSort = getState().items.sort;
oldRange = getState().items.range;
page = oldSort !== sort || oldRange !== range ? 0 : getState().items.page;
}
if (page === 0) {
dispatch({
type: FEED.ACTION.RESET,
});
}
let authToken = null;
if (user) {
authToken = user.authToken;
}
switch (type) {
case FEED.RANTS.NAME:
dispatch(fetchRants(sort, page, range, authToken));
break;
case FEED.STORIES.NAME:
dispatch(fetchStories(sort, range, page, authToken));
break;
case FEED.COLLABS.NAME:
dispatch(fetchCollabs(sort, page, range, authToken));
>>>>>>> |
<<<<<<<
const settingsMenu = this.settingsMenu = new SettingsMenu(api, model.player, this.controlbar, localization);
=======
// Settings Menu
const settingsMenu = this.settingsMenu = SettingsMenu(api, model.player, localization);
>>>>>>>
const settingsMenu = this.settingsMenu = new SettingsMenu(api, model.player, this.controlbar, localization);
<<<<<<<
=======
model.change('captionsIndex', (changedModel, index) => {
controlbar.toggleCaptionsButtonState(!!index);
});
>>>>>>>
<<<<<<<
=======
const updateControlbarButtons = (menuName) => {
const childMenus = settingsMenu.children;
const menuCount = Object.keys(childMenus).length;
const shouldShowGear =
!!childMenus.quality ||
!!childMenus.playbackRates ||
menuCount > 1;
controlbar.elements.settingsButton.toggle(shouldShowGear);
if (childMenus.captions) {
controlbar.toggleCaptionsButtonState(!!model.get('captionsIndex'));
}
const controlBarButton = controlbar.elements[`${menuName}Button`];
if (controlBarButton) {
const isVisible = !!childMenus[menuName] && !shouldShowGear || menuCount > 1;
controlBarButton.toggle(isVisible);
}
};
settingsMenu.on('menuRemoved menuAppended', (menuName) => {
updateControlbarButtons(menuName);
});
updateControlbarButtons('captions');
>>>>>>> |
<<<<<<<
function _setAudioTracks(tracks) {
if(tracks && tracks.length > 0) {
for (var i = 0; i < tracks.length; i++) {
if (tracks[i].enabled) {
_currentAudioTrackIndex = i;
console.log('got current audio track: ', i);
break;
}
}
if(_currentAudioTrackIndex === -1) {
console.log('setting default track: ', _currentAudioTrackIndex);
_currentAudioTrackIndex = 0;
tracks[_currentAudioTrackIndex].enabled = true;
}
_this.trigger('audioTracks',{currentTrack: _currentAudioTrackIndex, tracks: tracks});
}
}
function _setCurrentAudioTrack(index) {
if (index > -1 && index < _videotag.audioTracks.length) {
_videotag.audioTracks[_currentAudioTrackIndex].enabled = false;
_currentAudioTrackIndex = index;
_videotag.audioTracks[_currentAudioTrackIndex].enabled = true;
_this.trigger('audioTrackChanged',{currentTrack: _currentAudioTrackIndex,
tracks: _videotag.audioTracks});
}
}
=======
>>>>>>>
function _setAudioTracks(tracks) {
if(tracks && tracks.length > 0) {
for (var i = 0; i < tracks.length; i++) {
if (tracks[i].enabled) {
_currentAudioTrackIndex = i;
break;
}
}
if(_currentAudioTrackIndex === -1) {
_currentAudioTrackIndex = 0;
tracks[_currentAudioTrackIndex].enabled = true;
}
_this.trigger('audioTracks',{currentTrack: _currentAudioTrackIndex, tracks: tracks});
}
}
function _setCurrentAudioTrack(index) {
if (index > -1 && index < _videotag.audioTracks.length) {
_videotag.audioTracks[_currentAudioTrackIndex].enabled = false;
_currentAudioTrackIndex = index;
_videotag.audioTracks[_currentAudioTrackIndex].enabled = true;
_this.trigger('audioTrackChanged',{currentTrack: _currentAudioTrackIndex,
tracks: _videotag.audioTracks});
}
}
<<<<<<<
//index off by 1 because of 'Off' option
console.log('current track: ', _currentTextTrackIndex, ' and new index: ', index);
=======
if(!_textTracks) {
return;
}
//index off by 1 because of 'off' option
>>>>>>>
if(!_textTracks) {
return;
} |
<<<<<<<
if (_model.getVideo) {
var provider = _model.getVideo();
provider.setContainer(_videoLayer);
}
=======
var provider = _model.getVideo();
provider.setContainer(_videoLayer);
provider.setVisibility(true);
_setLiveMode(_model, _model.get('duration'));
>>>>>>>
if (_model.getVideo) {
var provider = _model.getVideo();
provider.setContainer(_videoLayer);
}
_setLiveMode(_model, _model.get('duration')); |
<<<<<<<
{verb: 'post', url: '/roles/_search', controller: 'security', action: 'searchRoles'},
=======
{verb: 'post', url: '/_login', controller: 'auth', action: 'login'},
>>>>>>>
{verb: 'post', url: '/roles/_search', controller: 'security', action: 'searchRoles'},
{verb: 'post', url: '/_login', controller: 'auth', action: 'login'}, |
<<<<<<<
renderCaptionsNatively: false
=======
renderCaptionsNatively: false,
nextUpDisplay: true
//qualityLabel: '480p', // specify a default quality
//captionLabel: 'English', // specify a default Caption
>>>>>>>
renderCaptionsNatively: false,
nextUpDisplay: true |
<<<<<<<
_model.on(NATIVE_FULLSCREEN, _fullscreenChangeHandler);
=======
_model.on('fullscreenchange', _fullscreenChangeHandler);
_model.on('change:mediaType', _onMediaTypeChange, this);
_model.on('change:visualQuality', () => {
_resizeMedia();
}, this);
>>>>>>>
_model.on(NATIVE_FULLSCREEN, _fullscreenChangeHandler);
_model.on('change:mediaType', _onMediaTypeChange, this);
_model.on('change:visualQuality', () => {
_resizeMedia();
}, this);
<<<<<<<
_model.off(NATIVE_FULLSCREEN, _fullscreenChangeHandler);
=======
>>>>>>> |
<<<<<<<
test('tracks first frame with provider first frame event', function(assert) {
=======
// mock MediaModel
var MediaModel = function() {
this.set('state', states.IDLE);
};
_.extend(MediaModel.prototype, SimpleModel);
test('tracks first frame with provider first frame event', function() {
>>>>>>>
// mock MediaModel
var MediaModel = function() {
this.set('state', states.IDLE);
};
_.extend(MediaModel.prototype, SimpleModel);
test('tracks first frame with provider first frame event', function(assert) {
<<<<<<<
// mock MediaModel
var MediaModel = function() {
this.state = states.IDLE;
};
_.extend(MediaModel.prototype, Model.prototype);
function validateQoeFirstFrame(assert, qoeItem, startTime) {
assert.ok(!!qoeItem, 'qoeItem is defined');
=======
function validateQoeFirstFrame(qoeItem, startTime) {
ok(!!qoeItem, 'qoeItem is defined');
>>>>>>>
function validateQoeFirstFrame(assert, qoeItem, startTime) {
assert.ok(!!qoeItem, 'qoeItem is defined'); |
<<<<<<<
_view.clickHandler().setAlternateClickHandlers(function (evt) {
=======
var _this = this;
_view.clickHandler().setAlternateClickHandler(function (evt) {
>>>>>>>
var _this = this;
_view.clickHandler().setAlternateClickHandlers(function (evt) { |
<<<<<<<
_checkPlayOnViewable(model, viewable);
if (shouldPreload(model, viewable)) {
const item = model.get('playlistItem');
model.getVideo().preload(item);
_preloaded = true;
}
=======
>>>>>>>
if (shouldPreload(model, viewable)) {
const item = model.get('playlistItem');
model.getVideo().preload(item);
_preloaded = true;
} |
<<<<<<<
'view/components/volumetooltip',
'view/components/drawer'
], function(utils, _, Events, Constants, UI, Slider, TimeSlider, Menu, VolumeTooltip, Drawer) {
=======
'view/components/playlist',
'view/components/volumetooltip'
], function(utils, _, Events, Constants, UI, Slider, TimeSlider, Menu, Playlist, VolumeTooltip) {
>>>>>>>
'view/components/volumetooltip'
], function(utils, _, Events, Constants, UI, Slider, TimeSlider, Menu, VolumeTooltip) {
<<<<<<<
drawer = new Drawer('jw-icon-more', this._localization.more),
=======
playlistTooltip,
>>>>>>>
<<<<<<<
this.clearCompactMode();
=======
var itemIdx = model.get('item');
if (this.elements.playlist) {
this.elements.playlist.selectItem(itemIdx);
}
>>>>>>>
<<<<<<<
this.elements.drawer.closeTooltip();
utils.removeClass(this.el, 'jw-drawer-expanded');
},
clearCompactMode : function() {
this._maxCompactWidth = -1;
this._model.set('compactUI', false);
if(this._containerWidth) {
this.checkCompactMode(this._containerWidth);
}
},
// Sets this._maxCompactWidth so we calculate less per call of isCompactMode
setCompactModeBounds : function(){
if(this.element().offsetWidth > 0 ){
// Use the current center section content (timeslider or alt text) to determine compact mode
var nonCenterExpandedSize = this.elements.left.offsetWidth + this.elements.right.offsetWidth;
if(utils.adaptiveType(this._model.get('duration')) === 'LIVE'){
this._maxCompactWidth = nonCenterExpandedSize + this.elements.alt.offsetWidth;
} else {
var containerRequiredSize = nonCenterExpandedSize +
(this.elements.center.offsetWidth - this.elements.time.el.offsetWidth),
timeSliderBreakpoint = 0.20;
this._maxCompactWidth = containerRequiredSize / (1-timeSliderBreakpoint);
}
}
},
checkCompactMode : function(containerWidth) {
// If we cleared the _maxCompactWidth then try to reset it. This can fail if the controlbar is display: none
if(this._maxCompactWidth === -1){
this.setCompactModeBounds();
}
this._containerWidth = containerWidth;
// If the _maxCompactWidth is set (which it may or may not be above)
if(this._maxCompactWidth !== -1) {
// If we're in compact mode and we have enough space to exit it, then do so
if( containerWidth >= this._compactModeMaxSize && containerWidth > this._maxCompactWidth) {
this._model.set('compactUI', false);
}
// Enter if we're in a small player or our timeslider is too small.
else if( containerWidth < this._compactModeMaxSize || containerWidth <= this._maxCompactWidth ){
this._model.set('compactUI', true);
}
}
},
onCompactUI : function(model, isCompact) {
utils.removeClass(this.el, 'jw-drawer-expanded');
this.elements.drawer.setup(this.layout.drawer, isCompact);
// If we're not in compact mode or we're not hiding icons, then put them back where they came from.
if(!isCompact || this.elements.drawer.activeContents.length < 2){
_.each(this.layout.drawer,function(ele){
this.elements.right.insertBefore(ele.el, this.elements.drawer.el);
}, this);
}
},
rewind : function() {
var currentPosition = this._model.get('position'),
duration = this._model.get('duration'),
rewindPosition = currentPosition - 10,
startPosition = 0;
// duration is negative in DVR mode
if (utils.adaptiveType(duration) === 'DVR') {
startPosition = duration;
}
// Seek 10s back. Seek value should be >= 0 in VOD mode and >= (negative) duration in DVR mode
this._api.seek(Math.max(rewindPosition, startPosition));
=======
>>>>>>>
},
rewind : function() {
var currentPosition = this._model.get('position'),
duration = this._model.get('duration'),
rewindPosition = currentPosition - 10,
startPosition = 0;
// duration is negative in DVR mode
if (utils.adaptiveType(duration) === 'DVR') {
startPosition = duration;
}
// Seek 10s back. Seek value should be >= 0 in VOD mode and >= (negative) duration in DVR mode
this._api.seek(Math.max(rewindPosition, startPosition)); |
<<<<<<<
exports.LiquidPledging = require('./js/liquidPledging.js');
exports.LiquidPledgingMock = require('./js/liquidPledgingMock.js');
exports.LiquidPledgingState = require('./js/liquidPledgingState.js');
exports.LPVault = require('./js/vault.js');
=======
exports.LiquidPledging = require('./lib/liquidPledging.js');
exports.LiquidPledgingMock = require('./lib/liquidPledgingMock.js');
exports.LiquidPledgingState = require('./lib/liquidPledgingState.js');
exports.Vault = require('./lib/vault.js');
>>>>>>>
exports.LiquidPledging = require('./lib/liquidPledging.js');
exports.LiquidPledgingMock = require('./lib/liquidPledgingMock.js');
exports.LiquidPledgingState = require('./lib/liquidPledgingState.js');
exports.LPVault = require('./lib/vault.js'); |
<<<<<<<
SB_trace(sbCommonUtils.lang("CONNECT", url));
this.sniffer = new sbHeaderSniffer(url, gRefURL);
this.sniffer.checkURL();
=======
SB_trace(sbCommonUtils.lang("capture", "CONNECT", [url]));
// if active, start connection and capture
if (this.isActive()) {
this.sniffer = new sbHeaderSniffer(url, gRefURL);
this.sniffer.checkURL();
}
>>>>>>>
SB_trace(sbCommonUtils.lang("CONNECT", url));
// if active, start connection and capture
if (this.isActive()) {
this.sniffer = new sbHeaderSniffer(url, gRefURL);
this.sniffer.checkURL();
}
<<<<<<<
SB_trace(sbCommonUtils.lang("WAITING", sbCaptureTask.seconds));
if ( --this.seconds > 0 ) {
=======
SB_trace(sbCommonUtils.lang("capture", "WAITING", [sbCaptureTask.seconds]));
if ( this.seconds > 0 ) {
this.seconds--;
>>>>>>>
SB_trace(sbCommonUtils.lang("WAITING", sbCaptureTask.seconds));
if ( this.seconds > 0 ) {
this.seconds--; |
<<<<<<<
if ( !file.exists() ) { sbCommonUtils.alert(sbCommonUtils.lang("ERR_NO_FILE2URL")); window.close(); }
var lines = sbCommonUtils.readFile(file).split("\n");
=======
if ( !file.exists() ) { sbCommonUtils.alert(sbCommonUtils.lang("scrapbook", "ERR_NO_FILE2URL")); window.close(); }
var lines = sbCommonUtils.readFile(file, "UTF-8").split("\n");
>>>>>>>
if ( !file.exists() ) { sbCommonUtils.alert(sbCommonUtils.lang("ERR_NO_FILE2URL")); window.close(); }
var lines = sbCommonUtils.readFile(file, "UTF-8").split("\n");
<<<<<<<
if ( !file.exists() ) { sbCommonUtils.alert(sbCommonUtils.lang("ERR_NO_URL2NAME")); window.close(); }
lines = sbCommonUtils.readFile(file).split("\n");
=======
if ( !file.exists() ) { sbCommonUtils.alert(sbCommonUtils.lang("scrapbook", "ERR_NO_URL2NAME")); window.close(); }
lines = sbCommonUtils.readFile(file, "UTF-8").split("\n");
>>>>>>>
if ( !file.exists() ) { sbCommonUtils.alert(sbCommonUtils.lang("ERR_NO_URL2NAME")); window.close(); }
lines = sbCommonUtils.readFile(file, "UTF-8").split("\n"); |
<<<<<<<
var options = {};
transport.sendMail(options, function(){
test.ok(options.noCR);
test.done();
});
=======
var options = {transport:new Transport("stub")};
transport.sendMail(options, function(){});
test.ok(options.noCR);
test.done();
>>>>>>>
var options = {transport:new Transport("stub")};
transport.sendMail(options, function(){
test.ok(options.noCR);
test.done();
}); |
<<<<<<<
},
{
str: 'var x = 1;\n',
expect: 'var x = 1\n',
msg: 'Remove semicolons'
=======
},
{
str: 'var x = {key:123}\n',
expect: 'var x = {key: 123}\n',
msg: 'Space after colon (key-spacing)'
},
{
str: 'var x = {key : 123}\n',
expect: 'var x = {key: 123}\n',
msg: 'No Space before colon (key-spacing)'
>>>>>>>
},
{
str: 'var x = 1;\n',
expect: 'var x = 1\n',
msg: 'Remove semicolons'
},
{
str: 'var x = {key:123}\n',
expect: 'var x = {key: 123}\n',
msg: 'Space after colon (key-spacing)'
},
{
str: 'var x = {key : 123}\n',
expect: 'var x = {key: 123}\n',
msg: 'No Space before colon (key-spacing)' |
<<<<<<<
msg: 'Remove uneeded trailing semicolons that are followed by a comment'
},
{
str: 'var x = 123; /* Useful comment */\n',
expect: 'var x = 123 /* Useful comment */\n',
msg: 'Remove uneeded trailing semicolons that are followed by a multiline comment'
=======
msg: 'Remove unneeded trailing semicolons that are followed by a comment'
>>>>>>>
msg: 'Remove unneeded trailing semicolons that are followed by a comment'
},
{
str: 'var x = 123; /* Useful comment */\n',
expect: 'var x = 123 /* Useful comment */\n',
msg: 'Remove unneeded trailing semicolons that are followed by a multiline comment' |
<<<<<<<
// Generated by CoffeeScript 1.10.0
(function() {
var $, Range, Trie,
indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
=======
// Generated by CoffeeScript 1.10.0
>>>>>>>
// Generated by CoffeeScript 1.10.0
(function() {
var $, Range, Trie,
indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
<<<<<<<
Range = (function() {
function Range(trie1) {
this.trie = trie1;
if (this.trie.constructor !== Trie) {
throw Error('Range constructor requires a Trie parameter');
}
}
Range.rangeWithString = function(ranges) {
var j, k, len, n, r, range, ref, ref1, trie;
if (typeof ranges !== 'string') {
throw Error('rangeWithString requires a string parameter');
}
ranges = ranges.replace(/ /g, '');
ranges = ranges.split(',');
trie = new Trie;
for (j = 0, len = ranges.length; j < len; j++) {
range = ranges[j];
if (r = range.match(/^(\d+)-(\d+)$/)) {
for (n = k = ref = r[1], ref1 = r[2]; ref <= ref1 ? k <= ref1 : k >= ref1; n = ref <= ref1 ? ++k : --k) {
trie.push(n);
}
} else if (range.match(/^\d+$/)) {
trie.push(range);
} else {
throw Error("Invalid range '" + r + "'");
}
}
return new Range(trie);
};
Range.prototype.match = function(number) {
return this.trie.find(number);
};
return Range;
})();
/*
jQuery Credit Card Validator 1.1
Copyright 2012-2015 Pawel Decowski
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
*/
=======
(function() {
var $,
indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
>>>>>>>
Range = (function() {
function Range(trie1) {
this.trie = trie1;
if (this.trie.constructor !== Trie) {
throw Error('Range constructor requires a Trie parameter');
}
}
Range.rangeWithString = function(ranges) {
var j, k, len, n, r, range, ref, ref1, trie;
if (typeof ranges !== 'string') {
throw Error('rangeWithString requires a string parameter');
}
ranges = ranges.replace(/ /g, '');
ranges = ranges.split(',');
trie = new Trie;
for (j = 0, len = ranges.length; j < len; j++) {
range = ranges[j];
if (r = range.match(/^(\d+)-(\d+)$/)) {
for (n = k = ref = r[1], ref1 = r[2]; ref <= ref1 ? k <= ref1 : k >= ref1; n = ref <= ref1 ? ++k : --k) {
trie.push(n);
}
} else if (range.match(/^\d+$/)) {
trie.push(range);
} else {
throw Error("Invalid range '" + r + "'");
}
}
return new Range(trie);
};
Range.prototype.match = function(number) {
return this.trie.find(number);
};
return Range;
})();
/*
jQuery Credit Card Validator 1.1
Copyright 2012-2015 Pawel Decowski
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
*/
<<<<<<<
var bind, card, card_type, card_types, get_card_type, is_valid_length, is_valid_luhn, j, len, normalize, ref, validate, validate_number;
=======
var bind, card, card_type, card_types, get_card_type, i, is_valid_length, is_valid_luhn, len, normalize, ref, validate, validate_number;
>>>>>>>
var bind, card, card_type, card_types, get_card_type, is_valid_length, is_valid_luhn, j, len, normalize, ref, validate, validate_number;
<<<<<<<
range: '4',
valid_length: [13, 16]
=======
pattern: /^4/,
valid_length: [13, 14, 15, 16, 17, 18, 19]
>>>>>>>
range: '4',
valid_length: [13, 14, 15, 16, 17, 18, 19]
<<<<<<<
var j, len, results;
results = [];
for (j = 0, len = card_types.length; j < len; j++) {
card = card_types[j];
results.push(card.name);
=======
var i, len, results;
results = [];
for (i = 0, len = card_types.length; i < len; i++) {
card = card_types[i];
results.push(card.name);
>>>>>>>
var j, len, results;
results = [];
for (j = 0, len = card_types.length; j < len; j++) {
card = card_types[j];
results.push(card.name);
<<<<<<<
ref = options.accept;
for (j = 0, len = ref.length; j < len; j++) {
card_type = ref[j];
if (indexOf.call((function() {
var k, len1, results;
results = [];
for (k = 0, len1 = card_types.length; k < len1; k++) {
card = card_types[k];
results.push(card.name);
=======
ref = options.accept;
for (i = 0, len = ref.length; i < len; i++) {
card_type = ref[i];
if (indexOf.call((function() {
var j, len1, results;
results = [];
for (j = 0, len1 = card_types.length; j < len1; j++) {
card = card_types[j];
results.push(card.name);
>>>>>>>
ref = options.accept;
for (j = 0, len = ref.length; j < len; j++) {
card_type = ref[j];
if (indexOf.call((function() {
var k, len1, results;
results = [];
for (k = 0, len1 = card_types.length; k < len1; k++) {
card = card_types[k];
results.push(card.name);
<<<<<<<
var k, len1, r, ref1;
ref1 = (function() {
var l, len1, ref1, results;
results = [];
for (l = 0, len1 = card_types.length; l < len1; l++) {
card = card_types[l];
if (ref1 = card.name, indexOf.call(options.accept, ref1) >= 0) {
results.push(card);
=======
var j, len1, ref1;
ref1 = (function() {
var k, len1, ref1, results;
results = [];
for (k = 0, len1 = card_types.length; k < len1; k++) {
card = card_types[k];
if (ref1 = card.name, indexOf.call(options.accept, ref1) >= 0) {
results.push(card);
>>>>>>>
var k, len1, r, ref1;
ref1 = (function() {
var l, len1, ref1, results;
results = [];
for (l = 0, len1 = card_types.length; l < len1; l++) {
card = card_types[l];
if (ref1 = card.name, indexOf.call(options.accept, ref1) >= 0) {
results.push(card);
<<<<<<<
for (k = 0, len1 = ref1.length; k < len1; k++) {
card_type = ref1[k];
r = Range.rangeWithString(card_type.range);
if (r.match(number)) {
=======
for (j = 0, len1 = ref1.length; j < len1; j++) {
card_type = ref1[j];
if (number.match(card_type.pattern)) {
>>>>>>>
for (k = 0, len1 = ref1.length; k < len1; k++) {
card_type = ref1[k];
r = Range.rangeWithString(card_type.range);
if (r.match(number)) {
<<<<<<<
var digit, k, len1, n, ref1, sum;
=======
var digit, j, len1, n, ref1, sum;
>>>>>>>
var digit, k, len1, n, ref1, sum;
<<<<<<<
ref1 = number.split('').reverse();
for (n = k = 0, len1 = ref1.length; k < len1; n = ++k) {
digit = ref1[n];
=======
ref1 = number.split('').reverse();
for (n = j = 0, len1 = ref1.length; j < len1; n = ++j) {
digit = ref1[n];
>>>>>>>
ref1 = number.split('').reverse();
for (n = k = 0, len1 = ref1.length; k < len1; n = ++k) {
digit = ref1[n]; |
<<<<<<<
};
exports.updateServerInfo = {
setUp: function(done) {
Instance();
done();
},
'update server info': function (test) {
git.updateServerInfo(function (err, result) {
test.equals(null, err, 'not an error');
test.same(["update-server-info"], theCommandRun());
test.done();
});
closeWith('');
}
=======
};
exports.checkIgnore = {
setUp: function (done) {
Instance();
done();
},
'with single excluded file specified': function (test) {
git.checkIgnore('foo.log', function (err, result) {
test.equals(null, err, 'not an error');
test.same(['check-ignore', 'foo.log'], theCommandRun());
test.same(['foo.log'], result);
test.done();
});
closeWith('foo.log');
},
'with two excluded files specified': function (test) {
git.checkIgnore(['foo.log', 'bar.log'], function (err, result) {
test.equals(null, err, 'not an error');
test.same(['check-ignore', 'foo.log', 'bar.log'], theCommandRun());
test.same(['foo.log', 'bar.log'], result);
test.done();
});
closeWith('foo.log\n\
bar.log\
');
},
'with no excluded files': function (test) {
git.checkIgnore(['foo.log', 'bar.log'], function (err, result) {
test.equals(null, err, 'not an error');
test.same(['check-ignore', 'foo.log', 'bar.log'], theCommandRun());
test.same([], result);
test.done();
});
closeWith('');
}
>>>>>>>
};
exports.checkIgnore = {
setUp: function (done) {
Instance();
done();
},
'with single excluded file specified': function (test) {
git.checkIgnore('foo.log', function (err, result) {
test.equals(null, err, 'not an error');
test.same(['check-ignore', 'foo.log'], theCommandRun());
test.same(['foo.log'], result);
test.done();
});
closeWith('foo.log');
},
'with two excluded files specified': function (test) {
git.checkIgnore(['foo.log', 'bar.log'], function (err, result) {
test.equals(null, err, 'not an error');
test.same(['check-ignore', 'foo.log', 'bar.log'], theCommandRun());
test.same(['foo.log', 'bar.log'], result);
test.done();
});
closeWith('foo.log\n\
bar.log\
');
},
'with no excluded files': function (test) {
git.checkIgnore(['foo.log', 'bar.log'], function (err, result) {
test.equals(null, err, 'not an error');
test.same(['check-ignore', 'foo.log', 'bar.log'], theCommandRun());
test.same([], result);
test.done();
});
closeWith('');
}
};
exports.updateServerInfo = {
setUp: function(done) {
Instance();
done();
},
'update server info': function (test) {
git.updateServerInfo(function (err, result) {
test.equals(null, err, 'not an error');
test.same(["update-server-info"], theCommandRun());
test.done();
});
closeWith('');
} |
<<<<<<<
/**
* Call a simple function
* @param {Function} [then]
*/
Git.prototype.then = function(then) {
this._runCache.push(["echo ''", then]);
this._schedule();
return this;
};
=======
/**
* Show commit logs.
*
* @param {String} [from]
* @param {String} [to]
* @param {Function} [then]
*/
Git.prototype.log = function(from, to, then) {
var command = "log --pretty=format:'%H;%ai;%s%d;%aN;%ae' ";
if (from && to) {
command += from + "..." + to;
}
if (typeof arguments[arguments.length - 1] === 'function') {
then = arguments[arguments.length - 1];
}
return this._run(command, function(err, data) {
then && then(err, !err && this._parseListLog(data));
});
};
>>>>>>>
/**
* Call a simple function
* @param {Function} [then]
*/
Git.prototype.then = function(then) {
this._runCache.push(["echo ''", then]);
this._schedule();
return this;
};
/**
* Show commit logs.
*
* @param {String} [from]
* @param {String} [to]
* @param {Function} [then]
*/
Git.prototype.log = function(from, to, then) {
var command = "log --pretty=format:'%H;%ai;%s%d;%aN;%ae' ";
if (from && to) {
command += from + "..." + to;
}
if (typeof arguments[arguments.length - 1] === 'function') {
then = arguments[arguments.length - 1];
}
return this._run(command, function(err, data) {
then && then(err, !err && this._parseListLog(data));
});
}; |
<<<<<<<
"Confirm to Reset ?": "确认重置？",
"New Key": "申请Key",
"Reset Key": "重置Key",
"Delete Key": "删除Key",
=======
"Confirm to Close?": "确认关闭？",
"Confirm to hang up chosen members?": "该操作会挂掉您选择的成员，是否继续？",
"Can't Delete Because The Child Group Exist!": "不能删除因为子组还在!",
>>>>>>>
"Confirm to Reset ?": "确认重置？",
"New Key": "申请Key",
"Reset Key": "重置Key",
"Delete Key": "删除Key",
"Confirm to Close?": "确认关闭？",
"Confirm to hang up chosen members?": "该操作会挂掉您选择的成员，是否继续？",
"Can't Delete Because The Child Group Exist!": "不能删除因为子组还在!", |
<<<<<<<
import {createFragmentContainer, commitMutation, graphql} from 'react-relay';
// import {PeriqlesForm} from '../../module/index.js';
// import PeriqlesForm from './PeriqlesForm.js';
// import periqlesFormWrapper from './PeriqlesForm.js';
// import schema from './schema.js';
=======
import {createFragmentContainer, graphql} from 'react-relay';
>>>>>>>
import {createFragmentContainer, commitMutation, graphql} from 'react-relay';
<<<<<<<
{/* <PeriqlesForm
mutationName={'AddTodo'}
mutationGQL={graphql`
mutation TodoApp_AddTodoMutation($input: AddTodoInput!) {
addTodo(input: $input) {
todoEdge {
__typename
cursor
node {
complete
id
text
}
}
user {
id
totalCount
}
}
}
`}
args={[
{name: 'clientMutationId', value: '0000'},
{name: 'userId', value: 'me'},
]}
/> */}
=======
>>>>>>> |
<<<<<<<
_sampleIds.push(_data[i]['sample']);
_dataAttrMapArr[_data[i]["sample"]][_data[i]["attr_id"]] = _data[i]["attr_val"];
=======
_dataAttrMapArr[_data[i]["sample"]][_data[i]["attr_id"].toString().toUpperCase()] = _data[i]["attr_val"];
>>>>>>>
_sampleIds.push(_data[i]['sample']);
_dataAttrMapArr[_data[i]["sample"]][_data[i]["attr_id"].toString().toUpperCase()] = _data[i]["attr_val"]; |
<<<<<<<
'makeGenePanelPopupLink': function(gene_panel_id) {
var anchor = $('<a href="#" oncontextmenu="return false;">'+gene_panel_id+'</a>');
anchor.ready(anchor.click(function() {
window.cbioportal_client.getGenePanelsByPanelId({panel_id:[gene_panel_id]}).then(function(response) {
var genes = response[0].genes.map(function(g) { return g.hugoGeneSymbol; }).sort();
var popup = open("", "_blank", "width=500,height=500");
var div = popup.document.createElement("div");
popup.document.body.appendChild(div);
$('<h3 style="text-align:center;">'+gene_panel_id+'</h3><br>').appendTo(div);
$(genes.join("<br>")).appendTo(div);
});
}));
return anchor;
},
=======
'makeHeatmapTrackTooltip': function(genetic_profile, data_type, link_id) {
return function (d) {
var data_header = '';
var profile_data = 'NaN';
if (genetic_profile.genetic_alteration_type === "MRNA_EXPRESSION") {
data_header = 'MRNA: ';
} else if (genetic_profile.genetic_alteration_type === "PROTEIN_LEVEL") {
data_header = 'PROT: ';
}
if (d.profile_data) {
profile_data = d.profile_data.toString();
}
var ret = data_header + '<b>' + profile_data + '</b><br>';
ret += (data_type === 'sample' ? (link_id ? tooltip_utils.sampleViewAnchorTag(d.study, d.sample) : d.sample) : (link_id ? tooltip_utils.patientViewAnchorTag(d.study, d.patient) : d.patient));
return ret;
};
},
>>>>>>>
'makeGenePanelPopupLink': function(gene_panel_id) {
var anchor = $('<a href="#" oncontextmenu="return false;">'+gene_panel_id+'</a>');
anchor.ready(anchor.click(function() {
window.cbioportal_client.getGenePanelsByPanelId({panel_id:[gene_panel_id]}).then(function(response) {
var genes = response[0].genes.map(function(g) { return g.hugoGeneSymbol; }).sort();
var popup = open("", "_blank", "width=500,height=500");
var div = popup.document.createElement("div");
popup.document.body.appendChild(div);
$('<h3 style="text-align:center;">'+gene_panel_id+'</h3><br>').appendTo(div);
$(genes.join("<br>")).appendTo(div);
});
}));
return anchor;
},
'makeHeatmapTrackTooltip': function(genetic_profile, data_type, link_id) {
return function (d) {
var data_header = '';
var profile_data = 'NaN';
if (genetic_profile.genetic_alteration_type === "MRNA_EXPRESSION") {
data_header = 'MRNA: ';
} else if (genetic_profile.genetic_alteration_type === "PROTEIN_LEVEL") {
data_header = 'PROT: ';
}
if (d.profile_data) {
profile_data = d.profile_data.toString();
}
var ret = data_header + '<b>' + profile_data + '</b><br>';
ret += (data_type === 'sample' ? (link_id ? tooltip_utils.sampleViewAnchorTag(d.study, d.sample) : d.sample) : (link_id ? tooltip_utils.patientViewAnchorTag(d.study, d.patient) : d.patient));
return ret;
};
},
<<<<<<<
var oncoprint_data_frame = oncoprint_data_by_line[track_line];
var track_data = oncoprint_data_frame.oncoprint_data;
=======
var track_data = oncoprint_data_by_line[track_line].oncoprint_data;
console.log("populating sample data for alteration track " + oncoprint_data_by_line[track_line].gene);
>>>>>>>
var oncoprint_data_frame = oncoprint_data_by_line[track_line];
var track_data = oncoprint_data_frame.oncoprint_data;
console.log("populating sample data for alteration track " + oncoprint_data_by_line[track_line].gene); |
<<<<<<<
browser: detectBrowser(), // returning the browser object, not the function itself
getWindowOrigin: getOrigin,
sortByAttribute: sortByAttribute,
safeProperty: safeProperty,
autoHideOnMouseLeave: autoHideOnMouseLeave,
swapElement: swapElement
=======
browser: detectBrowser(), // returning the browser object, not the function itself
getWindowOrigin: getOrigin,
safeProperty: safeProperty,
autoHideOnMouseLeave: autoHideOnMouseLeave,
swapElement: swapElement,
getTargetWindow: getTargetWindow,
submitDownload: submitDownload,
requestDownload: requestDownload,
getTargetDocument: getTargetDocument
>>>>>>>
browser: detectBrowser(), // returning the browser object, not the function itself
getWindowOrigin: getOrigin,
sortByAttribute: sortByAttribute,
safeProperty: safeProperty,
autoHideOnMouseLeave: autoHideOnMouseLeave,
swapElement: swapElement,
getTargetWindow: getTargetWindow,
submitDownload: submitDownload,
requestDownload: requestDownload,
getTargetDocument: getTargetDocument |
<<<<<<<
$('.attribute_name').qtip({
content: {text: 'Click to drag '},
position: {my:'left bottom', at:'top middle', viewport: $(window)},
style: { classes: 'qtip-light qtip-rounded qtip-shadow qtip-lightyellow' },
show: {event: "mouseover"},
hide: {fixed: true, delay: 100, event: "mouseout"}
});
zoom = reset_zoom();
invodeDataManager();
=======
zoom = reset_zoom();
invokeDataManager();
>>>>>>>
$('.attribute_name').qtip({
content: {text: 'Click to drag '},
position: {my:'left bottom', at:'top middle', viewport: $(window)},
style: { classes: 'qtip-light qtip-rounded qtip-shadow qtip-lightyellow' },
show: {event: "mouseover"},
hide: {fixed: true, delay: 100, event: "mouseout"}
});
zoom = reset_zoom();
invokeDataManager();
<<<<<<<
extraTracks = extraTracks.concat(response.attributes().map(function(attr) { return attr.attr_id; }));
extraGenes = extraGenes.concat(response.toJSON());
extraAttributes=extraAttributes.concat(response.attributes());
sortStatus = sortStatus.concat('increSort');
oncoprint = Oncoprint(document.getElementById('oncoprint_body'), {
geneData: geneDataColl.toJSON(),
clinicalData: extraGenes,
genes: genes,
clinical_attrs: extraAttributes,
legend: document.getElementById('oncoprint_legend'),
sortStatus:sortStatus,
mutationColor:mutationColorControl
},extraTracks);
// oncoprint.sortBy(sortBy.val(), cases.split(" "));
if($('#oncoprint_sortbyfirst_dropdonw span')[0].innerHTML === 'Sort by')
{
oncoprint.sortBy("genes", cases.split(" "));
}
else
{
selectsortby();
}
// enable the option to sort by clinical data
// $(sortBy.add('option[value="clinical"]')[1]).prop('disabled', false);
// sortBy[0].options[1].disabled = false;
// // sort by genes by default
// sortBy.val('genes');
for(attributeElemValue in extraAttributes)
{
var attributeElemValueIndex;
for(var m= 0; m<totalAttrs.length;m++)
{
if(totalAttrs[m].display_name === extraAttributes[attributeElemValue].display_name)
{
attributeElemValueIndex=m;
totalAttrs.splice(attributeElemValueIndex,1);
}
}
}
utils.populate_clinical_attr_select(document.getElementById('select_clinical_attributes'), totalAttrs);
toggleControls(true);
functionFunctions();
zoom = reset_zoom();
// sync
oncoprint.zoom(zoom.val());
oncoprint.showUnalteredCases(!$('#toggle_unaltered_cases').is(":checked"));
oncoprint.toggleWhiteSpace(!$('#toggle_whitespace').is(":checked"));
$('.oncoprint-diagram-showlegend-icon')[0].attributes.src.value === 'images/showlegend.svg';
utils.make_mouseover(d3.selectAll('.sample rect'),{linkage:true}); // hack =(
invodeDataManager();
=======
$('.special_delete').click(resetClinicalAttribute);// enable delete symbol "x" function
invokeDataManager();
>>>>>>>
extraTracks = extraTracks.concat(response.attributes().map(function(attr) { return attr.attr_id; }));
extraGenes = extraGenes.concat(response.toJSON());
extraAttributes=extraAttributes.concat(response.attributes());
sortStatus = sortStatus.concat('increSort');
oncoprint = Oncoprint(document.getElementById('oncoprint_body'), {
geneData: geneDataColl.toJSON(),
clinicalData: extraGenes,
genes: genes,
clinical_attrs: extraAttributes,
legend: document.getElementById('oncoprint_legend'),
sortStatus:sortStatus,
mutationColor:mutationColorControl
},extraTracks);
// oncoprint.sortBy(sortBy.val(), cases.split(" "));
if($('#oncoprint_sortbyfirst_dropdonw span')[0].innerHTML === 'Sort by')
{
oncoprint.sortBy("genes", cases.split(" "));
}
else
{
selectsortby();
}
// enable the option to sort by clinical data
// $(sortBy.add('option[value="clinical"]')[1]).prop('disabled', false);
// sortBy[0].options[1].disabled = false;
// // sort by genes by default
// sortBy.val('genes');
for(attributeElemValue in extraAttributes)
{
var attributeElemValueIndex;
for(var m= 0; m<totalAttrs.length;m++)
{
if(totalAttrs[m].display_name === extraAttributes[attributeElemValue].display_name)
{
attributeElemValueIndex=m;
totalAttrs.splice(attributeElemValueIndex,1);
}
}
}
utils.populate_clinical_attr_select(document.getElementById('select_clinical_attributes'), totalAttrs);
toggleControls(true);
functionFunctions();
zoom = reset_zoom();
// sync
oncoprint.zoom(zoom.val());
oncoprint.showUnalteredCases(!$('#toggle_unaltered_cases').is(":checked"));
oncoprint.toggleWhiteSpace(!$('#toggle_whitespace').is(":checked"));
$('.oncoprint-diagram-showlegend-icon')[0].attributes.src.value === 'images/showlegend.svg';
utils.make_mouseover(d3.selectAll('.sample rect'),{linkage:true}); // hack =(
invokeDataManager();
<<<<<<<
invodeDataManager();
=======
$('.special_delete').click(resetClinicalAttribute);// enable delete symbol "x" function
invokeDataManager();
>>>>>>>
invokeDataManager(); |
<<<<<<<
this.on('kill', function(callback) {
self.browser.quit(function() {
console.log('Killed ' + spec.testName + '.');
callback();
});
});
this._start = function (url) {
self.browser = wd.remote(config);
self.browser.init(spec, function () {
self.browser.get(url);
});
=======
this._start = function(url) {
self.browser = wd.remote(config, 'promiseChain');
self.browser.init(spec)
.get(url)
.done();
self._process = {
kill: function() {
self.browser.quit(function() {
log.info('Killed ' + spec.name + '.');
self._onProcessExit(self.error ? -1 : 0, self.error);
});
}
};
>>>>>>>
this._start = function(url) {
self.browser = wd.remote(config, 'promiseChain');
self.browser.init(spec)
.get(url)
.done();
self._process = {
kill: function() {
self.browser.quit(function() {
log.info('Killed ' + spec.testName + '.');
self._onProcessExit(self.error ? -1 : 0, self.error);
});
}
}; |
<<<<<<<
severity: severity,
ttl: _config.ttl || _ttl
=======
isWarn: severity.isWarn,
isError: severity.isError,
isInfo: severity.isInfo,
isSuccess: severity.isSuccess,
ttl: _config.ttl || _ttl,
enableHtml: _config.enableHtml || _enableHtml
>>>>>>>
severity: severity,
ttl: _config.ttl || _ttl,
enableHtml: _config.enableHtml || _enableHtml |
<<<<<<<
this.validation = {
validate: sinon.spy(function () {return Promise.resolve(arguments[0]);}),
validationPromise: sinon.spy(function () {return Promise.resolve(arguments[0]);}),
addType: sinon.spy()
};
=======
this.resetStorage = sinon.stub().resolves();
this.rootPath = '/kuzzle';
>>>>>>>
this.validation = {
validate: sinon.spy(function () {return Promise.resolve(arguments[0]);}),
validationPromise: sinon.spy(function () {return Promise.resolve(arguments[0]);}),
addType: sinon.spy()
};
this.resetStorage = sinon.stub().resolves();
this.rootPath = '/kuzzle'; |
<<<<<<<
var seriesEditorUrl = '../Series/SingleSeriesEditor';
var saveSeriesEditorUrl = '../Series/SaveSingleSeriesEditor';
var seriesDeleteUrl = '../Series/Delete';
=======
var seriesEditorUrl = '../Series/Edit';
var saveSeriesEditorUrl = '../Series/Edit';
var seriesDeleteUrl = '../Series/DeleteSeries';
>>>>>>>
var seriesEditorUrl = '../Series/Edit';
var saveSeriesEditorUrl = '../Series/Edit';
var seriesDeleteUrl = '../Series/Delete'; |
<<<<<<<
var FullMovieCollection = require('../FullMovieCollection');
var InCinemasCell = require('../../Cells/InCinemasCell');
=======
//var FullMovieCollection = require('../FullMovieCollection');
//var InCinemasCell = require('../../Cells/InCinemasCell');
var RelativeDateCell = require('../../Cells/RelativeDateCell');
>>>>>>>
var FullMovieCollection = require('../FullMovieCollection');
var InCinemasCell = require('../../Cells/InCinemasCell');
var RelativeDateCell = require('../../Cells/RelativeDateCell'); |
<<<<<<<
},{
name: 'zxsoft',
qq: '21557523',
email: '[email protected]',
github: 'https://github.com/zxsoft'
}
=======
},
{
name: '企鹅',
github: 'https://github.com/zxsoft'
},
{
name: 'Ken',
github: 'https://github.com/ckken'
}
>>>>>>>
},{
name: 'zxsoft',
qq: '21557523',
email: '[email protected]',
github: 'https://github.com/zxsoft'
},
{
name: 'Ken',
github: 'https://github.com/ckken'
} |
<<<<<<<
const activeDirectoryEndpoint = 'https://login.microsoftonline.com/';
=======
const activeDirectoryEndpoint = "https://login.microsoftonline.com/";
const pjson = require('../package.json');
>>>>>>>
const activeDirectoryEndpoint = 'https://login.microsoftonline.com/';
<<<<<<<
const url = require('url');
const request = require('request');
const {promisify} = require('util');
var pjson = require('../package.json');
=======
>>>>>>>
const pjson = require('../package.json');
<<<<<<<
_logger = logger;
if (useAuth(options)) {
const token = await acquireToken(options);
await encrypt(options, token);
}
else {
await encrypt(options);
}
};
=======
>>>>>>>
<<<<<<<
if (!allowInsecureUrl && url.parse(kamusUrl).protocol !== 'https:') {
_logger.error('Insecure Kamus URL is not allowed');
process.exit(1);
}
=======
>>>>>>>
<<<<<<<
const response = await performEncryptRequestAsync(secret, serviceAccount, namespace, kamusUrl, certFingerprint, token);
if (response && response.statusCode >= 300) {
_logger.error(`Encrypt request failed due to unexpected error. Status code: ${response.statusCode}`);
process.exit(1);
}
_logger.info(`Successfully encrypted data to ${serviceAccount} service account in ${namespace} namespace`);
if (outputFile) {
const fs = require('fs');
// eslint-disable-next-line security/detect-non-literal-fs-filename
fs.writeFileSync(outputFile, response.body, {
encoding: 'utf8',
flag: overwrite ? 'w' : 'wx',
});
_logger.info(`Encrypted data was saved to ${outputFile}.`);
=======
validateArguments(options);
let token = null;
if (!useAuth(options)) {
logger.warn('Auth options were not provided, will try to encrypt without authentication to kamus');
>>>>>>>
validateArguments(options);
let token = null;
if (!useAuth(options)) {
logger.warn('Auth options were not provided, will try to encrypt without authentication to kamus');
<<<<<<<
const refreshToken = await acquireTokenWithDeviceCode(context, authApplication, authResource);
=======
const refreshToken = await acquireTokenWithDeviceCode(context, authApplication, authResource, logger);
>>>>>>>
const refreshToken = await acquireTokenWithDeviceCode(context, authApplication, authResource, logger);
<<<<<<<
_logger.info(`Login to https://microsoft.com/devicelogin Enter this code to authenticate: ${userCodeResult.userCode}`);
=======
logger.info(`Login to https://microsoft.com/devicelogin Enter this code to authenticate: ${userCodeResult.userCode}`)
>>>>>>>
logger.info(`Login to https://microsoft.com/devicelogin Enter this code to authenticate: ${userCodeResult.userCode}`);
<<<<<<<
const performEncryptRequest = (data, serviceAccount, namespace, kamusUrl, certificateFingerprint, token, cb) => {
const headersBase = {
=======
const performEncryptRequest = (data, serviceAccount, namespace, kamusUrl, certificateFingerprint, token, cb) => {
const headers = {
>>>>>>>
const performEncryptRequest = (data, serviceAccount, namespace, kamusUrl, certificateFingerprint, token, cb) => {
const headersBase = {
<<<<<<<
url: kamusUrl + '/api/v1/encrypt',
headers,
=======
url: `${kamusUrl}/api/v1/encrypt`,
headers: headers,
>>>>>>>
url: `${kamusUrl}/api/v1/encrypt`,
headers,
<<<<<<<
const performEncryptRequestAsync = promisify(performEncryptRequest);
=======
const outputEncryptedSecret = (encryptedSecret, { outputFile, overwrite, fileEncoding }, logger) => {
if (outputFile) {
fs.writeFileSync(outputFile, encryptedSecret, {
encoding: fileEncoding || DEFAULT_ENCODING,
flag: overwrite ? 'w' : 'wx',
});
logger.info(`Encrypted data was saved to ${outputFile}.`);
}
else {
logger.info(`Encrypted data:\n${encryptedSecret}`);
}
};
performEncryptRequestAsync = promisify(performEncryptRequest);
>>>>>>>
const performEncryptRequestAsync = promisify(performEncryptRequest);
const outputEncryptedSecret = (encryptedSecret, { outputFile, overwrite, fileEncoding }, logger) => {
if (outputFile) {
// eslint-disable-next-line security/detect-non-literal-fs-filename
fs.writeFileSync(outputFile, encryptedSecret, {
encoding: fileEncoding || DEFAULT_ENCODING,
flag: overwrite ? 'w' : 'wx',
});
logger.info(`Encrypted data was saved to ${outputFile}.`);
}
else {
logger.info(`Encrypted data:\n${encryptedSecret}`);
}
}; |
<<<<<<<
ApiRT.prototype.indexExists = function (index) {
return this.send({
index,
controller: 'read',
action: 'indexExists'
});
};
ApiRT.prototype.collectionExists = function (index, collection) {
return this.send({
index,
collection,
controller: 'read',
action: 'collectionExists'
});
};
=======
ApiRT.prototype.getSpecifications = function (index, collection) {
return this.send({
index: index,
collection: collection,
controller: 'admin',
action: 'getSpecifications'
});
};
ApiRT.prototype.updateSpecifications = function (specifications) {
return this.send({
index: null,
collection: null,
controller: 'admin',
action : 'updateSpecifications',
body: specifications
});
};
ApiRT.prototype.validateSpecifications = function (specifications) {
return this.send({
index: null,
collection: null,
controller: 'admin',
action : 'validateSpecifications',
body: specifications
});
};
ApiRT.prototype.validateDocument = function (index, collection, document) {
return this.create(document, index, collection);
};
ApiRT.prototype.deleteSpecifications = function (index, collection) {
return this.send({
index: index,
collection: collection,
controller: 'admin',
action : 'deleteSpecifications',
body: null
});
};
>>>>>>>
ApiRT.prototype.indexExists = function (index) {
return this.send({
index,
controller: 'read',
action: 'indexExists'
});
};
ApiRT.prototype.collectionExists = function (index, collection) {
return this.send({
index,
collection,
controller: 'read',
action: 'collectionExists'
});
};
ApiRT.prototype.getSpecifications = function (index, collection) {
return this.send({
index: index,
collection: collection,
controller: 'admin',
action: 'getSpecifications'
});
};
ApiRT.prototype.updateSpecifications = function (specifications) {
return this.send({
index: null,
collection: null,
controller: 'admin',
action : 'updateSpecifications',
body: specifications
});
};
ApiRT.prototype.validateSpecifications = function (specifications) {
return this.send({
index: null,
collection: null,
controller: 'admin',
action : 'validateSpecifications',
body: specifications
});
};
ApiRT.prototype.validateDocument = function (index, collection, document) {
return this.create(document, index, collection);
};
ApiRT.prototype.deleteSpecifications = function (index, collection) {
return this.send({
index: index,
collection: collection,
controller: 'admin',
action : 'deleteSpecifications',
body: null
});
}; |
<<<<<<<
hashover.elements.exists (id, function (element) {
element.scrollIntoView ({ behavior: 'smooth', block: 'start', inline: 'nearest' });
}, false);
=======
hashover.elementExists (id, function (element) {
element.scrollIntoView ({ behavior: 'smooth' });
}, true);
>>>>>>>
hashover.elementExists (id, function (element) {
element.scrollIntoView ({ behavior: 'smooth', block: 'start', inline: 'nearest' });
}, true); |
<<<<<<<
it('spits back its rules() verbatim', function () {
const rules = ruleset(
rule(dom('a'), type('A')),
rule(type('A'), type('B')),
rule(type('A'), out('ay')),
rule(type('B'), out('be'))
);
const ruleList = rules.rules();
assert.equal(ruleList.length, 4); // because deepEqual doesn't actually deep-compare Maps yet
assert.deepEqual(ruleset(...ruleList), rules);
});
=======
it('takes a subtree of a document and operates on it', function () {
const doc = jsdom(`
<div id=root>some text
<div id=inner>some more text</div>
</div>
`);
const rules = ruleset(
rule(dom('#root'), type('smoo').score(10)),
rule(dom('#inner'), type('smoo').score(5)),
rule(type('smoo').max(), out('best'))
);
const facts = rules.against(doc);
const best = facts.get('best');
assert.equal(best.length, 1);
assert.equal(best[0].element.id, 'root');
const subtree = doc.getElementById('root');
const subtreeFacts = rules.against(subtree);
const subtreeBest = subtreeFacts.get('best');
assert.equal(subtreeBest.length, 1);
assert.equal(subtreeBest[0].element.id, 'inner');
});
>>>>>>>
it('spits back its rules() verbatim', function () {
const rules = ruleset(
rule(dom('a'), type('A')),
rule(type('A'), type('B')),
rule(type('A'), out('ay')),
rule(type('B'), out('be'))
);
const ruleList = rules.rules();
assert.equal(ruleList.length, 4); // because deepEqual doesn't actually deep-compare Maps yet
assert.deepEqual(ruleset(...ruleList), rules);
});
it('takes a subtree of a document and operates on it', function () {
const doc = jsdom(`
<div id=root>some text
<div id=inner>some more text</div>
</div>
`);
const rules = ruleset(
rule(dom('#root'), type('smoo').score(10)),
rule(dom('#inner'), type('smoo').score(5)),
rule(type('smoo').max(), out('best'))
);
const facts = rules.against(doc);
const best = facts.get('best');
assert.equal(best.length, 1);
assert.equal(best[0].element.id, 'root');
const subtree = doc.getElementById('root');
const subtreeFacts = rules.against(subtree);
const subtreeBest = subtreeFacts.get('best');
assert.equal(subtreeBest.length, 1);
assert.equal(subtreeBest[0].element.id, 'inner');
}); |
<<<<<<<
Riak.prototype.log(meta.headers['content-type'] === 'application/json' ? JSON.stringify(response) : response)
=======
Riak.prototype.log(meta.type === 'application/json' ? JSON.stringify(response) : response)
},
errback: function(response, meta) {
if (response)
Riak.prototype.log((meta ? meta.statusCode + ": " : "") + response, 'error')
>>>>>>>
Riak.prototype.log(meta.type === 'application/json' ? JSON.stringify(response) : response)
<<<<<<<
Riak.prototype.executeInternal(self, path, options, callback);
=======
// actual http calls provided by implementors
Riak.prototype.executeInternal(self, path, options, callback, errback);
>>>>>>>
// actual http calls provided by implementors
Riak.prototype.executeInternal(self, path, options, callback); |
<<<<<<<
},{
title: "Titanic",
emojiImgs: "💑❄🚢⬇️",
genres: ["drama", "romance"],
type: "movie",
year: 1997,
itemLink: "https://www.imdb.com/title/tt0120338/"
},{
title: "The Wizard of Oz",
emojiImgs: "🐶🌪️🤖🦁🧙",
genres: ["adventure", "family", "fantasy"],
itemLink: "https://www.imdb.com/title/tt0032138/",
type: "movie",
year: 1939
},
{
title: "Timecrimes",
emojiImgs: "🕒🤕🧥✂️",
genres: ["horror", "mystery", "sci-fi"],
type: "movie",
year: 2007,
itemLink: "https://www.imdb.com/title/tt0480669/"
=======
},
{
title: "Top Gun",
emojiImgs: "🔝🔫🛩️🕶️",
genres: ["action", "drama"],
itemLink: "https://www.imdb.com/title/tt0092099/",
type: "movie",
year: 1986
>>>>>>>
},{
title: "Titanic",
emojiImgs: "💑❄🚢⬇️",
genres: ["drama", "romance"],
type: "movie",
year: 1997,
itemLink: "https://www.imdb.com/title/tt0120338/"
},{
title: "The Wizard of Oz",
emojiImgs: "🐶🌪️🤖🦁🧙",
genres: ["adventure", "family", "fantasy"],
itemLink: "https://www.imdb.com/title/tt0032138/",
type: "movie",
year: 1939
},
{
title: "Timecrimes",
emojiImgs: "🕒🤕🧥✂️",
genres: ["horror", "mystery", "sci-fi"],
type: "movie",
year: 2007,
itemLink: "https://www.imdb.com/title/tt0480669/"
},
{
title: "Top Gun",
emojiImgs: "🔝🔫🛩️🕶️",
genres: ["action", "drama"],
itemLink: "https://www.imdb.com/title/tt0092099/",
type: "movie",
year: 1986 |
<<<<<<<
title: "Bettlejuice",
emojiImgs: "⚰️🧟👰📙",
genres: ["comedy", "fantasy"],
type: "movie",
year: 1988,
itemLink: "https://www.imdb.com/title/tt0094721/"
},
{
=======
title: "Be More Chill",
emojiImgs: "👾🎮😜🎤",
genres: ["sci-fi", "musical", "comedy", "drama"],
type: "musical",
year: 2015,
itemLink: "https://www.imdb.com/title/tt8804832/"
},{
>>>>>>>
title: "Bettlejuice",
emojiImgs: "⚰️🧟👰📙",
genres: ["comedy", "fantasy"],
type: "movie",
year: 1988,
itemLink: "https://www.imdb.com/title/tt0094721/"
},
{
title: "Be More Chill",
emojiImgs: "👾🎮😜🎤",
genres: ["sci-fi", "musical", "comedy", "drama"],
type: "musical",
year: 2015,
itemLink: "https://www.imdb.com/title/tt8804832/"
},{ |
<<<<<<<
title: "Mrs. Doubtfire",
emojiImgs: "👨➡👵",
genres: ["comedy", "drama", "family"],
itemLink: "https://www.imdb.com/title/tt0107614/",
type: "movie",
year: 1993
},
{
=======
title: "Moonrise Kingdom",
emojiImgs: "⛺️🧳🌕👑",
genres: ["Comedy", "Drama", "Romance"],
itemLink: "https://www.imdb.com/title/tt1748122/",
type: "movie",
year: 2012
},{
title: "Monty Python and the Holy Grail",
emojiImgs: "🤵🐍⛪🍷",
genres: ["comedy"],
type: "movie",
year: 1975,
itemLink: "https://www.imdb.com/title/tt0071853/?ref_=nv_sr_1?ref_=nv_sr_1"
},
{
>>>>>>>
title: "Mrs. Doubtfire",
emojiImgs: "👨➡👵",
genres: ["comedy", "drama", "family"],
itemLink: "https://www.imdb.com/title/tt0107614/",
type: "movie",
year: 1993
},{
title: "Moonrise Kingdom",
emojiImgs: "⛺️🧳🌕👑",
genres: ["Comedy", "Drama", "Romance"],
itemLink: "https://www.imdb.com/title/tt1748122/",
type: "movie",
year: 2012
},{
title: "Monty Python and the Holy Grail",
emojiImgs: "🤵🐍⛪🍷",
genres: ["comedy"],
type: "movie",
year: 1975,
itemLink: "https://www.imdb.com/title/tt0071853/?ref_=nv_sr_1?ref_=nv_sr_1"
},
{ |
<<<<<<<
<Route path="/test" component={PostAdd}>
<Route path="/add" component={PostAdd} />
</Route>
<Route path="/edit" component={Edit} />
<Route path="/post/:id" component={PostView} />
=======
>>>>>>>
<Route path="/test" component={PostAdd} />
<Route path="/add" component={PostAdd} />
<Route path="/edit" component={Edit} />
<Route path="/post/:id" component={PostView} /> |
<<<<<<<
// Generated by CoffeeScript 1.6.2
=======
// Generated by CoffeeScript 1.3.2
>>>>>>>
// Generated by CoffeeScript 1.6.2
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
var a, add1, add2, addO, e, enter, ex, force, postTrans, preTrans, s, t, _data, _j, _join, _k, _l, _len1, _len2, _len3, _parent, _transition, _transitionExit;
=======
var a, add1, add2, addO, e, enter, ex, force, postTrans, preTrans, s, t, _data, _j, _join, _k, _l, _len1, _len2, _len3, _parent, _transition, _transitionExit;
>>>>>>>
var a, add1, add2, addO, e, enter, ex, force, postTrans, preTrans, s, t, _data, _j, _join, _k, _l, _len1, _len2, _len3, _parent, _transition, _transitionExit;
<<<<<<<
var force, sel, _datum;
=======
var force, sel, _datum;
>>>>>>>
var force, sel, _datum;
<<<<<<<
var column, compareModes, _j, _len1;
=======
var column, compareModes, _j, _len1;
>>>>>>>
var column, compareModes, _j, _len1;
<<<<<<<
var i, ind, visibleChanged, w, _indicator, _j, _len1;
=======
var i, ind, visibleChanged, w, _indicator, _j, _len1;
>>>>>>>
var i, ind, visibleChanged, w, _indicator, _j, _len1;
<<<<<<<
var colSel, dataSorted, enterRowSel, i, rowSel, sel, visibleChanged, w, _compare, _j, _len1, _ref2, _rowClass, _rowLimit;
=======
var colSel, dataSorted, enterRowSel, i, rowSel, sel, visibleChanged, w, _compare, _j, _len1, _ref2, _rowClass, _rowLimit;
>>>>>>>
var colSel, dataSorted, enterRowSel, i, rowSel, sel, visibleChanged, w, _compare, _j, _len1, _ref2, _rowClass, _rowLimit; |
<<<<<<<
count: 0,
tweets: [
]
=======
count: 0,
hashtag: null
>>>>>>>
count: 0,
tweets: [
],
hashtag: null
<<<<<<<
},
ADD_TWEET(state, obj) {
state.tweets.push({
id: (Math.random()*1000000000).toString(),
author: {
image_url: 'http://unsplash.it/233/233',
name: 'Tonton René'
},
date: '27-11-2016', // ou un timestamp, osef
content: "J'aime bcp les frites"
})
=======
},
SET_HASHTAG(state, hashtag) {
state.hashtag = hashtag
>>>>>>>
},
ADD_TWEET(state, obj) {
state.tweets.push({
id: (Math.random()*1000000000).toString(),
author: {
image_url: 'http://unsplash.it/233/233',
name: 'Tonton René'
},
date: '27-11-2016', // ou un timestamp, osef
content: "J'aime bcp les frites"
})
},
SET_HASHTAG(state, hashtag) {
state.hashtag = hashtag
<<<<<<<
},
addTweet({commit}, obj) {
commit('ADD_TWEET', obj)
=======
},
setHashtag({commit}, hashtag) {
commit('SET_HASHTAG', hashtag)
>>>>>>>
},
addTweet({commit}, obj) {
commit('ADD_TWEET', obj)
},
setHashtag({commit}, hashtag) {
commit('SET_HASHTAG', hashtag) |
<<<<<<<
const FormTextInput = ({
className,
errorMessage,
name,
onChange,
onKeyPress,
placeholder,
value
}) => (
=======
const FormTextInput = ({className, errorMessage, name, onChange, onFocus, onBlur, placeholder, value}) => (
>>>>>>>
const FormTextInput = ({
className,
errorMessage,
name,
onChange,
onFocus,
onBlur,
onKeyPress,
placeholder,
value
}) => (
<<<<<<<
onChange={onChange}
onKeyPress={onKeyPress}
/>
=======
onChange={onChange}
onFocus={onFocus}
onBlur={onBlur}
/>
>>>>>>>
onChange={onChange}
onKeyPress={onKeyPress}
onFocus={onFocus}
onBlur={onBlur}
/>
<<<<<<<
* Custom callback function to execute when the user presses a keyboard key.
*/
onKeyPress: PropTypes.func,
/**
=======
* Custom function callback to execute when the text input element gets focused.
*/
onFocus: PropTypes.func,
/**
* Custom function callback to execute when the text input element loses the focus.
*/
onBlur: PropTypes.func,
/**
>>>>>>>
* Custom callback function to execute when the user presses a keyboard key.
*/
onKeyPress: PropTypes.func,
/**
* Custom function callback to execute when the text input element gets focused.
*/
onFocus: PropTypes.func,
/**
* Custom function callback to execute when the text input element loses the focus.
*/
onBlur: PropTypes.func,
/** |
<<<<<<<
optionsData = {},
tabIndex
=======
optionsData = {},
selectSize
>>>>>>>
optionsData = {},
selectSize,
tabIndex
<<<<<<<
tabIndex={tabIndex}
=======
size={selectSize}
>>>>>>>
size={selectSize}
tabIndex={tabIndex} |
<<<<<<<
{
bySector,
byTag,
byLocation,
byHeadcount,
byOrgType,
byCapitalType,
byCapitalStrategic,
byCapitalStage,
byCapitalCheckSize,
},
=======
{ byCategory, byTag, byLocation, byHeadcount, byOrgType },
>>>>>>>
{
byCategory,
byTag,
byLocation,
byHeadcount,
byOrgType,
byCapitalType,
byCapitalStrategic,
byCapitalStage,
byCapitalCheckSize,
},
<<<<<<<
const {
bySector,
byTag,
byLocation,
byHeadcount,
byOrgType,
byCapitalType,
byCapitalStrategic,
byCapitalStage,
byCapitalCheckSize,
} = currentFilter
=======
const {
byCategory,
byTag,
byLocation,
byHeadcount,
byOrgType,
} = currentFilter
>>>>>>>
const {
byCategory,
byTag,
byLocation,
byHeadcount,
byOrgType,
byCapitalType,
byCapitalStrategic,
byCapitalStage,
byCapitalCheckSize,
} = currentFilter
<<<<<<<
bySector ||
byTag ||
byLocation ||
byHeadcount ||
byOrgType ||
byCapitalType ||
byCapitalStrategic ||
byCapitalStage ||
byCapitalCheckSize
=======
byCategory || byTag || byLocation || byHeadcount || byOrgType
>>>>>>>
byCategory ||
byTag ||
byLocation ||
byHeadcount ||
byOrgType ||
byCapitalType ||
byCapitalStrategic ||
byCapitalStage ||
byCapitalCheckSize |
<<<<<<<
$('[data-fallback]').on('error', function(){
//console.log('img load failure: ' + $(this).attr('src'));
var fallback = $(this).attr('data-fallback');
$(this).attr('src', fallback);
//console.log('missing img src replaced with: ' + fallback);
});
=======
>>>>>>>
<<<<<<<
=======
$('[data-fallback]').on('error', function(){
var fallback = $(this).attr('data-fallback');
$(this).attr('src', fallback);
});
>>>>>>>
$('[data-fallback]').on('error', function(){
var fallback = $(this).attr('data-fallback');
$(this).attr('src', fallback);
});
<<<<<<<
=======
});
var maskTerm = 'hide';
var unmaskTerm = 'show';
$('.password-field').append('<a class="password-mask" href="#">' + maskTerm + '</a>');
$('input[type="password"]').each(function() {
$(this).changeType($(this), 'text');
});
$('.password-mask').on('click', function(){
var field = $(this).siblings('input[type="password"], input[type="text"]');
if ($(this).html() == unmaskTerm) {
field.changeType(field, 'text')
$(this).html(maskTerm);
} else {
field.changeType(field, 'password');
$(this).html(unmaskTerm);
};
return false;
>>>>>>>
})
var maskTerm = 'hide';
var unmaskTerm = 'show';
$('.password-field').append('<a class="password-mask" href="#">' + maskTerm + '</a>');
$('input[type="password"]').each(function() {
$(this).changeType($(this), 'text');
});
$('.password-mask').on('click', function(){
var field = $(this).siblings('input[type="password"], input[type="text"]');
if ($(this).html() == unmaskTerm) {
field.changeType(field, 'text')
$(this).html(maskTerm);
} else {
field.changeType(field, 'password');
$(this).html(unmaskTerm);
};
return false; |
<<<<<<<
Promise = require('bluebird'),
=======
_ = require('lodash'),
q = require('q'),
>>>>>>>
Promise = require('bluebird'),
_ = require('lodash'),
<<<<<<<
return Promise.resolve(profile);
=======
return q(profile);
},
loadProfiles: function (profileKeys) {
var
profile,
profiles = [];
profileKeys.forEach(profileKey => {
profile = new Profile();
if (profileKey !== 'notfound') {
profile._id = profileKey;
profiles.push(_.assignIn({}, profile));
}
});
return q(profiles);
>>>>>>>
return Promise.resolve(profile);
},
loadProfiles: function (profileKeys) {
var
profile,
profiles = [];
profileKeys.forEach(profileKey => {
profile = new Profile();
if (profileKey !== 'notfound') {
profile._id = profileKey;
profiles.push(_.assignIn({}, profile));
}
});
return Promise.resolve(profiles);
<<<<<<<
});
describe('#load', function () {
=======
>>>>>>> |
<<<<<<<
{
nome: 'Octávio Barbosa',
foto: 'https://avatars2.githubusercontent.com/u/40213753',
nomeDoProjeto: 'Beakmanflix',
url: 'https://beakmanflix.vercel.app/',
tags: [
'curiosidades',
'ciência',
'tecnologia',
'documentários',
],
},
=======
{
nome: 'Jonathan Santos',
foto: 'https://avatars0.githubusercontent.com/u/18014023?s=460&u=37a96704fa38c8ad238e053ea4dda9a97f1ff297&v=4',
nomeDoProjeto: 'JhowFlix',
url: 'https://flix.jhow.io/',
tags: [
'música',
'séries',
'games',
],
},
{
nome: 'Bruno Batalha',
foto: 'https://avatars1.githubusercontent.com/u/33035221?s=460&u=c7648589c95511abcb5e7172eeab23d8cd1b4fab&v=4',
nomeDoProjeto: 'LoLFlix',
url: 'https://lolflix.vercel.app/',
tags: [
'front end',
'jogos',
'league of legends',
],
},
>>>>>>>
{
nome: 'Octávio Barbosa',
foto: 'https://avatars2.githubusercontent.com/u/40213753',
nomeDoProjeto: 'Beakmanflix',
url: 'https://beakmanflix.vercel.app/',
tags: [
'curiosidades',
'ciência',
'tecnologia',
'documentários',
],
},
{
nome: 'Jonathan Santos',
foto: 'https://avatars0.githubusercontent.com/u/18014023?s=460&u=37a96704fa38c8ad238e053ea4dda9a97f1ff297&v=4',
nomeDoProjeto: 'JhowFlix',
url: 'https://flix.jhow.io/',
tags: [
'música',
'séries',
'games',
],
},
{
nome: 'Bruno Batalha',
foto: 'https://avatars1.githubusercontent.com/u/33035221?s=460&u=c7648589c95511abcb5e7172eeab23d8cd1b4fab&v=4',
nomeDoProjeto: 'LoLFlix',
url: 'https://lolflix.vercel.app/',
tags: [
'front end',
'jogos',
'league of legends',
],
}, |
<<<<<<<
{
nome: 'Victor Akio',
foto: 'https://avatars0.githubusercontent.com/u/36519906?s=460&v=4',
nomeDoProjeto: 'Akioflix',
url: 'https://akioflix.vercel.app/',
tags: [
'front end',
'react',
'javascript',
]
},
=======
{
nome: 'William Sousa',
foto: 'https://avatars1.githubusercontent.com/u/28930281?s=460&u=dcfb0a75ba1c812a722b9cd29bd1b892fd990876&v=4',
nomeDoProjeto: 'williamflix',
url: 'https://will-imersao-react.vercel.app/',
tags: [
'Jogos',
'Música',
'Desenvolvimento',
'Geral',
],
},
{
nome: 'Jhonata Galante',
foto: 'https://avatars0.githubusercontent.com/u/16074925?s=460&u=ed25c17c1be881f20d1f59537173f1723d174ddc&v=4',
nomeDoProjeto: 'JhonFlix',
url: 'https://jhonflix-git-master.jhongalante.vercel.app/',
tags: [
'anime',
'amv',
'openings',
'endings',
],
},
{
nome: 'Ismael Oliveira',
foto: 'https://avatars1.githubusercontent.com/u/22065160?s=460&u=5d667bd59df5c926cb0942f03207e50c4e1905ba&v=4',
nomeDoProjeto: 'KelloFlix',
url: 'https://kelloflix.vercel.app/',
tags: [
'front end',
'api',
'tecnologia',
'animes',
'jogos',
'filmes',
],
},
{
nome: 'Augusto Calandrino',
foto: 'https://avatars2.githubusercontent.com/u/22560579?s=460&u=2df440a73ddf28bfafa837364a9ab1bd755a2b20&v=4',
nomeDoProjeto: 'code4gflix',
url: 'https://code-4gflix.vercel.app/',
tags: [
'programação',
'Data Science',
'Front end',
'Business Analytics',
'Business Intelligence',
'filmes',
'música',
],
},
{
nome: 'Simão Freire',
foto: 'https://avatars0.githubusercontent.com/u/51380943?s=460&u=cc6ee09fa9a1598cfe3669207d825bbc16987909&v=4',
nomeDoProjeto: 'simasTV',
url: 'https://simastv.vercel.app/',
tags: [
'Tecnologia',
'Programação',
'Filmes',
'e-Sports',
'Games',
'Animes',
],
},
{
nome: 'Rayon Lindraz Nunes',
redeSocial: 'https://instagram.com/rayonnunes',
foto: 'https://avatars2.githubusercontent.com/u/13816352?s=460&u=951f0beff58adc4c201448b514f5171b98323c10&v=4',
nomeDoProjeto: 'Rayonix',
url: 'https://rayonix.vercel.app/',
tags: [
'ciencia',
'tecnologia',
'filosofia',
'música',
'jogos',
],
},
{
nome: 'Heverton Reis',
foto: 'https://avatars1.githubusercontent.com/u/66853052?s=400&v=4',
nomeDoProjeto: 'HSRMax',
url: 'https://hsrmax.vercel.app/',
tags: [
'ciência',
'música',
'desenhos animados',
'filmes',
'tecnologia',
],
},
{
nome: 'Ciro Moura',
foto: 'https://avatars0.githubusercontent.com/u/28021343?s=460&u=5fb5f38d67fc6ccc26540bbce0718ad05f170db3&v=4',
nomeDoProjeto: 'GuardaVídeos',
url: 'https://guardavideos.vercel.app/',
tags: [
'Filmes',
'Séries',
'Vídeos',
'Desenvolvimento',
'Geral'
]
}
>>>>>>>
{
nome: 'Victor Akio',
foto: 'https://avatars0.githubusercontent.com/u/36519906?s=460&v=4',
nomeDoProjeto: 'Akioflix',
url: 'https://akioflix.vercel.app/',
tags: [
'front end',
'react',
'javascript',
],
},
{
nome: 'William Sousa',
foto: 'https://avatars1.githubusercontent.com/u/28930281?s=460&u=dcfb0a75ba1c812a722b9cd29bd1b892fd990876&v=4',
nomeDoProjeto: 'williamflix',
url: 'https://will-imersao-react.vercel.app/',
tags: [
'Jogos',
'Música',
'Desenvolvimento',
'Geral',
],
},
{
nome: 'Jhonata Galante',
foto: 'https://avatars0.githubusercontent.com/u/16074925?s=460&u=ed25c17c1be881f20d1f59537173f1723d174ddc&v=4',
nomeDoProjeto: 'JhonFlix',
url: 'https://jhonflix-git-master.jhongalante.vercel.app/',
tags: [
'anime',
'amv',
'openings',
'endings',
],
},
{
nome: 'Ismael Oliveira',
foto: 'https://avatars1.githubusercontent.com/u/22065160?s=460&u=5d667bd59df5c926cb0942f03207e50c4e1905ba&v=4',
nomeDoProjeto: 'KelloFlix',
url: 'https://kelloflix.vercel.app/',
tags: [
'front end',
'api',
'tecnologia',
'animes',
'jogos',
'filmes',
],
},
{
nome: 'Augusto Calandrino',
foto: 'https://avatars2.githubusercontent.com/u/22560579?s=460&u=2df440a73ddf28bfafa837364a9ab1bd755a2b20&v=4',
nomeDoProjeto: 'code4gflix',
url: 'https://code-4gflix.vercel.app/',
tags: [
'programação',
'Data Science',
'Front end',
'Business Analytics',
'Business Intelligence',
'filmes',
'música',
],
},
{
nome: 'Simão Freire',
foto: 'https://avatars0.githubusercontent.com/u/51380943?s=460&u=cc6ee09fa9a1598cfe3669207d825bbc16987909&v=4',
nomeDoProjeto: 'simasTV',
url: 'https://simastv.vercel.app/',
tags: [
'Tecnologia',
'Programação',
'Filmes',
'e-Sports',
'Games',
'Animes',
],
},
{
nome: 'Rayon Lindraz Nunes',
redeSocial: 'https://instagram.com/rayonnunes',
foto: 'https://avatars2.githubusercontent.com/u/13816352?s=460&u=951f0beff58adc4c201448b514f5171b98323c10&v=4',
nomeDoProjeto: 'Rayonix',
url: 'https://rayonix.vercel.app/',
tags: [
'ciencia',
'tecnologia',
'filosofia',
'música',
'jogos',
],
},
{
nome: 'Heverton Reis',
foto: 'https://avatars1.githubusercontent.com/u/66853052?s=400&v=4',
nomeDoProjeto: 'HSRMax',
url: 'https://hsrmax.vercel.app/',
tags: [
'ciência',
'música',
'desenhos animados',
'filmes',
'tecnologia',
],
},
{
nome: 'Ciro Moura',
foto: 'https://avatars0.githubusercontent.com/u/28021343?s=460&u=5fb5f38d67fc6ccc26540bbce0718ad05f170db3&v=4',
nomeDoProjeto: 'GuardaVídeos',
url: 'https://guardavideos.vercel.app/',
tags: [
'Filmes',
'Séries',
'Vídeos',
'Desenvolvimento',
'Geral',
],
}, |
<<<<<<<
const
Promise = require('bluebird'),
=======
var
Bluebird = require('bluebird'),
>>>>>>>
const
Bluebird = require('bluebird'), |
<<<<<<<
{
nome: 'Francisco Noberto',
foto: 'https://avatars2.githubusercontent.com/u/32619479?s=460&u=73445bb9ec11dd30e838bc7f9f2c7c8a6b0ab2d3&v=4',
nomeDoProjeto: 'Mineflix',
url: 'https://imersao-aluraflix-1bldplo65.vercel.app/',
tags: [
'minecraft',
'Jogos',
'pixelart',
],
},
=======
{
nome: 'Augusto Pedro Gomes',
foto: 'https://avatars2.githubusercontent.com/u/52221457?s=460&v=4',
nomeDoProjeto: 'My Top List',
url: 'https://mytoplist.vercel.app/',
tags: [
'Jogos',
'Música',
'Filmes',
'Geral',
'Séries',
'Cult',
'Brasil',
'Switch',
'Playstation',
'Xbox'
]
},
{
nome: 'Rodrigo Aramburu',
foto: 'https://avatars1.githubusercontent.com/u/389627?s=460&v=4',
nomeDoProjeto: 'rpgflix',
url: 'https://rpgflix.vercel.app/',
tags: [
'RPG',
'lives'
]
},
{
nome: 'Vanessa Ribeiro Koch',
foto: 'https://avatars1.githubusercontent.com/u/49540299?s=460&u=f88ab6da79935e30fc189625bfb9e46301e32f23&v=4',
nomeDoProjeto: 'healthflix',
url: 'https://healthflix.vercel.app/',
tags: [
'saúde',
'quarentena',
'vida saudável',
],
},
>>>>>>>
{
nome: 'Augusto Pedro Gomes',
foto: 'https://avatars2.githubusercontent.com/u/52221457?s=460&v=4',
nomeDoProjeto: 'My Top List',
url: 'https://mytoplist.vercel.app/',
tags: [
'Jogos',
'Música',
'Filmes',
'Geral',
'Séries',
'Cult',
'Brasil',
'Switch',
'Playstation',
'Xbox'
]
},
{
nome: 'Rodrigo Aramburu',
foto: 'https://avatars1.githubusercontent.com/u/389627?s=460&v=4',
nomeDoProjeto: 'rpgflix',
url: 'https://rpgflix.vercel.app/',
tags: [
'RPG',
'lives'
]
},
{
nome: 'Vanessa Ribeiro Koch',
foto: 'https://avatars1.githubusercontent.com/u/49540299?s=460&u=f88ab6da79935e30fc189625bfb9e46301e32f23&v=4',
nomeDoProjeto: 'healthflix',
url: 'https://healthflix.vercel.app/',
tags: [
'saúde',
'quarentena',
'vida saudável',
],
},
{
nome: 'Francisco Noberto',
foto: 'https://avatars2.githubusercontent.com/u/32619479?s=460&u=73445bb9ec11dd30e838bc7f9f2c7c8a6b0ab2d3&v=4',
nomeDoProjeto: 'Mineflix',
url: 'https://imersao-aluraflix-1bldplo65.vercel.app/',
tags: [
'minecraft',
'Jogos',
'pixelart',
],
}, |
<<<<<<<
cah.$.AjaxOperation.BAN = "b";
=======
cah.$.AjaxOperation.SCORE = "SC";
>>>>>>>
cah.$.AjaxOperation.BAN = "b";
cah.$.AjaxOperation.SCORE = "SC"; |
<<<<<<<
case 'sync':
if (game_id !== null) {
var game = cah.currentGames[game_id];
if (game) {
game.removeAllCards();
}
ajax = cah.Ajax.build(cah.$.AjaxOperation.GET_CARDS).withGameId(game_id);
} else {
cah.log.error("This command only works in a game.");
}
break;
=======
case 'score':
ajax = cah.Ajax.build(cah.$.AjaxOperation.SCORE).withMessage(text);
if (game_id != null) {
ajax = ajax.withGameId(game_id);
}
break;
>>>>>>>
case 'sync':
if (game_id !== null) {
var game = cah.currentGames[game_id];
if (game) {
game.removeAllCards();
}
ajax = cah.Ajax.build(cah.$.AjaxOperation.GET_CARDS).withGameId(game_id);
} else {
cah.log.error("This command only works in a game.");
}
break;
case 'score':
ajax = cah.Ajax.build(cah.$.AjaxOperation.SCORE).withMessage(text);
if (game_id != null) {
ajax = ajax.withGameId(game_id);
}
break; |
<<<<<<<
should: function (roomId, index, collection, filters, not) {
var deferred = q.defer();
getFormattedFilters(roomId, index, collection, filters, not)
.then(function (formattedFilters) {
if (not) {
deferred.resolve({and: formattedFilters});
}
else {
deferred.resolve({or: formattedFilters});
}
})
.catch(function (error) {
deferred.reject(error);
});
=======
should: function (roomId, collection, filters, not) {
if (not) {
return this.and(roomId, collection, filters, not);
}
>>>>>>>
should: function (roomId, index, collection, filters, not) {
if (not) {
return this.and(roomId, index, collection, filters, not);
}
<<<<<<<
function termFunction(termType, roomId, index, collection, filter, not) {
=======
function termFunction (termType, roomId, collection, filter, not) {
>>>>>>>
function termFunction(termType, roomId, index, collection, filter, not) { |
<<<<<<<
init () {
return this.kuzzle.internalEngine.listIndexes()
=======
init() {
return this.kuzzle.internalEngine.listIndexes()
>>>>>>>
init () {
return this.kuzzle.internalEngine.listIndexes()
<<<<<<<
add (index, collection, notify) {
=======
add(index, collection, notify = true) {
>>>>>>>
add (index, collection, notify = true) {
<<<<<<<
exists (index, collection) {
=======
exists(index, collection) {
>>>>>>>
exists (index, collection) {
<<<<<<<
remove (index, collection, notify) {
let
modified = false;
notify = (notify === undefined) || notify;
=======
remove(index, collection, notify = true) {
let modified = false;
>>>>>>>
remove (index, collection, notify = true) {
let
modified = false;
<<<<<<<
reset (index, notify) {
notify = (notify === undefined) || notify;
=======
reset(index, notify = true) {
>>>>>>>
reset (index, notify = true) {
<<<<<<<
}
}
=======
}
}
>>>>>>>
}
} |
<<<<<<<
var updateTwistyCallback = function(twisty) {
twisty["3d"].rotation.z += 0.01;
};
=======
// If we get here successfully, do it again!
if (animating || timing) {
animationLooping = true;
requestAnimationFrame(function() {animate(true);});
} else {
animationLooping = false;
}
>>>>>>>
var updateTwistyCallback = function(twisty) {
twisty["3d"].rotation.z += 0.01;
};
// If we get here successfully, do it again!
if (animating || timing) {
animationLooping = true;
requestAnimationFrame(function() {animate(true);});
} else {
animationLooping = false;
}
<<<<<<<
"scale": 1,
};
// Passed Parameters
for (option in cubeOptions) {
if(option in twistyParameters) {
log("Setting option \"" + option + "\" to " + twistyParameters[option]);
cubeOptions[option] = twistyParameters[option];
}
=======
"scale": 1,
"stickerBorder": true
};
// Passed Parameters
for (option in cubeOptions) {
if(option in twistyParameters) {
log("Setting option \"" + option + "\" to " + twistyParameters[option]);
cubeOptions[option] = twistyParameters[option];
>>>>>>>
"scale": 1,
};
// Passed Parameters
for (option in cubeOptions) {
if(option in twistyParameters) {
log("Setting option \"" + option + "\" to " + twistyParameters[option]);
cubeOptions[option] = twistyParameters[option];
}
};
// Cube Constants
var numSides = 6;
// Cube Materials
var materials = [];
var blackMaterial = new THREE.MeshLambertMaterial( { color: 0x000000 } );
blackMaterial.opacity = cubeOptions["opacity"];
for (var i = 0; i < numSides; i++) {
var material = new THREE.MeshLambertMaterial( { color: cubeOptions["faceColors"][i]} );
material.opacity = cubeOptions["opacity"];
materials.push(material); |
<<<<<<<
import Dashboard from './src/screens/Dashboard';
=======
import Register from './src/screens/Register';
>>>>>>>
import Dashboard from './src/screens/Dashboard';
import Register from './src/screens/Register';
<<<<<<<
navigationOptions: { drawerLabel: 'Presentation Screen' }
},
Dashboard: {
screen: Dashboard,
navigationOptions: { drawerLabel: 'Dashboard Screen' }
},
=======
navigationOptions: { drawerLabel: 'Presentation Screen' },
},
Register: {
screen: Register,
navigationOptions: {
drawerLabel: 'Register Screen',
},
},
>>>>>>>
navigationOptions: { drawerLabel: 'Presentation Screen' }
},
Register: {
screen: Register,
navigationOptions: {
drawerLabel: 'Register Screen',
},
},
Dashboard: {
screen: Dashboard,
navigationOptions: { drawerLabel: 'Dashboard Screen' }
}, |
<<<<<<<
import { Card, Typography, NavBar } from '..';
=======
import { Card, Text, NavBar } from '../';
>>>>>>>
import { Card, Text, NavBar } from '..'; |
<<<<<<<
import { Typography, Button } from '..';
=======
import { Text, Button } from '../';
>>>>>>>
import { Text, Button } from '..'; |
<<<<<<<
import {
Button, Icon, Typography, NavBar,
} from '..';
=======
import { Button, Icon, Text, NavBar } from '../';
>>>>>>>
import { Button, Icon, Text, NavBar } from '../';
<<<<<<<
<View style={{ flex: 1 }}>
<Typography h5>{props.title}</Typography>
<Typography muted>{props.subtitle}</Typography>
=======
<View style={{flex: 1}}>
<Text h5>{props.title}</Text>
<Text muted>{props.subtitle}</Text>
>>>>>>>
<View style={{ flex: 1 }}>
<Text h5>{props.title}</Text>
<Text muted>{props.subtitle}</Text> |
<<<<<<<
if(number === -1){
=======
if (number == -1) {
>>>>>>>
if (number === -1) {
<<<<<<<
if(value === "STUDENTS") {
=======
if (value == "STUDENTS") {
>>>>>>>
if (value === "STUDENTS") {
<<<<<<<
if($(tdElements).parent().prop("tagName") === "tr"){
=======
if ($(tdElements).parent().prop("tagName") == "tr") {
>>>>>>>
if ($(tdElements).parent().prop("tagName") === "tr") {
<<<<<<<
if($(tdElements).parent().prop("tagName") === "hide"){
=======
if ($(tdElements).parent().prop("tagName") == "hide") {
>>>>>>>
if ($(tdElements).parent().prop("tagName") === "hide") {
<<<<<<<
function feedbackRecipientUpdateVisibilityOptions(el){
if($(el).val() === "OWN_TEAM" || $(el).val() === "TEAMS" || $(el).val() === "INSTRUCTORS" || $(el).val() === "OWN_TEAM_MEMBERS"){
=======
function feedbackRecipientUpdateVisibilityOptions(el) {
if ($(el).val() == "OWN_TEAM" || $(el).val() == "TEAMS" || $(el).val() == "INSTRUCTORS" || $(el).val() == "OWN_TEAM_MEMBERS") {
>>>>>>>
function feedbackRecipientUpdateVisibilityOptions(el) {
if ($(el).val() === "OWN_TEAM" || $(el).val() === "TEAMS" || $(el).val() === "INSTRUCTORS" || $(el).val() === "OWN_TEAM_MEMBERS") {
<<<<<<<
}else if($(el).val() === "NONE"){
=======
} else if($(el).val() == "NONE") {
>>>>>>>
} else if($(el).val() === "NONE") {
<<<<<<<
function feedbackGiverUpdateVisibilityOptions(el){
if($(el).val() === "INSTRUCTORS" || $(el).val() === "TEAMS"){
=======
function feedbackGiverUpdateVisibilityOptions(el) {
if ($(el).val() == "INSTRUCTORS" || $(el).val() == "TEAMS") {
>>>>>>>
function feedbackGiverUpdateVisibilityOptions(el){
if ($(el).val() === "INSTRUCTORS" || $(el).val() === "TEAMS") {
<<<<<<<
if(typeof input === 'undefined'){
=======
if (typeof input == 'undefined') {
>>>>>>>
if (typeof input === 'undefined') {
<<<<<<<
idOfQuestion = '#form_editquestion-' + questionNumber;
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
if($(idOfQuestion).attr('editStatus') === "hasResponses") {
=======
if ($(idOfQuestion).attr('editStatus') == "hasResponses") {
>>>>>>>
if ($(idOfQuestion).attr('editStatus') === "hasResponses") {
<<<<<<<
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
idOfQuestion = '#form_editquestion-' + questionNumber;
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
if($(idOfQuestion).attr('editStatus') === "hasResponses") {
=======
if ($(idOfQuestion).attr('editStatus') == "hasResponses") {
>>>>>>>
if ($(idOfQuestion).attr('editStatus') === "hasResponses") {
<<<<<<<
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
if(min.toString() === "NaN" || max.toString() === "NaN" || step.toString() === "NaN"){
=======
if (min.toString() == "NaN" || max.toString() == "NaN" || step.toString() == "NaN") {
>>>>>>>
if (min.toString() === "NaN" || max.toString() === "NaN" || step.toString() === "NaN") {
<<<<<<<
if(questionNumber === -1){
=======
if (questionNumber == -1) {
>>>>>>>
if (questionNumber === -1) {
<<<<<<<
idOfQuestion = '#form_editquestion-' + questionNumber;
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
if($(idOfQuestion).attr('editStatus') === "hasResponses") {
=======
if ($(idOfQuestion).attr('editStatus') == "hasResponses") {
>>>>>>>
if ($(idOfQuestion).attr('editStatus') === "hasResponses") {
<<<<<<<
if(questionNumber === -1){
=======
if (questionNumber == -1) {
>>>>>>>
if (questionNumber === -1) {
<<<<<<<
idOfQuestion = '#form_editquestion-' + questionNumber;
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
>>>>>>>
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
if($(idOfQuestion).attr('editStatus') === "hasResponses") {
$(idOfQuestion).attr('editStatus', "mustDeleteResponses");
=======
// count number of child rows the table have and - 1 because of add option button
var numberOfOptions = $thisRow.parent().children('div').length - 1;
if (numberOfOptions <= 1) {
$thisRow.find('input').val('');
} else {
$thisRow.remove();
if ($(idOfQuestion).attr('editStatus') === 'hasResponses') {
$(idOfQuestion).attr('editStatus', 'mustDeleteResponses');
}
>>>>>>>
// count number of child rows the table have and - 1 because of add option button
var numberOfOptions = $thisRow.parent().children('div').length - 1;
if (numberOfOptions <= 1) {
$thisRow.find('input').val('');
} else {
$thisRow.remove();
if ($(idOfQuestion).attr('editStatus') === 'hasResponses') {
$(idOfQuestion).attr('editStatus', 'mustDeleteResponses');
}
<<<<<<<
if ($(this).prop('checked') === false) {
if($(this).val() === 'RECEIVER' || $(this).val() === 'OWN_TEAM_MEMBERS' || $(this).val() === 'RECEIVER_TEAM_MEMBERS'){
=======
if ($(this).prop('checked') == false) {
if ($(this).val() == 'RECEIVER' || $(this).val() == 'OWN_TEAM_MEMBERS' || $(this).val() == 'RECEIVER_TEAM_MEMBERS') {
>>>>>>>
if ($(this).prop('checked') === false) {
if ($(this).val() === 'RECEIVER' || $(this).val() === 'OWN_TEAM_MEMBERS' || $(this).val() === 'RECEIVER_TEAM_MEMBERS') {
<<<<<<<
if($(this).val() === 'RECEIVER' || $(this).val() === 'OWN_TEAM_MEMBERS' || $(this).val() === 'RECEIVER_TEAM_MEMBERS'){
=======
if ($(this).val() == 'RECEIVER' || $(this).val() == 'OWN_TEAM_MEMBERS' || $(this).val() == 'RECEIVER_TEAM_MEMBERS') {
>>>>>>>
if ($(this).val() === 'RECEIVER' || $(this).val() === 'OWN_TEAM_MEMBERS' || $(this).val() === 'RECEIVER_TEAM_MEMBERS') {
<<<<<<<
idOfQuestion = '#form_editquestion-' + questionNumber;
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber == -1){
>>>>>>>
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1){
<<<<<<<
if($(idOfQuestion).attr('editStatus') === "hasResponses") {
=======
if ($(idOfQuestion).attr('editStatus') == "hasResponses") {
>>>>>>>
if ($(idOfQuestion).attr('editStatus') === "hasResponses") {
<<<<<<<
idOfQuestion = '#form_editquestion-' + questionNumber;
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) {
<<<<<<<
if($(idOfQuestion).attr('editStatus') === "hasResponses") {
=======
if ($(idOfQuestion).attr('editStatus') == "hasResponses") {
>>>>>>>
if ($(idOfQuestion).attr('editStatus') === "hasResponses") {
<<<<<<<
idOfQuestion = '#form_editquestion-' + questionNumber;
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1){
>>>>>>>
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1){
<<<<<<<
idOfQuestion = '#form_editquestion-' + questionNumber;
idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if(questionNumber === -1){
=======
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber == -1) {
>>>>>>>
var idOfQuestion = '#form_editquestion-' + questionNumber;
var idSuffix = (questionNumber > 0) ? ("-" + questionNumber) : "";
if (questionNumber === -1) { |
<<<<<<<
capturedFramesRaw = [],
totalFrames = 0,
=======
capturedFrames = [],
curFrame = 0,
>>>>>>>
capturedFrames = [],
totalFrames = 0,
<<<<<<<
capturedFramesRaw.splice(id - 1, 1);
totalFrames--;
=======
capturedFrames.splice(id - 1, 1);
curFrame--;
>>>>>>>
capturedFrames.splice(id - 1, 1);
totalFrames--;
<<<<<<<
if (totalFrames > 0) {
onionSkinWindow.setAttribute("src", capturedFramesRaw[totalFrames - 1]);
=======
if (curFrame > 0) {
onionSkinWindow.setAttribute("src", capturedFrames[curFrame - 1]);
>>>>>>>
if (totalFrames > 0) {
onionSkinWindow.setAttribute("src", capturedFrames[totalFrames - 1]);
<<<<<<<
capturedFramesRaw.push(data);
totalFrames++;
console.info(`Captured frame: ${data.slice(100, 120)} There are now: ${totalFrames} frames`);
=======
capturedFrames.push(data);
curFrame++;
console.info(`Captured frame: ${data.slice(100, 120)} There are now: ${curFrame} frames`);
>>>>>>>
capturedFrames.push(data);
totalFrames++;
console.info(`Captured frame: ${data.slice(100, 120)} There are now: ${totalFrames} frames`);
<<<<<<<
playback.setAttribute("src", capturedFramesRaw[totalFrames - 1]);
=======
playback.setAttribute("src", capturedFrames[curFrame - 1]);
>>>>>>>
playback.setAttribute("src", capturedFrames[totalFrames - 1]);
<<<<<<<
playback.setAttribute("src", capturedFramesRaw[curPlayFrame]);
_updateStatusBarCurFrame(curPlayFrame + 1);
=======
playback.setAttribute("src", capturedFrames[curPlayFrame]);
statusBarCurFrame.innerHTML = curPlayFrame + 1;
>>>>>>>
playback.setAttribute("src", capturedFrames[curPlayFrame]);
_updateStatusBarCurFrame(curPlayFrame + 1); |
<<<<<<<
=======
isPlaying = false;
>>>>>>>
<<<<<<<
/**
* Update the frame displays and frame stats.
*/
function updateFrameReel(action, id) {
"use strict";
var imagePreview = document.querySelector(`#lastCapturedFrame${id}`);
// Display number of captured frames in status bar
statusBarFrameNum.innerHTML = `${curFrame} ${curFrame === 1 ? "frame" : "frames"} captured`;
// Get a link to the last captured frame
var curFrameData = capturedFramesRaw[curFrame - 1];
// Update onion skinning frame
onionSkinWindow.setAttribute("src", curFrameData);
// Display the image preview only if we can
// TODO If ID > 5, still display it
if (id <= 5) {
// Frame additon
if (action === "create") {
imagePreview.setAttribute("src", curFrameData);
}
// Last frame undo
else if (action === "delete") {
imagePreview.setAttribute("src", "blanksquare.png");
}
=======
function updateFrameReel(action, id) {
"use strict";
// Display number of captured frames in status bar
statusBarFrameNum.innerHTML = `${curFrame} ${curFrame === 1 ? "frame" : "frames"} captured`;
// Add the newly captured frame
if (action === "capture") {
frameReelRow.insertAdjacentHTML("beforeend", `<td><div class="frame-reel-preview">
<img class="frame-reel-img" id="img-${id}" title="Expand image" width="160" height="120" src="${capturedFramesRaw[id - 1]}">
<img class="btn-frame-delete" title="Delete image" width="20" height="20" src="icons/delete.png">
</div></td>`);
// Individual frame deletion
var insertedImage = document.querySelector(`.frame-reel-img#img-${id}`);
insertedImage.nextElementSibling.addEventListener("click", function() {
deleteFrame(id);
});
// Deference the selector to reduce memory usage
insertedImage = null;
// Remove the chosen frame
} else if (action === "delete") {
frameReelRow.removeChild(frameReelRow.children[id - 1]);
}
// We have frames, display them
if (curFrame > 0) {
frameReelMsg.classList.add("hidden");
frameReelTable.classList.remove("hidden");
// All the frames were deleted, display "No frames" message
} else {
frameReelMsg.classList.remove("hidden");
frameReelTable.classList.add("hidden");
frameReelRow.innerHTML = "";
>>>>>>>
function updateFrameReel(action, id) {
"use strict";
// Display number of captured frames in status bar
statusBarFrameNum.innerHTML = `${curFrame} ${curFrame === 1 ? "frame" : "frames"} captured`;
// Add the newly captured frame
if (action === "capture") {
frameReelRow.insertAdjacentHTML("beforeend", `<td><div class="frame-reel-preview">
<img class="frame-reel-img" id="img-${id}" title="Expand image" width="160" height="120" src="${capturedFramesRaw[id - 1]}">
<img class="btn-frame-delete" title="Delete image" width="20" height="20" src="icons/delete.png">
</div></td>`);
// Individual frame deletion
var insertedImage = document.querySelector(`.frame-reel-img#img-${id}`);
insertedImage.nextElementSibling.addEventListener("click", function() {
deleteFrame(id);
});
// Deference the selector to reduce memory usage
insertedImage = null;
// Remove the chosen frame
} else if (action === "delete") {
frameReelRow.removeChild(frameReelRow.children[id - 1]);
}
// We have frames, display them
if (curFrame > 0) {
frameReelMsg.classList.add("hidden");
frameReelTable.classList.remove("hidden");
// All the frames were deleted, display "No frames" message
} else {
frameReelMsg.classList.remove("hidden");
frameReelTable.classList.add("hidden");
frameReelRow.innerHTML = "";
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
updateFrameReel("delete", id);
>>>>>>>
<<<<<<<
function takePicture() {
"use strict";
// We are not able to take a picture
if (!(width && height)) {
clearPhoto();
=======
// Capture a photo by fetching the current contents of the video
// and drawing it into a canvas, then converting that to a PNG
// format data URL. By drawing it on an offscreen canvas and then
// drawing that to the screen, we can change its size and/or apply
// other changes before drawing it.
function takepicture() {
if (width && height) {
var context = canvas.getContext('2d');
canvas.width = width;
canvas.height = height;
context.drawImage(video, 0, 0, width, height);
var data = canvas.toDataURL('image/png');
photo.setAttribute('src', data);
//add frame to list of imgs
capturedFramesList.push("<img class='capturedFramesItem' id='" + noOfFrames + "' src='" + data + "'>");
//add frame to list of img srcs
capturedFramesRaw.push(data);
curFrame++;
console.info('Captured frame: ' + data.slice(100, 120) + ' There are now: ' + (noOfFrames + 1) + ' frames');
saveFrame(curFrame);
updateFrameReel("capture", curFrame);
} else {
clearPhoto();
}
>>>>>>>
function takePicture() {
"use strict";
// We are not able to take a picture
if (!(width && height)) {
clearPhoto(); |
<<<<<<<
captureAudio = "audio/camera.wav",
audioToggle = document.querySelector("#audio-toggle"),
=======
captureAudio = new Audio("audio/camera.wav"),
playAudio = true,
>>>>>>>
captureAudio = "audio/camera.wav",
playAudio = true,
<<<<<<<
function audio(file) {
"use strict";
if (audioToggle.checked) {
var audio = new Audio(file);
audio.play();
}
=======
function audio(name) {
"use strict";
if (playAudio) {
name.play();
}
>>>>>>>
function audio(file) {
"use strict";
if (playAudio) {
var audio = new Audio(file);
audio.play();
} |
<<<<<<<
// Returns `true` if the current application is running.
=======
// Returns a boolean of weather the current application is running.
>>>>>>>
// Returns a boolean of weather the current application is running.
<<<<<<<
Sammy.RenderContext = function(event_context) {
this.event_context = event_context;
this.callbacks = [];
this.previous_content = null;
this.content = null;
this.waiting = false;
};
$.extend(Sammy.RenderContext.prototype, {
load: function(path, params, callback) {
var context = this;
return this.then(function() {
if ($.isFunction(params)) {
callback = params;
params = {};
}
// var cached = this.event_context.app.remoteCache(path);
// if (cached) {
//
// } else {
//
// }
this.wait();
if (callback) { this.then(callback); }
$.get(path, params, function(data) {
context.content = data;
context.next();
});
return false;
});
},
render: function(path, data, callback) {
return this.load(path).interpolate(data, path).then(callback);
},
collect: function(array, callback) {
var context = this;
return this.then(function() {
var contents = "";
$.each(array, function(i, item) {
var returned = callback.apply(context, [i, item]);
contents += returned;
return returned;
});
return contents;
});
},
renderEach: function(path, name, data, callback) {
if ($.isArray(name)) {
callback = data;
data = name;
name = null;
}
return this.load(path).collect(data, function(i, value) {
var idata = {};
name ? (idata[name] = value) : (idata = value);
return this.event_context.interpolate(this.content, idata, path);
});
},
then: function(callback) {
if ($.isFunction(callback)) {
if (this.waiting) {
this.callbacks.push(callback);
} else {
this.wait();
var returned = callback.apply(this, [this.content, this.previous_content]);
if (returned !== false) {
if (typeof returned !== 'undefined') {
this.previous_content = this.content;
this.content = returned;
}
this.next();
}
}
}
return this;
},
interpolate: function(data, engine, retain) {
var context = this;
return this.then(function(content, prev) {
var rendered = context.event_context.interpolate(content, data, engine);
return retain ? prev + rendered : rendered;
});
},
swap: function() {
return this.then(function(content) {
this.event_context.swap(content);
});
},
appendTo: function(selector) {
return this.then(function(content) {
$(selector).append(content);
});
},
replace: function(selector) {
return this.then(function(content) {
$(selector).html(content);
});
},
wait: function() {
this.waiting = true;
},
next: function() {
this.waiting = false;
if (this.callbacks.length > 0) {
this.then(this.callbacks.shift());
}
}
});
// `Sammy.EventContext` objects are created every time a route is run or a
=======
// `Sammy.EventContext` objects are created every time a route is run or a
>>>>>>>
Sammy.RenderContext = function(event_context) {
this.event_context = event_context;
this.callbacks = [];
this.previous_content = null;
this.content = null;
this.waiting = false;
};
$.extend(Sammy.RenderContext.prototype, {
load: function(path, params, callback) {
var context = this;
return this.then(function() {
if ($.isFunction(params)) {
callback = params;
params = {};
}
// var cached = this.event_context.app.remoteCache(path);
// if (cached) {
//
// } else {
//
// }
this.wait();
if (callback) { this.then(callback); }
$.get(path, params, function(data) {
context.content = data;
context.next();
});
return false;
});
},
render: function(path, data, callback) {
return this.load(path).interpolate(data, path).then(callback);
},
collect: function(array, callback) {
var context = this;
return this.then(function() {
var contents = "";
$.each(array, function(i, item) {
var returned = callback.apply(context, [i, item]);
contents += returned;
return returned;
});
return contents;
});
},
renderEach: function(path, name, data, callback) {
if ($.isArray(name)) {
callback = data;
data = name;
name = null;
}
return this.load(path).collect(data, function(i, value) {
var idata = {};
name ? (idata[name] = value) : (idata = value);
return this.event_context.interpolate(this.content, idata, path);
});
},
then: function(callback) {
if ($.isFunction(callback)) {
if (this.waiting) {
this.callbacks.push(callback);
} else {
this.wait();
var returned = callback.apply(this, [this.content, this.previous_content]);
if (returned !== false) {
if (typeof returned !== 'undefined') {
this.previous_content = this.content;
this.content = returned;
}
this.next();
}
}
}
return this;
},
interpolate: function(data, engine, retain) {
var context = this;
return this.then(function(content, prev) {
var rendered = context.event_context.interpolate(content, data, engine);
return retain ? prev + rendered : rendered;
});
},
swap: function() {
return this.then(function(content) {
this.event_context.swap(content);
});
},
appendTo: function(selector) {
return this.then(function(content) {
$(selector).append(content);
});
},
replace: function(selector) {
return this.then(function(content) {
$(selector).html(content);
});
},
wait: function() {
this.waiting = true;
},
next: function() {
this.waiting = false;
if (this.callbacks.length > 0) {
this.then(this.callbacks.shift());
}
}
});
// `Sammy.EventContext` objects are created every time a route is run or a
<<<<<<<
engineFor: function(path) {
var context = this,
engine;
// if path is actually an engine function just return it
if ($.isFunction(path)) { return path; }
// lookup engine name by path extension
if ((engine = path.match(/\.([^\.]+)$/))) { engine = engine[1]; }
// set the engine to the default template engine if no match is found
if ((!engine || !$.isFunction(context[engine])) && context.app.template_engine) {
engine = context.app.template_engine;
}
if (engine && !$.isFunction(engine) && $.isFunction(context[engine])) {
engine = context[engine];
}
return engine;
},
interpolate: function(content, data, engine) {
return this.engineFor(engine).apply(this, [content, data]);
},
=======
>>>>>>>
engineFor: function(path) {
var context = this,
engine;
// if path is actually an engine function just return it
if ($.isFunction(path)) { return path; }
// lookup engine name by path extension
if ((engine = path.match(/\.([^\.]+)$/))) { engine = engine[1]; }
// set the engine to the default template engine if no match is found
if ((!engine || !$.isFunction(context[engine])) && context.app.template_engine) {
engine = context.app.template_engine;
}
if (engine && !$.isFunction(engine) && $.isFunction(context[engine])) {
engine = context[engine];
}
return engine;
},
interpolate: function(content, data, engine) {
return this.engineFor(engine).apply(this, [content, data]);
},
<<<<<<<
//
partial: function(path, data) {
return this.render(path, data).swap();
// var file_data,
// wrapped_callback,
// engine,
// data_array,
// cache_key = 'partial:' + path,
// context = this;
//
// // engine setup
// if ((engine = path.match(/\.([^\.]+)$/))) { engine = engine[1]; }
// // set the engine to the default template engine if no match is found
// if ((!engine || !$.isFunction(context[engine])) && this.app.template_engine) {
// engine = this.app.template_engine;
// }
// if (engine && !$.isFunction(engine) && $.isFunction(context[engine])) {
// engine = context[engine];
// }
// if (!callback && $.isFunction(data)) {
// // callback is in the data position
// callback = data;
// data = {};
// }
// data_array = ($.isArray(data) ? data : [data || {}]);
// wrapped_callback = function(response) {
// var new_content = response,
// all_content = "";
// $.each(data_array, function(i, idata) {
// if ($.isFunction(engine)) {
// new_content = engine.apply(context, [response, idata]);
// }
// // collect the content
// all_content += new_content;
// // if callback exists call it for each iteration
// if (callback) {
// // return the result of the callback
// // (you can bail the loop by returning false)
// return callback.apply(context, [new_content, i]);
// }
// });
// if (!callback) { context.swap(all_content); }
// context.trigger('changed');
// };
// if (this.app.cache_partials && this.cache(cache_key)) {
// // try to load the template from the cache
// wrapped_callback.apply(context, [this.cache(cache_key)]);
// } else {
// // the template wasnt cached, we need to fetch it
// $.get(path, function(response) {
// if (context.app.cache_partials) { context.cache(cache_key, response); }
// wrapped_callback.apply(context, [response]);
// });
// }
=======
//
partial: function(path, data, callback) {
var file_data,
wrapped_callback,
engine,
data_array,
cache_key = 'partial:' + path,
context = this;
// engine setup
if ((engine = path.match(/\.([^\.]+)$/))) { engine = engine[1]; }
// set the engine to the default template engine if no match is found
if ((!engine || !_isFunction(context[engine])) && this.app.template_engine) {
engine = this.app.template_engine;
}
if (engine && !_isFunction(engine) && _isFunction(context[engine])) {
engine = context[engine];
}
if (!callback && _isFunction(data)) {
// callback is in the data position
callback = data;
data = {};
}
data_array = (_isArray(data) ? data : [data || {}]);
wrapped_callback = function(response) {
var new_content = response,
all_content = "";
$.each(data_array, function(i, idata) {
if (_isFunction(engine)) {
new_content = engine.apply(context, [response, idata]);
}
// collect the content
all_content += new_content;
// if callback exists call it for each iteration
if (callback) {
// return the result of the callback
// (you can bail the loop by returning false)
return callback.apply(context, [new_content, i]);
}
});
if (!callback) { context.swap(all_content); }
context.trigger('changed');
};
if (this.app.cache_partials && this.cache(cache_key)) {
// try to load the template from the cache
wrapped_callback.apply(context, [this.cache(cache_key)]);
} else {
// the template wasnt cached, we need to fetch it
$.get(path, function(response) {
if (context.app.cache_partials) { context.cache(cache_key, response); }
wrapped_callback.apply(context, [response]);
});
}
>>>>>>>
//
partial: function(path, data) {
return this.render(path, data).swap();
// var file_data,
// wrapped_callback,
// engine,
// data_array,
// cache_key = 'partial:' + path,
// context = this;
//
// // engine setup
// if ((engine = path.match(/\.([^\.]+)$/))) { engine = engine[1]; }
// // set the engine to the default template engine if no match is found
// if ((!engine || !$.isFunction(context[engine])) && this.app.template_engine) {
// engine = this.app.template_engine;
// }
// if (engine && !$.isFunction(engine) && $.isFunction(context[engine])) {
// engine = context[engine];
// }
// if (!callback && $.isFunction(data)) {
// // callback is in the data position
// callback = data;
// data = {};
// }
// data_array = ($.isArray(data) ? data : [data || {}]);
// wrapped_callback = function(response) {
// var new_content = response,
// all_content = "";
// $.each(data_array, function(i, idata) {
// if ($.isFunction(engine)) {
// new_content = engine.apply(context, [response, idata]);
// }
// // collect the content
// all_content += new_content;
// // if callback exists call it for each iteration
// if (callback) {
// // return the result of the callback
// // (you can bail the loop by returning false)
// return callback.apply(context, [new_content, i]);
// }
// });
// if (!callback) { context.swap(all_content); }
// context.trigger('changed');
// };
// if (this.app.cache_partials && this.cache(cache_key)) {
// // try to load the template from the cache
// wrapped_callback.apply(context, [this.cache(cache_key)]);
// } else {
// // the template wasnt cached, we need to fetch it
// $.get(path, function(response) {
// if (context.app.cache_partials) { context.cache(cache_key, response); }
// wrapped_callback.apply(context, [response]);
// });
// } |
<<<<<<<
function stateGo() {
var fullStateName = applyDefaultChildStates(prototypalStateHolder, state.name)
attemptStateChange(fullStateName, parameters)
}
if (isTransitioning()) {
queueUpStateGo(stateGo)
} else {
stateProviderEmitter.emit('stateChangeAttempt')
stateGo()
}
=======
var fullStateName = prototypalStateHolder.applyDefaultChildStates(state.name)
attemptStateChange(fullStateName, parameters)
>>>>>>>
function stateGo() {
var fullStateName = prototypalStateHolder.applyDefaultChildStates(state.name)
attemptStateChange(fullStateName, parameters)
}
if (isTransitioning()) {
queueUpStateGo(stateGo)
} else {
stateProviderEmitter.emit('stateChangeAttempt')
stateGo()
} |
<<<<<<<
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
=======
/* harmony import */ var _common_imageManager__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(14);
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
>>>>>>>
/* harmony import */ var _common_imageManager__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(14);
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } |
<<<<<<<
world.on( PUBSUB_CANDIDATES, this.check, this );
=======
world.subscribe( this.options.check, this.check, this );
>>>>>>>
world.on( this.options.check, this.check, this );
<<<<<<<
world.off( PUBSUB_CANDIDATES, this.check );
=======
world.unsubscribe( this.options.check, this.check );
>>>>>>>
world.off( this.options.check, this.check );
<<<<<<<
this._world.emit( PUBSUB_COLLISION, {
=======
this._world.publish({
topic: this.options.channel,
>>>>>>>
this._world.emit({
topic: this.options.channel,
<<<<<<<
this._world.emit( PUBSUB_COLLISION, {
=======
this._world.publish({
topic: this.options.channel,
>>>>>>>
this._world.emit({
topic: this.options.channel, |
<<<<<<<
var _ = require('underscore');
var Promise = require('../promise');
// interface Storage {
// readonly attribute boolean async;
// string getItem(string key);
// void setItem(string key, string value);
// void removeItem(string key);
// void clear();
// Promise getItemAsync(string key);
// Promise setItemAsync(string key, string value);
// Promise removeItemAsync(string key);
// Promise clearAsync();
// }
var Storage = {};
var apiNames = [
'getItem',
'setItem',
'removeItem',
'clear'
];
if (global.localStorage) {
// in browser, `localStorage.async = false` will excute `localStorage.setItem('async', false)`
_(apiNames).each(function(apiName) {
Storage[apiName] = function() {
return global.localStorage[apiName].apply(global.localStorage, arguments);
};
});
Storage.async = false;
} else {
var AsyncStorage = require('react-native').AsyncStorage;
_(apiNames).each(function(apiName) {
Storage[apiName + 'Async'] = function() {
return Promise.as(AsyncStorage[apiName].apply(AsyncStorage, arguments));
};
});
Storage.async = true;
}
module.exports = Storage;
=======
var localStorage = global.localStorage;
try {
var testKey = '__storejs__';
localStorage.setItem(testKey, testKey);
if (localStorage.getItem(testKey) != testKey) {
throw new Error();
}
localStorage.remove(testKey);
} catch (e) {
localStorage = require('localstorage-memory');
}
module.exports = localStorage;
>>>>>>>
var _ = require('underscore');
var Promise = require('../promise');
// interface Storage {
// readonly attribute boolean async;
// string getItem(string key);
// void setItem(string key, string value);
// void removeItem(string key);
// void clear();
// Promise getItemAsync(string key);
// Promise setItemAsync(string key, string value);
// Promise removeItemAsync(string key);
// Promise clearAsync();
// }
var Storage = {};
var apiNames = [
'getItem',
'setItem',
'removeItem',
'clear'
];
if (global.localStorage) {
var localStorage = global.localStorage;
try {
var testKey = '__storejs__';
localStorage.setItem(testKey, testKey);
if (localStorage.getItem(testKey) != testKey) {
throw new Error();
}
localStorage.remove(testKey);
} catch (e) {
localStorage = require('localstorage-memory');
}
// in browser, `localStorage.async = false` will excute `localStorage.setItem('async', false)`
_(apiNames).each(function(apiName) {
Storage[apiName] = function() {
return global.localStorage[apiName].apply(global.localStorage, arguments);
};
});
Storage.async = false;
} else {
var AsyncStorage = require('react-native').AsyncStorage;
_(apiNames).each(function(apiName) {
Storage[apiName + 'Async'] = function() {
return Promise.as(AsyncStorage[apiName].apply(AsyncStorage, arguments));
};
});
Storage.async = true;
}
module.exports = Storage; |
<<<<<<<
};
var request = AV._request("insight", 'jobs', null, 'POST',
=======
}
var request = AV._request("bigquery", 'jobs', null, 'POST',
>>>>>>>
};
var request = AV._request("bigquery", 'jobs', null, 'POST', |
<<<<<<<
if (OneSignal._initOptions.notificationClickHandlerMatch) {
Database.put('Options', {key: 'notificationClickHandlerMatch', value: OneSignal._initOptions.notificationClickHandlerMatch})
} else {
Database.put('Options', {key: 'notificationClickHandlerMatch', value: 'exact'})
}
=======
if (OneSignal._initOptions.serviceWorkerRefetchRequests === false) {
Database.put('Options', {key: 'serviceWorkerRefetchRequests', value: false})
} else {
Database.put('Options', {key: 'serviceWorkerRefetchRequests', value: true})
}
>>>>>>>
if (OneSignal._initOptions.notificationClickHandlerMatch) {
Database.put('Options', {key: 'notificationClickHandlerMatch', value: OneSignal._initOptions.notificationClickHandlerMatch})
} else {
Database.put('Options', {key: 'notificationClickHandlerMatch', value: 'exact'})
}
if (OneSignal._initOptions.serviceWorkerRefetchRequests === false) {
Database.put('Options', {key: 'serviceWorkerRefetchRequests', value: false})
} else {
Database.put('Options', {key: 'serviceWorkerRefetchRequests', value: true})
} |
<<<<<<<
import "./events-polyfill.js";
import Event from "./events.js";
import Bell from "./bell/bell.js";
import Database from './database.js';
import * as Browser from 'bowser';
import { isPushNotificationsSupported, isBrowserSafari, isSupportedFireFox, isBrowserFirefox, getFirefoxVersion, isSupportedSafari, getConsoleStyle } from './utils.js';
=======
>>>>>>>
import Event from "./events.js";
import Bell from "./bell/bell.js";
import Database from './database.js';
import * as Browser from 'bowser';
import { isPushNotificationsSupported, isBrowserSafari, isSupportedFireFox, isBrowserFirefox, getFirefoxVersion, isSupportedSafari, getConsoleStyle } from './utils.js';
<<<<<<<
_VERSION: __VERSION__,
_API_URL: API_URL,
=======
_VERSION: 109016,
_HOST_URL: HOST_URL,
>>>>>>>
_VERSION: __VERSION__,
_API_URL: API_URL,
<<<<<<<
=======
_triggerEvent: function (eventName, data) {
if (typeof window === "undefined") {
log.debug('Skipping triggering of event:', eventName, 'because we are running in a ServiceWorker context.');
return;
}
var event = new CustomEvent(eventName, {
bubbles: true, cancelable: true, detail: data
});
window.dispatchEvent(event);
},
>>>>>>>
<<<<<<<
var recentPermissions = LimitStore.put('prompt.custom.permission', clickResult);
Event.trigger(OneSignal.EVENTS.CUSTOM_PROMPT_CLICKED, {
=======
var recentPermissions = LimitStore.put('onesignal.prompt.custom.clicked', clickResult);
OneSignal._triggerEvent('onesignal.prompt.custom.clicked', {
>>>>>>>
var recentPermissions = LimitStore.put('prompt.custom.permission', clickResult);
Event.trigger(OneSignal.EVENTS.CUSTOM_PROMPT_CLICKED, { |
<<<<<<<
assertHasBody = require('./util/requestAssertions').assertHasBody,
assertHasBodyHasNotAttribute = require('./util/requestAssertions').assertHasBodyHasNotAttribute,
assertHasBodyHasAttribute = require('./util/requestAssertions').assertHasBodyHasAttribute;
=======
assertHadBody = require('./util/requestAssertions').assertHadBody,
assertBodyHasNotAttribute = require('./util/requestAssertions').assertBodyHasNotAttribute,
assertBodyHasAttribute = require('./util/requestAssertions').assertBodyHasAttribute;
>>>>>>>
assertHasBody = require('./util/requestAssertions').assertHasBody,
assertBodyHasNotAttribute = require('./util/requestAssertions').assertBodyHasNotAttribute,
assertBodyHasAttribute = require('./util/requestAssertions').assertBodyHasAttribute;
<<<<<<<
assertHasBody(request, 'auth:login');
=======
assertHadBody(request, 'login');
>>>>>>>
assertHasBody(request, 'auth:login');
<<<<<<<
assertHasBody(request, 'auth:checkToken');
assertHasBodyHasAttribute(request, 'token', 'auth:checkToken');
=======
assertHadBody(request, 'checkToken');
assertBodyHasAttribute(request, 'token', 'checkToken');
>>>>>>>
assertHasBody(request, 'auth:checkToken');
assertBodyHasAttribute(request, 'token', 'auth:checkToken');
<<<<<<<
assertHasBody(request, 'updateSelf');
assertHasBodyHasNotAttribute(request, '_id', 'updateSelf');
assertHasBodyHasNotAttribute(request, 'profileIds', 'updateSelf');
=======
assertHadBody(request, 'updateSelf');
assertBodyHasNotAttribute(request, '_id', 'updateSelf');
assertBodyHasNotAttribute(request, 'profileIds', 'updateSelf');
>>>>>>>
assertHasBody(request, 'auth:updateSelf');
assertBodyHasNotAttribute(request, '_id', 'auth:updateSelf');
assertBodyHasNotAttribute(request, 'profileIds', 'auth:updateSelf'); |
<<<<<<<
if (OneSignal._initOptions.autoRegister == false && !registrationIdResult && !OneSignal._initOptions.subdomainName) {
Event.trigger(OneSignal.EVENTS.SDK_INITIALIZED);
=======
if (OneSignal._supportsDirectPermission() && OneSignal._initOptions.autoRegister === false) {
log.debug('Skipping auto register.');
return;
}
if (OneSignal._initOptions.autoRegister == false && !registrationIdResult && OneSignal._initOptions.subdomainName == null)
>>>>>>>
if (OneSignal._supportsDirectPermission() && OneSignal._initOptions.autoRegister === false) {
log.debug('Skipping auto register.');
Event.trigger(OneSignal.EVENTS.SDK_INITIALIZED);
return;
}
if (OneSignal._initOptions.autoRegister == false && !registrationIdResult && !OneSignal._initOptions.subdomainName) {
Event.trigger(OneSignal.EVENTS.SDK_INITIALIZED); |
<<<<<<<
_.contains(['import', 'create', 'createCollection', 'putMapping', 'createOrUpdate'], requestObject.action)) {
=======
_.contains(['import', 'create', 'createCollection', 'updateMapping', 'createOrReplace'], requestObject.action) &&
!doesIndexExist(requestObject, indexes)) {
>>>>>>>
_.contains(['import', 'create', 'createCollection', 'updateMapping', 'createOrReplace'], requestObject.action)) {
<<<<<<<
_.contains(['import', 'create', 'createCollection', 'putMapping', 'createOrUpdate'], requestObject.action)) {
=======
_.contains(['import', 'create', 'createCollection', 'updateMapping', 'createOrReplace'], requestObject.action) &&
!doesCollectionExist(requestObject, indexes)) {
>>>>>>>
_.contains(['import', 'create', 'createCollection', 'updateMapping', 'createOrReplace'], requestObject.action)) { |
<<<<<<<
// there is no subscribe on whole collection
should(responseObject.data.body[index][collection]).not.have.property('totalGlobals');
=======
>>>>>>>
// there is no subscribe on whole collection
should(responseObject.data.body[index][collection]).not.have.property('totalGlobals');
<<<<<<<
it('should return a correct list according to subscribe on whole collection', function () {
var requestObject = new RequestObject({
controller: 'subscribe',
action: 'on',
requestId: roomName,
index: index,
collection: collection,
body: {}
});
=======
it('should return a correct list according to subscribe on filter and user right', function () {
var
requestObjectUser = new RequestObject({
controller: 'subscribe',
action: 'on',
requestId: roomName,
collection: collection,
body: filter
}),
requestObjectFoo = new RequestObject({
controller: 'subscribe',
action: 'on',
requestId: roomName,
collection: 'foo',
body: filter
}),
requestObjectList = new RequestObject({
controller: 'subscribe',
action: 'list',
requestId: roomName,
body: {}
});
>>>>>>>
it('should return a correct list according to subscribe on filter and user right', function () {
var
requestObjectUser = new RequestObject({
controller: 'subscribe',
action: 'on',
requestId: roomName,
index: index,
collection: collection,
body: filter
}),
requestObjectFoo = new RequestObject({
controller: 'subscribe',
action: 'on',
requestId: roomName,
index: index,
collection: 'foo',
body: filter
}),
requestObjectList = new RequestObject({
controller: 'subscribe',
action: 'list',
index: index,
requestId: roomName,
body: {}
}); |
<<<<<<<
=======
/*THREE.Matrix4.makeInvert3x3 = function ( m1 ) {
// input: THREE.Matrix4, output: THREE.Matrix3
// ( based on http://code.google.com/p/webgl-mjs/ )
var m33 = m1.m33, m33m = m33.m,
a11 = m1.n33 * m1.n22 - m1.n32 * m1.n23,
a21 = - m1.n33 * m1.n21 + m1.n31 * m1.n23,
a31 = m1.n32 * m1.n21 - m1.n31 * m1.n22,
a12 = - m1.n33 * m1.n12 + m1.n32 * m1.n13,
a22 = m1.n33 * m1.n11 - m1.n31 * m1.n13,
a32 = - m1.n32 * m1.n11 + m1.n31 * m1.n12,
a13 = m1.n23 * m1.n12 - m1.n22 * m1.n13,
a23 = - m1.n23 * m1.n11 + m1.n21 * m1.n13,
a33 = m1.n22 * m1.n11 - m1.n21 * m1.n12,
det = m1.n11 * a11 + m1.n21 * a12 + m1.n31 * a13,
idet;
// no inverse
if (det == 0) {
throw "matrix not invertible";
}
idet = 1.0 / det;
m33this.value[ 0 ] = idet * a11; m33this.value[ 1 ] = idet * a21; m33this.value[ 2 ] = idet * a31;
m33this.value[ 3 ] = idet * a12; m33this.value[ 4 ] = idet * a22; m33this.value[ 5 ] = idet * a32;
m33this.value[ 6 ] = idet * a13; m33this.value[ 7 ] = idet * a23; m33this.value[ 8 ] = idet * a33;
return m33;
}
*/
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.