conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
dimBackground()
{
this._background.show();
Tweener.addTween(this._background, {
=======
dimBackground: function() {
this._background.show();
this.tween(this._background, {
>>>>>>>
dimBackground()
{
this._background.show();
this.tween(this._background, {
<<<<<<<
undimBackground(onCompleteBind)
{
Tweener.removeTweens(this._background);
Tweener.addTween(this._background, {
=======
undimBackground: function(onCompleteBind) {
this.removeTweens(this._background);
this.tween(this._background, {
>>>>>>>
undimBackground(onCompleteBind)
{
this.removeTweens(this._background);
this.tween(this._background, {
<<<<<<<
for (let background of backgrounds) {
Tweener.addTween(background, {
brightness: 1.0,
vignette_sharpness: 0.0,
time: this.getSettings().animation_time,
transition: TRANSITION_TYPE,
onComplete: onCompleteBind
});
=======
for (let i = 0; i < backgrounds.length; i++) {
this.tween(backgrounds[i],
{ brightness: 1.0,
vignette_sharpness: 0.0,
time: this.getSettings().animation_time,
transition: TRANSITION_TYPE,
onComplete: onCompleteBind
});
>>>>>>>
for (let background of backgrounds) {
this.tween(backgrounds[i],
{ brightness: 1.0,
vignette_sharpness: 0.0,
time: this.getSettings().animation_time,
transition: TRANSITION_TYPE,
onComplete: onCompleteBind
}); |
<<<<<<<
, TAG = "v2.3.1"
, CW = "/*!\n * Bootstrap v2.3.1\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world by @mdo and @fat.\n */\n"
=======
, TAG = "v2.3.2"
, CW = "/*!\n * Bootstrap v2.3.2\n *\n * Copyright 2012 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n"
>>>>>>>
, TAG = "v2.3.2"
, CW = "/*!\n * Bootstrap v2.3.2\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n" |
<<<<<<<
};
return page.evaluate(setupReporters, {
save_path: options.junit_save_path,
consolidate: options.junit_consolidate
});
};
getXmlResults = function(page, key) {
var getWindowObj;
getWindowObj = function() {
return window["%resultsObj%"] || {};
};
return page.evaluate(getWindowObj, {
resultsObj: key
});
};
// Workaround for https://github.com/ariya/phantomjs/issues/12697 since
// it doesn't seem like there will be another 1.9.x release fixing this
phantomExit = function(exitCode) {
page.close();
setTimeout(function() { phantom.exit(exitCode); }, 0);
};
replaceFunctionPlaceholders = function(fn, replacements) {
var match, p;
if (replacements && typeof replacements === 'object') {
fn = fn.toString();
for (p in replacements) {
if (replacements.hasOwnProperty(p)) {
match = new RegExp("%" + p + "%", "g");
while (true) {
fn = fn.replace(match, replacements[p]);
if (fn.indexOf(match) === -1) {
break;
}
}
}
}
}
return fn;
};
overloadPageEvaluate = function(page) {
page._evaluate = page.evaluate;
page.evaluate = function(fn, replacements) {
return page._evaluate(replaceFunctionPlaceholders(fn, replacements));
};
return page;
};
setupWriteFileFunction = function(page, key, path_separator) {
var saveData;
saveData = function() {
window["%resultsObj%"] = {};
window.fs_path_separator = "%fs_path_separator%";
return window.__phantom_writeFile = function(filename, text) {
return window["%resultsObj%"][filename] = text;
};
};
return page.evaluate(saveData, {
resultsObj: key,
fs_path_separator: path_separator
=======
>>>>>>>
<<<<<<<
console.log(JSON.stringify({
error: "Unable to access Jasmine specs at " + options.url
}));
return phantomExit();
=======
return reportError("Unable to access Jasmine specs at " + options.url + ", page returned status: " + status);
>>>>>>>
return reportError("Unable to access Jasmine specs at " + options.url + ", page returned status: " + status);
<<<<<<<
if (text) {
error = "Timeout waiting for the Jasmine test results!\n\n" + text;
return console.log(JSON.stringify({
error: error
}));
} else {
return console.log(JSON.stringify({
error: 'Timeout for the Jasmine test results!'
}));
}
};
specsDone = function() {
var filename, output, xml_results;
if (options.junit === true) {
xml_results = getXmlResults(page, resultsKey);
for (filename in xml_results) {
if (xml_results.hasOwnProperty(filename) && (output = xml_results[filename]) && typeof output === 'string') {
fs.write(filename, output, 'w');
}
}
}
return phantomExit();
=======
return reportError("Timeout waiting for the Jasmine test results!\n\n" + text);
>>>>>>>
return reportError("Timeout waiting for the Jasmine test results!\n\n" + text);
<<<<<<<
timeoutFunction();
return phantomExit(1);
=======
return timeoutFunction();
>>>>>>>
return timeoutFunction(); |
<<<<<<<
var backtrace_frame_list = new cls.EcmascriptDebugger["6.14"].BacktraceFrameList(message);
var return_value_list = backtrace_frame_list && backtrace_frame_list.returnValueList;
if (return_value_list)
{
return_values = {
rt_id: stop_at.runtime_id,
return_value_list: return_value_list
};
}
=======
>>>>>>>
var backtrace_frame_list = new cls.EcmascriptDebugger["6.14"].BacktraceFrameList(message);
var return_value_list = backtrace_frame_list && backtrace_frame_list.returnValueList;
if (return_value_list)
{
return_values = {
rt_id: stop_at.runtime_id,
return_value_list: return_value_list
};
} |
<<<<<<<
function returnFalse(){ return false; }
var EventsMixin = Object.assign( {
=======
function returnFalse(){ return false; }
/**
* Mixin which is attached to all components.
*/
var EventsMixin = tools.assign( {
>>>>>>>
function returnFalse(){ return false; }
/**
* Mixin which is attached to all components.
*/
var EventsMixin = tools.assign( {
<<<<<<<
asyncUpdate : asyncUpdate,
// Perform transactional props and state update. Nested calls are allowed.
// Subsequent local update is forced. Not sure it's needed.
transaction : function( fun ){
const shouldComponentUpdate = this.shouldComponentUpdate,
isRoot = shouldComponentUpdate !== returnFalse;
if( isRoot ){
this.shouldComponentUpdate = returnFalse;
}
fun( this.props );
if( isRoot ){
this.shouldComponentUpdate = shouldComponentUpdate;
this.asyncUpdate();
}
},
renderAfter : function( promise, render ){
var originalRender = this.render;
this.render = render || this.loading || loading;
var _this = this;
promise.always( function(){
_this.render = originalRender;
_this.asyncUpdate();
} );
return promise;
}
=======
asyncUpdate : asyncUpdate,
/**
* Performs transactional update for both props and state.
* Suppress updates during the transaction, and force update aftewards.
* Wrapping the sequence of changes in a transactions guarantees that
* React component will be updated _after_ all the changes to the
* both props and local state are applied.
*
* @param fun - takes
*/
transaction : function( fun ){
const shouldComponentUpdate = this.shouldComponentUpdate,
isRoot = shouldComponentUpdate !== returnFalse;
if( isRoot ){
this.shouldComponentUpdate = returnFalse;
}
fun( this.props, this.state );
if( isRoot ){
this.shouldComponentUpdate = shouldComponentUpdate;
this.asyncUpdate();
}
}
>>>>>>>
asyncUpdate : asyncUpdate,
/**
* Performs transactional update for both props and state.
* Suppress updates during the transaction, and force update aftewards.
* Wrapping the sequence of changes in a transactions guarantees that
* React component will be updated _after_ all the changes to the
* both props and local state are applied.
*
* @param fun - takes
*/
transaction : function( fun ){
const shouldComponentUpdate = this.shouldComponentUpdate,
isRoot = shouldComponentUpdate !== returnFalse;
if( isRoot ){
this.shouldComponentUpdate = returnFalse;
}
fun( this.props, this.state );
if( isRoot ){
this.shouldComponentUpdate = shouldComponentUpdate;
this.asyncUpdate();
}
},
renderAfter : function( promise, render ){
var originalRender = this.render;
this.render = render || this.loading || loading;
var _this = this;
promise.always( function(){
_this.render = originalRender;
_this.asyncUpdate();
} );
return promise;
} |
<<<<<<<
if (this.softDelete === true && options.hardDelete !== true) {
let query = this.query()
=======
if (this.softDelete && !options.hardDelete) {
>>>>>>>
if (this.softDelete && !options.hardDelete) {
let query = this.query()
<<<<<<<
softDelete: true,
query
})
=======
softDelete: true
}, options)
const date = options.date ? new Date(options.date) : new Date()
>>>>>>>
softDelete: true,
query: query
}, options)
const date = options.date ? new Date(options.date) : new Date() |
<<<<<<<
return r.data.map(recipeForLang.bind(this, lang));
=======
var result = [];
for (var i = 0; i < r.data.length; i++) {
var recipe = r.data[i];
result.push(recipeForLang(lang, recipe));
}
result.sort(function (a, b) {
var diff = a.level - b.level;
if (diff !== 0) return diff;
if (a.name < b.name) return -1;
else if (a.name > b.name) return 1;
return 0;
});
return result;
>>>>>>>
var result = r.data.map(recipeForLang.bind(this, lang));
result.sort(function (a, b) {
var diff = a.level - b.level;
if (diff !== 0) return diff;
if (a.name < b.name) return -1;
else if (a.name > b.name) return 1;
return 0;
});
return result; |
<<<<<<<
logOutput.write("Monte Carlo Example\n");
logOutput.write("===================\n");
MonteCarloSequence(sim.sequence, sim.startState, false, true, false, true, logOutput);
=======
============\n");
MonteCarloSequence(sequence, startState, false, true, false, true, logOutput);
=======
logOutput.write("\nMonte Carlo Example");
logOutput.write("\n===================\n");
MonteCarloSequence(sequence, startState, false, settings.overrideOnCondition, false, true, logOutput);
>>>>>>>
logOutput.write("Monte Carlo Example\n");
logOutput.write("===================\n");
MonteCarloSequence(sim.sequence, sim.startState, false, settings.overrideOnCondition, false, true, logOutput); |
<<<<<<<
function ($scope, $log, $modal, $timeout, $translate, _allClasses, _actionGroups, _allActions, _actionsByName,
_recipeLibrary, _localProfile, _xivdbtooltips)
=======
function ($scope, $rootScope, $http, $location, $modal, $document, $timeout, $filter, $translate, _getSolverServiceURL, _allClasses,
_actionGroups, _allActions, _actionsByName, _recipeLibrary, _localProfile, _simulator, _solver, _xivdbtooltips)
>>>>>>>
function ($scope, $rootScope, $modal, $translate, _allClasses, _actionGroups, _allActions, _actionsByName,
_localProfile, _xivdbtooltips)
<<<<<<<
=======
function updateRecipeSearchList() {
var recipes = _recipeLibrary.recipesForClass($translate.use(), $scope.recipe.cls) || [];
$scope.recipeSearch.list = $filter('filter')(recipes, {name: $scope.recipeSearch.text});
$scope.recipeSearch.selected = Math.min($scope.recipeSearch.selected, $scope.recipeSearch.list.length - 1);
}
$rootScope.$on('$translateChangeSuccess', function (event, data) {
updateRecipeSearchList();
});
$scope.$watch('recipeSearch.text', function () {
updateRecipeSearchList();
});
function saveAndRerunSim() {
saveLocalPageState($scope);
if ($scope.sequence.length > 0 && $scope.isValidSequence($scope.sequence, $scope.recipe.cls)) {
$scope.runSimulation();
}
else {
$scope.simulatorStatus.state = null
$scope.simulatorStatus.error = null
}
}
>>>>>>>
<<<<<<<
// Trigger initial simulation using newly loaded profile
$scope.$broadcast('simulation.needs.update');
};
$scope.$on('sequence.editor.save', function (event, newSequence) {
$scope.sequence = angular.copy(newSequence);
});
=======
// data model interaction functions
$scope.importRecipe = function (name) {
var cls = $scope.recipe.cls;
$scope.recipe = angular.copy(_recipeLibrary.recipeForClassByName($translate.use(), cls, name));
$scope.recipe.cls = cls;
$scope.recipe.startQuality = 0;
};
>>>>>>>
// Trigger initial simulation using newly loaded profile
$scope.$broadcast('simulation.needs.update');
};
$scope.$on('sequence.editor.save', function (event, newSequence) {
$scope.sequence = angular.copy(newSequence);
}); |
<<<<<<<
this.on('pointerdown', this.down, this)
this.on('pointermove', this.move, this)
this.on('pointerup', this.up, this)
this.on('pointercancel', this.up, this)
this.on('pointerout', this.up, this)
document.body.addEventListener('wheel', (e) => this.handleWheel(e))
=======
this.on('pointerdown', this.down)
this.on('pointermove', this.move)
this.on('pointerup', this.up)
this.on('pointercancel', this.up)
this.on('pointerout', this.up)
this.on('tap', this.tap)
document.body.addEventListener('wheel', (e) => this.handleWheel(e))
>>>>>>>
this.on('pointerdown', this.down)
this.on('pointermove', this.move)
this.on('pointerup', this.up)
this.on('pointercancel', this.up)
this.on('pointerout', this.up)
document.body.addEventListener('wheel', (e) => this.handleWheel(e)) |
<<<<<<<
'taskStats': {},
'taskDone': {}
=======
'taskDone': {},
// common buttons
'taskSkip': {}
>>>>>>>
'taskStats': {},
'taskDone': {},
// common buttons
'taskSkip': {} |
<<<<<<<
eval: _eval = false,
topLevel = false,
=======
keepClassName = false,
eval: _eval = false
>>>>>>>
eval: _eval = false,
topLevel = false,
keepClassName = false, |
<<<<<<<
// Start the app.
logger.info('App starting up.');
this._appProcess = child_process.spawn(parts[0], parts.slice(1), {
cwd: path.dirname(path.resolve($$appUpdater.get('local')))
}).on('exit', _.bind(function() {
this._appProcess = null;
=======
if (!fs.existsSync(parts[0])) {
this._isStartingUp = false;
logger.error('Application not found.');
if (callback) {
callback(false);
}
return;
}
// Start the app.
logger.info('App starting up.');
this._appProcess = child_process.spawn(parts[0], parts.slice(1), {
cwd: path.dirname(path.resolve($$appUpdater.get('local')))
});
this._resetRestartTimeout(this.get('startupTimeout'));
>>>>>>>
if (!fs.existsSync(parts[0])) {
this._isStartingUp = false;
logger.error('Application not found.');
if (callback) {
callback(false);
}
return;
}
// Start the app.
logger.info('App starting up.');
this._appProcess = child_process.spawn(parts[0], parts.slice(1), {
cwd: path.dirname(path.resolve($$appUpdater.get('local')))
}).on('exit', _.bind(function() {
this._appProcess = null; |
<<<<<<<
<div>
<pComponent1/>
<p es-class="this.state.a" es-repeat="let a in this.state.d">{{this.state.b}}</p>
<div>
<p es-repeat="let a in this.state.e" es-on:click="this.showAlert(a)">{{a.z}}</p>
</div>
=======
<div>
<div es-class="this.state.a">
<p es-on:click="this.showAlert()">{{this.state.b}}</p>
</div>
>>>>>>>
<div>
<pComponent1/>
<p es-class="this.state.a" es-repeat="let a in this.state.d">{{this.state.b}}</p>
<div>
<p es-repeat="let a in this.state.e" es-on:click="this.showAlert(a)">{{a.z}}</p>
</div>
<div es-class="this.state.a">
<p es-on:click="this.showAlert()">{{this.state.b}}</p>
</div> |
<<<<<<<
window.Config.openID = openID || "dedbc83d62104d6da8d4a3c0188dc419";
Func.openID = window.Config.openID;
this.func = {
showMenu: this.showMenu,
loadSceneShop: this.loadSceneShop,
loadSceneRepertory: this.loadSceneRepertory
};
=======
Func.openID = openID || "dedbc83d62104d6da8d4a3c0188dc419";
Config.newSocket = io.connect("http://service.linedin.cn:5520");
this.getStorageCount(); //初始化消息数量
this.socketNotice(); //socket监听消息变化
setInterval(function() {});
>>>>>>>
window.Config.openID = openID || "dedbc83d62104d6da8d4a3c0188dc419";
Func.openID = window.Config.openID;
Config.newSocket = io.connect("http://service.linedin.cn:5520");
this.getStorageCount(); //初始化消息数量
this.socketNotice(); //socket监听消息变化
this.func = {
showMenu: this.showMenu,
loadSceneShop: this.loadSceneShop,
loadSceneRepertory: this.loadSceneRepertory
}; |
<<<<<<<
import './blocks/animatedheadline' // Animated Headline
=======
import './blocks/pieprogress' // PieProgress
>>>>>>>
import './blocks/animatedheadline' // Animated Headline
import './blocks/pieprogress' // PieProgress |
<<<<<<<
if (typeof showPresetSettings !== 'undefined') {
const detailedPreset = Object.keys(presets)[showPresetSettings];
setTypoTitleStyle(presets[detailedPreset].typography);
}
=======
>>>>>>>
if (typeof showPresetSettings !== 'undefined') {
const detailedPreset = Object.keys(presets)[showPresetSettings];
setTypoTitleStyle(presets[detailedPreset].typography);
} |
<<<<<<<
import './blocks/row/column' // Column
import './blocks/button' // Button
import './blocks/text' // Text
import './blocks/icon' // Icon
import './blocks/map' // Map
import './blocks/divider' // Divider
import './blocks/infobox' // Info Box
import './blocks/image' // Image
import './blocks/testimonial' // Testimonial
import './blocks/accordion' // Accordion
import './blocks/heading' // Heading Box
import './blocks/videopopup' // Video popup
import './blocks/progressbar' // Progress Bar
import './blocks/counter' // counter
import './blocks/tabs' // Tabs
import './blocks/tabs/tab' // Inner Tabs
import './blocks/socialicons' // Social Icons
import './blocks/contactform' // Contact Form
import './blocks/buttongroup' // Button Group
import './blocks/advancedlist' // Advanced List
import './blocks/iconlist' // Icon List
import './blocks/wrapper' // Wrapper
import './blocks/team' // Team
import './blocks/pricing' // pricing
import './blocks/timeline' // Timeline
import './blocks/postgrid' // Postgrid
import './blocks/verticaltabs' // Vertical Tabs
import './blocks/verticaltabs/verticaltab' // Vertical Inner Tabs
=======
import './blocks/row/column' // Column
import './blocks/button' // Button
import './blocks/text' // Text
import './blocks/icon' // Icon
import './blocks/map' // Map
import './blocks/divider' // Divider
import './blocks/infobox' // Info Box
import './blocks/image' // Image
import './blocks/testimonial' // Testimonial
import './blocks/accordion' // Accordion
import './blocks/heading' // Heading Box
import './blocks/videopopup' // Video popup
import './blocks/progressbar' // Progress Bar
import './blocks/counter' // counter
import './blocks/tabs' // Tabs
import './blocks/tabs/tab' // Inner Tabs
import './blocks/socialicons' // Social Icons
import './blocks/contactform' // Contact Form
import './blocks/buttongroup' // Button Group
import './blocks/advancedlist' // Advanced List
import './blocks/iconlist' // Icon List
import './blocks/wrapper' // Wrapper
import './blocks/team' // Team
import './blocks/pricing' // pricing
import './blocks/timeline' // Timeline
import './blocks/postgrid' // Postgrid
import './blocks/pieprogress' // PieProgress
>>>>>>>
import './blocks/row/column' // Column
import './blocks/button' // Button
import './blocks/text' // Text
import './blocks/icon' // Icon
import './blocks/map' // Map
import './blocks/divider' // Divider
import './blocks/infobox' // Info Box
import './blocks/image' // Image
import './blocks/testimonial' // Testimonial
import './blocks/accordion' // Accordion
import './blocks/heading' // Heading Box
import './blocks/videopopup' // Video popup
import './blocks/progressbar' // Progress Bar
import './blocks/counter' // counter
import './blocks/tabs' // Tabs
import './blocks/tabs/tab' // Inner Tabs
import './blocks/socialicons' // Social Icons
import './blocks/contactform' // Contact Form
import './blocks/buttongroup' // Button Group
import './blocks/advancedlist' // Advanced List
import './blocks/iconlist' // Icon List
import './blocks/wrapper' // Wrapper
import './blocks/team' // Team
import './blocks/pricing' // pricing
import './blocks/timeline' // Timeline
import './blocks/postgrid' // Postgrid
import './blocks/verticaltabs' // Vertical Tabs
import './blocks/verticaltabs/verticaltab' // Vertical Inner Tabs
import './blocks/row/column' // Column
import './blocks/button' // Button
import './blocks/text' // Text
import './blocks/icon' // Icon
import './blocks/map' // Map
import './blocks/divider' // Divider
import './blocks/infobox' // Info Box
import './blocks/image' // Image
import './blocks/testimonial' // Testimonial
import './blocks/accordion' // Accordion
import './blocks/heading' // Heading Box
import './blocks/videopopup' // Video popup
import './blocks/progressbar' // Progress Bar
import './blocks/counter' // counter
import './blocks/tabs' // Tabs
import './blocks/tabs/tab' // Inner Tabs
import './blocks/socialicons' // Social Icons
import './blocks/contactform' // Contact Form
import './blocks/buttongroup' // Button Group
import './blocks/advancedlist' // Advanced List
import './blocks/iconlist' // Icon List
import './blocks/wrapper' // Wrapper
import './blocks/team' // Team
import './blocks/pricing' // pricing
import './blocks/timeline' // Timeline
import './blocks/postgrid' // Postgrid
import './blocks/pieprogress' // PieProgress |
<<<<<<<
=======
it('sets multiple styles with a css string as the first argument', function() {
var rect = draw.rect(100,100).style('cursor: help; display: block;')
expect(window.stripped(rect.node.style.cssText)).toMatch(/cursor:help/)
expect(window.stripped(rect.node.style.cssText)).toMatch(/display:block/)
expect(window.stripped(rect.node.style.cssText).length).toBe(('display:block;cursor:help').length)
})
>>>>>>>
<<<<<<<
it('ungroups everything to the doc root when called on SVG.Doc / does not flatten defs', function() {
draw.flatten()
=======
it('ungroups everything to the doc root when called on SVG.Doc / does not ungroup defs/parser', function() {
draw.ungroup()
>>>>>>>
it('ungroups everything to the doc root when called on SVG.Doc / does not ungroup defs/parser', function() {
draw.flatten()
<<<<<<<
=======
describe('flatten()', function() {
it('redirects the call to ungroup()', function() {
spyOn(draw, 'ungroup')
draw.flatten()
expect(draw.ungroup).toHaveBeenCalled()
})
})
>>>>>>> |
<<<<<<<
// FIXME: SVG.Matrix does now allow translateX to be passed but decompose returns it!!!!!
console.log(new SVG.Morphable.TransformBag({rotate: 50, translateX: 20}).valueOf().decompose())
=======
>>>>>>> |
<<<<<<<
case '@':
next();
var name = "";
while (tok && /[a-zA-Z]/.test(tok)) {
name += tok;
next();
}
children.push(Icon.icons.hasOwnProperty(name) ? new Icon(name) : new Label("@" + name));
label = null;
break;
=======
case '\\':
next(); // escape character
// fall-thru
>>>>>>>
case '@':
next();
var name = "";
while (tok && /[a-zA-Z]/.test(tok)) {
name += tok;
next();
}
children.push(Icon.icons.hasOwnProperty(name) ? new Icon(name) : new Label("@" + name));
label = null;
break;
case '\\':
next(); // escape character
// fall-thru |
<<<<<<<
function paintBlock(info, children, languages) {
var overrides = [];
if (isArray(children[children.length - 1])) {
overrides = children.pop();
}
if (!children.length) {
children = [new Label("")];
}
=======
// Text minifying functions normalise block text before lookups.
function minify(text) {
var minitext = text.replace(/[.,%?:▶◀▸◂]/g, "").toLowerCase()
.replace(/[ \t]+/g, " ").trim();
minitext = (minitext
.replace("ß", "ss")
.replace("ü", "u")
.replace("ö", "o")
.replace("ä", "a")
)
if (!minitext && text.replace(" ", "") === "...") minitext = "...";
return minitext;
}
// Insert padding around arguments in spec
function normalize_spec(spec) {
return spec.replace(/([^ ])_/g, "$1 _").replace(/_([^ ])/g, "_ $1");
}
/*** Parse block ***/
var BRACKETS = "([<{)]>}";
// Various bracket-related utilities...
function is_open_bracket(chr) {
var bracket_index = BRACKETS.indexOf(chr);
return (-1 < bracket_index && bracket_index < 4);
}
function is_close_bracket(chr) {
return (3 < BRACKETS.indexOf(chr));
}
function get_matching_bracket(chr) {
return BRACKETS[BRACKETS.indexOf(chr) + 4];
}
// Strip one level of brackets from around a piece.
>>>>>>>
function paintBlock(info, children, languages) {
var overrides = [];
if (isArray(children[children.length - 1])) {
overrides = children.pop();
}
if (!children.length) {
children = [new Label("")];
}
<<<<<<<
if (b.isElse || b.isEnd) {
b = new Block(extend(b.info, {
shape: 'stack',
}), b.children);
}
=======
function oldParser(code) {
var context = {obsolete_blocks: {}, define_hats: [], custom_args: [],
variable_reporters: {}, lists: []};
var scripts = [];
var nesting = [[]];
var lines = code.trim().split("\n");
>>>>>>>
if (b.isElse || b.isEnd) {
b = new Block(extend(b.info, {
shape: 'stack',
}), b.children);
}
<<<<<<<
var f = parseLines(code, languages);
var scripts = parseScripts(f);
return scripts;
=======
function extend(src, dest) {
src = src || {};
dest = dest || {};
for (var key in src) {
if (src.hasOwnProperty(key) && !dest.hasOwnProperty(key)) {
dest[key] = src[key];
}
}
return dest;
>>>>>>>
var f = parseLines(code, languages);
var scripts = parseScripts(f);
return scripts;
<<<<<<<
this.height = 12;
this.x = 0;
};
Label.prototype.isLabel = true;
Label.prototype.measure = function() {
// TODO measure multiple spaces
this.el = text(0, 10, this.value, {
class: this.cls,
});
if (this.value === "") {
=======
this.height = 12;
this.x = 0;
};
Label.prototype.isLabel = true;
Label.prototype.measure = function() {
this.el = text(0, 10, this.value, {
class: this.cls,
});
if (this.value === "") {
>>>>>>>
this.height = 12;
this.x = 0;
};
Label.prototype.isLabel = true;
Label.prototype.measure = function() {
// TODO measure multiple spaces
this.el = text(0, 10, this.value, {
class: this.cls,
});
if (this.value === "") {
<<<<<<<
=======
Input.fromAST = function(input) {
assert(input.pieces.length === 1);
return new Input(input.shape, input.pieces[0]);
};
>>>>>>>
<<<<<<<
assert(children.length);
=======
this.comment = comment || null;
>>>>>>>
this.comment = comment || null;
<<<<<<<
=======
this.isRing = shape === 'ring';
>>>>>>>
this.isRing = shape === 'ring';
<<<<<<<
Block.prototype.measure = function() {
for (var i=0; i<this.children.length; i++) {
var child = this.children[i];
if (child.measure) child.measure();
}
};
=======
Block.prototype.measure = function() {
for (var i=0; i<this.children.length; i++) {
var child = this.children[i];
if (child.measure) child.measure();
}
if (this.comment) this.comment.measure();
};
>>>>>>>
Block.prototype.measure = function() {
for (var i=0; i<this.children.length; i++) {
var child = this.children[i];
if (child.measure) child.measure();
}
if (this.comment) this.comment.measure();
};
<<<<<<<
'ring': roundedRect,
=======
'ring': ringOuter,
>>>>>>>
'ring': ringOuter,
<<<<<<<
assert(func, "no shape func " + this.info.shape);
return func(w, h, {
=======
assert(func, "no shape func: " + this.info.shape);
var el = func(w, h, {
>>>>>>>
assert(func, "no shape func: " + this.info.shape);
var el = func(w, h, {
<<<<<<<
=======
Block.fromAST = function(thing) {
var list = [];
if (thing.type === 'cwrap') {
for (var i=1; i<thing.contents.length; i++) {
var item = thing.contents[i];
if (item.type === 'cmouth') {
list.push(Script.fromAST(item.contents));
} else {
item.pieces.forEach(function(l) {
if (typeof l === 'string') {
list.push(new Label(l.trim()));
} else {
list.push(Block.fromAST(l));
}
});
}
}
var block = thing.contents[0];
var shape = block.pieces[0] === 'if ' ? 'if-block' : 'c-block';
if (thing.shape === 'cap') shape += ' cap';
if (['repeat until _', 'repeat _', 'forever'].indexOf(block.blockid) > -1) {
list.push(new Icon('loopArrow'));
}
} else {
var block = thing;
var shape = block.shape;
if (thing.flag === 'ring') {
shape = 'ring';
}
}
var info = {
shape: shape,
category: block.category,
};
var children = block.pieces.map(function(piece) {
if (/^ *$/.test(piece)) return;
if (piece === '@') {
var symbol = {
'green-flag': 'greenFlag',
'arrow-cw': 'turnRight',
'arrow-ccw': 'turnLeft',
}[block.image_replacement];
return new Icon(symbol);
}
if (typeof piece === 'string') return new Label(piece.trim());
switch (piece.shape) {
case 'number':
case 'string':
case 'dropdown':
case 'number-dropdown':
case 'color':
if (piece.shape === 'number' && piece.is_ringed) {
return new Input('reporter', "");
}
return Input.fromAST(piece);
default:
if (piece.blockid === '' && (piece.shape === 'boolean' || piece.shape === 'stack')) {
return Input.fromAST(piece);
}
return Block.fromAST(piece);
}
});
children = children.filter(function(x) { return !!x; });
children = children.concat(list);
if (!children.length) {
children.push(new Label(""));
}
return new Block(info, children, block.comment ? new Comment(block.comment.trim()) : undefined);
};
/* Comment */
var Comment = function(value) {
this.label = new Label(value, ['comment-label']);
this.width = null;
};
Comment.lineLength = 12;
Comment.prototype.height = 20;
Comment.prototype.measure = function() {
this.label.measure();
};
Comment.prototype.draw = function() {
var labelEl = this.label.draw();
this.width = this.label.width + 16;
return group([
commentLine(Comment.lineLength, 6),
commentRect(this.width, this.height, {
class: 'comment',
}),
translate(8, 4, labelEl),
]);
};
>>>>>>>
/* Comment */
var Comment = function(value) {
this.label = new Label(value, ['comment-label']);
this.width = null;
};
Comment.lineLength = 12;
Comment.prototype.height = 20;
Comment.prototype.measure = function() {
this.label.measure();
};
Comment.prototype.draw = function() {
var labelEl = this.label.draw();
this.width = this.label.width + 16;
return group([
commentLine(Comment.lineLength, 6),
commentRect(this.width, this.height, {
class: 'comment',
}),
translate(8, 4, labelEl),
]);
};
<<<<<<<
function render(scripts, cb) {
=======
function render(scripts, cb) {
// measure strings
>>>>>>>
function render(scripts, cb) {
// measure strings
<<<<<<<
scripts.forEach(function(script) {
script.measure();
});
// measure strings, then draw
=======
// finish measuring & render
>>>>>>>
// finish measuring & render
<<<<<<<
}, options);
=======
languages: ['en'],
read: readCode, // function(el, options) => code
parse: parse, // function(code, options) => scripts
render: render, // function(scripts, cb) => svg
replace: replace, // function(el, svg, scripts, options)
}, options);
>>>>>>>
languages: ['en'],
read: readCode, // function(el, options) => code
parse: parse, // function(code, options) => scripts
render: render, // function(scripts, cb) => svg
replace: replace, // function(el, svg, scripts, options)
}, options);
<<<<<<<
var scripts = parse(code, options);
render(scripts, function(svg) {
var container = document.createElement('div');
container.classList.add("sb");
if (options.inline) container.classList.add('sb-inline');
container.appendChild(svg);
=======
var scripts = options.parse(code, options);
>>>>>>>
var scripts = options.parse(code, options);
<<<<<<<
allLanguages: allLanguages, // read-only
loadLanguages: loadLanguages,
Label: Label,
Icon: Icon,
Input: Input,
Block: Block,
Script: Script,
=======
Label: Label,
Icon: Icon,
Input: Input,
Block: Block,
Script: Script,
read: readCode,
_oldParser: oldParser,
>>>>>>>
allLanguages: allLanguages, // read-only
loadLanguages: loadLanguages,
Label: Label,
Icon: Icon,
Input: Input,
Block: Block,
Script: Script,
read: readCode,
_oldParser: oldParser, |
<<<<<<<
var alarm, alarms, cozyAlarm, duration, endDate, event, in24h, key, now, startDate, startDates, trigg, unitValues, value, _i, _j, _len, _len1, _ref;
=======
var alarm, alarms, cozyAlarm, duration, endDate, event, i, in24h, index, j, key, len, len1, now, ref, startDate, startDates, trigg, unitValues, value;
>>>>>>>
var alarm, alarms, cozyAlarm, duration, endDate, event, in24h, index, key, now, startDate, startDates, trigg, unitValues, value, _i, _j, _len, _len1, _ref;
<<<<<<<
_ref = this.alarms;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
alarm = _ref[_i];
=======
ref = this.alarms;
for (index = i = 0, len = ref.length; i < len; index = ++i) {
alarm = ref[index];
>>>>>>>
_ref = this.alarms;
for (index = _i = 0, _len = _ref.length; _i < _len; index = ++_i) {
alarm = _ref[index];
<<<<<<<
_id: this._id,
=======
_id: this._id + "_" + index,
>>>>>>>
_id: this._id + "_" + index, |
<<<<<<<
// Generated by CoffeeScript 1.6.2
=======
;var ColorHash = (function () {
var schemes = {
"base" : [
"00bb3f", "238c47", "007929", "37dd6f", "63dd8d",
"0f4fa8", "284c7e", "05316d", "4380d3", "6996d3",
"ff9f00", "bf8930", "a66800", "ffb740", "ffca73",
"ff2800", "bf4630", "a61a00", "ff5d40", "ff8973"
]
};
function hashCode(str) {
var h, i, len, max;
h = 0;
max = Math.pow(2, 32);
for (i = 0, len = str.length; i < len; i++) {
h = (h * 31 + str.charCodeAt(i)) % max;
}
return h;
}
function getColor(str, name) {
var scheme, hash;
scheme = schemes[name] || schemes.base;
hash = hashCode(str);
return "#" + scheme[hash % scheme.length];
}
function addScheme(name, scheme) {
schemes[name] = scheme;
}
function getScheme(name) {
return scheme[name];
}
function deleteScheme(name) {
if (name !== "base") {
delete schemes[name];
}
}
return {
"addScheme" : addScheme,
"getScheme" : getScheme,
"deleteScheme" : deleteScheme,
"getHash" : hashCode,
"getColor" : getColor
}
}());
;// Generated by CoffeeScript 1.6.2
>>>>>>>
var ColorHash = (function () {
var schemes = {
"base" : [
"00bb3f", "238c47", "007929", "37dd6f", "63dd8d",
"0f4fa8", "284c7e", "05316d", "4380d3", "6996d3",
"ff9f00", "bf8930", "a66800", "ffb740", "ffca73",
"ff2800", "bf4630", "a61a00", "ff5d40", "ff8973"
]
};
function hashCode(str) {
var h, i, len, max;
h = 0;
max = Math.pow(2, 32);
for (i = 0, len = str.length; i < len; i++) {
h = (h * 31 + str.charCodeAt(i)) % max;
}
return h;
}
function getColor(str, name) {
var scheme, hash;
scheme = schemes[name] || schemes.base;
hash = hashCode(str);
return "#" + scheme[hash % scheme.length];
}
function addScheme(name, scheme) {
schemes[name] = scheme;
}
function getScheme(name) {
return scheme[name];
}
function deleteScheme(name) {
if (name !== "base") {
delete schemes[name];
}
}
return {
"addScheme" : addScheme,
"getScheme" : getScheme,
"deleteScheme" : deleteScheme,
"getHash" : hashCode,
"getColor" : getColor
}
}());
// Generated by CoffeeScript 1.6.2 |
<<<<<<<
constructor(props) {
super(props);
this.state = {
searchMode: props.defaultOpen,
value: '',
};
}
componentWillUnmount() {
clearTimeout(this.timeout);
}
=======
state = {
searchMode: this.props.defaultOpen,
value: '',
};
>>>>>>>
constructor(props) {
super(props);
this.state = {
searchMode: props.defaultOpen,
value: '',
};
}
componentWillUnmount() {
clearTimeout(this.timeout);
}
<<<<<<<
const { onPressEnter } = this.props;
const { value } = this.state;
this.timeout = setTimeout(() => {
onPressEnter(value); // Fix duplicate onPressEnter
}, 0);
=======
this.debouncePressEnter();
>>>>>>>
const { onPressEnter } = this.props;
const { value } = this.state;
this.timeout = setTimeout(() => {
onPressEnter(value); // Fix duplicate onPressEnter
}, 0);
<<<<<<<
=======
// NOTE: 不能小于500，如果长按某键，第一次触发auto repeat的间隔是500ms，小于500会导致触发2次
@Bind()
@Debounce(500, {
leading: true,
trailing: false,
})
debouncePressEnter() {
this.props.onPressEnter(this.state.value);
}
>>>>>>> |
<<<<<<<
extraBabelPlugins: [
[
'import',
{
libraryName: 'antd',
libraryDirectory: 'es',
style: true,
},
],
],
=======
extraBabelPlugins: [['import', { libraryName: 'antd', libraryDirectory: 'es', style: true }]],
>>>>>>>
extraBabelPlugins: [['import', { libraryName: 'antd', libraryDirectory: 'es', style: true }]],
<<<<<<<
=======
lessLoaderOptions: {
javascriptEnabled: true,
},
disableDynamicImport: true,
>>>>>>> |
<<<<<<<
componentDidUpdate(preProps) {
const { data } = this.props;
if (data !== preProps.data) {
=======
componentWillReceiveProps(nextProps) {
const { data } = this.props;
if (data !== nextProps.data) {
>>>>>>>
componentDidUpdate(preProps) {
const { data } = this.props;
if (data !== preProps.data) {
<<<<<<<
this.getLegendData();
=======
const { legendData } = this.state;
this.setState(
{
legendData: [...legendData],
},
() => {
this.getLegendData();
}
);
>>>>>>>
this.getLegendData();
<<<<<<<
// for window resize auto responsive legend
@Bind()
@Debounce(300)
resize() {
const { hasLegend } = this.props;
const { legendBlock } = this.state;
if (!hasLegend || !this.root) {
window.removeEventListener('resize', this.resize);
return;
}
if (this.root.parentNode.clientWidth <= 380) {
if (!legendBlock) {
this.setState({
legendBlock: true,
});
}
} else if (legendBlock) {
this.setState({
legendBlock: false,
});
}
}
=======
// for window resize auto responsive legend
@Bind()
@Debounce(300)
resize() {
const { hasLegend } = this.props;
if (!hasLegend || !this.root) {
window.removeEventListener('resize', this.resize);
return;
}
const { legendBlock } = this.state;
if (this.root.parentNode.clientWidth <= 380) {
if (!legendBlock) {
this.setState({
legendBlock: true,
});
}
} else if (legendBlock) {
this.setState({
legendBlock: false,
});
}
}
>>>>>>>
// for window resize auto responsive legend
@Bind()
@Debounce(300)
resize() {
const { hasLegend } = this.props;
const { legendBlock } = this.state;
if (!hasLegend || !this.root) {
window.removeEventListener('resize', this.resize);
return;
}
if (this.root.parentNode.clientWidth <= 380) {
if (!legendBlock) {
this.setState({
legendBlock: true,
});
}
} else if (legendBlock) {
this.setState({
legendBlock: false,
});
}
}
<<<<<<<
let { data, selected, tooltip } = this.props;
data = data || [];
selected = selected || true;
tooltip = tooltip || true;
=======
// let data = this.props.data || [];
// let selected = this.props.selected || true;
// let tooltip = this.props.tooltip || true;
>>>>>>>
data = data || [];
selected = selected || true;
tooltip = tooltip || true; |
<<<<<<<
//left panel
"ngw-pyramid/navigation-menu/NavigationMenu",
"ngw-webmap/ui/LayersPanel/LayersPanel",
"ngw-webmap/ui/PrintMapPanel/PrintMapPanel",
=======
"./tool/Swipe",
"./ui/PrintButton/PrintButton",
>>>>>>>
//left panel
"ngw-pyramid/navigation-menu/NavigationMenu",
"ngw-webmap/ui/LayersPanel/LayersPanel",
"ngw-webmap/ui/PrintMapPanel/PrintMapPanel",
"./tool/Swipe",
<<<<<<<
NavigationMenu,
LayersPanel,
PrintMapPanel,
=======
ToolSwipe,
PrintButton,
>>>>>>>
NavigationMenu,
LayersPanel,
PrintMapPanel,
ToolSwipe,
<<<<<<<
=======
this.mapToolbar.items.addTool(new ToolSwipe({display: this, orientation: "vertical"}), 'swipeVertical');
this.mapToolbar.items.addSeparator();
this.mapToolbar.items.addButton(PrintButton);
>>>>>>>
this.mapToolbar.items.addTool(new ToolSwipe({display: this, orientation: "vertical"}), 'swipeVertical'); |
<<<<<<<
let modal = _q(modalSelector, container)[0];
let modalDoc = _q('[role="document"]', modal)[0];
=======
let modal = container.querySelector(modalSelector);
>>>>>>>
let modal = _q(modalSelector, container)[0];
<<<<<<<
// set first/last focusable elements
focusableElements = _q(focusableSelectors.join(), modal);
=======
>>>>>>> |
<<<<<<<
watched: [],
warned: [],
failing: []
}
=======
watched: []
};
>>>>>>>
watched: [],
warned: [],
failing: []
}; |
<<<<<<<
/* DESC: A info message that the required features to create this view are disabled. */
ui_strings.S_INFO_REQUIRED_SERVICES_DISABLED = "Features to create this view are disabled";
/* DESC: A info message that the debugger is currently in profiler mode. */
ui_strings.S_INFO_PROFILER_MODE = "The debugger is in profiler mode. All other features are disabled."
/* DESC: A info message that the debugger is currently in HTTP profiler mode. */
ui_strings.S_INFO_HTTP_PROFILER_MODE = "The debugger is in HTTP profiler mode. All other features are disabled."
/* DESC: Button label to enable the default debugger features. */
ui_strings.S_LABEL_ENABLE_DEFAULT_FEATURES = "Enable the default debugger features"
/* DESC: Dialog to confirm switching to network-profiler mode. */
ui_strings.S_CONFIRM_SWITCH_TO_NETWORK_PROFILER = "Switching to Network-Profiler mode means that other Dragonfly features are turned off. You may loose changes you made.";
/* DESC: Button to switch to network-profiler mode. */
ui_strings.S_BUTTON_SWITCH_TO_NETWORK_PROFILER = "Switch to Network-Profiler mode";
=======
>>>>>>>
/* DESC: Dialog to confirm switching to network-profiler mode. */
ui_strings.S_CONFIRM_SWITCH_TO_NETWORK_PROFILER = "Switching to Network-Profiler mode means that other Dragonfly features are turned off. You may loose changes you made.";
/* DESC: Button to switch to network-profiler mode. */
ui_strings.S_BUTTON_SWITCH_TO_NETWORK_PROFILER = "Switch to Network-Profiler mode"; |
<<<<<<<
' <div class="clipboard-button"><span class="button icon-clippy"></span></div>' +
' <div class="password-button">' +
' <span class="button {{#if hasPassword}}icon-password"{{else}}icon-no-password{{/if}}"></span>' +
' <div class="popovermenu password-menu menu-left">' +
' <ul>' +
' <li>' +
' <span class="menuitem icon-triangle-e password-option">' +
' <form class="password-form">' +
' <input class="password-input" required maxlength="200" type="password"' +
' placeholder="{{#if hasPassword}}' + t('spreed', 'Change password') + '{{else}}' + t('spreed', 'Set password') + '{{/if}}">'+
' <input type="submit" value="" class="icon icon-confirm password-confirm"></input>'+
' </form>' +
' </span>' +
' </li>' +
' </ul>' +
' </div>' +
=======
' <div class="clipboard-button"><span class="icon icon-clippy"></span></div>' +
' <div class="password-button"><span class="icon {{#if hasPassword}}icon-password"{{else}}icon-no-password{{/if}}"></span></div>' +
' <div class="password-option">' +
' <input class="password-input" maxlength="200" type="password" autocomplete="new-password"' +
' placeholder="{{#if hasPassword}}' + t('spreed', 'Change password') + '{{else}}' + t('spreed', 'Set password') + '{{/if}}">'+
' <div class="icon icon-confirm password-confirm"></div>'+
>>>>>>>
' <div class="clipboard-button"><span class="button icon-clippy"></span></div>' +
' <div class="password-button">' +
' <span class="button {{#if hasPassword}}icon-password"{{else}}icon-no-password{{/if}}"></span>' +
' <div class="popovermenu password-menu menu-left">' +
' <ul>' +
' <li>' +
' <span class="menuitem icon-triangle-e password-option">' +
' <form class="password-form">' +
' <input class="password-input" required maxlength="200" type="password"' +
' placeholder="{{#if hasPassword}}' + t('spreed', 'Change password') + '{{else}}' + t('spreed', 'Set password') + '{{/if}}">'+
' <input type="submit" value="" autocomplete="new-password" class="icon icon-confirm password-confirm"></input>'+
' </form>' +
' </span>' +
' </li>' +
' </ul>' +
' </div>' +
<<<<<<<
confirmPassword: function(event) {
event.preventDefault();
=======
showPasswordInput: function() {
this.passwordInputIsShown = true;
this.ui.passwordButton.hide();
this.ui.passwordOption.show();
this.ui.passwordInput.focus();
},
confirmPassword: function() {
>>>>>>>
confirmPassword: function(e) {
e.preventDefault();
<<<<<<<
OC.hideMenus();
OCA.SpreedMe.app.syncRooms();
=======
this.ui.passwordOption.hide();
this.ui.passwordButton.show();
OCA.SpreedMe.app.signaling.syncRooms();
>>>>>>>
OC.hideMenus();
OCA.SpreedMe.app.signaling.syncRooms();
<<<<<<<
OC.hideMenus();
=======
this.passwordInputIsShown = false;
this.ui.passwordInput.val('');
this.ui.passwordOption.hide();
this.ui.passwordButton.show();
>>>>>>>
OC.hideMenus(); |
<<<<<<<
ui_strings.S_TEXT_STATUS_SEARCH = "Matches for %(SEARCH_TERM)s: Match %(SEARCH_COUNT_INDEX)s out of %(SEARCH_COUNT_TOTAL)s";
/* DESC: Message in detail view of http logger when no request/respons is selected */
ui_strings.S_TEXT_NO_REQUEST_SELECTED = "No request selected.";
=======
ui_strings.S_TEXT_STATUS_SEARCH = "Matches for \"%(SEARCH_TERM)s\": Match %(SEARCH_COUNT_INDEX)s out of %(SEARCH_COUNT_TOTAL)s";
ui_strings.S_TEXT_STATUS_SEARCH_NO_MATCH = "No match for \"%(SEARCH_TERM)s\"";
>>>>>>>
ui_strings.S_TEXT_STATUS_SEARCH = "Matches for \"%(SEARCH_TERM)s\": Match %(SEARCH_COUNT_INDEX)s out of %(SEARCH_COUNT_TOTAL)s";
/* */
ui_strings.S_TEXT_STATUS_SEARCH_NO_MATCH = "No match for \"%(SEARCH_TERM)s\"";
/* DESC: Message in detail view of http logger when no request/respons is selected */
ui_strings.S_TEXT_NO_REQUEST_SELECTED = "No request selected."; |
<<<<<<<
=======
XMLHttpRequest = window.XMLHttpRequest,
jQuery = window.jQuery,
>>>>>>>
XMLHttpRequest = window.XMLHttpRequest,
jQuery = window.jQuery,
<<<<<<<
version: '2.0.0b',
=======
version: '1.2.5',
>>>>>>>
version: '2.0.0b',
<<<<<<<
queue.next();
});
}
else {
Form.append(name, file, filename);
}
})(file);
=======
queue.next();
});
}
else if( filename !== api.expando ){
Form.append(name, file, filename);
}
>>>>>>>
queue.next();
});
}
else if( filename !== api.expando ){
Form.append(name, file, filename);
}
})(file); |
<<<<<<<
+ (opts.camera ? '&useCamera=1' : '')
// + '&debug=1'
}, opts);
=======
+ '&timeout='+api.flashAbortTimeout
});
>>>>>>>
+ '&timeout='+api.flashAbortTimeout
+ (opts.camera ? '&useCamera=1' : '')
// + '&debug=1'
}, opts); |
<<<<<<<
},
storage: {
result: "",
testSDCard: function(){
Device.storage.result = window.DroidGap.testSaveLocationExists();
return Device.storage.result;
},
testExistence: function(file){
Device.storage.result = window.DroidGap.testDirOrFileExists(file);
return Device.storage.result;
},
delFile: function(file){
Device.storage.result = window.DroidGap.deleteFile(file);
return Device.storage.result;
},
delDir: function(file){
Device.storage.result = window.DroidGap.deleteDirectory(file);
return Device.storage.result;
},
createDir: function(file){
Device.storage.result = window.DroidGap.createDirectory(file);
return Device.storage.result;
}
}
=======
},
audio: {
startRecording: function(file) {
window.DroidGap.startRecordingAudio(file);
},
stopRecording: function() {
window.DroidGap.stopRecordingAudio();
},
startPlaying: function(file) {
window.DroidGap.startPlayingAudio(file);
},
stopPlaying: function() {
window.DroidGap.stopPlayingAudio();
},
getCurrentPosition: function() {
return window.DroidGap.getCurrentPositionAudio();
},
getDuration: function(file) {
return window.DroidGap.getDurationAudio(file);
}
}
>>>>>>>
},
storage: {
result: "",
testSDCard: function(){
Device.storage.result = window.DroidGap.testSaveLocationExists();
return Device.storage.result;
},
testExistence: function(file){
Device.storage.result = window.DroidGap.testDirOrFileExists(file);
return Device.storage.result;
},
delFile: function(file){
Device.storage.result = window.DroidGap.deleteFile(file);
return Device.storage.result;
},
delDir: function(file){
Device.storage.result = window.DroidGap.deleteDirectory(file);
return Device.storage.result;
},
createDir: function(file){
Device.storage.result = window.DroidGap.createDirectory(file);
return Device.storage.result;
}
}
audio: {
startRecording: function(file) {
window.DroidGap.startRecordingAudio(file);
},
stopRecording: function() {
window.DroidGap.stopRecordingAudio();
},
startPlaying: function(file) {
window.DroidGap.startPlayingAudio(file);
},
stopPlaying: function() {
window.DroidGap.stopPlayingAudio();
},
getCurrentPosition: function() {
return window.DroidGap.getCurrentPositionAudio();
},
getDuration: function(file) {
return window.DroidGap.getDurationAudio(file);
}
} |
<<<<<<<
let getWarningString = function(warningPlugins) {
return (warningPlugins.length > 6 ?
warningPlugins.slice(0, 6).concat([
`... (${warningPlugins.length - 6} more)`
]) : warningPlugins)
.reduce((str, filename) => str + `- ${filename}\n`, '');
};
let pluginWarning = function() {
let pluginsStr = getWarningString($scope.merge.warningPlugins);
return confirm(`The following plugins will not be usable after building this merge. You can include them in the merge or remove the plugins they require from the merge to resolve this. Proceed anyways? \n\nPlugins:\n${pluginsStr}`);
};
=======
// initialization
$scope.editing = $scope.modalOptions.hasOwnProperty('merge');
$scope.merge = $scope.modalOptions.merge || mergeService.newMerge();
$scope.experimental = env.allow_experimental_merge_methods;
let initialFilename = $scope.merge.filename;
let dataPath = xelib.GetGlobal('DataPath');
>>>>>>>
// initialization
$scope.editing = $scope.modalOptions.hasOwnProperty('merge');
$scope.merge = $scope.modalOptions.merge || mergeService.newMerge();
$scope.experimental = env.allow_experimental_merge_methods;
let initialFilename = $scope.merge.filename;
let dataPath = xelib.GetGlobal('DataPath');
let getWarningString = function(warningPlugins) {
return (warningPlugins.length > 6 ?
warningPlugins.slice(0, 6).concat([
`... (${warningPlugins.length - 6} more)`
]) : warningPlugins)
.reduce((str, filename) => str + `- ${filename}\n`, '');
};
let pluginWarning = function() {
let pluginsStr = getWarningString($scope.merge.warningPlugins);
return confirm(`The following plugins will not be usable after building this merge. You can include them in the merge or remove the plugins they require from the merge to resolve this. Proceed anyways? \n\nPlugins:\n${pluginsStr}`);
}; |
<<<<<<<
import {xelib} from './lib';
// FILE VALUE METHODS
xelib.GetFileHeader = function(_id) {
return xelib.GetElement(_id, 'File Header');
};
xelib.GetNextObjectID = function(_id) {
return xelib.GetUIntValue(_id, 'File Header\\HEDR\\Next Object ID');
};
xelib.SetNextObjectID = function(_id, nextObjectID) {
this.SetUIntValue(_id, 'File Header\\HEDR\\Next Object ID', nextObjectID);
};
xelib.GetFileName = function(_id) {
return xelib.Name(_id);
};
xelib.GetAuthor = function(_id) {
return xelib.GetValue(_id, 'File Header\\CNAM', true);
};
xelib.SetAuthor = function(_id, author) {
return xelib.SetValue(_id, 'File Header\\CNAM', author);
};
xelib.GetDescription = function(_id) {
return xelib.GetValue(_id, 'File Header\\SNAM', true);
};
xelib.SetDescription = function(_id, description) {
if (!xelib.HasElement(_id, 'File Header\\SNAM'))
xelib.AddElement(_id, 'File Header\\SNAM');
return xelib.SetValue(_id, 'File Header\\SNAM', description);
};
xelib.GetIsESM = function(_id) {
return xelib.GetFlag(_id, 'File Header\\Record Header\\Record Flags', 'ESM');
};
xelib.SetIsESM = function(_id, enabled) {
return xelib.SetFlag(_id, 'File Header\\Record Header\\Record Flags', 'ESM', enabled);
=======
// FILE VALUE METHODS
xelib.GetFileHeader = function(_id) {
return xelib.GetElement(_id, 'File Header');
};
xelib.GetNextObjectID = function(_id) {
return xelib.GetUIntValue(_id, 'File Header\\HEDR\\Next Object ID');
};
xelib.SetNextObjectID = function(_id, nextObjectID) {
this.SetUIntValue(_id, 'File Header\\HEDR\\Next Object ID', nextObjectID);
};
xelib.GetFileName = function(_id) {
return xelib.Name(_id);
};
xelib.GetAuthor = function(_id) {
return xelib.GetValue(_id, 'File Header\\CNAM', true);
};
xelib.SetAuthor = function(_id, author) {
return xelib.SetValue(_id, 'File Header\\CNAM', author);
};
xelib.GetDescription = function(_id) {
return xelib.GetValue(_id, 'File Header\\SNAM', true);
};
xelib.SetDescription = function(_id, description) {
if (!xelib.HasElement(_id, 'File Header\\SNAM'))
xelib.AddElement(_id, 'File Header\\SNAM');
return xelib.SetValue(_id, 'File Header\\SNAM', description);
};
xelib.GetIsESM = function(_id) {
return xelib.GetFlag(_id, 'File Header\\Record Header\\Record Flags', 'ESM');
};
xelib.SetIsESM = function(_id, enabled) {
return xelib.SetFlag(_id, 'File Header\\Record Header\\Record Flags', 'ESM', enabled);
};
xelib.GetLoadedFileNames = function() {
let fileNames = undefined;
xelib.WithHandles(xelib.GetElements(), function(files) {
fileNames = files.map((file) => { return xelib.Name(file) });
});
return fileNames;
};
// TODO: we probably should make a native function for this
xelib.GetFileLoadOrder = function(file) {
return parseInt(xelib.DisplayName(file).substr(1, 2));
>>>>>>>
import {xelib} from './lib';
// FILE VALUE METHODS
xelib.GetFileHeader = function(_id) {
return xelib.GetElement(_id, 'File Header');
};
xelib.GetNextObjectID = function(_id) {
return xelib.GetUIntValue(_id, 'File Header\\HEDR\\Next Object ID');
};
xelib.SetNextObjectID = function(_id, nextObjectID) {
this.SetUIntValue(_id, 'File Header\\HEDR\\Next Object ID', nextObjectID);
};
xelib.GetFileName = function(_id) {
return xelib.Name(_id);
};
xelib.GetAuthor = function(_id) {
return xelib.GetValue(_id, 'File Header\\CNAM', true);
};
xelib.SetAuthor = function(_id, author) {
return xelib.SetValue(_id, 'File Header\\CNAM', author);
};
xelib.GetDescription = function(_id) {
return xelib.GetValue(_id, 'File Header\\SNAM', true);
};
xelib.SetDescription = function(_id, description) {
if (!xelib.HasElement(_id, 'File Header\\SNAM'))
xelib.AddElement(_id, 'File Header\\SNAM');
return xelib.SetValue(_id, 'File Header\\SNAM', description);
};
xelib.GetIsESM = function(_id) {
return xelib.GetFlag(_id, 'File Header\\Record Header\\Record Flags', 'ESM');
};
xelib.SetIsESM = function(_id, enabled) {
return xelib.SetFlag(_id, 'File Header\\Record Header\\Record Flags', 'ESM', enabled);
};
xelib.GetNextObjectID = function(_id) {
return xelib.GetUIntValue(_id, 'File Header\\HEDR\\Next Object ID');
};
xelib.SetNextObjectID = function(_id, nextObjectID) {
this.SetUIntValue(_id, 'File Header\\HEDR\\Next Object ID', nextObjectID);
};
xelib.GetFileName = function(_id) {
return xelib.Name(_id);
};
xelib.GetAuthor = function(_id) {
return xelib.GetValue(_id, 'File Header\\CNAM', true);
};
xelib.SetAuthor = function(_id, author) {
return xelib.SetValue(_id, 'File Header\\CNAM', author);
};
xelib.GetDescription = function(_id) {
return xelib.GetValue(_id, 'File Header\\SNAM', true);
};
xelib.SetDescription = function(_id, description) {
if (!xelib.HasElement(_id, 'File Header\\SNAM'))
xelib.AddElement(_id, 'File Header\\SNAM');
return xelib.SetValue(_id, 'File Header\\SNAM', description);
};
xelib.GetIsESM = function(_id) {
return xelib.GetFlag(_id, 'File Header\\Record Header\\Record Flags', 'ESM');
};
xelib.SetIsESM = function(_id, enabled) {
return xelib.SetFlag(_id, 'File Header\\Record Header\\Record Flags', 'ESM', enabled);
};
xelib.GetLoadedFileNames = function() {
let fileNames = undefined;
xelib.WithHandles(xelib.GetElements(), function(files) {
fileNames = files.map((file) => { return xelib.Name(file) });
});
return fileNames;
};
// TODO: we probably should make a native function for this
xelib.GetFileLoadOrder = function(file) {
return parseInt(xelib.DisplayName(file).substr(1, 2)); |
<<<<<<<
require('dotenv').config();
require('@babel/register')({ extensions: ['.js', '.jsx', '.ts'] });
=======
require('@babel/register')({ extensions: ['.js', '.jsx', '.ts', '.tsx'] });
process.env.ROOT_PATH = process.env.ROOT_PATH || __dirname;
>>>>>>>
require('dotenv').config();
require('@babel/register')({ extensions: ['.js', '.jsx', '.ts', '.tsx'] });
process.env.ROOT_PATH = process.env.ROOT_PATH || __dirname; |
<<<<<<<
import { wrapDispatch } from 'app/Multireducer';
import { hideSemanticSearch } from 'app/Library/actions/libraryActions';
import { fetchSearches, submitNewSearch, registerForUpdates, updateSearch } from '../actions/actions';
=======
import { hideSemanticSearch } from 'app/SemanticSearch/actions/actions';
import { fetchSearches, submitNewSearch } from '../actions/actions';
>>>>>>>
import { wrapDispatch } from 'app/Multireducer';
import { hideSemanticSearch } from 'app/Library/actions/libraryActions';
import { fetchSearches, submitNewSearch, registerForUpdates, updateSearch } from '../actions/actions';
<<<<<<<
this.showMainPage = this.showMainPage.bind(this);
this.showNewSearchPage = this.showNewSearchPage.bind(this);
this.onSearchUpdated = this.onSearchUpdated.bind(this);
socket.on('semanticSearchUpdated', this.onSearchUpdated);
=======
>>>>>>>
this.showMainPage = this.showMainPage.bind(this);
this.showNewSearchPage = this.showNewSearchPage.bind(this);
this.onSearchUpdated = this.onSearchUpdated.bind(this);
socket.on('semanticSearchUpdated', this.onSearchUpdated);
<<<<<<<
<ShowIf if={page === 'new'}>
<div className="sidepanel-footer">
<span
className="btn btn-danger cancel-search"
onClick={this.showMainPage}
>
<Icon icon="times" />
<span className="btn-label">{t('System', 'Cancel')}</span>
</span>
<button
className="btn btn-success start-search"
onClick={this.submitForm}
>
<Icon icon="search" />
<span className="btn-label">{t('System', 'Start search')}</span>
</button>
</div>
</ShowIf>
<div className="sidepanel-body">
<p className="sidepanel-title">{t('System', 'Semantic search')}</p>
<button className="closeSidepanel close-modal" onClick={this.close.bind(this)}>
<Icon icon="times" />
</button>
<ShowIf if={page === 'main'}>
<div style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
marginTop: 30,
marginBottom: 30 }}
>
<button
className="btn btn-default new-search"
onClick={this.showNewSearchPage}
>
{t('System', 'Start new search')}
</button>
=======
<button className="closeSidepanel close-modal" onClick={this.props.hideSemanticSearch}>
<Icon icon="times" />
</button>
<div className="sidepanel-header">
<span className="sidepanel-title">{t('System', 'Semantic search')}</span>
<LocalForm
model="searchText"
autoComplete="off"
onSubmit={this.onSubmit}
getDispatch={dispatch => this.attachDispatch(dispatch)}
className="form-inline semantic-search-form"
>
<div className="input-group">
<Field model=".searchTerm">
<input
type="text"
placeholder={t('System', 'Search', null, false)}
className="form-control"
autoComplete="off"
/>
</Field>
>>>>>>>
<button className="closeSidepanel close-modal" onClick={this.props.hideSemanticSearch}>
<Icon icon="times" />
</button>
<div className="sidepanel-header">
<span className="sidepanel-title">{t('System', 'Semantic search')}</span>
<LocalForm
model="searchText"
autoComplete="off"
onSubmit={this.onSubmit}
getDispatch={dispatch => this.attachDispatch(dispatch)}
className="form-inline semantic-search-form"
>
<div className="input-group">
<Field model=".searchTerm">
<input
type="text"
placeholder={t('System', 'Search', null, false)}
className="form-control"
autoComplete="off"
/>
</Field>
<<<<<<<
search: state.semanticSearch.search,
open: state[props.storeKey].ui.get('showSemanticSearchPanel')
=======
open: state.semanticSearch.showSemanticSearchPanel
>>>>>>>
search: state.semanticSearch.search,
open: state.semanticSearch.showSemanticSearchPanel
<<<<<<<
submitNewSearch,
registerForUpdates,
updateSearch,
hideSemanticSearch
}, wrapDispatch(dispatch, 'library'));
=======
submitNewSearch,
hideSemanticSearch
}, dispatch);
>>>>>>>
submitNewSearch,
registerForUpdates,
updateSearch,
hideSemanticSearch
}, dispatch); |
<<<<<<<
topicClassification: Joi.boolean(),
=======
favorites: Joi.boolean(),
>>>>>>>
topicClassification: Joi.boolean(),
favorites: Joi.boolean(), |
<<<<<<<
import { RowList } from 'app/Layout/Lists';
=======
>>>>>>>
<<<<<<<
export function SemanticSearchResults({ search, filters }) {
const items = search.results ? filterItems(search.results, filters) : [];
const isEmpty = Object.keys(search).length === 0;
return (
<div className="row panels-layout">
{ isEmpty &&
<React.Fragment>
<p>Search not found</p>
<Helmet title="Semantic search not found" />
</React.Fragment>
}
{ !isEmpty &&
<React.Fragment>
<Helmet title={`${search.searchTerm} - Semantic search results`} />
<main className="semantic-search-results-viewer document-viewer with-panel">
<div>
{ search.searchTerm }
</div>
{/* <RowList>
{items.map(result => (
<ResultItem result={result} key={result.sharedId} />
))}
</RowList> */}
<ItemList items={items} link="" storeKey="library"/>
</main>
<ResultsSidePanel />
</React.Fragment>
}
</div>
);
=======
export class SemanticSearchResults extends Component {
render() {
const { search, filters } = this.props;
const items = search.results ? filterItems(search.results, filters) : [];
const isEmpty = Object.keys(search).length === 0;
return (
<div className="row panels-layout">
{ isEmpty &&
<React.Fragment>
<p>Search not found</p>
<Helmet title="Semantic search not found" />
</React.Fragment>
}
{ !isEmpty &&
<React.Fragment>
<Helmet title={`${search.searchTerm} - Semantic search results`} />
<main className="semantic-search-results-viewer document-viewer with-panel">
<div>
{ search.searchTerm }
</div>
<ItemList items={items} link="" storeKey="library"/>
</main>
<ResultsSidePanel />
</React.Fragment>
}
</div>
);
}
>>>>>>>
export class SemanticSearchResults extends Component {
render() {
const { search, filters } = this.props;
const items = search.results ? filterItems(search.results, filters) : [];
const isEmpty = Object.keys(search).length === 0;
return (
<div className="row panels-layout">
{ isEmpty &&
<React.Fragment>
<p>Search not found</p>
<Helmet title="Semantic search not found" />
</React.Fragment>
}
{ !isEmpty &&
<React.Fragment>
<Helmet title={`${search.searchTerm} - Semantic search results`} />
<main className="semantic-search-results-viewer document-viewer with-panel">
<div>
{ search.searchTerm }
</div>
<ItemList items={items} link="" storeKey="library"/>
</main>
<ResultsSidePanel />
</React.Fragment>
}
</div>
);
} |
<<<<<<<
import referencesAPI from 'app/Viewer/referencesAPI';
=======
>>>>>>>
<<<<<<<
return Promise.all([
getDocument(documentId),
referencesAPI.get(documentId),
templatesAPI.get(),
thesaurisAPI.get(),
relationTypesAPI.get()
])
.then(([doc, references, templates, thesauris, relationTypes]) => {
return {
templates,
thesauris,
documentViewer: {
doc,
references: referencesUtils.filterRelevant(references, lang),
templates,
thesauris,
relationTypes
},
relationTypes
};
});
=======
return requestViewerState(documentId, lang);
>>>>>>>
return requestViewerState(documentId, lang); |
<<<<<<<
fullTextSearch(
=======
includeUnpublished() {
const matchPublished = baseQuery.query.bool.filter.find(i => i.term && i.term.published);
if (matchPublished) {
baseQuery.query.bool.filter.splice(baseQuery.query.bool.filter.indexOf(matchPublished), 1);
}
return this;
},
fullTextSearch( // eslint-disable-line max-params
>>>>>>>
fullTextSearch( // eslint-disable-line max-params |
<<<<<<<
Joi.number().allow('').allow(null),
Joi.string().allow(''),
=======
Joi.number().allow(''),
Joi.string().allow('').allow(null),
>>>>>>>
Joi.number().allow('').allow(null),
Joi.string().allow('').allow(null), |
<<<<<<<
import { validateRequest, handleError, createError } from '../utils';
=======
import { validation, handleError } from '../utils';
>>>>>>>
import { validation, handleError, createError } from '../utils';
<<<<<<<
validateRequest(saveSchema),
async (req, res, next) => {
=======
validation.validateRequest(saveSchema),
async (req, res) => {
>>>>>>>
validation.validateRequest(saveSchema),
async (req, res, next) => {
<<<<<<<
const newEntity = await entities.save(entity, { user: {}, language: req.language });
=======
const newEntity = await entities.save(entity, { user: {}, language: req.language });
>>>>>>>
const newEntity = await entities.save(entity, { user: {}, language: req.language }); |
<<<<<<<
import debugLog from 'shared/debugLog';
import errorLog from 'shared/errorLog';
import fs from 'fs';
=======
import path from 'path';
>>>>>>>
import debugLog from 'shared/debugLog';
import errorLog from 'shared/errorLog';
import fs from 'fs';
import path from 'path'; |
<<<<<<<
expect(
error.errors.some(e => e.params.keyword === 'metadataMatchesTemplateProperties')
).toBe(true);
=======
>>>>>>> |
<<<<<<<
import ShowIf from 'app/App/ShowIf';
import { reloadThesauri } from 'app/Thesauris/actions/thesaurisActions';
=======
import { reloadThesauris } from 'app/Thesauris/actions/thesaurisActions';
>>>>>>>
import { reloadThesauri } from 'app/Thesauris/actions/thesaurisActions';
<<<<<<<
login(credentials) {
return this.props
.login(credentials)
.then(() => {
if (this.props.private) {
browserHistory.push('/');
reloadHome();
return;
}
reconnectSocket();
this.props.reloadThesauris();
browserHistory.push('/');
})
.catch(() => {
this.setState({ error: true });
});
=======
resolveSuccessfulLogin() {
if (this.props.private) {
browserHistory.push('/');
reloadHome();
return;
}
reconnectSocket();
this.props.reloadThesauris();
browserHistory.push('/');
}
async login(credentials) {
try {
await this.props.login(credentials);
this.resolveSuccessfulLogin();
} catch (err) {
if (!this.state.tokenRequired && err.status === 409) {
this.setState({ tokenRequired: true });
} else {
const { tokenRequired } = this.state;
this.formDispatch(formActions.change('loginForm.token', undefined));
const error2fa = tokenRequired;
this.setState({ error: true, tokenRequired, error2fa });
}
}
>>>>>>>
resolveSuccessfulLogin() {
if (this.props.private) {
browserHistory.push('/');
reloadHome();
return;
}
reconnectSocket();
this.props.reloadThesauris();
browserHistory.push('/');
}
async login(credentials) {
try {
await this.props.login(credentials);
this.resolveSuccessfulLogin();
} catch (err) {
if (!this.state.tokenRequired && err.status === 409) {
this.setState({ tokenRequired: true });
} else {
const { tokenRequired } = this.state;
this.formDispatch(formActions.change('loginForm.token', undefined));
const error2fa = tokenRequired;
this.setState({ error: true, tokenRequired, error2fa });
}
}
<<<<<<<
<Form onSubmit={this.submit} model="login.form">
<div className={`form-group login-email${this.state.error ? ' has-error' : ''}`}>
<Field model="login.form.username">
<label className="form-group-label" htmlFor="username">
{this.state.recoverPassword ? t('System', 'Email') : t('System', 'User')}
</label>
<input type="text" name="username" id="username" className="form-control" />
</Field>
</div>
<div
className={`form-group login-password ${this.state.error ? 'has-error' : ''}${
this.state.recoverPassword ? ' is-hidden' : ''
}`}
>
<label className="form-group-label" htmlFor="password">
{t('System', 'Password')}
</label>
<Field model="login.form.password">
<input type="password" name="password" id="password" className="form-control" />
</Field>
<div className="form-text">
{this.state.error && <span>{t('System', 'Login failed')} - </span>}
<a
title={t('System', 'Forgot Password?', null, false)}
onClick={this.setRecoverPassword.bind(this)}
className={this.state.error ? 'label-danger' : ''}
=======
<LocalForm
onSubmit={this.submit}
model="loginForm"
getDispatch={dispatch => {
this.formDispatch = dispatch;
}}
>
{!this.state.tokenRequired && (
<React.Fragment>
<div className={`form-group login-email${this.state.error ? ' has-error' : ''}`}>
<Field model=".username">
<label className="form-group-label" htmlFor="username">
{this.state.recoverPassword ? t('System', 'Email') : t('System', 'User')}
</label>
<input type="text" name="username" id="username" className="form-control" />
</Field>
</div>
<div
className={`form-group login-password ${this.state.error ? 'has-error' : ''}${
this.state.recoverPassword ? ' is-hidden' : ''
}`}
>>>>>>>
<LocalForm
onSubmit={this.submit}
model="loginForm"
getDispatch={dispatch => {
this.formDispatch = dispatch;
}}
>
{!this.state.tokenRequired && (
<React.Fragment>
<div className={`form-group login-email${this.state.error ? ' has-error' : ''}`}>
<Field model=".username">
<label className="form-group-label" htmlFor="username">
{this.state.recoverPassword ? t('System', 'Email') : t('System', 'User')}
</label>
<input type="text" name="username" id="username" className="form-control" />
</Field>
</div>
<div
className={`form-group login-password ${this.state.error ? 'has-error' : ''}${
this.state.recoverPassword ? ' is-hidden' : ''
}`}
<<<<<<<
<button
type="submit"
className={`btn btn-block btn-lg ${
this.state.recoverPassword ? 'btn-success' : 'btn-primary'
}`}
>
{this.state.recoverPassword
? t('System', 'Send recovery email')
: t('System', 'Login button', 'Login')}
=======
<button
type="submit"
className={`btn btn-block btn-lg ${
this.state.recoverPassword ? 'btn-success' : 'btn-primary'
}`}
>
{submitLabel}
>>>>>>>
<button
type="submit"
className={`btn btn-block btn-lg ${
this.state.recoverPassword ? 'btn-success' : 'btn-primary'
}`}
>
{submitLabel}
<<<<<<<
<a title={t('System', 'Cancel', null, false)} onClick={this.setLogin.bind(this)}>
=======
<span
title={t('System', 'Cancel', null, false)}
onClick={this.setLogin}
className="button cancel"
>
>>>>>>>
<span
title={t('System', 'Cancel', null, false)}
onClick={this.setLogin}
className="button cancel"
>
<<<<<<<
return bindActionCreators(
{
login: auth.actions.login,
recoverPassword: auth.actions.recoverPassword,
reset: formActions.reset,
reloadThesauris: reloadThesauri,
},
dispatch
);
=======
return bindActionCreators(
{
login: auth.actions.login,
recoverPassword: auth.actions.recoverPassword,
reloadThesauris,
},
dispatch
);
>>>>>>>
return bindActionCreators(
{
login: auth.actions.login,
recoverPassword: auth.actions.recoverPassword,
reloadThesauris: reloadThesauri,
},
dispatch
); |
<<<<<<<
import Helmet from 'react-helmet'
=======
import { Link } from 'react-router'
>>>>>>>
import Helmet from 'react-helmet'
import { Link } from 'react-router'
<<<<<<<
<div>
<Helmet title='Upload' />
<h1>Uploaded documents</h1>
<div className="row">
<div className="col-md-7">
<table className="table table-striped table-hover ">
<thead>
<tr>
<th>#</th>
<th>Title</th>
<th>Author</th>
<th>Category</th>
<th>File</th>
</tr>
</thead>
<tbody>
{this.state.documents.map((doc, index) => {
return <tr onClick={this.editDocument.bind(this, doc)} key={index}>
<td>{index + 1}</td>
<td>{doc.value.title}</td>
<td>{doc.value.author}</td>
<td>{doc.value.category}</td>
<td>{this.docFileValue(doc)}</td>
</tr>
})}
</tbody>
</table>
</div>
<div className="col-md-5">
{(() => {
if(this.state.documentBeingEdited){
return (
<div>
<SelectField label="Template" value={this.state.documentBeingEdited.value.template} ref={(ref) => {this.templateField = ref}} options={options} onChange={this.templateChanged} />
<Form fields={this.state.template.fields} values={this.state.documentBeingEdited.value.metadata} ref={(ref) => this.form = ref }/>
<button onClick={this.cancelEdit}>Cancel</button>
<button onClick={this.saveDocument}>Save</button>
</div>
)
}
})()}
</div>
=======
<div className="row">
<div className="col-md-7">
<table className="table table-striped table-hover ">
<thead>
<tr>
<th>#</th>
<th>Title</th>
<th>Author</th>
<th>Category</th>
<th>File</th>
</tr>
</thead>
<tbody>
{this.state.documents.map((doc, index) => {
let documentViewUrl = '/document/'+doc.id;
return <tr onClick={this.editDocument.bind(this, doc)} key={index}>
<td>{index + 1}</td>
<td>{doc.value.title}</td>
<td>{doc.value.author}</td>
<td>{doc.value.category}</td>
<td>
{this.docFileValue(doc)}
<Link to={documentViewUrl} className="navbar-brand">View</Link>
</td>
</tr>
})}
</tbody>
</table>
</div>
<div className="col-md-5">
{(() => {
if(this.state.documentBeingEdited){
return (
<div>
<SelectField label="Template" value={this.state.documentBeingEdited.value.template} ref={(ref) => {this.templateField = ref}} options={options} onChange={this.templateChanged} />
<Form fields={this.state.template.fields} values={this.state.documentBeingEdited.value.metadata} ref={(ref) => this.form = ref }/>
<button onClick={this.cancelEdit}>Cancel</button>
<button onClick={this.saveDocument}>Save</button>
</div>
)
}
})()}
>>>>>>>
<div>
<Helmet title='Upload' />
<h1>Uploaded documents</h1>
<div className="row">
<div className="col-md-7">
<table className="table table-striped table-hover ">
<thead>
<tr>
<th>#</th>
<th>Title</th>
<th>Author</th>
<th>Category</th>
<th>File</th>
</tr>
</thead>
<tbody>
{this.state.documents.map((doc, index) => {
let documentViewUrl = '/document/'+doc.id;
return <tr onClick={this.editDocument.bind(this, doc)} key={index}>
<td>{index + 1}</td>
<td>{doc.value.title}</td>
<td>{doc.value.author}</td>
<td>{doc.value.category}</td>
<td>
{this.docFileValue(doc)}
<Link to={documentViewUrl} className="navbar-brand">View</Link>
</td>
</tr>
})}
</tbody>
</table>
</div>
<div className="col-md-5">
{(() => {
if(this.state.documentBeingEdited){
return (
<div>
<SelectField label="Template" value={this.state.documentBeingEdited.value.template} ref={(ref) => {this.templateField = ref}} options={options} onChange={this.templateChanged} />
<Form fields={this.state.template.fields} values={this.state.documentBeingEdited.value.metadata} ref={(ref) => this.form = ref }/>
<button onClick={this.cancelEdit}>Cancel</button>
<button onClick={this.saveDocument}>Save</button>
</div>
)
}
})()}
</div> |
<<<<<<<
const sentencesAboveThreshold = (item, threshold) => {
let count = item.getIn(['semanticSearch', 'results']).toJS().findIndex(({ score }) => score < threshold);
count = count >= 0 ? count : item.getIn(['semanticSearch', 'results']).size;
return {
count,
percentage: count / item.getIn(['semanticSearch', 'results']).size * 100
};
};
const filterAndSortItems = (items, { threshold, minRelevantSentences }) => items.map(item =>
item.setIn(['semanticSearch', 'aboveThreshold'], sentencesAboveThreshold(item, threshold))
)
.filter(item =>
item.getIn(['semanticSearch', 'aboveThreshold']).count >= minRelevantSentences
)
.sort((a, b) =>
b.getIn(['semanticSearch', 'aboveThreshold']).percentage -
a.getIn(['semanticSearch', 'aboveThreshold']).percentage
);
=======
>>>>>>>
<<<<<<<
const resultsSize = doc.getIn(['semanticSearch', 'results']).size;
const aboveThreshold = doc.getIn(['semanticSearch', 'aboveThreshold']).count;
const { percentage } = doc.getIn(['semanticSearch', 'aboveThreshold']);
=======
const resultsSize = doc.getIn(['semanticSearch', 'totalResults']);
const aboveThreshold = doc.getIn(['semanticSearch', 'numRelevant']);
const percentage = doc.getIn(['semanticSearch', 'relevantRate']) * 100;
>>>>>>>
const resultsSize = doc.getIn(['semanticSearch', 'totalResults']);
const aboveThreshold = doc.getIn(['semanticSearch', 'numRelevant']);
const percentage = doc.getIn(['semanticSearch', 'relevantRate']) * 100;
<<<<<<<
selectDocuments: PropTypes.func.isRequired,
=======
getSearch: PropTypes.func.isRequired,
getMoreSearchResults: PropTypes.func.isRequired,
>>>>>>>
multipleUpdate: PropTypes.func.isRequired,
getSearch: PropTypes.func.isRequired,
getMoreSearchResults: PropTypes.func.isRequired,
<<<<<<<
addSearchResults,
selectDocuments
=======
addSearchResults,
getSearch,
getMoreSearchResults,
>>>>>>>
multipleUpdate,
addSearchResults,
getSearch,
getMoreSearchResults, |
<<<<<<<
expect(context.store.dispatch).toHaveBeenCalledWith({type: 'rrf/reset', model: 'documentViewer.tocForm'});
=======
expect(context.store.dispatch).toHaveBeenCalledWith({type: 'viewer/targetDoc/UNSET'});
>>>>>>>
expect(context.store.dispatch).toHaveBeenCalledWith({type: 'rrf/reset', model: 'documentViewer.tocForm'});
expect(context.store.dispatch).toHaveBeenCalledWith({type: 'viewer/targetDoc/UNSET'}); |
<<<<<<<
import rison from 'rison';
=======
import rison from 'rison-node';
import Doc from 'app/Library/components/Doc';
>>>>>>>
import rison from 'rison-node'; |
<<<<<<<
return entities.indexEntities({}, '+fullText', 200, indexed => {
process.stdout.write(
`Indexing documents and entities... ${spinner[pos]} - ${docsIndexed} indexed\r`
);
=======
return search.indexEntities({}, '+fullText', 200, (indexed) => {
process.stdout.write(`Indexing documents and entities... ${spinner[pos]} - ${docsIndexed} indexed\r`);
>>>>>>>
return search.indexEntities({}, '+fullText', 200, indexed => {
process.stdout.write(
`Indexing documents and entities... ${spinner[pos]} - ${docsIndexed} indexed\r`
); |
<<<<<<<
it('should add the uploaded file to attachments, add current timestamp and return the attachment, including its new ID', (done) => {
spyOn(Date, 'now').and.returnValue(1000);
=======
it('should have a validation schema', () => {
expect(routes.post.validation('/api/attachments/upload')).toMatchSnapshot();
});
it('should add the uploaded file to attachments and return it, including its new ID', (done) => {
>>>>>>>
it('should have a validation schema', () => {
expect(routes.post.validation('/api/attachments/upload')).toMatchSnapshot();
});
it('should add the uploaded file to attachments, add current timestamp and return the attachment, including its new ID', (done) => {
spyOn(Date, 'now').and.returnValue(1000); |
<<<<<<<
issues: [i1],
year: 2019,
=======
issues: [i1, null],
>>>>>>>
issues: [i1, null],
year: 2019, |
<<<<<<<
<i className="fa fa-close" onClick={this.resetSearch.bind(this)} />
=======
<i className="fa fa-times" onClick={this.resetSearch.bind(this)}></i>
>>>>>>>
<i className="fa fa-times" onClick={this.resetSearch.bind(this)} /> |
<<<<<<<
dispatch(notify('Success', 'success'));
completionResolve(response);
=======
dispatch(notificationActions.notify('Success', 'success'));
resolve(response);
>>>>>>>
dispatch(notificationActions.notify('Success', 'success'));
completionResolve(response); |
<<<<<<<
=======
it('should convert aggregation buckets that are objects to arrays', done => {
result.aggregations.all = {
dictionaryWithGroups: {
buckets: {
a: { doc_count: 2, filtered: { doc_count: 1 } },
b: { doc_count: 2, filtered: { doc_count: 1 } },
},
},
};
spyOn(elastic, 'search').and.returnValue(Promise.resolve(result));
search.search({ searchTerm: '', geolocation: true }, 'en').then(response => {
const expectedBuckets = [
{ key: 'a', doc_count: 2, filtered: { doc_count: 1 } },
{ key: 'b', doc_count: 2, filtered: { doc_count: 1 } },
{ key: 'any', doc_count: 10, filtered: { doc_count: 10 } },
];
expect(response.aggregations.all.dictionaryWithGroups.buckets).toEqual(expectedBuckets);
done();
});
});
>>>>>>>
it('should convert aggregation buckets that are objects to arrays', done => {
result.aggregations.all = {
dictionaryWithGroups: {
buckets: {
a: { doc_count: 2, filtered: { doc_count: 1 } },
b: { doc_count: 2, filtered: { doc_count: 1 } },
},
},
};
spyOn(elastic, 'search').and.returnValue(Promise.resolve(result));
search.search({ searchTerm: '', geolocation: true }, 'en').then(response => {
const expectedBuckets = [
{ key: 'a', doc_count: 2, filtered: { doc_count: 1 } },
{ key: 'b', doc_count: 2, filtered: { doc_count: 1 } },
{ key: 'any', doc_count: 10, filtered: { doc_count: 10 } },
];
expect(response.aggregations.all.dictionaryWithGroups.buckets).toEqual(expectedBuckets);
done();
});
});
<<<<<<<
expect(
template1Aggs.find(a => a.key === '35ae6c24-9f4c-4017-9f01-2bc42ff7ad83').filtered
.doc_count
).toBe(2);
expect(
template1Aggs.find(a => a.key === 'bce629bf-efc1-40dd-9af0-0542422dcbc3').filtered
.doc_count
).toBe(2);
=======
expect(template1Aggs.find(a => a.key === 'multiValue1').filtered.doc_count).toBe(2);
expect(template1Aggs.find(a => a.key === 'multiValue2').filtered.doc_count).toBe(2);
expect(template1Aggs.find(a => a.key === 'missing').filtered.doc_count).toBe(0);
expect(template1Aggs.find(a => a.key === 'any').filtered.doc_count).toBe(3);
>>>>>>>
expect(
template1Aggs.find(a => a.key === '35ae6c24-9f4c-4017-9f01-2bc42ff7ad83').filtered
.doc_count
).toBe(2);
expect(
template1Aggs.find(a => a.key === 'bce629bf-efc1-40dd-9af0-0542422dcbc3').filtered
.doc_count
).toBe(2);
expect(template1Aggs.find(a => a.key === 'missing').filtered.doc_count).toBe(0);
expect(template1Aggs.find(a => a.key === 'any').filtered.doc_count).toBe(3);
<<<<<<<
expect(
filteredAggs.find(a => a.key === '35ae6c24-9f4c-4017-9f01-2bc42ff7ad83').filtered
.doc_count
).toBe(2);
expect(
filteredAggs.find(a => a.key === 'bce629bf-efc1-40dd-9af0-0542422dcbc3').filtered
.doc_count
).toBe(3);
=======
expect(filteredAggs.find(a => a.key === 'multiValue1').filtered.doc_count).toBe(2);
expect(filteredAggs.find(a => a.key === 'multiValue2').filtered.doc_count).toBe(3);
expect(filteredAggs.find(a => a.key === 'missing').filtered.doc_count).toBe(1);
// In the presence of value filters, don't provide the any bucket.
expect(filteredAggs.find(a => a.key === 'any').filtered.doc_count).toBe(3);
>>>>>>>
expect(
filteredAggs.find(a => a.key === '35ae6c24-9f4c-4017-9f01-2bc42ff7ad83').filtered
.doc_count
).toBe(2);
expect(
filteredAggs.find(a => a.key === 'bce629bf-efc1-40dd-9af0-0542422dcbc3').filtered
.doc_count
).toBe(3);
expect(filteredAggs.find(a => a.key === 'missing').filtered.doc_count).toBe(1);
// In the presence of value filters, don't provide the any bucket.
expect(filteredAggs.find(a => a.key === 'any').filtered.doc_count).toBe(3); |
<<<<<<<
import './scss/document.scss'
=======
import wrapper from '../../utils/wrapper'
>>>>>>>
import wrapper from '../../utils/wrapper'
import './scss/document.scss' |
<<<<<<<
import entities from './entities.js';
import model from './entitiesModel';
=======
import model, { MetadataObject } from './entitiesModel';
>>>>>>>
import model from './entitiesModel';
<<<<<<<
export default entities;
export { model, endpointSchema };
=======
export { default } from './entities.js';
export { model, MetadataObject, endpointSchema };
>>>>>>>
export { default } from './entities.js';
export { model, endpointSchema }; |
<<<<<<<
this.options.fetch = function(path) {
return _.template($(path).html());
};
this.collection.on("reset", this.render, this);
=======
this.collection.bind("reset", function() {
this.render();
}, this);
>>>>>>>
this.collection.on("reset", this.render, this);
<<<<<<<
equal(view.views.ul.length, 4, "Only four Views");
=======
equal(view.views["ul"].length, 4, "Only four views");
});
>>>>>>>
equal(view.views.ul.length, 4, "Only four Views"); |
<<<<<<<
var url, handler;
=======
var url, handler, prefix, contents;
>>>>>>>
var url, handler, prefix, contents;
<<<<<<<
// Render any additional views.
renderViews(view, view.views);
}
=======
>>>>>>>
// Render any additional views.
renderViews(view, view.views);
}
<<<<<<<
// Recursively iterate over each View and apply the render method
function renderViews(root, views) {
// Take in a view and a name and perform mighty magic to ensure the
// template is loaded and rendered. Wraps in a new render method so
// that you can call to update a single model.
function processView(view, name) {
// The original render method
var original = view.render;
// Wrap a new render reusable render method
view.render = function() {
// Render into a variable
var viewDeferred = original.call(view, viewRender);
// Internal partial deferred used for injecting into layout
viewDeferred.partial.then(function(contents) {
// Apply partially
options.partial(root.el, name, contents);
// Once added to the DOM resolve original deferred
viewDeferred.resolve(root.el);
// If the view contains a views object, iterate over it as well
if (_.isObject(view.options.views)) {
return renderViews(view, view.options.views);
}
});
// Ensure events are rebound
view.delegateEvents();
};
// Render each view
view.render();
};
// For each view access the view object and partial name
_.each(views, function(view, name) {
// If the views is an array render out as a list
if (_.isArray(view)) {
// Take each subView and pipe it into the processView function
return _.each(view, function(subView) {
processView(subView, name);
});
}
// Process a single view
processView(view, name);
});
}
=======
// Wraps the View's original render to supply a reusable render method
function wrappedRender(root, name, view) {
var original = view.render;
return function() {
// Render into a variable
var viewDeferred = original.call(view, viewRender);
// Internal partial deferred used for injecting into layout
viewDeferred.partial.then(function(contents) {
// Apply partially
options.partial(root.el, name, contents);
// Once added to the DOM resolve original deferred
viewDeferred.resolve(root.el);
// If the view contains a views object, iterate over it as well
if (_.isObject(view.options.views)) {
return renderViews(view, view.options.views);
}
});
// Ensure events are rebound
view.delegateEvents();
}
}
// Recursively iterate over each View and apply the render method
function renderViews(root, views) {
// For each view access the view object and partial name
_.each(views, function(view, name) {
// The original render method
var original = view.render;
// Wrap a new reusable render method
view.render = wrappedRender(root, name, view);
// Render each view
view.render();
});
}
view.render = wrappedRender(manager, name, view);
return this.views[name] = view;
},
render: function(done) {
var contents, prefix, url;
var manager = this;
var options = this.options;
// Returns an object that provides asynchronous capabilities.
function async(done) {
var handler = options.deferred();
// Used to handle asynchronous renders
handler.async = function() {
return done;
};
// This is used internally for when to apply to a layout
handler.partial = options.deferred();
return handler;
}
>>>>>>>
// Wraps the View's original render to supply a reusable render method
function wrappedRender(root, name, view) {
var original = view.render;
return function() {
// Render into a variable
var viewDeferred = original.call(view, viewRender);
// Internal partial deferred used for injecting into layout
viewDeferred.partial.then(function(el) {
// Apply partially
options.partial(root.el, name, el, view.options.append);
// Once added to the DOM resolve original deferred
viewDeferred.resolve(root.el);
// If the view contains a views object, iterate over it as well
if (_.isObject(view.options.views)) {
return renderViews(view, view.options.views);
}
});
// Ensure events are rebound
view.delegateEvents();
}
}
// Recursively iterate over each View and apply the render method
function renderViews(root, views) {
// Take in a view and a name and perform mighty magic to ensure the
// template is loaded and rendered. Wraps in a new render method so
// that you can call to update a single model.
function processView(view, name) {
// The original render method
var original = view.render;
// Wrap a new reusable render method
view.render = wrappedRender(root, name, view);
// Render each view
view.render();
}
// For each view access the view object and partial name
_.each(views, function(view, name) {
// If the views is an array render out as a list
if (_.isArray(view)) {
// Take each subView and pipe it into the processView function
return _.each(view, function(subView) {
// Automatically convert lists to append
subView.options.append = true;
processView(subView, name);
});
}
// Process a single view
processView(view, name);
});
}
view.render = wrappedRender(manager, name, view);
return this.views[name] = view;
},
render: function(done) {
var contents, prefix, url, handler;
var manager = this;
var options = this.options;
// Returns an object that provides asynchronous capabilities.
function async(done) {
var handler = options.deferred();
// Used to handle asynchronous renders
handler.async = function() {
handler._isAsync = true;
return done;
};
// This is used internally for when to apply to a layout
handler.partial = options.deferred();
return handler;
} |
<<<<<<<
RJSDemoApp.readium = new Readium(elementToBindReaderTo, packageDocumentURL, jsLibDir, function (epubViewer) {
RJSDemoApp.epubViewer = epubViewer;
RJSDemoApp.epubViewer.openBook();
ReadiumSDK.reader.on(ReadiumSDK.Events.PAGINATION_CHANGED, function (args) {
var newSpineIndex = args.paginationInfo.openPages[0].spineItemIndex;
if (newSpineIndex !== RJSDemoApp.currentSpineIndex) {
RJSDemoApp.resetAnnotations();
RJSDemoApp.currentSpineIndex = newSpineIndex;
}
console.log("PAGINATION_CHANGED: Current spine=" + newSpineIndex);
});
ReadiumSDK.reader.on("annotationClicked", function () {
console.log("Annotation clicked:" + arguments);
});
ReadiumSDK.reader.on("textSelectionEvent", function () {
console.log("Selection event:" + arguments);
});
});
=======
// Generate the library
$.getJSON('epub_content/epub_library.json', function (data) {
$(".show-on-load").hide();
$("#library-list").html("");
RJSDemoApp.addLibraryList($("#library-list"), data);
$(".show-on-load").show();
}).fail(function (result) {
console.log("The library could not be loaded");
});
_readium = new Readium("#epub-reader-container", './lib/');
>>>>>>>
/*
RJSDemoApp.readium = new Readium(elementToBindReaderTo, packageDocumentURL, jsLibDir, function (epubViewer) {
RJSDemoApp.epubViewer = epubViewer;
RJSDemoApp.epubViewer.openBook();
ReadiumSDK.reader.on(ReadiumSDK.Events.PAGINATION_CHANGED, function (args) {
var newSpineIndex = args.paginationInfo.openPages[0].spineItemIndex;
if (newSpineIndex !== RJSDemoApp.currentSpineIndex) {
RJSDemoApp.resetAnnotations();
RJSDemoApp.currentSpineIndex = newSpineIndex;
}
console.log("PAGINATION_CHANGED: Current spine=" + newSpineIndex);
});
ReadiumSDK.reader.on("annotationClicked", function () {
console.log("Annotation clicked:" + arguments);
});
ReadiumSDK.reader.on("textSelectionEvent", function () {
console.log("Selection event:" + arguments);
});
}); */
// Generate the library
$.getJSON('epub_content/epub_library.json', function (data) {
$(".show-on-load").hide();
$("#library-list").html("");
RJSDemoApp.addLibraryList($("#library-list"), data);
$(".show-on-load").show();
}).fail(function (result) {
console.log("The library could not be loaded");
});
_readium = new Readium("#epub-reader-container", './lib/');
<<<<<<<
$("#annotations-highlight").on("click", function () {
RJSDemoApp.epubViewer.addSelectionHighlight(RJSDemoApp.lastAnnotationId, "highlight");
RJSDemoApp.lastAnnotationId++;
});
$("#annotations-underline").on("click", function () {
RJSDemoApp.epubViewer.addSelectionHighlight(RJSDemoApp.lastAnnotationId, "underline");
RJSDemoApp.lastAnnotationId++;
});
$("#annotations-image-highlight").on("click", function () {
RJSDemoApp.epubViewer.addSelectionImageAnnotation(RJSDemoApp.lastAnnotationId, "highlight");
RJSDemoApp.lastAnnotationId++;
});
};
// When the document is ready, choose an EPUB to show.
$(document).ready(function () {
RJSDemoApp.currLayoutIsSynthetic = true;
=======
>>>>>>>
$("#annotations-highlight").on("click", function () {
RJSDemoApp.epubViewer.addSelectionHighlight(RJSDemoApp.lastAnnotationId, "highlight");
RJSDemoApp.lastAnnotationId++;
});
$("#annotations-underline").on("click", function () {
RJSDemoApp.epubViewer.addSelectionHighlight(RJSDemoApp.lastAnnotationId, "underline");
RJSDemoApp.lastAnnotationId++;
});
$("#annotations-image-highlight").on("click", function () {
RJSDemoApp.epubViewer.addSelectionImageAnnotation(RJSDemoApp.lastAnnotationId, "highlight");
RJSDemoApp.lastAnnotationId++;
});
};
// When the document is ready, choose an EPUB to show.
$(document).ready(function () {
RJSDemoApp.currLayoutIsSynthetic = true; |
<<<<<<<
if (false) // true => override authored Media Overlays CSS with user-provided style (can be called during playback)
{
readium.reader.on(ReadiumSDK.Events.CONTENT_DOCUMENT_LOADED, function () {
readium.reader.setStyles(
[
{
selector: ".mo-active-default",
declarations: {
"background-color": "blue !important",
"color": "white !important",
"padding": "0.2em",
"font-weight": "bold"
}
}
]);
});
}
=======
readium.reader.on(ReadiumSDK.Events.CONTENT_DOCUMENT_LOADED, function () {
readium.reader.setStyles(
[
{
selector: ".mo-active-default",
declarations: {"background-color": "yellow"}
}
]);
});
});
}
>>>>>>>
if (false) // true => override authored Media Overlays CSS with user-provided style (can be called during playback)
{
readium.reader.on(ReadiumSDK.Events.CONTENT_DOCUMENT_LOADED, function () {
readium.reader.setStyles(
[
{
selector: ".mo-active-default",
declarations: {
"background-color": "blue !important",
"color": "white !important",
"padding": "0.2em",
"font-weight": "bold"
}
}
]);
});
}
});
} |
<<<<<<<
if (!this._current_context) { return; }
var data = new cls.ResourceManager["1.2"].UrlLoad(msg);
=======
if (!this._context)
return;
var data = new cls.ResourceManager["1.0"].UrlLoad(msg);
//bail if we get dupes. Why do we get dupes? fixme
//if (data.resourceID in this._current_document.resourcemap) { return }
this._context.update("urlload", data);
this._view.update();
>>>>>>>
if (!this._context)
return;
var data = new cls.ResourceManager["1.2"].UrlLoad(msg);
//bail if we get dupes. Why do we get dupes? fixme
//if (data.resourceID in this._current_document.resourcemap) { return }
this._context.update("urlload", data);
this._view.update(); |
<<<<<<<
readium.reader.on(ReadiumSDK.Events.CONTENT_DOCUMENT_LOAD_START, function($iframe, spineItem) {
spinner.spin($('#reading-area')[0]);
});
loadEbook(url, readerSettings);
=======
loadEbook(url, readerSettings, openPageRequest);
>>>>>>>
readium.reader.on(ReadiumSDK.Events.CONTENT_DOCUMENT_LOAD_START, function($iframe, spineItem) {
spinner.spin($('#reading-area')[0]);
});
loadEbook(url, readerSettings, openPageRequest); |
<<<<<<<
var readerSettings;
if (settings.reader){
readerSettings = JSON.parse(settings.reader);
}
if (!embedded){
readerSettings = readerSettings || SettingsDialog.defaultSettings;
SettingsDialog.updateReader(readium.reader, readerSettings);
}
else{
readium.reader.updateSettings({
isSyntheticSpread: false
});
}
readium.reader.on(ReadiumSDK.Events.PAGINATION_CHANGED, function (pageChangeData) {
// That's after mediaOverlayPlayer.onPageChanged()
savePlace();
if (readium.reader.isMediaOverlayAvailable()) {
$('#audioplayer').show();
}
if (!pageChangeData.spineItem) return;
var smil = readium.reader.package().media_overlay.getSmilBySpineItem(pageChangeData.spineItem);
=======
>>>>>>> |
<<<<<<<
const PlayAttachmentAction = require('./playattachmentaction.js');
=======
const PlayCharacterAction = require('./playcharacteraction.js');
>>>>>>>
const PlayAttachmentAction = require('./playattachmentaction.js');
const PlayCharacterAction = require('./playcharacteraction.js');
<<<<<<<
new PlayAttachmentAction(),
=======
new PlayCharacterAction(),
>>>>>>>
new PlayAttachmentAction(),
new PlayCharacterAction(), |
<<<<<<<
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
=======
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from his provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
>>>>>>>
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
<<<<<<<
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
=======
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from his provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
>>>>>>>
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
<<<<<<<
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
=======
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from his provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
>>>>>>>
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
} |
<<<<<<<
new: this.new,
=======
stealth: this.stealth,
>>>>>>>
new: this.new,
stealth: this.stealth, |
<<<<<<<
} else if(actionType === 'putIntoConflict') {
// There is no current conflict, or no context (cards must be put into play by a player, not a framework event)
if(!this.game.currentConflict || !context || !this.allowGameAction('putIntoPlay', context)) {
return false;
}
// controller is attacking, and character can't attack, or controller is defending, and character can't defend
if((context.player.isAttackingPlayer() && !this.allowGameAction('participateAsAttacker')) ||
(context.player.isDefendingPlayer() && !this.allowGameAction('participateAsDefender'))) {
return false;
}
// card cannot participate in this conflict type
if(this.conflictOptions.cannotParticipateIn[this.game.currentConflict.conflictType]) {
return false;
}
} else if(actionType === 'putIntoPlay' && this.isUnique()) {
if(this.game.allCards.any(card => (
card.location === 'play area' &&
card.name === this.name &&
((card.owner === context.player || card.controller === context.player) || (card.owner === this.owner)) &&
card !== this
))) {
return false;
}
=======
} else if(actionType === 'removeFate' && (this.location !== 'play area' || this.fate === 0)) {
return false;
} else if(actionType === 'sacrifice' && ['character', 'attachment'].includes(this.type) && this.location !== 'play area') {
return false;
} else if(['discardFromPlay', 'returnToHand', 'returnToDeck', 'takeControl'].includes(actionType) && this.location !== 'play area') {
return false;
>>>>>>>
} else if(actionType === 'putIntoConflict') {
// There is no current conflict, or no context (cards must be put into play by a player, not a framework event)
if(!this.game.currentConflict || !context || !this.allowGameAction('putIntoPlay', context)) {
return false;
}
// controller is attacking, and character can't attack, or controller is defending, and character can't defend
if((context.player.isAttackingPlayer() && !this.allowGameAction('participateAsAttacker')) ||
(context.player.isDefendingPlayer() && !this.allowGameAction('participateAsDefender'))) {
return false;
}
// card cannot participate in this conflict type
if(this.conflictOptions.cannotParticipateIn[this.game.currentConflict.conflictType]) {
return false;
}
} else if(actionType === 'putIntoPlay' && this.isUnique()) {
if(this.game.allCards.any(card => (
card.location === 'play area' &&
card.name === this.name &&
((card.owner === context.player || card.controller === context.player) || (card.owner === this.owner)) &&
card !== this
))) {
return false;
}
} else if(actionType === 'removeFate' && (this.location !== 'play area' || this.fate === 0)) {
return false;
} else if(actionType === 'sacrifice' && ['character', 'attachment'].includes(this.type) && this.location !== 'play area') {
return false;
} else if(['discardFromPlay', 'returnToHand', 'returnToDeck', 'takeControl'].includes(actionType) && this.location !== 'play area') {
return false; |
<<<<<<<
const PlayCharacterAction = require('./playcharacteraction.js');
=======
const DuplicateUniqueAction = require('./duplicateuniqueaction.js');
>>>>>>>
const PlayCharacterAction = require('./playcharacteraction.js');
const DuplicateUniqueAction = require('./duplicateuniqueaction.js');
<<<<<<<
new PlayCharacterAction(),
=======
new DuplicateUniqueAction(),
>>>>>>>
new PlayCharacterAction(),
new DuplicateUniqueAction(), |
<<<<<<<
event.executeHandler();
this.game.emit(event.name, ...event.params);
=======
this.game.queueSimpleStep(() => {
event.executeHandler();
this.game.emit(event.name, event);
});
>>>>>>>
event.executeHandler();
this.game.emit(event.name, event); |
<<<<<<<
* Bows multiple cards
* @param {[DrawCard]} cards
* @param {EffectSource} source
*/
bowCards(cards, source) {
_.each(cards, card => this.bowCard(card, source));
}
/**
* Raises an avent for an effect readying a card
=======
* Raises an event for an effect readying a card
>>>>>>>
* Bows multiple cards
* @param {[DrawCard]} cards
* @param {EffectSource} source
*/
bowCards(cards, source) {
_.each(cards, card => this.bowCard(card, source));
}
/**
* Raises an event for an effect readying a card |
<<<<<<<
discardCharactersWithNoFate() {
if(!this.anyCardsInPlay(card => card.type === 'character' && card.fate === 0 && card.allowGameAction('discardCardFromPlay'))) {
=======
resolveRingEffectForElement(element) {
this.game.queueSimpleStep(() => this.game.pushAbilityContext('ring', element, 'effect'));
this.game.queueSimpleStep(() => this.resolveRing(element));
this.game.queueSimpleStep(() => this.game.popAbilityContext());
}
resolveRing(element) {
if(element === '') {
return;
}
let otherPlayer = this.game.getOtherPlayer(this);
switch(element) {
case 'air':
this.game.promptWithMenu(this, this, {
activePrompt: {
promptTitle: 'Air Ring',
menuTitle: 'Choose an effect to resolve',
buttons: [
{ text: 'Gain 2 Honor', arg: 'Gain 2 Honor', method: 'resolveAirRing' },
{ text: 'Take 1 Honor from Opponent', arg: 'Take 1 Honor from Opponent', method: 'resolveAirRing' }
]
},
waitingPromptTitle: 'Waiting for opponent to use Air Ring'
});
break;
case 'earth':
this.drawCardsToHand(1);
if(otherPlayer) {
otherPlayer.discardAtRandom(1);
}
break;
case 'void':
this.game.promptForSelect(this, {
activePromptTitle: 'Choose character to remove a Fate from',
waitingPromptTitle: 'Waiting for opponent to use Void Ring',
cardCondition: card => {
return (card.location === 'play area' && card.fate > 0);
},
cardType: 'character',
onSelect: (player, card) => {
card.modifyFate(-1);
return true;
}
});
break;
case 'water':
this.game.promptForSelect(this, {
activePromptTitle: 'Choose character to bow or unbow',
waitingPromptTitle: 'Waiting for opponent to use Water Ring',
cardCondition: card => {
return ((card.fate === 0 || card.bowed) && card.location === 'play area');
},
cardType: 'character',
onSelect: (player, card) => {
if(card.bowed) {
this.readyCard(card);
} else {
this.bowCard(card);
}
return true;
}
});
break;
case 'fire':
this.game.promptWithMenu(this, this, {
activePrompt: {
promptTitle: 'Fire Ring',
menuTitle: 'Choose an effect to resolve',
buttons: [
{ text: 'Honor a character', arg: 'honor', method: 'resolveFireRing' },
{ text: 'Dishonor a character', arg: 'sihonor', method: 'resolveFireRing' }
]
},
waitingPromptTitle: 'Waiting for opponent to use Fire Ring'
});
break;
}
this.game.addMessage('{0} resolved the {1} ring', this.name, element);
}
resolveAirRing(player, choice) {
if(choice === 'Gain 2 Honor') {
this.game.addHonor(this, 2);
} else {
if(this.game.getOtherPlayer(this)) {
this.game.transferHonor(this.game.getOtherPlayer(this), this, 1);
} else {
this.game.addHonor(this, 1);
}
}
return true;
}
resolveFireRing(player, choice) {
if(choice === 'honor') {
this.game.promptForSelect(this, {
activePromptTitle: 'Choose character to '.concat(choice),
waitingPromptTitle: 'Waiting for opponent to use Fire Ring',
cardCondition: card => !card.isHonored && card.location === 'play area',
cardType: 'character',
onSelect: (player, card) => {
this.honorCard(card);
return true;
}
});
} else {
this.game.promptForSelect(this, {
activePromptTitle: 'Choose character to '.concat(choice),
waitingPromptTitle: 'Waiting for opponent to use Fire Ring',
cardCondition: card => card.allowGameAction('dishonor') && card.location === 'play area',
cardType: 'character',
onSelect: (player, card) => {
this.dishonorCard(card);
return true;
}
});
}
return true;
}
discardCharactersWithNoFate(cardsToDiscard) {
if(cardsToDiscard.length === 0) {
>>>>>>>
discardCharactersWithNoFate(cardsToDiscard) {
if(cardsToDiscard.length === 0) { |
<<<<<<<
return card.getMilitarySkill(false, this.bidFinished) + (this.bidFinished ? parseInt(card.controller.honorBid) : 0);
=======
return card.getMillitarySkill(false, this.bidFinished);
>>>>>>>
return card.getMilitarySkill(false, this.bidFinished); |
<<<<<<<
this.cannotGainConflictBonus = false;
this.abilityRestrictions = [];
this.abilityMaxByIdentifier = {};
this.canInitiateAction = false;
=======
this.cannotGainConflictBonus = false; // I have no idea what this is for
this.abilityRestrictions = []; // This stores player restrictions from e.g. Guest of Honor
this.abilityMaxByTitle = {}; // This records max limits for abilities
this.canInitiateAction = false; // This flag determines whether this player has priority in an action window
>>>>>>>
this.cannotGainConflictBonus = false; // I have no idea what this is for
this.abilityRestrictions = []; // This stores player restrictions from e.g. Guest of Honor
this.abilityMaxByIdentifier = {}; // This records max limits for abilities
this.canInitiateAction = false; // This flag determines whether this player has priority in an action window
<<<<<<<
registerAbilityMax(maxIdentifier, limit) {
if(this.abilityMaxByIdentifier[maxIdentifier]) {
=======
/**
* Registers a card ability max limit on this Player
* @param {String} cardName
* @param {FixedAbilityLimit} limit
*/
registerAbilityMax(cardName, limit) {
if(this.abilityMaxByTitle[cardName]) {
>>>>>>>
/**
* Registers a card ability max limit on this Player
* @param {String} maxIdentifier
* @param {FixedAbilityLimit} limit
*/
registerAbilityMax(maxIdentifier, limit) {
if(this.abilityMaxByIdentifier[maxIdentifier]) {
<<<<<<<
isAbilityAtMax(maxIdentifier) {
let limit = this.abilityMaxByIdentifier[maxIdentifier];
=======
/**
* Checks whether a max ability is at max
* @param {String} cardName
*/
isAbilityAtMax(cardName) {
let limit = this.abilityMaxByTitle[cardName];
>>>>>>>
/**
* Checks whether a max ability is at max
* @param {String} maxIdentifier
*/
isAbilityAtMax(maxIdentifier) {
let limit = this.abilityMaxByIdentifier[maxIdentifier];
<<<<<<<
incrementAbilityMax(maxIdentifier) {
let limit = this.abilityMaxByIdentifier[maxIdentifier];
=======
/**
* Marks the use of a max ability
* @param {String} cardName
*/
incrementAbilityMax(cardName) {
let limit = this.abilityMaxByTitle[cardName];
>>>>>>>
/**
* Marks the use of a max ability
* @param {String} maxIdentifier
*/
incrementAbilityMax(maxIdentifier) {
let limit = this.abilityMaxByIdentifier[maxIdentifier]; |
<<<<<<<
return context.source.allowGameAction('play', context);
},
pay: function(context) {
context.source.controller.moveCard(context.source, 'conflict discard pile');
=======
return context.source.canPlay();
>>>>>>>
return context.source.allowGameAction('play', context); |
<<<<<<<
=======
this.contingentEvents = [];
if(!this.condition) {
this.condition = () => this.card.location === 'play area';
}
>>>>>>>
if(!this.condition) {
this.condition = () => this.card.location === 'play area';
}
<<<<<<<
return contingentEvents;
=======
}
cancel() {
if(this.contingentEvents.length > 0) {
_.each(this.contingentEvents, event => event.cancelled = true);
this.window.removeEvent(this.contingentEvents);
this.contingentEvents = [];
}
super.cancel();
>>>>>>>
return contingentEvents; |
<<<<<<<
const PlayAttachmentAction = require('./playattachmentaction.js');
=======
const DuplicateUniqueAction = require('./duplicateuniqueaction.js');
>>>>>>>
const PlayAttachmentAction = require('./playattachmentaction.js');
const DuplicateUniqueAction = require('./duplicateuniqueaction.js');
<<<<<<<
new PlayAttachmentAction(),
=======
new DuplicateUniqueAction(),
>>>>>>>
new PlayAttachmentAction(),
new DuplicateUniqueAction(), |
<<<<<<<
fieldNames = Object.keys(schema).filter(key => key !== '_id' && key !== '_metadata');
response = {};
fieldNames.forEach(fieldName => {
response[fieldName] = mongoFieldTypeToApiResponseType(schema[fieldName]);
});
=======
fieldNames = Object.keys(schema).filter(key => key !== '_id');
response = fieldNames.reduce((obj, fieldName) => {
obj[fieldName] = mongoFieldTypeToSchemaAPIType(schema[fieldName])
return obj;
}, {});
>>>>>>>
fieldNames = Object.keys(schema).filter(key => key !== '_id' && key !== '_metadata');
response = fieldNames.reduce((obj, fieldName) => {
obj[fieldName] = mongoFieldTypeToSchemaAPIType(schema[fieldName])
return obj;
}, {}); |
<<<<<<<
if (options.indexOf("balance") > -1) {
try {
addrData["balance"] = web3.eth.getBalance(addr);
} catch(err) {
console.error("AddrWeb3 error :" + err);
addrData = {"error": true};
}
=======
try {
addrData["balance"] = web3.eth.getBalance(addr);
addrData["balance"] = etherUnits.toEther(addrData["balance"], 'wei');
} catch(err) {
console.error("AddrWeb3 error :" + err);
addrData = {"error": true};
>>>>>>>
if (options.indexOf("balance") > -1) {
try {
addrData["balance"] = web3.eth.getBalance(addr);
addrData["balance"] = etherUnits.toEther(addrData["balance"], 'wei');
} catch(err) {
console.error("AddrWeb3 error :" + err);
addrData = {"error": true};
} |
<<<<<<<
/* global URLSearchParams */
import upperFirst from 'lodash.upperfirst'
import camelCase from 'lodash.camelcase'
=======
>>>>>>>
/* global URLSearchParams */ |
<<<<<<<
import { Navbar, NavBrand, Nav, NavItem, CollapsibleNav } from 'react-bootstrap';
import Helmet from 'react-helmet';
=======
import { Navbar, Nav, NavItem } from 'react-bootstrap';
import DocumentMeta from 'react-document-meta';
>>>>>>>
import { Navbar, Nav, NavItem } from 'react-bootstrap';
import Helmet from 'react-helmet';
<<<<<<<
<Helmet {...config.app.head}/>
<Navbar fixedTop toggleNavKey={0}>
<NavBrand>
<IndexLink to="/" activeStyle={{color: '#33e0ff'}}>
<div className={styles.brand}/>
<span>{config.app.title}</span>
</IndexLink>
</NavBrand>
=======
<DocumentMeta {...config.app}/>
<Navbar fixedTop>
<Navbar.Header>
<Navbar.Brand>
<IndexLink to="/" activeStyle={{color: '#33e0ff'}}>
<div className={styles.brand}/>
<span>{config.app.title}</span>
</IndexLink>
</Navbar.Brand>
<Navbar.Toggle/>
</Navbar.Header>
>>>>>>>
<Helmet {...config.app.head}/>
<Navbar fixedTop>
<Navbar.Header>
<Navbar.Brand>
<IndexLink to="/" activeStyle={{color: '#33e0ff'}}>
<div className={styles.brand}/>
<span>{config.app.title}</span>
</IndexLink>
</Navbar.Brand>
<Navbar.Toggle/>
</Navbar.Header> |
<<<<<<<
} else {
// if we have the base get its length
if (base) {
lengthOfTheBaseUrl = base.length;
}
// Remove the base url from the originalUrl if it exist
arr = arr.splice(lengthOfTheBaseUrl);
return arr[0];
=======
}
// if we have the base get its length
if (base) {
lengthOfTheBaseUrl = base.length;
>>>>>>>
}
// if we have the base get its length
if (base) {
lengthOfTheBaseUrl = base.length;
<<<<<<<
=======
return;
>>>>>>>
return; |
<<<<<<<
it('should render cosmos plug by default', function() {
render();
expect(component.refs.cosmosPlug).to.exist;
});
describe('with fixture path selected', function() {
=======
describe('with fixture selected', function() {
>>>>>>>
describe('with fixture selected', function() {
<<<<<<<
it('should not render cosmos plug', function() {
render();
expect(component.refs.cosmosPlug).to.not.exist;
});
it('should generate full-screen url', function() {
=======
it('should add expanded class to selected component', function() {
>>>>>>>
it('should not render cosmos plug', function() {
render();
expect(component.refs.cosmosPlug).to.not.exist;
});
it('should add expanded class to selected component', function() { |
<<<<<<<
var supportedImageExts = ['jpg', 'jpeg', 'png'];
// TODO: need to clean this up
// eslint-disable-next-line consistent-return
$('img').each(function (i, elem) {
=======
ogObject.ogImage = [];
const supportedImageExts = ['jpg', 'jpeg', 'png'];
$('img').map(function (i, elem) {
>>>>>>>
ogObject.ogImage = [];
var supportedImageExts = ['jpg', 'jpeg', 'png'];
// TODO: need to clean this up
// eslint-disable-next-line consistent-return
$('img').map(function (i, elem) { |
<<<<<<<
display_uri = helpers.shortenURI(runtime.uri),
is_reloaded_window = runtimes.isReloadedWindow(runtime.window_id),
ret = \
[
=======
display_uri = helpers.shortenURI(runtime['uri']),
is_reloaded_window = runtimes.isReloadedWindow(runtime['window-id']),
ret = [
>>>>>>>
display_uri = helpers.shortenURI(runtime.uri),
is_reloaded_window = runtimes.isReloadedWindow(runtime.window_id),
ret = [
<<<<<<<
script_type = script.script_type,
ret = \
[
=======
script_type = script['script-type'],
ret = [
>>>>>>>
script_type = script.script_type,
ret = [ |
<<<<<<<
wx_pub: require('./channels/wx_pub'),
upacp_wap: require('./channels/upacp_wap'),
=======
alipay_pc_direct: require('./channels/alipay_pc_direct'),
alipay_qr: require('./channels/alipay_qr'),
>>>>>>>
wx_pub: require('./channels/wx_pub'),
upacp_wap: require('./channels/upacp_wap'),
alipay_qr: require('./channels/alipay_qr'), |
<<<<<<<
success: function (data) {
// Loop through all the exercises listed in the server's response
// and update the user's status for each exercise
=======
success: function (data) {
// Loop through all the exercises listed in the server's response and update the user's status for each exercise
>>>>>>>
success: function (data) {
// Loop through all the exercises listed in the server's response
// and update the user's status for each exercise
<<<<<<<
var rand = Math.floor(Math.random() * 101);
var key = ['score', data.tstamp, rand].join('-');
=======
var rand = Math.floor(Math.random() * 101),
key = ['score', data.tstamp, rand].join('-');
>>>>>>>
var rand = Math.floor(Math.random() * 101);
var key = ['score', data.tstamp, rand].join('-');
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
/**
* Sends the score for a single exercise
* - key - the key used to store the score object in local storage
* - scoreData - the score data to send
*/
=======
}
/**
* Sends the score for a single exercise
* - key - the key used to store the score object in local storage
* - scoreData - the score data to send
*/
>>>>>>>
}
/**
* Sends the score for a single exercise
* - key - the key used to store the score object in local storage
* - scoreData - the score data to send
*/
<<<<<<<
var username = odsaUtils.getUserEmail();
var validDate = new Date();
=======
var username = odsaUtils.getUserEmail(),
validDate = new Date();
>>>>>>>
var username = odsaUtils.getUserEmail();
var validDate = new Date();
<<<<<<<
// Send any score data belonging to the current user or the guest
// account if anonymous credit is allowed
if (odsaUtils.scoringServerEnabled()) {
// Set the username to the current user
// (in case the score belonged to the guest account)
=======
// Send any score data belonging to the current user or the guest account if anonymous credit is allowed
if (odsaUtils.scoringServerEnabled()) {
// Set the username to the current user (in case the score belonged to the guest account)
>>>>>>>
// Send any score data belonging to the current user or the guest
// account if anonymous credit is allowed
if (odsaUtils.scoringServerEnabled()) {
// Set the username to the current user
// (in case the score belonged to the guest account)
<<<<<<<
// once KA is ready send message to canvas to adjust iframe dimensions
// to avoid scroll bar in a scroll bar issue
=======
// once KA is ready send message to canvas to adjust iframe dimensions to avoid scroll bar in a scroll bar issue
>>>>>>>
// once KA is ready send message to canvas to adjust iframe dimensions
// to avoid scroll bar in a scroll bar issue
<<<<<<<
src = $elem.attr("data-frame-src") + separator + 'scoringServerEnabled=' + odsaUtils.scoringServerEnabled() + '&loggingServerEnabled=' + odsaUtils.loggingServerEnabled() + '&threshold=' + threshold + '&points=' + points + '&required=' + required;
=======
workoutId = $elem.attr("data-workout-id"),
src = $elem.attr("data-frame-src") + separator + 'scoringServerEnabled=' + odsaUtils.scoringServerEnabled() + '&threshold=' + threshold + '&points=' + points + '&required=' + required;
>>>>>>>
src = $elem.attr("data-frame-src") + separator + 'scoringServerEnabled=' + odsaUtils.scoringServerEnabled() + '&loggingServerEnabled=' + odsaUtils.loggingServerEnabled() + '&threshold=' + threshold + '&points=' + points + '&required=' + required;
workoutId = $elem.attr("data-workout-id") |
<<<<<<<
var leftMargin = 155;
var blockchain = av.ds.list({top: topMargin, left: leftMargin});
var graph = av.ds.graph({visible: true, left: -10, bottom: 5});
=======
var leftMargin = 360;
var blockchain = av.ds.list({top: topMargin, left: leftMargin, nodegap: 10});
var graph = av.ds.graph({visible: true, left: -40});
>>>>>>>
var leftMargin = 360;
var blockchain = av.ds.list({top: topMargin, left: leftMargin, nodegap: 10});
var graph = av.ds.graph({visible: true, left: -10, bottom: 5}); |
<<<<<<<
Image,
=======
Dimensions,
>>>>>>>
Image,
Dimensions,
<<<<<<<
import { FContainer, FButton } from '../../components/FloatButtons';
import { getSystemName } from 'react-native-device-info';
=======
import { getSystemName, isTablet } from 'react-native-device-info';
>>>>>>>
import { FContainer, FButton } from '../../components/FloatButtons';
import { getSystemName, isTablet } from 'react-native-device-info'; |
<<<<<<<
disabled={navigation.getParam('isLoading') === true}
style={styles.walletDetails}
=======
disabled={route.params.isLoading === true}
style={{ marginHorizontal: 16, minWidth: 150, justifyContent: 'center', alignItems: 'flex-end' }}
>>>>>>>
disabled={route.params.isLoading === true}
style={styles.walletDetails} |
<<<<<<<
showReceiveButton: showReceive,
showSendButton: showSend,
showManageFundsBigButton,
showManageFundsSmallButton,
dataSource: this.getTransactions(this.state.limit),
walletHeaderLatestTransaction: latestTXTime,
=======
dataSource: txs,
>>>>>>>
dataSource: this.getTransactions(this.state.limit), |
<<<<<<<
{ label: 'Thai (TH)', value: 'th_th' },
=======
{ label: 'Dutch (NL)', value: 'nl_nl' },
>>>>>>>
{ label: 'Thai (TH)', value: 'th_th' },
{ label: 'Dutch (NL)', value: 'nl_nl' }, |
<<<<<<<
import WalletImport from '../../class/wallet-import';
let EV = require('../../events');
let A = require('../../analytics');
=======
import WalletImport from '../../class/walletImport';
import ActionSheet from '../ActionSheet';
import ImagePicker from 'react-native-image-picker';
const EV = require('../../events');
const A = require('../../analytics');
>>>>>>>
import WalletImport from '../../class/wallet-import';
import ActionSheet from '../ActionSheet';
import ImagePicker from 'react-native-image-picker';
const EV = require('../../events');
const A = require('../../analytics'); |
<<<<<<<
import CoinsSelected from '../../components/CoinsSelected';
=======
import BottomModal from '../../components/BottomModal';
>>>>>>>
import CoinsSelected from '../../components/CoinsSelected';
import BottomModal from '../../components/BottomModal'; |
<<<<<<<
import { BlueLoadingHook, BlueText, BlueButtonHook, BlueSpacing40 } from '../../BlueComponents';
=======
import { BlueLoadingHook, BlueTextHooks, BlueButton, BlueSpacing40 } from '../../BlueComponents';
>>>>>>>
import { BlueLoadingHook, BlueText, BlueButton, BlueSpacing40 } from '../../BlueComponents'; |
<<<<<<<
Alert,
Animated,
=======
View,
KeyboardAvoidingView,
UIManager,
PlatformColor,
StyleSheet,
>>>>>>>
Alert,
Animated,
<<<<<<<
TouchableOpacity,
TouchableWithoutFeedback,
UIManager,
View,
=======
PixelRatio,
useWindowDimensions,
>>>>>>>
TouchableOpacity,
TouchableWithoutFeedback,
UIManager,
useWindowDimensions,
View, |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.