conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
function dir(){var sys=require('sys');for(var i=0,l=arguments.length;i<l;i++)sys.debug(sys.inspect(arguments[i]));}
exports.Session = function(options, nextApp){
if (!options.expires) options.expires = -(settings.security.sessionTTL || 300);
=======
exports.Session = function(nextApp, store){
if(store){
sessionModel = store;
}
>>>>>>>
function dir(){var sys=require('sys');for(var i=0,l=arguments.length;i<l;i++)sys.debug(sys.inspect(arguments[i]));}
exports.Session = function(options, nextApp){
if (!options) options = {};
if(options.store){
sessionModel = options.store;
}
if (!options.expires) options.expires = -(settings.security.sessionTTL || 300);
<<<<<<<
/*
// N.B. caching this model prevents robust exports.getSessionModel() override!
var sessionModel;
=======
>>>>>>> |
<<<<<<<
var r = false;
metadata.range.replace(/^items=(\d+)-(\d+)?/, function(dummy, start, end){
start = +start;
end = +end;
if (end >= start) {
queryString += "&slice(" + start + "," + end + ")";
} else if (end === undefined) {
queryString += "&slice(" + start + ")";
=======
var hasRange = false;
metadata.range.replace(/^items=(\d+)-(\d+)?/, function(header, start, end){
metadata.start = start = +start;
if (+end >= start) {
metadata.end = +end;
hasRange = true;
} else if (end !== undefined) {
delete metadata.start;
>>>>>>>
metadata.range.replace(/^items=(\d+)-(\d+)?/, function(dummy, start, end){
start = +start;
end = +end;
if (end >= start) {
queryString += "&slice(" + start + "," + end + ")";
} else if (end === undefined) {
queryString += "&slice(" + start + ")"; |
<<<<<<<
=======
import { sendDelegationOperation } from '../tezos/TezosOperations';
import { displayError } from '../utils/formValidation';
>>>>>>>
import { displayError } from '../utils/formValidation'; |
<<<<<<<
import styled from 'styled-components';
=======
import styles from './styles.css';
>>>>>>>
<<<<<<<
<p>Please close the wallet and edit "defaultWalletNodes.json" and open the wallet again. <br/>
defaultWalletNodes should look like: </p>
<StyledPre>
{ preContent }
</StyledPre>
</WalletContainers>
</DefaultContainer>
=======
<p>
{
'Please close the wallet and edit "defaultWalletNodes.json" and open the wallet again.'
}
<br />
{'defaultWalletNodes should look like:'}
</p>
<pre className={styles.styledPre}>{preContent}</pre>
</div>
</div>
>>>>>>>
<p>
{
'Please close the wallet and edit "defaultWalletNodes.json" and open the wallet again.'
}
<br />
{'defaultWalletNodes should look like:'}
</p>
<StyledPre>
{ preContent }
</StyledPre>
</WalletContainers>
</DefaultContainer> |
<<<<<<<
disableAnchorForm: false,
=======
disablePlaceholders: false,
>>>>>>>
disableAnchorForm: false,
disablePlaceholders: false, |
<<<<<<<
timer = setTimeout(function () {
self.checkSelection(e);
=======
setTimeout(function () {
self.checkSelection();
>>>>>>>
timer = setTimeout(function () {
self.checkSelection(); |
<<<<<<<
buttonTemplate: function(btnType) {
var buttonTemplates = {
'bold': '<li><button class="medium-editor-action medium-editor-action-bold" data-action="bold" data-element="b">B</button></li>',
'italic': '<li><button class="medium-editor-action medium-editor-action-italic" data-action="italic" data-element="i">I</button></li>',
'underline': '<li><button class="medium-editor-action medium-editor-action-underline" data-action="underline" data-element="u">U</button></li>',
'strikethrough': '<li><button class="medium-editor-action medium-editor-action-strikethrough" data-action="strikethrough" data-element="strike"><strike>A</strike></button></li>',
'superscript': '<li><button class="medium-editor-action medium-editor-action-superscript" data-action="superscript" data-element="sup">x<sup>1</sup></button></li>',
'subscript': '<li><button class="medium-editor-action medium-editor-action-subscript" data-action="subscript" data-element="sub">x<sub>1</sub></button></li>',
'anchor': '<li><button class="medium-editor-action medium-editor-action-anchor" data-action="anchor" data-element="a">#</button></li>',
'header1': '<li><button class="medium-editor-action medium-editor-action-header1" data-action="append-' + this.options.firstHeader + '" data-element="' + this.options.firstHeader + '">h1</button></li>',
'header2': '<li><button class="medium-editor-action medium-editor-action-header2" data-action="append-' + this.options.secondHeader + '" data-element="' + this.options.secondHeader + '">h2</button></li>',
'quote': '<li><button class="medium-editor-action medium-editor-action-quote" data-action="append-blockquote" data-element="blockquote">“</button></li>',
'orderedlist': '<li><button class="medium-editor-action medium-editor-action-orderedlist" data-action="insertorderedlist" data-element="ol">1.</button></li>',
'unorderedlist': '<li><button class="medium-editor-action medium-editor-action-unorderedlist" data-action="insertunorderedlist" data-element="ul">•</button></li>',
'pre': '<li><button class="medium-editor-action medium-editor-action-pre" data-action="append-pre" data-element="pre">0101</button></li>'
=======
buttonTemplate: function (btnType) {
var buttonLabels = this.getButtonLabels(this.options.buttonLabels), buttonTemplates = {
'bold': '<li><button class="medium-editor-action medium-editor-action-bold" data-action="bold" data-element="b">' + buttonLabels.bold + '</button></li>',
'italic': '<li><button class="medium-editor-action medium-editor-action-italic" data-action="italic" data-element="i">' + buttonLabels.italic + '</button></li>',
'underline': '<li><button class="medium-editor-action medium-editor-action-underline" data-action="underline" data-element="u">' + buttonLabels.underline + '</button></li>',
'superscript': '<li><button class="medium-editor-action medium-editor-action-superscript" data-action="superscript" data-element="sup">' + buttonLabels.superscript + '</button></li>',
'subscript': '<li><button class="medium-editor-action medium-editor-action-subscript" data-action="subscript" data-element="sub">' + buttonLabels.subscript + '</button></li>',
'anchor': '<li><button class="medium-editor-action medium-editor-action-anchor" data-action="anchor" data-element="a">' + buttonLabels.anchor + '</button></li>',
'header1': '<li><button class="medium-editor-action medium-editor-action-header1" data-action="append-' + this.options.firstHeader + '" data-element="' + this.options.firstHeader + '">' + buttonLabels.header1 + '</button></li>',
'header2': '<li><button class="medium-editor-action medium-editor-action-header2" data-action="append-' + this.options.secondHeader + '" data-element="' + this.options.secondHeader + '">' + buttonLabels.header2 + '</button></li>',
'quote': '<li><button class="medium-editor-action medium-editor-action-quote" data-action="append-blockquote" data-element="blockquote">' + buttonLabels.quote + '</button></li>',
'orderedlist': '<li><button class="medium-editor-action medium-editor-action-orderedlist" data-action="insertorderedlist" data-element="ol">' + buttonLabels.orderedlist + '</button></li>',
'unorderedlist': '<li><button class="medium-editor-action medium-editor-action-unorderedlist" data-action="insertunorderedlist" data-element="ul">' + buttonLabels.unorderedlist + '</button></li>',
'pre': '<li><button class="medium-editor-action medium-editor-action-pre" data-action="append-pre" data-element="pre">' + buttonLabels.pre + '</button></li>'
>>>>>>>
buttonTemplate: function (btnType) {
var buttonLabels = this.getButtonLabels(this.options.buttonLabels), buttonTemplates = {
'bold': '<li><button class="medium-editor-action medium-editor-action-bold" data-action="bold" data-element="b">' + buttonLabels.bold + '</button></li>',
'italic': '<li><button class="medium-editor-action medium-editor-action-italic" data-action="italic" data-element="i">' + buttonLabels.italic + '</button></li>',
'underline': '<li><button class="medium-editor-action medium-editor-action-underline" data-action="underline" data-element="u">' + buttonLabels.underline + '</button></li>',
'strikethrough': '<li><button class="medium-editor-action medium-editor-action-strikethrough" data-action="strikethrough" data-element="strike"><strike>A</strike></button></li>',
'superscript': '<li><button class="medium-editor-action medium-editor-action-superscript" data-action="superscript" data-element="sup">' + buttonLabels.superscript + '</button></li>',
'subscript': '<li><button class="medium-editor-action medium-editor-action-subscript" data-action="subscript" data-element="sub">' + buttonLabels.subscript + '</button></li>',
'anchor': '<li><button class="medium-editor-action medium-editor-action-anchor" data-action="anchor" data-element="a">' + buttonLabels.anchor + '</button></li>',
'header1': '<li><button class="medium-editor-action medium-editor-action-header1" data-action="append-' + this.options.firstHeader + '" data-element="' + this.options.firstHeader + '">' + buttonLabels.header1 + '</button></li>',
'header2': '<li><button class="medium-editor-action medium-editor-action-header2" data-action="append-' + this.options.secondHeader + '" data-element="' + this.options.secondHeader + '">' + buttonLabels.header2 + '</button></li>',
'quote': '<li><button class="medium-editor-action medium-editor-action-quote" data-action="append-blockquote" data-element="blockquote">' + buttonLabels.quote + '</button></li>',
'orderedlist': '<li><button class="medium-editor-action medium-editor-action-orderedlist" data-action="insertorderedlist" data-element="ol">' + buttonLabels.orderedlist + '</button></li>',
'unorderedlist': '<li><button class="medium-editor-action medium-editor-action-unorderedlist" data-action="insertunorderedlist" data-element="ul">' + buttonLabels.unorderedlist + '</button></li>',
'pre': '<li><button class="medium-editor-action medium-editor-action-pre" data-action="append-pre" data-element="pre">' + buttonLabels.pre + '</button></li>' |
<<<<<<<
var editor = new MediumEditor('.editor'),
defaultOptions = {
anchorInputPlaceholder: 'Paste or type a link',
delay: 0,
diffLeft: 0,
diffTop: -10,
disableReturn: false,
disableDoubleReturn: false,
disableToolbar: false,
firstHeader: 'h3',
forcePlainText: true,
cleanPastedHTML: false,
allowMultiParagraphSelection: true,
placeholder: 'Type your text',
secondHeader: 'h4',
buttons: ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'quote'],
buttonLabels: false,
targetBlank: false,
anchorPreviewHideDelay: 500
};
=======
var defaultOptions = {
anchorInputPlaceholder: 'Paste or type a link',
delay: 0,
diffLeft: 0,
diffTop: -10,
disableReturn: false,
disableDoubleReturn: false,
disableToolbar: false,
firstHeader: 'h3',
forcePlainText: true,
allowMultiParagraphSelection: true,
placeholder: 'Type your text',
secondHeader: 'h4',
buttons: ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'quote'],
buttonLabels: false,
targetBlank: false,
anchorPreviewHideDelay: 500,
checkLinkFormat: false
},
editor = new MediumEditor('.editor');
>>>>>>>
var defaultOptions = {
anchorInputPlaceholder: 'Paste or type a link',
delay: 0,
diffLeft: 0,
diffTop: -10,
disableReturn: false,
disableDoubleReturn: false,
disableToolbar: false,
firstHeader: 'h3',
forcePlainText: true,
cleanPastedHTML: false,
allowMultiParagraphSelection: true,
placeholder: 'Type your text',
secondHeader: 'h4',
buttons: ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'quote'],
buttonLabels: false,
targetBlank: false,
anchorPreviewHideDelay: 500,
checkLinkFormat: false
},
editor = new MediumEditor('.editor'); |
<<<<<<<
contours.forEach(function(val, idx, arr){fill_all_points(val.matrix_coor) })
fill_all_loggedPoints(lp)
=======
contours.forEach(function(val, idx, arr){
//console.log("in fillall", val)
val.contours.forEach(function(val, idx, arr){fill_all_points(val.matrix_coor)})
})
fill_all_loggedPoints(lp)
>>>>>>>
contours.forEach(function(val, idx, arr){
//console.log("in fillall", val)
val.contours.forEach(function(val, idx, arr){fill_all_points(val.matrix_coor)})
})
fill_all_loggedPoints(lp)
<<<<<<<
var currentContour = contours[contours.length-1] //OR: selected contour
=======
var selectContour = getSelectedDrawing(template)//contours[contours.length-1].contours //OR: selected contour
//console.log("selectContours is", selectContour)
var currentContour = selectContour[selectContour.length-1]
//console.log("currentContours is", currentContour)
>>>>>>>
var selectContour = getSelectedDrawing(template)//contours[contours.length-1].contours //OR: selected contour
//console.log("selectContours is", selectContour)
var currentContour = selectContour[selectContour.length-1]
//console.log("currentContours is", currentContour)
<<<<<<<
=======
Session.set("isDrawing", true)
>>>>>>>
Session.set("isDrawing", true)
<<<<<<<
}
}}
else if (type=="mouseup" && template.logMode.get() == "contour"){
=======
Session.set("isDrawing", true)
}
}
}//end if contours
}
else if ((type=="mouseup" || type=="mouseout") && template.logMode.get() == "contour"){
>>>>>>>
Session.set("isDrawing", true)
}
}
}//end if contours
}
else if ((type=="mouseup" || type=="mouseout") && template.logMode.get() == "contour"){
<<<<<<<
=======
Session.set("isDrawing", false)
>>>>>>>
Session.set("isDrawing", false)
<<<<<<<
else{
if (template.logMode.get() == "contour"){
var contours = template.contours.get()
if (contours != null){
var currentContour = contours[contours.length-1]
if (currentContour != null){
currentContour.complete = true
template.contours.set(contours)
//console.log("ended contour")
}
}
}
}
=======
else{Session.set("isDrawing", false)}
>>>>>>>
else{Session.set("isDrawing", false)}
<<<<<<<
},
isTouch: function(){
return Template.instance().touchscreen.get()
=======
},
selectedDrawing: function(value){
var Idx = Session.get("selectedDrawing")
return value == Idx
},
selectedDrawingName: function(){
if (Template.instance().logMode.get() == "contour"){
var idx = Session.get("selectedDrawing")
var contours = Template.instance().contours.get()
//console.log("idx is", idx, "contours is", contours)
if (idx == null){
addNewDrawing(Template.instance())
Session.set("selectedDrawing", contours.length)
//var contours = Template.instance().contours.get()
//return contours[contours.length-1].name
}
Session.set("selectedDrawing", contours.length-1)
return contours[contours.length-1].name
}
>>>>>>>
},
selectedDrawing: function(value){
var Idx = Session.get("selectedDrawing")
return value == Idx
},
selectedDrawingName: function(){
if (Template.instance().logMode.get() == "contour"){
var idx = Session.get("selectedDrawing")
var contours = Template.instance().contours.get()
//console.log("idx is", idx, "contours is", contours)
if (idx == null){
addNewDrawing(Template.instance())
Session.set("selectedDrawing", contours.length)
//var contours = Template.instance().contours.get()
//return contours[contours.length-1].name
}
Session.set("selectedDrawing", contours.length-1)
return contours[contours.length-1].name
}
},
isTouch: function(){
return Template.instance().touchscreen.get()
<<<<<<<
=======
>>>>>>>
<<<<<<<
//console.log("element is", element)
=======
console.log("element is", element)
>>>>>>>
console.log("element is", element)
<<<<<<<
"click #touchscreen": function(event, template){
//var element = event.toElement.className.split(" ")//.slice(1).split("-")
//var idx = element.indexOf("swapmode") + 1
//console.log("element is", element, "idx of filter is", idx)
//element = element[idx]//.join(" ").split("+")
//console.log("element is", element)
//console.log("element is", element)
=======
"click .touchscreen": function(event, template){
>>>>>>>
"click #touchscreen": function(event, template){
<<<<<<<
=======
>>>>>>>
<<<<<<<
"mousedown #papayaContainer0": function(event, template){
=======
"mousedown #papayaContainer0": function(event, template){
>>>>>>>
"mousedown #papayaContainer0": function(event, template){
<<<<<<<
"mouseup #papayaContainer0": function(event, template){
=======
"mouseup #papayaContainer0": function(event, template){
>>>>>>>
"mouseup #papayaContainer0": function(event, template){
<<<<<<<
=======
"mouseout #papayaContainer0": function(event, template){
logpoint(event, template, "mouseout")
fill_all(template)
},
>>>>>>>
"mouseout #papayaContainer0": function(event, template){
logpoint(event, template, "mouseout")
fill_all(template)
},
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
"click .remove-contour": function(event, template){
=======
"click .remove-contour": function(event, template){
>>>>>>>
"click .remove-contour": function(event, template){
<<<<<<<
=======
},
"click #addNewDrawing": function(e, template){
/*var contours = template.contours.get()
contours.push({contours: [{complete: false, matrix_coor:[], world_coor:[]}],
checkedBy: Meteor.user().username, name:"Drawing "+contours.length})
template.contours.set(contours)
Session.set('selectedDrawing', contours.length-1) */
addNewDrawing(template)
},
"click #drawingDropdown": function(e, template){
idx = template.contours.get().indexOf(this)
console.log("seelcted,", idx)
Session.set("selectedDrawing", idx)
},
"click #select_button_group": function(e, template){
idx = template.contours.get().indexOf(this)
console.log("seelcted,", idx)
Session.set("selectedDrawing", idx)
},
"click #delete_button_group": function(e, template){
var contours = template.contours.get()
var idx = contours.indexOf(this)
contours.splice(idx, 1)
template.contours.set(contours)
Session.set("selectedDrawing", contours.length-1)
>>>>>>>
},
"click #addNewDrawing": function(e, template){
/*var contours = template.contours.get()
contours.push({contours: [{complete: false, matrix_coor:[], world_coor:[]}],
checkedBy: Meteor.user().username, name:"Drawing "+contours.length})
template.contours.set(contours)
Session.set('selectedDrawing', contours.length-1) */
addNewDrawing(template)
},
"click #drawingDropdown": function(e, template){
idx = template.contours.get().indexOf(this)
console.log("seelcted,", idx)
Session.set("selectedDrawing", idx)
},
"click #select_button_group": function(e, template){
idx = template.contours.get().indexOf(this)
console.log("seelcted,", idx)
Session.set("selectedDrawing", idx)
},
"click #delete_button_group": function(e, template){
var contours = template.contours.get()
var idx = contours.indexOf(this)
contours.splice(idx, 1)
template.contours.set(contours)
Session.set("selectedDrawing", contours.length-1) |
<<<<<<<
const Video = ({ vimeoId, title, ...props }) => {
=======
export const Video = ({ vimeoId, title, ...props }) => {
const [isPlaying, setIsPlaying] = useState(false);
const videoRef = useRef(null);
const buttonClassName = cx(videoButton, {
[videoIsPlaying]: isPlaying,
});
useEffect(() => {
if (vimeoId) {
return;
}
if (videoRef.current) {
videoRef.current.controls = false;
}
});
>>>>>>>
const Video = ({ vimeoId, title, ...props }) => {
const [isPlaying, setIsPlaying] = useState(false);
const videoRef = useRef(null);
const buttonClassName = cx(videoButton, {
[videoIsPlaying]: isPlaying,
});
useEffect(() => {
if (vimeoId) {
return;
}
if (videoRef.current) {
videoRef.current.controls = false;
}
}); |
<<<<<<<
resolve = require("perstore/path").resolve,
Response = require("./response").Response;
=======
Response = require("./response").Response,
settings = require("commonjs-utils/settings");
>>>>>>>
resolve = require("perstore/path").resolve,
Response = require("./response").Response,
settings = require("commonjs-utils/settings"); |
<<<<<<<
return (
<ItemCard
item={item}
sortField={this.state.sortField}
productId={productId}
key={`item-${productId}-${item.number}`}
/>
);
}, this)
=======
return <ItemCard item={item} productId={productId} key={`item-${index}`} />
})
>>>>>>>
return (
<ItemCard
item={item}
sortField={this.state.sortField}
productId={productId}
key={`item-${index}`}
/>
);
}, this) |
<<<<<<<
=======
function loadConfig(cb) {
repo.contents(branch, "_config.yml", function(err, data) {
if (err) return cb(err);
cb(null, jsyaml.load(data));
});
}
>>>>>>>
<<<<<<<
repo.read(branch, path ? path + '/' + file : file, function (err, data, commit) {
=======
repo.contents(branch, path ? path + "/" + file : file, function(err, data, commit) {
>>>>>>>
repo.contents(branch, path ? path + "/" + file : file, function(err, data, commit) { |
<<<<<<<
case '#':
if (selection.charAt(1) === '#' && selection.charAt(2) !== '#') { // Subheading Check
$('[data-key="sub-heading"]').addClass('active');
} else if (selection.charAt(1) !== '#') {
$('[data-key="heading"]').addClass('active');
}
break;
case '>':
$('[data-key="quote"]').addClass('active');
break;
case '*':
if (selection.charAt(selection.length - 1) === '*') {
$('[data-key="bold"]').addClass('active');
}
break;
case '_':
if (selection.charAt(selection.length - 1) === '_') {
$('[data-key="italic"]').addClass('active');
}
break;
case '!':
if (selection.charAt(1) === '[' && selection.charAt(selection.length - 1) === ')') {
$('[data-key="media"]').addClass('active');
}
break;
case '[':
if (selection.charAt(selection.length - 1) === ')') {
$('[data-key="link"]').addClass('active');
}
break;
case '-':
if (selection.charAt(1) === ' ') {
$('[data-key="list"]').addClass('active');
}
=======
case '#':
if (!match.lineBreak.test(selection)) {
if (match.h2.test(selection) && !match.h3.test(selection)) {
$('[data-key="sub-heading"]').addClass('active');
} else if (!match.h2.test(selection)) {
$('[data-key="heading"]').addClass('active');
}
}
break;
case '>':
$('[data-key="quote"]').addClass('active');
break;
case '*':
case '_':
if (match.strong.test(selection)) {
$('[data-key="bold"]').addClass('active');
} else if (match.italic.test(selection)) {
$('[data-key="italic"]').addClass('active');
}
break;
case '!':
if (selection.charAt(1) === '[' && selection.charAt(selection.length - 1) === ')') {
$('[data-key="image"]').addClass('active');
}
break;
case '[':
if (selection.charAt(selection.length - 1) === ')') {
$('[data-key="link"]').addClass('active');
}
break;
case '-':
if (selection.charAt(1) === ' ') {
$('[data-key="list"]').addClass('active');
}
>>>>>>>
case '#':
if (!match.lineBreak.test(selection)) {
if (match.h2.test(selection) && !match.h3.test(selection)) {
$('[data-key="sub-heading"]').addClass('active');
} else if (!match.h2.test(selection)) {
$('[data-key="heading"]').addClass('active');
}
}
break;
case '>':
$('[data-key="quote"]').addClass('active');
break;
case '*':
case '_':
if (match.strong.test(selection)) {
$('[data-key="bold"]').addClass('active');
} else if (match.italic.test(selection)) {
$('[data-key="italic"]').addClass('active');
}
break;
case '!':
if (selection.charAt(1) === '[' && selection.charAt(selection.length - 1) === ')') {
$('[data-key="media"]').addClass('active');
}
break;
case '[':
if (selection.charAt(selection.length - 1) === ')') {
$('[data-key="link"]').addClass('active');
}
break;
case '-':
if (selection.charAt(1) === ' ') {
$('[data-key="list"]').addClass('active');
} |
<<<<<<<
}
return when(security.getUserModel().put({
=======
return security.getUserModel().add({
>>>>>>>
return security.getUserModel().add({
<<<<<<<
}, {id: username}), function(user){
return user;
});
=======
}, {id: username, overwrite: false});
>>>>>>>
}, {id: username, overwrite: false});
<<<<<<<
throw new AccessError("Can not view user objects");
=======
return undefined;
>>>>>>>
throw new AccessError("Can not query user objects");
<<<<<<<
throw new AccessError("Can not query user objects");
=======
return undefined;
>>>>>>>
throw new AccessError("Can not view user objects"); |
<<<<<<<
Snoopifies tha sentence
**\`!yoda\`** \`sentence\`
Yodaify a sentence
`,
=======
Snoopifies tha sentence`,
>>>>>>>
Snoopifies tha sentence
**\`!yoda\`** \`sentence\`
Yodaify a sentence`, |
<<<<<<<
import logger from './logger';
=======
import datadog from './datadog';
>>>>>>>
import datadog from './datadog';
import logger from './logger';
<<<<<<<
const end = new Date().getTime();
logger.info(`Phantom execution time: ${end - start}ms`);
=======
const execution_time = new Date().getTime() - start;
datadog(`phantomjs.${view}.execution_time`, execution_time);
console.log(`${chalk.yellow('Phantom')} execution time: ${execution_time}ms`);
>>>>>>>
const execution_time = new Date().getTime() - start;
datadog(`phantomjs.${view}.execution_time`, execution_time);
logger.info(`Phantom execution time: ${execution_time}ms`); |
<<<<<<<
this._type = type;
this._writeValue = function (tap, val) {
=======
this._type = parse(schema);
this._writeObj = function (tap, obj) {
>>>>>>>
this._type = parse(schema);
this._writeValue = function (tap, val) {
<<<<<<<
'avro.schema': new Buffer(this._type.getSchema()),
=======
'avro.schema': new Buffer(this._schema || this._type.toString()),
>>>>>>>
'avro.schema': new Buffer(this._schema || this._type.getSchema()),
<<<<<<<
* Check whether an argument is a type and return a helpful error message.
*
*/
function checkIsType(type) {
if (!type) {
throw new Error('missing type');
}
if (!(type instanceof schemas.types.Type)) {
throw new Error(f('not a type: %j', type));
}
}
/**
=======
>>>>>>> |
<<<<<<<
var packageXml = buildPackageXml(this.data.pkg, this.data.pkgName, options.apiVersion);
grunt.file.write(options.root + '/package.xml', packageXml);
=======
var packageXml = buildPackageXml(this.data.pkg, options.apiVersion);
grunt.file.write(path.join(options.root,'/package.xml'), packageXml);
>>>>>>>
var packageXml = buildPackageXml(this.data.pkg, options.apiVersion);
var packageXml = buildPackageXml(this.data.pkg, this.data.pkgName, options.apiVersion);
grunt.file.write(path.join(options.root,'/package.xml'), packageXml);
<<<<<<<
var packageXml = buildPackageXml(this.data.pkg, this.data.pkgName, options.apiVersion);
grunt.file.write(localTmp + '/package.xml', packageXml);
=======
if (!options.existingPackage) {
var packageXml = buildPackageXml(this.data.pkg, options.apiVersion);
grunt.file.write(path.join(options.root,'/package.xml'), packageXml);
} else {
if(grunt.file.exists(options.root,'/package.xml')){
grunt.file.copy(path.join(options.root,'/package.xml'), path.join(localTmp,'/package.xml'));
} else {
grunt.log.error('No Package.xml file found in ' + options.root);
}
}
>>>>>>>
if (!options.existingPackage) {
var packageXml = buildPackageXml(this.data.pkg, this.data.pkgName, options.apiVersion);
grunt.file.write(path.join(options.root,'/package.xml'), packageXml);
} else {
if(grunt.file.exists(options.root,'/package.xml')){
grunt.file.copy(path.join(options.root,'/package.xml'), path.join(localTmp,'/package.xml'));
} else {
grunt.log.error('No Package.xml file found in ' + options.root);
}
} |
<<<<<<<
if (button.type === DropdownButton) {
return React.cloneElement(button, {
key: index,
grouped: true,
isFirstInGroup: index === 0,
isLastInGroup: index === cnt - 1,
});
=======
if (button.type === DropdownButton || button.type.isGroupable) {
return React.cloneElement(button, { key: index, grouped: true, isFirstInGroup: index === 0, isLastInGroup: index === cnt - 1 });
>>>>>>>
if (button.type === DropdownButton || button.type.isGroupable) {
return React.cloneElement(button, {
key: index,
grouped: true,
isFirstInGroup: index === 0,
isLastInGroup: index === cnt - 1,
}); |
<<<<<<<
query : '*:*',
=======
query : '*:*',
basic_query : '',
>>>>>>>
query : '*:*',
basic_query : '',
<<<<<<<
if (DEBUG) { console.debug('table: Begin of get_data():\n\t$scope=',$scope,'\n\t$scope.panel=',$scope.panel,'\n\t_segment='+_segment,'\n\tdashboard.indices[_segment]=',dashboard.indices[_segment],'\n\tdashboard=',dashboard,'\n\tquerySrv=',querySrv,'\n\tfilterSrv=',filterSrv); }
=======
if(DEBUG) {
console.debug('table: Begin of get_data():\n\t$scope=',$scope,'\n\t$scope.panel=',$scope.panel,'\n\t_segment='+_segment,'\n\tdashboard.indices[_segment]=',dashboard.indices[_segment],'\n\tdashboard=',dashboard,'\n\tquerySrv=',querySrv,'\n\tfilterSrv=',filterSrv);
}
>>>>>>>
if (DEBUG) { console.debug('table: Begin of get_data():\n\t$scope=',$scope,'\n\t$scope.panel=',$scope.panel,'\n\t_segment='+_segment,'\n\tdashboard.indices[_segment]=',dashboard.indices[_segment],'\n\tdashboard=',dashboard,'\n\tquerySrv=',querySrv,'\n\tfilterSrv=',filterSrv); }
<<<<<<<
=======
// var df = '&df=message';
>>>>>>>
<<<<<<<
$scope.panel.queries.query = querySrv.getQuery(0) + wt_json + rows_limit + fq + sorting;
if (DEBUG) { console.debug('table: query=',$scope.panel.queries.query); }
=======
// $scope.panel.queries.query = 'q=' + querySrv.list[0].query + df + wt_json + rows_limit + fq + sorting + filter_fq;
$scope.panel.queries.basic_query = querySrv.getQuery(0) + fq + sorting + rows_limit;
$scope.panel.queries.query = $scope.panel.queries.basic_query + wt_json;
console.debug('table: query=',$scope.panel.queries.query);
>>>>>>>
$scope.panel.queries.basic_query = querySrv.getQuery(0) + fq + sorting + rows_limit;
$scope.panel.queries.query = $scope.panel.queries.basic_query + wt_json;
if (DEBUG) { console.debug('table: query=',$scope.panel.queries.query); } |
<<<<<<<
// solr: "/api/apollo/solr/",
solr: "/solr/",
=======
solr: "/api/apollo/query-pipelines/_system/collections/",
// solr: "/solr/",
>>>>>>>
solr: "/solr/",
<<<<<<<
// banana_index: "system_banana",
banana_index: "banana-int",
banana_queryPipeline: "system_banana-default",
banana_indexPipeline: "system_banana-default",
=======
banana_index: "system_banana",
// banana_index: "banana-int",
>>>>>>>
banana_index: "banana-int",
banana_queryPipeline: "system_banana-default",
banana_indexPipeline: "system_banana-default", |
<<<<<<<
// solr: "/api/apollo/solr/",
solr: "/solr/",
=======
solr: "/api/apollo/query-pipelines/_system/collections/",
// solr: "/solr/",
>>>>>>>
solr: "/solr/",
<<<<<<<
// banana_index: "system_banana",
banana_index: "banana-int",
banana_queryPipeline: "system_banana-default",
banana_indexPipeline: "system_banana-default",
=======
banana_index: "system_banana",
// banana_index: "banana-int",
>>>>>>>
banana_index: "banana-int",
banana_queryPipeline: "system_banana-default",
banana_indexPipeline: "system_banana-default", |
<<<<<<<
["jquery", "ceci-app", "inflector", "ceci-ui", "jquery-ui"],
function($, Ceci, Inflector) {
=======
["jquery", "ceci-app", "ceci", "inflector", "ceci-ui", "jquery-ui", "togetherjsSupport"],
function($, App, Ceci, Inflector) {
>>>>>>>
["jquery", "ceci-app", "inflector", "ceci-ui", "jquery-ui", "togetherjsSupport"],
function($, Ceci, Inflector) { |
<<<<<<<
app = new Ceci.App({
defaultChannels: channels.map(function (c) { return c.name; }),
container: $('#flathead-app')[0],
onComponentAdded: function (component) {
component = $(component);
var dropTarget = $(".drophere").find(".draggable");
dropTarget.replaceWith(component);
component.addClass("component");
component.draggable({
handle: 'handle'
});
component.on('mousedown', function(evt) {
selectComponent($(evt.currentTarget));
});
component.append($('<div class="handle"></div>'));
selectComponent(component);
},
onload: function (components) {
this.sortComponents();
Ceci.registerCeciPlugin("onChange", function(){
if (saveTimer) {
clearTimeout(saveTimer);
}
saveTimer = setTimeout(saveApp, 500);
});
// document.addEventListener("onselectionchanged", app.sortComponents);
$('.library-list').removeClass("library-loading");
$('.drophere').sortable(sortableOptions);
$('.garbage-bin').droppable({
tolerance : "touch",
over : function( event, ui ) {
$(this).addClass("garbage-open");
$(".ui-state-highlight").hide();
},
out : function( event, ui ) {
$(this).removeClass("garbage-open");
$(".ui-state-highlight").show();
},
drop : function( event, ui ) {
var elements = selection.slice();
clearSelection();
elements.forEach(function(element) {
element.removeSafely();
});
}
});
updateTags();
},
onCardChange: function (card) {
var thumbId = "card-thumb-" + card.id.match(/(\d+)$/)[0];
$(".card").removeClass('selected');
$("#" + thumbId).addClass('selected');
},
onCardAdded: function (card) {
Array.prototype.forEach.call(card.children, function (element) {
element.classList.add('drophere');
});
// create card thumbnail
var cardNumber = $(".card").length + 1;
var newthumb = $('<div class="card">Page ' + cardNumber + '<a title="Delete this card" href="#" class="delete-card"></a></div>');
newthumb.attr('id', "card-thumb-" + cardNumber);
newthumb.click(function() {
=======
localized.ready(function(){
app = new Ceci.App({
defaultChannels: channels.map(function (c) { return c.name; }),
container: $('#flathead-app')[0],
onComponentAdded: function (component) {
component = $(component);
var dropTarget = $(".drophere").find(".draggable");
dropTarget.replaceWith(component);
component.addClass("component");
component.draggable({
handle: 'handle'
});
component.on('mousedown', function(evt) {
selectComponent($(evt.currentTarget));
});
component.append($('<div class="handle"></div>'));
selectComponent(component);
},
onload: function (components) {
this.sortComponents();
Ceci.registerCeciPlugin("onChange", function(){
if (saveTimer) {
clearTimeout(saveTimer);
}
saveTimer = setTimeout(saveApp, 500);
});
// document.addEventListener("onselectionchanged", app.sortComponents);
$('.library-list').removeClass("library-loading");
$('.drophere').sortable(sortableOptions);
$('.garbage-bin').droppable({
tolerance : "touch",
over : function( event, ui ) {
$(this).addClass("garbage-open");
$(".ui-state-highlight").hide();
},
out : function( event, ui ) {
$(this).removeClass("garbage-open");
$(".ui-state-highlight").show();
},
drop : function( event, ui ) {
var elements = selection.slice();
clearSelection();
elements.forEach(function(element) {
element.removeSafely();
});
}
});
},
onCardChange: function (card) {
var thumbId = "card-thumb-" + card.id.match(/(\d+)$/)[0];
$(".card").removeClass('selected');
$("#" + thumbId).addClass('selected');
},
onCardAdded: function (card) {
Array.prototype.forEach.call(card.children, function (element) {
element.classList.add('drophere');
});
// create card thumbnail
var cardNumber = $(".card").length + 1;
var newthumb = $('<div class="card">' + localized.get("Page") + cardNumber + '<a title="' + localized.get("Delete this card") + '" href="#" class="delete-card"></a></div>');
newthumb.attr('id', "card-thumb-" + cardNumber);
newthumb.click(function() {
card.show();
});
$(".card-list").append(newthumb);
$('.drophere').sortable(sortableOptions);
>>>>>>>
localized.ready(function(){
app = new Ceci.App({
defaultChannels: channels.map(function (c) { return c.name; }),
container: $('#flathead-app')[0],
onComponentAdded: function (component) {
component = $(component);
var dropTarget = $(".drophere").find(".draggable");
dropTarget.replaceWith(component);
component.addClass("component");
component.draggable({
handle: 'handle'
});
component.on('mousedown', function(evt) {
selectComponent($(evt.currentTarget));
});
component.append($('<div class="handle"></div>'));
selectComponent(component);
},
onload: function (components) {
this.sortComponents();
Ceci.registerCeciPlugin("onChange", function(){
if (saveTimer) {
clearTimeout(saveTimer);
}
saveTimer = setTimeout(saveApp, 500);
});
// document.addEventListener("onselectionchanged", app.sortComponents);
$('.library-list').removeClass("library-loading");
$('.drophere').sortable(sortableOptions);
$('.garbage-bin').droppable({
tolerance : "touch",
over : function( event, ui ) {
$(this).addClass("garbage-open");
$(".ui-state-highlight").hide();
},
out : function( event, ui ) {
$(this).removeClass("garbage-open");
$(".ui-state-highlight").show();
},
drop : function( event, ui ) {
var elements = selection.slice();
clearSelection();
elements.forEach(function(element) {
element.removeSafely();
});
}
});
updateTags();
},
onCardChange: function (card) {
var thumbId = "card-thumb-" + card.id.match(/(\d+)$/)[0];
$(".card").removeClass('selected');
$("#" + thumbId).addClass('selected');
},
onCardAdded: function (card) {
Array.prototype.forEach.call(card.children, function (element) {
element.classList.add('drophere');
});
// create card thumbnail
var cardNumber = $(".card").length + 1;
var newthumb = $('<div class="card">' + localized.get("Page") + cardNumber + '<a title="' + localized.get("Delete this card") + '" href="#" class="delete-card"></a></div>');
newthumb.attr('id', "card-thumb-" + cardNumber);
newthumb.click(function() {
card.show();
});
$(".card-list").append(newthumb);
$('.drophere').sortable(sortableOptions);
<<<<<<<
}
/* these are what we suggest with a blank app */
// suggestions.push('app-fireworks');
// suggestions.push('app-button');
var alreadyMadeSuggestions = {};
var suggestion;
for (i = 0; i < Math.min(10, suggestions.length); i++) {
suggestion = suggestions[i];
if (suggestion in alreadyMadeSuggestions) continue;
addThumb(components[suggestion], suggestion, fullList);
alreadyMadeSuggestions[suggestion] = true;
}
fullList.append('<div class="lb"></div>');
sortedComponentNames.forEach(function (name) {
addComponentCard(components[name], name, componentList);
});
};
=======
/* these are what we suggest with a blank app */
// suggestions.push('app-fireworks');
// suggestions.push('app-button');
var alreadyMadeSuggestions = {};
var suggestion;
for (i = 0; i < Math.min(10, suggestions.length); i++) {
suggestion = suggestions[i];
if (suggestion in alreadyMadeSuggestions) continue;
addThumb(components[suggestion], suggestion, fullList);
alreadyMadeSuggestions[suggestion] = true;
}
fullList.append('<div class="lb"></div>');
sortedComponentNames.forEach(function (name) {
addComponentCard(components[name], name, componentList);
//addThumb(components[name], name, fullList);
});
};
});
>>>>>>>
/* these are what we suggest with a blank app */
// suggestions.push('app-fireworks');
// suggestions.push('app-button');
var alreadyMadeSuggestions = {};
var suggestion;
for (i = 0; i < Math.min(10, suggestions.length); i++) {
suggestion = suggestions[i];
if (suggestion in alreadyMadeSuggestions) continue;
addThumb(components[suggestion], suggestion, fullList);
alreadyMadeSuggestions[suggestion] = true;
}
fullList.append('<div class="lb"></div>');
sortedComponentNames.forEach(function (name) {
addComponentCard(components[name], name, componentList);
});
};
}); |
<<<<<<<
$('.tray .expand-handle').click(function () {
if($(".page-wrapper").hasClass("mode-discovery")){
changeMode("normal");
} else {
changeMode("discovery");
}
});
$('.right-column .expand-handle').click(function () {
if($(".page-wrapper").hasClass("mode-viewsource")){
changeMode("normal");
} else {
changeMode("viewsource");
}
=======
$('.find-components').click(function () {
$(".modal-wrapper").removeClass("hidden");
$("#component-discovery-modal").show();
document.addEventListener('keydown', escapeHandler, false);
>>>>>>>
$('.tray .expand-handle').click(function () {
if($(".page-wrapper").hasClass("mode-discovery")){
changeMode("normal");
} else {
changeMode("discovery");
}
});
$('.right-column .expand-handle').click(function () {
if($(".page-wrapper").hasClass("mode-viewsource")){
changeMode("normal");
} else {
changeMode("viewsource");
}
<<<<<<<
$('stringify-wrapper').removeClass('flex');
=======
$(".modal-wrapper").addClass("hidden");
$(".modal").hide();
$('stringify-wrapper').removeClass('flex');
>>>>>>>
$(".modal-wrapper").addClass("hidden");
$(".modal").hide();
$('stringify-wrapper').removeClass('flex');
<<<<<<<
=======
>>>>>>>
<<<<<<<
$(".dismiss-note").on("click",function(){
$(this).parent().fadeOut();
});
=======
function contractColumn(){
$(".page-wrapper").removeClass("tray-hidden");
$(".tray").removeClass("hidden");
$(".right-column").removeClass("expanded");
}
function expandColumn(){
$(".page-wrapper").addClass("tray-hidden");
$(".tray").addClass("hidden");
$(".right-column").addClass("expanded");
}
$(".dismiss-note").on("click",function(){
$(this).parent().fadeOut();
});
>>>>>>>
$(".dismiss-note").on("click",function(){
$(this).parent().fadeOut();
}); |
<<<<<<<
=======
var listChannels = function () {
var strip = getChannelStrip();
$('.broadcast-options').append(strip);
}
// get a Channel object given a channel name
var getChannelByChannelName = function(channelName) {
var i,
len = radio.length,
rdata;
for (i = 0; i<len; i++) {
rdata = radio[i];
if(rdata.name === channelName) {
return rdata;
}
}
return false;
}
// empty the list of currently selected elements on the page
>>>>>>>
var listChannels = function () {
var strip = getChannelStrip();
$('.broadcast-options').append(strip);
}
// get a Channel object given a channel name
var getChannelByChannelName = function(channelName) {
var i,
len = radio.length,
rdata;
for (i = 0; i<len; i++) {
rdata = radio[i];
if(rdata.name === channelName) {
return rdata;
}
}
return false;
}
// empty the list of currently selected elements on the page
<<<<<<<
$('.drophere').sortable({
=======
// drag and drop behavior
$('.phone-canvas').droppable({
>>>>>>>
$('.drophere').sortable({
<<<<<<<
receive: function (event, ui) {
if(ui.helper){
var componentname = $(ui.helper).attr('value');
var componentId = genId($(ui.helper).attr('name'));
=======
drop: function (event, ui) {
var helper = $(ui.helper);
var componentname = helper.attr('value');
var componentId = genId(helper.attr('name'));
>>>>>>>
receive: function (event, ui) {
if(ui.helper){
var helper = $(ui.helper);
var componentname = helper.attr('value');
var componentId = genId(helper.attr('name'));
<<<<<<<
var item = $(".drophere").find(".draggable");
item.after(component);
item.remove();
=======
$(this).append(component);
// convert from webcomponent markup to "real" html markup,
// with all the functions and properties bound, and channel
// listening set up.
>>>>>>>
var item = $(".drophere").find(".draggable");
item.after(component);
item.remove();
<<<<<<<
$('.thumb[name='+componentId+']').not(ui.helper).draggable( "disable" ).removeClass('draggable');
}
=======
>>>>>>>
$('.thumb[name='+componentId+']').not(ui.helper).draggable( "disable" ).removeClass('draggable');
} |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
cancelSearch: function() {
var form = this._container.querySelector('form');
L.DomUtil.addClass(form, 'displayNone');
this._searchbox.value = '';
this.resetLink('glass');
L.DomUtil.addClass(this._msgbox, 'displayNone');
this._map._container.focus();
},
startSearch: function() {
// show spinner icon
this.resetLink('spinner');
this.geosearch(this._searchbox.value);
},
sendRequest: function (provider, url) {
=======
sendRequest: function (provider, url, qry) {
>>>>>>>
cancelSearch: function() {
var form = this._container.querySelector('form');
L.DomUtil.addClass(form, 'displayNone');
this._searchbox.value = '';
this.resetLink('glass');
L.DomUtil.addClass(this._msgbox, 'displayNone');
this._map._container.focus();
},
startSearch: function() {
// show spinner icon
this.resetLink('spinner');
this.geosearch(this._searchbox.value);
},
sendRequest: function (provider, url, qry) {
<<<<<<<
this._showLocation(results[0]);
this.cancelSearch();
=======
this._showLocation(results[0], qry);
>>>>>>>
this._showLocation(results[0], qry);
this.cancelSearch(); |
<<<<<<<
var results = [];
for (var i = 0; i < data.results.length; i++)
=======
if (data.results.length == 0)
return [];
var results = [],
northEastLatLng,
southWestLatLng,
bounds;
for (var i = 0; i < data.results.length; i++) {
if( data.results[i].geometry.bounds ) {
var northEastGoogle = data.results[i].geometry.bounds.getNorthEast(),
southWestGoogle = data.results[i].geometry.bounds.getSouthWest();
northEastLatLng = new L.LatLng( northEastGoogle.lat(), northEastGoogle.lng() );
southWestLatLng = new L.LatLng( southWestGoogle.lat(), southWestGoogle.lng() );
bounds = new L.LatLngBounds([ northEastLatLng, southWestLatLng ]);
}
else {
bounds = undefined;
}
>>>>>>>
var results = [],
northEastLatLng,
southWestLatLng,
bounds;
for (var i = 0; i < data.results.length; i++) {
if( data.results[i].geometry.bounds ) {
var northEastGoogle = data.results[i].geometry.bounds.getNorthEast(),
southWestGoogle = data.results[i].geometry.bounds.getSouthWest();
northEastLatLng = new L.LatLng( northEastGoogle.lat(), northEastGoogle.lng() );
southWestLatLng = new L.LatLng( southWestGoogle.lat(), southWestGoogle.lng() );
bounds = new L.LatLngBounds([ northEastLatLng, southWestLatLng ]);
}
else {
bounds = undefined;
} |
<<<<<<<
clientQuality = +(parameters.q || 1);
=======
>>>>>>>
clientQuality = +(parameters.q || 1);
<<<<<<<
var metadata = alternate.getMetadata();
=======
>>>>>>>
var metadata = alternate.getMetadata();
<<<<<<<
return bestMedia && {media: bestMedia, parameters: bestParameters};
=======
return bestMedia;
>>>>>>>
return bestMedia && {media: bestMedia, parameters: bestParameters}; |
<<<<<<<
return this._map.zoom;
},
_onInput: function() {
if (this._isShowingError) {
this.resetLink('glass');
L.DomUtil.addClass(this._msgbox, 'displayNone');
=======
return this._map._zoom;
}
>>>>>>>
return this._map._zoom;
},
_onInput: function() {
if (this._isShowingError) {
this.resetLink('glass');
L.DomUtil.addClass(this._msgbox, 'displayNone'); |
<<<<<<<
var str = "";
var children = this.children;
for(var i = 0; i < children.length; i++) {
var item = children[i];
str += typeof item === "string" ? item : item.source();
}
return str;
=======
let source = "";
for(let i = 0, len = this.children.length; i < len; ++i) {
const child = this.children[i];
source += (typeof child === "string") ? child : child.source();
}
return source;
>>>>>>>
let source = "";
const children = this.children;
for(let i = 0; i < children.length; i++) {
const child = children[i];
source += typeof child === "string" ? child : child.source();
}
return source;
<<<<<<<
var size = 0;
var children = this.children;
for(var i = 0; i < children.length; i++) {
var item = children[i];
size += typeof item === "string" ? item.length : item.size();
}
return size;
=======
let size = 0;
for(let i = 0, len = this.children.length; i < len; ++i) {
const child = this.children[i];
size += (typeof child === "string") ? child.length : child.size();
}
return size;
>>>>>>>
let size = 0;
const children = this.children;
for(let i = 0; i < children.length; i++) {
const child = children[i];
size += typeof child === "string" ? child.length : child.size();
}
return size; |
<<<<<<<
// If doImageUploadRequest returns any falsy value, then don't remove the upload preview.
// This is for the case if someone wants to handle failure on app level.
if (!response) {
removeImage(id);
return;
}
if (!imageUploads[id]) return; // removed before done
=======
>>>>>>>
// If doImageUploadRequest returns any falsy value, then don't remove the upload preview.
// This is for the case if someone wants to handle failure on app level.
if (!response) {
removeImage(id);
return;
}
<<<<<<<
=======
const removeImage = useCallback((id) => {
dispatch({ type: 'removeImageUpload', id });
// TODO: cancel upload if still uploading
}, []);
// Number of files that the user can still add. Should never be more than the amount allowed by the API.
// If multipleUploads is false, we only want to allow a single upload.
const maxFilesAllowed = useMemo(() => {
if (!channelContext.multipleUploads) return 1;
if (channelContext.maxNumberOfFiles === undefined) {
return apiMaxNumberOfFiles;
}
return channelContext.maxNumberOfFiles;
}, [channelContext.maxNumberOfFiles, channelContext.multipleUploads]);
const maxFilesLeft = maxFilesAllowed - numberOfUploads;
>>>>>>>
// Number of files that the user can still add. Should never be more than the amount allowed by the API.
// If multipleUploads is false, we only want to allow a single upload.
const maxFilesAllowed = useMemo(() => {
if (!channelContext.multipleUploads) return 1;
if (channelContext.maxNumberOfFiles === undefined) {
return apiMaxNumberOfFiles;
}
return channelContext.maxNumberOfFiles;
}, [channelContext.maxNumberOfFiles, channelContext.multipleUploads]);
const maxFilesLeft = maxFilesAllowed - numberOfUploads; |
<<<<<<<
=======
function submit_bam_url() {
var url = d3.select("#bam_url_input").property("value");
console.log(url);
read_bam_url(url);
}
d3.select("#submit_bam_url").on("click",submit_bam_url);
>>>>>>>
function submit_bam_url() {
var url = d3.select("#bam_url_input").property("value");
console.log(url);
read_bam_url(url);
}
d3.select("#submit_bam_url").on("click",submit_bam_url); |
<<<<<<<
go_to_region(d.chrom,(d.start+d.end)/2,(d.start+d.end)/2+1);
ga('send', 'event', "variant_table", "select");
=======
// Treat large variants like two separate breakpoints (same as for a BEDPE file)
if (d.end - d.start > 100) {
var regions = [];
regions.push({"chrom":d.chrom,"pos":d.start});
regions.push({"chrom":d.chrom,"pos":d.end});
fetch_regions(regions);
} else {
go_to_region(d.chrom,(d.start+d.end)/2,(d.start+d.end)/2+1);
}
>>>>>>>
// Treat large variants like two separate breakpoints (same as for a BEDPE file)
if (d.end - d.start > 100) {
var regions = [];
regions.push({"chrom":d.chrom,"pos":d.start});
regions.push({"chrom":d.chrom,"pos":d.end});
fetch_regions(regions);
} else {
go_to_region(d.chrom,(d.start+d.end)/2,(d.start+d.end)/2+1);
}
ga('send', 'event', "variant_table", "select"); |
<<<<<<<
accesskeys: {},
tipMessage: null
=======
accesskeys: {},
selectedScope: null
>>>>>>>
accesskeys: {},
tipMessage: null,
selectedScope: null
<<<<<<<
if (local.tipMessage) tipMessage = local.tipMessage;
// todo: Use localized database of tips
elem("tip").attr("tip-type", type);
elem("tip").text(tipMessage ||
'TIP: Hit the right arrow key to "expand" your selection');
=======
>>>>>>>
if (local.tipMessage) tipMessage = local.tipMessage;
// todo: Use localized database of tips
elem("tip").attr("tip-type", type);
elem("tip").text(tipMessage ||
'TIP: Hit the right arrow key to "expand" your selection'); |
<<<<<<<
C.ANNOTATIONS_TO_IGNORE = [
'coreos.com/',
'kubernetes.io/',
'cattle.io/',
]
=======
C.GRAY_OUT_SCHEDULER_STATUS_PROVIDERS = [
'azureaks',
'aliyunkcs',
'tencenttke'
];
>>>>>>>
C.ANNOTATIONS_TO_IGNORE = [
'coreos.com/',
'kubernetes.io/',
'cattle.io/',
]
C.GRAY_OUT_SCHEDULER_STATUS_PROVIDERS = [
'azureaks',
'aliyunkcs',
'tencenttke'
]; |
<<<<<<<
exports.testTryCatchFilter = function (test) {
var code = [
"try {",
" throw {name: 'foo', message: 'bar'};",
"}",
"catch (e if e.name === 'foo') {",
" print (e.message);",
"}"
];
TestRun(test)
.test(code, {esnext: true, es5: true, undef: true,
predef: ["print"]});
test.done();
};
=======
exports.testArrayComprehensionDetection = function (test) {
var code = [
"var foo = []; for each (let i in [1,2,3]) { print(i); }"
];
TestRun(test)
.test(code, {esnext: true, es5: true, undef: true,
predef: ["print"]});
test.done();
};
>>>>>>>
exports.testTryCatchFilter = function (test) {
var code = [
"try {",
" throw {name: 'foo', message: 'bar'};",
"}",
"catch (e if e.name === 'foo') {",
" print (e.message);",
"}"
];
TestRun(test)
.test(code, {esnext: true, es5: true, undef: true,
predef: ["print"]});
test.done();
};
exports.testArrayComprehensionDetection = function (test) {
var code = [
"var foo = []; for each (let i in [1,2,3]) { print(i); }"
];
TestRun(test)
.test(code, {esnext: true, es5: true, undef: true,
predef: ["print"]});
test.done();
}; |
<<<<<<<
/**
* Convenience function for defining "infix" symbols--operators that require
* operands as both "land-hand side" and "right-hand side".
*
* @param {string} s - the name of the symbol
* @param {function} [f] - a function to be invoked that consumes the
* right-hand side of the operator
* @param {number} p - the left-binding power of the token as used by the
* Pratt parsing semantics
* @param {boolean} [w] - if `true`
*
* @returns {object} - the object describing the JSHint symbol (provided to
* support cases where further refinement is necessary)
*/
=======
function reservevar(s, v) {
return reserve(s, function() {
if (typeof v === "function") {
v(this);
}
return this;
});
}
function infixDefaultLed(left, token, precedence) {
token.left = left;
token.right = expression(precedence);
return token;
}
>>>>>>>
/**
* Convenience function for defining "infix" symbols--operators that require
* operands as both "land-hand side" and "right-hand side".
*
* @param {string} s - the name of the symbol
* @param {function} [f] - a function to be invoked that consumes the
* right-hand side of the operator
* @param {number} p - the left-binding power of the token as used by the
* Pratt parsing semantics
* @param {boolean} [w] - if `true`
*
* @returns {object} - the object describing the JSHint symbol (provided to
* support cases where further refinement is necessary)
*/
<<<<<<<
if (typeof f === "function") {
return f(context, left, this);
} else {
this.left = left;
this.right = expression(context, p);
return this;
}
=======
f = typeof f === "function" ? f : infixDefaultLed;
return f(left, this, p);
>>>>>>>
if (typeof f === "function") {
return f(context, left, this);
} else {
this.left = left;
this.right = expression(context, p);
return this;
}
<<<<<<<
infix("instanceof", function(context, left, token) {
var right;
var scope = state.funct["(scope)"];
token.left = left;
token.right = right = expression(context, 120);
// This condition reflects a syntax error which will be reported by the
// `expression` function.
if (!right) {
return token;
}
if (right.id === "(number)" ||
right.id === "(string)" ||
right.value === "null" ||
(right.value === "undefined" && !scope.has("undefined")) ||
right.arity === "unary" ||
right.id === "{" ||
(right.id === "[" && !right.right) ||
right.id === "(regexp)" ||
(right.id === "(template)" && !right.tag)) {
error("E060");
}
if (right.id === "function") {
warning("W139");
}
return token;
}, 120);
infix("+", function(context, left, that) {
var next = state.tokens.next;
var right;
that.left = left;
that.right = right = expression(context, 130);
=======
infix("instanceof", "instanceof", 120);
infix("+", function(left, that, precedence) {
that = infixDefaultLed(left, that, precedence);
var right = that.right;
>>>>>>>
infix("instanceof", function(context, left, token) {
var right;
var scope = state.funct["(scope)"];
token.left = left;
token.right = right = expression(context, 120);
// This condition reflects a syntax error which will be reported by the
// `expression` function.
if (!right) {
return token;
}
if (right.id === "(number)" ||
right.id === "(string)" ||
right.value === "null" ||
(right.value === "undefined" && !scope.has("undefined")) ||
right.arity === "unary" ||
right.id === "{" ||
(right.id === "[" && !right.right) ||
right.id === "(regexp)" ||
(right.id === "(template)" && !right.tag)) {
error("E060");
}
if (right.id === "function") {
warning("W139");
}
return token;
}, 120);
infix("+", function(context, left, that) {
var next = state.tokens.next;
var right;
that.left = left;
that.right = right = expression(context, 130);
<<<<<<<
infix("-", function(context, left, that) {
var next = state.tokens.next;
that.left = left;
that.right = expression(context, 130);
if (next.id === "-" || next.id === "--") {
warning("W006", that.right);
}
return that;
=======
infix("+++", function(left, that, precedence) {
warning("W007");
return infixDefaultLed(left, that, precedence);
>>>>>>>
infix("-", function(context, left, that) {
var next = state.tokens.next;
that.left = left;
that.right = expression(context, 130);
if (next.id === "-" || next.id === "--") {
warning("W006", that.right);
}
return that;
<<<<<<<
=======
infix("---", function(left, that, precedence) {
warning("W006");
return infixDefaultLed(left, that, precedence);
}, 130);
>>>>>>> |
<<<<<<<
};
exports.unnecessarysemicolon = function () {
var code = [
"function foo() {",
" var a;;",
"}"
];
TestRun()
.addError(2, "Unnecessary semicolon.")
.test(code);
TestRun()
.addError(2, "Unnecessary semicolon.")
.test(code, { white: true });
};
exports.blacklist = function () {
var src = fs.readFileSync(__dirname + '/fixtures/browser.js', 'utf8');
var code = [
'/*jshint browser: true */',
'/*global -event bar -btoa */',
'var a = event.hello();',
'var c = foo();',
'var b = btoa(1);',
'var d = bar();'
];
// make sure everything is ok
TestRun().test(src, { undef: true, browser: true });
// disallow Node in a predef Object
TestRun()
.addError(15, "'Node' is not defined.")
.test(src, {
undef: true,
browser: true,
predef: { '-Node': false }
});
// disallow Node and NodeFilter in a predef Array
TestRun()
.addError(14, "'NodeFilter' is not defined.")
.addError(15, "'Node' is not defined.")
.test(src, {
undef: true,
browser: true,
predef: ['-Node', '-NodeFilter']
});
TestRun()
.addError(3, "'event' is not defined.")
.addError(4, "'foo' is not defined.")
.addError(5, "'btoa' is not defined.")
.test(code, { undef: true });
=======
};
/*
* Tests the `maxstatements` option
*/
exports.maxstatements = function () {
var src = fs.readFileSync(__dirname + '/fixtures/max-statements-per-function.js', 'utf8');
TestRun()
.addError(1, "Too many statements per function (8).")
.test(src, { maxstatements: 7 });
TestRun()
.test(src, { maxstatements: 8 });
TestRun()
.test(src, {});
};
/*
* Tests the `maxdepth` option
*/
exports.maxdepth = function () {
var fixture = '/fixtures/max-nested-block-depth-per-function.js';
var src = fs.readFileSync(__dirname + fixture, 'utf8');
TestRun()
.addError(5, "Blocks are nested too deeply (2).")
.addError(14, "Blocks are nested too deeply (2).")
.test(src, { maxdepth: 1 });
TestRun()
.addError(9, "Blocks are nested too deeply (3).")
.test(src, { maxdepth: 2 });
TestRun()
.test(src, { maxdepth: 3 });
TestRun()
.test(src, {});
};
/*
* Tests the `maxparams` option
*/
exports.maxparams = function () {
var fixture = '/fixtures/max-parameters-per-function.js';
var src = fs.readFileSync(__dirname + fixture, 'utf8');
TestRun()
.addError(1, "Too many parameters per function (3).")
.test(src, { maxparams: 2 });
TestRun()
.test(src, { maxparams: 3 });
TestRun()
.test(src, {});
};
/*
* Tests the `maxcomplexity` option
*/
exports.maxcomplexity = function () {
var fixture = '/fixtures/max-cyclomatic-complexity-per-function.js';
var src = fs.readFileSync(__dirname + fixture, 'utf8');
TestRun()
.addError(8, "Cyclomatic complexity is to high per function (2).")
.addError(15, "Cyclomatic complexity is to high per function (2).")
.addError(25, "Cyclomatic complexity is to high per function (2).")
.addError(47, "Cyclomatic complexity is to high per function (8).")
.test(src, { maxcomplexity: 1 });
TestRun()
.test(src, { maxcomplexity: 8 });
TestRun()
.test(src, {});
>>>>>>>
};
exports.unnecessarysemicolon = function () {
var code = [
"function foo() {",
" var a;;",
"}"
];
TestRun()
.addError(2, "Unnecessary semicolon.")
.test(code);
TestRun()
.addError(2, "Unnecessary semicolon.")
.test(code, { white: true });
};
exports.blacklist = function () {
var src = fs.readFileSync(__dirname + '/fixtures/browser.js', 'utf8');
var code = [
'/*jshint browser: true */',
'/*global -event bar -btoa */',
'var a = event.hello();',
'var c = foo();',
'var b = btoa(1);',
'var d = bar();'
];
// make sure everything is ok
TestRun().test(src, { undef: true, browser: true });
// disallow Node in a predef Object
TestRun()
.addError(15, "'Node' is not defined.")
.test(src, {
undef: true,
browser: true,
predef: { '-Node': false }
});
// disallow Node and NodeFilter in a predef Array
TestRun()
.addError(14, "'NodeFilter' is not defined.")
.addError(15, "'Node' is not defined.")
.test(src, {
undef: true,
browser: true,
predef: ['-Node', '-NodeFilter']
});
TestRun()
.addError(3, "'event' is not defined.")
.addError(4, "'foo' is not defined.")
.addError(5, "'btoa' is not defined.")
.test(code, { undef: true });
};
/*
* Tests the `maxstatements` option
*/
exports.maxstatements = function () {
var src = fs.readFileSync(__dirname + '/fixtures/max-statements-per-function.js', 'utf8');
TestRun()
.addError(1, "Too many statements per function (8).")
.test(src, { maxstatements: 7 });
TestRun()
.test(src, { maxstatements: 8 });
TestRun()
.test(src, {});
};
/*
* Tests the `maxdepth` option
*/
exports.maxdepth = function () {
var fixture = '/fixtures/max-nested-block-depth-per-function.js';
var src = fs.readFileSync(__dirname + fixture, 'utf8');
TestRun()
.addError(5, "Blocks are nested too deeply (2).")
.addError(14, "Blocks are nested too deeply (2).")
.test(src, { maxdepth: 1 });
TestRun()
.addError(9, "Blocks are nested too deeply (3).")
.test(src, { maxdepth: 2 });
TestRun()
.test(src, { maxdepth: 3 });
TestRun()
.test(src, {});
};
/*
* Tests the `maxparams` option
*/
exports.maxparams = function () {
var fixture = '/fixtures/max-parameters-per-function.js';
var src = fs.readFileSync(__dirname + fixture, 'utf8');
TestRun()
.addError(1, "Too many parameters per function (3).")
.test(src, { maxparams: 2 });
TestRun()
.test(src, { maxparams: 3 });
TestRun()
.test(src, {});
};
/*
* Tests the `maxcomplexity` option
*/
exports.maxcomplexity = function () {
var fixture = '/fixtures/max-cyclomatic-complexity-per-function.js';
var src = fs.readFileSync(__dirname + fixture, 'utf8');
TestRun()
.addError(8, "Cyclomatic complexity is too high per function (2).")
.addError(15, "Cyclomatic complexity is too high per function (2).")
.addError(25, "Cyclomatic complexity is too high per function (2).")
.addError(47, "Cyclomatic complexity is too high per function (8).")
.test(src, { maxcomplexity: 1 });
TestRun()
.test(src, { maxcomplexity: 8 });
TestRun()
.test(src, {}); |
<<<<<<<
if (requestId === undefined) {
requestId = this.originalRequestId;
}
this.logger.debug('Rendering request', requestId)
=======
>>>>>>>
this.logger.debug('Rendering request', requestId)
<<<<<<<
this.logger.debug('Request data', request)
=======
>>>>>>>
this.logger.debug('Request data', request)
<<<<<<<
(new App(window.ExDebugToolbar)).render();
=======
(new App({requestId: window.requestId})).render(window.requestId);
>>>>>>>
const opts = window.ExDebugToolbar;
(new App(opts)).render(opts.requestId); |
<<<<<<<
'badge-left-time' : false,
'record-achievements' : false,
//'enable-manual-reminder' : false, //Obsolete!!
'enable-dynamic-reminder' : false,
'popup-select-title' : '',
'notification-img-file' : '',
'notification-sound-file' : '',
'notification-sound-volume' : '100',
'notification-mission-end-suffix' : '',
'notification-nyukyo-end-suffix' : '',
'notification-createship-end-suffix' : '',
//'enable-notification' : false, // Obsolete!!
'notification-on-reminder-set' : true,
'notification-on-reminder-finish' : true,
'enable-screen-shot' : false,
'capture-destination-size' : true, // とりあえず今はbool
'launch-on-click-notification' : false,
'show-clockmode-button' : false,
'download-on-screenshot' : false,
'notification-stay-visible' : '',
'dynamic-reminder-type' : 0,
'allow-ocr-result-log' : false
=======
'badge-left-time' : true,
'record-achievements' : false,
//'enable-manual-reminder' : false, //Obsolete!!
'enable-dynamic-reminder': false,
'popup-select-title' : '',
'notification-img-file' : '',
'notification-sound-file': '',
'notification-sound-volume' : '100',
'notification-mission-end-suffix': '',
'notification-nyukyo-end-suffix': '',
'notification-createship-end-suffix': '',
//'enable-notification' : false, // Obsolete!!
'notification-on-reminder-set' : true,
'notification-on-reminder-finish' : true,
'notification-offset-millisec' : 60*1000,//デフォルトでは1分前
'enable-screen-shot' : false,
'capture-destination-size' : true, // とりあえず今はbool
'launch-on-click-notification' : false,
'show-clockmode-button' : false,
'download-on-screenshot' : false,
'notification-stay-visible' : false,
'dynamic-reminder-type' : 0,
'allow-ocr-result-log' : false
>>>>>>>
'badge-left-time' : false,
'record-achievements' : false,
//'enable-manual-reminder' : false, //Obsolete!!
'enable-dynamic-reminder' : false,
'popup-select-title' : '',
'notification-img-file' : '',
'notification-sound-file' : '',
'notification-sound-volume' : '100',
'notification-mission-end-suffix' : '',
'notification-nyukyo-end-suffix' : '',
'notification-createship-end-suffix' : '',
//'enable-notification' : false, // Obsolete!!
'notification-on-reminder-set' : true,
'notification-on-reminder-finish' : true,
'notification-offset-millisec' : 60*1000,//デフォルトでは1分前
'enable-screen-shot' : false,
'capture-destination-size' : true, // とりあえず今はbool
'launch-on-click-notification' : false,
'show-clockmode-button' : false,
'download-on-screenshot' : false,
'notification-stay-visible' : '',
'dynamic-reminder-type' : 0,
'allow-ocr-result-log' : false |
<<<<<<<
password: adminPassword
};
request(url)
.post('/admin/delete')
.set('Content-type','application/json')
.set('Authorization', authValue )
.send(admin)
.end(function(err, res) {
res.statusCode.should.be.equal(404);
done();
});
});
it('should return an error response indicating the admin account has NOT been updated because of invalid email', function(done) {
var randEmail = '[email protected]';
var admin = {
email: randEmail,
password: adminPassword
};
request(url)
.post('/admin/update')
.set('Content-type','application/json')
.set('Authorization', authValue )
.send(admin)
.end(function(err, res) {
res.statusCode.should.be.equal(404);
done();
});
});
=======
password: "5f4dcc3b5aa765d61d8327deb882cf99"
};
request(url)
.post('/admin/add')
.send(admin)
.end(function(err, res) {
setTimeout(function () {
request(url)
.post('/admin/login')
.set('Content-type','application/json')
.send(admin)
.end(function(err, res) {
authValue = 'Bearer ' + res.body.content.token;
// console.log(authValue);
request(url)
.delete('/admin/delete')
.set('Content-type','application/json')
.set('Authorization', authValue )
.send(admin)
.end(function(err, res) {
//console.log(res);
res.statusCode.should.be.equal(200);
done();
});
});
}, 1000);
});
});
>>>>>>>
password: adminPassword
};
request(url)
.post('/admin/delete')
.set('Content-type','application/json')
.set('Authorization', authValue )
.send(admin)
.end(function(err, res) {
res.statusCode.should.be.equal(404);
done();
});
});
it('should return an error response indicating the admin account has NOT been updated because of invalid email', function(done) {
var randEmail = '[email protected]';
var admin = {
email: randEmail,
password: adminPassword
};
request(url)
.post('/admin/update')
.set('Content-type','application/json')
.set('Authorization', authValue )
.send(admin)
.end(function(err, res) {
res.statusCode.should.be.equal(404);
done();
});
});
<<<<<<<
=======
//console.log("appID= " + appID);
>>>>>>> |
<<<<<<<
// eslint-disable-next-line
t: (msg, options) => msg,
tDateTimeParser: (input) => Dayjs(input),
=======
t: (msg) => msg,
tDateTimeParser: (input) => extendedDayjs(input),
>>>>>>>
// eslint-disable-next-line
t: (msg, options) => msg,
tDateTimeParser: (input) => extendedDayjs(input), |
<<<<<<<
t: string => string,
fetchMe: () => void
=======
fetchMe: () => void,
displayName: string
>>>>>>>
displayName: string,
t: string => string,
fetchMe: () => void
<<<<<<<
const { entry, loading, error, t, authenticated } = this.props;
=======
const { me, loading, error, authenticated, displayName } = this.props;
>>>>>>>
const { loading, error, authenticated, displayName, t } = this.props; |
<<<<<<<
export { default as ErrorBoundary } from "./ErrorBoundary";
=======
export { default as MarkdownView } from "./MarkdownView";
export { default as SyntaxHighlighter } from "./SyntaxHighlighter";
>>>>>>>
export { default as MarkdownView } from "./MarkdownView";
export { default as SyntaxHighlighter } from "./SyntaxHighlighter";
export { default as ErrorBoundary } from "./ErrorBoundary"; |
<<<<<<<
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<Route
path={`${url}/diff`}
component={() => (
<ScmDiff
namespace={repository.namespace}
name={repository.name}
revision={"db64ca5992ad8e327c7687d49f5297bef7b29893"}
/>
)}
/>
=======
<Switch>
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<Route
path={`${url}/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
<Route
path={`${url}/branches/:branch/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
</Switch>
>>>>>>>
<Switch>
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<Route
path={`${url}/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
<Route
path={`${url}/branches/:branch/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
<Route
path={`${url}/diff`}
component={() => (
<ScmDiff
namespace={repository.namespace}
name={repository.name}
revision={"db64ca5992ad8e327c7687d49f5297bef7b29893"}
/>
)}
/>
</Switch> |
<<<<<<<
export type { Config } from "./Config";
export type { SubRepository, File, SourcesCollection } from "./Sources";
=======
export type { Config } from "./Config";
export type { Permission, PermissionEntry, PermissionCollection } from "./RepositoryPermissions";
>>>>>>>
export type { Config } from "./Config";
export type { Permission, PermissionEntry, PermissionCollection } from "./RepositoryPermissions";
export type { SubRepository, File, SourcesCollection } from "./Sources"; |
<<<<<<<
import { Route, withRouter } from "react-router-dom";
=======
import { Route, Switch } from "react-router-dom";
>>>>>>>
import { Route, Switch } from "react-router-dom";
<<<<<<<
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<Route
path={`${url}/sources`}
exact={true}
component={props => (
<Sources
{...props}
repository={repository}
baseUrl={`${url}/sources`}
/>
)}
/>
<Route
path={`${url}/sources/:revision/:path*`}
component={props => (
<Sources
{...props}
repository={repository}
baseUrl={`${url}/sources`}
/>
)}
/>
=======
<Switch>
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<Route
path={`${url}/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
<Route
path={`${url}/branches/:branch/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
</Switch>
>>>>>>>
<Switch>
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<Route
path={`${url}/sources`}
exact={true}
component={props => (
<Sources
{...props}
repository={repository}
baseUrl={`${url}/sources`}
/>
)}
/>
<Route
path={`${url}/sources/:revision/:path*`}
component={props => (
<Sources
{...props}
repository={repository}
baseUrl={`${url}/sources`}
/>
)}
/>
<Route
path={`${url}/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
<Route
path={`${url}/branches/:branch/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
</Switch>
<<<<<<<
<EditNavLink repository={repository} editUrl={`${url}/edit`} />
<RepositoryNavLink
repository={repository}
linkName="sources"
to={`${url}/sources`}
label={t("repository-root.sources")}
activeOnlyWhenExact={false}
/>
=======
>>>>>>>
<RepositoryNavLink
repository={repository}
linkName="sources"
to={`${url}/sources`}
label={t("repository-root.sources")}
activeOnlyWhenExact={false}
/> |
<<<<<<<
<NavLink to={permissionUrl} label={t("repositoryRoot.menu.permissionsNavLink")} />
=======
<NavLink to={permissionUrl} icon="fas fa-lock" label={t("repository-root.permissions")} />
>>>>>>>
<NavLink to={permissionUrl} icon="fas fa-lock" label={t("repositoryRoot.menu.permissionsNavLink")} /> |
<<<<<<<
import Changesets from "./Changesets";
import ChangesetView from "./ChangesetView";
=======
import PermissionsNavLink from "../components/PermissionsNavLink";
>>>>>>>
import Changesets from "./Changesets";
import ChangesetView from "./ChangesetView";
import PermissionsNavLink from "../components/PermissionsNavLink";
<<<<<<<
<Route
exact
path={`${url}/history`}
render={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/history/:branch`}
render={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/changeset/:id`}
render={() => <ChangesetView repository={repository} />}
/>
=======
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
>>>>>>>
<Route
exact
path={`${url}/history`}
render={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/history/:branch`}
render={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/changeset/:id`}
render={() => <ChangesetView repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<<<<<<<
<NavLink
activeOnlyWhenExact={false}
to={`${url}/history`}
label={t("repository-root.history")}
otherLocation={this.matchChangeset}
/>
=======
<PermissionsNavLink
permissionUrl={`${url}/permissions`}
repository={repository}
/>
>>>>>>>
<NavLink
activeOnlyWhenExact={false}
to={`${url}/history`}
label={t("repository-root.history")}
otherLocation={this.matchChangeset}
/>
<PermissionsNavLink
permissionUrl={`${url}/permissions`}
repository={repository}
/> |
<<<<<<<
import Changesets from "./Changesets";
import ChangesetView from "./ChangesetView";
=======
import BranchRoot from "./BranchRoot";
>>>>>>>
import BranchRoot from "./BranchRoot";
import ChangesetView from "./ChangesetView";
<<<<<<<
matchChangeset = (route: any) => {
const url = this.matchedUrl();
return route.location.pathname.match(`${url}/changeset/`);
};
=======
matches = (route: any) => {
const url = this.matchedUrl();
const regex = new RegExp(`${url}(/branches)?/?[^/]*/changesets?.*`);
return route.location.pathname.match(regex);
};
>>>>>>>
matchChangeset = (route: any) => {
const url = this.matchedUrl();
return route.location.pathname.match(`${url}/changeset/`);
};
matches = (route: any) => {
const url = this.matchedUrl();
const regex = new RegExp(`${url}(/branches)?/?[^/]*/changesets?.*`);
return route.location.pathname.match(regex);
};
<<<<<<<
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
exact
path={`${url}/history`}
render={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/history/:branch`}
render={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/changeset/:id`}
render={() => <ChangesetView repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
=======
<Switch>
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<Route
path={`${url}/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
<Route
path={`${url}/branches/:branch/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
</Switch>
>>>>>>>
<Switch>
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<Route
exact
path={`${url}/changeset/:id`}
render={() => <ChangesetView repository={repository} />}
/>
<Route
path={`${url}/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
<Route
path={`${url}/branches/:branch/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
</Switch>
<<<<<<<
<NavLink
activeOnlyWhenExact={false}
to={`${url}/history`}
label={t("repository-root.history")}
otherLocation={this.matchChangeset}
/>
=======
<NavLink
activeOnlyWhenExact={false}
to={`${url}/changesets/`}
label={t("repository-root.history")}
activeWhenMatch={this.matches}
/>
<EditNavLink repository={repository} editUrl={`${url}/edit`} />
>>>>>>>
<NavLink
activeOnlyWhenExact={false}
to={`${url}/changesets/`}
label={t("repository-root.history")}
activeWhenMatch={this.matches}
/>
<EditNavLink repository={repository} editUrl={`${url}/edit`} /> |
<<<<<<<
import {
modifyGroup,
modifyGroupReset,
fetchGroup,
isModifyGroupPending,
getModifyGroupFailure
} from "../modules/groups";
=======
import { modifyGroup } from "../modules/groups";
>>>>>>>
import {
modifyGroup,
modifyGroupReset,
isModifyGroupPending,
getModifyGroupFailure
} from "../modules/groups";
<<<<<<<
modifyGroupReset: Group => void,
fetchGroup: (name: string) => void,
=======
>>>>>>>
modifyGroupReset: Group => void,
fetchGroup: (name: string) => void,
<<<<<<<
componentDidMount() {
const { group, modifyGroupReset } = this.props;
modifyGroupReset(group);
}
groupModified = () => () => {
const { group, history } = this.props;
history.push(`/group/${group.name}`);
=======
groupModified = (group: Group) => () => {
this.props.history.push(`/group/${group.name}`);
>>>>>>>
componentDidMount() {
const { group, modifyGroupReset } = this.props;
modifyGroupReset(group);
}
groupModified = (group: Group) => () => {
this.props.history.push(`/group/${group.name}`);
<<<<<<<
},
modifyGroupReset: (group: Group) => {
dispatch(modifyGroupReset(group));
=======
>>>>>>>
},
modifyGroupReset: (group: Group) => {
dispatch(modifyGroupReset(group)); |
<<<<<<<
export { default as GeneralUserNavLink } from "./GeneralUserNavLink";
export { default as SetPasswordNavLink } from "./SetPasswordNavLink";
=======
export { default as DeleteUserNavLink } from "./DeleteUserNavLink";
export { default as EditUserNavLink } from "./EditUserNavLink";
export { default as SetPasswordNavLink } from "./SetPasswordNavLink";
export { default as SetPermissionsNavLink } from "./SetPermissionsNavLink";
>>>>>>>
export { default as GeneralUserNavLink } from "./GeneralUserNavLink";
export { default as SetPasswordNavLink } from "./SetPasswordNavLink";
export { default as SetPermissionsNavLink } from "./SetPermissionsNavLink"; |
<<<<<<<
disableGroupingGridText: 'Disable repository Groups',
=======
// TODO i18n
disableGroupingGridText: 'Disable repository groups',
enableRepositoryArchiveText: 'Enable repository archive',
>>>>>>>
disableGroupingGridText: 'Disable repository Groups',
enableRepositoryArchiveText: 'Enable repository archive',
<<<<<<<
disableGroupingGridHelpText: 'Disable repository Groups. A complete page reload is required after a change of this value.',
=======
// TODO i18n
disableGroupingGridHelpText: 'Disable repository groups. A complete page reload is required after a change of this value.',
// TODO
enableRepositoryArchiveHelpText: 'Enable repository archives. A complete page reload is required after a change of this value.',
>>>>>>>
disableGroupingGridHelpText: 'Disable repository Groups. A complete page reload is required after a change of this value.',
enableRepositoryArchiveHelpText: 'Enable repository archives. A complete page reload is required after a change of this value.', |
<<<<<<<
import Sources from "../sources/containers/Sources";
import RepositoryNavLink from "../components/RepositoryNavLink";
=======
import PermissionsNavLink from "../components/PermissionsNavLink";
>>>>>>>
import PermissionsNavLink from "../components/PermissionsNavLink";
import Sources from "../sources/containers/Sources";
import RepositoryNavLink from "../components/RepositoryNavLink";
<<<<<<<
<Route
path={`${url}/sources`}
exact={true}
component={props => (
<Sources
{...props}
repository={repository}
baseUrl={`${url}/sources`}
/>
)}
/>
<Route
path={`${url}/sources/:revision/:path*`}
component={props => (
<Sources
{...props}
repository={repository}
baseUrl={`${url}/sources`}
/>
)}
/>
=======
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
>>>>>>>
<Route
path={`${url}/permissions`}
render={props => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}
/>
)}
/>
<Route
path={`${url}/sources`}
exact={true}
component={props => (
<Sources
{...props}
repository={repository}
baseUrl={`${url}/sources`}
/>
)}
/>
<Route
path={`${url}/sources/:revision/:path*`}
component={props => (
<Sources
{...props}
repository={repository}
baseUrl={`${url}/sources`}
/>
)}
/> |
<<<<<<<
return <NavLink label={t("singleUser.menu.setPasswordNavLink")} to={passwordUrl} />;
=======
return <NavLink to={passwordUrl} label={t("set-password-button.label")} />;
>>>>>>>
return <NavLink to={passwordUrl} label={t("singleUser.menu.setPasswordNavLink")} />; |
<<<<<<<
constructor() {
super( ...arguments );
this.state = {
products: [],
loaded: false,
changedAttributes: {},
isEditing: false,
};
this.startEditing = this.startEditing.bind( this );
this.stopEditing = this.stopEditing.bind( this );
this.setChangedAttributes = this.setChangedAttributes.bind( this );
this.save = this.save.bind( this );
this.debouncedGetProducts = debounce( this.getProducts.bind( this ), 200 );
}
componentDidMount() {
if ( this.props.attributes.categories ) {
this.getProducts();
}
}
startEditing() {
this.setState( {
isEditing: true,
changedAttributes: {},
} );
}
stopEditing() {
this.setState( {
isEditing: false,
changedAttributes: {},
} );
}
setChangedAttributes( attributes ) {
this.setState( ( prevState ) => {
return { changedAttributes: { ...prevState.changedAttributes, ...attributes } };
} );
}
save() {
const { changedAttributes } = this.state;
const { setAttributes } = this.props;
setAttributes( changedAttributes );
this.stopEditing();
}
componentDidUpdate( prevProps ) {
const hasChange = [
'categories',
'catOperator',
'columns',
'orderby',
'rows',
].reduce( ( acc, key ) => {
return acc || prevProps.attributes[ key ] !== this.props.attributes[ key ];
}, false );
if ( hasChange ) {
this.debouncedGetProducts();
}
}
getProducts() {
if ( ! this.props.attributes.categories.length ) {
// We've removed all selected categories, or no categories have been selected yet.
this.setState( { products: [], loaded: true, isEditing: true } );
return;
}
apiFetch( {
path: addQueryArgs(
'/wc-blocks/v1/products',
getQuery( this.props.attributes, this.props.name )
),
} )
.then( ( products ) => {
this.setState( { products, loaded: true } );
} )
.catch( () => {
this.setState( { products: [], loaded: true } );
} );
}
=======
>>>>>>>
constructor() {
super( ...arguments );
this.state = {
changedAttributes: {},
isEditing: false,
};
this.startEditing = this.startEditing.bind( this );
this.stopEditing = this.stopEditing.bind( this );
this.setChangedAttributes = this.setChangedAttributes.bind( this );
this.save = this.save.bind( this );
}
startEditing() {
this.setState( {
isEditing: true,
changedAttributes: {},
} );
}
stopEditing() {
this.setState( {
isEditing: false,
changedAttributes: {},
} );
}
setChangedAttributes( attributes ) {
this.setState( ( prevState ) => {
return { changedAttributes: { ...prevState.changedAttributes, ...attributes } };
} );
}
save() {
const { changedAttributes } = this.state;
const { setAttributes } = this.props;
setAttributes( changedAttributes );
this.stopEditing();
}
<<<<<<<
const { isEditing } = this.state;
const { columns, catOperator, contentVisibility, orderby, rows } = attributes;
=======
const {
columns,
catOperator,
contentVisibility,
editMode,
orderby,
rows,
} = attributes;
>>>>>>>
const { isEditing } = this.state;
const {
columns,
catOperator,
contentVisibility,
orderby,
rows,
} = attributes;
<<<<<<<
const {
categories,
columns,
contentVisibility,
} = this.props.attributes;
const { loaded, products = [], isEditing } = this.state;
const classes = classnames( {
'wc-block-products-grid': true,
'wc-block-products-category': true,
[ `cols-${ columns }` ]: columns,
'is-loading': ! loaded,
'is-not-found': loaded && ! products.length,
'is-hidden-title': ! contentVisibility.title,
'is-hidden-price': ! contentVisibility.price,
'is-hidden-rating': ! contentVisibility.rating,
'is-hidden-button': ! contentVisibility.button,
} );
const nothingFound = ! categories.length ?
__(
'Select at least one category to display its products.',
'woo-gutenberg-products-block'
) :
_n(
'No products in this category.',
'No products in these categories.',
categories.length,
'woo-gutenberg-products-block'
);
=======
const { attributes, setAttributes } = this.props;
const { editMode } = attributes;
>>>>>>>
const { attributes } = this.props;
const { isEditing } = this.state; |
<<<<<<<
const { t, type, handleTypeChange, loading, label, helpText } = this.props;
const types = ["READ", "OWNER", "WRITE"];
=======
const { type, handleTypeChange, loading } = this.props;
const types = ["READ", "WRITE", "OWNER"];
>>>>>>>
const { type, handleTypeChange, loading, label, helpText } = this.props;
const types = ["READ", "OWNER", "WRITE"]; |
<<<<<<<
link: string,
permission: PermissionEntry,
=======
permission: PermissionCreateEntry,
>>>>>>>
link: string,
permission: PermissionCreateEntry,
<<<<<<<
link: string,
permission: PermissionEntry,
=======
permission: PermissionCreateEntry,
>>>>>>>
link: string,
permission: PermissionCreateEntry, |
<<<<<<<
export type { Config } from "./Config";
export type {IndexResources} from "./IndexResources";
=======
export type { Config } from "./Config";
export type { Permission, PermissionEntry, PermissionCollection } from "./RepositoryPermissions";
>>>>>>>
export type { Config } from "./Config";
export type {IndexResources} from "./IndexResources";
export type { Permission, PermissionEntry, PermissionCollection } from "./RepositoryPermissions"; |
<<<<<<<
// Original intention is to have stop not restart on hover
// this doesn't appear to be ever have been implemented, can implement if requested
=======
// resume playing if not stopped
api.resume = function() {
stopped || api.play();
};
// when stopped - mouseover won't restart
>>>>>>>
// resume playing if not stopped
api.resume = function() {
stopped || api.play();
};
// when stopped - mouseover won't restart
<<<<<<<
root.add(api.getNaviButtons()).hover(api.pause, api.play);
=======
api.getRoot().add(api.getNaviButtons()).hover(api.pause, api.resume);
>>>>>>>
root.add(api.getNaviButtons()).hover(api.pause, api.resume); |
<<<<<<<
import ProductTopRatedBlock from './product-top-rated';
=======
import ProductOnSaleBlock from './product-on-sale';
>>>>>>>
import ProductTopRatedBlock from './product-top-rated';
import ProductOnSaleBlock from './product-on-sale';
<<<<<<<
} );
registerBlockType( 'woocommerce/product-top-rated', {
title: __( 'Top Rated Products', 'woo-gutenberg-products-block' ),
icon: <Gridicon icon="trophy" />,
category: 'widgets',
keywords: [ __( 'WooCommerce', 'woo-gutenberg-products-block' ) ],
description: __(
'Display a grid of your top rated products.',
'woo-gutenberg-products-block'
),
attributes: {
...sharedAttributes,
},
getEditWrapperProps,
/**
* Renders and manages the block.
*/
edit( props ) {
return <ProductTopRatedBlock { ...props } />;
},
/**
* Save the block content in the post content. Block content is saved as a products shortcode.
*
* @return string
*/
save( props ) {
const {
align,
} = props.attributes; /* eslint-disable-line react/prop-types */
return (
<RawHTML className={ align ? `align${ align }` : '' }>
{ getShortcode( props, 'woocommerce/product-top-rated' ) }
</RawHTML>
);
},
=======
} );
registerBlockType( 'woocommerce/product-on-sale', {
title: __( 'On Sale Products', 'woo-gutenberg-products-block' ),
icon: <Gridicon icon="tag" />,
category: 'widgets',
keywords: [ __( 'WooCommerce', 'woo-gutenberg-products-block' ) ],
description: __(
'Display a grid of on sale products.',
'woo-gutenberg-products-block'
),
attributes: {
...sharedAttributes,
/**
* How to order the products: 'date', 'popularity', 'price_asc', 'price_desc' 'rating', 'title'.
*/
orderby: {
type: 'string',
default: 'date',
},
},
getEditWrapperProps,
/**
* Renders and manages the block.
*/
edit( props ) {
return <ProductOnSaleBlock { ...props } />;
},
/**
* Save the block content in the post content. Block content is saved as a products shortcode.
*
* @return string
*/
save( props ) {
const {
align,
} = props.attributes; /* eslint-disable-line react/prop-types */
return (
<RawHTML className={ align ? `align${ align }` : '' }>
{ getShortcode( props, 'woocommerce/product-on-sale' ) }
</RawHTML>
);
},
>>>>>>>
} );
registerBlockType( 'woocommerce/product-top-rated', {
title: __( 'Top Rated Products', 'woo-gutenberg-products-block' ),
icon: <Gridicon icon="trophy" />,
category: 'widgets',
keywords: [ __( 'WooCommerce', 'woo-gutenberg-products-block' ) ],
description: __(
'Display a grid of your top rated products.',
'woo-gutenberg-products-block'
),
attributes: {
...sharedAttributes,
},
getEditWrapperProps,
/**
* Renders and manages the block.
*/
edit( props ) {
return <ProductTopRatedBlock { ...props } />;
},
/**
* Save the block content in the post content. Block content is saved as a products shortcode.
*
* @return string
*/
save( props ) {
const {
align,
} = props.attributes; /* eslint-disable-line react/prop-types */
return (
<RawHTML className={ align ? `align${ align }` : '' }>
{ getShortcode( props, 'woocommerce/product-top-rated' ) }
</RawHTML>
);
},
} );
registerBlockType( 'woocommerce/product-on-sale', {
title: __( 'On Sale Products', 'woo-gutenberg-products-block' ),
icon: <Gridicon icon="tag" />,
category: 'widgets',
keywords: [ __( 'WooCommerce', 'woo-gutenberg-products-block' ) ],
description: __(
'Display a grid of on sale products.',
'woo-gutenberg-products-block'
),
attributes: {
...sharedAttributes,
/**
* How to order the products: 'date', 'popularity', 'price_asc', 'price_desc' 'rating', 'title'.
*/
orderby: {
type: 'string',
default: 'date',
},
},
getEditWrapperProps,
/**
* Renders and manages the block.
*/
edit( props ) {
return <ProductOnSaleBlock { ...props } />;
},
/**
* Save the block content in the post content. Block content is saved as a products shortcode.
*
* @return string
*/
save( props ) {
const {
align,
} = props.attributes; /* eslint-disable-line react/prop-types */
return (
<RawHTML className={ align ? `align${ align }` : '' }>
{ getShortcode( props, 'woocommerce/product-on-sale' ) }
</RawHTML>
);
}, |
<<<<<<<
this.setState({ queryList: [{ id: 0, render: true, query: "" }] });
=======
this.queriesToRun = [];
this.setState({ queryList: [{ id: 0, render: true, value: "" }] });
>>>>>>>
this.setState({ queryList: [{ id: 0, render: true, query: "" }] });
this.queriesToRun = []; |
<<<<<<<
var shownExtensions = getFilteredFileExtensions();
=======
>>>>>>>
<<<<<<<
var shownExtensions = getFilteredFileExtensions();
if(shownExtensions !== undefined)
$('#fileupload').attr('accept', shownExtensions.map(function(el){return '.'+el;}).join());
$('#fileupload', $uploadContainer)
=======
$('#fileupload', $uploadContainer)
>>>>>>>
$('#fileupload', $uploadContainer) |
<<<<<<<
/**
* Determine path when using baseUrl and setFileRoot connector
* function to give back a valid path on selectItem calls
*/
var smartPath = function(url, path) {
var a = url.split('/'),
separator = '/' + a[a.length-2] + '/',
position = path.indexOf(separator),
smart_path;
// separator is not found
// this can happen when not set dynamically with setFileRoot function - see : https://github.com/simogeo/Filemanager/issues/354
if(position == -1) {
smart_path = url + path;
} else {
smart_path = url + path.substring(position + separator.length);
}
if(fm.config.options.logger) {
console.log("url : " + url + " - path : " + path + " - separator: " + separator + " - position: " + position + " - returned value : " + smart_path);
}
return smart_path;
};
=======
>>>>>>>
<<<<<<<
var code = '<video src="' + createPreviewUrl(data['Preview']) + '" width=' + fm.config.videos.videosPlayerWidth + ' height=' + fm.config.videos.videosPlayerHeight + ' controls="controls"></video>';
=======
var url = createPreviewUrl(data['Preview'], true);
var code = '<video src="' + url + '" width=' + config.videos.videosPlayerWidth + ' height=' + config.videos.videosPlayerHeight + ' controls="controls"></video>';
>>>>>>>
var url = createPreviewUrl(data['Preview'], true);
var code = '<video src="' + url + '" width=' + fm.config.videos.videosPlayerWidth + ' height=' + fm.config.videos.videosPlayerHeight + ' controls="controls"></video>';
<<<<<<<
var code = '<iframe id="fm-pdf-viewer" src="' + fm.config.globals.pluginPath + '/scripts/ViewerJS/index.html#' + createPreviewUrl(data['Preview']) + '" width="' + fm.config.pdfs.pdfsReaderWidth + '" height="' + fm.config.pdfs.pdfsReaderHeight + '" allowfullscreen webkitallowfullscreen></iframe>';
=======
var url = createPreviewUrl(data['Preview'], true);
var code = '<iframe id="fm-pdf-viewer" src="' + config.globals.pluginPath + '/scripts/ViewerJS/index.html#' + url + '" width="' + config.pdfs.pdfsReaderWidth + '" height="' + config.pdfs.pdfsReaderHeight + '" allowfullscreen webkitallowfullscreen></iframe>';
>>>>>>>
var url = createPreviewUrl(data['Preview'], true);
var code = '<iframe id="fm-pdf-viewer" src="' + fm.config.globals.pluginPath + '/scripts/ViewerJS/index.html#' + url + '" width="' + fm.config.pdfs.pdfsReaderWidth + '" height="' + config.pdfs.pdfsReaderHeight + '" allowfullscreen webkitallowfullscreen></iframe>';
<<<<<<<
var url;
if(fm.config.options.baseUrl !== false ) {
url = smartPath(baseUrl, data['Path'].replace(fm.fileRoot, ""));
} else {
url = data['Path'];
}
=======
var url = createPreviewUrl(data['Preview']);
>>>>>>>
var url = createPreviewUrl(data['Preview']);
<<<<<<<
$fileinfo.find('img').attr('src', data['Thumbnail']);
if(isVideoFile(data['Filename']) && fm.config.videos.showVideoPlayer == true) {
=======
if(isVideoFile(data['Filename']) && config.videos.showVideoPlayer == true) {
>>>>>>>
if(isVideoFile(data['Filename']) && fm.config.videos.showVideoPlayer == true) {
<<<<<<<
if(fm.config.options.baseUrl !== false ) {
var url = smartPath(baseUrl, data['Path'].replace(fm.fileRoot, ""));
} else {
var url = data['Path'];
}
=======
var url = createPreviewUrl(data['Preview']);
>>>>>>>
var url = createPreviewUrl(data['Preview']);
<<<<<<<
if(fm.config.options.baseUrl === false) {
baseUrl = window.location.protocol + "//" + window.location.host;
=======
// init baseUrl
if(config.options.baseUrl === false) {
baseUrl = location.origin + location.pathname;
>>>>>>>
// init baseUrl
if(fm.config.options.baseUrl === false) {
baseUrl = location.origin + location.pathname; |
<<<<<<<
if (this.showToolbar) {
this.tbar = this.createToolBar();
}
if (this.isVertical) {
=======
if (this.isVertical) {
>>>>>>>
if(this.isVertical) {
<<<<<<<
var admin;
(function (admin) {
(function (ui) {
var FilterPanel = (function () {
function FilterPanel() {
this.facetData = [
{
"name": 'Space',
"terms": [
{
"name": 'Public Web',
"key": 'public',
"count": 8
},
{
"name": 'Intranet',
"key": 'intra',
"count": 20
}
]
},
{
"name": "Type",
"terms": [
{
"name": "Space",
"key": "space",
"count": 10
},
{
"name": "Part",
"key": "part",
"count": 80
},
{
"name": "Page Template",
"key": "template",
"count": 7
}
]
},
{
"name": "Module",
"terms": [
{
"name": "Twitter Bootrstrap",
"key": "twitter",
"count": 0
},
{
"name": "Enonic",
"key": "enonic",
"count": 3
},
{
"name": "Foo",
"key": "foo",
"count": 6
}
]
}
];
this.facetTpl =
'<tpl for=".">' + '<div class="admin-facet-group" name="{name}">' + '<h2>{[values.displayName || values.name]}</h2>' +
'<tpl for="terms">{[this.updateFacetCount(values, parent)]}' + '<tpl if="this.shouldShowTerm(values, parent)">' +
'<div class="admin-facet {[values.selected ? \'checked\' : \'\']}">' +
'<input type="checkbox" id="facet-{term}" value="{name}" class="admin-facet-cb" name="{parent.name}" {[values.selected ? \'checked="true"\' : \'\']} />' +
'<label for="facet-{key}" class="admin-facet-lbl"> {[values.displayName || values.name]} ({[this.getTermCount(values)]})</label>' +
'</div>' + '</tpl>' + '</tpl>' + '</div>' + '</tpl>';
var fp = this.ext = new Ext.panel.Panel();
fp.cls = 'admin-filter';
fp.header = false;
fp.layout = {
type: 'vbox',
align: 'stretch'
};
fp.autoScroll = true;
fp.split = true;
fp.includeSearch = true;
fp.includeEmptyFacets = 'none';
fp.updateCountCriteria = 'always';
fp.updateCountStrategy = 'notlast';
fp.originalTitle = '';
fp.facetData = this.facetData;
fp.facetTpl = new Ext.XTemplate(this.facetTpl, {
updateFacetCount: function (term, facet) {
var isCriteria = fp.updateCountCriteria == 'always' || (fp.updateCountCriteria == 'query' && fp.queryDirty);
var isStrategy = fp.updateCountStrategy == 'all' ||
(fp.updateCountStrategy == 'notlast' && fp.lastFacetNafp != facet.nafp);
var isDefined = Ext.isDefined(fp.facetCountMap[term.name]);
var isDirty = fp.isDirty();
if (!isDirty || !isDefined || (isCriteria && isStrategy)) {
fp.facetCountMap[term.name] = term.count;
}
},
shouldShowTerm: function (term, facet) {
return fp.includeEmptyFacets == 'all' ||
(fp.includeEmptyFacets == 'last' && (!fp.lastFacetName || fp.lastFacetName == facet.name)) ||
fp.facetCountMap[term.name] > 0 || term.selected || this.isSelected(term, facet);
},
getTermCount: function (term) {
return fp.facetCountMap[term.name];
},
isSelected: function (term, facet) {
var terms = fp.selectedValues[facet.name];
if (terms) {
return Ext.Array.contains(terms, term.name);
}
return false;
}
});
fp.facetContainer = this.createFacetContainer();
fp.insert(0, fp.facetContainer);
fp.clearLink = this.createClearLink();
fp.insert(0, fp.clearLink);
fp.facetCountMap = [];
if (fp.includeSearch) {
fp.searchField = this.createSearchField();
fp.insert(0, fp.searchField);
=======
Ext.define('Admin.view.FilterPanel', {
extend: 'Admin.view.BaseFilterPanel',
alias: 'widget.spaceFilter',
facetData: [
{
"name": 'Space',
"terms": [
{
"name": 'Public Web',
"key": 'public',
"count": 8
},
{
"name": 'Intranet',
"key": 'intra',
"count": 20
}
]
},
{
"name": "Type",
"terms": [
{
"name": "Space",
"key": "space",
"count": 10
},
{
"name": "Part",
"key": "part",
"count": 80
},
{
"name": "Page Template",
"key": "template",
"count": 7
}
]
},
{
"name": "Module",
"terms": [
{
"name": "Twitter Bootrstrap",
"key": "twitter",
"count": 0
},
{
"name": "Enonic",
"key": "enonic",
"count": 3
},
{
"name": "Foo",
"key": "foo",
"count": 6
>>>>>>>
var admin;
(function (admin) {
(function (ui) {
var FilterPanel = (function () {
function FilterPanel() {
this.facetData = [
{
"name": 'Space',
"terms": [
{
"name": 'Public Web',
"key": 'public',
"count": 8
},
{
"name": 'Intranet',
"key": 'intra',
"count": 20
}
]
},
{
"name": "Type",
"terms": [
{
"name": "Space",
"key": "space",
"count": 10
},
{
"name": "Part",
"key": "part",
"count": 80
},
{
"name": "Page Template",
"key": "template",
"count": 7
}
]
},
{
"name": "Module",
"terms": [
{
"name": "Twitter Bootrstrap",
"key": "twitter",
"count": 0
},
{
"name": "Enonic",
"key": "enonic",
"count": 3
},
{
"name": "Foo",
"key": "foo",
"count": 6
}
]
}
];
this.facetTpl = '<tpl for=".">' + '<div class="admin-facet-group" name="{name}">' + '<h2>{[values.displayName || values.name]}</h2>' + '<tpl for="terms">{[this.updateFacetCount(values, parent)]}' + '<tpl if="this.shouldShowTerm(values, parent)">' + '<div class="admin-facet {[values.selected ? \'checked\' : \'\']}">' + '<input type="checkbox" id="facet-{term}" value="{name}" class="admin-facet-cb" name="{parent.name}" {[values.selected ? \'checked="true"\' : \'\']} />' + '<label for="facet-{key}" class="admin-facet-lbl"> {[values.displayName || values.name]} ({[this.getTermCount(values)]})</label>' + '</div>' + '</tpl>' + '</tpl>' + '</div>' + '</tpl>';
var fp = this.ext = new Ext.panel.Panel();
fp.cls = 'admin-filter';
fp.header = false;
fp.layout = {
type: 'vbox',
align: 'stretch'
};
fp.autoScroll = true;
fp.split = true;
fp.includeSearch = true;
fp.includeEmptyFacets = 'none';
fp.updateCountCriteria = 'always';
fp.updateCountStrategy = 'notlast';
fp.originalTitle = '';
fp.facetData = this.facetData;
fp.facetTpl = new Ext.XTemplate(this.facetTpl, {
updateFacetCount: function (term, facet) {
var isCriteria = fp.updateCountCriteria == 'always' || (fp.updateCountCriteria == 'query' && fp.queryDirty);
var isStrategy = fp.updateCountStrategy == 'all' || (fp.updateCountStrategy == 'notlast' && fp.lastFacetNafp != facet.nafp);
var isDefined = Ext.isDefined(fp.facetCountMap[term.name]);
var isDirty = fp.isDirty();
if(!isDirty || !isDefined || (isCriteria && isStrategy)) {
fp.facetCountMap[term.name] = term.count;
}
},
shouldShowTerm: function (term, facet) {
return fp.includeEmptyFacets == 'all' || (fp.includeEmptyFacets == 'last' && (!fp.lastFacetName || fp.lastFacetName == facet.name)) || fp.facetCountMap[term.name] > 0 || term.selected || this.isSelected(term, facet);
},
getTermCount: function (term) {
return fp.facetCountMap[term.name];
},
isSelected: function (term, facet) {
var terms = fp.selectedValues[facet.name];
if(terms) {
return Ext.Array.contains(terms, term.name);
}
return false;
}
});
fp.facetContainer = this.createFacetContainer();
fp.insert(0, fp.facetContainer);
fp.clearLink = this.createClearLink();
fp.insert(0, fp.clearLink);
fp.facetCountMap = [];
if(fp.includeSearch) {
fp.searchField = this.createSearchField();
fp.insert(0, fp.searchField);
<<<<<<<
if (!activeTab) {
var tabItem = {
id: me.generateTabId(space, false),
xtype: 'spaceDetail',
showToolbar: false,
data: space,
title: space.get('displayName'),
isFullPage: true
};
=======
if (!activeTab) {
var tabItem = new admin.ui.SpaceDetailPanel();
>>>>>>>
if(!activeTab) {
var tabItem = new admin.ui.SpaceDetailPanel(); |
<<<<<<<
' <div class="admin-inputimage" style="background-image: url({iconUrl}?size=140&thumbnail=false)">',
=======
' <div class="admin-inputimage">',
' <div class="loader"></div>',
' <div class="image" style="background-image: url({iconUrl}?size=140&thumbnail=false);"></div>',
// ' <div class="top-bar"><a href="javascript:;" class="admin-remove-button">Remove</a></div>',
>>>>>>>
' <div class="admin-inputimage">',
' <div class="loader"></div>',
' <div class="image" style="background-image: url({iconUrl}?size=140&thumbnail=false);"></div>', |
<<<<<<<
=======
const { exec, spawn } = require("child_process");
const { join } = require("path");
const { ipcMain } = require("electron");
const node_ssh = require("node-ssh");
>>>>>>>
<<<<<<<
if (this.ssh && this.ssh.hasConnection()) {
if (this.shell) {
await this.shell.disconnect();
}
this.ssh.gracefulShutdown(this.kill);
=======
const ssh = this.ssh;
if (ssh && ssh.connection) {
ssh.connection.once("error", () => {
// swallow the error
// this shutdown command causes a disconnect from the corda
// which results an error within the ssh connection logic.
});
ssh.exec("run", ["gracefulShutdown"]).catch(e => {
// eslint-disable-next-line no-console
console.error(e);
// didn't seem to work... send SIGINT
this.kill(java);
});
>>>>>>>
if (this.ssh && this.ssh.hasConnection()) {
if (this.shell) {
await this.shell.disconnect();
}
this.ssh.gracefulShutdown(this.kill);
<<<<<<<
async earlyCloseHandler(code) {
// eslint-disable-next-line no-console
console.log("corda", `child process exited with code ${code}`);
const reject = this._awaiter.reject;
=======
async earlyCloseHandler(code) {
if (this.status === "started") {
// looks like the user shut this down.
await this.stop();
this._io.emit("send", "NODE_STOPPED", this.entity.safeName);
ipcMain.once("START_NODE:" + this.entity.safeName, async () => {
this._io.emit("send", "NODE_STARTING", this.entity.safeName);
await this.start(this);
this._io.emit("send", "NODE_STARTED", this.entity.safeName);
});
} else {
// eslint-disable-next-line no-console
console.log("corda", `child process exited with code ${code}`);
const reject = this._awaiter.reject;
>>>>>>>
async earlyCloseHandler(code) {
if (this.status === "started") {
// looks like the user shut this node down. tell the UI about it.
await this.stop();
this._io.emit("send", "NODE_STOPPED", this.entity.safeName);
ipcMain.once("START_NODE:" + this.entity.safeName, async () => {
this._io.emit("send", "NODE_STARTING", this.entity.safeName);
await this.start(this);
await this._io.sendClearTerm({
node: this.entity.safeName
});
this.handleStartShell(null, {node: this.entity.safeName});
this._io.emit("send", "NODE_STARTED", this.entity.safeName);
});
} else {
// eslint-disable-next-line no-console
console.log("corda", `child process exited with code ${code}`);
const reject = this._awaiter.reject; |
<<<<<<<
// @vue/component
=======
const svgContext = require.context('asset/svg/?inline', false, /\.svg/);
>>>>>>>
const svgContext = require.context('asset/svg/?inline', false, /\.svg/);
// @vue/component |
<<<<<<<
<Route path="/contracts" component={ContractsScreen} />
=======
<Route path='/events' component={EventsScreen} />
>>>>>>>
<Route path="/contracts" component={ContractsScreen} />
<Route path='/events' component={EventsScreen} />
<<<<<<<
"./screens/not-found/NotFoundScreen.scss",
"./screens/contracts/ContractsScreen.scss"
=======
"./screens/not-found/NotFoundScreen.scss",
"./screens/events/EventList.scss",
"./screens/events/EventsScreen.scss",
"./screens/events/RecentEvents.scss"
>>>>>>>
"./screens/not-found/NotFoundScreen.scss",
"./screens/contracts/ContractsScreen.scss",
"./screens/events/EventList.scss",
"./screens/events/EventsScreen.scss",
"./screens/events/RecentEvents.scss" |
<<<<<<<
});
test.cb("should not throw without config", (t) => {
const config = {
entry: path.join(__dirname, "fixtures/basic.js"),
output: {
path: t.context.directory,
},
module: {
loaders: [
{
test: /\.jsx?/,
loader: babelLoader,
exclude: /node_modules/,
},
],
},
};
webpack(config, (err, stats) => {
t.is(err, null);
t.true(stats.compilation.errors.length === 0);
t.end();
});
=======
});
test.serial.cb("should not polute BABEL_ENV after using forceEnv", (t) => {
const initialBabelEnv = process.env.BABEL_ENV;
const config = {
entry: path.join(__dirname, "fixtures/basic.js"),
output: {
path: t.context.directory,
},
module: {
loaders: [
{
test: /\.jsx?/,
loader: babelLoader,
query: {
forceEnv: "testenv",
env: {
testenv: {
presets: ["es2015"],
},
}
},
exclude: /node_modules/,
},
],
},
};
webpack(config, () => {
t.truthy(process.env.BABEL_ENV === initialBabelEnv);
t.end();
});
});
test.serial.cb("should not polute BABEL_ENV after using forceEnv (on exception)", (t) => {
const initialBabelEnv = process.env.BABEL_ENV;
const config = {
entry: path.join(__dirname, "fixtures/basic.js"),
output: {
path: t.context.directory,
},
module: {
loaders: [
{
test: /\.jsx?/,
loader: babelLoader,
query: {
forceEnv: "testenv",
env: {
testenv: {
presets: ["es2015asd"],
},
}
},
exclude: /node_modules/,
},
],
},
};
webpack(config, () => {
t.truthy(process.env.BABEL_ENV === initialBabelEnv);
t.end();
});
});
test.serial.cb("should not change BABEL_ENV when using forceEnv", (t) => {
const initialBabelEnv = process.env.BABEL_ENV;
process.env.BABEL_ENV = "nontestenv";
const config = {
entry: path.join(__dirname, "fixtures/basic.js"),
output: {
path: t.context.directory,
},
module: {
loaders: [
{
test: /\.jsx?/,
loader: babelLoader,
query: {
forceEnv: "testenv",
env: {
testenv: {
presets: ["es2015abc"],
},
nontestenv: {
presets: ["es2015xzy"]
}
}
},
exclude: /node_modules/,
},
],
},
};
webpack(config, (err, stats) => {
t.is(err, null);
t.true(stats.compilation.errors.length === 1);
t.truthy(stats.compilation.errors[0].message.match(/es2015abc/));
t.falsy(stats.compilation.errors[0].message.match(/es2015xyz/));
t.truthy("nontestenv" === process.env.BABEL_ENV);
if (initialBabelEnv !== undefined) {
process.env.BABEL_ENV = initialBabelEnv;
} else {
delete process.env.BABEL_ENV;
}
t.end();
});
>>>>>>>
});
test.serial.cb("should not polute BABEL_ENV after using forceEnv", (t) => {
const initialBabelEnv = process.env.BABEL_ENV;
const config = {
entry: path.join(__dirname, "fixtures/basic.js"),
output: {
path: t.context.directory,
},
module: {
loaders: [
{
test: /\.jsx?/,
loader: babelLoader,
query: {
forceEnv: "testenv",
env: {
testenv: {
presets: ["es2015"],
},
}
},
exclude: /node_modules/,
},
],
},
};
webpack(config, () => {
t.truthy(process.env.BABEL_ENV === initialBabelEnv);
t.end();
});
});
test.serial.cb("should not polute BABEL_ENV after using forceEnv (on exception)", (t) => {
const initialBabelEnv = process.env.BABEL_ENV;
const config = {
entry: path.join(__dirname, "fixtures/basic.js"),
output: {
path: t.context.directory,
},
module: {
loaders: [
{
test: /\.jsx?/,
loader: babelLoader,
query: {
forceEnv: "testenv",
env: {
testenv: {
presets: ["es2015asd"],
},
}
},
exclude: /node_modules/,
},
],
},
};
webpack(config, () => {
t.truthy(process.env.BABEL_ENV === initialBabelEnv);
t.end();
});
});
test.serial.cb("should not change BABEL_ENV when using forceEnv", (t) => {
const initialBabelEnv = process.env.BABEL_ENV;
process.env.BABEL_ENV = "nontestenv";
const config = {
entry: path.join(__dirname, "fixtures/basic.js"),
output: {
path: t.context.directory,
},
module: {
loaders: [
{
test: /\.jsx?/,
loader: babelLoader,
query: {
forceEnv: "testenv",
env: {
testenv: {
presets: ["es2015abc"],
},
nontestenv: {
presets: ["es2015xzy"]
}
}
},
exclude: /node_modules/,
},
],
},
};
webpack(config, (err, stats) => {
t.is(err, null);
t.true(stats.compilation.errors.length === 1);
t.truthy(stats.compilation.errors[0].message.match(/es2015abc/));
t.falsy(stats.compilation.errors[0].message.match(/es2015xyz/));
t.truthy("nontestenv" === process.env.BABEL_ENV);
if (initialBabelEnv !== undefined) {
process.env.BABEL_ENV = initialBabelEnv;
} else {
delete process.env.BABEL_ENV;
}
t.end();
});
});
test.cb("should not throw without config", (t) => {
const config = {
entry: path.join(__dirname, "fixtures/basic.js"),
output: {
path: t.context.directory,
},
module: {
loaders: [
{
test: /\.jsx?/,
loader: babelLoader,
exclude: /node_modules/,
},
],
},
};
webpack(config, (err, stats) => {
t.is(err, null);
t.true(stats.compilation.errors.length === 0);
t.end();
}); |
<<<<<<<
style: React.PropTypes.object, // additional style properties for the component
=======
disabled: React.PropTypes.bool, // only applies to buttons
>>>>>>>
style: React.PropTypes.object, // additional style properties for the component
disabled: React.PropTypes.bool, // only applies to buttons |
<<<<<<<
if(typeof amplifyMeta.video != "undefined" && Object.keys(amplifyMeta.video).length != 0){
for(var project in amplifyMeta.video){
if (amplifyMeta.video[project].output){
await prettifyOutput(amplifyMeta.video[project].output);
}
=======
if (!amplifyMeta.video){
chalk.bold("You have no video projects.");
}
const chooseProject = [
{
type: 'list',
name: 'resourceName',
message: 'Choose what project you want to get info for?',
choices: Object.keys(amplifyMeta.video),
default: Object.keys(amplifyMeta.video)[0],
>>>>>>>
if(typeof amplifyMeta.video != "undefined" && Object.keys(amplifyMeta.video).length != 0){
for(var project in amplifyMeta.video){
if (amplifyMeta.video[project].output){
await prettifyOutput(amplifyMeta.video[project].output);
}
<<<<<<<
async function getLiveStreamInfo(context, options){
const { amplify } = context;
let project;
const amplifyMeta = context.amplify.getProjectMeta();
if (typeof amplifyMeta.video == "undefined" || Object.keys(amplifyMeta.video).length == 0){
console.log(chalk.bold("You have no video projects."));
return;
} else {
const chooseProject = [
{
type: 'list',
name: 'resourceName',
message: 'Choose what project you want to get info for?',
choices: Object.keys(amplifyMeta.video),
default: Object.keys(amplifyMeta.video)[0],
}
];
=======
if(!amplify.video && Object.keys(amplifyMeta.video).length != 0){
>>>>>>>
async function getLiveStreamInfo(context, options){
const { amplify } = context;
let project;
const amplifyMeta = context.amplify.getProjectMeta();
if (typeof amplifyMeta.video == "undefined" || Object.keys(amplifyMeta.video).length == 0){
console.log(chalk.bold("You have no video projects."));
return;
} else {
const chooseProject = [
{
type: 'list',
name: 'resourceName',
message: 'Choose what project you want to get info for?',
choices: Object.keys(amplifyMeta.video),
default: Object.keys(amplifyMeta.video)[0],
}
];
<<<<<<<
=======
} else {
console.log(chalk.bold("You have no video projects."));
return;
>>>>>>> |
<<<<<<<
function getBeforeLayer(geometriesAboveLabels) {
return geometriesAboveLabels ? null : 'place_other';
}
class Map extends React.Component {
=======
class Map extends React.Component { // eslint-disable-line
>>>>>>>
function getBeforeLayer(geometriesAboveLabels) {
return geometriesAboveLabels ? null : 'place_other';
}
class Map extends React.Component { // eslint-disable-line
<<<<<<<
componentWillReceiveProps(nextProps) {
const {
tiles,
geoJson,
geometryType,
geometriesAboveLabels: nextGeometriesAboveLabels,
} = nextProps;
const { geometriesAboveLabels } = this.state;
if ((geometriesAboveLabels !== nextGeometriesAboveLabels) && (!!this.map.getLayer('postgis-preview'))) {
this.map.moveLayer('postgis-preview', getBeforeLayer(nextGeometriesAboveLabels));
} else {
if (tiles) this.addTileLayer(tiles, geometryType, geometriesAboveLabels);
if (geoJson) this.addJsonLayer(geoJson, geometryType, geometriesAboveLabels);
}
}
=======
>>>>>>>
<<<<<<<
addJsonLayer(geoJson, geometryType, geometriesAboveLabels) {
=======
fitBounds(bounds) {
this.map.fitBounds(bounds, {
padding: 80,
});
this.setState({ zoomedToBounds: true });
}
addJsonLayer(geoJson, geometryType) {
>>>>>>>
fitBounds(bounds) {
this.map.fitBounds(bounds, {
padding: 80,
});
this.setState({ zoomedToBounds: true });
}
addJsonLayer(geoJson, geometryType, geometriesAboveLabels) {
<<<<<<<
addTileLayer(tiles, geometryType, geometriesAboveLabels) {
const beforeLayer = geometriesAboveLabels ? '' : 'place_other';
=======
addTileLayer(tiles, geometryType) {
const { bounds } = this.props;
>>>>>>>
addTileLayer(tiles, geometryType, geometriesAboveLabels) {
const { bounds } = this.props; |
<<<<<<<
path: path.resolve(__dirname, '../docs'),
publicPath: '/',
filename: '[name].[hash].js'
=======
filename: '[name].[hash].js',
path: path.resolve(__dirname, 'dist')
>>>>>>>
filename: '[name].[hash].js',
path: path.resolve(__dirname, 'dist')
<<<<<<<
pathToMake: './elm-make',
yes: false
=======
warn: true,
debug: true
>>>>>>>
yes: false
<<<<<<<
devServer: {
inline: true,
stats: { colors: true },
historyApiFallback: true,
host: '0.0.0.0',
disableHostCheck: true,
stats: {
hash: false,
version: false,
timings: false,
assets: false,
chunks: false,
modules: false,
reasons: false,
children: false,
source: false,
errors: true,
errorDetails: true,
warnings: true,
publicPath: false
}
},
};
=======
plugins: [
new HtmlWebpackPlugin({
title: 'composable-form - Build type-safe composable forms in Elm',
meta: { viewport: 'width=device-width, initial-scale=1' }
})
]
});
>>>>>>>
devServer: {
inline: true,
stats: { colors: true },
historyApiFallback: true,
host: '0.0.0.0',
disableHostCheck: true,
stats: {
hash: false,
version: false,
timings: false,
assets: false,
chunks: false,
modules: false,
reasons: false,
children: false,
source: false,
errors: true,
errorDetails: true,
warnings: true,
publicPath: false
}
},
plugins: [
new HtmlWebpackPlugin({
title: 'composable-form - Build type-safe composable forms in Elm',
meta: { viewport: 'width=device-width, initial-scale=1' }
})
]
}); |
<<<<<<<
exports.DBConnectionPool.prototype.getDBSession = function(index, user_callback) {
var db = properties.database;
assert(ndbconn);
assert(db == "test");
=======
exports.DBConnectionPool.prototype.openSessionHandler = function(user_callback) {
var db = this.properties.database;
assert(this.ndbconn);
>>>>>>>
exports.DBConnectionPool.prototype.getDBSession = function(index, user_callback) {
var db = this.properties.database;
assert(this.ndbconn); |
<<<<<<<
import PhoneComponent from './components/pc/phone'
=======
import UploadComponent from './components/pc/upload'
>>>>>>>
import PhoneComponent from './components/pc/phone'
import UploadComponent from './components/pc/upload'
<<<<<<<
<Route path="phone"
component={PhoneComponent}/>
=======
<Route path="upload"
component={UploadComponent}/>
>>>>>>>
<Route path="phone"
component={PhoneComponent}/>
<Route path="upload"
component={UploadComponent}/> |
<<<<<<<
import BackupsView from "../components/Backups";
import DataExplorer from "../components/DataExplorer";
=======
import ClusterPage from "components/Cluster/ClusterPage";
import LicenseWarning from "components/LicenseWarning";
>>>>>>>
import BackupsView from "../components/Backups";
import ClusterPage from "components/Cluster/ClusterPage";
import LicenseWarning from "components/LicenseWarning";
<<<<<<<
const {
activeFrameId,
clickSidebarUrl,
connection,
frames,
frameResults,
activeTab,
handleDiscardFrame,
handleUpdateAction,
handleUpdateConnectedState,
mainFrameUrl,
overlayUrl,
showFrame,
url,
} = this.props;
const renderMainFrame = () => {
switch (mainFrameUrl) {
case "":
return (
<QueryView
handleClearQuery={this.handleClearQuery}
handleDiscardFrame={handleDiscardFrame}
handleRunQuery={this.handleRunQuery}
onSelectQuery={this.handleSelectQuery}
onSetQuery={this.handleSetQuery}
handleUpdateAction={handleUpdateAction}
handleUpdateConnectedState={
handleUpdateConnectedState
}
handleUpdateQuery={this.handleUpdateQuery}
activeFrameId={activeFrameId}
frames={frames}
frameResults={frameResults}
activeTab={activeTab}
showFrame={showFrame}
/>
);
case "schema":
return (
<Schema
url={url}
onUpdateConnectedState={handleUpdateConnectedState}
onOpenGeneratedQuery={this.handleExternalQuery}
/>
);
case "dataexplorer":
return (
<DataExplorer
url={url}
onUpdateConnectedState={handleUpdateConnectedState}
/>
);
case "acl":
return (
<AclPage
url={url}
onUpdateConnectedState={handleUpdateConnectedState}
/>
);
case "backups":
return <BackupsView />;
default:
return <p>Unknown internal URL: {mainFrameUrl}</p>;
}
};
return [
<Sidebar
key="app-sidebar"
currentMenu={overlayUrl || mainFrameUrl}
currentOverlay={this.getOverlayContent(overlayUrl)}
onToggleMenu={this.props.clickSidebarUrl}
connection={connection}
serverName={url.url}
/>,
<div
key="app-main-content"
className={classnames(
"main-content",
mainFrameUrl || "console",
)}
>
{overlayUrl ? (
<div
className="click-capture"
onClick={() => clickSidebarUrl(mainFrameUrl)}
/>
) : null}
{renderMainFrame()}
</div>,
];
=======
const { clickSidebarUrl, mainFrameUrl, overlayUrl } = this.props;
const getMainContent = mainFrameUrl => {
switch (mainFrameUrl) {
case "":
return (
<QueryView
handleRunQuery={this.handleRunQuery}
onSelectQuery={this.handleSelectQuery}
onSetQuery={this.handleSetQuery}
/>
);
case "acl":
return <AclPage />;
case "cluster":
return <ClusterPage />;
case "connection":
return <ServerConnectionModal />;
case "schema":
return (
<Schema
onOpenGeneratedQuery={this.handleExternalQuery}
/>
);
default:
return <div>Unknown main frame URL: {mainFrameUrl}</div>;
}
};
return (
<>
<Sidebar
currentMenu={overlayUrl || mainFrameUrl}
currentOverlay={this.getOverlayContent(overlayUrl)}
onToggleMenu={this.props.clickSidebarUrl}
/>
<div
className={classnames(
"main-content",
mainFrameUrl || "console",
)}
>
{overlayUrl ? (
<div
className="click-capture"
onClick={() => clickSidebarUrl(mainFrameUrl)}
/>
) : null}
<LicenseWarning />
{getMainContent(mainFrameUrl)}
</div>
</>
);
>>>>>>>
const { clickSidebarUrl, mainFrameUrl, overlayUrl } = this.props;
const getMainContent = mainFrameUrl => {
switch (mainFrameUrl) {
case "":
return (
<QueryView
handleRunQuery={this.handleRunQuery}
onSelectQuery={this.handleSelectQuery}
onSetQuery={this.handleSetQuery}
/>
);
case "acl":
return <AclPage />;
case "backups":
return <BackupsView />;
case "cluster":
return <ClusterPage />;
case "connection":
return <ServerConnectionModal />;
case "schema":
return (
<Schema
onOpenGeneratedQuery={this.handleExternalQuery}
/>
);
default:
return <div>Unknown main frame URL: {mainFrameUrl}</div>;
}
};
return (
<>
<Sidebar
currentMenu={overlayUrl || mainFrameUrl}
currentOverlay={this.getOverlayContent(overlayUrl)}
onToggleMenu={this.props.clickSidebarUrl}
/>
<div
className={classnames(
"main-content",
mainFrameUrl || "console",
)}
>
{overlayUrl ? (
<div
className="click-capture"
onClick={() => clickSidebarUrl(mainFrameUrl)}
/>
) : null}
<LicenseWarning />
{getMainContent(mainFrameUrl)}
</div>
</>
); |
<<<<<<<
this.adapters = {
"TK103":'./adapters/tk103'
};
=======
this.server = false;
this.available_adapters = {
"TK103":'./adapters/tk103'
};
>>>>>>>
this.server = false;
this.available_adapters = {
"TK103":'./adapters/tk103'
};
<<<<<<<
=======
/****************************
SOME FUNCTIONS
*****************************/
/* */
this.set_adapter = function(adapter){
if(typeof(adapter.adapter) != "function")
throw "The adapter needs an adpater() method to start an instance of it";
this.device_adapter = adapter;
}
this.get_adapter = function(){
return this.device_adapter;
}
this.getCollection = function(collection_name){
return this_server.collections[collection_name];
}
this.addAdaptar = function(model,Obj){
this.available_adapters.push(model);
}
>>>>>>>
/****************************
SOME FUNCTIONS
*****************************/
/* */
this.setAdapter = function(adapter){
if(typeof(adapter.adapter) != "function")
throw "The adapter needs an adpater() method to start an instance of it";
this.device_adapter = adapter;
}
this.getAdapter = function(){
return this.device_adapter;
}
this.getCollection = function(collection_name){
return this_server.collections[collection_name];
}
this.addAdaptar = function(model,Obj){
this.available_adapters.push(model);
}
<<<<<<<
//Init varibles
this_server.setDebug(this.opts.debug);
=======
/*****************************
DEVICE ADAPTER INITIALIZATION
******************************/
if(this_server.opts.device_adapter == false)throw "The app don't set the device_adapter to use. Which model is sending data to this server?"
if(typeof(this_server.opts.device_adapter) == "string"){
//Check if the selected model has an available adapter registered
if(typeof(this.available_adapters[this.opts.device_model]) == "undefined")
throw "The class adapter for "+this.opts.device_model+" doesn't exists";
//Get the adapter
var adapter_file = (this.available_adapters[this.opts.device_model]);
this.set_adapter(require(adapter_file));
}else{
//IF THE APP PASS THE ADEPTER DIRECTLY
this_server.set_adapter(this.opts.device_adapter);
}
/*****************************
MONGODB INIT
*****************************/
>>>>>>>
//Set debug
this_server.setDebug(this.opts.debug);
/*****************************
DEVICE ADAPTER INITIALIZATION
******************************/
if(this_server.opts.device_adapter == false)throw "The app don't set the device_adapter to use. Which model is sending data to this server?"
if(typeof(this_server.opts.device_adapter) == "string"){
//Check if the selected model has an available adapter registered
if(typeof(this.available_adapters[this.opts.device_adapter]) == "undefined")
throw "The class adapter for "+this.opts.device_adapter+" doesn't exists";
//Get the adapter
var adapter_file = (this.available_adapters[this.opts.device_adapter]);
this.setAdapter(require(adapter_file));
}else{
//IF THE APP PASS THE ADEPTER DIRECTLY
this_server.setAdapter(this.opts.device_adapter);
}
/*****************************
MONGODB INIT
*****************************/
<<<<<<<
=======
/* Search a device by ID */
this.find_device = function(device_id){
for(var i in this.devices){
var dev = this.devices[i].device;
if(dev.uid == device_id)return dev;
}
return false;
}
/* SEND A MESSAGE TO DEVICE ID X */
this.send_to = function(device_id,msg){
var dev = this.find_device(device_id);
dev.send(msg);
}
>>>>>>>
/* Search a device by ID */
this.find_device = function(device_id){
for(var i in this.devices){
var dev = this.devices[i].device;
if(dev.uid == device_id)return dev;
}
return false;
}
/* SEND A MESSAGE TO DEVICE ID X */
this.send_to = function(device_id,msg){
var dev = this.find_device(device_id);
dev.send(msg);
}
<<<<<<<
function Device(model,adapter,connection,server){
=======
/**************************************************************
**************************************************************
THE DEVICE CLASS
**************************************************************
**************************************************************/
function Device(adapter,connection,gps_server){
>>>>>>>
/*************************************************************
THE DEVICE CLASS
**************************************************************/
function Device(adapter,connection,gps_server){
<<<<<<<
var this_device = this;
this.connection = connection;
this.server = server;
this.model_name = model;
this.adapter = require(adapter).adapter(this);
=======
var this_device = this;
this.connection = connection;
this.gps_server = gps_server;
this.adapter = adapter.adapter(this);
>>>>>>>
var this_device = this;
this.connection = connection;
this.server = gps_server;
this.adapter = adapter.adapter(this);
<<<<<<<
if(this.getUID() == false && typeof(msg_parts.device_id) == "undefined")
throw "The adapter doesn't return the device_id and is not defined";
=======
if(msg_parts == false){ //something bad happened
do_log("The message ("+data+") can't be parsed. Discarding...");
return;
}
if(this.uid == false && typeof(msg_parts.device_id) == "undefined")
throw "The adapter doesn't return the device_id and is not yet defined";
>>>>>>>
if(this.getUID() == false && typeof(msg_parts.device_id) == "undefined"){
throw "The adapter doesn't return the device_id and is not defined";
}
if(msg_parts == false){ //something bad happened
this_device.do_log("The message ("+data+") can't be parsed. Discarding...");
return;
}
<<<<<<<
this_device.emit("login_request",this.getUID(),msg_parts);
=======
do_log("Device "+this_device.uid+" has requested to be loged.");
this_device.emit("login_request",this.uid,msg_parts);
>>>>>>>
this_device.do_log("I'm requesting to be loged.");
this_device.emit("login_request",this.getUID(),msg_parts); |
<<<<<<<
var $, Analyze, Blender, Calculate, Caman, CamanParser, Canvas, Convert, Event, Fiber, Filter, IO, Image, Layer, Log, Logger, Module, PixelInfo, Plugin, Renderer, Root, Store, Util, fs, moduleKeywords, slice,
=======
var $, Analyze, Blender, Calculate, Caman, CamanParser, Canvas, Convert, Event, Fiber, Filter, IO, Image, Layer, Log, Logger, Pixel, Plugin, Renderer, Root, Store, Util, fs, slice,
__hasProp = {}.hasOwnProperty,
>>>>>>>
var $, Analyze, Blender, Calculate, Caman, CamanParser, Canvas, Convert, Event, Fiber, Filter, IO, Image, Layer, Log, Logger, Module, Pixel, Plugin, Renderer, Root, Store, Util, fs, moduleKeywords, slice, |
<<<<<<<
var $, Analyze, Blender, Calculate, Caman, CamanParser, Canvas, Convert, Event, Fiber, Filter, IO, Image, Layer, Log, Logger, Module, PixelInfo, Plugin, Renderer, Root, Store, Util, fs, moduleKeywords, slice, vignetteFilters,
=======
var $, Analyze, Blender, Calculate, Caman, CamanParser, Canvas, Convert, Event, Fiber, Filter, IO, Image, Layer, Log, Logger, Pixel, Plugin, Renderer, Root, Store, Util, fs, slice, vignetteFilters,
__hasProp = {}.hasOwnProperty,
>>>>>>>
var $, Analyze, Blender, Calculate, Caman, CamanParser, Canvas, Convert, Event, Fiber, Filter, IO, Image, Layer, Log, Logger, Module, Pixel, Plugin, Renderer, Root, Store, Util, fs, moduleKeywords, slice, vignetteFilters, |
<<<<<<<
value = indexHandler.get(keys, i);
if(value !== null) {
=======
value = keys[i];
if(value) {
>>>>>>>
value = keys[i];
if(value !== null) { |
<<<<<<<
menu.push({
label: i18n.t('mist.applicationMenu.app.label', {app: Settings.appName}),
submenu: [
=======
var fileMenu = [];
if(process.platform === 'darwin') {
fileMenu.push(
>>>>>>>
var fileMenu = [];
if(process.platform === 'darwin') {
fileMenu.push(
<<<<<<<
},
{
label: i18n.t('mist.applicationMenu.app.quit', {app: Settings.appName}),
accelerator: 'CommandOrControl+Q',
click: function(){
app.quit();
}
=======
>>>>>>>
<<<<<<<
log = fs.readFileSync(Settings.userDataPath + '/node.log', {encoding: 'utf8'});
log = '...'+ log.slice(-1000);
=======
shell.showItemInFolder(Settings.userDataPath + '/node.log');
>>>>>>>
shell.showItemInFolder(Settings.userDataPath + '/node.log');
<<<<<<<
label: 'Geth 1.4.10 (Go)',
=======
label: 'Geth 1.4.16 (Go)',
>>>>>>>
label: 'Geth 1.4.16 (Go)',
<<<<<<<
label: 'Eth 1.2.9 (C++) [no hardfork support!]',
/*checked: ethereumNode.isOwnNode && ethereumNode.isEth,
enabled: ethereumNode.isOwnNode,*/
enabled: false,
=======
label: 'Eth 1.3.0 (C++)',
checked: ethereumNode.isOwnNode && ethereumNode.isEth,
enabled: ethereumNode.isOwnNode,
// enabled: false,
>>>>>>>
label: 'Eth 1.3.0 (C++)',
checked: ethereumNode.isOwnNode && ethereumNode.isEth,
enabled: ethereumNode.isOwnNode,
<<<<<<<
// add fork support
devToolsMenu.push({
label: i18n.t('"The DAO" Fork'),
submenu: [
{
label: 'Support DAO Fork',//i18n.t('mist.applicationMenu.develop.mainNetwork'),
checked: ethereumNode.isOwnNode && (ethereumNode.daoFork !== 'false'),
enabled: ethereumNode.isOwnNode && (ethereumNode.daoFork === 'false'),
type: 'checkbox',
click: function(){
restartNode(ethereumNode.type, ethereumNode.network, 'true');
}
},
{
label: 'Don\'t Support DAO Fork',
checked: ethereumNode.isOwnNode && (ethereumNode.daoFork === 'false'),
enabled: ethereumNode.isOwnNode && (ethereumNode.daoFork !== 'false'),
type: 'checkbox',
click: function(){
restartNode(ethereumNode.type, ethereumNode.network, 'false');
}
}
]});
=======
>>>>>>> |
<<<<<<<
export { default as summedAreaTable } from './summed_area_table';
export { default as adaptiveThreshold } from './adaptive_threshold';
=======
export { default as upsample } from './upsample';
export { default as summedAreaTable } from './summed_area_table';
>>>>>>>
export { default as upsample } from './upsample';
export { default as summedAreaTable } from './summed_area_table';
export { default as adaptiveThreshold } from './adaptive_threshold'; |
<<<<<<<
spdy = require('spdy'),
=======
ipaddr = require('ipaddr.js'),
>>>>>>>
spdy = require('spdy'),
ipaddr = require('ipaddr.js'), |
<<<<<<<
// If not a valid channel name, display a warning
if (!that.isChannelName(channel_name)) {
that.panels.server.addMsg('', styleText('client_models_network_channel_invalid_name', {'%T': translateText('client_models_network_channel_invalid_name'), '%C': channel_name}));
_kiwi.app.message.text(channel_name + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_invalid_name').fetch(), {timeout: 5000});
return;
=======
// Add channel_prefix in front of the first channel if missing
if (that.get('channel_prefix').indexOf(channel_name[0]) === -1) {
// Could be many prefixes but '#' is highly likely the required one
channel_name = '#' + channel_name;
>>>>>>>
// If not a valid channel name, display a warning
if (!that.isChannelName(channel_name)) {
that.panels.server.addMsg('', styleText('client_models_network_channel_invalid_name', {'%T': translateText('client_models_network_channel_invalid_name'), '%C': channel_name}));
_kiwi.app.message.text(channel_name + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_invalid_name').fetch(), {timeout: 5000});
return;
// Add channel_prefix in front of the first channel if missing
if (that.get('channel_prefix').indexOf(channel_name[0]) === -1) {
// Could be many prefixes but '#' is highly likely the required one
channel_name = '#' + channel_name;
<<<<<<<
// Show this notice to the active panel if it didn't have a set target
if (!event.from_server && panel === this.panels.server && _kiwi.app.panels().active !== this.panels.server)
_kiwi.app.panels().active.addMsg('[' + (event.nick||'') + ']', styleText('notice', {'%T': event.msg}), 'notice', {time: event.time});
=======
// Show this notice to the active panel if it didn't have a set target, but only in an active channel or query window
active_panel = _kiwi.app.panels().active;
if (!event.from_server && panel === this.panels.server && active_panel !== this.panels.server) {
if (active_panel.isChannel() || active_panel.isQuery())
active_panel.addMsg('[' + (event.nick||'') + ']', event.msg, 'notice', {time: event.time});
}
>>>>>>>
// Show this notice to the active panel if it didn't have a set target, but only in an active channel or query window
active_panel = _kiwi.app.panels().active;
if (!event.from_server && panel === this.panels.server && active_panel !== this.panels.server) {
if (active_panel.isChannel() || active_panel.isQuery())
_kiwi.app.panels().active.addMsg('[' + (event.nick||'') + ']', styleText('notice', {'%T': event.msg}), 'notice', {time: event.time});
}
<<<<<<<
if (event.trailing)
display_params.push(event.trailing);
this.panels.server.addMsg('', styleText('unknown_command', {'%T': '[' + event.command + '] ' + display_params.join(', ', '')}));
=======
this.panels.server.addMsg('', '[' + event.command + '] ' + display_params.join(', ', ''));
>>>>>>>
this.panels.server.addMsg('', styleText('unknown_command', {'%T': '[' + event.command + '] ' + display_params.join(', ', '')})); |
<<<<<<<
start: function (opts, callback) {
var continueStart, locale, igniteTextTheme, text_theme;
=======
init: function (opts, callback) {
var continueStart, locale;
>>>>>>>
init: function (opts, callback) {
var continueStart, locale, igniteTextTheme, text_theme;
<<<<<<<
text_theme = opts.text_theme;
if (!text_theme) {
$.getJSON(opts.base_path + '/assets/text_themes/default.json', igniteTextTheme);
} else {
$.getJSON(opts.base_path + '/assets/text_themes/' + text_theme + '.json', igniteTextTheme);
}
=======
},
start: function() {
_kiwi.app.showStartup();
},
// Allow plugins to change the startup applet
registerStartupApplet: function(startup_applet_name) {
_kiwi.app.startup_applet_name = startup_applet_name;
>>>>>>>
text_theme = opts.text_theme;
if (!text_theme) {
$.getJSON(opts.base_path + '/assets/text_themes/default.json', igniteTextTheme);
} else {
$.getJSON(opts.base_path + '/assets/text_themes/' + text_theme + '.json', igniteTextTheme);
}
},
start: function() {
_kiwi.app.showStartup();
},
// Allow plugins to change the startup applet
registerStartupApplet: function(startup_applet_name) {
_kiwi.app.startup_applet_name = startup_applet_name; |
<<<<<<<
mainWindow.navigate('Snippets')
setTimeout(() => {
mainWindow.ctx.show()
app.dock.show()
}, 500)
=======
mainWindow.show('Snippets')
>>>>>>>
mainWindow.show('Snippets')
app.dock.show()
<<<<<<<
mainWindow.navigate('Preferences')
setTimeout(() => {
mainWindow.ctx.show()
app.dock.show()
}, 500)
=======
mainWindow.show('Preferences')
>>>>>>>
mainWindow.show('Preferences')
app.dock.show() |
<<<<<<<
var CurrentParameters, CurrentPath, CurrentTargetPath, Finch, NodeType, NullPath, ParameterObservable, RootNode, RouteNode, RoutePath, RouteSettings, addRoute, arraysEqual, contains, endsWith, extend, findNearestCommonAncestor, findPath, getChildRouteString, getComponentName, getComponentType, getParentRouteString, isArray, isFunction, isNumber, isObject, isString, objectsEqual, parseQueryString, peek, resetGlobals, splitRouteString, startsWith, step, stepSetup, stepTeardown, trim, trimSlashes,
__slice = Array.prototype.slice;
=======
var Finch, NodeType, NullPath, RouteNode, RoutePath, RouteSettings, addRoute, arraysEqual, contains, currentHash, currentParameters, currentPath, currentTargetPath, endsWith, extend, findNearestCommonAncestor, findPath, getChildRouteString, getComponentName, getComponentType, getParentRouteString, hashChange, hashInterval, hashListening, isArray, isFunction, isNumber, isObject, isString, objectsEqual, parseQueryString, resetGlobals, rootNode, splitRouteString, startsWith, step, trim, trimSlashes;
>>>>>>>
var CurrentParameters, CurrentPath, CurrentTargetPath, Finch, NodeType, NullPath, ParameterObservable, RootNode, RouteNode, RoutePath, RouteSettings, addRoute, arraysEqual, contains, currentHash, endsWith, extend, findNearestCommonAncestor, findPath, getChildRouteString, getComponentName, getComponentType, getParentRouteString, hashChange, hashInterval, hashListening, isArray, isFunction, isNumber, isObject, isString, objectsEqual, parseQueryString, peek, resetGlobals, splitRouteString, startsWith, step, stepSetup, stepTeardown, trim, trimSlashes,
__slice = Array.prototype.slice;
<<<<<<<
=======
rootNode = currentPath = currentParameters = currentTargetPath = null;
hashInterval = currentHash = null;
hashListening = false;
(resetGlobals = function() {
rootNode = new RouteNode({
name: "*"
});
currentPath = NullPath;
currentParameters = {};
return currentTargetPath = null;
})();
>>>>>>>
hashInterval = currentHash = null;
hashListening = false;
<<<<<<<
# Method: Finch.observe
# Used to set up observers on the query string.
#
# Form 1:
# Arguments:
# keys - An array of param keys
# callback(keys...) - A callback function to execute with the values bound to each key in order.
#
# Form 2:
# Arguments:
# callback(params) - A callback function to execute with a params accessor.
*/
observe: function() {
var args, callback, keys, observable;
args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
if (args.length === 2) {
keys = args[0], callback = args[1];
if (!isArray(keys)) keys = [];
if (!isFunction(callback)) callback = (function() {});
return Finch.observe(function(params) {
var key, values;
values = (function() {
var _i, _len, _results;
_results = [];
for (_i = 0, _len = keys.length; _i < _len; _i++) {
key = keys[_i];
_results.push(params(key));
}
return _results;
})();
return callback.apply(null, values);
});
}
callback = args[0];
if (!isFunction(callback)) callback = (function() {});
observable = new ParameterObservable(callback);
return peek(CurrentPath.parameterObservables).push(observable);
},
/*
=======
# Method: Finch.listen
# Used to listen to changes in the window hash, will respond with Finch.call
#
# Returns:
# boolean - Is Finch listening?
*/
listen: function() {
if (!hashListening) {
if ("onhashchange" in window) {
if (isFunction(window.addEventListener)) {
window.addEventListener("hashchange", hashChange, true);
hashListening = true;
} else if (isFunction(window.attachEvent)) {
window.attachEvent("hashchange", hashChange);
hashListening = true;
}
} else {
hashInterval = setInterval(hashChange, 33);
hashListening = true;
}
hashChange();
}
return hashListening;
},
/*
# Method: Finch.ignore
# Used to stop listening to changes in the hash
#
# Returns:
# boolean - Is Finch done listening?
*/
ignore: function() {
if (hashListening) {
if (hashInterval !== null) {
clearInterval(hashInterval);
hashInterval = null;
hashListening = false;
} else if ("onhashchange" in window) {
if (isFunction(window.removeEventListener)) {
window.removeEventListener("hashchange", hashChange, true);
hashListening = false;
} else if (isFunction(window.detachEvent)) {
window.detachEvent("hashchange", hashChange);
hashListening = false;
}
}
}
return !hashListening;
},
/*
>>>>>>>
# Method: Finch.observe
# Used to set up observers on the query string.
#
# Form 1:
# Arguments:
# keys - An array of param keys
# callback(keys...) - A callback function to execute with the values bound to each key in order.
#
# Form 2:
# Arguments:
# callback(params) - A callback function to execute with a params accessor.
*/
observe: function() {
var args, callback, keys, observable;
args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
if (args.length === 2) {
keys = args[0], callback = args[1];
if (!isArray(keys)) keys = [];
if (!isFunction(callback)) callback = (function() {});
return Finch.observe(function(params) {
var key, values;
values = (function() {
var _i, _len, _results;
_results = [];
for (_i = 0, _len = keys.length; _i < _len; _i++) {
key = keys[_i];
_results.push(params(key));
}
return _results;
})();
return callback.apply(null, values);
});
}
callback = args[0];
if (!isFunction(callback)) callback = (function() {});
observable = new ParameterObservable(callback);
return peek(CurrentPath.parameterObservables).push(observable);
},
/*
# Method: Finch.listen
# Used to listen to changes in the window hash, will respond with Finch.call
#
# Returns:
# boolean - Is Finch listening?
*/
listen: function() {
if (!hashListening) {
if ("onhashchange" in window) {
if (isFunction(window.addEventListener)) {
window.addEventListener("hashchange", hashChange, true);
hashListening = true;
} else if (isFunction(window.attachEvent)) {
window.attachEvent("hashchange", hashChange);
hashListening = true;
}
} else {
hashInterval = setInterval(hashChange, 33);
hashListening = true;
}
hashChange();
}
return hashListening;
},
/*
# Method: Finch.ignore
# Used to stop listening to changes in the hash
#
# Returns:
# boolean - Is Finch done listening?
*/
ignore: function() {
if (hashListening) {
if (hashInterval !== null) {
clearInterval(hashInterval);
hashInterval = null;
hashListening = false;
} else if ("onhashchange" in window) {
if (isFunction(window.removeEventListener)) {
window.removeEventListener("hashchange", hashChange, true);
hashListening = false;
} else if (isFunction(window.detachEvent)) {
window.detachEvent("hashchange", hashChange);
hashListening = false;
}
}
}
return !hashListening;
},
/* |
<<<<<<<
Version 0.3.6
=======
Version 0.4.0
>>>>>>>
Version 0.4.0
<<<<<<<
test("Route finding backtracking 1", sinon.test(function() {
var bar, baz, foo, var1, var2, var3;
Finch.route("/foo", foo = this.stub());
Finch.route("[/foo]/bar", bar = this.stub());
Finch.route("[/foo/bar]/baz", baz = this.stub());
Finch.route("/:var1", var1 = this.stub());
Finch.route("[/:var1/]:var2", var2 = this.stub());
Finch.route("[/:var1/:var2]/:var3", var3 = this.stub());
Finch.call("/foo/nope");
calledOnce(var1, "var1 called once");
lastCalledWithExactly(var1, [
{
var1: "foo"
}
], "var1 called with binding for var1");
calledOnce(var2, "var2 called once");
lastCalledWithExactly(var2, [
{
var1: "foo",
var2: "nope"
}
], "var2 called with bindings for var1 and var2");
return neverCalled(foo, "foo never called");
}));
test("Route finding backtracking 2", sinon.test(function() {
var bar, baz, foo, var1, var2, var3;
Finch.route("/foo", foo = this.stub());
Finch.route("[/foo]/bar", bar = this.stub());
Finch.route("[/foo/bar]/baz", baz = this.stub());
Finch.route("/:var1", var1 = this.stub());
Finch.route("[/:var1/]:var2", var2 = this.stub());
Finch.route("[/:var1/:var2]/:var3", var3 = this.stub());
Finch.call("/foo/bar/nope");
calledOnce(var1, "var1 called once");
lastCalledWithExactly(var1, [
{
var1: "foo"
}
], "var1 called with binding for var1");
calledOnce(var2, "var2 called once");
lastCalledWithExactly(var2, [
{
var1: "foo",
var2: "bar"
}
], "var2 called with bindings for var1 and var2");
calledOnce(var3, "var3 called once");
lastCalledWithExactly(var3, [
{
var1: "foo",
var2: "bar",
var3: "nope"
}
], "var3 called with bindings for var1, var2 and var3");
neverCalled(foo, "foo never called");
return neverCalled(bar, "bar never called");
}));
=======
test("Finch.abort", sinon.test(function() {
var fooStub, homeStub;
homeStub = this.stub();
fooStub = this.stub();
Finch.route("/home", function(bindings, continuation) {
return homeStub();
});
Finch.route("/foo", function(bindings, continuation) {
return fooStub();
});
Finch.call("home");
equal(homeStub.callCount, 1, "Home called correctly");
equal(fooStub.callCount, 0, "Foo not called");
homeStub.reset();
fooStub.reset();
Finch.call("foo");
equal(homeStub.callCount, 0, "Home not called");
equal(fooStub.callCount, 0, "Foo not called");
homeStub.reset();
fooStub.reset();
Finch.abort();
Finch.call("foo");
equal(homeStub.callCount, 0, "Home not called");
return equal(fooStub.callCount, 1, "Foo called correctly");
}));
>>>>>>>
test("Finch.abort", sinon.test(function() {
var fooStub, homeStub;
homeStub = this.stub();
fooStub = this.stub();
Finch.route("/home", function(bindings, continuation) {
return homeStub();
});
Finch.route("/foo", function(bindings, continuation) {
return fooStub();
});
Finch.call("home");
equal(homeStub.callCount, 1, "Home called correctly");
equal(fooStub.callCount, 0, "Foo not called");
homeStub.reset();
fooStub.reset();
Finch.call("foo");
equal(homeStub.callCount, 0, "Home not called");
equal(fooStub.callCount, 0, "Foo not called");
homeStub.reset();
fooStub.reset();
Finch.abort();
Finch.call("foo");
equal(homeStub.callCount, 0, "Home not called");
return equal(fooStub.callCount, 1, "Foo called correctly");
}));
test("Route finding backtracking 1", sinon.test(function() {
var bar, baz, foo, var1, var2, var3;
Finch.route("/foo", foo = this.stub());
Finch.route("[/foo]/bar", bar = this.stub());
Finch.route("[/foo/bar]/baz", baz = this.stub());
Finch.route("/:var1", var1 = this.stub());
Finch.route("[/:var1/]:var2", var2 = this.stub());
Finch.route("[/:var1/:var2]/:var3", var3 = this.stub());
Finch.call("/foo/nope");
calledOnce(var1, "var1 called once");
lastCalledWithExactly(var1, [
{
var1: "foo"
}
], "var1 called with binding for var1");
calledOnce(var2, "var2 called once");
lastCalledWithExactly(var2, [
{
var1: "foo",
var2: "nope"
}
], "var2 called with bindings for var1 and var2");
return neverCalled(foo, "foo never called");
}));
test("Route finding backtracking 2", sinon.test(function() {
var bar, baz, foo, var1, var2, var3;
Finch.route("/foo", foo = this.stub());
Finch.route("[/foo]/bar", bar = this.stub());
Finch.route("[/foo/bar]/baz", baz = this.stub());
Finch.route("/:var1", var1 = this.stub());
Finch.route("[/:var1/]:var2", var2 = this.stub());
Finch.route("[/:var1/:var2]/:var3", var3 = this.stub());
Finch.call("/foo/bar/nope");
calledOnce(var1, "var1 called once");
lastCalledWithExactly(var1, [
{
var1: "foo"
}
], "var1 called with binding for var1");
calledOnce(var2, "var2 called once");
lastCalledWithExactly(var2, [
{
var1: "foo",
var2: "bar"
}
], "var2 called with bindings for var1 and var2");
calledOnce(var3, "var3 called once");
lastCalledWithExactly(var3, [
{
var1: "foo",
var2: "bar",
var3: "nope"
}
], "var3 called with bindings for var1, var2 and var3");
neverCalled(foo, "foo never called");
return neverCalled(bar, "bar never called");
})); |
<<<<<<<
var args = [f.dest, '--stdin'].concat(dargs(options));
=======
var bundleExec = options.bundleExec;
if (bundleExec) {
delete options.bundleExec;
}
var args = [f.dest, '--stdin'].concat(helpers.optsToArgs(options));
>>>>>>>
var bundleExec = options.bundleExec;
if (bundleExec) {
delete options.bundleExec;
}
var args = [f.dest, '--stdin'].concat(dargs(options)); |
<<<<<<<
/*global safeLauncher:false, $:false; alert:false */
safeLauncher.controller('AuthController', [ '$scope', '$state', 'AuthFactory',
function($scope, $state, Auth) {
=======
/**
* Auth Controller
* @param Auth - Auth factory dependency
*/
window.safeLauncher.controller('AuthController', [ '$scope', 'AuthFactory',
function($scope, Auth) {
var REGISTER_TAB_INIT_POS = 1;
var REGISTER_TAB_COUNT = 3;
var USER_PASSWORD_MIN_LENGTH = 6;
var USER_PIN_MIN_LENGTH = 4;
>>>>>>>
/**
* Auth Controller
* @param Auth - Auth factory dependency
*/
window.safeLauncher.controller('AuthController', [ '$scope', 'AuthFactory',
function($scope, $state, Auth) {
var REGISTER_TAB_INIT_POS = 1;
var REGISTER_TAB_COUNT = 3;
var USER_PASSWORD_MIN_LENGTH = 6;
var USER_PIN_MIN_LENGTH = 4; |
<<<<<<<
this.arc = d3.svg.arc()
.outerRadius(radius)
=======
this.arc = d3.arc()
.outerRadius(radius - (padding/2))
>>>>>>>
this.arc = d3.svg.arc()
.outerRadius(radius - (padding/2)) |
<<<<<<<
/**
* Provide options for backwards compatible support
* @type {{camelCase: boolean}}
* @private
*/
this._options = Object.assign({}, {
camelCase: true
}, options)
=======
/**
* Map of component groups to group keys.
* @private
*/
this._groupKeyMap = new WeakMap()
>>>>>>>
/**
* Map of component groups to group keys.
* @private
*/
this._groupKeyMap = new WeakMap()
/**
* Provide options for backwards compatible support
* @type {{camelCase: boolean}}
* @private
*/
this._options = Object.assign({}, {
camelCase: true
}, options)
<<<<<<<
var cName = componentPropertyName(Component, this._options.camelCase)
entity[cName] = new Component(entity)
=======
var cName = componentPropertyName(Component)
args = args || []
entity[cName] = new Component(entity, ...args)
>>>>>>>
var cName = componentPropertyName(Component, this._options.camelCase)
args = args || []
entity[cName] = new Component(entity, ...args) |
<<<<<<<
ide.projetName || localize('Untitled') + ' ' + localize('script pic')
=======
(ide.projetName || localize('untitled')) + ' ' + localize('script pic')
>>>>>>>
(ide.projetName || localize('untitled')) + ' ' + localize('script pic')
<<<<<<<
ide.projetName || localize('Untitled') + ' ' +
localize('script pic')
=======
(ide.projetName || localize('untitled')) + ' ' +
localize('script pic'),
false // request new window
>>>>>>>
(ide.projetName || localize('untitled')) + ' ' +
localize('script pic')
<<<<<<<
ide.projetName || localize('Untitled') + ' ' +
localize('script pic')
=======
(ide.projetName || localize('untitled')) + ' ' +
localize('script pic'),
false // request new window
>>>>>>>
(ide.projetName || localize('untitled')) + ' ' +
localize('script pic')
<<<<<<<
ide.projetName || localize('Untitled') + ' ' +
localize('comment pic')
=======
(ide.projetName || localize('untitled')) + ' ' +
localize('comment pic'),
false // request new window
>>>>>>>
(ide.projetName || localize('untitled')) + ' ' +
localize('comment pic') |
<<<<<<<
// Entirely Unicode Compliant Line Splitting (Platform independent)
// http://www.unicode.org/reports/tr18/#Line_Boundaries
del = /\r\n|[\n\v\f\r\x85\u2028\u2029]/;
=======
del = '\r?\n';
>>>>>>>
// Unicode Compliant Line Splitting (Platform independent)
// http://www.unicode.org/reports/tr18/#Line_Boundaries
del = /\r\n|[\n\v\f\r\x85\u2028\u2029]/; |
<<<<<<<
var AtNode = require('./at');
var SliceNode = require('./slice');
=======
var CaseNode = require('./case');
>>>>>>>
var CaseNode = require('./case');
var AtNode = require('./at');
var SliceNode = require('./slice'); |
<<<<<<<
//= require jstree.min
=======
//= require jquery.zclip.min
>>>>>>>
//= require jstree.min
//= require jquery.zclip.min |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.