conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
"user/:userName/hotkeyconfig" : "showHotKeyConfig",
=======
>>>>>>>
"user/:userName/hotkeyconfig" : "showHotKeyConfig",
<<<<<<<
$("#hotkey-config-view").hide();
=======
$('#new_data_list').hide();
},
/**
* Displays a page where the user can make their own modified datalist specified by the given
* corpusName and the given datumId.
*
* @param {String}
* corpusName The name of the corpus this datum is from.
* @param {Number}
* sessionId The ID of the session within the corpus.
*/
newFullscreenDataList : function(corpusName) {
Utils.debug("In newFullscreenDataList: " + corpusName);
$("#dashboard-view").show();
$("#new-session-view").hide();
$("#fullscreen-datum-view").hide();
$("#fullscreen-datalist-view").hide();
$("#fullscreen-datalist-view").hide();
$('#new_data_list').show();
$("#fullscreen-search-view").hide();
$("#fullscreen-user-profile-view").hide();
$("#user-preferences-view").hide();
$("#datum-preferences-view").hide();
>>>>>>>
$("#hotkey-config-view").hide();
$('#new_data_list').hide();
},
/**
* Displays a page where the user can make their own modified datalist specified by the given
* corpusName and the given datumId.
*
* @param {String}
* corpusName The name of the corpus this datum is from.
* @param {Number}
* sessionId The ID of the session within the corpus.
*/
newFullscreenDataList : function(corpusName) {
Utils.debug("In newFullscreenDataList: " + corpusName);
$("#dashboard-view").show();
$("#new-session-view").hide();
$("#fullscreen-datum-view").hide();
$("#fullscreen-datalist-view").hide();
$("#fullscreen-datalist-view").hide();
$('#new_data_list').show();
$("#fullscreen-search-view").hide();
$("#fullscreen-user-profile-view").hide();
$("#user-preferences-view").hide();
$("#datum-preferences-view").hide();
<<<<<<<
$("#hotkey-config-view").hide();
=======
$('#new_data_list').hide();
>>>>>>>
$("#hotkey-config-view").hide();
$('#new_data_list').hide();
<<<<<<<
$("#hotkey-config-view").hide();
=======
$('#new_data_list').hide();
>>>>>>>
$("#hotkey-config-view").hide();
$('#new_data_list').hide();
<<<<<<<
$("#hotkey-config-view").hide();
=======
$('#new_data_list').hide();
>>>>>>>
$("#hotkey-config-view").hide();
$('#new_data_list').hide();
<<<<<<<
$("#hotkey-config-view").hide();
=======
$('#new_data_list').hide();
$("#corpus").show();
$("#activity_feed").show();
>>>>>>>
$("#hotkey-config-view").hide();
$('#new_data_list').hide();
$("#corpus").show();
$("#activity_feed").show();
<<<<<<<
$("#hotkey-config-view").hide();
=======
$('#new_data_list').hide();
>>>>>>>
$("#hotkey-config-view").hide();
$('#new_data_list').hide();
<<<<<<<
$("#hotkey-config-view").hide();
=======
$('#new_data_list').hide();
>>>>>>>
$("#hotkey-config-view").hide();
$('#new_data_list').hide();
<<<<<<<
$("#hotkey-config-view").hide();
=======
$('#new_data_list').hide();
>>>>>>>
$("#hotkey-config-view").hide();
$('#new_data_list').hide(); |
<<<<<<<
"corpus/" : "newFullscreenCorpus",
"corpus/:corpusName" : "showDashboard",
=======
"corpus/:corpusName" : "showDashboard",
"corpus/:corpusName/export" : "showExport",
>>>>>>>
"corpus/" : "newFullscreenCorpus",
"corpus/:corpusName/export" : "showExport",
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
$('#new_data_list').hide();
$('#export-view').hide();
>>>>>>>
$('#export-view').hide();
<<<<<<<
$("#new-corpus").hide();
=======
$('#export-view').hide();
>>>>>>>
$("#new-corpus").hide();
$('#export-view').hide();
<<<<<<<
$('#new-data-list').hide();
$("#new-corpus").hide();
=======
$('#new_data_list').hide();
$('#export-view').hide();
>>>>>>>
$('#new-data-list').hide();
$("#new-corpus").hide();
$('#export-view').hide();
<<<<<<<
// Display the fullscreen datum view and hide all the other views
$("#dashboard-view").show();
$("#fullscreen-datum-view").show();
$("#fullscreen-datalist-view").hide();
$("#fullscreen-search-view").hide();
$("#fullscreen-user-profile-view").hide();
$("#new-session-view").hide();
$("#user-preferences-view").hide();
$("#datum-preferences-view").hide();
$("#hotkey-config-view").hide();
$('#new-data-list').hide();
$("#new-corpus").hide();
},
=======
// Display the fullscreen datum view and hide all the other views
$("#dashboard-view").show();
$("#fullscreen-datum-view").show();
$("#new-session-view").hide();
$("#fullscreen-datalist-view").hide();
$('#new_data_list').hide();
$("#fullscreen-search-view").hide();
$("#fullscreen-user-profile-view").hide();
$("#user-preferences-view").hide();
$("#datum-preferences-view").hide();
$("#hotkey-config-view").hide();
$('#import').hide();
>>>>>>>
// Display the fullscreen datum view and hide all the other views
$("#dashboard-view").show();
$("#fullscreen-datum-view").show();
$("#fullscreen-datalist-view").hide();
$("#fullscreen-search-view").hide();
$("#fullscreen-user-profile-view").hide();
$("#new-session-view").hide();
$("#user-preferences-view").hide();
$("#datum-preferences-view").hide();
$("#hotkey-config-view").hide();
$('#new-data-list').hide();
$("#new-corpus").hide();
$('#import').hide();
<<<<<<<
$('#new-data-list').hide();
$("#new-corpus").hide();
=======
$('#new_data_list').hide();
$('#export-view').hide();
>>>>>>>
$('#new-data-list').hide();
$("#new-corpus").hide();
$('#export-view').hide();
<<<<<<<
$('#new-data-list').hide();
$("#new-corpus").hide();
=======
$('#new_data_list').hide();
$('#export-view').hide();
>>>>>>>
$('#new-data-list').hide();
$("#new-corpus").hide();
$('#export-view').hide();
<<<<<<<
$('#new-data-list').hide();
$("#corpus").show();
$("#activity_feed").show();
$("#new-corpus").hide();
=======
$('#new_data_list').hide();
$("#corpus").show();
$("#activity_feed").show();
$('#export-view').hide();
>>>>>>>
$('#new-data-list').hide();
$("#corpus").show();
$("#activity_feed").show();
$("#new-corpus").hide();
$('#export-view').hide();
<<<<<<<
$('#new-data-list').hide();
$("#new-corpus").hide();
=======
$('#new_data_list').hide();
$('#export-view').hide();
>>>>>>>
$('#new-data-list').hide();
$("#new-corpus").hide();
$('#export-view').hide();
<<<<<<<
$('#new-data-list').hide();
$("#new-corpus").hide();
=======
$('#new_data_list').hide();
$('#export-view').hide();
>>>>>>>
$('#new-data-list').hide();
$("#new-corpus").hide();
$('#export-view').hide();
<<<<<<<
$("#fullscreen-search-view").hide();
$("#fullscreen-user-profile-view").hide();
$("#user-preferences-view").hide();
$("#datum-preferences-view").hide();
$("#hotkey-config-view").hide();
$('#import').show();
},
=======
$('#export-view').hide();
},
showExport : function(corpusName) {
Utils.debug("In showExport: " + corpusName);
$("#dashboard-view").show();
$("#fullscreen-datum-view").hide();
$("#fullscreen-datalist-view").hide();
$("#fullscreen-search-view").hide();
$("#user-preferences-view").hide();
$("#new-session-view").hide();
$("#fullscreen-user-profile-view").hide();
$("#datum-preferences-view").hide();
$("#hotkey-config-view").hide();
$('#new_data_list').hide();
$('#export-view').show();
$('#import').hide();
}
>>>>>>>
$("#fullscreen-search-view").hide();
$("#fullscreen-user-profile-view").hide();
$("#user-preferences-view").hide();
$("#datum-preferences-view").hide();
$("#hotkey-config-view").hide();
$('#import').show();
$('#export-view').hide();
},
showExport : function(corpusName) {
Utils.debug("In showExport: " + corpusName);
$("#dashboard-view").show();
$("#fullscreen-datum-view").hide();
$("#fullscreen-datalist-view").hide();
$("#fullscreen-search-view").hide();
$("#user-preferences-view").hide();
$("#new-session-view").hide();
$("#fullscreen-user-profile-view").hide();
$("#datum-preferences-view").hide();
$("#hotkey-config-view").hide();
$('#new_data_list').hide();
$('#export-view').show();
$('#import').hide();
} |
<<<<<<<
import { keyBy } from "lodash"
import {
quadtree,
select as d3Select,
event as d3Event,
mouse as d3Mouse,
} from "d3"
import { transition as d3Transition } from "d3" /* */
=======
import _ from "lodash"
import { select as d3Select, event as d3Event, mouse as d3Mouse } from "d3"
import { transition as d3Transition } from "d3"
>>>>>>>
import { keyBy } from "lodash"
import {
quadtree,
select as d3Select,
event as d3Event,
mouse as d3Mouse,
} from "d3"
import { transition as d3Transition } from "d3"
<<<<<<<
// import thMap from "../../public/th-grid-map.png"
=======
>>>>>>>
<<<<<<<
const partyLookup = keyBy(parties, p => p.id)
const NO_PARTY = "#aaaaaa"
const HIDDEN_ZONE = "#dddddd"
// @todo #30 Declare the required props for Election Map.
=======
>>>>>>>
const partyLookup = keyBy(parties, p => p.id)
const NO_PARTY = "#aaaaaa"
const HIDDEN_ZONE = "#dddddd"
// @todo #30 Declare the required props for Election Map. |
<<<<<<<
import { overrideDirectory } from "./DeveloperOptions.js"
import { performOverrideOnSummaryJSON } from "./ResultOverride.js"
=======
import { overrideDirectory } from "./TimeTraveling"
import { useComputed } from "./MobXHooks"
>>>>>>>
import { overrideDirectory } from "./DeveloperOptions.js"
import { performOverrideOnSummaryJSON } from "./ResultOverride.js"
import { useComputed } from "./MobXHooks"
<<<<<<<
}
function useMappedDataState(state, mapper) {
return useMemo(
() => (state.data ? { ...state, data: mapper(state.data) } : state),
[state, mapper]
)
}
/**
* Utility function to subscribe to MobX.
*/
function useComputed(fn, inputs) {
const box = useMemo(() => computed(fn), inputs)
const [, setRerenderCount] = useState(0)
useEffect(
() =>
autorun(() => {
box.get()
setRerenderCount(x => x + 1)
}),
[box]
)
return box.get()
=======
>>>>>>>
}
function useMappedDataState(state, mapper) {
return useMemo(
() => (state.data ? { ...state, data: mapper(state.data) } : state),
[state, mapper]
) |
<<<<<<<
webgazer.BlinkDetector.prototype.setBlinkWindow = function(value) {
if (webgazer.utils.isInt(value) && value > 0) {
this.blinkWindow = value;
}
return this;
=======
//replace oldest entry
this.blinkData[this.blinkWindowIndex] = eyesObj;
this.blinkWindowIndex = (this.blinkWindowIndex + 1) % this.blinkWindow;
//TODO detect if current eyeObj is different from eyeObj in blinkData;
eyesObj.left.blink = false;
eyesObj.right.blink = false;
return eyesObj;
}
//TODO
/**
*
* @param value
* @returns {webgazer.BlinkDetector}
*/
webgazer.BlinkDetector.prototype.setBlinkWindow = function(value) {
if (webgazer.utils.isInt(value) && value > 0) {
this.blinkWindow = value;
>>>>>>>
//TODO
/**
*
* @param value
* @returns {webgazer.BlinkDetector}
*/
webgazer.BlinkDetector.prototype.setBlinkWindow = function(value) {
if (webgazer.utils.isInt(value) && value > 0) {
this.blinkWindow = value;
}
return this; |
<<<<<<<
var Js_objectdetectGaze = function() {};
=======
/**
* Constructor of Js_objectdetectGaze
* @constructor
*/
var Js_objectdetectGaze = function() {
}
>>>>>>>
/**
* Constructor of Js_objectdetectGaze
* @constructor
*/
var Js_objectdetectGaze = function() {};
<<<<<<<
=======
/**
* The Js_objectdetectGaze object name
* @type {string}
*/
>>>>>>>
/**
* The Js_objectdetectGaze object name
* @type {string}
*/ |
<<<<<<<
=======
var CalibrationPoints={};
>>>>>>>
var CalibrationPoints={};
<<<<<<<
}
function sleep (time) {
return new Promise((resolve) => setTimeout(resolve, time));
}
=======
}
>>>>>>>
}
function sleep (time) {
return new Promise((resolve) => setTimeout(resolve, time));
} |
<<<<<<<
//Type test functions
self.gazer.util.isInt;
self.gazer.util.isNaN;
self.gazer.util.isString;
//Eye class
self.gazer.util.Eye = function(patch, imagex, imagey, width, height) {
=======
/**
* Eye class, represents an eye patch detected in the video stream
* @param {ImageData} patch - the image data corresponding to an eye
* @param {number} imagex - x-axis offset from the top-left corner of the video canvas
* @param {number} imagey - y-axis offset from the top-left corner of the video canvas
* @param {number} width - width of the eye patch
* @param {number} height - height of the eye patch
*/
gazer.util.Eye = function(patch, imagex, imagey, width, height) {
>>>>>>>
self.gazer.util.Eye = function(patch, imagex, imagey, width, height) {
/**
* Eye class, represents an eye patch detected in the video stream
* @param {ImageData} patch - the image data corresponding to an eye
* @param {number} imagex - x-axis offset from the top-left corner of the video canvas
* @param {number} imagey - y-axis offset from the top-left corner of the video canvas
* @param {number} width - width of the eye patch
* @param {number} height - height of the eye patch
*/
self.gazer.util.Eye = function(patch, imagex, imagey, width, height) {
<<<<<<<
//Data Window class
//operates like an array but 'wraps' data around to keep the array at a fixed windowSize
self.gazer.util.DataWindow = function(windowSize) {
=======
/**
* DataWindow class - Operates like an array, but 'wraps' data around to keep the array at a fixed windowSize
* @param {number} windowSize - defines the maximum size of the window
* @param {data} [data] - optional data to seed the DataWindow with
**/
gazer.util.DataWindow = function(windowSize, data) {
>>>>>>>
//Data Window class
//operates like an array but 'wraps' data around to keep the array at a fixed windowSize
/**
* DataWindow class - Operates like an array, but 'wraps' data around to keep the array at a fixed windowSize
* @param {number} windowSize - defines the maximum size of the window
* @param {data} [data] - optional data to seed the DataWindow with
**/
self.gazer.util.DataWindow = function(windowSize, data) {
<<<<<<<
self.gazer.util.DataWindow.prototype.push = function(entry) {
=======
/**
* [push description]
* @param {Any} entry - item to be inserted. It either grows the DataWindow or replaces the oldest item
* @return {DataWindow} this
*/
gazer.util.DataWindow.prototype.push = function(entry) {
>>>>>>>
/**
* [push description]
* @param {Any} entry - item to be inserted. It either grows the DataWindow or replaces the oldest item
* @return {DataWindow} this
*/
self.gazer.util.DataWindow.prototype.push = function(entry) {
<<<<<<<
self.gazer.util.DataWindow.prototype.get = function(ind) {
=======
/**
* Get the element at the ind position by wrapping around the DataWindow
* @param {number} ind index of desired entry
* @return {Any}
*/
gazer.util.DataWindow.prototype.get = function(ind) {
>>>>>>>
/**
* Get the element at the ind position by wrapping around the DataWindow
* @param {number} ind index of desired entry
* @return {Any}
*/
self.gazer.util.DataWindow.prototype.get = function(ind) {
<<<<<<<
self.gazer.util.DataWindow.prototype.addAll = function(data) {
//TODO use slice instead?
=======
/**
* Append all the contents of data
* @param {array} data - to be inserted
*/
gazer.util.DataWindow.prototype.addAll = function(data) {
>>>>>>>
/**
* Append all the contents of data
* @param {array} data - to be inserted
*/
self.gazer.util.DataWindow.prototype.addAll = function(data) {
<<<<<<<
self.gazer.util.grayscale = function(imageData, imageWidth, imageHeight){
//TODO either move tracking into self.gazer namespace or re-implement function
=======
/**
* Grayscales an image patch. Can be used for the whole canvas, detected face, detected eye, etc.
* @param {ImageData} imageData - image data to be grayscaled
* @param {number} imageWidth - width of image data to be grayscaled
* @param {number} imageHeight - height of image data to be grayscaled
* @return {ImageData} grayscaledImage
*/
gazer.util.grayscale = function(imageData, imageWidth, imageHeight){
//TODO either move tracking into gazer namespace or re-implement function
>>>>>>>
/**
* Grayscales an image patch. Can be used for the whole canvas, detected face, detected eye, etc.
* @param {ImageData} imageData - image data to be grayscaled
* @param {number} imageWidth - width of image data to be grayscaled
* @param {number} imageHeight - height of image data to be grayscaled
* @return {ImageData} grayscaledImage
*/
self.gazer.util.grayscale = function(imageData, imageWidth, imageHeight){
//TODO either move tracking into gazer namespace or re-implement function
<<<<<<<
gazer.util.resizeEye = function(eye, resizeWidth, resizeHeight) {
=======
/**
* Gets an Eye object and resizes it to the desired resolution
* @param {gazer.util.Eye} eye - patch to be resized
* @param {number} resizeWidth - desired width
* @param {number} resizeHeight - desired height
* @return {gazer.util.Eye} resized eye patch
*/
gazer.util.resizeEye = function(eye, resizeWidth, resizeHeight) {
>>>>>>>
/**
* Gets an Eye object and resizes it to the desired resolution
* @param {gazer.util.Eye} eye - patch to be resized
* @param {number} resizeWidth - desired width
* @param {number} resizeHeight - desired height
* @return {gazer.util.Eye} resized eye patch
*/
self.gazer.util.resizeEye = function(eye, resizeWidth, resizeHeight) {
<<<<<<<
=======
>>>>>>> |
<<<<<<<
blocks.makeNewBlock('start');
last(blocks.blockList).x = 250;
last(blocks.blockList).y = 250;
last(blocks.blockList).connections = [null, null, null];
turtles.add(last(blocks.blockList));
last(blocks.blockList).value = turtles.turtleList.length - 1;
blocks.updateBlockPositions();
}
if (!doNotSave) {
// Overwrite session data too.
saveLocally();
=======
function postprocess() {
last(blocks.blockList).x = 250;
last(blocks.blockList).y = 250;
last(blocks.blockList).connections = [null, null, null];
turtles.add(last(blocks.blockList));
last(blocks.blockList).value = turtles.turtleList.length - 1;
blocks.updateBlockPositions();
if (typeof(Storage) !== 'undefined') {
localStorage.setItem('sessiondata', prepareExport());
}
}
blocks.makeNewBlock('start', postprocess);
} else {
// Overwrite session data too.
console.log('overwriting session data');
if (typeof(Storage) !== 'undefined') {
localStorage.setItem('sessiondata', prepareExport());
} else {
// Sorry! No Web Storage support..
}
>>>>>>>
function postprocess() {
last(blocks.blockList).x = 250;
last(blocks.blockList).y = 250;
last(blocks.blockList).connections = [null, null, null];
turtles.add(last(blocks.blockList));
last(blocks.blockList).value = turtles.turtleList.length - 1;
blocks.updateBlockPositions();
if (!doNotSave) {
saveLocally();
}
}
blocks.makeNewBlock('start', postprocess);
}
if (!doNotSave) {
// Overwrite session data too.
saveLocally();
<<<<<<<
=======
function doSaveBox() {
saveBox.show(scale);
}
function doSave() {
// FIXME: show input form and then save after name has been entered
// Save file to turtle.sugarlabs.org
// var titleElem = docById('title');
// if (titleElem.value.length == 0) {
var saveName = docById('mySaveName');
if (saveName.value.length == 0) {
console.log('saving to unknown.tb');
return saveProject('unknown.tb');
} else {
console.log('saving to ' + saveName.value);
return saveProject(saveName.value);
}
// } else {
// console.log('saving to ' + titleElem.value + '.tb');
// return saveProject(titleElem.value + '.tb');
// }
}
>>>>>>> |
<<<<<<<
=======
var path = require('path');
var urlModule = require('url');
>>>>>>>
<<<<<<<
});
=======
}
// If a string is passed
if (self.options.templateContent) {
return Promise.resolve(self.options.templateContent);
}
// If templateContent is empty use the template option
var templateFile = self.options.template;
if (!templateFile) {
// Use a special index file to prevent double script / style injection if the `inject` option is truthy
templateFile = path.join(__dirname, self.options.inject ? 'default_inject_index.html' : 'default_index.html');
} else {
templateFile = path.normalize(templateFile);
}
compilation.fileDependencies.push(templateFile);
return fs.readFileAsync(templateFile, 'utf8')
// If the file could not be read log a error
.catch(function() {
return Promise.reject(new Error('HtmlWebpackPlugin: Unable to read HTML template "' + templateFile + '"'));
});
>>>>>>>
}); |
<<<<<<<
describe("Converting elliptical arc commands to curves", function() {
=======
describe('Converting eliptical arc commands to curves', () => {
>>>>>>>
describe('Converting elliptical arc commands to curves', () => { |
<<<<<<<
})
test('Test German', (t) => {
t.plan(1)
t.equal(
jovanotti('In German orthography, the grapheme ß, called Eszett or scharfes S, in English "sharp S", represents the [s] phoneme in Standard German'),
'In German orthography, the grapheme ff, called Efffett or fcharfef F, in Englifh "fharp F", reprefentf the [f] phoneme in Ftandard German'
)
=======
})
test('French phrase', (t) => {
t.plan(1)
t.equal(jovanotti('Salut! Ça va?'), 'Falut! Fa va?')
>>>>>>>
})
test('Test German', (t) => {
t.plan(1)
t.equal(
jovanotti('In German orthography, the grapheme ß, called Eszett or scharfes S, in English "sharp S", represents the [s] phoneme in Standard German'),
'In German orthography, the grapheme ff, called Efffett or fcharfef F, in Englifh "fharp F", reprefentf the [f] phoneme in Ftandard German'
)
})
test('French phrase', (t) => {
t.plan(1)
t.equal(jovanotti('Salut! Ça va?'), 'Falut! Fa va?') |
<<<<<<<
'Imports', 'Targets', 'TargetFailures', 'Sessions', 'Installations', 'Policies'
=======
'Imports', 'Targets', 'Sessions', 'Installations', 'Policies', 'Automations'
>>>>>>>
'Imports', 'Targets', 'TargetFailures', 'Sessions', 'Installations', 'Policies', 'Automations' |
<<<<<<<
return this.requestAll('GET', ['tickets', {type: value}], cb);
=======
this.requestAll('GET', ['tickets', {[type]: value}], cb);
>>>>>>>
return this.requestAll('GET', ['tickets', { [type]: value }], cb);
<<<<<<<
Tickets.prototype.exportSample = function (startTime, options) {
return this.request('GET', ['exports', 'tickets', 'sample', {start_time: startTime}], cb);
=======
Tickets.prototype.exportSample = function (startTime, cb) {
this.request('GET', ['exports', 'tickets', 'sample', {start_time: startTime}], cb);
>>>>>>>
Tickets.prototype.exportSample = function (startTime, cb) {
return this.request('GET', ['exports', 'tickets', 'sample', { start_time: startTime }], cb);
<<<<<<<
return this.request('GET', ['incremental', 'tickets', {start_time: startTime}], cb);
=======
this.requestAll('GET', ['incremental', 'tickets', {start_time: startTime}], cb);
>>>>>>>
return this.requestAll('GET', ['incremental', 'tickets', { start_time: startTime }], cb);
<<<<<<<
return this.request('GET', ['incremental', 'tickets', {start_time: startTime, include: include}], cb);
=======
this.requestAll('GET', ['incremental', 'tickets', {start_time: startTime, include: include}], cb);
>>>>>>>
return this.requestAll('GET', ['incremental', 'tickets', { start_time: startTime, include: include }], cb);
<<<<<<<
return this.requestAll('PUT', ['tickets', ticketID, 'tags'], tags, cb);
=======
this.requestAll('PUT', ['tickets', ticketID, 'tags'], tags, cb);
};
// ====================================== Replace Tags to Ticket
Tickets.prototype.updateTags = function (ticketID, tags, cb) {
this.requestAll('POST', ['tickets', ticketID, 'tags'], tags, cb);
>>>>>>>
return this.requestAll('PUT', ['tickets', ticketID, 'tags'], tags, cb);
};
// ====================================== Replace Tags to Ticket
Tickets.prototype.updateTags = function (ticketID, tags, cb) {
return this.requestAll('POST', ['tickets', ticketID, 'tags'], tags, cb); |
<<<<<<<
return withDesc(new Bacon.Desc(Bacon, "retry", [options]), Bacon.repeat(function(count) {
=======
return withDesc(new Desc(Bacon, "retry", [options]), repeat(function() {
>>>>>>>
return withDesc(new Desc(Bacon, "retry", [options]), Bacon.repeat(function(count) {
<<<<<<<
var pause = Bacon.later(delay(context)).filter(false);
retriesDone++
return pause.concat(Bacon.once().flatMap(valueStream));
=======
var pause = later(delay(context)).filter(false);
retries = retries - 1;
return pause.concat(once().flatMap(valueStream));
>>>>>>>
var pause = later(delay(context)).filter(false);
retriesDone++
return pause.concat(Bacon.once().flatMap(valueStream)); |
<<<<<<<
function Next(value) {
=======
export function Next(valueF, eager) {
>>>>>>>
export function Next(value) {
<<<<<<<
Bacon.Event = Event;
Bacon.Initial = Initial;
Bacon.Next = Next;
Bacon.End = End;
Bacon.Error = Error;
var initialEvent = function(value) { return new Initial(value); };
var nextEvent = function(value) { return new Next(value); };
var endEvent = function() { return new End(); };
var toEvent = function(x) {
=======
export function initialEvent(value) { return new Initial(value, true); }
export function nextEvent(value) { return new Next(value, true); }
export function endEvent() { return new End(); }
export function toEvent(x) {
>>>>>>>
export function initialEvent(value) { return new Initial(value); }
export function nextEvent(value) { return new Next(value); }
export function endEvent() { return new End(); }
export function toEvent(x) { |
<<<<<<<
// build-dependencies: zip
// ES7 observable:
// build-dependencies: esobservable
// build-dependencies: fromesobservable
=======
// build-dependencies: when
// build-dependencies: zip
>>>>>>>
// build-dependencies: when
// build-dependencies: zip
// ES7 observable:
// build-dependencies: esobservable
// build-dependencies: fromesobservable |
<<<<<<<
// build-dependencies: zip
=======
// build-dependencies: when
// build-dependencies: zip
// ES6 pieces:
// build-dependencies: first
// build-dependencies: last
// build-dependencies: throttle
// build-dependencies: topromise
// ES7 observable:
// build-dependencies: esobservable
// build-dependencies: fromesobservable
>>>>>>>
// build-dependencies: zip
// ES7 observable:
// build-dependencies: esobservable
// build-dependencies: fromesobservable |
<<<<<<<
var Bacon, BufferingSource, Bus, CompositeUnsubscribe, ConsumingSource, Desc, Dispatcher, End, Error, Event, EventStream, Exception, Initial, Next, None, Observable, Property, PropertyDispatcher, Some, Source, UpdateBarrier, _, addPropertyInitValueToStream, assert, assertArray, assertEventStream, assertFunction, assertNoArguments, assertObservable, assertObservableIsProperty, assertString, cloneArray, constantToFunction, containsDuplicateDeps, convertArgsToFunction, describe, endEvent, eventIdCounter, eventMethods, findDeps, findHandlerMethods, flatMap_, former, idCounter, initialEvent, isArray, isFieldKey, isObservable, latter, liftCallback, makeFunction, makeFunctionArgs, makeFunction_, makeObservable, makeSpawner, nextEvent, nop, partiallyApplied, recursionDepth, ref, registerObs, spys, toCombinator, toEvent, toFieldExtractor, toFieldKey, toOption, toSimpleExtractor, valueAndEnd, withDesc, withMethodCallSupport, hasProp = {}.hasOwnProperty, extend = function (child, parent) {
=======
var Bacon, BufferingSource, Bus, CompositeUnsubscribe, ConsumingSource, Desc, Dispatcher, End, Error, Event, EventStream, Exception, Initial, Next, None, Observable, Property, PropertyDispatcher, Some, Source, UpdateBarrier, _, addPropertyInitValueToStream, assert, assertArray, assertEventStream, assertFunction, assertNoArguments, assertObservable, assertObservableIsProperty, assertString, cloneArray, constantToFunction, containsDuplicateDeps, convertArgsToFunction, describe, endEvent, eventIdCounter, eventMethods, findDeps, findHandlerMethods, flatMap_, former, idCounter, initialEvent, isArray, isFieldKey, isObservable, latter, liftCallback, makeFunction, makeFunctionArgs, makeFunction_, makeObservable, makeSpawner, nextEvent, nop, partiallyApplied, recursionDepth, ref, registerObs, spys, toCombinator, toEvent, toFieldExtractor, toFieldKey, toOption, toSimpleExtractor, valueAndEnd, withDescription, withMethodCallSupport, hasProp = {}.hasOwnProperty, extend = function (child, parent) {
>>>>>>>
var Bacon, BufferingSource, Bus, CompositeUnsubscribe, ConsumingSource, Desc, Dispatcher, End, Error, Event, EventStream, Exception, Initial, Next, None, Observable, Property, PropertyDispatcher, Some, Source, UpdateBarrier, _, addPropertyInitValueToStream, assert, assertArray, assertEventStream, assertFunction, assertNoArguments, assertObservable, assertObservableIsProperty, assertString, cloneArray, constantToFunction, containsDuplicateDeps, convertArgsToFunction, describe, endEvent, eventIdCounter, eventMethods, findDeps, findHandlerMethods, flatMap_, former, idCounter, initialEvent, isArray, isFieldKey, isObservable, latter, liftCallback, makeFunction, makeFunctionArgs, makeFunction_, makeObservable, makeSpawner, nextEvent, nop, partiallyApplied, recursionDepth, ref, registerObs, spys, toCombinator, toEvent, toFieldExtractor, toFieldKey, toOption, toSimpleExtractor, valueAndEnd, withDesc, withMethodCallSupport, hasProp = {}.hasOwnProperty, extend = function (child, parent) {
<<<<<<<
Bacon.version = '0.7.61';
=======
Bacon.version = '<version>';
>>>>>>>
Bacon.version = '<version>';
<<<<<<<
Bacon.fromPromise = function (promise, abort) {
return withDesc(new Bacon.Desc(Bacon, 'fromPromise', [promise]), Bacon.fromBinder(function (handler) {
=======
Bacon.fromPromise = function (promise, abort, eventTransformer) {
if (eventTransformer == null) {
eventTransformer = valueAndEnd;
}
return withDescription(Bacon, 'fromPromise', promise, Bacon.fromBinder(function (handler) {
>>>>>>>
Bacon.fromPromise = function (promise, abort, eventTransformer) {
if (eventTransformer == null) {
eventTransformer = valueAndEnd;
}
return withDesc(new Bacon.Desc(Bacon, 'fromPromise', [promise]), Bacon.fromBinder(function (handler) { |
<<<<<<<
var Bacon, BufferingSource, Bus, CompositeUnsubscribe, ConsumingSource, Desc, Dispatcher, End, Error, Event, EventStream, Exception, Initial, Next, None, Observable, Property, PropertyDispatcher, Some, Source, UpdateBarrier, _, addPropertyInitValueToStream, argumentsToObservables, argumentsToObservablesAndFunction, assert, assertArray, assertEventStream, assertFunction, assertNoArguments, assertObservable, assertObservableIsProperty, assertString, cloneArray, constantToFunction, containsDuplicateDeps, convertArgsToFunction, describe, endEvent, eventIdCounter, eventMethods, findDeps, findHandlerMethods, flatMap_, former, idCounter, initialEvent, isArray, isFieldKey, isObservable, latter, liftCallback, makeFunction, makeFunctionArgs, makeFunction_, makeObservable, makeSpawner, nextEvent, nop, partiallyApplied, recursionDepth, registerObs, spys, toCombinator, toEvent, toFieldExtractor, toFieldKey, toOption, toSimpleExtractor, valueAndEnd, withDesc, withMethodCallSupport,
=======
var Bacon, BufferingSource, Bus, CompositeUnsubscribe, ConsumingSource, Desc, Dispatcher, End, Error, Event, EventStream, Exception, Initial, Next, None, Observable, Property, PropertyDispatcher, Some, Source, UpdateBarrier, _, addPropertyInitValueToStream, argumentsToObservables, argumentsToObservablesAndFunction, assert, assertArray, assertEventStream, assertFunction, assertNoArguments, assertObservable, assertObservableIsProperty, assertString, cloneArray, constantToFunction, containsDuplicateDeps, convertArgsToFunction, describe, endEvent, eventIdCounter, eventMethods, findDeps, findHandlerMethods, flatMap_, former, idCounter, initialEvent, isArray, isFieldKey, isObservable, latter, liftCallback, makeFunction, makeFunctionArgs, makeFunction_, makeObservable, makeSpawner, nextEvent, nop, partiallyApplied, recursionDepth, ref, registerObs, spys, symbol, toCombinator, toEvent, toFieldExtractor, toFieldKey, toOption, toSimpleExtractor, valueAndEnd, withDesc, withMethodCallSupport,
>>>>>>>
var Bacon, BufferingSource, Bus, CompositeUnsubscribe, ConsumingSource, Desc, Dispatcher, End, Error, Event, EventStream, Exception, Initial, Next, None, Observable, Property, PropertyDispatcher, Some, Source, UpdateBarrier, _, addPropertyInitValueToStream, argumentsToObservables, argumentsToObservablesAndFunction, assert, assertArray, assertEventStream, assertFunction, assertNoArguments, assertObservable, assertObservableIsProperty, assertString, cloneArray, constantToFunction, containsDuplicateDeps, convertArgsToFunction, describe, endEvent, eventIdCounter, eventMethods, findDeps, findHandlerMethods, flatMap_, former, idCounter, initialEvent, isArray, isFieldKey, isObservable, latter, liftCallback, makeFunction, makeFunctionArgs, makeFunction_, makeObservable, makeSpawner, nextEvent, nop, partiallyApplied, recursionDepth, registerObs, spys, symbol, toCombinator, toEvent, toFieldExtractor, toFieldKey, toOption, toSimpleExtractor, valueAndEnd, withDesc, withMethodCallSupport,
<<<<<<<
for (var _len2 = arguments.length, args = Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
args[_key2 - 1] = arguments[_key2];
}
=======
Bacon["try"] = function(f) {
return function(value) {
var e, error1;
try {
return Bacon.once(f(value));
} catch (error1) {
e = error1;
return new Bacon.Error(e);
}
};
};
>>>>>>>
for (var _len2 = arguments.length, args = Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
args[_key2 - 1] = arguments[_key2];
}
<<<<<<<
Bacon.try = function (f) {
return function (value) {
try {
return Bacon.once(f(value));
} catch (e) {
return new Bacon.Error(e);
}
};
};
Bacon.update = function (initial) {
var _Bacon;
function lateBindFirst(f) {
return function () {
for (var _len5 = arguments.length, args = Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
args[_key5] = arguments[_key5];
}
return function (i) {
return f.apply(undefined, _toConsumableArray([i].concat(args)));
};
};
}
for (var _len4 = arguments.length, patterns = Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
patterns[_key4 - 1] = arguments[_key4];
}
var i = patterns.length - 1;
while (i > 0) {
if (!(patterns[i] instanceof Function)) {
patterns[i] = _.always(patterns[i]);
}
patterns[i] = lateBindFirst(patterns[i]);
i = i - 2;
}
return withDesc(new Bacon.Desc(Bacon, "update", [initial].concat(patterns)), (_Bacon = Bacon).when.apply(_Bacon, patterns).scan(initial, function (x, f) {
return f(x);
}));
};
Bacon.zipAsArray = function () {
for (var _len6 = arguments.length, args = Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
args[_key6] = arguments[_key6];
}
var streams = argumentsToObservables(args);
return withDesc(new Bacon.Desc(Bacon, "zipAsArray", streams), Bacon.zipWith(streams, function () {
for (var _len7 = arguments.length, xs = Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
xs[_key7] = arguments[_key7];
}
return xs;
}));
};
Bacon.zipWith = function () {
for (var _len8 = arguments.length, args = Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
args[_key8] = arguments[_key8];
}
var observablesAndFunction = argumentsToObservablesAndFunction(args);
var streams = observablesAndFunction[0];
var f = observablesAndFunction[1];
streams = _.map(function (s) {
return s.toEventStream();
}, streams);
return withDesc(new Bacon.Desc(Bacon, "zipWith", [f].concat(streams)), Bacon.when(streams, f));
};
Bacon.Observable.prototype.zip = function (other, f) {
return withDesc(new Bacon.Desc(this, "zip", [other]), Bacon.zipWith([this, other], f || Array));
};
=======
function ESObservable(observable) {
this.observable = observable;
}
ESObservable.prototype.subscribe = function (observer) {
var cancel = this.observable.subscribe(function (event) {
if (event.isError()) {
if (observer.error) observer.error(event.error);
cancel();
} else if (event.isEnd()) {
if (observer.complete) observer.complete();
cancel();
} else if (observer.next) {
observer.next(event.value());
}
});
return cancel;
};
Bacon.Observable.prototype[symbol('observable')] = function () {
return new ESObservable(this);
};
Bacon.fromESObservable = function (_observable) {
var observable;
if (_observable[symbol("observable")]) {
observable = _observable[symbol("observable")]();
} else {
observable = observable;
}
var desc = new Bacon.Desc(Bacon, "fromESObservable", [observable]);
return new Bacon.EventStream(desc, function (sink) {
var cancel = observable.subscribe({
error: function () {
sink(new Bacon.Error());
sink(new Bacon.End());
},
next: function (value) {
sink(new Bacon.Next(value, true));
},
complete: function () {
sink(new Bacon.End());
}
});
if (cancel.unsubscribe) {
return function () {
cancel.unsubscribe();
};
} else {
return cancel;
}
});
};
>>>>>>>
Bacon.try = function (f) {
return function (value) {
try {
return Bacon.once(f(value));
} catch (e) {
return new Bacon.Error(e);
}
};
};
Bacon.update = function (initial) {
var _Bacon;
function lateBindFirst(f) {
return function () {
for (var _len5 = arguments.length, args = Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
args[_key5] = arguments[_key5];
}
return function (i) {
return f.apply(undefined, _toConsumableArray([i].concat(args)));
};
};
}
for (var _len4 = arguments.length, patterns = Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
patterns[_key4 - 1] = arguments[_key4];
}
var i = patterns.length - 1;
while (i > 0) {
if (!(patterns[i] instanceof Function)) {
patterns[i] = _.always(patterns[i]);
}
patterns[i] = lateBindFirst(patterns[i]);
i = i - 2;
}
return withDesc(new Bacon.Desc(Bacon, "update", [initial].concat(patterns)), (_Bacon = Bacon).when.apply(_Bacon, patterns).scan(initial, function (x, f) {
return f(x);
}));
};
Bacon.zipAsArray = function () {
for (var _len6 = arguments.length, args = Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
args[_key6] = arguments[_key6];
}
var streams = argumentsToObservables(args);
return withDesc(new Bacon.Desc(Bacon, "zipAsArray", streams), Bacon.zipWith(streams, function () {
for (var _len7 = arguments.length, xs = Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
xs[_key7] = arguments[_key7];
}
return xs;
}));
};
Bacon.zipWith = function () {
for (var _len8 = arguments.length, args = Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
args[_key8] = arguments[_key8];
}
var observablesAndFunction = argumentsToObservablesAndFunction(args);
var streams = observablesAndFunction[0];
var f = observablesAndFunction[1];
streams = _.map(function (s) {
return s.toEventStream();
}, streams);
return withDesc(new Bacon.Desc(Bacon, "zipWith", [f].concat(streams)), Bacon.when(streams, f));
};
Bacon.Observable.prototype.zip = function (other, f) {
return withDesc(new Bacon.Desc(this, "zip", [other]), Bacon.zipWith([this, other], f || Array));
};
function ESObservable(observable) {
this.observable = observable;
}
ESObservable.prototype.subscribe = function (observer) {
var cancel = this.observable.subscribe(function (event) {
if (event.isError()) {
if (observer.error) observer.error(event.error);
cancel();
} else if (event.isEnd()) {
if (observer.complete) observer.complete();
cancel();
} else if (observer.next) {
observer.next(event.value());
}
});
return cancel;
};
Bacon.Observable.prototype[symbol('observable')] = function () {
return new ESObservable(this);
};
Bacon.fromESObservable = function (_observable) {
var observable;
if (_observable[symbol("observable")]) {
observable = _observable[symbol("observable")]();
} else {
observable = observable;
}
var desc = new Bacon.Desc(Bacon, "fromESObservable", [observable]);
return new Bacon.EventStream(desc, function (sink) {
var cancel = observable.subscribe({
error: function () {
sink(new Bacon.Error());
sink(new Bacon.End());
},
next: function (value) {
sink(new Bacon.Next(value, true));
},
complete: function () {
sink(new Bacon.End());
}
});
if (cancel.unsubscribe) {
return function () {
cancel.unsubscribe();
};
} else {
return cancel;
}
});
}; |
<<<<<<<
test('tm dirfiles windows root', function(t) {
var platform = require('os').platform();
if (platform === 'win32' || platform === 'win64') {
tm.dirfiles('/', function(err, files) {
t.ifError(err);
t.deepEqual(
files
.filter(function(f) { return (-1 < f.basename.indexOf('c')) })
.map(function(f){ return f.path }),
[
'c:\\'
]
);
t.end();
});
}
});
=======
>>>>>>>
test('tm dirfiles windows root', function(t) {
var platform = require('os').platform();
if (platform === 'win32' || platform === 'win64') {
tm.dirfiles('/', function(err, files) {
t.ifError(err);
t.deepEqual(
files
.filter(function(f) { return (-1 < f.basename.indexOf('c')) })
.map(function(f){ return f.path }),
[
'c:\\'
]
);
t.end();
});
}
}); |
<<<<<<<
tmp: path.join(tmppath, 'tmp'),
=======
fonts: path.join(tmppath, 'fonts'),
>>>>>>>
tmp: path.join(tmppath, 'tmp'),
fonts: path.join(tmppath, 'fonts'), |
<<<<<<<
test('tm applog noop', function(t) {
tm.applog(false, 1, function(err) {
t.ifError(err, 'noop on no filepath');
t.end();
});
});
test('tm applog err: not a file', function(t) {
tm.applog(tmppath, 1, function(err) {
t.ok(/is not a file$/.test(err.toString()), 'error when filepath is not a file');
t.end();
});
});
test('tm applog', function(t) {
var filepath = tm.join(tmppath + '/app.log');
t.ok(!fs.existsSync(filepath), 'app.log does not exist');
tm.applog(filepath, 10, function(err) {
t.ifError(err);
process.stdout.write(' stdout\n');
process.stderr.write(' stderr\n');
setTimeout(function() {
t.ok(fs.existsSync(filepath), 'creates app.log');
t.equal(fs.readFileSync(filepath,'utf8'), ' stdout\n stderr\n', 'writes stdout/stderr to app.log');
rotates();
}, 100);
});
function rotates() {
tm.applog(filepath, 10, function(err) {
t.ifError(err);
t.ok(fs.existsSync(filepath + '.0.gz'), 'rotates app log to app.log.0.gz');
process.stdout.write(' stdout\n');
process.stderr.write(' stderr\n');
setTimeout(function() {
t.equal(fs.readFileSync(filepath,'utf8'), ' stdout\n stderr\n', 'writes stdout/stderr to app.log');
t.end();
}, 100);
});
}
});
test('cleanup', function(t) {
try { fs.unlinkSync(path.join(tmppath, 'app.db')); } catch(err) {}
try { fs.unlinkSync(path.join(tmppath, 'app.log')); } catch(err) {}
try { fs.unlinkSync(path.join(tmppath, 'app.log.0.gz')); } catch(err) {}
try { fs.unlinkSync(path.join(tmppath, 'noncompact.db')); } catch(err) {}
try { fs.unlinkSync(path.join(tmppath, 'schema-v1.db')); } catch(err) {}
try { fs.unlinkSync(path.join(tmppath, 'schema-v2.db')); } catch(err) {}
try { fs.unlinkSync(path.join(tmppath, 'schema-v3.db')); } catch(err) {}
try { fs.unlinkSync(path.join(tmppath, 'cache', 'font-dbad83a6.png')); } catch(err) {}
try { fs.rmdirSync(path.join(tmppath, 'cache')); } catch(err) {}
try { fs.rmdirSync(tmppath); } catch(err) {}
t.end();
});
=======
>>>>>>>
test('tm applog noop', function(t) {
tm.applog(false, 1, function(err) {
t.ifError(err, 'noop on no filepath');
t.end();
});
});
test('tm applog err: not a file', function(t) {
tm.applog(tmppath, 1, function(err) {
t.ok(/is not a file$/.test(err.toString()), 'error when filepath is not a file');
t.end();
});
});
test('tm applog', function(t) {
var filepath = tm.join(tmppath + '/app.log');
t.ok(!fs.existsSync(filepath), 'app.log does not exist');
tm.applog(filepath, 10, function(err) {
t.ifError(err);
process.stdout.write(' stdout\n');
process.stderr.write(' stderr\n');
setTimeout(function() {
t.ok(fs.existsSync(filepath), 'creates app.log');
t.equal(fs.readFileSync(filepath,'utf8'), ' stdout\n stderr\n', 'writes stdout/stderr to app.log');
rotates();
}, 100);
});
function rotates() {
tm.applog(filepath, 10, function(err) {
t.ifError(err);
t.ok(fs.existsSync(filepath + '.0.gz'), 'rotates app log to app.log.0.gz');
process.stdout.write(' stdout\n');
process.stderr.write(' stderr\n');
setTimeout(function() {
t.equal(fs.readFileSync(filepath,'utf8'), ' stdout\n stderr\n', 'writes stdout/stderr to app.log');
t.end();
}, 100);
});
}
}); |
<<<<<<<
if (extension === 'tif' || extension === 'vrt') window.editor.addlayer(extension, [{'id':metadata.filename}], filepath, metadata);
else window.editor.addlayer(extension, metadata.json.vector_layers, filepath, metadata);
=======
window.editor.addlayer(extension, metadata.json.vector_layers, filepath, metadata);
window.editor.changed();
>>>>>>>
if (extension === 'tif' || extension === 'vrt') window.editor.addlayer(extension, [{'id':metadata.filename}], filepath, metadata);
else window.editor.addlayer(extension, metadata.json.vector_layers, filepath, metadata);
window.editor.changed(); |
<<<<<<<
var protocol = require('protocol');
if (protocol.isHandledProtocol('https')) {
protocol.interceptProtocol('https', function(request) {
var url = request.url.substr(7)
console.log(url);
return;
});
} else {
protocol.registerProtocol('https', function(request) {
var url = request.url.substr(7)
console.log('URL', url)
return;
});
}
=======
loadURL();
}
function loadURL() {
if (!mainWindow) return;
if (!serverPort) return;
mainWindow.loadUrl('http://localhost:'+serverPort);
>>>>>>>
var protocol = require('protocol');
if (protocol.isHandledProtocol('https')) {
protocol.interceptProtocol('https', function(request) {
var url = request.url.substr(7)
console.log(url);
return;
});
} else {
protocol.registerProtocol('https', function(request) {
var url = request.url.substr(7)
console.log('URL', url)
return;
});
}
loadURL();
}
function loadURL() {
if (!mainWindow) return;
if (!serverPort) return;
mainWindow.loadUrl('http://localhost:'+serverPort); |
<<<<<<<
var extension = filepath.split('.').pop().toLowerCase();
if (filepath.indexOf('.geo.json') !== -1) extension = 'geojson';
// file browser is loading file for a manual source
if (!mapnikOmnivore_digestable(extension)) return Modal.close();
//if file is compatible with mapnik omnivore, send to mapnik-omnivore for file's metadata
$.ajax({
url: '/metadata?file=' + filepath,
success: function(metadata) {
if(extension === 'tif' || extension === 'vrt') window.editor.addlayer(extension, [{'id':metadata.filename}], filepath, metadata);
else window.editor.addlayer(extension, metadata.json.vector_layers, filepath, metadata)
},
error: function(jqXHR, textStatus, errorThrown) {
Modal.show('error', jqXHR.responseText);
}
});
=======
var form = $(target).parents('form');
if (form.is('#addlayer')) {
window.editor.addlayerSubmit(null, filepath);
} else {
Modal.close();
}
>>>>>>>
var form = $(target).parents('form');
if (form.is('#addlayer')) {
window.editor.addlayerSubmit(null, filepath);
} else {
Modal.close();
}
<<<<<<<
function mapnikOmnivore_digestable(ext) {
if (ext === 'gpx' || ext === 'geojson' || ext === 'kml' || ext === 'shp' || ext === 'csv' || ext === 'tif' || ext === 'tiff' || ext === 'vrt') return true;
else return false;
};
=======
>>>>>>> |
<<<<<<<
'click .search-result': 'selectSearch',
'click .search-result-bookmark': 'bookmarkSearch',
'click .search-n': 'focusSearch',
'click #upload-style': 'upload',
'click #print-style': 'print',
=======
'click .js-upload': 'upload',
>>>>>>>
'click .js-upload': 'upload',
'click #print-style': 'print', |
<<<<<<<
var stream = require('stream');
var progress = require('progress-stream');
=======
var UPDATE = process.env.UPDATE;
>>>>>>>
var stream = require('stream');
var progress = require('progress-stream');
var UPDATE = process.env.UPDATE; |
<<<<<<<
=======
view.changed();
>>>>>>>
view.changed(); |
<<<<<<<
=======
scrollToSignUp = () => {
Utils.scrollToElement('.signup-form');
};
>>>>>>>
scrollToSignUp = () => {
Utils.scrollToElement('.signup-form');
}; |
<<<<<<<
=======
<div>
<Link id="create-org-link" onClick={toggle} to="/create">
Create Organisation
</Link>
</div>
>>>>>>> |
<<<<<<<
<div className={"col-md-3"}>
<Panel title="Free">
<p className="price">$Free</p>
<ul className="pricing-features">
<li><p>Up to 2,000 Monthly Active Users</p></li>
<li><p>Unlimited Administrator Accounts</p></li>
<li><p>Unlimited Projects</p></li>
<li><p>Unlimited Environments</p></li>
<li><p>Unlimited Feature Flags</p></li>
</ul>
<a href="#">Sign Up</a>
</Panel>
</div>
<div className={"col-md-3"}>
<Panel title="Startup">
<p className="price">$29 / month</p>
=======
<div className={"col-md-4"}>
<Panel title={<h4 className="pricing-type">Startup</h4>}>
<h5 className="pricing-price">$29 / month</h5>
>>>>>>>
<div className={"col-md-3"}>
<Panel title={<h4 className="pricing-type">Free</h4>}>
<h5 className="pricing-price">$Free</h5>
<ul className="pricing-features">
<li><p>Up to 2,000 Monthly Active Users</p></li>
<li><p>Unlimited Administrator Accounts</p></li>
<li><p>Unlimited Projects</p></li>
<li><p>Unlimited Environments</p></li>
<li><p>Unlimited Feature Flags</p></li>
</ul>
<a href="#">Sign Up</a>
</Panel>
</div>
<div className={"col-md-3"}>
<Panel title={<h4 className="pricing-type">Start-Up</h4>}>
<h5 className="pricing-price">$29 / month</h5>
<<<<<<<
<div className={"col-md-3"}>
<Panel title="Scale-Up">
<p className="price">$99 / month</p>
=======
<div className={"col-md-4"}>
<Panel title={<h4 className="pricing-type">Scale-Up</h4>}>
<h5 className="pricing-price">$99 / month</h5>
>>>>>>>
<div className={"col-md-3"}>
<Panel title={<h4 className="pricing-type">Scale-Up</h4>}>
<h5 className="pricing-price">$99 / month</h5>
<<<<<<<
<div className={"col-md-3"}>
<Panel title="Enterprise">
<p>$Contact Us</p>
<ul>
=======
<div className={"col-md-4"}>
<Panel title={<h4 className="pricing-type">Enterprise</h4>}>
<h5 className="pricing-price">$Contact Us</h5>
<ul className="pricing-features">
>>>>>>>
<div className={"col-md-3"}>
<Panel title={<h4 className="pricing-type">Enterprise</h4>}>
<h5 className="pricing-price">$Contact Us</h5>
<ul className="pricing-features"> |
<<<<<<<
snippets={Constants.codeHelp.CREATE_USER(this.props.match.params.environmentId, identities && identities[0].identifier)}
=======
snippets={Constants.codeHelp.CREATE_USER(this.props.params.environmentId, identities && identities[0] && identities[0].identifier)}
>>>>>>>
snippets={Constants.codeHelp.CREATE_USER(this.props.match.params.environmentId, identities && identities[0] && identities[0].identifier)} |
<<<<<<<
const TheComponent = class extends Component {
static displayName = 'TheComponent'
=======
const SegmentListProvider = class extends Component {
displayName: 'SegmentListProvider'
>>>>>>>
const SegmentListProvider = class extends Component {
static displayName = 'TheComponent' |
<<<<<<<
import arrayMove from 'array-move';
import _data from '../../common/data/base/_data';
import ProjectStore from '../../common/stores/project-store';
=======
const arrayMoveMutate = (array, from, to) => {
array.splice(to < 0 ? array.length + to : to, 0, array.splice(from, 1)[0]);
};
const arrayMove = (array, from, to) => {
array = array.slice();
arrayMoveMutate(array, from, to);
return array;
};
>>>>>>>
import _data from '../../common/data/base/_data';
import ProjectStore from '../../common/stores/project-store';
const arrayMoveMutate = (array, from, to) => {
array.splice(to < 0 ? array.length + to : to, 0, array.splice(from, 1)[0]);
};
const arrayMove = (array, from, to) => {
array = array.slice();
arrayMoveMutate(array, from, to);
return array;
}; |
<<<<<<<
<ul className="float-right nav-list">
<li><a onClick={loginDemo}>Demo</a></li>
<li><a href="https://docs.bullet-train.io/">Docs</a></li>
<li><a href="mailto:[email protected]">Support</a></li>
</ul>
=======
>>>>>>> |
<<<<<<<
websocketAddress: atom.config.get('etheratom.websocketAddress'),
status: this.props.store.getState().node.status
};
console.log('==========================================================================');
console.log(this.props.store.getState());
console.log('==========================================================================');
this._refreshSync = this._refreshSync.bind(this);
=======
websocketAddress: atom.config.get('etheratom.websocketAddress')
};
this._refreshSync = this._refreshSync.bind(this);
>>>>>>>
websocketAddress: atom.config.get('etheratom.websocketAddress'),
status: this.props.store.getState().node.status
};
this._refreshSync = this._refreshSync.bind(this);
<<<<<<<
const accounts = await this.helpers.getAccounts();
=======
const accounts = await this.helpers.getAccounts();
>>>>>>>
const accounts = await this.helpers.getAccounts();
<<<<<<<
const accounts = await this.helpers.getAccounts();
=======
const accounts = await this.helpers.getAccounts();
>>>>>>>
const accounts = await this.helpers.getAccounts(); |
<<<<<<<
=======
===================================================================');
console.log(this.props.store.getState());
console.log('==========================================================================');
=======
>>>>>>>
<<<<<<<
const accounts = await this.helpers.getAccounts();
this.helpers.showPanelSuccess('Connection Re-established');
this.props.setAccounts(accounts);
if (accounts.length > 0) {
this.props.setCoinbase(accounts[0]);
} else {
this.props.setCoinbase('0x00');
}
=======
await this.helpers.getAccountsForNodeSubmit('node_ws', websocketAddress);
>>>>>>>
await this.helpers.getAccountsForNodeSubmit('node_ws', websocketAddress);
<<<<<<<
this.props.setAccounts([]);
this.props.setCoinbase('0x00');
this.props.setMining(false);
=======
>>>>>>>
<<<<<<<
const accounts = await this.helpers.getAccounts();
this.helpers.showPanelSuccess('Connection Re-established with rpc');
this.props.setAccounts(accounts);
if (accounts.length > 0) {
this.props.setCoinbase(accounts[0]);
} else {
this.props.setCoinbase('0x00');
}
=======
await this.helpers.getAccountsForNodeSubmit('node_rpc', rpcAddress);
>>>>>>>
await this.helpers.getAccountsForNodeSubmit('node_rpc', rpcAddress); |
<<<<<<<
notifications: UpdatesNotificationsSection,
// that's right, use the same object as "notifications"
notifications_enabled: UpdatesNotificationsSection},
=======
monitor_buckets: MonitorBucketsSection,
monitor_servers: MonitorServersSection,
settings: SettingsSection},
>>>>>>>
// monitor_buckets: MonitorBucketsSection,
// monitor_servers: MonitorServersSection,
settings: SettingsSection}, |
<<<<<<<
if(typeof this.contentBase === "object") {
// Proxy every request to contentBase.target
app.all("*", function(req, res) {
proxy.web(req, res, this.contentBase, function(err) {
var msg = "cannot proxy to " + this.contentBase.target + " (" + err.message + ")";
console.log(msg);
this.io.sockets.emit("proxy-error", [msg]);
}.bind(this));
}.bind(this));
} else if(/^(https?:)?\/\//.test(this.contentBase)) {
// Redirect every request to contentBase
app.get("*", function(req, res) {
res.writeHead(302, {
'Location': this.contentBase + req.path + (req._parsedUrl.search || "")
});
res.end();
}.bind(this));
} else if(typeof this.contentBase === "number") {
// Redirect every request to the port contentBase
app.get("*", function(req, res) {
res.writeHead(302, {
'Location': "//localhost:" + this.contentBase + req.path + (req._parsedUrl.search || "")
});
res.end();
}.bind(this));
} else {
// route content request
app.get("*", this.serveMagicHtml.bind(this), express.static(this.contentBase), serveIndex(this.contentBase));
=======
if(options.contentBase !== false) {
var contentBase = options.contentBase || process.cwd();
if(typeof contentBase === "object") {
// Proxy every request to contentBase.target
app.all("*", function(req, res) {
proxy.web(req, res, contentBase);
}.bind(this));
} else if(/^(https?:)?\/\//.test(contentBase)) {
// Redirect every request to contentBase
app.get("*", function(req, res) {
res.writeHead(302, {
'Location': contentBase + req.path + (req._parsedUrl.search || "")
});
res.end();
}.bind(this));
} else if(typeof contentBase === "number") {
// Redirect every request to the port contentBase
app.get("*", function(req, res) {
res.writeHead(302, {
'Location': "//localhost:" + contentBase + req.path + (req._parsedUrl.search || "")
});
res.end();
}.bind(this));
} else {
// route content request
app.get("*", this.serveMagicHtml.bind(this), express.static(contentBase), serveIndex(contentBase));
}
>>>>>>>
if(options.contentBase !== false) {
var contentBase = options.contentBase || process.cwd();
if(typeof contentBase === "object") {
// Proxy every request to contentBase.target
app.all("*", function(req, res) {
proxy.web(req, res, this.contentBase, function(err) {
var msg = "cannot proxy to " + this.contentBase.target + " (" + err.message + ")";
console.log(msg);
this.io.sockets.emit("proxy-error", [msg]);
}.bind(this));
}.bind(this));
} else if(/^(https?:)?\/\//.test(contentBase)) {
// Redirect every request to contentBase
app.get("*", function(req, res) {
res.writeHead(302, {
'Location': contentBase + req.path + (req._parsedUrl.search || "")
});
res.end();
}.bind(this));
} else if(typeof contentBase === "number") {
// Redirect every request to the port contentBase
app.get("*", function(req, res) {
res.writeHead(302, {
'Location': "//localhost:" + contentBase + req.path + (req._parsedUrl.search || "")
});
res.end();
}.bind(this));
} else {
// route content request
app.get("*", this.serveMagicHtml.bind(this), express.static(contentBase), serveIndex(contentBase));
} |
<<<<<<<
const api = stores.settings.all.app.server;
let url;
if (api === 'https://api.franzinfra.com') {
url = `${WEBSITE}${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`;
} else {
url = `${api}${route}`;
}
=======
const url = stores.user.getAuthURL(`${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`);
>>>>>>>
const api = stores.settings.all.app.server;
let url;
if (api === 'https://api.franzinfra.com') {
url = stores.user.getAuthURL(`${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`);
} else {
url = `${api}${route}`;
} |
<<<<<<<
'pl-PL': 'Polish',
=======
'ru-RU': 'Русский',
>>>>>>>
'pl-PL': 'Polish',
'ru-RU': 'Русский', |
<<<<<<<
import FeaturesStore from '../../stores/FeaturesStore';
=======
import SettingsStore from '../../stores/SettingsStore';
>>>>>>>
import FeaturesStore from '../../stores/FeaturesStore';
import SettingsStore from '../../stores/SettingsStore';
<<<<<<<
features: PropTypes.instanceOf(FeaturesStore).isRequired,
=======
settings: PropTypes.instanceOf(SettingsStore).isRequired,
>>>>>>>
features: PropTypes.instanceOf(FeaturesStore).isRequired,
settings: PropTypes.instanceOf(SettingsStore).isRequired, |
<<<<<<<
@observable isPremium = true;
=======
@observable hasSubscription = false;
@observable hadSubscription = false;
@observable isPremium = false;
>>>>>>>
@observable hasSubscription = true;
@observable hadSubscription = false;
@observable isPremium = true; |
<<<<<<<
this._updateTodosConfig,
=======
this._firstLaunchReaction,
>>>>>>>
this._updateTodosConfig,
this._firstLaunchReaction,
<<<<<<<
_updateTodosConfig = () => {
// Resend the config if any part changes in Franz:
this._onTodosClientInitialized();
}
=======
_firstLaunchReaction = () => {
const { stats } = this.stores.settings.all;
// Hide todos layer on first app start but show on second
if (stats.appStarts <= 1) {
this._updateSettings({
isTodosPanelVisible: false,
});
} else if (stats.appStarts <= 2) {
this._updateSettings({
isTodosPanelVisible: true,
});
}
};
>>>>>>>
_updateTodosConfig = () => {
// Resend the config if any part changes in Franz:
this._onTodosClientInitialized();
};
_firstLaunchReaction = () => {
const { stats } = this.stores.settings.all;
// Hide todos layer on first app start but show on second
if (stats.appStarts <= 1) {
this._updateSettings({
isTodosPanelVisible: false,
});
} else if (stats.appStarts <= 2) {
this._updateSettings({
isTodosPanelVisible: true,
});
}
}; |
<<<<<<<
action, computed, observable, set, reaction,
=======
action, computed, observable,
>>>>>>>
action, computed, observable, reaction, |
<<<<<<<
if (window.ferdi === undefined) {
=======
// Don't initialize when window.franz is undefined or when we are on a payment window route
if (window.franz === undefined || this.stores.router.location.pathname.startsWith('/payment/')) {
console.log('skipping menu init');
>>>>>>>
// Don't initialize when window.franz is undefined or when we are on a payment window route
if (window.ferdi === undefined || this.stores.router.location.pathname.startsWith('/payment/')) {
console.log('skipping menu init'); |
<<<<<<<
isAppMuted: PropTypes.bool.isRequired,
=======
update: PropTypes.func.isRequired,
>>>>>>>
isAppMuted: PropTypes.bool.isRequired,
update: PropTypes.func.isRequired,
<<<<<<<
isAppMuted,
=======
update,
>>>>>>>
isAppMuted,
update,
<<<<<<<
isAppMuted={isAppMuted}
=======
enable={() => update({
serviceId: service.id,
serviceData: {
isEnabled: true,
},
redirect: false,
})}
>>>>>>>
isAppMuted={isAppMuted}
enable={() => update({
serviceId: service.id,
serviceData: {
isEnabled: true,
},
redirect: false,
})} |
<<<<<<<
import workspaces from '../features/workspaces';
=======
import shareFranz from '../features/shareFranz';
>>>>>>>
import workspaces from '../features/workspaces';
import shareFranz from '../features/shareFranz';
<<<<<<<
workspaces(this.stores, this.actions);
=======
shareFranz(this.stores, this.actions);
>>>>>>>
workspaces(this.stores, this.actions);
shareFranz(this.stores, this.actions); |
<<<<<<<
=======
import { gaEvent, gaPage } from '../../lib/analytics';
import { getUserWorkspacesRequest } from '../workspaces/api';
>>>>>>>
import { getUserWorkspacesRequest } from '../workspaces/api'; |
<<<<<<<
import serviceLimit from '../features/serviceLimit';
import communityRecipes from '../features/communityRecipes';
=======
import todos from '../features/todos';
>>>>>>>
import serviceLimit from '../features/serviceLimit';
import communityRecipes from '../features/communityRecipes';
import todos from '../features/todos';
<<<<<<<
serviceLimit(this.stores, this.actions);
communityRecipes(this.stores, this.actions);
=======
todos(this.stores, this.actions);
>>>>>>>
serviceLimit(this.stores, this.actions);
communityRecipes(this.stores, this.actions);
todos(this.stores, this.actions); |
<<<<<<<
import settingsWS from '../features/settingsWS';
=======
import announcements from '../features/announcements';
>>>>>>>
import announcements from '../features/announcements';
import settingsWS from '../features/settingsWS';
<<<<<<<
settingsWS(this.stores, this.actions);
=======
announcements(this.stores, this.actions);
>>>>>>>
announcements(this.stores, this.actions);
settingsWS(this.stores, this.actions); |
<<<<<<<
@observable authRequestFailed = false;
=======
@observable timeSuspensionStart;
>>>>>>>
@observable authRequestFailed = false;
@observable timeSuspensionStart;
<<<<<<<
=======
// analytics autorun
reaction(() => this.stores.router.location.pathname, (pathname) => {
gaPage(pathname);
});
powerMonitor.on('suspend', () => {
debug('System suspended starting timer');
this.timeSuspensionStart = moment();
});
powerMonitor.on('resume', () => {
debug('System resumed, last suspended on', this.timeSuspensionStart.toString());
if (this.timeSuspensionStart.add(10, 'm').isBefore(moment())) {
debug('Reloading services, user info and features');
setTimeout(() => {
window.location.reload();
}, ms('2s'));
statsEvent('resumed-app');
}
});
// macOS catalina notifications hack
// notifications got stuck after upgrade but forcing a notification
// via `new Notification` triggered the permission request
if (isMac && !localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
// eslint-disable-next-line no-new
new window.Notification('Welcome to Franz 5', {
body: 'Have a wonderful day & happy messaging.',
});
localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, true);
}
statsEvent('app-start');
>>>>>>>
powerMonitor.on('suspend', () => {
debug('System suspended starting timer');
this.timeSuspensionStart = moment();
});
powerMonitor.on('resume', () => {
debug('System resumed, last suspended on', this.timeSuspensionStart.toString());
if (this.timeSuspensionStart.add(10, 'm').isBefore(moment())) {
debug('Reloading services, user info and features');
setTimeout(() => {
window.location.reload();
}, ms('2s'));
statsEvent('resumed-app');
}
});
// macOS catalina notifications hack
// notifications got stuck after upgrade but forcing a notification
// via `new Notification` triggered the permission request
if (isMac && !localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
// eslint-disable-next-line no-new
new window.Notification('Welcome to Franz 5', {
body: 'Have a wonderful day & happy messaging.',
});
localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, true);
}
statsEvent('app-start'); |
<<<<<<<
=======
import { gaEvent, gaPage } from '../../lib/analytics';
import { planSelectionStore } from '../planSelection';
>>>>>>>
import { planSelectionStore } from '../planSelection'; |
<<<<<<<
workspaces: {
id: 'menu.workspaces',
defaultMessage: '!!!Workspaces',
},
defaultWorkspace: {
id: 'menu.workspaces.defaultWorkspace',
defaultMessage: '!!!Default',
},
addNewWorkspace: {
id: 'menu.workspaces.addNewWorkspace',
defaultMessage: '!!!Add New Workspace...',
},
=======
activateNextService: {
id: 'menu.services.setNextServiceActive',
defaultMessage: '!!!Activate next service...',
},
activatePreviousService: {
id: 'menu.services.activatePreviousService',
defaultMessage: '!!!Activate previous service...',
},
muteApp: {
id: 'sidebar.muteApp',
defaultMessage: '!!!Disable notifications & audio',
},
unmuteApp: {
id: 'sidebar.unmuteApp',
defaultMessage: '!!!Enable notifications & audio',
},
>>>>>>>
addNewWorkspace: {
id: 'menu.workspaces.addNewWorkspace',
defaultMessage: '!!!Add New Workspace...',
},
activateNextService: {
id: 'menu.services.setNextServiceActive',
defaultMessage: '!!!Activate next service...',
},
activatePreviousService: {
id: 'menu.services.activatePreviousService',
defaultMessage: '!!!Activate previous service...',
},
muteApp: {
id: 'sidebar.muteApp',
defaultMessage: '!!!Disable notifications & audio',
},
unmuteApp: {
id: 'sidebar.unmuteApp',
defaultMessage: '!!!Enable notifications & audio',
},
workspaces: {
id: 'menu.workspaces',
defaultMessage: '!!!Workspaces',
},
defaultWorkspace: {
id: 'menu.workspaces.defaultWorkspace',
defaultMessage: '!!!Default',
},
<<<<<<<
// need to clone object so we don't modify computed (cached) object
const serviceTpl = Object.assign([], this.serviceTpl);
const workspacesMenu = Object.assign([], this.workspacesMenu);
=======
// need to clone object so we don't modify computed (cached) object
const serviceTpl = Object.assign([], this.serviceTpl());
>>>>>>>
// need to clone object so we don't modify computed (cached) object
const serviceTpl = Object.assign([], this.serviceTpl());
const workspacesMenu = Object.assign([], this.workspacesMenu()); |
<<<<<<<
<button
onClick={() => togglePanel()}
className={isVisible ? classes.closeTodosButton : classes.openTodosButton}
type="button"
>
<Icon icon={isVisible ? mdiChevronRight : mdiCheckAll} size={2} />
</button>
=======
<Icon icon={isVisible ? 'mdiChevronRight' : 'mdiCheckAll'} size={2} />
</button>
<div
className={classes.resizeHandler}
style={Object.assign({ left: delta }, isDragging ? { width: 600, marginLeft: -200 } : {})} // This hack is required as resizing with webviews beneath behaves quite bad
onMouseDown={e => this.startResize(e)}
/>
{isDragging && (
>>>>>>>
<Icon icon={isVisible ? mdiChevronRight : mdiCheckAll} size={2} />
</button>
<div
className={classes.resizeHandler}
style={Object.assign({ left: delta }, isDragging ? { width: 600, marginLeft: -200 } : {})} // This hack is required as resizing with webviews beneath behaves quite bad
onMouseDown={e => this.startResize(e)}
/>
{isDragging && (
<<<<<<<
className={classes.resizeHandler}
style={Object.assign({ left: delta }, isDragging ? { width: 600, marginLeft: -200 } : {})} // This hack is required as resizing with webviews beneath behaves quite bad
onMouseDown={e => this.startResize(e)}
/>
{isDragging && (
<div
className={classes.dragIndicator}
style={{ left: delta }} // This hack is required as resizing with webviews beneath behaves quite bad
/>
)}
{isTodosIncludedInCurrentPlan ? (
<Webview
className={classes.webview}
onDidAttach={() => {
const { setTodosWebview } = this.props;
setTodosWebview(this.webview);
this.startListeningToIpcMessages();
}}
partition="persist:todos"
preload="./features/todos/preload.js"
ref={(webview) => { this.webview = webview ? webview.view : null; }}
src={environment.TODOS_FRONTEND}
/>
) : (
<Appear>
<div className={classes.premiumContainer}>
<Icon icon={mdiCheckAll} className={classes.premiumIcon} size={5} />
<p>{intl.formatMessage(messages.premiumInfo)}</p>
<p>{intl.formatMessage(messages.rolloutInfo)}</p>
<ActivateTrialButton
className={classes.premiumCTA}
gaEventInfo={{ category: 'Todos', event: 'upgrade' }}
short
/>
</div>
</Appear>
)}
</div>
</>
=======
className={classes.dragIndicator}
style={{ left: delta }} // This hack is required as resizing with webviews beneath behaves quite bad
/>
)}
<Webview
className={classes.webview}
onDidAttach={() => {
const { setTodosWebview } = this.props;
setTodosWebview(this.webview);
this.startListeningToIpcMessages();
}}
partition="persist:todos"
preload="./features/todos/preload.js"
ref={(webview) => { this.webview = webview ? webview.view : null; }}
src={environment.TODOS_FRONTEND}
/>
</div>
>>>>>>>
className={classes.dragIndicator}
style={{ left: delta }} // This hack is required as resizing with webviews beneath behaves quite bad
/>
)}
{isTodosIncludedInCurrentPlan ? (
<Webview
className={classes.webview}
onDidAttach={() => {
const { setTodosWebview } = this.props;
setTodosWebview(this.webview);
this.startListeningToIpcMessages();
}}
partition="persist:todos"
preload="./features/todos/preload.js"
ref={(webview) => { this.webview = webview ? webview.view : null; }}
src={environment.TODOS_FRONTEND}
/>
) : (
<Appear>
<div className={classes.premiumContainer}>
<Icon icon={mdiCheckAll} className={classes.premiumIcon} size={5} />
<p>{intl.formatMessage(messages.premiumInfo)}</p>
<p>{intl.formatMessage(messages.rolloutInfo)}</p>
<ActivateTrialButton
className={classes.premiumCTA}
gaEventInfo={{ category: 'Todos', event: 'upgrade' }}
short
/>
</div>
</Appear>
)}
</div> |
<<<<<<<
{ isLoggedIn ? (
<>
{ stores.settings.all.app.lockingFeatureEnabled ? (
<button
type="button"
className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
onClick={() => {
actions.settings.update({
type: 'app',
data: {
locked: true,
},
});
}}
data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+Shift+L)`}
>
<i className="mdi mdi-lock" />
</button>
) : null}
{todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? (
<button
type="button"
onClick={() => {
todoActions.toggleTodosPanel();
this.updateToolTip();
}}
className="sidebar__button sidebar__button--workspaces"
data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
>
<i className="mdi mdi-check-all" />
</button>
) : null}
{workspaceStore.isFeatureEnabled ? (
<button
type="button"
onClick={() => {
toggleWorkspaceDrawer();
this.updateToolTip();
}}
className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
>
<i className="mdi mdi-view-grid" />
</button>
) : null}
<button
type="button"
onClick={() => {
toggleMuteApp();
this.updateToolTip();
}}
className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
>
<i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
</button>
<button
type="button"
onClick={() => openSettings({ path: 'recipes' })}
className="sidebar__button sidebar__button--new-service"
data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
>
<i className="mdi mdi-plus-box" />
</button>
</>
) : (
<Link
to="/auth/welcome"
className="sidebar__button sidebar__button--new-service"
data-tip="Login"
=======
{todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? (
<button
type="button"
onClick={() => {
todoActions.toggleTodosPanel();
this.updateToolTip();
gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'sidebar');
}}
className={`sidebar__button sidebar__button--todos ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`}
data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
>
<i className="mdi mdi-check-all" />
</button>
) : null}
{workspaceStore.isFeatureEnabled ? (
<button
type="button"
onClick={() => {
toggleWorkspaceDrawer();
this.updateToolTip();
gaEvent(GA_CATEGORY_WORKSPACES, 'toggleDrawer', 'sidebar');
}}
className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
>>>>>>>
{ isLoggedIn ? (
<>
{ stores.settings.all.app.lockingFeatureEnabled ? (
<button
type="button"
className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
onClick={() => {
actions.settings.update({
type: 'app',
data: {
locked: true,
},
});
}}
data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+Shift+L)`}
>
<i className="mdi mdi-lock" />
</button>
) : null}
{todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? (
<button
type="button"
onClick={() => {
todoActions.toggleTodosPanel();
this.updateToolTip();
gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'sidebar');
}}
className={`sidebar__button sidebar__button--todos ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`}
data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
>
<i className="mdi mdi-check-all" />
</button>
) : null}
{workspaceStore.isFeatureEnabled ? (
<button
type="button"
onClick={() => {
toggleWorkspaceDrawer();
this.updateToolTip();
}}
className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
>
<i className="mdi mdi-view-grid" />
</button>
) : null}
<button
type="button"
onClick={() => {
toggleMuteApp();
this.updateToolTip();
}}
className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
>
<i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
</button>
<button
type="button"
onClick={() => openSettings({ path: 'recipes' })}
className="sidebar__button sidebar__button--new-service"
data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
>
<i className="mdi mdi-plus-box" />
</button>
</>
) : (
<Link
to="/auth/welcome"
className="sidebar__button sidebar__button--new-service"
data-tip="Login" |
<<<<<<<
export const API = api;
export const WS_API = wsApi;
export const WEBSITE = web;
=======
export const API = api;
export const API_VERSION = 'v1';
>>>>>>>
export const API = api;
export const API_VERSION = 'v1';
export const WS_API = wsApi;
export const WEBSITE = web; |
<<<<<<<
self.minYear = self.minDate.year();
=======
*/
>>>>>>>
*/
<<<<<<<
if(!this.START+ index<=(self.maxYear)) {
return (this.START+ index);
}else{
return this.START ;
}
if(this.currentIndex_ < index){
this.currentIndex_ = index;
return this.START + index;
}
=======
if(this.currentIndex_ < index){
this.currentIndex_ = index;
}
return this.START + index;
>>>>>>>
if(!this.START+ index<=(self.maxYear)) {
return (this.START+ index);
}else{
return this.START ;
}
if(this.currentIndex_ < index){
this.currentIndex_ = index;
return this.START + index;
}
if(this.currentIndex_ < index){
this.currentIndex_ = index;
}
return this.START + index;
<<<<<<<
Calender.$inject = ['picker'];
=======
CalenderCtrl.prototype.isPreviousDate = function(yearToCheck, monthToCheck)
{
var self = this;
if(angular.isUndefined(self.minDate) || angular.isUndefined(yearToCheck) || angular.isUndefined(monthToCheck))
{
return false;
}
var _current_year = self.minDate.year();
if(yearToCheck < _current_year)
{
return true;
}else if(yearToCheck === _current_year)
{
if(monthToCheck < self.minDate.month())
{
return true;
}
}
return false;
};
>>>>>>>
Calender.$inject = ['picker'];
CalenderCtrl.prototype.isPreviousDate = function(yearToCheck, monthToCheck)
{
var self = this;
if(angular.isUndefined(self.minDate) || angular.isUndefined(yearToCheck) || angular.isUndefined(monthToCheck))
{
return false;
}
var _current_year = self.minDate.year();
if(yearToCheck < _current_year)
{
return true;
}else if(yearToCheck === _current_year)
{
if(monthToCheck < self.minDate.month())
{
return true;
}
}
return false;
}; |
<<<<<<<
: " (no response is expected)";
=======
: " (response will be ignored)";
const stringifiedPayload = JSON.stringify(payload);
// We want to log raw payload and event data rather than
// our fancy wrapper objects. Calling payload.toJSON() is
// insufficient to get all the nested raw data, because it's
// not recursive (it doesn't call toJSON() on the event objects).
// Parsing the result of JSON.stringify(), however, gives the
// fully recursive raw data.
>>>>>>>
: " (no response is expected)";
const stringifiedPayload = JSON.stringify(payload);
// We want to log raw payload and event data rather than
// our fancy wrapper objects. Calling payload.toJSON() is
// insufficient to get all the nested raw data, because it's
// not recursive (it doesn't call toJSON() on the event objects).
// Parsing the result of JSON.stringify(), however, gives the
// fully recursive raw data. |
<<<<<<<
// TODO: It would probably be best to query on the data collection payload level
// rather than the event. It seems like a payload-level thing and would save
// space whenever we start supporting multiple events per payload.
onBeforeEvent({ event }) {
addEcidQueryToEvent(event);
},
onBeforeRequest({ payload, onResponse, onRequestFailure }) {
return ensureSingleIdentity({ payload, onResponse, onRequestFailure });
=======
onBeforeRequest({ payload, onResponse }) {
// Querying the ECID on every request to be able to set the legacy cookie, and make it
// available for the `getIdentity` command.
addEcidQueryToPayload(payload);
return ensureSingleIdentity({ payload, onResponse });
>>>>>>>
onBeforeRequest({ payload, onResponse, onRequestFailure }) {
// Querying the ECID on every request to be able to set the legacy cookie, and make it
// available for the `getIdentity` command.
addEcidQueryToPayload(payload);
return ensureSingleIdentity({ payload, onResponse, onRequestFailure }); |
<<<<<<<
const network = { sendRequest() {} };
const createNetwork = jasmine.createSpy().and.returnValue(network);
const lifecycle = { onComponentsRegistered() {} };
const logger = { log() {} };
const config = { a: "b" };
const networkStrategy = () => {};
const tool = networkToolFactory(
createNetwork,
lifecycle,
logger,
networkStrategy
)(config)();
expect(createNetwork).toHaveBeenCalledWith(
config,
logger,
lifecycle,
networkStrategy
);
=======
const tool = networkToolFactory(createNetwork, lifecycle, logger)(config)();
expect(createNetwork).toHaveBeenCalledWith(config, logger, lifecycle);
>>>>>>>
const tool = networkToolFactory(
createNetwork,
lifecycle,
logger,
networkStrategy
)(config)();
expect(createNetwork).toHaveBeenCalledWith(
config,
logger,
lifecycle,
networkStrategy
); |
<<<<<<<
export default ({ createConsentRequestPayload, sendEdgeNetworkRequest }) => ({
consentOptions,
identityMap,
newConsentHash
}) => {
=======
export default ({
createConsentRequestPayload,
createConsentRequest,
sendEdgeNetworkRequest
}) => ({ consentOptions, identityMap }) => {
>>>>>>>
export default ({
createConsentRequestPayload,
createConsentRequest,
sendEdgeNetworkRequest
}) => ({ consentOptions, identityMap, newConsentHash }) => {
<<<<<<<
if (newConsentHash !== undefined) {
payload.setConsentHash(newConsentHash);
}
=======
const request = createConsentRequest(payload);
>>>>>>>
if (newConsentHash !== undefined) {
payload.setConsentHash(newConsentHash);
}
const request = createConsentRequest(payload); |
<<<<<<<
onBeforeEventSpy.and.callFake(event => {
event.mergeXdm({ a: "changed" });
=======
onBeforeEventSpy.and.callFake(({ event }) => {
event.mergeData({ a: "changed" });
>>>>>>>
onBeforeEventSpy.and.callFake(({ event }) => {
event.mergeXdm({ a: "changed" }); |
<<<<<<<
const action = expectsResponse ? "interact" : "collect";
const url = `https://${collectionDomain}/${action}?propertyID=${propertyID}`;
=======
const action = isBeacon ? "collect" : "interact";
const url = `https://${edgeDomain}/${action}?propertyID=${propertyID}`;
>>>>>>>
const action = expectsResponse ? "interact" : "collect";
const url = `https://${edgeDomain}/${action}?propertyID=${propertyID}`; |
<<<<<<<
logger.log(
`Request ${requestId}: Sending request${responseHandlingMessage}.`,
JSON.parse(stringifiedPayload)
);
=======
// JSON.parse is expensive so we short circuit if logging is disabled.
if (logger.enabled) {
logger.log(
`Request ${requestID}: Sending request${responseHandlingMessage}.`,
JSON.parse(stringifiedPayload)
);
}
>>>>>>>
// JSON.parse is expensive so we short circuit if logging is disabled.
if (logger.enabled) {
logger.log(
`Request ${requestId}: Sending request${responseHandlingMessage}.`,
JSON.parse(stringifiedPayload)
);
} |
<<<<<<<
export { default as atRuleParamIndex } from "./atRuleParamIndex"
export { default as declarationValueIndex } from "./declarationValueIndex"
=======
export { default as configurationError } from "./configurationError"
export { default as declarationValueIndex } from "./declarationValueIndex"
>>>>>>>
export { default as atRuleParamIndex } from "./atRuleParamIndex"
export { default as configurationError } from "./configurationError"
export { default as declarationValueIndex } from "./declarationValueIndex"
<<<<<<<
export { default as optionsHaveIgnored } from "./optionsHaveIgnored"
export { default as parseSelector } from "./parseSelector"
export { default as findOperators } from "./sassValueParser"
=======
export { default as optionsHaveIgnored } from "./optionsHaveIgnored"
export { default as parseSelector } from "./parseSelector"
export { default as whitespaceChecker } from "./whitespaceChecker"
>>>>>>>
export { default as optionsHaveIgnored } from "./optionsHaveIgnored"
export { default as parseSelector } from "./parseSelector"
export { default as findOperators } from "./sassValueParser"
export { default as whitespaceChecker } from "./whitespaceChecker" |
<<<<<<<
"function-color-relative": functionColorRelative,
=======
"map-keys-quotes": mapKeysQuotes,
>>>>>>>
"function-color-relative": functionColorRelative,
"map-keys-quotes": mapKeysQuotes, |
<<<<<<<
function move(from, to) {
$("#" + from + " option").each(function () {
if ($(this).prop("selected") == true) {
$("#" + to).append(this);
}
});
}
function move_all(from, to) {
$("#" + from).children().each(function () {
$("#" + to).append(this);
});
}
=======
function selectAll(){
var checklist = document.getElementsByName ("selected");
if(document.getElementById("select_all").checked)
{
for(var i=0;i<checklist.length;i++)
{
checklist[i].checked = 1;
}
}else{
for(var j=0;j<checklist.length;j++)
{
checklist[j].checked = 0;
}
}
}
function move(from, to) {
$("#"+from+" option").each(function(){
if ( $(this).prop("selected") == true ) {
$("#"+to).append(this);
}
});
}
function move_all(from, to){
$("#"+from).children().each(function(){
$("#"+to).append(this);
});
}
>>>>>>>
function move(from, to) {
$("#" + from + " option").each(function () {
if ($(this).prop("selected") == true) {
$("#" + to).append(this);
}
});
}
function move_all(from, to) {
$("#" + from).children().each(function () {
$("#" + to).append(this);
});
}
function selectAll(){
var checklist = document.getElementsByName ("selected");
if(document.getElementById("select_all").checked)
{
for(var i=0;i<checklist.length;i++)
{
checklist[i].checked = 1;
}
}else{
for(var j=0;j<checklist.length;j++)
{
checklist[j].checked = 0;
}
}
}
function move(from, to) {
$("#"+from+" option").each(function(){
if ( $(this).prop("selected") == true ) {
$("#"+to).append(this);
}
});
}
function move_all(from, to){
$("#"+from).children().each(function(){
$("#"+to).append(this);
});
} |
<<<<<<<
'can add years': {
'adding positive years works': function () {
var topic = new Date(2011, 1, 10);
topic.addYears(1);
assert.equal(topic.getFullYear(), 2012);
},
'adding negative years works': function () {
var topic = new Date(2011, 1, 10);
topic.addYears(1);
assert.equal(topic.getFullYear(), 2012);
topic.addYears(-2);
assert.equal(topic.getFullYear(), 2010);
}
},
'cannot remove milliseconds': {
'removing is not implemented': function () {
var topic = Date.today();
assert.throws(function() { topic.removeMilliseconds(500) }, Error);
}
},
'can remove seconds': {
'removing positive seconds works': function () {
var topic = Date.today();
topic.removeSeconds(50);
assert.equal(topic.getSeconds(), 10);
},
'removing negative seconds works': function () {
var topic = Date.today();
topic.removeSeconds(50);
assert.equal(topic.getSeconds(), 10);
topic.removeSeconds(-25);
assert.equal(topic.getSeconds(), 35);
}
},
'can remove minutes': {
'removing positive minutes works': function () {
var topic = Date.today();
topic.removeMinutes(50);
assert.equal(topic.getMinutes(), 10);
},
'removing negative minutes works': function () {
var topic = Date.today();
topic.removeMinutes(50);
assert.equal(topic.getMinutes(), 10);
topic.removeMinutes(-25);
assert.equal(topic.getMinutes(), 35);
}
},
'can remove hours': {
'removing positive hours works': function () {
var topic = Date.today();
topic.removeHours(5);
assert.equal(topic.getHours(), 19);
},
'removing negative hours works': function () {
var topic = Date.today();
topic.removeHours(5);
assert.equal(topic.getHours(), 19);
topic.removeHours(-2);
assert.equal(topic.getHours(), 21);
}
},
'can remove days': {
'removing positive days works': function () {
var topic = new Date(2011, 0, 10);
topic.removeDays(1);
assert.equal(topic.getDate(), 09);
},
'removing positive days works across boundaries': function () {
var topic = new Date(2011, 0, 01);
topic.removeDays(1);
assert.equal(topic.getDate(), 31);
assert.equal(topic.getMonth(), 11);
},
'removing negative days works': function () {
var topic = new Date(2011, 0, 10);
topic.removeDays(1);
assert.equal(topic.getDate(), 09);
topic.removeDays(-2);
assert.equal(topic.getDate(), 11);
}
},
'can remove weeks': {
'removing positive weeks works': function () {
var topic = new Date(2011, 0, 10);
topic.removeWeeks(1);
assert.equal(topic.getDate(), 03);
},
'removing negative weeks works': function () {
var topic = new Date(2011, 0, 10);
topic.removeWeeks(1);
assert.equal(topic.getDate(), 03);
topic.removeWeeks(-2);
assert.equal(topic.getDate(), 17);
}
},
'can remove months': {
'removing positive months works': function () {
var topic = new Date(2011, 1, 10);
topic.removeMonths(1);
assert.equal(topic.getMonth(), 0);
},
'removing negative months works': function () {
var topic = new Date(2011, 1, 10);
topic.removeMonths(1);
assert.equal(topic.getMonth(), 0);
topic.removeMonths(-2);
assert.equal(topic.getMonth(), 2);
}
},
'can remove years': {
'removing positive years works': function () {
var topic = new Date(2011, 1, 10);
topic.removeYears(1);
assert.equal(topic.getFullYear(), 2010);
},
'removing negative years works': function () {
var topic = new Date(2011, 1, 10);
topic.removeYears(1);
assert.equal(topic.getFullYear(), 2010);
topic.removeYears(-2);
assert.equal(topic.getFullYear(), 2012);
}
},
=======
'can add weekdays within a week': {
'adding positive weekdays': function () {
var topic = new Date(2013, 1, 13); //Wed
topic.addWeekdays(2);
assert.equal(topic.getDay(), 5);
},
'adding negative weekdays': function () {
var topic = new Date(2013, 1, 13); //Wed
topic.addWeekdays(-2);
assert.equal(topic.getDay(), 1);
}
},
'can add weekdays across one week': {
'adding positive weekdays': function () {
var wed = new Date(2013, 1, 13);
assert.equal(wed.addWeekdays(3).getDate(), 18);
var fri = new Date(2013, 1, 15);
assert.equal(fri.addWeekdays(1).getDate(), 18);
},
'adding negative weekdays': function () {
var wed = new Date(2013, 1, 13);
assert.equal(wed.addWeekdays(-3).getDate(), 8);
var mon = new Date(2013, 1, 11);
assert.equal(mon.addWeekdays(-1).getDate(), 8);
}
},
'can add weekdays across multiple weeks': {
'adding positive weekdays': function () {
var tue = new Date(2013, 3, 16);
assert.equal(tue.clone().addWeekdays(14).getDate(), 6);
assert.equal(tue.clone().addWeekdays(14).getMonth(), 4);
var fri = new Date(2013, 3, 19);
assert.equal(fri.clone().addWeekdays(14).getDate(), 9);
assert.equal(fri.clone().addWeekdays(14).getMonth(), 4);
},
'adding negative weekdays': function () {
var tue = new Date(2013, 3, 16); //Wed
assert.equal(tue.clone().addWeekdays(-17).getDate(), 22);
assert.equal(tue.clone().addWeekdays(-17).getMonth(), 2);
var mon = new Date(2013, 3, 15); //Wed
assert.equal(mon.clone().addWeekdays(-17).getDate(), 21);
assert.equal(mon.clone().addWeekdays(-17).getMonth(), 2);
}
},
'can add weekdays to a Saturday': {
'adding positive weekdays': function () {
var sat = new Date(2013, 1, 16);
assert.equal(sat.clone().addWeekdays(1).getDate(), 18);
assert.equal(sat.clone().addWeekdays(11).getDate(), 4);
assert.equal(sat.clone().addWeekdays(31).getDate(), 1);
},
'adding negative weekdays': function () {
var sat = new Date(2013, 1, 16);
assert.equal(sat.clone().addWeekdays(-1).getDate(), 15);
assert.equal(sat.clone().addWeekdays(-15).getDate(), 28);
assert.equal(sat.clone().addWeekdays(-33).getDate(), 2);
}
},
'can add weekdays to a Sunday': {
'adding positive weekdays': function () {
var sun = new Date(2013, 1, 17);
assert.equal(sun.clone().addWeekdays(1).getDate(), 18);
assert.equal(sun.clone().addWeekdays(11).getDate(), 4);
assert.equal(sun.clone().addWeekdays(31).getDate(), 1);
},
'adding negative weekdays': function () {
var sun = new Date(2013, 1, 17);
assert.equal(sun.clone().addWeekdays(-1).getDate(), 15);
assert.equal(sun.clone().addWeekdays(-15).getDate(), 28);
assert.equal(sun.clone().addWeekdays(-33).getDate(), 2);
}
},
>>>>>>>
'can add years': {
'adding positive years works': function () {
var topic = new Date(2011, 1, 10);
topic.addYears(1);
assert.equal(topic.getFullYear(), 2012);
},
'adding negative years works': function () {
var topic = new Date(2011, 1, 10);
topic.addYears(1);
assert.equal(topic.getFullYear(), 2012);
topic.addYears(-2);
assert.equal(topic.getFullYear(), 2010);
}
},
'cannot remove milliseconds': {
'removing is not implemented': function () {
var topic = Date.today();
assert.throws(function() { topic.removeMilliseconds(500) }, Error);
}
},
'can remove seconds': {
'removing positive seconds works': function () {
var topic = Date.today();
topic.removeSeconds(50);
assert.equal(topic.getSeconds(), 10);
},
'removing negative seconds works': function () {
var topic = Date.today();
topic.removeSeconds(50);
assert.equal(topic.getSeconds(), 10);
topic.removeSeconds(-25);
assert.equal(topic.getSeconds(), 35);
}
},
'can remove minutes': {
'removing positive minutes works': function () {
var topic = Date.today();
topic.removeMinutes(50);
assert.equal(topic.getMinutes(), 10);
},
'removing negative minutes works': function () {
var topic = Date.today();
topic.removeMinutes(50);
assert.equal(topic.getMinutes(), 10);
topic.removeMinutes(-25);
assert.equal(topic.getMinutes(), 35);
}
},
'can remove hours': {
'removing positive hours works': function () {
var topic = Date.today();
topic.removeHours(5);
assert.equal(topic.getHours(), 19);
},
'removing negative hours works': function () {
var topic = Date.today();
topic.removeHours(5);
assert.equal(topic.getHours(), 19);
topic.removeHours(-2);
assert.equal(topic.getHours(), 21);
}
},
'can remove days': {
'removing positive days works': function () {
var topic = new Date(2011, 0, 10);
topic.removeDays(1);
assert.equal(topic.getDate(), 09);
},
'removing positive days works across boundaries': function () {
var topic = new Date(2011, 0, 01);
topic.removeDays(1);
assert.equal(topic.getDate(), 31);
assert.equal(topic.getMonth(), 11);
},
'removing negative days works': function () {
var topic = new Date(2011, 0, 10);
topic.removeDays(1);
assert.equal(topic.getDate(), 09);
topic.removeDays(-2);
assert.equal(topic.getDate(), 11);
}
},
'can remove weeks': {
'removing positive weeks works': function () {
var topic = new Date(2011, 0, 10);
topic.removeWeeks(1);
assert.equal(topic.getDate(), 03);
},
'removing negative weeks works': function () {
var topic = new Date(2011, 0, 10);
topic.removeWeeks(1);
assert.equal(topic.getDate(), 03);
topic.removeWeeks(-2);
assert.equal(topic.getDate(), 17);
}
},
'can remove months': {
'removing positive months works': function () {
var topic = new Date(2011, 1, 10);
topic.removeMonths(1);
assert.equal(topic.getMonth(), 0);
},
'removing negative months works': function () {
var topic = new Date(2011, 1, 10);
topic.removeMonths(1);
assert.equal(topic.getMonth(), 0);
topic.removeMonths(-2);
assert.equal(topic.getMonth(), 2);
}
},
'can remove years': {
'removing positive years works': function () {
var topic = new Date(2011, 1, 10);
topic.removeYears(1);
assert.equal(topic.getFullYear(), 2010);
},
'removing negative years works': function () {
var topic = new Date(2011, 1, 10);
topic.removeYears(1);
assert.equal(topic.getFullYear(), 2010);
topic.removeYears(-2);
assert.equal(topic.getFullYear(), 2012);
'can add weekdays within a week': {
'adding positive weekdays': function () {
var topic = new Date(2013, 1, 13); //Wed
topic.addWeekdays(2);
assert.equal(topic.getDay(), 5);
},
'adding negative weekdays': function () {
var topic = new Date(2013, 1, 13); //Wed
topic.addWeekdays(-2);
assert.equal(topic.getDay(), 1);
}
},
'can add weekdays across one week': {
'adding positive weekdays': function () {
var wed = new Date(2013, 1, 13);
assert.equal(wed.addWeekdays(3).getDate(), 18);
var fri = new Date(2013, 1, 15);
assert.equal(fri.addWeekdays(1).getDate(), 18);
},
'adding negative weekdays': function () {
var wed = new Date(2013, 1, 13);
assert.equal(wed.addWeekdays(-3).getDate(), 8);
var mon = new Date(2013, 1, 11);
assert.equal(mon.addWeekdays(-1).getDate(), 8);
}
},
'can add weekdays across multiple weeks': {
'adding positive weekdays': function () {
var tue = new Date(2013, 3, 16);
assert.equal(tue.clone().addWeekdays(14).getDate(), 6);
assert.equal(tue.clone().addWeekdays(14).getMonth(), 4);
var fri = new Date(2013, 3, 19);
assert.equal(fri.clone().addWeekdays(14).getDate(), 9);
assert.equal(fri.clone().addWeekdays(14).getMonth(), 4);
},
'adding negative weekdays': function () {
var tue = new Date(2013, 3, 16); //Wed
assert.equal(tue.clone().addWeekdays(-17).getDate(), 22);
assert.equal(tue.clone().addWeekdays(-17).getMonth(), 2);
var mon = new Date(2013, 3, 15); //Wed
assert.equal(mon.clone().addWeekdays(-17).getDate(), 21);
assert.equal(mon.clone().addWeekdays(-17).getMonth(), 2);
}
},
'can add weekdays to a Saturday': {
'adding positive weekdays': function () {
var sat = new Date(2013, 1, 16);
assert.equal(sat.clone().addWeekdays(1).getDate(), 18);
assert.equal(sat.clone().addWeekdays(11).getDate(), 4);
assert.equal(sat.clone().addWeekdays(31).getDate(), 1);
},
'adding negative weekdays': function () {
var sat = new Date(2013, 1, 16);
assert.equal(sat.clone().addWeekdays(-1).getDate(), 15);
assert.equal(sat.clone().addWeekdays(-15).getDate(), 28);
assert.equal(sat.clone().addWeekdays(-33).getDate(), 2);
}
},
'can add weekdays to a Sunday': {
'adding positive weekdays': function () {
var sun = new Date(2013, 1, 17);
assert.equal(sun.clone().addWeekdays(1).getDate(), 18);
assert.equal(sun.clone().addWeekdays(11).getDate(), 4);
assert.equal(sun.clone().addWeekdays(31).getDate(), 1);
},
'adding negative weekdays': function () {
var sun = new Date(2013, 1, 17);
assert.equal(sun.clone().addWeekdays(-1).getDate(), 15);
assert.equal(sun.clone().addWeekdays(-15).getDate(), 28);
assert.equal(sun.clone().addWeekdays(-33).getDate(), 2);
}
}, |
<<<<<<<
renderBlockWithTimecodes = (contentBlock) => {
const type = contentBlock.getType();
return {
component: WrapperBlock,
editable: true,
props: {
foo: 'bar'
}
};
}
=======
getLatestUnplayedWord = () => {
let latest = 'NA';
if (this.state.transcriptData) {
const wordsArray = this.state.transcriptData.retval.words;
const word = wordsArray.find(w => w.start < this.props.currentTime);
latest = word.start;
}
return latest;
}
getCurrentWord = () => {
const currentWord = {
start: 'NA',
end: 'NA'
};
if (this.state.transcriptData) {
const wordsArray = this.state.transcriptData.retval.words;
const word = wordsArray.find((w, i) => w.start <= this.props.currentTime && w.end >= this.props.currentTime);
if (word) {
currentWord.start = word.start;
currentWord.end = word.end;
}
}
return currentWord;
}
>>>>>>>
renderBlockWithTimecodes = (contentBlock) => {
const type = contentBlock.getType();
return {
component: WrapperBlock,
editable: true,
props: {
foo: 'bar'
}
};
}
getLatestUnplayedWord = () => {
let latest = 'NA';
if (this.state.transcriptData) {
const wordsArray = this.state.transcriptData.retval.words;
const word = wordsArray.find(w => w.start < this.props.currentTime);
latest = word.start;
}
return latest;
}
getCurrentWord = () => {
const currentWord = {
start: 'NA',
end: 'NA'
};
if (this.state.transcriptData) {
const wordsArray = this.state.transcriptData.retval.words;
const word = wordsArray.find((w, i) => w.start <= this.props.currentTime && w.end >= this.props.currentTime);
if (word) {
currentWord.start = word.start;
currentWord.end = word.end;
}
}
return currentWord;
} |
<<<<<<<
import SttTypeSelect from './select-stt-json-type';
import style from './index.module.css';
=======
import styles from './index.module.css';
import SttTypeSelect from './select-stt-json-type';
import ExportFormatSelect from './select-export-format';
>>>>>>>
import style from './index.module.css';
import SttTypeSelect from './select-stt-json-type';
import ExportFormatSelect from './select-export-format';
<<<<<<<
this.download(JSON.stringify(tmpEditorsContnet, null, 2), `${ this.state.mediaUrl } .json`);
=======
this.download(JSON.stringify(tmpEditorsContent, null, 2), `${ this.state.mediaUrl }.json`)
>>>>>>>
this.download(JSON.stringify(tmpEditorsContent, null, 2), `${ this.state.mediaUrl } .json`);
<<<<<<<
<hr />
=======
<br />
>>>>>>>
<hr />
<<<<<<<
=======
<br />
<label>Export transcript</label>
<button onClick={ () => this.exportTranscript() }>Export file</button>
<ExportFormatSelect
name={ 'exportFormat' }
value={ this.state.exportFormat }
handleChange={ this.handleExportFormatChange }
/>
>>>>>>>
<br />
<label>Export transcript</label>
<button onClick={ () => this.exportTranscript() }>Export file</button>
<ExportFormatSelect
name={ 'exportFormat' }
value={ this.state.exportFormat }
handleChange={ this.handleExportFormatChange }
/> |
<<<<<<<
import style from './index.module.css';
=======
import styles from './index.module.css';
import { throws } from 'assert';
>>>>>>>
import style from './index.module.css';
import { throws } from 'assert';
<<<<<<<
};
=======
isScrollIntoViewOn: false
}
>>>>>>>
isScrollIntoViewOn: false
};
<<<<<<<
<div className={ style.container }>
<aside className={ style.aside }>
<MediaPlayer
// eslint-disable-next-line no-return-assign
hookSeek={ foo => this.setCurrentTime = foo }
hookPlayMedia={ foo => this.playMedia = foo }
hookIsPlaying={ foo => this.isPlaying = foo }
hookOnTimeUpdate={ this.handleTimeUpdate }
mediaUrl={ this.props.mediaUrl }
/>
</aside>
<main className={ style.main }>
<TimedTextEditor
transcriptData={ this.state.transcriptData }
onWordClick={ this.handleWordClick }
playMedia={ this.handlePlayMedia }
isPlaying={ this.handleIsPlaying }
currentTime={ this.state.currentTime }
isEditable={ this.props.isEditable }
sttJsonType={ this.props.sttJsonType }
ref={ 'timedTextEditor' }
mediaUrl={ this.props.mediaUrl }
/>
</main>
</div>
=======
<section>
<section className={ styles.container }>
<aside className={ styles.aside }>
<MediaPlayer
// eslint-disable-next-line no-return-assign
hookSeek={ foo => this.setCurrentTime = foo }
hookPlayMedia={ foo => this.playMedia = foo }
hookIsPlaying={ foo => this.isPlaying = foo }
hookOnTimeUpdate={ this.handleTimeUpdate }
mediaUrl={ this.props.mediaUrl }
isScrollIntoViewOn={ this.state.isScrollIntoViewOn }
handleIsScrollIntoViewChange={ this.handleIsScrollIntoViewChange }
/>
</aside>
<main className={ styles.main }>
<TimedTextEditor
transcriptData={ this.state.transcriptData }
onWordClick={ this.handleWordClick }
playMedia={ this.handlePlayMedia }
isPlaying={ this.handleIsPlaying }
isScrollIntoViewOn={ this.state.isScrollIntoViewOn }
currentTime={ this.state.currentTime }
isEditable={ this.props.isEditable }
sttJsonType={ this.props.sttJsonType }
ref={ 'timedTextEditor' }
mediaUrl={ this.props.mediaUrl }
/>
</main>
</section>
</section>
>>>>>>>
<div className={ style.container }>
<aside className={ style.aside }>
<MediaPlayer
// eslint-disable-next-line no-return-assign
hookSeek={ foo => this.setCurrentTime = foo }
hookPlayMedia={ foo => this.playMedia = foo }
hookIsPlaying={ foo => this.isPlaying = foo }
hookOnTimeUpdate={ this.handleTimeUpdate }
mediaUrl={ this.props.mediaUrl }
/>
</aside>
<main className={ style.main }>
<TimedTextEditor
transcriptData={ this.state.transcriptData }
onWordClick={ this.handleWordClick }
playMedia={ this.handlePlayMedia }
isPlaying={ this.handleIsPlaying }
currentTime={ this.state.currentTime }
isEditable={ this.props.isEditable }
sttJsonType={ this.props.sttJsonType }
ref={ 'timedTextEditor' }
mediaUrl={ this.props.mediaUrl }
isScrollIntoViewOn={ this.state.isScrollIntoViewOn }
/>
</main>
</div> |
<<<<<<<
{ tooltip }
=======
>>>>>>> |
<<<<<<<
<span className={ style.time }>{secondsToTimecode(this.state.start)}</span>
</div>
<div className={ style.text }>
<EditorBlock { ...this.props } />
</div>
=======
</span>
<br />
<span className={ style.TimeBlock } onClick={ this.handleTimecodeClick }>{this.state.start}</span>
<br />
<EditorBlock { ...this.props } />
>>>>>>>
<span className={ style.time } onClick={ this.handleTimecodeClick }>{secondsToTimecode(this.state.start)}</span>
</div>
<div className={ style.text }>
<EditorBlock { ...this.props } />
</div> |
<<<<<<<
handlePreviewIsDisplayed = () => {
this.setState({
previewIsDisplayed: !this.state.previewIsDisplayed
});
}
onLoadedDataGetDuration = (e) => {
const currentDuration = e.target.duration;
const currentDurationWithOffset = currentDuration+ this.state.timecodeOffset;
const durationInSeconds = secondsToTimecode( currentDuration+ currentDurationWithOffset);
this.setState({
mediaDuration: durationInSeconds
});
if (this.props.handleAnalyticsEvents !== undefined) {
this.props.handleAnalyticsEvents({
category: 'TranscriptEditor',
action: 'onLoadedDataGetDuration',
name: 'durationInSeconds-WithoutOffset',
value: secondsToTimecode( currentDuration)
});
}
}
handleChangePreviewViewWidth = (e) => {
const newPreviewViewWidth = e.target.value;
this.setState({
previewViewWidth: newPreviewViewWidth
});
}
=======
handleSaveTranscript = () => {
return this.refs.timedTextEditor.localSave(this.props.mediaUrl);
}
>>>>>>>
handlePreviewIsDisplayed = () => {
this.setState({
previewIsDisplayed: !this.state.previewIsDisplayed
});
}
onLoadedDataGetDuration = (e) => {
const currentDuration = e.target.duration;
const currentDurationWithOffset = currentDuration+ this.state.timecodeOffset;
const durationInSeconds = secondsToTimecode( currentDuration+ currentDurationWithOffset);
this.setState({
mediaDuration: durationInSeconds
});
if (this.props.handleAnalyticsEvents !== undefined) {
this.props.handleAnalyticsEvents({
category: 'TranscriptEditor',
action: 'onLoadedDataGetDuration',
name: 'durationInSeconds-WithoutOffset',
value: secondsToTimecode( currentDuration)
});
}
}
handleChangePreviewViewWidth = (e) => {
const newPreviewViewWidth = e.target.value;
this.setState({
previewViewWidth: newPreviewViewWidth
});
}
handleSaveTranscript = () => {
return this.refs.timedTextEditor.localSave(this.props.mediaUrl);
}
<<<<<<<
const videoPlayer = <VideoPlayer
mediaUrl={ this.props.mediaUrl }
onTimeUpdate= { this.handleTimeUpdate }
onClick= { this.props.onClick }
videoRef={ this.videoRef }
previewIsDisplayed={ this.state.previewIsDisplayed }
onLoadedDataGetDuration={ this.onLoadedDataGetDuration }
viewWith={ this.state.previewViewWidth }
/>;
// <video
// id="video"
// playsInline
// src={ this.props.mediaUrl }
// onTimeUpdate={ this.handleTimeUpdate }
// type="video/mp4"
// data-testid="media-player-id"
// onClick={ this.handlePlayMedia }
// // onLoadedData={ this.props.onLoadedDataGetDuration }
// ref={ this.videoRef }
// // style={ { display: 'none' } }
// />;
const mediaControls = <MediaPlayer
title={ this.props.title? this.props.title: '' }
mediaDuration={ this.state.mediaDuration }
=======
const mediaPlayer = <MediaPlayer
fileName={ this.props.fileName }
>>>>>>>
const videoPlayer = <VideoPlayer
mediaUrl={ this.props.mediaUrl }
onTimeUpdate= { this.handleTimeUpdate }
onClick= { this.props.onClick }
videoRef={ this.videoRef }
previewIsDisplayed={ this.state.previewIsDisplayed }
onLoadedDataGetDuration={ this.onLoadedDataGetDuration }
viewWith={ this.state.previewViewWidth }
/>;
const mediaControls = <MediaPlayer
title={ this.props.title? this.props.title: '' }
fileName={ this.props.fileName }
mediaDuration={ this.state.mediaDuration }
<<<<<<<
videoRef={ this.videoRef }
=======
handleSaveTranscript={ this.handleSaveTranscript }
>>>>>>>
videoRef={ this.videoRef }
handleSaveTranscript={ this.handleSaveTranscript }
<<<<<<<
<section className={ style.row }>
<aside className={ style.aside }>
{ videoPlayer }
</aside>
<main className={ style.main }>
<TimedTextEditor
transcriptData={ this.state.transcriptData }
timecodeOffset={ this.state.timecodeOffset }
onWordClick={ this.handleWordClick }
playMedia={ this.handlePlayMedia }
isPlaying={ this.handleIsPlaying }
currentTime={ this.state.currentTime }
isEditable={ this.props.isEditable }
sttJsonType={ this.props.sttJsonType }
mediaUrl={ this.props.mediaUrl }
isScrollIntoViewOn={ this.state.isScrollIntoViewOn }
isPauseWhileTypingOn={ this.state.isPauseWhileTypingOn }
showTimecodes={ this.state.showTimecodes }
showSpeakers={ this.state.showSpeakers }
ref={ 'timedTextEditor' }
handleAnalyticsEvents={ this.props.handleAnalyticsEvents }
/>
</main>
</section>
=======
<main className={ style.main }>
{this.props.mediaUrl === null? null : timedTextEditor}
</main>
>>>>>>>
{/* */}
<section className={ style.row }>
<aside className={ style.aside }>
{this.props.mediaUrl === null? null : videoPlayer}
</aside>
<main className={ style.main }>
{this.props.mediaUrl === null? null : timedTextEditor}
</main>
</section> |
<<<<<<<
this.translate = this.jsoneditor.translate || JSONEditor.defaults.translate;
=======
>>>>>>>
this.translate = this.jsoneditor.translate || JSONEditor.defaults.translate; |
<<<<<<<
var p = pageToken ? params.concat('pageToken=' + pageToken) : params;
self.X.ajsonp(url, p)(ret);
=======
var p = pageToken ? params.concat(pageToken) : params;
var xhr = self.X.XHR.create();
xhr.responseType = "json";
xhr.asend(ret, url, params);
>>>>>>>
var p = pageToken ? params.concat('pageToken=' + pageToken) : params;
var xhr = self.X.XHR.create();
xhr.responseType = "json";
xhr.asend(ret, url, params); |
<<<<<<<
};
/*
*
* Ex.
* OR(EQ(Issue.ASSIGNED_TO, 'kgr'), EQ(Issue.SEVERITY, 'Minor')).toSQL();
* -> "(assignedTo = 'kgr' OR severity = 'Minor')"
* OR(EQ(Issue.ASSIGNED_TO, 'kgr'), EQ(Issue.SEVERITY, 'Minor')).f(Issue.create({assignedTo: 'kgr'}));
* -> true
*/
=======
};
>>>>>>>
};
/*
* Ex.
* OR(EQ(Issue.ASSIGNED_TO, 'kgr'), EQ(Issue.SEVERITY, 'Minor')).toSQL();
* -> "(assignedTo = 'kgr' OR severity = 'Minor')"
* OR(EQ(Issue.ASSIGNED_TO, 'kgr'), EQ(Issue.SEVERITY, 'Minor')).f(Issue.create({assignedTo: 'kgr'}));
* -> true
*/ |
<<<<<<<
dao: self.filteredDAO$Proxy,
view: DAOListView.create({
dao: self.filteredDAO$Proxy,
mode: self.editableCitationViews ? 'read-write' : 'read-only',
rowView: self.citationView,
chunkSize: 15
})
=======
dao: self.filteredDAO$.asDAO(),
view: daoListView
>>>>>>>
dao: self.filteredDAO$Proxy,
view: daoListView |
<<<<<<<
assert.equal(await I.grabValueFrom('.debug'), '[[],[],[],[],[]]');
});
=======
value = await I.grabValueFrom('.debug');
assert.equal(value, '[[],[],[],[],[]]');
});
Scenario('should work well with selectize multiselect editors', async (I) => {
I.amOnPage('array-selectize.html');
I.click('Add item');
I.click('Add item');
I.seeElement('[data-schemapath="root.0"]');
I.seeElement('[data-schemapath="root.1"]');
I.click('.get-value');
value = await I.grabValueFrom('.debug');
// ensure defaults
assert.equal(value, '[["1","2"],["1","2"]]');
// every selected item has remove button
I.seeElement('[data-schemapath="root.0"] .selectize-input [data-value="1"] a.remove');
I.seeElement('[data-schemapath="root.0"] .selectize-input [data-value="2"] a.remove');
I.seeElement('[data-schemapath="root.1"] .selectize-input [data-value="1"] a.remove');
I.seeElement('[data-schemapath="root.1"] .selectize-input [data-value="2"] a.remove');
// could not add values
I.fillField('[data-schemapath="root.1"] input[type="text"]', "123");
I.dontSeeElement('.create.active');
// selectize dropdown is filled with enum values
I.click('[data-schemapath="root.0"] .selectize-input');
I.seeElement('[data-schemapath="root.0"] .selectize-dropdown-content [data-value="3"]');
I.seeElement('[data-schemapath="root.0"] .selectize-dropdown-content [data-value="4"]');
});
>>>>>>>
assert.equal(await I.grabValueFrom('.debug'), '[[],[],[],[],[]]');
});
Scenario('should work well with selectize multiselect editors', async (I) => {
I.amOnPage('array-selectize.html');
I.click('Add item');
I.click('Add item');
I.seeElement('[data-schemapath="root.0"]');
I.seeElement('[data-schemapath="root.1"]');
I.click('.get-value');
value = await I.grabValueFrom('.debug');
// ensure defaults
assert.equal(value, '[["1","2"],["1","2"]]');
// every selected item has remove button
I.seeElement('[data-schemapath="root.0"] .selectize-input [data-value="1"] a.remove');
I.seeElement('[data-schemapath="root.0"] .selectize-input [data-value="2"] a.remove');
I.seeElement('[data-schemapath="root.1"] .selectize-input [data-value="1"] a.remove');
I.seeElement('[data-schemapath="root.1"] .selectize-input [data-value="2"] a.remove');
// could not add values
I.fillField('[data-schemapath="root.1"] input[type="text"]', "123");
I.dontSeeElement('.create.active');
// selectize dropdown is filled with enum values
I.click('[data-schemapath="root.0"] .selectize-input');
I.seeElement('[data-schemapath="root.0"] .selectize-dropdown-content [data-value="3"]');
I.seeElement('[data-schemapath="root.0"] .selectize-dropdown-content [data-value="4"]');
}); |
<<<<<<<
keys_: {},
keyify: function(str) {
return this.keys_[str] || (
this.keys_[str] =
/^[a-zA-Z\$_][0-9a-zA-Z$_]*$/.test(str) ?
str :
'"' + str + '"'
);
},
=======
>>>>>>>
<<<<<<<
if ( Array.isArray(val) && ! val.length ) continue;
if ( ! first ) out(',');
out(JSONUtil.keyify(prop.name), ': ');
=======
if ( Array.isArray(val) && ! val.length ) continue;
if ( ! first ) out(',');
out(this.keyify(prop.name), ': ');
>>>>>>>
if ( Array.isArray(val) && ! val.length ) continue;
if ( ! first ) out(',');
out(this.keyify(prop.name), ': ');
<<<<<<<
out(JSONUtil.keyify(key), ': ');
=======
out(this.keyify(key), ': ');
>>>>>>>
out(this.keyify(key), ': ');
<<<<<<<
},
=======
},
outputFunction_: function(out, obj) { out(obj); }
},
>>>>>>>
},
<<<<<<<
if ( obj.model_.id !== opt_defaultModel ) {
this.outputModel_(out, obj, nestedIndent);
first = false;
}
=======
if ( obj.model_.id && obj.model_.id !== opt_defaultModel ) {
this.outputModel_(out, obj, nestedIndent);
first = false;
}
>>>>>>>
if ( obj.model_.id && obj.model_.id !== opt_defaultModel ) {
this.outputModel_(out, obj, nestedIndent);
first = false;
}
<<<<<<<
if ( val == prop.defaultValue ) continue;
if ( Array.isArray(val) && ! val.length ) continue;
if ( ! first ) out(',\n');
out(nestedIndent, JSONUtil.keyify(prop.name), ': ');
if ( Array.isArray(val) && prop.subType ) {
this.outputArray_(out, val, prop.subType, nestedIndent);
} else {
this.output(out, val, nestedIndent);
}
first = false;
=======
if ( val == prop.defaultValue ) continue;
if ( Array.isArray(val) && ! val.length ) continue;
if ( ! first ) out(',\n');
out(nestedIndent, this.keyify(prop.name), ': ');
if ( Array.isArray(val) && prop.subType ) {
this.outputArray_(out, val, prop.subType, nestedIndent);
} else {
this.output(out, val, nestedIndent);
}
first = false;
>>>>>>>
if ( val == prop.defaultValue ) continue;
if ( Array.isArray(val) && ! val.length ) continue;
if ( ! first ) out(',\n');
out(nestedIndent, this.keyify(prop.name), ': ');
if ( Array.isArray(val) && prop.subType ) {
this.outputArray_(out, val, prop.subType, nestedIndent);
} else {
this.output(out, val, nestedIndent);
}
first = false;
<<<<<<<
out(indent, 'model_: "', obj.model_.id, '"');
=======
out(indent, '"model_": "', obj.model_.id, '"');
>>>>>>>
out(indent, '"model_": "', obj.model_.id, '"');
<<<<<<<
if ( typeof obj === 'string' ) {
=======
if ( typeof obj === 'string' || typeof obj === 'number' ) {
>>>>>>>
if ( typeof obj === 'string' || typeof obj === 'number' ) {
<<<<<<<
},
outputFunction_: function(out, obj, indent) {
var str = obj.toString();
var lines = str.split('\n');
if ( lines.length == 1 ) { out(str); return; }
var minIndent = 10000;
for ( var i = 0 ; i < lines.length ; i++ ) {
var j = 0;
for ( ; j < lines[i].length && lines[i].charAt(j) === ' ' && j < minIndent ; j++ );
if ( j > 0 && j < minIndent ) minIndent = j;
}
if ( minIndent === 10000 ) { out(str); return; }
for ( var i = 0 ; i < lines.length ; i++ ) {
if ( lines[i].length && lines[i].charAt(0) === ' ' ) {
lines[i] = indent + lines[i].substring(minIndent);
}
out(lines[i]);
if ( i < lines.length-1 ) out('\n');
}
=======
},
outputFunction_: function(out, obj, indent) {
var str = obj.toString();
var lines = str.split('\n');
if ( lines.length == 1 ) { out(str); return; }
var minIndent = 10000;
for ( var i = 0 ; i < lines.length ; i++ ) {
var j = 0;
for ( ; j < lines[i].length && lines[i].charAt(j) === ' ' && j < minIndent ; j++ );
if ( j > 0 && j < minIndent ) minIndent = j;
}
if ( minIndent === 10000 ) { out(str); return; }
for ( var i = 0 ; i < lines.length ; i++ ) {
if ( lines[i].length && lines[i].charAt(0) === ' ' ) {
lines[i] = indent + lines[i].substring(minIndent);
}
out(lines[i]);
if ( i < lines.length-1 ) out('\n');
}
>>>>>>>
},
outputFunction_: function(out, obj, indent) {
var str = obj.toString();
var lines = str.split('\n');
if ( lines.length == 1 ) { out(str); return; }
var minIndent = 10000;
for ( var i = 0 ; i < lines.length ; i++ ) {
var j = 0;
for ( ; j < lines[i].length && lines[i].charAt(j) === ' ' && j < minIndent ; j++ );
if ( j > 0 && j < minIndent ) minIndent = j;
}
if ( minIndent === 10000 ) { out(str); return; }
for ( var i = 0 ; i < lines.length ; i++ ) {
if ( lines[i].length && lines[i].charAt(0) === ' ' ) {
lines[i] = indent + lines[i].substring(minIndent);
}
out(lines[i]);
if ( i < lines.length-1 ) out('\n');
} |
<<<<<<<
type: 'foam.ui.ChoiceView',
factory: function() { return this.X.ChoiceView.create(); }
=======
type: 'ChoiceView',
factory: function() { return this.Y.ChoiceView.create(); }
>>>>>>>
type: 'foam.ui.ChoiceView',
factory: function() { return this.Y.ChoiceView.create(); }
<<<<<<<
type: 'foam.ui.ChoiceView',
factory: function() { return this.X.ChoiceView.create(); }
=======
type: 'ChoiceView',
factory: function() { return this.Y.ChoiceView.create(); }
>>>>>>>
type: 'foam.ui.ChoiceView',
factory: function() { return this.Y.ChoiceView.create(); }
<<<<<<<
type: 'foam.ui.ChoiceView',
factory: function() { return this.X.ChoiceView.create(); }
=======
type: 'ChoiceView',
factory: function() { return this.Y.ChoiceView.create(); }
>>>>>>>
type: 'foam.ui.ChoiceView',
factory: function() { return this.Y.ChoiceView.create(); } |
<<<<<<<
// If the src is modelled, and it has an instance_
// BUT the instance doesn't have a value for the property,
// then don't copy this value over since it's a default value.
if ( src.model_ && src.instance_ &&
!src.instance_.hasOwnProperty(prop.name) ) continue;
if ( prop.name in src ) this[prop.name] = src[prop.name];
// if ( src.instance_ && src.instance_.hasOwnProperty(name) ) this[prop.name] = src[prop.name];
=======
if (prop.name in src) this[prop.name] = src[prop.name];
// if ( src.instance_ && src.instance_.hasOwnProperty(name) ) {
// this[prop.name] = src[prop.name];
// }
>>>>>>>
// If the src is modelled, and it has an instance_
// BUT the instance doesn't have a value for the property,
// then don't copy this value over since it's a default value.
if ( src.model_ && src.instance_ &&
!src.instance_.hasOwnProperty(prop.name) ) continue;
if (prop.name in src) this[prop.name] = src[prop.name];
// if ( src.instance_ && src.instance_.hasOwnProperty(name) ) {
// this[prop.name] = src[prop.name];
// } |
<<<<<<<
'foam.ui.DetailView',
'GestureManager',
=======
'DetailView',
'foam.input.touch.GestureManager',
>>>>>>>
'foam.ui.DetailView',
'foam.input.touch.GestureManager',
<<<<<<<
'foam.ui.StackView',
'TouchManager',
=======
'StackView',
'foam.input.touch.TouchManager',
>>>>>>>
'foam.ui.StackView',
'foam.input.touch.TouchManager', |
<<<<<<<
imports: [
'document'
],
extendsModel: 'View',
=======
extendsModel: 'foam.ui.View',
>>>>>>>
imports: [
'document'
],
extendsModel: 'foam.ui.View', |
<<<<<<<
var value = self.value.get();
return self.action.isEnabled.call(value, self.action) ? undefined : 'disabled';
=======
return self.action.isEnabled.call(value, self, self.action) ? undefined : 'disabled';
>>>>>>>
return self.action.isEnabled.call(value, self.action) ? undefined : 'disabled'; |
<<<<<<<
'layout',
=======
'daoView',
>>>>>>>
'layout',
'daoView', |
<<<<<<<
'src/editors/jodit.js',
'src/editors/ace.js',
'src/editors/simplemde.js',
'src/editors/autocomplete.js',
'src/editors/button.js',
'src/editors/sceditor.js',
'src/editors/select2.js',
=======
'src/editors/ip.js',
>>>>>>>
'src/editors/jodit.js',
'src/editors/ace.js',
'src/editors/simplemde.js',
'src/editors/autocomplete.js',
'src/editors/button.js',
'src/editors/sceditor.js',
'src/editors/select2.js',
'src/editors/ip.js', |
<<<<<<<
I.waitForValue("[name='root[0][location][city]']", 'Stuttgart');
I.click('.json-editor-btn-delete');
I.acceptPopup();
=======
I.waitForValue("[name='root[0][location][city]']", 'Stuttgart');
I.click('.json-editor-btntype-deletelast');
>>>>>>>
I.waitForValue("[name='root[0][location][city]']", 'Stuttgart');
I.click('.json-editor-btntype-deletelast');
I.acceptPopup(); |
<<<<<<<
},
{
id: "us1.knackforge",
name: "KnackForge LLC US 1",
host: "us1.stellar.knackforge.com",
port: 11625,
publicKey: "GAMWPPFIO2ZRR2W2KF73U5M4ONURKLJFAQSE5K5RKQ3LD6FDHNI7SPDI"
=======
},
{
id: "clic.world.3.africa",
name: "Clic.World 3 (Southern Africa)",
host: "stellar3.clic.world",
port: 11625,
publicKey: "GBB5SVPMROHPI4Z3LDBYBLANECR222LGREPN53UVA4KXMG5W42D3XFY5"
>>>>>>>
},
{
id: "us1.knackforge",
name: "KnackForge LLC US 1",
host: "us1.stellar.knackforge.com",
port: 11625,
publicKey: "GAMWPPFIO2ZRR2W2KF73U5M4ONURKLJFAQSE5K5RKQ3LD6FDHNI7SPDI"
},
id: "clic.world.3.africa",
name: "Clic.World 3 (Southern Africa)",
host: "stellar3.clic.world",
port: 11625,
publicKey: "GBB5SVPMROHPI4Z3LDBYBLANECR222LGREPN53UVA4KXMG5W42D3XFY5" |
<<<<<<<
'fr_FR': 'La carte des solutions a été effacée, vous repartez de zéro !',
'en_US': 'Solved map was reset, you are starting from a clean slate!'
=======
'en_US': 'Solved map was reset, you are starting from a clean slate!',
'zh_CN': '解决列表已重置，您现在从零开始了'
>>>>>>>
'fr_FR': 'La carte des solutions a été effacée, vous repartez de zéro !',
'en_US': 'Solved map was reset, you are starting from a clean slate!',
'zh_CN': '解决列表已重置，您现在从零开始了'
<<<<<<<
'fr_FR': 'Ce message n\'a pas encore été traduit dans votre langue :( Venez sur Github aider à la traduction !',
'en_US': 'This dialog or text is not yet translated in your locale :( Hop on github to aid in translation!'
=======
'en_US': 'This dialog or text is not yet translated in your locale :( Hop on github to aid in translation!',
'zh_CN': '这段对话还没有被翻译成你的语言 :( 欢迎在gitHub上贡献你的翻译!'
>>>>>>>
'fr_FR': 'Ce message n\'a pas encore été traduit dans votre langue :( Venez sur Github aider à la traduction !',
'en_US': 'This dialog or text is not yet translated in your locale :( Hop on github to aid in translation!',
'zh_CN': '这段对话还没有被翻译成你的语言 :( 欢迎在gitHub上贡献你的翻译!' |
<<<<<<<
"zh_CN": "相对引用(^)",
"zh_TW": "相對引用（^）"
=======
"de_DE": "Relative Referenzen (^)",
"zh_CN": "相对引用(^)"
>>>>>>>
"zh_CN": "相对引用(^)",
"zh_TW": "相對引用（^）"
"de_DE": "Relative Referenzen (^)",
<<<<<<<
"zh_CN": "记住插入(^)操作符!",
"zh_TW": "不要忘記插入（^） 符號!"
=======
"de_DE": "Denk an den Dach-Operator (^)!",
"zh_CN": "记住插入(^)操作符!"
>>>>>>>
"de_DE": "Denk an den Dach-Operator (^)!",
"zh_CN": "记住插入(^)操作符!"
"zh_TW": "不要忘記插入（^） 符號!" |
<<<<<<<
"en_US": "Cherry-pick Intro",
"de_DE": "Einführung Cherry-picking"
=======
"en_US": "Cherry-pick Intro",
"zh_CN": "Cherry-pick Intro"
>>>>>>>
"en_US": "Cherry-pick Intro",
"de_DE": "Einführung Cherry-picking",
"zh_CN": "Cherry-pick Intro"
<<<<<<<
"en_US": "git cherry-pick followed by commit names!",
"de_DE": "git cherry-pick gefolgt von Commit-Namen."
=======
"en_US": "git cherry-pick followed by commit names!",
"zh_CN": "git cherry-pick 跟提交对句名"
>>>>>>>
"en_US": "git cherry-pick followed by commit names!",
"de_DE": "git cherry-pick gefolgt von Commit-Namen.",
"zh_CN": "git cherry-pick 跟提交对句名"
<<<<<<<
},
"de_DE": {
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## Inhalte verschieben",
"",
"Bis jetzt haben wir uns die Grundlagen von Git angeschaut -- comitten, verzweigen und sich im Commit-Baum bewegen. Nur damit lässt sich schon 90% der Macht von Git-Repositories nutzen und die meisten Anforderungen von Entwicklern erfüllen.",
"",
"Die übrigen 10% jedoch können in komplexeren Abläufen sehr hilfreich sein (oder wenn man sich in eine schwierige Lage manövriert hat). Das nächste was wir uns anschauen, ist, Inhalte durch den Commit-Baum zu schieben. Es gibt dem Entwickler die Möglichkeit in präziser, eloquenter Manier zu sagen \"Ich will diese Inhalte hier und diese dort haben\".",
"",
"Das klingt vielleicht nach einer Menge, aber es ist sehr einfach."
]
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## git cherry-pick",
"",
"Der erste Befehl in dieser Serie ist `git cherry-pick`. Er sieht so aus:",
"",
"* `git cherry-pick <Commit1> <Commit2> <...>`",
"",
"Er ist eine einfache Möglichkeit um auszudrücken, dass du eine Folge von Commits unter deinen aktuellen Checkout (also `HEAD`) hängen möchtest. Ich persönlich liebe `cherry-pick`, weil es wenig Magic enthält und einfach zu verstehen ist.",
"",
"Schauen wir's uns mal an.",
""
]
}
},
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"Hier haben wir ein Repository mit einigem Zeugs im Branch `side`, das wir in den Branch `master` kopieren wollen. Das könnten wir mit einem Rebase machen (wie bereits gesehen), aber schauen wir mal wie das mit `cherry-pick` geht."
],
"afterMarkdowns": [
"Das war's! Wir wollten die commits `C2` und `C4` und Git hat die einfach unter unseren aktuellen Checkout kopiert. So einfach ist das."
],
"command": "git cherry-pick C2 C4",
"beforeCommand": "git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"Um diesen Level zu schaffen musst du einfach nur einige Commits aus den drei gezeigten Branches in den `master` kopieren. Der Zielbaum zeigt dir, welche.",
""
]
}
}
]
=======
},
"zh_CN": {
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## 转移工作区",
"",
"到现在我们已经学习了git的基础命令 -- commit, branch, checkout. 这些概念实现了git 90% 的功能, 同样也满足了开发者的主要需求 ",
"",
"然而, 剩余的10% 可能在处理复杂的工作流时(或者当你陷入困惑时), 非常的重要. 我们会在下一个概念中涉及'转移工作区', 换句话说, 这是开发者表达'我想要把这个工作放这里, 那个工作也放这里', 精确的说, 这是很灵活的方式 ",
"",
"看起来内容很多, 其实概念相当简单"
]
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## Git Cherry-pick",
"",
"本系列的第一个命令是`git cherry-pick`, 命令形式为: ",
"",
"* `git cherry-pick <Commit1> <Commit2> <...>`",
"",
"这是一种很直接的推进方式 -- 如果你想将一些提交复制到你当前的位置`HEAD`下面, 我个人喜欢`cherry-pick` 的原因是, 其概念非常简单 ",
"",
"Let's see a demo!",
""
]
}
},
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"现在有一个仓库, 我们想将`side`分支下的工作复制到`master`分支, 我们可以通过`rebase`完成这一点(已经学过了哈), 但是这里我们想通过`cherry-pick`来完成."
],
"afterMarkdowns": [
"这是它啦, 我们需要的是提交对象`C2` 和 `C4` ,所以 git 将被它们抓取到当前分支下了. 就是这么简单!"
],
"command": "git cherry-pick C2 C4",
"beforeCommand": "git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"请完成这节测试, 只需要简单的将分支的工作复制到 master. 如果想看我们所需要的提交对象, 你可以打开虚拟目标窗口(`show goal`)",
""
]
}
}
]
>>>>>>>
},
"zh_CN": {
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## 转移工作区",
"",
"到现在我们已经学习了git的基础命令 -- commit, branch, checkout. 这些概念实现了git 90% 的功能, 同样也满足了开发者的主要需求 ",
"",
"然而, 剩余的10% 可能在处理复杂的工作流时(或者当你陷入困惑时), 非常的重要. 我们会在下一个概念中涉及'转移工作区', 换句话说, 这是开发者表达'我想要把这个工作放这里, 那个工作也放这里', 精确的说, 这是很灵活的方式 ",
"",
"看起来内容很多, 其实概念相当简单"
"Das klingt vielleicht nach einer Menge, aber es ist sehr einfach."
]
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## Git Cherry-pick",
"",
"本系列的第一个命令是`git cherry-pick`, 命令形式为: ",
"",
"* `git cherry-pick <Commit1> <Commit2> <...>`",
"",
"这是一种很直接的推进方式 -- 如果你想将一些提交复制到你当前的位置`HEAD`下面, 我个人喜欢`cherry-pick` 的原因是, 其概念非常简单 ",
"",
"Let's see a demo!",
]
}
},
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"现在有一个仓库, 我们想将`side`分支下的工作复制到`master`分支, 我们可以通过`rebase`完成这一点(已经学过了哈), 但是这里我们想通过`cherry-pick`来完成."
],
"afterMarkdowns": [
"这是它啦, 我们需要的是提交对象`C2` 和 `C4` ,所以 git 将被它们抓取到当前分支下了. 就是这么简单!"
],
"command": "git cherry-pick C2 C4",
"beforeCommand": "git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"请完成这节测试, 只需要简单的将分支的工作复制到 master. 如果想看我们所需要的提交对象, 你可以打开虚拟目标窗口(`show goal`)",
""
]
}
}
]
},
"de_DE": {
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## Inhalte verschieben",
"",
"Bis jetzt haben wir uns die Grundlagen von Git angeschaut -- comitten, verzweigen und sich im Commit-Baum bewegen. Nur damit lässt sich schon 90% der Macht von Git-Repositories nutzen und die meisten Anforderungen von Entwicklern erfüllen.",
"",
"Die übrigen 10% jedoch können in komplexeren Abläufen sehr hilfreich sein (oder wenn man sich in eine schwierige Lage manövriert hat). Das nächste was wir uns anschauen, ist, Inhalte durch den Commit-Baum zu schieben. Es gibt dem Entwickler die Möglichkeit in präziser, eloquenter Manier zu sagen \"Ich will diese Inhalte hier und diese dort haben\".",
"",
"Das klingt vielleicht nach einer Menge, aber es ist sehr einfach."
]
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## git cherry-pick",
"",
"Der erste Befehl in dieser Serie ist `git cherry-pick`. Er sieht so aus:",
"",
"* `git cherry-pick <Commit1> <Commit2> <...>`",
"",
"Er ist eine einfache Möglichkeit um auszudrücken, dass du eine Folge von Commits unter deinen aktuellen Checkout (also `HEAD`) hängen möchtest. Ich persönlich liebe `cherry-pick`, weil es wenig Magic enthält und einfach zu verstehen ist.",
"",
"Schauen wir's uns mal an.",
""
]
}
},
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"Hier haben wir ein Repository mit einigem Zeugs im Branch `side`, das wir in den Branch `master` kopieren wollen. Das könnten wir mit einem Rebase machen (wie bereits gesehen), aber schauen wir mal wie das mit `cherry-pick` geht."
],
"afterMarkdowns": [
"Das war's! Wir wollten die commits `C2` und `C4` und Git hat die einfach unter unseren aktuellen Checkout kopiert. So einfach ist das."
],
"command": "git cherry-pick C2 C4",
"beforeCommand": "git checkout -b side; git commit; git commit; git commit; git checkout master; git commit;"
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"Um diesen Level zu schaffen musst du einfach nur einige Commits aus den drei gezeigten Branches in den `master` kopieren. Der Zielbaum zeigt dir, welche.",
""
]
}
}
] |
<<<<<<<
'zh_TW': '請使用下列其中一個指令取得更多資訊：',
=======
'de_DE': 'Bitte benutze einen der folgenden Befehle um mehr Informationen zu bekommen:',
>>>>>>>
'zh_TW': '請使用下列其中一個指令取得更多資訊：',
'de_DE': 'Bitte benutze einen der folgenden Befehle um mehr Informationen zu bekommen:',
<<<<<<<
'zh_TW': '這份清單列出所有可用指令：',
=======
'de_DE': 'Hier ist eine Liste aller verfügbarer Befehle:',
>>>>>>>
'zh_TW': '這份清單列出所有可用指令：',
'de_DE': 'Hier ist eine Liste aller verfügbarer Befehle:', |
<<<<<<<
"zh_CN": "这一关至少要用到一次直接引用(hash)",
"zh_TW": "這一關至少要用到一次直接參考（hash）"
=======
"de_DE": "Du musst mindestens einen Hash benutzen, um dieses Level zu schaffen",
"zh_CN": "这一关至少要用到一次直接引用(hash)"
>>>>>>>
"zh_CN": "这一关至少要用到一次直接引用(hash)",
"zh_TW": "這一關至少要用到一次直接參考（hash）"
"de_DE": "Du musst mindestens einen Hash benutzen, um dieses Level zu schaffen",
<<<<<<<
"zh_CN": "相对引用2(~)",
"zh_TW": "相對引用二（~）"
=======
"de_DE": "Relative Referenzen #2 (~)",
"zh_CN": "相对引用2(~)"
>>>>>>>
"de_DE": "Relative Referenzen #2 (~)",
"zh_CN": "相对引用2(~)"
"zh_TW": "相對引用二（~）" |
<<<<<<<
'fr_FR': 'Maîtrise Rebase, Luke!',
'ko': '리베이스 완전정복!'
=======
'ko': '리베이스 완전정복!',
'zh_CN': '掌握衍合，兄弟！'
>>>>>>>
'fr_FR': 'Maîtrise Rebase, Luke!',
'zh_CN': '掌握衍合，兄弟！',
'ko': '리베이스 완전정복!'
<<<<<<<
'fr_FR': 'Que\'est-ce que c\'est que ce rebase dont tout le monde parle ? Découvrez-le !',
'ko': '그 좋다고들 말하는 rebase에 대해 알아봅시다!'
=======
'ko': '그 좋다고들 말하는 rebase에 대해 알아봅시다!',
'zh_CN': '大家说的火热的衍合都是些神马？看看吧！'
>>>>>>>
'fr_FR': 'Que\'est-ce que c\'est que ce rebase dont tout le monde parle ? Découvrez-le !',
'ko': '그 좋다고들 말하는 rebase에 대해 알아봅시다!',
'zh_CN': '大家说的火热的衍合都是些神马？看看吧！'
<<<<<<<
'fr_FR': 'Un assortiment',
'ko': '종합선물세트'
=======
'ko': '종합선물세트',
'zh_CN': '大杂烩？'
>>>>>>>
'fr_FR': 'Un assortiment',
'ko': '종합선물세트',
'zh_CN': '大杂烩？'
<<<<<<<
'fr_FR': 'Un assortiment de techniques et astuces pour utiliser Git',
'ko': 'Git을 다루는 다양한 팁과 테크닉을 다양하게 알아봅니다'
=======
'ko': 'Git을 다루는 다양한 팁과 테크닉을 다양하게 알아봅니다',
'zh_CN': 'Git技术，技巧与贴士'
>>>>>>>
'fr_FR': 'Un assortiment de techniques et astuces pour utiliser Git',
'ko': 'Git을 다루는 다양한 팁과 테크닉을 다양하게 알아봅니다',
'zh_CN': 'Git技术，技巧与贴士' |
<<<<<<<
"zh_CN": "多个父提交记录",
"zh_TW": "多個 parent commit"
=======
"de_DE": "Mehrere Vorgänger",
"zh_CN": "多个父提交记录"
>>>>>>>
"zh_CN": "多个父提交记录",
"de_DE": "Mehrere Vorgänger",
"zh_TW": "多個 parent commit"
<<<<<<<
"zh_CN": "使用`git branch bugWork`加上一个目标提交记录来创建消失的引用。",
"zh_TW": "在一個指定的 commit 上面使用 `git branch bugWork`。"
=======
"de_DE": "Nutze `git branch bugWork` mit einem Ziel-Commit um die fehlende Referenz zu erstellen.",
"zh_CN": "使用`git branch bugWork`加上一个目标提交记录来创建消失的引用。"
>>>>>>>
"de_DE": "Nutze `git branch bugWork` mit einem Ziel-Commit um die fehlende Referenz zu erstellen.",
"zh_CN": "使用`git branch bugWork`加上一个目标提交记录来创建消失的引用。"
"zh_TW": "在一個指定的 commit 上面使用 `git branch bugWork`。" |
<<<<<<<
}],
'ja': [{
type: 'ModalAlert',
options: {
markdowns: [
'## Levelエディタへようこそ!',
'',
'ここでは、以下の主にステップを踏みます:',
'',
' * Gitコマンドで初期設定をします',
' * ```define start```で開始時のコミットツリーを定義します',
' * 一連のGitコマンドの（最適な）解答を入力します',
' * ```define goal```でゴールのコミットツリーを定義します（ゴールを定義するということは、解答を定義するということでもあります）',
' * オプションで```define hint```でヒントを定義します',
' * ```define name```で名前を編集します',
' * オプションで```edit dialog```で良い感じに開始時のダイアログを定義します',
' * ```finish```コマンドを打つことであなたのlevelがJSONで出力されます'
]
}
=======
}],
'ru_RU': [{
type: 'ModalAlert',
options: {
markdowns: [
'## Добро пожаловать в конструктор уровней!',
'',
'Вот основные шаги:',
'',
' * Настроить стартовое дерево при помощи команд git',
' * Обозначить старовое дерево при помощи ```define start```',
' * Ввести команды "оптимального" решения уровня',
' * Обозначить цель уровня при помощи ```define goal```. Одновременно обозначится решение.',
' * По желанию, можно указать подсказку при помощи ```define hint```',
' * Указать название уровня при помощи ```define name```',
' * По желанию, указать стартовое сообщение при помощи ```edit dialog```',
' * Ввести ```finish``` и получить JSON с описанием уровня!'
]
}
>>>>>>>
}],
'ja': [{
type: 'ModalAlert',
options: {
markdowns: [
'## Levelエディタへようこそ!',
'',
'ここでは、以下の主にステップを踏みます:',
'',
' * Gitコマンドで初期設定をします',
' * ```define start```で開始時のコミットツリーを定義します',
' * 一連のGitコマンドの（最適な）解答を入力します',
' * ```define goal```でゴールのコミットツリーを定義します（ゴールを定義するということは、解答を定義するということでもあります）',
' * オプションで```define hint```でヒントを定義します',
' * ```define name```で名前を編集します',
' * オプションで```edit dialog```で良い感じに開始時のダイアログを定義します',
' * ```finish```コマンドを打つことであなたのlevelがJSONで出力されます'
]
}
}],
'ru_RU': [{
type: 'ModalAlert',
options: {
markdowns: [
'## Добро пожаловать в конструктор уровней!',
'',
'Вот основные шаги:',
'',
' * Настроить стартовое дерево при помощи команд git',
' * Обозначить старовое дерево при помощи ```define start```',
' * Ввести команды "оптимального" решения уровня',
' * Обозначить цель уровня при помощи ```define goal```. Одновременно обозначится решение.',
' * По желанию, можно указать подсказку при помощи ```define hint```',
' * Указать название уровня при помощи ```define name```',
' * По желанию, указать стартовое сообщение при помощи ```edit dialog```',
' * Ввести ```finish``` и получить JSON с описанием уровня!'
]
} |
<<<<<<<
"fr_FR": "Introduction à rebase",
"ko": "리베이스(rebase)의 기본"
=======
"ko": "리베이스(rebase)의 기본",
"zh_CN": "介绍衍合(rebase)"
>>>>>>>
"fr_FR": "Introduction à rebase",
"ko": "리베이스(rebase)의 기본",
"zh_CN": "介绍衍合(rebase)" |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.