conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
/* jshint maxdepth:7*/
=======
// # can.compute
//
// `can.compute` allows creation of observable values
// from the result of a funciton. Any time an observable
// value that the function depends on changes, the
// function automatically updates. This enables creating
// observable data that relies on other sources, potentially
// multiple different ones. For instance, a `can.compute` is
// able to:
// - Combine a first and last name into a full name and update when either changes
// - Calculate the absolute value of an observable number, updating any time the observable number does
// - Specify complicated behavior for getting and setting a value, as well as how to handle changes
>>>>>>>
/* jshint maxdepth:7*/
// # can.compute
//
// `can.compute` allows creation of observable values
// from the result of a funciton. Any time an observable
// value that the function depends on changes, the
// function automatically updates. This enables creating
// observable data that relies on other sources, potentially
// multiple different ones. For instance, a `can.compute` is
// able to:
// - Combine a first and last name into a full name and update when either changes
// - Calculate the absolute value of an observable number, updating any time the observable number does
// - Specify complicated behavior for getting and setting a value, as well as how to handle changes
<<<<<<<
//
=======
// ###setupComputeHandlers
//
// Sets up handlers for a compute.
// - compute - the compute to set up handlers for
// - func - the getter/setter function for the compute
// - context - the `this` for the compute
// - setCachedValue - function for setting cached value
//
// Returns an object with `on` and `off` functions.
>>>>>>>
// ###setupComputeHandlers
//
// Sets up handlers for a compute.
// - compute - the compute to set up handlers for
// - func - the getter/setter function for the compute
// - context - the `this` for the compute
// - setCachedValue - function for setting cached value
//
// Returns an object with `on` and `off` functions.
<<<<<<<
=======
// ###Specifying an initial value and a settings object
//
// If `can.compute` is called with an [initial value and optionally a settings object](http://canjs.com/docs/can.compute.html#sig_can_compute_initialValue__settings__),
// a can.compute is created that can optionally specify how to read,
// update, and listen to changes in dependent values. This form of
// can.compute can be used to derive a compute that derives its
// value from any source
>>>>>>>
// ###Specifying an initial value and a settings object
//
// If `can.compute` is called with an [initial value and optionally a settings object](http://canjs.com/docs/can.compute.html#sig_can_compute_initialValue__settings__),
// a can.compute is created that can optionally specify how to read,
// update, and listen to changes in dependent values. This form of
// can.compute can be used to derive a compute that derives its
// value from any source |
<<<<<<<
} else if (range.clientX != null || range.pageX != null || range.left != null) {
this.rangeFromPoint(range)
} else if (range.originalEvent && range.originalEvent.touches && range.originalEvent.touches.length) {
this.rangeFromPoint(range.originalEvent.touches[0])
} else if (range.originalEvent && range.originalEvent.changedTouches && range.originalEvent.changedTouches.length) {
this.rangeFromPoint(range.originalEvent.changedTouches[0])
=======
} else if (range.clientX || range.pageX || range.left) {
this.moveToPoint(range)
>>>>>>>
} else if (range.clientX != null || range.pageX != null || range.left != null) {
this.moveToPoint(range)
} else if (range.originalEvent && range.originalEvent.touches && range.originalEvent.touches.length) {
this.moveToPoint(range.originalEvent.touches[0])
} else if (range.originalEvent && range.originalEvent.changedTouches && range.originalEvent.changedTouches.length) {
this.moveToPoint(range.originalEvent.changedTouches[0])
<<<<<<<
}, supportWhitespace,
isWhitespace = function(el){
if(supportWhitespace == null){
supportWhitespace = 'isElementContentWhitespace' in el;
}
return (supportWhitespace? el.isElementContentWhitespace :
(el.nodeType === 3 && '' == el.data.trim()));
}, within = function(rect, point){
=======
},
// if a point is within a rectangle
within = function(rect, point){
>>>>>>>
},
supportWhitespace,
isWhitespace = function(el){
if(supportWhitespace == null){
supportWhitespace = 'isElementContentWhitespace' in el;
}
return (supportWhitespace? el.isElementContentWhitespace :
(el.nodeType === 3 && '' == el.data.trim()));
},
// if a point is within a rectangle
within = function(rect, point){
<<<<<<<
$("<div id='rect' />").appendTo(document.body)
=======
// support
support.moveToPoint = !!$.Range().range.moveToPoint
>>>>>>>
support.moveToPoint = !!$.Range().range.moveToPoint |
<<<<<<<
import { titleBarHeight } from "../../util/globals";
=======
import ToggleTangle from "./toggle-tangle";
>>>>>>>
import ToggleTangle from "./toggle-tangle";
import { titleBarHeight } from "../../util/globals"; |
<<<<<<<
// can.Y is set as part of the build process
// YUI().use('*') is called for when YUI is statically loaded (like when running tests)
=======
// yui.js
// ---------
// _YUI node list._
// `can.Y` is set as part of the build process.
// `YUI().use('*')` is called for when `YUI` is statically loaded (like when running tests).
>>>>>>>
// ---------
// _YUI node list._
// `can.Y` is set as part of the build process.
// `YUI().use('*')` is called for when `YUI` is statically loaded (like when running tests).
<<<<<<<
// element ... get the wrapped helper
var prepareNodeList = function( nodelist ) {
nodelist.each(function( node, i ) {
=======
// Element -- get the wrapped helper.
var prepareNodeList = function(nodelist) {
nodelist.each(function(node, i) {
>>>>>>>
// Element -- get the wrapped helper.
var prepareNodeList = function( nodelist ) {
nodelist.each(function( node, i ) {
<<<<<<<
// YUI only returns a request if it is asynchronous
if ( request && request.io ) {
=======
// `YUI` only returns a request if it is asynchronous.
if (request && request.io) {
>>>>>>>
// `YUI` only returns a request if it is asynchronous.
if ( request && request.io ) { |
<<<<<<<
test(".model on create and update (#301)", function() {
var MyModel = can.Model({
create: 'POST /todo',
update: 'PUT /todo',
model: function(data) {
return can.Model.model.call(this, data.item);
}
}, {}),
id = 0,
updateTime;
can.fixture('POST /todo', function(original, respondWith, settings) {
id++;
return {
item: can.extend(original.data, {
id: id
})
};
});
can.fixture('PUT /todo', function(original, respondWith, settings) {
updateTime = new Date().getTime();
return {
item: {
updatedAt: updateTime
}
};
});
stop();
MyModel.bind('created', function(ev, created) {
start();
deepEqual(created.attr(), {id: 1, name: 'Dishes'}, '.model works for create');
}).bind('updated', function(ev, updated) {
start();
deepEqual(updated.attr(), {id: 1, name: 'Laundry', updatedAt: updateTime}, '.model works for update');
});
var instance = new MyModel({
name: 'Dishes'
}),
saveD = instance.save();
stop();
saveD.then(function() {
instance.attr('name', 'Laundry').save();
})
});
=======
test("List params uses findAll",function(){
stop()
can.fixture("/things",function(request){
equal(request.data.param,"value","params passed")
return [{
id: 1,
name: "Thing One"
}];
})
var Model = can.Model({
findAll: "/things"
},{});
var items = new Model.List({param: "value"});
items.bind("add",function(ev, items, index){
equal(items[0].name, "Thing One", "items added");
start()
})
})
>>>>>>>
test(".model on create and update (#301)", function() {
var MyModel = can.Model({
create: 'POST /todo',
update: 'PUT /todo',
model: function(data) {
return can.Model.model.call(this, data.item);
}
}, {}),
id = 0,
updateTime;
can.fixture('POST /todo', function(original, respondWith, settings) {
id++;
return {
item: can.extend(original.data, {
id: id
})
};
});
can.fixture('PUT /todo', function(original, respondWith, settings) {
updateTime = new Date().getTime();
return {
item: {
updatedAt: updateTime
}
};
});
stop();
MyModel.bind('created', function(ev, created) {
start();
deepEqual(created.attr(), {id: 1, name: 'Dishes'}, '.model works for create');
}).bind('updated', function(ev, updated) {
start();
deepEqual(updated.attr(), {id: 1, name: 'Laundry', updatedAt: updateTime}, '.model works for update');
});
var instance = new MyModel({
name: 'Dishes'
}),
saveD = instance.save();
stop();
saveD.then(function() {
instance.attr('name', 'Laundry').save();
})
});
test("List params uses findAll",function(){
stop()
can.fixture("/things",function(request){
equal(request.data.param,"value","params passed")
return [{
id: 1,
name: "Thing One"
}];
})
var Model = can.Model({
findAll: "/things"
},{});
var items = new Model.List({param: "value"});
items.bind("add",function(ev, items, index){
equal(items[0].name, "Thing One", "items added");
start()
})
}) |
<<<<<<<
steal("can/model", "can/view/mustache", "can/test", function() {
module("can/view/mustache, rendering",{
setup : function(){
this.animals = ['sloth', 'bear', 'monkey']
if(!this.animals.each){
this.animals.each = function(func){
for(var i =0; i < this.length; i++){
func(this[i])
=======
/* jshint asi:true,multistr:true*/
/*global Mustache*/
(function () {
module("can/view/mustache, rendering", {
setup: function () {
this.animals = ['sloth', 'bear', 'monkey']
if (!this.animals.each) {
this.animals.each = function (func) {
for (var i = 0; i < this.length; i++) {
func(this[i])
}
>>>>>>>
/* jshint asi:true,multistr:true*/
/*global Mustache*/
steal("can/model", "can/view/mustache", "can/test", function() {
module("can/view/mustache, rendering", {
setup: function () {
this.animals = ['sloth', 'bear', 'monkey']
if (!this.animals.each) {
this.animals.each = function (func) {
for (var i = 0; i < this.length; i++) {
func(this[i])
}
<<<<<<<
test("Partials and observes", function() {
var div = document.createElement('div');
var template = can.view.mustache("table","<table><thead><tr>{{#data}}{{{>"+
can.test.path('view/mustache/test/partial.mustache')
+"}}}{{/data}}</tr></thead></table>")
var dom = can.view("table", {
data : new can.Map({
list: ["hi","there"]
})
=======
deepEqual(div.innerHTML, "foo");
>>>>>>>
deepEqual(div.innerHTML, "foo");
<<<<<<<
var div = document.createElement('div');
var template = can.view.mustache('<form>{{#items}}{{^is_done}}<div id="{{title}}"></div>{{/is_done}}{{/items}}</form>')
div.appendChild(template({ items: items }));
=======
test("computes as helper parameters don't get converted", function () {
can.Mustache.registerHelper('computeTest', function (no) {
equal(no(), 5, 'Got computed calue');
ok(no.isComputed, 'no is still a compute')
});
>>>>>>>
test("computes as helper parameters don't get converted", function () {
can.Mustache.registerHelper('computeTest', function (no) {
equal(no(), 5, 'Got computed calue');
ok(no.isComputed, 'no is still a compute')
});
<<<<<<<
div.appendChild(renderer2(plainData));
equal(div.getElementsByTagName('span')[0].innerHTML, "Dishes", 'Array item rendered with DOM container');
equal(div.getElementsByTagName('span')[1].innerHTML, "Forks", 'Array item rendered with DOM container');
div.innerHTML = '';
div.appendChild(renderer2(liveData));
equal(div.getElementsByTagName('span')[0].innerHTML, "Dishes", 'List item rendered with DOM container');
equal(div.getElementsByTagName('span')[1].innerHTML, "Forks", 'List item rendered with DOM container');
div.innerHTML = '';
div.appendChild(renderer(plainData));
equal(div.innerHTML, "DishesForks", 'Array item rendered without DOM container');
div.innerHTML = '';
div.appendChild(renderer(liveData));
equal(div.innerHTML, "DishesForks", 'List item rendered without DOM container');
liveData.todos.push({ id: 3, name: 'Knives' });
equal(div.innerHTML, "DishesForksKnives", 'New list item rendered without DOM container');
});
=======
liveData.todos.push({
id: 3,
name: 'Knives'
});
equal(div.innerHTML, "DishesForksKnives", 'New list item rendered without DOM container');
});
>>>>>>>
liveData.todos.push({
id: 3,
name: 'Knives'
});
equal(div.innerHTML, "DishesForksKnives", 'New list item rendered without DOM container');
});
<<<<<<<
var div = document.createElement('div'),
u = new can.Map({name: "Justin"});
div.appendChild(renderer({
user: u
}));
=======
var div = document.createElement('div'),
u = new can.Map({
name: "Justin"
});
>>>>>>>
var div = document.createElement('div'),
u = new can.Map({
name: "Justin"
});
<<<<<<<
input.value = "Austin";
input.onchange();
equal(u.attr('name'), "Austin", "Name changed by input field" );
val.teardown();
=======
equal(input.value, "Eli", "Changing observe updates value");
>>>>>>>
equal(input.value, "Eli", "Changing observe updates value");
<<<<<<<
test("a compute gets passed to a plugin",function(){
can.Mustache.registerHelper('iamhungryforcomputes', function(value){
ok(value.isComputed,"value is a compute")
return function(el){
}
=======
var frag = renderer({
animals: animals
});
div.appendChild(frag)
equal(div.getElementsByTagName('div')[0].innerHTML, "Animals:No animals!");
animals.push('sloth');
equal(div.getElementsByTagName('span')
.length, 1, "There is 1 sloth");
animals.pop();
equal(div.getElementsByTagName('div')[0].innerHTML, "Animals:No animals!");
>>>>>>>
var frag = renderer({
animals: animals
});
div.appendChild(frag)
equal(div.getElementsByTagName('div')[0].innerHTML, "Animals:No animals!");
animals.push('sloth');
equal(div.getElementsByTagName('span')
.length, 1, "There is 1 sloth");
animals.pop();
equal(div.getElementsByTagName('div')[0].innerHTML, "Animals:No animals!");
<<<<<<<
var div = document.createElement('div'),
u = new can.Map({name: "Justin"});
div.appendChild(renderer({
userName: u.compute("name")
}));
=======
can.Mustache.registerHelper('iamhungryforcomputes', function (value) {
ok(value.isComputed, "value is a compute")
return function (el) {
>>>>>>>
can.Mustache.registerHelper('iamhungryforcomputes', function (value) {
ok(value.isComputed, "value is a compute")
return function (el) {
<<<<<<<
equal(div.style.width, "5px");
equal(div.style.backgroundColor, "red");
dims.attr("width", 10);
dims.attr('color', 'blue');
=======
var frag = template(map);
var div = document.createElement('div');
>>>>>>>
var frag = template(map);
var div = document.createElement('div');
<<<<<<<
test("incremental updating of #each within an if", function(){
var template = can.view.mustache('{{#if items.length}}<ul>{{#each items}}<li/>{{/each}}</ul>{{/if}}');
var items = new can.List([{},{}]);
var div = document.createElement('div');
div.appendChild(template({items: items}));
var ul = div.getElementsByTagName('ul')[0]
ul.setAttribute("original","yup");
items.push({});
ok(ul === div.getElementsByTagName('ul')[0], "ul is still the same")
});
=======
})
>>>>>>>
})
<<<<<<<
test("can.Mustache.safestring works on live binding (#606)", function(){
var num = can.compute(1)
can.Mustache.registerHelper("safeHelper", function(){
return can.Mustache.safeString(
"<p>"+num()+"</p>"
)
});
var template = can.view.mustache("<div>{{safeHelper}}</div>")
var frag = template();
equal(frag.childNodes[0].childNodes[0].nodeName.toLowerCase(),"p" , "got a p element");
});
=======
can.Mustache.registerHelper("safeHelper", function () {
>>>>>>>
can.Mustache.registerHelper("safeHelper", function () {
<<<<<<<
var frag = template(map);
var lis = frag.childNodes[0].getElementsByTagName("li");
equal(lis.length, 3, "there are 3 properties of map's data property")
equal("some : test", lis[0].innerHTML)
});
=======
>>>>>>>
<<<<<<<
test("@index in partials loaded from script templates", function(){
// add template as script
var script = document.createElement("script");
script.type= "text/mustache";
script.id = "itempartial";
script.text = "<label></label>"
document.body.appendChild(script)
//can.view.mustache("itempartial","<label></label>")
var itemsTemplate = can.view.mustache(
"<div>"+
"{{#each items}}"+
"{{>itempartial}}"+
"{{/each}}"+
"</div>")
var items = new can.List([{},{}])
var frag = itemsTemplate({
items: items
}),
div = frag.childNodes[0],
labels = div.getElementsByTagName("label");
equal(labels.length, 2, "two labels")
items.shift();
equal(labels.length, 1, "first label removed")
})
//!dev-remove-start
if(can.dev) {
test("Logging: Custom tag does not have a registered handler", function() {
var oldlog = can.dev.warn;
can.dev.warn = function(text) {
equal(text, 'can/view/scanner.js: No custom element found for my-tag',
'Got expected message logged.')
}
=======
test("@index in partials loaded from script templates", function () {
>>>>>>>
test("@index in partials loaded from script templates", function () { |
<<<<<<<
test("Model#save should not replace attributes with their default values (#560)", function () {
can.fixture("POST /person.json", function (request, response) {
return {
createdAt: "now"
};
});
var Person = can.Model.extend({
update: 'POST /person.json'
}, {
name: 'Example name'
});
var person = new Person({
id: 5,
name: 'Justin'
}),
personD = person.save();
stop();
personD.then(function (person) {
start();
equal(person.name, "Justin", "Model name attribute value is preserved after save");
});
});
test(".parseModel as function on create and update (#560)", function () {
var MyModel = can.Model.extend({
create: 'POST /todo',
update: 'PUT /todo',
parseModel: function (data) {
return data.item;
}
}, {
aDefault: "foo"
}),
id = 0,
updateTime;
can.fixture('POST /todo', function (original, respondWith, settings) {
id++;
return {
item: can.extend(original.data, {
id: id
})
};
});
can.fixture('PUT /todo', function (original, respondWith, settings) {
updateTime = new Date()
.getTime();
return {
item: {
updatedAt: updateTime
}
};
});
stop();
MyModel.bind('created', function (ev, created) {
start();
deepEqual(created.attr(), {
id: 1,
name: 'Dishes',
aDefault: "bar"
}, '.model works for create');
})
.bind('updated', function (ev, updated) {
start();
deepEqual(updated.attr(), {
id: 1,
name: 'Laundry',
updatedAt: updateTime
}, '.model works for update');
});
var instance = new MyModel({
name: 'Dishes',
aDefault: "bar"
}),
saveD = instance.save();
stop();
saveD.then(function () {
instance.attr('name', 'Laundry');
instance.removeAttr("aDefault");
instance.save();
});
});
test(".parseModel as string on create and update (#560)", function () {
var MyModel = can.Model.extend({
create: 'POST /todo',
update: 'PUT /todo',
parseModel: "item"
}, {
aDefault: "foo"
}),
id = 0,
updateTime;
can.fixture('POST /todo', function (original, respondWith, settings) {
id++;
return {
item: can.extend(original.data, {
id: id
})
};
});
can.fixture('PUT /todo', function (original, respondWith, settings) {
updateTime = new Date()
.getTime();
return {
item: {
updatedAt: updateTime
}
};
});
stop();
MyModel.bind('created', function (ev, created) {
start();
deepEqual(created.attr(), {
id: 1,
name: 'Dishes',
aDefault: "bar"
}, '.model works for create');
})
.bind('updated', function (ev, updated) {
start();
deepEqual(updated.attr(), {
id: 1,
name: 'Laundry',
updatedAt: updateTime
}, '.model works for update');
});
var instance = new MyModel({
name: 'Dishes',
aDefault: "bar"
}),
saveD = instance.save();
stop();
saveD.then(function () {
instance.attr('name', 'Laundry');
instance.removeAttr("aDefault");
instance.save();
});
});
test("parseModels and findAll", function () {
var array = [{
id: 1,
name: "first"
}];
can.fixture("/mymodels", function () {
return array;
});
var MyModel = can.Model.extend({
findAll: "/mymodels",
parseModels: function (raw, xhr) {
// only check this if jQuery because its deferreds can resolve with multiple args
if (window.jQuery) {
ok(xhr, "xhr object provided");
}
equal(array, raw, "got passed raw data");
return {
data: raw,
count: 1000
};
}
}, {});
stop();
MyModel.findAll({}, function (models) {
equal(models.count, 1000);
start();
});
});
test("parseModels and parseModel and findAll", function () {
can.fixture("/mymodels", function () {
return {
myModels: [{
myModel: {
id: 1,
name: "first"
}
}]
};
});
var MyModel = can.Model.extend({
findAll: "/mymodels",
parseModels: "myModels",
parseModel: "myModel"
}, {});
stop();
MyModel.findAll({}, function (models) {
deepEqual(models.attr(), [{
id: 1,
name: "first"
}], "correct models returned");
start();
});
});
})();
=======
});
>>>>>>>
test("Model#save should not replace attributes with their default values (#560)", function () {
can.fixture("POST /person.json", function (request, response) {
return {
createdAt: "now"
};
});
var Person = can.Model.extend({
update: 'POST /person.json'
}, {
name: 'Example name'
});
var person = new Person({
id: 5,
name: 'Justin'
}),
personD = person.save();
stop();
personD.then(function (person) {
start();
equal(person.name, "Justin", "Model name attribute value is preserved after save");
});
});
test(".parseModel as function on create and update (#560)", function () {
var MyModel = can.Model.extend({
create: 'POST /todo',
update: 'PUT /todo',
parseModel: function (data) {
return data.item;
}
}, {
aDefault: "foo"
}),
id = 0,
updateTime;
can.fixture('POST /todo', function (original, respondWith, settings) {
id++;
return {
item: can.extend(original.data, {
id: id
})
};
});
can.fixture('PUT /todo', function (original, respondWith, settings) {
updateTime = new Date()
.getTime();
return {
item: {
updatedAt: updateTime
}
};
});
stop();
MyModel.bind('created', function (ev, created) {
start();
deepEqual(created.attr(), {
id: 1,
name: 'Dishes',
aDefault: "bar"
}, '.model works for create');
})
.bind('updated', function (ev, updated) {
start();
deepEqual(updated.attr(), {
id: 1,
name: 'Laundry',
updatedAt: updateTime
}, '.model works for update');
});
var instance = new MyModel({
name: 'Dishes',
aDefault: "bar"
}),
saveD = instance.save();
stop();
saveD.then(function () {
instance.attr('name', 'Laundry');
instance.removeAttr("aDefault");
instance.save();
});
});
test(".parseModel as string on create and update (#560)", function () {
var MyModel = can.Model.extend({
create: 'POST /todo',
update: 'PUT /todo',
parseModel: "item"
}, {
aDefault: "foo"
}),
id = 0,
updateTime;
can.fixture('POST /todo', function (original, respondWith, settings) {
id++;
return {
item: can.extend(original.data, {
id: id
})
};
});
can.fixture('PUT /todo', function (original, respondWith, settings) {
updateTime = new Date()
.getTime();
return {
item: {
updatedAt: updateTime
}
};
});
stop();
MyModel.bind('created', function (ev, created) {
start();
deepEqual(created.attr(), {
id: 1,
name: 'Dishes',
aDefault: "bar"
}, '.model works for create');
})
.bind('updated', function (ev, updated) {
start();
deepEqual(updated.attr(), {
id: 1,
name: 'Laundry',
updatedAt: updateTime
}, '.model works for update');
});
var instance = new MyModel({
name: 'Dishes',
aDefault: "bar"
}),
saveD = instance.save();
stop();
saveD.then(function () {
instance.attr('name', 'Laundry');
instance.removeAttr("aDefault");
instance.save();
});
});
test("parseModels and findAll", function () {
var array = [{
id: 1,
name: "first"
}];
can.fixture("/mymodels", function () {
return array;
});
var MyModel = can.Model.extend({
findAll: "/mymodels",
parseModels: function (raw, xhr) {
// only check this if jQuery because its deferreds can resolve with multiple args
if (window.jQuery) {
ok(xhr, "xhr object provided");
}
equal(array, raw, "got passed raw data");
return {
data: raw,
count: 1000
};
}
}, {});
stop();
MyModel.findAll({}, function (models) {
equal(models.count, 1000);
start();
});
});
test("parseModels and parseModel and findAll", function () {
can.fixture("/mymodels", function () {
return {
myModels: [{
myModel: {
id: 1,
name: "first"
}
}]
};
});
var MyModel = can.Model.extend({
findAll: "/mymodels",
parseModels: "myModels",
parseModel: "myModel"
}, {});
stop();
MyModel.findAll({}, function (models) {
deepEqual(models.attr(), [{
id: 1,
name: "first"
}], "correct models returned");
start();
});
});
}); |
<<<<<<<
can.isDOM = function(el) {
return (el.ownerDocument || el) === can.global.document;
};
can.childNodes = function(node) {
var childNodes = node.childNodes;
if("length" in childNodes) {
return childNodes;
} else {
var cur = node.firstChild;
var nodes = [];
while(cur) {
nodes.push(cur);
cur = cur.nextSibling;
}
return nodes;
}
};
=======
var protoBind = Function.prototype.bind;
if(protoBind) {
can.proxy = function(fn, context){
return protoBind.call(fn, context);
};
} else {
can.proxy = function (fn, context) {
return function () {
return fn.apply(context, arguments);
};
};
}
>>>>>>>
can.isDOM = function(el) {
return (el.ownerDocument || el) === can.global.document;
};
can.childNodes = function(node) {
var childNodes = node.childNodes;
if("length" in childNodes) {
return childNodes;
} else {
var cur = node.firstChild;
var nodes = [];
while(cur) {
nodes.push(cur);
cur = cur.nextSibling;
}
return nodes;
}
};
var protoBind = Function.prototype.bind;
if(protoBind) {
can.proxy = function(fn, context){
return protoBind.call(fn, context);
};
} else {
can.proxy = function (fn, context) {
return function () {
return fn.apply(context, arguments);
};
};
} |
<<<<<<<
// can.Y is set as part of the build process
// YUI().use('*') is called for when YUI is statically loaded (like when running tests)
=======
// yui.js
// ---------
// _YUI node list._
// `can.Y` is set as part of the build process.
// `YUI().use('*')` is called for when `YUI` is statically loaded (like when running tests).
>>>>>>>
// ---------
// _YUI node list._
// `can.Y` is set as part of the build process.
// `YUI().use('*')` is called for when `YUI` is statically loaded (like when running tests).
<<<<<<<
// element ... get the wrapped helper
var prepareNodeList = function( nodelist ) {
nodelist.each(function( node, i ) {
=======
// Element -- get the wrapped helper.
var prepareNodeList = function(nodelist) {
nodelist.each(function(node, i) {
>>>>>>>
// Element -- get the wrapped helper.
var prepareNodeList = function( nodelist ) {
nodelist.each(function( node, i ) {
<<<<<<<
// YUI only returns a request if it is asynchronous
if ( request && request.io ) {
=======
// `YUI` only returns a request if it is asynchronous.
if (request && request.io) {
>>>>>>>
// `YUI` only returns a request if it is asynchronous.
if ( request && request.io ) { |
<<<<<<<
test("checkboxes with can-value bind properly (#628)", function() {
can.Component({
tag: 'checkbox-value',
template: '<input type="checkbox" can-value="completed"/>'
});
var data = new can.Map({ completed: true }),
frag = can.view.mustache("<checkbox-value></checkbox-value>")(data);
can.append( can.$("#qunit-test-area") , frag );
var input = can.$("#qunit-test-area")[0].getElementsByTagName('input')[0];
equal(input.checked, data.attr('completed'), 'checkbox value bound (via attr check)');
data.attr('completed', false);
equal(input.checked, data.attr('completed'), 'checkbox value bound (via attr uncheck)');
input.checked = true;
can.trigger(input, 'change');
equal(input.checked, true, 'checkbox value bound (via check)');
equal(data.attr('completed'), true, 'checkbox value bound (via check)');
input.checked = false;
can.trigger(input, 'change');
equal(input.checked, false, 'checkbox value bound (via uncheck)');
equal(data.attr('completed'), false, 'checkbox value bound (via uncheck)');
});
test("Scope as Map constructors should follow '@' default values (#657)", function() {
var PanelViewModel = can.Map.extend({
title: "@"
});
can.Component.extend({
tag: "panel",
scope: PanelViewModel
})
var frag = can.view.mustache('<panel title="Libraries">Content</panel>')({ title: "hello" });
can.append( can.$("#qunit-test-area") , frag );
equal(can.scope(can.$("panel")[0]).attr("title"), "Libraries");
});
=======
test("@ keeps properties live now", function(){
can.Component.extend({
tag: "attr-fun",
template: "<h1>{{fullName}}</h1>",
scope: {
firstName: "@",
lastName: "@",
fullName: function(){
return this.attr("firstName")+" "+this.attr("lastName")
}
}
});
var frag = can.view.mustache("<attr-fun first-name='Justin' last-name='Meyer'></attr-fun>")();
var attrFun = frag.childNodes[0];
can.$("#qunit-test-area")[0].appendChild( attrFun );
equal(attrFun.childNodes[0].innerHTML, "Justin Meyer");
can.attr.set(attrFun,"first-name", "Brian")
stop();
setTimeout(function(){
equal(attrFun.childNodes[0].innerHTML, "Brian Meyer");
can.remove( can.$(attrFun) );
start()
},100)
})
>>>>>>>
test("checkboxes with can-value bind properly (#628)", function() {
can.Component({
tag: 'checkbox-value',
template: '<input type="checkbox" can-value="completed"/>'
});
var data = new can.Map({ completed: true }),
frag = can.view.mustache("<checkbox-value></checkbox-value>")(data);
can.append( can.$("#qunit-test-area") , frag );
var input = can.$("#qunit-test-area")[0].getElementsByTagName('input')[0];
equal(input.checked, data.attr('completed'), 'checkbox value bound (via attr check)');
data.attr('completed', false);
equal(input.checked, data.attr('completed'), 'checkbox value bound (via attr uncheck)');
input.checked = true;
can.trigger(input, 'change');
equal(input.checked, true, 'checkbox value bound (via check)');
equal(data.attr('completed'), true, 'checkbox value bound (via check)');
input.checked = false;
can.trigger(input, 'change');
equal(input.checked, false, 'checkbox value bound (via uncheck)');
equal(data.attr('completed'), false, 'checkbox value bound (via uncheck)');
});
test("Scope as Map constructors should follow '@' default values (#657)", function() {
var PanelViewModel = can.Map.extend({
title: "@"
});
can.Component.extend({
tag: "panel",
scope: PanelViewModel
})
var frag = can.view.mustache('<panel title="Libraries">Content</panel>')({ title: "hello" });
can.append( can.$("#qunit-test-area") , frag );
equal(can.scope(can.$("panel")[0]).attr("title"), "Libraries");
});
test("@ keeps properties live now", function(){
can.Component.extend({
tag: "attr-fun",
template: "<h1>{{fullName}}</h1>",
scope: {
firstName: "@",
lastName: "@",
fullName: function(){
return this.attr("firstName")+" "+this.attr("lastName")
}
}
});
var frag = can.view.mustache("<attr-fun first-name='Justin' last-name='Meyer'></attr-fun>")();
var attrFun = frag.childNodes[0];
can.$("#qunit-test-area")[0].appendChild( attrFun );
equal(attrFun.childNodes[0].innerHTML, "Justin Meyer");
can.attr.set(attrFun,"first-name", "Brian")
stop();
setTimeout(function(){
equal(attrFun.childNodes[0].innerHTML, "Brian Meyer");
can.remove( can.$(attrFun) );
start()
},100)
}) |
<<<<<<<
// handle hookup cases
if(status === 0){ // we are in between html tags
// return a span with a hookup function ...
return "<" +(tagMap[tagName] || "span")+" data-view-id='" + $View.hookup(function(el){
// remove child, bind on parent
var parent = el.parentNode,
node = document.createTextNode(input);
parent.insertBefore(node, el);
parent.removeChild(el);
// create textNode
liveBind(observed, parent, function(){
node.nodeValue = func.call(self)
})
}) + "'></" +(tagMap[tagName] || "span")+">";
} else if(status === 1) { // in a tag
=======
var tag = (tagMap[tagName] || "span");
if(status == 0){
return "<" +tag+" data-view-id='" +Can.view.hook(
// are we escaping
escape ?
//
function(el){
// remove child, bind on parent
var parent = el.parentNode,
node = document.createTextNode(input);
parent.insertBefore(node, el);
parent.removeChild(el);
// create textNode
liveBind(observed, parent, function(){
node.nodeValue = func.call(self)
});
}
:
function(span){
// remove child, bind on parent
var makeAndPut = function(val, remove){
// get fragement of html to fragment
var frag = Can.view.frag(val),
// wrap it to keep a reference to the elements ..
nodes = Can.$(Can.map(frag.childNodes,function(node){
return node;
})),
last = remove[remove.length - 1];
// insert it in the document
if( last.nextSibling ){
last.parentNode.insertBefore(frag, last.nextSibling)
} else {
last.parentNode.appendChild(frag)
}
// remove the old content
Can.remove( Can.$(remove) );
//Can.view.hookup(nodes);
return nodes;
},
nodes = makeAndPut(input, [span]);
// listen to changes and update
// make sure the parent does not die
// we might simply check that nodes is still in the document
// before a write ...
liveBind(observed, span.parentNode, function(){
nodes = makeAndPut(func.call(self), nodes);
});
//return parent;
}) + "'></" +tag+">";
} else if(status === 1){ // in a tag
// TODO: handle within a tag <div <%== %>>
return input;
>>>>>>>
var tag = (tagMap[tagName] || "span");
if(status == 0){
return "<" +tag+" data-view-id='" +Can.view.hook(
// are we escaping
escape ?
//
function(el){
// remove child, bind on parent
var parent = el.parentNode,
node = document.createTextNode(input);
parent.insertBefore(node, el);
parent.removeChild(el);
// create textNode
liveBind(observed, parent, function(){
node.nodeValue = func.call(self)
});
}
:
function(span){
// remove child, bind on parent
var makeAndPut = function(val, remove){
// get fragement of html to fragment
var frag = Can.view.frag(val),
// wrap it to keep a reference to the elements ..
nodes = Can.$(Can.map(frag.childNodes,function(node){
return node;
})),
last = remove[remove.length - 1];
// insert it in the document
if( last.nextSibling ){
last.parentNode.insertBefore(frag, last.nextSibling)
} else {
last.parentNode.appendChild(frag)
}
// remove the old content
Can.remove( Can.$(remove) );
//Can.view.hookup(nodes);
return nodes;
},
nodes = makeAndPut(input, [span]);
// listen to changes and update
// make sure the parent does not die
// we might simply check that nodes is still in the document
// before a write ...
liveBind(observed, span.parentNode, function(){
nodes = makeAndPut(func.call(self), nodes);
});
//return parent;
}) + "'></" +tag+">";
} else if(status === 1){ // in a tag
<<<<<<<
var i = 0;
var newAttr = attr.replace(/__!@#\$%__/g, function() {
return hooks[status].funcs[i++].call(self);
=======
var i =0;
var newAttr = attr.replace(/__!!__/g, function() {
return contentEscape( hooks[status].funcs[i++].call(self) );
>>>>>>>
var i =0;
var newAttr = attr.replace(/__!!__/g, function() {
return contentEscape( hooks[status].funcs[i++].call(self) ); |
<<<<<<<
steal("can/view/bindings", "can/map", "can/test", function (special) {
QUnit.module('can/view/bindings', {
=======
steal("can/view/bindings", "can/map", "can/test", "can/view/stache", function (special) {
module('can/view/bindings', {
>>>>>>>
steal("can/view/bindings", "can/map", "can/test", "can/view/stache", function (special) {
QUnit.module('can/view/bindings', { |
<<<<<<<
steal(function(){
module("can/util/object");
test("same", function(){
ok( can.Object.same({type: "FOLDER"},{type: "FOLDER", count: 5}, {
count: null
}), "count ignored" );
ok(can.Object.same({type: "folder"},{type: "FOLDER"}, {
type: "i"
}), "folder case ignored" );
})
test("subsets", function(){
var res1 = can.Object.subsets({parentId: 5, type: "files"},
[{parentId: 6}, {type: "folders"}, {type: "files"}]);
deepEqual(res1,[{type: "files"}])
var res2 = can.Object.subsets({parentId: 5, type: "files"},
[{}, {type: "folders"}, {type: "files"}]);
deepEqual(res2,[{},{type: "files"}]);
var res3 = can.Object.subsets({parentId: 5, type: "folders"},
[{parentId: 5},{type: "files"}]);
deepEqual(res3,[{parentId: 5}])
});
test("subset compare", function(){
ok( can.Object.subset(
{type: "FOLDER"},
{type: "FOLDER"}),
"equal sets" );
ok( can.Object.subset(
{type: "FOLDER", parentId: 5},
{type: "FOLDER"}),
"sub set" );
ok(! can.Object.subset(
{type: "FOLDER"},
{type: "FOLDER", parentId: 5}),
"wrong way" );
ok(! can.Object.subset(
{type: "FOLDER", parentId: 7},
{type: "FOLDER", parentId: 5}),
"different values" );
ok( can.Object.subset(
{type: "FOLDER", count: 5}, // subset
{type: "FOLDER"},
{count: null} ),
"count ignored" );
ok( can.Object.subset(
{type: "FOLDER", kind: "tree"}, // subset
{type: "FOLDER", foo: true, bar: true },
{foo: null, bar: null} ),
"understands a subset" );
ok( can.Object.subset(
{type: "FOLDER", foo: true, bar: true },
{type: "FOLDER", kind: "tree"}, // subset
{foo: null, bar: null, kind : null} ),
"ignores nulls" );
});
test("searchText", function(){
var item = {
=======
(function () {
module('can/util/object');
test('same', function () {
ok(can.Object.same({
type: 'FOLDER'
}, {
type: 'FOLDER',
count: 5
}, {
count: null
}), 'count ignored');
ok(can.Object.same({
type: 'folder'
}, {
type: 'FOLDER'
}, {
type: 'i'
}), 'folder case ignored');
});
test('subsets', function () {
var res1 = can.Object.subsets({
parentId: 5,
type: 'files'
}, [{
parentId: 6
}, {
type: 'folders'
}, {
type: 'files'
}]);
deepEqual(res1, [{
type: 'files'
}]);
var res2 = can.Object.subsets({
parentId: 5,
type: 'files'
}, [{}, {
type: 'folders'
}, {
type: 'files'
}]);
deepEqual(res2, [{}, {
type: 'files'
}]);
var res3 = can.Object.subsets({
parentId: 5,
type: 'folders'
}, [{
parentId: 5
}, {
type: 'files'
}]);
deepEqual(res3, [{
parentId: 5
}]);
});
test('subset compare', function () {
ok(can.Object.subset({
type: 'FOLDER'
}, {
type: 'FOLDER'
}), 'equal sets');
ok(can.Object.subset({
type: 'FOLDER',
parentId: 5
}, {
type: 'FOLDER'
}), 'sub set');
ok(!can.Object.subset({
type: 'FOLDER'
}, {
type: 'FOLDER',
parentId: 5
}), 'wrong way');
ok(!can.Object.subset({
type: 'FOLDER',
parentId: 7
}, {
type: 'FOLDER',
parentId: 5
}), 'different values');
ok(can.Object.subset({
type: 'FOLDER',
count: 5
}, {
type: 'FOLDER'
}, {
count: null
}), 'count ignored');
ok(can.Object.subset({
type: 'FOLDER',
kind: 'tree'
}, {
type: 'FOLDER',
foo: true,
bar: true
}, {
foo: null,
bar: null
}), 'understands a subset');
ok(can.Object.subset({
type: 'FOLDER',
foo: true,
bar: true
}, {
type: 'FOLDER',
kind: 'tree'
}, {
foo: null,
bar: null,
kind: null
}), 'ignores nulls');
});
test('searchText', function () {
var item = {
>>>>>>>
steal('can/util/object', function () {
module('can/util/object');
test('same', function () {
ok(can.Object.same({
type: 'FOLDER'
}, {
type: 'FOLDER',
count: 5
}, {
count: null
}), 'count ignored');
ok(can.Object.same({
type: 'folder'
}, {
type: 'FOLDER'
}, {
type: 'i'
}), 'folder case ignored');
});
test('subsets', function () {
var res1 = can.Object.subsets({
parentId: 5,
type: 'files'
}, [{
parentId: 6
}, {
type: 'folders'
}, {
type: 'files'
}]);
deepEqual(res1, [{
type: 'files'
}]);
var res2 = can.Object.subsets({
parentId: 5,
type: 'files'
}, [{}, {
type: 'folders'
}, {
type: 'files'
}]);
deepEqual(res2, [{}, {
type: 'files'
}]);
var res3 = can.Object.subsets({
parentId: 5,
type: 'folders'
}, [{
parentId: 5
}, {
type: 'files'
}]);
deepEqual(res3, [{
parentId: 5
}]);
});
test('subset compare', function () {
ok(can.Object.subset({
type: 'FOLDER'
}, {
type: 'FOLDER'
}), 'equal sets');
ok(can.Object.subset({
type: 'FOLDER',
parentId: 5
}, {
type: 'FOLDER'
}), 'sub set');
ok(!can.Object.subset({
type: 'FOLDER'
}, {
type: 'FOLDER',
parentId: 5
}), 'wrong way');
ok(!can.Object.subset({
type: 'FOLDER',
parentId: 7
}, {
type: 'FOLDER',
parentId: 5
}), 'different values');
ok(can.Object.subset({
type: 'FOLDER',
count: 5
}, {
type: 'FOLDER'
}, {
count: null
}), 'count ignored');
ok(can.Object.subset({
type: 'FOLDER',
kind: 'tree'
}, {
type: 'FOLDER',
foo: true,
bar: true
}, {
foo: null,
bar: null
}), 'understands a subset');
ok(can.Object.subset({
type: 'FOLDER',
foo: true,
bar: true
}, {
type: 'FOLDER',
kind: 'tree'
}, {
foo: null,
bar: null,
kind: null
}), 'ignores nulls');
});
test('searchText', function () {
var item = {
<<<<<<<
name: "thinger"
},
searchText = {
searchText : "foo"
},
compare = {
searchText : function(items, paramsText, itemr, params){
equal(item,itemr);
equal(searchText, params)
return true;
}
};
ok( can.Object.subset( item, searchText, compare ), "searchText" );
});
});
=======
name: 'thinger'
}, searchText = {
searchText: 'foo'
}, compare = {
searchText: function (items, paramsText, itemr, params) {
equal(item, itemr);
equal(searchText, params);
return true;
}
};
ok(can.Object.subset(item, searchText, compare), 'searchText');
});
}());
>>>>>>>
name: 'thinger'
}, searchText = {
searchText: 'foo'
}, compare = {
searchText: function (items, paramsText, itemr, params) {
equal(item, itemr);
equal(searchText, params);
return true;
}
};
ok(can.Object.subset(item, searchText, compare), 'searchText');
});
}); |
<<<<<<<
test("to virtual dom output", function(){
can.noDOM = true;
var template = can.stache("<h1>{{#test}}<span>{{name}}</span>{{/test}}</h1>");
var res = template({
test: true,
name: "Hello"
});
deepEqual(res, [
{
tag: "h1",
children: [{
tag: "span",
children: ["Hello"]
}]
}
]);
});
=======
test('using #each when toggling between list and null', function() {
var state = new can.Map();
var frag = can.stache('{{#each deepness.rows}}<div></div>{{/each}}')(state);
state.attr('deepness', {
rows: ['test']
});
state.attr('deepness', null);
equal(frag.childNodes.length, 1, "only the placeholder textnode");
});
test('registerSimpleHelper', 3, function() {
var template = can.stache('<div>Result: {{simple first second}}</div>');
can.stache.registerSimpleHelper('simple', function(first, second) {
equal(first, 2);
equal(second, 4);
return first + second;
});
var frag = template(new can.Map({
first: 2,
second: 4
}));
equal(frag.childNodes[0].innerHTML, 'Result: 6');
});
>>>>>>>
test("to virtual dom output", function(){
can.noDOM = true;
var template = can.stache("<h1>{{#test}}<span>{{name}}</span>{{/test}}</h1>");
var res = template({
test: true,
name: "Hello"
});
deepEqual(res, [
{
tag: "h1",
children: [{
tag: "span",
children: ["Hello"]
}]
}
]);
});
test('using #each when toggling between list and null', function() {
var state = new can.Map();
var frag = can.stache('{{#each deepness.rows}}<div></div>{{/each}}')(state);
state.attr('deepness', {
rows: ['test']
});
state.attr('deepness', null);
equal(frag.childNodes.length, 1, "only the placeholder textnode");
});
test('registerSimpleHelper', 3, function() {
var template = can.stache('<div>Result: {{simple first second}}</div>');
can.stache.registerSimpleHelper('simple', function(first, second) {
equal(first, 2);
equal(second, 4);
return first + second;
});
var frag = template(new can.Map({
first: 2,
second: 4
}));
equal(frag.childNodes[0].innerHTML, 'Result: 6');
}); |
<<<<<<<
showDownload: false,
=======
quickdraw: false, // if true, components may skip expensive computes.
>>>>>>>
showDownload: false,
quickdraw: false, // if true, components may skip expensive computes. |
<<<<<<<
export const NODE_NOT_VISIBLE = 0;
export const NODE_VISIBLE_TO_MAP_ONLY = 1;
export const NODE_VISIBLE = 2;
export const UNDEFINED_VALUE = "undefined";
export const invalidValues = [UNDEFINED_VALUE, undefined, "unknown", "?", "nan", "na", "n/a"];
export const isValueValid = (value) =>
!invalidValues.includes(String(value).toLowerCase());
=======
// increasing levels of "visibility"
export const NODE_NOT_VISIBLE = 0; // branch thickness 0 and excluded from map
export const NODE_VISIBLE_TO_MAP_ONLY = 1; // branch thickness 0.5 and included in map
export const NODE_VISIBLE = 2; // included on tree and map
>>>>>>>
export const NODE_NOT_VISIBLE = 0; // branch thickness 0 and excluded from map
export const NODE_VISIBLE_TO_MAP_ONLY = 1; // branch thickness 0.5 and included in map
export const NODE_VISIBLE = 2; // included on tree and map
export const UNDEFINED_VALUE = "undefined";
export const invalidValues = [UNDEFINED_VALUE, undefined, "unknown", "?", "nan", "na", "n/a"];
export const isValueValid = (value) =>
!invalidValues.includes(String(value).toLowerCase()); |
<<<<<<<
const SEARCH_OPERATORS = [
'added',
'age',
=======
var SEARCH_OPERATORS = [
'added:',
'age:',
>>>>>>>
const SEARCH_OPERATORS = [
'added:',
'age:',
<<<<<<<
'has:unresolved',
'hashtag',
'intopic',
'is',
=======
'intopic:',
'is:',
>>>>>>>
'has:unresolved',
'hashtag',
'intopic:',
'is:', |
<<<<<<<
err.message + "\n" + err.stack + "\n...resuming...\n");
=======
err.message + "\n" +
err.stack + "\n" +
"...resuming...\n");
>>>>>>>
err.message + "\n" +
err.stack + "\n" +
"...resuming...\n");
<<<<<<<
Trapezoid: function (state, container, buf) { return (this.polygonal(state, container, buf)); },
Hot_tub: function (state, container, buf) { return (this.common (state, container, buf)); },
Compass: function(state, container, buf) { return (this.common(state, container, buf)); }
=======
Trapezoid: function (state, container, buf) { return (this.polygonal(state,container, buf)); },
Hot_tub: function (state, container, buf) { return (this.common (state, container, buf)); },
Fountain: function (state, container, buf) { return (this.common (state, container, buf)); }
>>>>>>>
Trapezoid: function (state, container, buf) { return (this.polygonal(state, container, buf)); },
Hot_tub: function (state, container, buf) { return (this.common (state, container, buf)); },
Fountain: function (state, container, buf) { return (this.common (state, container, buf)); },
Compass: function(state, container, buf) { return (this.common(state, container, buf)); } |
<<<<<<<
if (json.maintainers) {
metadata.maintainers = json.maintainers;
}
if (json.author_info) {
metadata.authorInfo = json.author_info;
}
=======
metadata.maintainers = json.maintainers;
>>>>>>>
if (json.maintainers) {
metadata.maintainers = json.maintainers;
} |
<<<<<<<
import "../../css/mapbox.css";
=======
import ErrorBoundary from "../../util/errorBoundry";
import Legend from "../tree/legend/legend";
>>>>>>>
import ErrorBoundary from "../../util/errorBoundry";
import Legend from "../tree/legend/legend";
import "../../css/mapbox.css";
<<<<<<<
<Card center title={transmissionsExist ? t("Transmissions") : t("Geography")}>
=======
<Card center title={transmissionsExist ? "Transmissions" : "Geography"}>
{this.props.legend && <ErrorBoundary>
<Legend right width={this.props.width} />
</ErrorBoundary>}
>>>>>>>
<Card center title={transmissionsExist ? t("Transmissions") : t("Geography")}>
{this.props.legend && <ErrorBoundary>
<Legend right width={this.props.width} />
</ErrorBoundary>} |
<<<<<<<
* Prevents sprite from becoming invisible out of frame and losing mouse input connection.
*
* @property dragMode
* @type Boolean
* @default false
* @since 0.8.3
*/
tint: 0xFFFFFF,
/**
* Optional. The X scaling factor for the image. Defaults to 1.
=======
* Optional. The X scaling factor for the entity. Defaults to 1.
>>>>>>>
* Optional. The X scaling factor for the image. Defaults to 1.
<<<<<<<
updateSprite: (function () {
var sort = function (a, b) {
return a.z - b.z;
};
return function (playing) {
var x = 0,
y = 0,
o = this.owner.orientationMatrix,
rotation = 0,
mirrored = 1,
flipped = 1,
angle = null;
x = this.owner.x;
y = this.owner.y;
if (this.rotate) {
rotation = this.rotation;
}
if (this.sprite.z !== (this.owner.z + this.offsetZ)) {
if (this.parentContainer) {
this.parentContainer.reorder = true;
}
this.sprite.z = (this.owner.z + this.offsetZ);
}
if (!this.ignoreOpacity && (this.owner.opacity || (this.owner.opacity === 0))) {
this.sprite.alpha = this.owner.opacity;
}
if (this.owner.tint !== this.sprite.tint) {
this.sprite.tint = this.owner.tint;
}
if (this.sprite.reorder) {
this.sprite.reorder = false;
this.sprite.children.sort(sort);
}
if (this.mirror || this.flip) {
angle = this.rotation % 360;
if (this.mirror && (angle > 90) && (angle < 270)) {
mirrored = -1;
}
if (this.flip && (angle < 180)) {
flipped = -1;
}
}
/**
* This event is triggered each tick to check for animation updates.
*
* @event 'update-animation'
* @param playing {Boolean} Whether the animation is in a playing or paused state.
*/
this.owner.triggerEvent('update-animation', playing);
if (o) { // This is a 3x3 2D matrix describing an affine transformation.
this.sprite.setTransform(o[0][2], o[1][2], o[0][0], o[1][1], (rotation ? (rotation / 180) * Math.PI : 0), o[1][0], o[0][1]);
} else {
this.sprite.setTransform(x, y, this.scaleX * mirrored, this.scaleY * flipped, (rotation ? (rotation / 180) * Math.PI : 0), this.skewX, this.skewY);
}
// Set isCameraOn of sprite if within camera bounds
if (this.sprite && ((!this.wasVisible && this.visible) || this.lastX !== this.owner.x || this.lastY !== this.owner.y)) {
//TODO: This check is running twice when an object is moving and the camera is moving.
//Find a way to remove the duplication!
this.checkCameraBounds();
}
this.lastX = this.owner.x;
this.lastY = this.owner.y;
this.wasVisible = this.visible;
this.sprite.visible = (this.visible && this.isOnCamera) || this.dragMode;
};
}()),
=======
>>>>>>> |
<<<<<<<
const newState = {};
newState.tree = new PhyloTree(this.props.tree.nodes, "LEFT");
renderTree(this, true, newState.tree, this.props);
this.Viewer.fitToViewer();
=======
const tree = new PhyloTree(this.props.tree.nodes, "LEFT");
renderTree(this, true, tree, this.props);
const newState = {tree};
>>>>>>>
const newState = {};
newState.tree = new PhyloTree(this.props.tree.nodes, "LEFT");
renderTree(this, true, newState.tree, this.props);
<<<<<<<
this.setUpAndRenderTreeToo(this.props, newState); /* modifies newState in place */
=======
const treeToo = new PhyloTree(this.props.treeToo.nodes, "RIGHT");
renderTree(this, false, treeToo, this.props);
newState.treeToo = treeToo;
>>>>>>>
this.setUpAndRenderTreeToo(this.props, newState); /* modifies newState in place */
<<<<<<<
/* potentially change the (main / left hand) tree */
const [potentialNewState, leftTreeUpdated] = changePhyloTreeViaPropsComparison(true, this.state.tree, this.Viewer, prevProps, this.props);
if (potentialNewState) newState = potentialNewState;
/* has the 2nd (right hand) tree just been turned on, off or swapped? */
if (prevProps.showTreeToo !== this.props.showTreeToo) {
this.state.tree.change({svgHasChangedDimensions: true}); /* readjust co-ordinates */
if (!this.props.showTreeToo) { /* turned off -> remove the 2nd tree */
=======
if (this.state.tree) {
[newState, leftTreeUpdated] = changePhyloTreeViaPropsComparison(true, this.state.tree, prevProps, this.props);
if (prevProps.showTreeToo !== this.props.showTreeToo) {
this.state.tree.change({svgHasChangedDimensions: true});
if (this.props.showTreeToo) {
if (this.state.treeToo) { /* remove the old tree */
this.state.treeToo.clearSVG();
}
const treeToo = new PhyloTree(this.props.treeToo.nodes, "RIGHT");
renderTree(this, false, treeToo, this.props);
if (this.tangleRef) this.tangleRef.drawLines();
this.setState({treeToo});
} else {
this.setState({treeToo: null});
}
return;
}
}
/* tree too */
if (this.state.treeToo) {
if (!prevProps.showTreeToo && this.props.showTreeToo) {
newState.treeToo = new PhyloTree(this.props.treeToo.nodes, "RIGHT");
renderTree(this, false, newState.treeToo, this.props);
} else if (!this.props.showTreeToo) {
>>>>>>>
/* potentially change the (main / left hand) tree */
const [potentialNewState, leftTreeUpdated] = changePhyloTreeViaPropsComparison(true, this.state.tree, prevProps, this.props);
if (potentialNewState) newState = potentialNewState;
/* has the 2nd (right hand) tree just been turned on, off or swapped? */
if (prevProps.showTreeToo !== this.props.showTreeToo) {
this.state.tree.change({svgHasChangedDimensions: true}); /* readjust co-ordinates */
if (!this.props.showTreeToo) { /* turned off -> remove the 2nd tree */
<<<<<<<
} else { /* turned on -> render the 2nd tree */
if (this.state.treeToo) { /* tree has been swapped -> remove the old tree */
this.state.treeToo.clearSVG();
}
this.setUpAndRenderTreeToo(this.props, newState); /* modifies newState in place */
this.resetView(); /* reset the position of the left tree */
if (this.tangleRef) this.tangleRef.drawLines();
=======
} else {
[_, rightTreeUpdated] = changePhyloTreeViaPropsComparison(false, this.state.treeToo, prevProps, this.props);
>>>>>>>
} else { /* turned on -> render the 2nd tree */
if (this.state.treeToo) { /* tree has been swapped -> remove the old tree */
this.state.treeToo.clearSVG();
}
this.setUpAndRenderTreeToo(this.props, newState); /* modifies newState in place */
// this.resetView(); /* reset the position of the left tree */
if (this.tangleRef) this.tangleRef.drawLines(); |
<<<<<<<
var dimensions = {};
var dt = {};
var parameters = {};
var size = {};
var screen = {};
=======
>>>>>>>
<<<<<<<
var movefunct={};
var canv ={};
var position = {};
var previous = {};
=======
>>>>>>>
<<<<<<<
function loop (i, delay, funct) {
setTimeout(function () {
//console.log(dt);
eval(funct); // your code here
if (--i) {
//console.log("titles")
loop(i, delay, funct);
} // decrement i and call myLoop again if i > 0
if (i==0)console.log( funct + " complete")
}, delay);
};
/// SET UP VISUALIZATION CONTEXT
=======
var w; // width of our drawing context
var h; // height of our drawing context
var c; // a canvas context to use in
var draw = function() {}; // redefined in performance, called every animation frame
var event = function(e) {}; // redefined in performance, called with events from server
>>>>>>>
<<<<<<<
// get size of the screen and set the canvas to the same size
var g = $("#global");
dimensions.g = g;
dimensions.gx=g.width();dimensions.gy=g.height();
$('<canvas>').attr({id: "gcanvas"}).css({zIndex: $('canvas').length + 3}).insertBefore('#global');
$('#global').css({zIndex: $('canvas').length + 3});
dimensions.gcanvas = document.getElementById("gcanvas");
// alert(canvas0);
dimensions.gcanvas.width=dimensions.gx; dimensions.gcanvas.height=dimensions.gy;
canv.gcanvas = dimensions.gcanvas.getContext('2d');
new JSvisual();
console.log('visuals are set');
};
///
var JSvisual = function (){
var self = this;
var frame = function () {
$.each(funct, function(k,v) {
// console.log(v);
eval(v.func);
// console.log(k);
});
requestAnimationFrame(frame);
};
$('#edit1').keyup(function (event) {
if (event.keyCode == 13 && event.shiftKey) {
var e1 = $('#edit1').val();
eval(e1);
};
});
frame();
=======
// add a new canvas adjusted to display dimensions and store context for later use
$('<canvas>').attr({id: "gcanvas"}).css({zIndex: $('canvas').length + 3}).insertBefore('#global');
$('#global').css({zIndex: $('canvas').length + 3});
adjustCanvasDimensions();
c = document.getElementById('gcanvas').getContext('2d');
// and activate our animation callback function 'tick'
requestAnimationFrame(tick); // activate our animation callback function 'tick'
setupShiftEnter(); // now shift-enter in any textarea evaluates that as JS for livecoding of visuals
console.log('visuals are set');
>>>>>>>
<<<<<<<
// CLEAR CANVAS ////////////////////////////////////////////////////////////////////////
var clear = function() {canv.gcanvas.clearRect(0,0,dimensions.gx, dimensions.gy)};
/// FADE CANVAS ////////////////////////////////////////////////////////////////////////
var fadeCondition = 0;
// Determine if fade function has already been evaluated
var fade = function(x){
if(funct.fade !== "on") {
// console.log("turning funct.fade to on");
if (x == "stop") {fadeCondition=1; delete funct.fade}
else {
funct.fade = "on";
fadeCondition=0;
if(x !== null) {fadeRate = x;};
fade0(); // call fade function
console.log('fading :'+ fadeRate + " ms");
}
} else {
if (x == "stop") {fadeCondition=1; delete funct.fade};
if (x !== null) {fadeRate = x};
console.log('fading :'+ fadeRate + " ms");
}
};
/// Fade function -- has its own setTimeout function such that the fadeRate can be modified
var fade0 = function(){
if(fadeCondition == 0) {
// console.log('fade0');
canv.gcanvas.beginPath();
canv.gcanvas.fillStyle = "rgba(255,255,255,0.1)";
canv.gcanvas.fillRect(0,0,dimensions.gx, dimensions.gy);
canv.gcanvas.closePath();
setTimeout(function(){fade0()}, fadeRate);
} else {
console.log('fading stopped');
canv.gcanvas.beginPath();
canv.gcanvas.fillStyle = "rgba(255,255,255,0.1)";
canv.gcanvas.fillRect(0,0,dimensions.gx, dimensions.gy);
canv.gcanvas.closePath();
}
};
/// DRAW TRAJECTORY //////////////////////////////////////////////////////////////////////
var drawPath = function(name) {
if((funct["drawpath"+name] in funct) == true) {
console.log("Already drawing " + name + "/'s path");
}
else {
funct["drawpath"+name] = {func: "drawPath0('"+name+"')"};
// funct[name] = {func: "drawCircle0('"+name+ "',"+"'"+colour+"'"+","+ lw+",size."+name+".radius)",
// id: name, type: drawCircle0, col: colour, line: lw}
=======
function adjustCanvasDimensions() {
w = $("#global").width();
h = $("#global").height();
var canvas = document.getElementById("gcanvas");
canvas.width = w;
canvas.height = h;
}
function tick() {
draw();
$.each(funct, function(k,v) { eval(v); });
requestAnimationFrame(tick);
}
function retick() { // useful if in livecoding an error crashes animation callback
requestAnimationFrame(tick);
}
function setupShiftEnter() {
$('#edit1').keyup(function (event) {
if (event.keyCode == 13 && event.shiftKey) {
var e1 = $('#edit1').val();
eval(e1);
};
});
$('#edit3').keyup(function (event) {
if(event.keyCode==13 && event.shiftKey) {
var e3 = $('#edit3').val();
eval(e3);
};
});
}
function clear () {c.clearRect(0,0,w,h)};
function fade (x) {
if(x!="stop") setTimeout(function() {fade()},fadeRate);
c.beginPath();
c.fillStyle = "rgba(255,255,255,0.1)";
c.fillRect(0,0,w,h);
c.closePath();
}
>>>>>>>
<<<<<<<
var sr = size[name].radius;
// console.log(eval(size[name].radius));
// var size = 50;
canv.gcanvas.beginPath();
canv.gcanvas.arc(
position[name].x, position[name].y, eval(sr), 0, 2*Math.PI
);
canv.gcanvas.lineWidth=lineWidth;
canv.gcanvas.strokeStyle = colour;
canv.gcanvas.stroke();
canv.gcanvas.closePath();
=======
var position = {x:Math.random()*w, y:w*Math.random()};
c.beginPath();
c.arc(
position.x,
position.y,
50*Math.random(), 0, 2*Math.PI
);
c.lineWidth=lineWidth;
c.strokeStyle = colour;
c.stroke();
c.closePath();
>>>>>>>
<<<<<<<
var drawSquare = function(name, type, colour,size,lw) {
=======
var drawSquare = function(name, type, colour,size,lw) {
>>>>>>>
<<<<<<<
};
var drawSquare0 = function(name, type, colour, size, lineWidth){
var screen = canv.gcanvas;
=======
};
var drawSquare0 = function(name, type, colour, size, lineWidth) {
>>>>>>> |
<<<<<<<
const invalidScopeDisables = require("../invalidScopeDisables");
const path = require("path");
const replaceBackslashes = require("./replaceBackslashes");
const standalone = require("../standalone");
const stripIndent = require("common-tags").stripIndent;
=======
const invalidScopeDisables = require('../invalidScopeDisables');
const path = require('path');
const standalone = require('../standalone');
const stripIndent = require('common-tags').stripIndent;
>>>>>>>
const invalidScopeDisables = require('../invalidScopeDisables');
const path = require('path');
const replaceBackslashes = require("./replaceBackslashes");
const standalone = require('../standalone');
const stripIndent = require('common-tags').stripIndent;
<<<<<<<
return replaceBackslashes(
path.join(__dirname, "./fixtures/disableOptions", name)
);
}
function source(name) {
return path.join(__dirname, "./fixtures/disableOptions", name);
=======
return path.join(__dirname, './fixtures/disableOptions', name);
>>>>>>>
return replaceBackslashes(
path.join(__dirname, "./fixtures/disableOptions", name)
);
}
function source(name) {
return path.join(__dirname, './fixtures/disableOptions', name);
<<<<<<<
return standalone({
config,
files: [
fixture("disabled-ranges-1.css"),
fixture("disabled-ranges-2.css"),
// ignore files contain `CssSyntaxError`
fixture("disabled-ranges-3.css")
]
}).then(linted => {
expect(invalidScopeDisables(linted.results, config)).toEqual([
{
source: source("disabled-ranges-1.css"),
ranges: [{ start: 1, end: 3, unusedRule: "color-named" }]
},
{
source: source("disabled-ranges-2.css"),
ranges: [{ start: 5, end: 5, unusedRule: "color-named" }]
}
]);
});
=======
return standalone({
config,
files: [
fixture('disabled-ranges-1.css'),
fixture('disabled-ranges-2.css'),
// ignore files contain `CssSyntaxError`
fixture('disabled-ranges-3.css'),
],
}).then((linted) => {
expect(invalidScopeDisables(linted.results, config)).toEqual([
{
source: fixture('disabled-ranges-1.css'),
ranges: [{ start: 1, end: 3, unusedRule: 'color-named' }],
},
{
source: fixture('disabled-ranges-2.css'),
ranges: [{ start: 5, end: 5, unusedRule: 'color-named' }],
},
]);
});
>>>>>>>
return standalone({
config,
files: [
fixture('disabled-ranges-1.css'),
fixture('disabled-ranges-2.css'),
// ignore files contain `CssSyntaxError`
fixture('disabled-ranges-3.css'),
],
}).then((linted) => {
expect(invalidScopeDisables(linted.results, config)).toEqual([
{
source: source('disabled-ranges-1.css'),
ranges: [{ start: 1, end: 3, unusedRule: 'color-named' }],
},
{
source: source('disabled-ranges-2.css'),
ranges: [{ start: 5, end: 5, unusedRule: 'color-named' }],
},
]);
});
<<<<<<<
return standalone({
config,
files: [fixture("disabled-ranges-1.css"), fixture("ignored-file.css")],
ignoreDisables: true,
ignorePath: fixture(".stylelintignore")
}).then(linted => {
expect(invalidScopeDisables(linted.results, config)).toEqual([
{
source: source("disabled-ranges-1.css"),
ranges: [{ start: 5, end: 7, unusedRule: "block-no-empty" }]
}
]);
});
=======
return standalone({
config,
files: [fixture('disabled-ranges-1.css'), fixture('ignored-file.css')],
ignoreDisables: true,
ignorePath: fixture('.stylelintignore'),
}).then((linted) => {
expect(invalidScopeDisables(linted.results, config)).toEqual([
{
source: fixture('disabled-ranges-1.css'),
ranges: [{ start: 5, end: 7, unusedRule: 'block-no-empty' }],
},
]);
});
>>>>>>>
return standalone({
config,
files: [fixture('disabled-ranges-1.css'), fixture('ignored-file.css')],
ignoreDisables: true,
ignorePath: fixture('.stylelintignore'),
}).then((linted) => {
expect(invalidScopeDisables(linted.results, config)).toEqual([
{
source: source('disabled-ranges-1.css'),
ranges: [{ start: 5, end: 7, unusedRule: 'block-no-empty' }],
},
]);
}); |
<<<<<<<
"use strict";
const hash = require("../utils/hash");
const path = require("path");
const standalone = require("../standalone");
const fixturesPath = path.join(__dirname, "fixtures");
const cpFile = require("cp-file");
const fileExists = require("file-exists-promise");
const fs = require("fs");
const replaceBackslashes = require("./replaceBackslashes");
const { promisify } = require("util");
=======
'use strict';
const hash = require('../utils/hash');
const path = require('path');
const standalone = require('../standalone');
const fixturesPath = path.join(__dirname, 'fixtures');
const cpFile = require('cp-file');
const fileExists = require('file-exists-promise');
const fs = require('fs');
const { promisify } = require('util');
>>>>>>>
'use strict';
const hash = require('../utils/hash');
const path = require('path');
const standalone = require('../standalone');
const fixturesPath = path.join(__dirname, 'fixtures');
const cpFile = require('cp-file');
const fileExists = require('file-exists-promise');
const fs = require('fs');
const replaceBackslashes = require("./replaceBackslashes");
const { promisify } = require('util');
<<<<<<<
return {
files: replaceBackslashes(path.join(fixturesPath, "cache", "*.css")),
config: {
rules: { "block-no-empty": true, "color-no-invalid-hex": true }
},
cache: true
};
=======
return {
files: path.join(fixturesPath, 'cache', '*.css'),
config: {
rules: { 'block-no-empty': true, 'color-no-invalid-hex': true },
},
cache: true,
};
>>>>>>>
return {
files: replaceBackslashes(path.join(fixturesPath, 'cache', '*.css')),
config: {
rules: { 'block-no-empty': true, 'color-no-invalid-hex': true },
},
cache: true,
}; |
<<<<<<<
"use strict";
const _ = require("lodash");
const cpFile = require("cp-file");
const del = require("del");
const fs = require("fs");
const os = require("os");
const path = require("path");
const stylelint = require("../../lib");
const systemTestUtils = require("../systemTestUtils");
const { promisify } = require("util");
const { replaceBackslashes } = require("../systemTestUtils");
=======
'use strict';
const _ = require('lodash');
const cpFile = require('cp-file');
const del = require('del');
const fs = require('fs');
const os = require('os');
const path = require('path');
const stylelint = require('../../lib');
const systemTestUtils = require('../systemTestUtils');
const { promisify } = require('util');
>>>>>>>
'use strict';
const _ = require('lodash');
const cpFile = require('cp-file');
const del = require('del');
const fs = require('fs');
const os = require('os');
const path = require('path');
const stylelint = require('../../lib');
const systemTestUtils = require('../systemTestUtils');
const { promisify } = require('util');
const { replaceBackslashes } = require("../systemTestUtils"); |
<<<<<<<
return replaceBackslashes(path.join(__dirname, caseNumber, fileName));
=======
return path.join(__dirname, caseNumber, fileName);
>>>>>>>
return replaceBackslashes(path.join(__dirname, caseNumber, fileName));
<<<<<<<
caseFilePath,
replaceBackslashes,
caseStylesheetGlob,
caseConfig,
prepResults,
stripColors
=======
caseFilePath,
caseStylesheetGlob,
caseConfig,
prepResults,
stripColors,
>>>>>>>
caseFilePath,
replaceBackslashes,
caseStylesheetGlob,
caseConfig,
prepResults,
stripColors, |
<<<<<<<
const watchers = {};
const bsConfig = utils.defaultsDeep(this._config.syncOptions || {}, {
=======
const bsConfig = _.defaultsDeep(this._config.syncOptions || {}, {
>>>>>>>
const bsConfig = utils.defaultsDeep(this._config.syncOptions || {}, { |
<<<<<<<
import { Home } from "./pages/Home";
import { NeedHelp } from "./pages/NeedHelp";
import { OfferHelp } from "./pages/OfferHelp";
import { About } from "./pages/About";
import { Medical } from "./pages/Medical";
import { SymptomsCheck } from "./pages/SymptomsCheck";
import { TermsConditions } from "./pages/TermsConditions";
import { PrivacyPolicy } from "./pages/PrivacyPolicy";
import { CookiesPolicy } from "./pages/CookiesPolicy";
import Feed from "./pages/Feed";
=======
import Home from "./pages/Home";
import NeedHelp from "./pages/NeedHelp";
import OfferHelp from "./pages/OfferHelp";
import About from "./pages/About";
import Medical from "./pages/Medical";
import AirTableCOVID from "./pages/AirTableCOVID";
import SymptomsCheck from "./pages/SymptomsCheck";
import TermsConditions from "./pages/TermsConditions";
import PrivacyPolicy from "./pages/PrivacyPolicy";
import CookiesPolicy from "./pages/CookiesPolicy";
import Profile from "./pages/Profile";
import EditProfile from "./pages/EditProfile";
import EditAccount from "./pages/EditAccount";
import Feed from "./containers/FeedContainer";
>>>>>>>
import Home from "./pages/Home";
import NeedHelp from "./pages/NeedHelp";
import OfferHelp from "./pages/OfferHelp";
import About from "./pages/About";
import Medical from "./pages/Medical";
import SymptomsCheck from "./pages/SymptomsCheck";
import TermsConditions from "./pages/TermsConditions";
import PrivacyPolicy from "./pages/PrivacyPolicy";
import CookiesPolicy from "./pages/CookiesPolicy";
import Profile from "./pages/Profile";
import EditProfile from "./pages/EditProfile";
import EditAccount from "./pages/EditAccount";
import Feed from "./containers/FeedContainer"; |
<<<<<<<
import { theme } from "../constants/theme";
const { colors } = theme;
const { typography } = theme;
const Title = styled.h1`
align-items: center;
display: flex;
font-size: 2.2rem;
font-weight: bold;
height: 5rem;
justify-content: center;
`;
=======
// ICONS
import SvgIcon from "../components/Icon/SvgIcon";
import twitter from "~/assets/icons/social-twitter.svg";
import facebook from "~/assets/icons/social-facebook.svg";
import gmail from "~/assets/icons/social-google.svg";
import linkedin from "~/assets/icons/social-linkedin.svg";
>>>>>>>
// ICONS
import SvgIcon from "../components/Icon/SvgIcon";
import twitter from "~/assets/icons/social-twitter.svg";
import facebook from "~/assets/icons/social-facebook.svg";
import gmail from "~/assets/icons/social-google.svg";
import linkedin from "~/assets/icons/social-linkedin.svg";
import { theme } from "../constants/theme";
const { colors } = theme;
const { typography } = theme;
const Title = styled.h1`
align-items: center;
display: flex;
font-size: 2.2rem;
font-weight: bold;
height: 5rem;
justify-content: center;
`;
<<<<<<<
const SocialButton = styled(Button)`
border: 1px solid ${colors.lightGray};
border-radius: unset;
display: flex;
height: 4.8rem;
=======
const SocialButton = styled(Button).attrs(props => ({
inline: true,
}))`
width: 150px;
>>>>>>>
const SocialButton = styled(Button)`
border: 1px solid ${colors.lightGray};
border-radius: unset;
display: flex;
height: 4.8rem;
<<<<<<<
=======
{!isLoginForm && (
<InputWrapper>
<Label style={StyleLabel} label="Confirm password" />
<Input
type="password"
required
placeholder="Confirm password"
value={confirmPassword}
onChange={handleInputChangeConfirmPassword}
style={StyleInput}
/>
</InputWrapper>
)}
<WhiteSpace />
<WhiteSpace />
>>>>>>> |
<<<<<<<
export const CHANGE_ANALYSIS_VALUE = "CHANGE_ANALYSIS_VALUE";
export const CHANGE_ANIMATION_START = "CHANGE_ANIMATION_START";
export const CHANGE_ANIMATION_TIME = "CHANGE_ANIMATION_TIME";
export const CHANGE_ANIMATION_CUMULATIVE = "CHANGE_ANIMATION_CUMULATIVE";
export const DATA_VALID = "DATA_VALID";
export const DATA_INVALID = "DATA_INVALID";
export const TOGGLE_TEMPORAL_CONF = "TOGGLE_TEMPORAL_CONF";
export const MAP_ANIMATION_PLAY_PAUSE_BUTTON = "MAP_ANIMATION_PLAY_PAUSE_BUTTON";
=======
export const CHANGE_ANALYSIS_VALUE = "CHANGE_ANALYSIS_VALUE";
export const ADD_NOTIFICATION = "ADD_NOTIFICATION";
export const REMOVE_NOTIFICATION = "REMOVE_NOTIFICATION";
>>>>>>>
export const CHANGE_ANALYSIS_VALUE = "CHANGE_ANALYSIS_VALUE";
export const CHANGE_ANIMATION_START = "CHANGE_ANIMATION_START";
export const CHANGE_ANIMATION_TIME = "CHANGE_ANIMATION_TIME";
export const CHANGE_ANIMATION_CUMULATIVE = "CHANGE_ANIMATION_CUMULATIVE";
export const DATA_VALID = "DATA_VALID";
export const DATA_INVALID = "DATA_INVALID";
export const TOGGLE_TEMPORAL_CONF = "TOGGLE_TEMPORAL_CONF";
export const MAP_ANIMATION_PLAY_PAUSE_BUTTON = "MAP_ANIMATION_PLAY_PAUSE_BUTTON";
export const ADD_NOTIFICATION = "ADD_NOTIFICATION";
export const REMOVE_NOTIFICATION = "REMOVE_NOTIFICATION"; |
<<<<<<<
const StyledWelcome = styled.h2`
font-family: ${theme.typography.font.family.display}, sans-serif;
font-size: ${theme.typography.size.large};
font-style: normal;
font-weight: 300;
line-height: 3rem;
margin: 2.5rem auto 0;
text-align: center;
@media only screen and (min-width: 600px) {
font-size: 2.8vw;
=======
const StyledWelcome = styled(Heading)`
font-size: ${theme.typography.heading.three};
>>>>>>>
const StyledWelcome = styled.h2`
font-size: ${theme.typography.heading.three}; |
<<<<<<<
import CreateOrganizationProfile from "./pages/CreateOrganizationProfile";
import OrgProfileComplete from "./pages/OrgProfileComplete";
=======
import CreateOrganizationProfile from "./pages/CreateOrganizationProfile";
import EditOrganizationProfile from "./pages/EditOrganizationProfile";
import EditOrganizationAccount from "./pages/EditOrganizationAccount";
>>>>>>>
import CreateOrganizationProfile from "./pages/CreateOrganizationProfile";
import OrgProfileComplete from "./pages/OrgProfileComplete";
import EditOrganizationProfile from "./pages/EditOrganizationProfile";
import EditOrganizationAccount from "./pages/EditOrganizationAccount";
<<<<<<<
path: "/create-organization-profile",
component: CreateOrganizationProfile,
layout: "logo"
},
{
path: "/create-organization-complete",
component: OrgProfileComplete
},
{
=======
path: "/CreateOrganizationProfile",
component: CreateOrganizationProfile,
},
{
path: "/edit-organization-account",
component: EditOrganizationAccount,
},
{
path: "/edit-organization-profile",
component: EditOrganizationProfile,
},
{
>>>>>>>
path: "/create-organization-profile",
component: CreateOrganizationProfile,
layout: "logo"
},
{
path: "/create-organization-complete",
component: OrgProfileComplete
},
{
path: "/edit-organization-account",
component: EditOrganizationAccount,
},
{
path: "/edit-organization-profile",
component: EditOrganizationProfile,
},
{ |
<<<<<<<
const renderFeedSocialIcons = (
<>
<div className="social-icon" onClick={() => handlePostLike(id, liked, true)}>
{renderLikeIcon()}
<span className="total-number">{numLikes}</span>
<span className="social-text">Like</span>
</div>
<span></span>
<div className="social-icon" onClick={setShowComments}>
{renderCommentIcon()}
<span className="total-number">{numComments}</span>
</div>
<span></span>
</>
);
=======
>>>>>>>
<<<<<<<
<div className="social-icon" onClick={() => handlePostLike(id, liked, true)}>
{renderLikeIcon()}
<span className="total-number">{numLikes}</span>
<span className="social-text">Like</span>
</div>
=======
{postpage ? (
<div className="social-icon">
{renderLikeIcon()}
<span className="total-number">{numLikes}</span>
<span className="social-text">Like</span>
</div>
) : (
<div className="social-icon" onClick={() => handlePostLike(id, liked)}>
{renderLikeIcon()}
<span className="total-number">{numLikes}</span>
</div>
)}
>>>>>>>
{postpage ? (
<div className="social-icon" onClick={() => handlePostLike(id, liked, true)}>
{renderLikeIcon()}
<span className="total-number">{numLikes}</span>
<span className="social-text">Like</span>
</div>
) : (
<div className="social-icon" onClick={() => handlePostLike(id, liked, true)}>
{renderLikeIcon()}
<span className="total-number">{numLikes}</span>
</div>
)} |
<<<<<<<
<NavList>
{isAuthenticated ? (
<>
<NavItem>
<Link to="/profile">Profile</Link>
</NavItem>
</>
) : (
<>
<NavItem history={history} link="/auth/login">
Login / Register
</NavItem>
</>
)}
<NavItem history={history} link="/about-us">
About Us
=======
<WhiteSpace size="lg" />
<AvatarContainer>
<NavItem history={history}>
<TextAvatar size={80} alt="avatar">
{displayInitials(user)}
</TextAvatar>
>>>>>>>
<NavList>
{isAuthenticated ? (
<>
<NavItem>
<Link to="/profile">Profile</Link>
</NavItem>
</>
) : (
<>
<NavItem history={history} link="/auth/login">
Login / Register
</NavItem>
</>
)}
<NavItem history={history} link="/about-us">
About Us
<WhiteSpace size="lg" />
<AvatarContainer>
<NavItem history={history}>
<TextAvatar size={80} alt="avatar">
{displayInitials(user)}
</TextAvatar> |
<<<<<<<
=======
import GTM from "constants/gtm-tags";
>>>>>>>
<<<<<<<
import { Menu, Dropdown } from "antd";
=======
>>>>>>>
import { Menu, Dropdown } from "antd";
import GTM from "constants/gtm-tags";
<<<<<<<
<li className="feedbackBtn">
<button onClick={onFeedbackIconClick}>
<FeedbackIcon />
</button>
</li>
=======
<Link id={GTM.nav.prefix + GTM.nav.feedBack} to="/feed">
<SvgIcon src={envelope} style={{ marginLeft: "1.5rem" }} />
</Link>
>>>>>>>
<Link id={GTM.nav.prefix + GTM.nav.feedBack} to="/feed">
<SvgIcon src={envelope} style={{ marginLeft: "1.5rem" }} />
</Link> |
<<<<<<<
export const ERROR_POSTS = "ERROR_POSTS";
export const NEXT_PAGE = "NEXT_PAGE";
=======
export const ERROR_POSTS = "ERROR_POSTS";
export const SET_LIKE = "SET_LIKE";
>>>>>>>
export const ERROR_POSTS = "ERROR_POSTS";
export const NEXT_PAGE = "NEXT_PAGE";
export const SET_LIKE = "SET_LIKE"; |
<<<<<<<
export const MANIFEST_RECEIVED = "MANIFEST_RECEIVED";
export const CHANGE_TREE_ROOT_IDX = "CHANGE_TREE_ROOT_IDX";
=======
export const MANIFEST_RECEIVED = "MANIFEST_RECEIVED";
export const POSTS_MANIFEST_RECEIVED = "POSTS_MANIFEST_RECEIVED";
>>>>>>>
export const MANIFEST_RECEIVED = "MANIFEST_RECEIVED";
export const POSTS_MANIFEST_RECEIVED = "POSTS_MANIFEST_RECEIVED";
export const CHANGE_TREE_ROOT_IDX = "CHANGE_TREE_ROOT_IDX"; |
<<<<<<<
import axios from "axios";
import { Toast } from "antd-mobile";
import { GET_ERRORS } from "./types";
import { AUTH_LOGIN, AUTH_SIGNUP } from "constants/action-types";
import { setAuthToken, getAuthToken } from "utils/auth-token";
=======
import { AUTH_SUCCESS } from "constants/action-types";
import { getAuthToken } from "utils/auth-token";
>>>>>>>
import axios from "axios";
import { Toast } from "antd-mobile";
import { GET_ERRORS } from "./types";
import { AUTH_SUCCESS } from "constants/action-types";
import { getAuthToken } from "utils/auth-token";
<<<<<<<
dispatch({ type: AUTH_LOGIN, payload: { token, emailVerified } });
}
};
};
export const submitEmail = (userData, history) => (dispatch) => {
axios
.post("/api/users/login", userData)
.then((res) => history.push("/medicals"))
.catch((err) =>
dispatch({
type: GET_ERRORS,
payload: err.response.data,
}),
);
};
export const loginWithEmail = (payload) => {
return async (dispatch) => {
try {
const res = await axios.post("/api/auth/login", payload);
if (res.data && res.data.token){
setAuthToken(res.data);
}
dispatch({ type: AUTH_LOGIN, payload: res.data });
} catch (err) {
const message = err.response?.data?.message || err.message;
Toast.fail(`Login failed, reason: ${message}`, 3);
}
};
};
export const authWithSocialProvider = (payload) => {
return async (dispatch) => {
try {
const res = await axios.post(`/api/auth/oauth`, payload);
dispatch({ type: AUTH_LOGIN, payload: res.data });
} catch (err) {
const message = err.response?.data?.message || err.message;
Toast.fail(`Login failed, reason: ${message}`, 3);
}
};
};
export const signup = (payload) => {
return async (dispatch) => {
try {
const res = await axios.post("/api/auth/signup", payload);
dispatch({ type: AUTH_SIGNUP, payload: res.data });
} catch (err) {
const message = err.response?.data?.message || err.message;
Toast.fail(`Signup failed, reason: ${message}`, 3);
=======
dispatch({ type: AUTH_SUCCESS, payload: { token } });
>>>>>>>
dispatch({ type: AUTH_LOGIN, payload: { token, emailVerified } }); |
<<<<<<<
const { userId } = req.query;
let user;
let userErr;
=======
// TODO: handle optional user if authenticated
const { userId } = req;
let user;
let userErr;
>>>>>>>
const { userId } = req;
let user;
let userErr;
<<<<<<<
: [{ $match: { $and: filters } }, { $sort: { createdAt: -1 } }];
const aggregationPipeline = [
=======
: [{ $match: { $and: filters } }, { $sort: { createdAt: -1 } }];
const aggregationPipleine = [
>>>>>>>
: [{ $match: { $and: filters } }, { $sort: { createdAt: -1 } }];
const aggregationPipeline = [ |
<<<<<<<
'onModeChange', 'onChangeTimeout', 'onChangeSuggestionDelay'
=======
'onModeChange', 'onChangeTimeout', 'onToggleShiftEnter'
>>>>>>>
'onModeChange', 'onChangeTimeout', 'onChangeSuggestionDelay', 'onToggleShiftEnter'
<<<<<<<
onChangeSuggestionDelay(e) {
ReplPreferencesStore.onSetSuggestionDelay(e.target.value);
}
=======
onToggleShiftEnter(e) {
ReplPreferencesStore.toggleShiftEnter(e.target.checked);
}
>>>>>>>
onChangeSuggestionDelay(e) {
ReplPreferencesStore.onSetSuggestionDelay(e.target.value);
}
onToggleShiftEnter(e) {
ReplPreferencesStore.toggleShiftEnter(e.target.checked);
} |
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["@types/babel__core", "npm:7.1.12"]
=======
["@types/babel__core", null]
>>>>>>>
["@types/babel__core", null]
<<<<<<<
["antd", "virtual:65bbdbc833194d48af8b473ccb9eb396af4cb12a8148bcea865208cb4df1306b9afb0a62408cbd348e6f2af9b92764096868c744881c07da8a59708a1c9cb4f4#npm:4.4.2"],
["babel-jest", "virtual:45c4e4a73ecdeb874ac155656f6a93b075598df18169a0d7d5fe84ea341578c69f53a50638751735d5da1e71e76f6896516804ed0297a3cb73d625220ac3a752#npm:26.6.2"],
=======
["antd", "virtual:54dfdd95092c538917b1daf717721dd3beca716f0768958f8123e1439693d909b26a74c88b3fb65b402559e626be2accab32554fb8a3874e699047fe18793f5e#npm:4.4.2"],
["babel-jest", "virtual:caddf51df4928b33a437ca87b8f5ddfb6205ebd6d8231f74d4ee7223f3866e6f815b221aa1e2bd33e98915f701e95bae72a93d2288b49a34a6246bdbc2a4a132#npm:26.6.3"],
>>>>>>>
["antd", "virtual:65bbdbc833194d48af8b473ccb9eb396af4cb12a8148bcea865208cb4df1306b9afb0a62408cbd348e6f2af9b92764096868c744881c07da8a59708a1c9cb4f4#npm:4.4.2"],
["babel-jest", "virtual:caddf51df4928b33a437ca87b8f5ddfb6205ebd6d8231f74d4ee7223f3866e6f815b221aa1e2bd33e98915f701e95bae72a93d2288b49a34a6246bdbc2a4a132#npm:26.6.3"],
<<<<<<<
["@babel/plugin-syntax-async-generators", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.8.4"],
["@babel/plugin-syntax-bigint", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.8.3"],
["@babel/plugin-syntax-class-properties", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.12.1"],
["@babel/plugin-syntax-import-meta", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.10.4"],
["@babel/plugin-syntax-json-strings", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.8.3"],
["@babel/plugin-syntax-logical-assignment-operators", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.10.4"],
["@babel/plugin-syntax-nullish-coalescing-operator", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.8.3"],
["@babel/plugin-syntax-numeric-separator", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.10.4"],
["@babel/plugin-syntax-object-rest-spread", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.8.3"],
["@babel/plugin-syntax-optional-catch-binding", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.8.3"],
["@babel/plugin-syntax-optional-chaining", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.8.3"],
["@babel/plugin-syntax-top-level-await", "virtual:d1a4ebf3bb1ca2fb7c4584d854d3c99832ba530e6b860843a92dacf66aca740c1dcb048ce684a078ef7c119f56ce0de0d2b2069f9ed01968904427af1aa23c9c#npm:7.12.1"],
["@types/babel__core", "npm:7.1.12"]
=======
["@babel/plugin-syntax-async-generators", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.4"],
["@babel/plugin-syntax-bigint", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-class-properties", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.12.1"],
["@babel/plugin-syntax-import-meta", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.10.4"],
["@babel/plugin-syntax-json-strings", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-logical-assignment-operators", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.10.4"],
["@babel/plugin-syntax-nullish-coalescing-operator", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-numeric-separator", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.10.4"],
["@babel/plugin-syntax-object-rest-spread", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-optional-catch-binding", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-optional-chaining", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-top-level-await", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.12.1"],
["@types/babel__core", "npm:7.1.10"]
>>>>>>>
["@babel/plugin-syntax-async-generators", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.4"],
["@babel/plugin-syntax-bigint", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-class-properties", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.12.1"],
["@babel/plugin-syntax-import-meta", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.10.4"],
["@babel/plugin-syntax-json-strings", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-logical-assignment-operators", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.10.4"],
["@babel/plugin-syntax-nullish-coalescing-operator", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-numeric-separator", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.10.4"],
["@babel/plugin-syntax-object-rest-spread", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-optional-catch-binding", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-optional-chaining", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.8.3"],
["@babel/plugin-syntax-top-level-await", "virtual:06d63fdef056a816dbfd45fc619dbca1f3b1c6080a7aace56f94f09fc34a9b85b8f3464e63ef670bb76089af0698a69a549f9be8016ca1d91e1cbf3624386733#npm:7.12.1"],
["@types/babel__core", "npm:7.1.12"]
<<<<<<<
["npm:26.5.2", {
"packageLocation": "./.yarn/cache/jest-npm-26.5.2-802df785c1-8c31ca019c.zip/node_modules/jest/",
"packageDependencies": [
["jest", "npm:26.5.2"],
["@jest/core", "npm:26.6.2"],
["import-local", "npm:3.0.2"],
["jest-cli", "npm:26.6.2"]
],
"linkType": "HARD",
}],
["npm:26.6.2", {
"packageLocation": "./.yarn/cache/jest-npm-26.6.2-d87075d726-6e832cefb6.zip/node_modules/jest/",
=======
["npm:26.6.3", {
"packageLocation": "./.yarn/cache/jest-npm-26.6.3-dafe93d52f-4ffcfefa2b.zip/node_modules/jest/",
>>>>>>>
["npm:26.5.2", {
"packageLocation": "./.yarn/cache/jest-npm-26.5.2-802df785c1-8c31ca019c.zip/node_modules/jest/",
"packageDependencies": [
["jest", "npm:26.5.2"],
["@jest/core", "npm:26.6.2"],
["import-local", "npm:3.0.2"],
["jest-cli", "npm:26.6.2"]
],
"linkType": "HARD",
}],
["npm:26.6.3", {
"packageLocation": "./.yarn/cache/jest-npm-26.6.3-dafe93d52f-4ffcfefa2b.zip/node_modules/jest/", |
<<<<<<<
["nodemon", "npm:2.0.5"],
["react", "npm:17.0.1"],
["react-dom", "virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:17.0.1"],
=======
["nodemon", "npm:2.0.6"],
["react", "npm:17.0.1"],
["react-dom", "virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:17.0.1"],
>>>>>>>
["nodemon", "npm:2.0.6"],
["react", "npm:17.0.1"],
["react-dom", "virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:17.0.1"],
<<<<<<<
["react", "npm:17.0.1"],
["react-dom", "virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:17.0.1"],
["react-markdown", "virtual:54dfdd95092c538917b1daf717721dd3beca716f0768958f8123e1439693d909b26a74c88b3fb65b402559e626be2accab32554fb8a3874e699047fe18793f5e#npm:5.0.0"],
=======
["react", "npm:17.0.1"],
["react-dom", "virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:17.0.1"],
["react-markdown", "virtual:54dfdd95092c538917b1daf717721dd3beca716f0768958f8123e1439693d909b26a74c88b3fb65b402559e626be2accab32554fb8a3874e699047fe18793f5e#npm:5.0.2"],
>>>>>>>
["react", "npm:17.0.1"],
["react-dom", "virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:17.0.1"],
["react-markdown", "virtual:54dfdd95092c538917b1daf717721dd3beca716f0768958f8123e1439693d909b26a74c88b3fb65b402559e626be2accab32554fb8a3874e699047fe18793f5e#npm:5.0.2"],
<<<<<<<
["ejs", [
["npm:2.7.4", {
"packageLocation": "./.yarn/unplugged/ejs-npm-2.7.4-879ed38a4e/node_modules/ejs/",
"packageDependencies": [
["ejs", "npm:2.7.4"]
],
"linkType": "HARD",
}],
["npm:3.1.5", {
"packageLocation": "./.yarn/cache/ejs-npm-3.1.5-5ba4037886-463e8740cc.zip/node_modules/ejs/",
"packageDependencies": [
["ejs", "npm:3.1.5"],
["jake", "npm:10.8.2"]
],
"linkType": "HARD",
}]
]],
=======
>>>>>>>
["ejs", [
["npm:2.7.4", {
"packageLocation": "./.yarn/unplugged/ejs-npm-2.7.4-879ed38a4e/node_modules/ejs/",
"packageDependencies": [
["ejs", "npm:2.7.4"]
],
"linkType": "HARD",
}],
["npm:3.1.5", {
"packageLocation": "./.yarn/cache/ejs-npm-3.1.5-5ba4037886-463e8740cc.zip/node_modules/ejs/",
"packageDependencies": [
["ejs", "npm:3.1.5"],
["jake", "npm:10.8.2"]
],
"linkType": "HARD",
}]
]],
<<<<<<<
["npm:2.0.5", {
"packageLocation": "./.yarn/unplugged/nodemon-npm-2.0.5-6270a54615/node_modules/nodemon/",
=======
["npm:2.0.6", {
"packageLocation": "./.yarn/unplugged/nodemon-npm-2.0.6-533efccfd9/node_modules/nodemon/",
>>>>>>>
["npm:2.0.6", {
"packageLocation": "./.yarn/unplugged/nodemon-npm-2.0.6-533efccfd9/node_modules/nodemon/",
<<<<<<<
["npm:17.0.1", {
"packageLocation": "./.yarn/cache/react-npm-17.0.1-98658812fc-a76d86ec97.zip/node_modules/react/",
"packageDependencies": [
["react", "npm:17.0.1"],
=======
["npm:17.0.1", {
"packageLocation": "./.yarn/cache/react-npm-17.0.1-98658812fc-a76d86ec97.zip/node_modules/react/",
"packageDependencies": [
["react", "npm:17.0.1"],
>>>>>>>
["npm:17.0.1", {
"packageLocation": "./.yarn/cache/react-npm-17.0.1-98658812fc-a76d86ec97.zip/node_modules/react/",
"packageDependencies": [
["react", "npm:17.0.1"],
<<<<<<<
["react", "npm:17.0.1"],
["react-is", "npm:17.0.0-rc.3"],
["react-shallow-renderer", "virtual:75a4afb77c5822d7e44b427f5b597493abc40764f5fc91262d397dc65ce77278f21e79501d2b23ec73e5a4c17dd6f8e4991b3ccb3d4edc4ba030d70d9da474ef#npm:16.14.1"],
["scheduler", "npm:0.20.0-rc.3"]
=======
["react", "npm:17.0.1"],
["react-is", "npm:17.0.1"],
["react-shallow-renderer", "virtual:fcf777ff1a2595a9547a7d508688d2a18b4a75128b8635ce7829ed7a6147ca4d4a0e1efa56b1f3b412d813895822df2adc1bd08970fd7e6a7697df8d1057cab5#npm:16.14.1"],
["scheduler", "npm:0.20.1"]
>>>>>>>
["react", "npm:17.0.1"],
["react-is", "npm:17.0.1"],
["react-shallow-renderer", "virtual:fcf777ff1a2595a9547a7d508688d2a18b4a75128b8635ce7829ed7a6147ca4d4a0e1efa56b1f3b412d813895822df2adc1bd08970fd7e6a7697df8d1057cab5#npm:16.14.1"],
["scheduler", "npm:0.20.1"]
<<<<<<<
["npm:0.20.0-rc.3", {
"packageLocation": "./.yarn/cache/scheduler-npm-0.20.0-rc.3-fe9979019d-573f2ff261.zip/node_modules/scheduler/",
"packageDependencies": [
["scheduler", "npm:0.20.0-rc.3"],
["loose-envify", "npm:1.4.0"],
["object-assign", "npm:4.1.1"]
],
"linkType": "HARD",
}],
["npm:0.20.1", {
"packageLocation": "./.yarn/cache/scheduler-npm-0.20.1-db303b7f5c-377b4ad0d8.zip/node_modules/scheduler/",
=======
["npm:0.20.1", {
"packageLocation": "./.yarn/cache/scheduler-npm-0.20.1-db303b7f5c-377b4ad0d8.zip/node_modules/scheduler/",
>>>>>>>
["npm:0.20.0-rc.3", {
"packageLocation": "./.yarn/cache/scheduler-npm-0.20.0-rc.3-fe9979019d-573f2ff261.zip/node_modules/scheduler/",
"packageDependencies": [
["scheduler", "npm:0.20.0-rc.3"],
["loose-envify", "npm:1.4.0"],
["object-assign", "npm:4.1.1"]
],
"linkType": "HARD",
}],
["npm:0.20.1", {
"packageLocation": "./.yarn/cache/scheduler-npm-0.20.1-db303b7f5c-377b4ad0d8.zip/node_modules/scheduler/", |
<<<<<<<
metadata: state.metadata,
=======
totalStateCounts: state.tree.totalStateCounts,
metadata: state.metadata.metadata,
>>>>>>>
totalStateCounts: state.tree.totalStateCounts,
metadata: state.metadata, |
<<<<<<<
["virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:5.1.3", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-9b985c5e80/0/cache/webpack-npm-5.1.3-ee81460ee2-4c741af383.zip/node_modules/webpack/",
"packageDependencies": [
["webpack", "virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:5.1.3"],
["@types/eslint-scope", "npm:3.7.0"],
["@types/estree", "npm:0.0.45"],
["@webassemblyjs/ast", "npm:1.9.0"],
["@webassemblyjs/helper-module-context", "npm:1.9.0"],
["@webassemblyjs/wasm-edit", "npm:1.9.0"],
["@webassemblyjs/wasm-parser", "npm:1.9.0"],
["acorn", "npm:8.0.4"],
["browserslist", "npm:4.14.5"],
["chrome-trace-event", "npm:1.0.2"],
["enhanced-resolve", "npm:5.3.1"],
["eslint-scope", "npm:5.1.1"],
["events", "npm:3.2.0"],
["glob-to-regexp", "npm:0.4.1"],
["graceful-fs", "npm:4.2.4"],
["json-parse-better-errors", "npm:1.0.2"],
["loader-runner", "npm:4.1.0"],
["mime-types", "npm:2.1.27"],
["neo-async", "npm:2.6.2"],
["pkg-dir", "npm:4.2.0"],
["schema-utils", "npm:3.0.0"],
["tapable", "npm:2.0.0"],
["terser-webpack-plugin", "virtual:9b985c5e80af341178a8554211552e18c0fae97e5c83c4e23cb2a0f7ed21cfdeb529be0e2735c7739fd407f0bcb8a9d3321b3c7207fde6ebb1350d0a24af4571#npm:5.0.1"],
["watchpack", "npm:2.0.0"],
["webpack-cli", "virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:4.0.0"],
["webpack-sources", "npm:2.1.0"]
],
"packagePeers": [
"webpack-cli"
],
"linkType": "HARD",
}],
["virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:5.2.0", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-2c9cfe9902/0/cache/webpack-npm-5.2.0-128d7e3fc2-1f91563c25.zip/node_modules/webpack/",
=======
["virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:5.3.0", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-8905992c27/0/cache/webpack-npm-5.3.0-24424e3a6a-039d91f1ea.zip/node_modules/webpack/",
>>>>>>>
["virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:5.1.3", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-9b985c5e80/0/cache/webpack-npm-5.1.3-ee81460ee2-4c741af383.zip/node_modules/webpack/",
"packageDependencies": [
["webpack", "virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:5.1.3"],
["@types/eslint-scope", "npm:3.7.0"],
["@types/estree", "npm:0.0.45"],
["@webassemblyjs/ast", "npm:1.9.0"],
["@webassemblyjs/helper-module-context", "npm:1.9.0"],
["@webassemblyjs/wasm-edit", "npm:1.9.0"],
["@webassemblyjs/wasm-parser", "npm:1.9.0"],
["acorn", "npm:8.0.4"],
["browserslist", "npm:4.14.5"],
["chrome-trace-event", "npm:1.0.2"],
["enhanced-resolve", "npm:5.3.1"],
["eslint-scope", "npm:5.1.1"],
["events", "npm:3.2.0"],
["glob-to-regexp", "npm:0.4.1"],
["graceful-fs", "npm:4.2.4"],
["json-parse-better-errors", "npm:1.0.2"],
["loader-runner", "npm:4.1.0"],
["mime-types", "npm:2.1.27"],
["neo-async", "npm:2.6.2"],
["pkg-dir", "npm:4.2.0"],
["schema-utils", "npm:3.0.0"],
["tapable", "npm:2.0.0"],
["terser-webpack-plugin", "virtual:9b985c5e80af341178a8554211552e18c0fae97e5c83c4e23cb2a0f7ed21cfdeb529be0e2735c7739fd407f0bcb8a9d3321b3c7207fde6ebb1350d0a24af4571#npm:5.0.1"],
["watchpack", "npm:2.0.0"],
["webpack-cli", "virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:4.0.0"],
["webpack-sources", "npm:2.1.0"]
],
"packagePeers": [
"webpack-cli"
],
"linkType": "HARD",
}],
["virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:5.3.0", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-8905992c27/0/cache/webpack-npm-5.3.0-24424e3a6a-039d91f1ea.zip/node_modules/webpack/",
<<<<<<<
["virtual:270d82db604954d961cc9f757385701a41fef1be9394b7dfdd6397f44e5ade32e0654e585ce5553233f046dd87d6ed47ed75ed4197dde852ba15a88c4364ec5d#npm:5.2.0", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-3d23f033c9/0/cache/webpack-npm-5.2.0-128d7e3fc2-1f91563c25.zip/node_modules/webpack/",
"packageDependencies": [
["webpack", "virtual:270d82db604954d961cc9f757385701a41fef1be9394b7dfdd6397f44e5ade32e0654e585ce5553233f046dd87d6ed47ed75ed4197dde852ba15a88c4364ec5d#npm:5.2.0"],
["@types/eslint-scope", "npm:3.7.0"],
["@types/estree", "npm:0.0.45"],
["@webassemblyjs/ast", "npm:1.9.0"],
["@webassemblyjs/helper-module-context", "npm:1.9.0"],
["@webassemblyjs/wasm-edit", "npm:1.9.0"],
["@webassemblyjs/wasm-parser", "npm:1.9.0"],
["acorn", "npm:8.0.4"],
["browserslist", "npm:4.14.5"],
["chrome-trace-event", "npm:1.0.2"],
["enhanced-resolve", "npm:5.3.1"],
["eslint-scope", "npm:5.1.1"],
["events", "npm:3.2.0"],
["glob-to-regexp", "npm:0.4.1"],
["graceful-fs", "npm:4.2.4"],
["json-parse-better-errors", "npm:1.0.2"],
["loader-runner", "npm:4.1.0"],
["mime-types", "npm:2.1.27"],
["neo-async", "npm:2.6.2"],
["pkg-dir", "npm:4.2.0"],
["schema-utils", "npm:3.0.0"],
["tapable", "npm:2.0.0"],
["terser-webpack-plugin", "virtual:3d23f033c9af39b296bab58c813a964250165fac7385ebd520c1bc609c43c4465d3a578fb932672373041574e99eb32a3e46bc7462158da0f7afa24cef8327f1#npm:5.0.1"],
["watchpack", "npm:2.0.0"],
["webpack-cli", "virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:4.0.0"],
["webpack-sources", "npm:2.1.0"]
],
"packagePeers": [
"webpack-cli"
],
"linkType": "HARD",
}],
["virtual:54dfdd95092c538917b1daf717721dd3beca716f0768958f8123e1439693d909b26a74c88b3fb65b402559e626be2accab32554fb8a3874e699047fe18793f5e#npm:5.2.0", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-e2b8f407ac/0/cache/webpack-npm-5.2.0-128d7e3fc2-1f91563c25.zip/node_modules/webpack/",
=======
["virtual:54dfdd95092c538917b1daf717721dd3beca716f0768958f8123e1439693d909b26a74c88b3fb65b402559e626be2accab32554fb8a3874e699047fe18793f5e#npm:5.3.0", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-4b45f91185/0/cache/webpack-npm-5.3.0-24424e3a6a-039d91f1ea.zip/node_modules/webpack/",
>>>>>>>
["virtual:270d82db604954d961cc9f757385701a41fef1be9394b7dfdd6397f44e5ade32e0654e585ce5553233f046dd87d6ed47ed75ed4197dde852ba15a88c4364ec5d#npm:5.3.0", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-b9817f6e3b/0/cache/webpack-npm-5.3.0-24424e3a6a-039d91f1ea.zip/node_modules/webpack/",
"packageDependencies": [
["webpack", "virtual:270d82db604954d961cc9f757385701a41fef1be9394b7dfdd6397f44e5ade32e0654e585ce5553233f046dd87d6ed47ed75ed4197dde852ba15a88c4364ec5d#npm:5.3.0"],
["@types/eslint-scope", "npm:3.7.0"],
["@types/estree", "npm:0.0.45"],
["@webassemblyjs/ast", "npm:1.9.0"],
["@webassemblyjs/helper-module-context", "npm:1.9.0"],
["@webassemblyjs/wasm-edit", "npm:1.9.0"],
["@webassemblyjs/wasm-parser", "npm:1.9.0"],
["acorn", "npm:8.0.4"],
["browserslist", "npm:4.14.5"],
["chrome-trace-event", "npm:1.0.2"],
["enhanced-resolve", "npm:5.3.1"],
["eslint-scope", "npm:5.1.1"],
["events", "npm:3.2.0"],
["glob-to-regexp", "npm:0.4.1"],
["graceful-fs", "npm:4.2.4"],
["json-parse-better-errors", "npm:1.0.2"],
["loader-runner", "npm:4.1.0"],
["mime-types", "npm:2.1.27"],
["neo-async", "npm:2.6.2"],
["pkg-dir", "npm:4.2.0"],
["schema-utils", "npm:3.0.0"],
["tapable", "npm:2.0.0"],
["terser-webpack-plugin", "virtual:b9817f6e3b41e7df1f8b91bd82cf1ff1f770b6f09c678e661736ccca9efd57a4588a815fbf9f54cb5c08a9b065a725b67d1e20a9137a442fa7cbb1090c5e4d4e#npm:5.0.1"],
["watchpack", "npm:2.0.0"],
["webpack-cli", "virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:4.0.0"],
["webpack-sources", "npm:2.1.0"]
],
"packagePeers": [
"webpack-cli"
],
"linkType": "HARD",
}],
["virtual:54dfdd95092c538917b1daf717721dd3beca716f0768958f8123e1439693d909b26a74c88b3fb65b402559e626be2accab32554fb8a3874e699047fe18793f5e#npm:5.3.0", {
"packageLocation": "./.yarn/$$virtual/webpack-virtual-4b45f91185/0/cache/webpack-npm-5.3.0-24424e3a6a-039d91f1ea.zip/node_modules/webpack/", |
<<<<<<<
["react-markdown", "virtual:65bbdbc833194d48af8b473ccb9eb396af4cb12a8148bcea865208cb4df1306b9afb0a62408cbd348e6f2af9b92764096868c744881c07da8a59708a1c9cb4f4#npm:4.3.1"],
["react-syntax-highlighter", "virtual:65bbdbc833194d48af8b473ccb9eb396af4cb12a8148bcea865208cb4df1306b9afb0a62408cbd348e6f2af9b92764096868c744881c07da8a59708a1c9cb4f4#npm:15.2.1"],
["serve", "npm:11.3.2"],
=======
["react-markdown", "virtual:88778edb3eb541da91ed32af0b5c47e0a05d782a1945b337b1a3bcc46014df8b6dac985855b5111a0a12ffbcd2c69ceaa1dc4fc613dece78de9e845311d96041#npm:4.3.1"],
["react-syntax-highlighter", "virtual:88778edb3eb541da91ed32af0b5c47e0a05d782a1945b337b1a3bcc46014df8b6dac985855b5111a0a12ffbcd2c69ceaa1dc4fc613dece78de9e845311d96041#npm:15.3.0"],
>>>>>>>
["react-markdown", "virtual:65bbdbc833194d48af8b473ccb9eb396af4cb12a8148bcea865208cb4df1306b9afb0a62408cbd348e6f2af9b92764096868c744881c07da8a59708a1c9cb4f4#npm:4.3.1"],
["react-syntax-highlighter", "virtual:88778edb3eb541da91ed32af0b5c47e0a05d782a1945b337b1a3bcc46014df8b6dac985855b5111a0a12ffbcd2c69ceaa1dc4fc613dece78de9e845311d96041#npm:15.3.0"],
<<<<<<<
["antd", "virtual:65bbdbc833194d48af8b473ccb9eb396af4cb12a8148bcea865208cb4df1306b9afb0a62408cbd348e6f2af9b92764096868c744881c07da8a59708a1c9cb4f4#npm:4.4.2"],
["babel-jest", "virtual:4a7337632ff6e9ee5a1c45a62a9ff4cc325a9367b21424babda93e269fe01b671e885bc41bdeebafb83c81f2a8eebbf0102043354a4e58905f61c8c3387cda1e#npm:26.6.2"],
=======
["antd", "virtual:54dfdd95092c538917b1daf717721dd3beca716f0768958f8123e1439693d909b26a74c88b3fb65b402559e626be2accab32554fb8a3874e699047fe18793f5e#npm:4.4.2"],
["babel-jest", "virtual:45c4e4a73ecdeb874ac155656f6a93b075598df18169a0d7d5fe84ea341578c69f53a50638751735d5da1e71e76f6896516804ed0297a3cb73d625220ac3a752#npm:26.6.2"],
>>>>>>>
["antd", "virtual:65bbdbc833194d48af8b473ccb9eb396af4cb12a8148bcea865208cb4df1306b9afb0a62408cbd348e6f2af9b92764096868c744881c07da8a59708a1c9cb4f4#npm:4.4.2"],
["babel-jest", "virtual:45c4e4a73ecdeb874ac155656f6a93b075598df18169a0d7d5fe84ea341578c69f53a50638751735d5da1e71e76f6896516804ed0297a3cb73d625220ac3a752#npm:26.6.2"],
<<<<<<<
["npm:26.5.2", {
"packageLocation": "./.yarn/cache/jest-npm-26.5.2-802df785c1-8c31ca019c.zip/node_modules/jest/",
"packageDependencies": [
["jest", "npm:26.5.2"],
["@jest/core", "npm:26.6.2"],
["import-local", "npm:3.0.2"],
["jest-cli", "npm:26.6.2"]
],
"linkType": "HARD",
}],
["npm:26.6.1", {
"packageLocation": "./.yarn/cache/jest-npm-26.6.1-3c5e3cbae1-52c44268c7.zip/node_modules/jest/",
=======
["npm:26.6.2", {
"packageLocation": "./.yarn/cache/jest-npm-26.6.2-d87075d726-6e832cefb6.zip/node_modules/jest/",
>>>>>>>
["npm:26.5.2", {
"packageLocation": "./.yarn/cache/jest-npm-26.5.2-802df785c1-8c31ca019c.zip/node_modules/jest/",
"packageDependencies": [
["jest", "npm:26.5.2"],
["@jest/core", "npm:26.6.2"],
["import-local", "npm:3.0.2"],
["jest-cli", "npm:26.6.2"]
],
"linkType": "HARD",
}],
["npm:26.6.2", {
"packageLocation": "./.yarn/cache/jest-npm-26.6.2-d87075d726-6e832cefb6.zip/node_modules/jest/", |
<<<<<<<
["terser", "npm:5.3.3"],
["webpack", "virtual:e7dd2bdbec1b3ec399e5f3318d0a58728583b58181f43cb8f4f372a1b2b9707e2ffcf76bd80aad3c5c64a731754028a8070020628ca4fa0a02fe260c179762ae#npm:5.0.0-rc.3"],
=======
["terser", "npm:5.3.4"],
["webpack", "virtual:169dbf4f150c70e8e3c520c17e13f22c456554b80004ff2d30b111a6690248a25eccb9f152a6896cfffd934fd7b2869f1b936367a5a29078787bc35442cd3978#npm:5.0.0-rc.3"],
>>>>>>>
["terser", "npm:5.3.4"],
["webpack", "virtual:e7dd2bdbec1b3ec399e5f3318d0a58728583b58181f43cb8f4f372a1b2b9707e2ffcf76bd80aad3c5c64a731754028a8070020628ca4fa0a02fe260c179762ae#npm:5.0.0-rc.3"],
<<<<<<<
["terser", "npm:5.3.3"],
["webpack", "virtual:169dbf4f150c70e8e3c520c17e13f22c456554b80004ff2d30b111a6690248a25eccb9f152a6896cfffd934fd7b2869f1b936367a5a29078787bc35442cd3978#npm:5.0.0-rc.3"],
=======
["terser", "npm:5.3.4"],
["webpack", "virtual:90d4a72924f341713b457eb175224e1ec0cb1cc17fae57e4425352a06b7bd1badc2992c0aaf430411c746462d51ce4afd9da56feea73b62dad7f9bec3f6bc226#npm:5.0.0-rc.3"],
>>>>>>>
["terser", "npm:5.3.4"],
["webpack", "virtual:169dbf4f150c70e8e3c520c17e13f22c456554b80004ff2d30b111a6690248a25eccb9f152a6896cfffd934fd7b2869f1b936367a5a29078787bc35442cd3978#npm:5.0.0-rc.3"], |
<<<<<<<
$("input[data-control]").trigger("change");
=======
$("#bookDetailsModal")
.on("show.bs.modal", function(e) {
const $modalBody = $(this).find(".modal-body");
// Prevent static assets from loading multiple times
const useCache = (options) => {
options.async = true;
options.cache = true;
};
preFilters.add(useCache);
$.get(e.relatedTarget.href).done(function(content) {
$modalBody.html(content);
preFilters.remove(useCache);
});
})
.on("hidden.bs.modal", function() {
$(this).find(".modal-body").html("...");
});
>>>>>>>
$("input[data-control]").trigger("change");
$("#bookDetailsModal")
.on("show.bs.modal", function(e) {
const $modalBody = $(this).find(".modal-body");
// Prevent static assets from loading multiple times
const useCache = (options) => {
options.async = true;
options.cache = true;
};
preFilters.add(useCache);
$.get(e.relatedTarget.href).done(function(content) {
$modalBody.html(content);
preFilters.remove(useCache);
});
})
.on("hidden.bs.modal", function() {
$(this).find(".modal-body").html("...");
}); |
<<<<<<<
MenuManager,
initializePackageManager,
=======
createMenuManager,
PackageManager,
>>>>>>>
initializePackageManager,
createMenuManager,
<<<<<<<
class DesktopApplication {
constructor() {
app.setName(AppName);
this.platform = determinePlatform(process.platform);
this.isMac = this.platform === Platforms.Mac;
=======
static sharedApplication() {
if (!this.instance) {
throw 'Attempting to access application before creation';
}
return this.instance;
}
constructor({
platform
}) {
this.platform = platform;
this.isMac = Platforms.isMac(this.platform);
app.name = AppName;
app.allowRendererProcessReuse = true;
>>>>>>>
class DesktopApplication {
constructor() {
this.platform = determinePlatform(process.platform);
this.isMac = this.platform === Platforms.Mac;
app.name = AppName;
app.allowRendererProcessReuse = true;
<<<<<<<
=======
createExtensionsServer() {
const host = createExtensionsServer();
Store.set(StoreKeys.ExtServerHost, host);
}
onWindowCreate() {
this.createServices();
this.createExtensionsServer();
}
createServices() {
this.archiveManager = new ArchiveManager(this.window);
this.packageManager = new PackageManager(this.window);
this.searchManager = new SearchManager(this.window);
this.trayManager = createTrayManager(this.window, Store, this.platform);
this.updateManager = new UpdateManager(this.window);
this.zoomManager = new ZoomManager(this.window);
const spellcheckerManager = createSpellcheckerManager(
Store.getInstance(),
this.window.webContents,
app.getLocale()
);
this.menuManager = createMenuManager({
window: this.window,
archiveManager: this.archiveManager,
updateManager: this.updateManager,
trayManager: this.trayManager,
store: Store.getInstance(),
spellcheckerManager
});
}
>>>>>>>
<<<<<<<
ipcMain.on(IpcMessages.DisplayAppMenu, (_event, position) => {
=======
ipcMain.on('display-app-menu', (event, position) => {
>>>>>>>
ipcMain.on(IpcMessages.DisplayAppMenu, (_event, position) => {
<<<<<<<
const titleBarStyle = this.isMac || useSystemMenuBar ? 'hiddenInset' : null;
=======
const titleBarStyle = (this.isMac || useSystemMenuBar)
? 'hiddenInset'
: null;
const isTesting = process.argv.includes(CommandLineArgs.Testing);
>>>>>>>
const titleBarStyle = (this.isMac || useSystemMenuBar)
? 'hiddenInset'
: null;
const isTesting = process.argv.includes(CommandLineArgs.Testing);
<<<<<<<
nodeIntegration: false,
contextIsolation: true,
preload: path.join(__dirname, 'javascripts/renderer/preload.js')
=======
spellcheck: true,
/**
* During testing, we expose unsafe node apis to the browser window as
* required by spectron (^10.0.0)
*/
nodeIntegration: isTesting,
contextIsolation: !isTesting,
preload: path.join(__dirname, 'javascripts/renderer/preload.js')
>>>>>>>
spellcheck: true,
/**
* During testing, we expose unsafe node apis to the browser window as
* required by spectron (^10.0.0)
*/
nodeIntegration: isTesting,
contextIsolation: !isTesting,
preload: path.join(__dirname, 'javascripts/renderer/preload.js')
<<<<<<<
this.window.on('blur', () => {
this.window.webContents.send(IpcMessages.WindowBlurred, null);
=======
this.window.on('blur', (event) => {
this.window.webContents.send('window-blurred', null);
>>>>>>>
this.window.on('blur', () => {
this.window.webContents.send(IpcMessages.WindowBlurred, null);
<<<<<<<
this.window.on('focus', () => {
this.window.webContents.send(IpcMessages.WindowFocused, null);
=======
this.window.on('focus', (event) => {
this.window.webContents.send('window-focused', null);
>>>>>>>
this.window.on('focus', () => {
this.window.webContents.send(IpcMessages.WindowFocused, null);
<<<<<<<
const shouldOpenUrl = url => {
return url.startsWith('http') || url.startsWith('https');
};
/**
* Check file urls for equality by decoding components
* In packaged app, spaces in navigation events urls can contain %20 but
* not in windowUrl.
*/
=======
const shouldOpenUrl = url =>
url.startsWith('http') || url.startsWith('mailto');
// Check file urls for equality by decoding components
// In packaged app, spaces in navigation events urls can contain %20 but not in windowUrl.
>>>>>>>
const shouldOpenUrl = url =>
url.startsWith('http') || url.startsWith('mailto');
/**
* Check file urls for equality by decoding components
* In packaged app, spaces in navigation events urls can contain %20
* but not in windowUrl.
*/ |
<<<<<<<
import trLocaleData from '../public/static/lang/tr.json';
=======
import zhcnLocaleData from '../public/static/lang/zh_cn.json';
>>>>>>>
import trLocaleData from '../public/static/lang/tr.json';
import zhcnLocaleData from '../public/static/lang/zh_cn.json';
<<<<<<<
uk: new i18n.Tools({ localeData: ukLocaleData, locale: 'uk' }),
tr: new i18n.Tools({ localeData: trLocaleData, locale: 'tr' })
=======
uk: new i18n.Tools({ localeData: ukLocaleData, locale: 'uk' }),
zhcn:new i18n.Tools({ localeData: zhcnLocaleData, locale: 'zhcn' })
>>>>>>>
uk : new i18n.Tools({ localeData: ukLocaleData, locale: 'uk' }),
tr : new i18n.Tools({ localeData: trLocaleData, locale: 'tr' }),
zhcn : new i18n.Tools({ localeData: zhcnLocaleData, locale: 'zhcn' }) |
<<<<<<<
);
// console.log(transformedToString);
// console.log(tables.primaryKeys);
// let transformedToString = transform(tables);
fs.writeFileSync(
path.join(PATH, `mutationZip.js`),
mutationResolver(frontEndVersion, tables)
);
=======
);
// console.log(transformedToString);
// console.log(tables.primaryKeys);
// let transformedToString = transform(tables);
>>>>>>>
);
fs.writeFileSync(
path.join(PATH, `mutationZip.js`),
mutationResolver(frontEndVersion, tables)
); |
<<<<<<<
import { filterAbbrRev, filterAbbrFwd } from "../../util/globals";
import { modifyURLquery } from "../../util/urlHelpers";
=======
import { filterAbbrRev, filterAbbrFwd, controlsWidth } from "../../util/globals";
>>>>>>>
import { filterAbbrRev, filterAbbrFwd, controlsWidth } from "../../util/globals";
import { modifyURLquery } from "../../util/urlHelpers"; |
<<<<<<<
import { changeColorBy } from "../../actions/colors";
import { modifyURLquery } from "../../util/urlHelpers";
=======
import { changeColorBy } from "../../actions/controls";
import { dataFont, darkGrey } from "../../globalStyles";
>>>>>>>
import { changeColorBy } from "../../actions/colors";
import { modifyURLquery } from "../../util/urlHelpers";
import { dataFont, darkGrey } from "../../globalStyles"; |
<<<<<<<
assert.emits(client, 'drain', function() {
client.end();
});
client.query("");
});
=======
var query = client.query("");
assert.emits(query, 'end');
client.on('drain', client.end.bind(client));
});
test('callback supported', assert.calls(function() {
client.query("", function(err, result) {
assert.isNull(err);
assert.empty(result.rows);
})
}))
>>>>>>>
assert.emits(client, 'drain', function() {
client.end();
});
client.query("");
});
test('callback supported', assert.calls(function() {
client.query("", function(err, result) {
assert.isNull(err);
assert.empty(result.rows);
})
})) |
<<<<<<<
//creates datarow metatdata from the supplied
//data row information
var buildDataRowMetadata = function(msg, converters, names) {
var parsers = {
text: new TextParser(),
binary: new BinaryParser()
};
=======
//associates row metadata from the supplied
//message with this query object
//metadata used when parsing row results
p.handleRowDescription = function(msg) {
this._fieldNames = [];
this._fieldConverters = [];
>>>>>>>
//associates row metadata from the supplied
//message with this query object
//metadata used when parsing row results
p.handleRowDescription = function(msg) {
this._fieldNames = [];
this._fieldConverters = [];
var parsers = {
text: new TextParser(),
binary: new BinaryParser()
};
<<<<<<<
var format = field.format;
names[i] = field.name;
=======
this._fieldNames[i] = field.name;
>>>>>>>
this._fieldNames[i] = field.name;
<<<<<<<
converters[i] = parsers[format].parseInt64;
=======
this._fieldConverters[i] = parseInt;
>>>>>>>
this._fieldConverters[i] = parsers[format].parseInt64;
<<<<<<<
converters[i] = parsers[format].parseFloat64;
break;
case 1700:
converters[i] = parsers[format].parseNumeric;
=======
this._fieldConverters[i] = parseFloat;
>>>>>>>
this._fieldConverters[i] = parsers[format].parseFloat64;
break;
case 1700:
this._fieldConverters[i] = parsers[format].parseNumeric;
<<<<<<<
converters[i] = parsers[format].parseBool;
=======
this._fieldConverters[i] = function(val) {
return val === 't';
};
>>>>>>>
this._fieldConverters[i] = parsers[format].parseBool;
<<<<<<<
converters[i] = parsers[format].parseDate;
break;
case 1008:
case 1009:
converters[i] = parsers[format].parseStringArray;
break;
case 1007:
case 1016:
converters[i] = parsers[format].parseIntArray;
=======
this._fieldConverters[i] = dateParser;
>>>>>>>
this._fieldConverters[i] = parsers[format].parseDate;
break;
case 1008:
case 1009:
this._fieldConverters[i] = parsers[format].parseStringArray;
break;
case 1007:
case 1016:
this._fieldConverters[i] = parsers[format].parseIntArray; |
<<<<<<<
super()
this._recipient = (config.recipient) ? new Recipient(config.recipient) : new Recipient()
this._emitter = (config.emitter) ? new Emitter(config.emitter) : new Emitter()
this._total_exc_taxes = 0
this._total_taxes = 0
this._total_inc_taxes = 0
this._article = []
this._i18nConfigure(config.language)
this.hydrate(config.global, this._itemsToHydrate())
=======
super();
this._recipient = (config.recipient) ? new Recipient(config.recipient) : new Recipient();
this._emitter = (config.emitter) ? new Emitter(config.emitter) : new Emitter();
this._total_exc_taxes = 0;
this._total_taxes = 0;
this._total_inc_taxes = 0;
this._article = [];
this.hydrate(config.global, this._itemsToHydrate());
>>>>>>>
super();
this._recipient = (config.recipient) ? new Recipient(config.recipient) : new Recipient();
this._emitter = (config.emitter) ? new Emitter(config.emitter) : new Emitter();
this._total_exc_taxes = 0;
this._total_taxes = 0;
this._total_inc_taxes = 0;
this._article = [];
this._i18nConfigure(config.language)
this.hydrate(config.global, this._itemsToHydrate());
<<<<<<<
return (!this._lang) ? this._defaultLocale : this._lang
=======
return (!this._lang) ? 'en' : this._lang;
>>>>>>>
return (!this._lang) ? this._defaultLocale : this._lang
<<<<<<<
value = value.toLowerCase()
if (!this._availableLocale.includes(value)) throw new Error(`Wrong lang, please set one of ${this._availableLocale.join(', ')}`)
this._lang = value
=======
const tmp = value.toLowerCase();
if (!['en', 'fr'].includes(tmp)) throw new Error('Wrong lang, please set \'en\' or \'fr\'');
this._lang = tmp;
>>>>>>>
const tmp = value.toLowerCase()
if (!this._availableLocale.includes(tmp)) throw new Error(`Wrong lang, please set one of ${this._availableLocale.join(', ')}`)
this._lang = tmp
<<<<<<<
/**
* @description Overrides i18n configuration
* @param config
* @private
*/
_i18nConfigure(config) {
this._defaultLocale = (config && config.defaultLocale) ? config.defaultLocale : 'en';
this._availableLocale = (config && config.locales) ? config.locales : ['en', 'fr'];
config && i18n.configure(config);
}
=======
>>>>>>>
/**
* @description Overrides i18n configuration
* @param config
* @private
*/
_i18nConfigure(config) {
this._defaultLocale = (config && config.defaultLocale) ? config.defaultLocale : 'en';
this._availableLocale = (config && config.locales) ? config.locales : ['en', 'fr'];
config && i18n.configure(config);
} |
<<<<<<<
// Get api backend Id from the context
var backendId = (this.apiBackend) ? this.apiBackend._id : this._id;
=======
//Store api id being clicked
var backendId = this.apiBackend._id;
>>>>>>>
//Store api id being clicked
var backendId = this.apiBackend._id;
<<<<<<<
// Get current user bookmark (should be only one API Bookmarks result available)
var userBookmarks = ApiBookmarks.findOne({ userId: Meteor.user()._id, apiIds: apiBackendId });
=======
// Get current user bookmark
var userBookmarks = ApiBookmarks.findOne({ userId: Meteor.userId() });
>>>>>>>
// Get current user bookmark
var userBookmarks = ApiBookmarks.findOne({ userId: Meteor.userId() });
<<<<<<<
=======
// get array of API IDs
var apiIds = userBookmarks.apiIds;
//Store api id being clicked
var backendId = this.apiBackend._id;
>>>>>>>
// get array of API IDs
var apiIds = userBookmarks.apiIds;
//Store api id being clicked
var backendId = this.apiBackend._id; |
<<<<<<<
}
=======
},
// Create API key & attach it for given user,
// Might throw errors, catch on client callback
createApiKeyForCurrentUser () {
// Get logged in user
const currentUser = Meteor.user();
// Check currentUser exists
if (currentUser) {
// Check apiUmbrellaWeb global object exists
if (apiUmbrellaWeb) {
// Create API Umbrella user object with required fields
const apiUmbrellaUserObj = {
'user': {
'email': currentUser.emails[0].address,
'first_name': '-',
'last_name': '-',
'terms_and_conditions': true,
},
};
// Try to create user on API Umbrella
try {
// Add user on API Umbrella
const response = apiUmbrellaWeb.adminApi.v1.apiUsers.createUser(apiUmbrellaUserObj);
// Set fieldsToBeUpdated
const fieldsToBeUpdated = {
'apiUmbrellaUserId': response.data.user.id,
'profile.apiKey': response.data.user.api_key,
};
// Update currentUser
Meteor.users.update({ _id: currentUser._id }, { $set: fieldsToBeUpdated });
// Insert full API Umbrella user object into API Umbrella Users collection
ApiUmbrellaUsers.insert(response.data.user);
} catch (error) {
// Meteor Error (User create failed on Umbrella)
throw new Meteor.Error(
'umbrella-createuser-error',
TAPi18n.__('umbrella_createuser_error')
);
}
} else {
// Meteor Error (apiUmbrellaWeb not defined)
throw new Meteor.Error(
'umbrella-notdefined-error',
TAPi18n.__('umbrella_notdefined_error')
);
}
} else {
// Meteor Error (User not logged in)
throw new Meteor.Error(
'apinf-usernotloggedin-error',
TAPi18n.__('apinf_usernotloggedin_error')
);
}
},
>>>>>>>
},
// Create API key & attach it for given user,
// Might throw errors, catch on client callback
createApiKeyForCurrentUser () {
// Get logged in user
const currentUser = Meteor.user();
// Check currentUser exists
if (currentUser) {
// Check apiUmbrellaWeb global object exists
if (apiUmbrellaWeb) {
// Create API Umbrella user object with required fields
const apiUmbrellaUserObj = {
'user': {
'email': currentUser.emails[0].address,
'first_name': '-',
'last_name': '-',
'terms_and_conditions': true,
},
};
// Try to create user on API Umbrella
try {
// Add user on API Umbrella
const response = apiUmbrellaWeb.adminApi.v1.apiUsers.createUser(apiUmbrellaUserObj);
// Set fieldsToBeUpdated
const fieldsToBeUpdated = {
'apiUmbrellaUserId': response.data.user.id,
'profile.apiKey': response.data.user.api_key,
};
// Update currentUser
Meteor.users.update({ _id: currentUser._id }, { $set: fieldsToBeUpdated });
// Insert full API Umbrella user object into API Umbrella Users collection
ApiUmbrellaUsers.insert(response.data.user);
} catch (error) {
// Meteor Error (User create failed on Umbrella)
throw new Meteor.Error(
'umbrella-createuser-error',
TAPi18n.__('umbrella_createuser_error')
);
}
} else {
// Meteor Error (apiUmbrellaWeb not defined)
throw new Meteor.Error(
'umbrella-notdefined-error',
TAPi18n.__('umbrella_notdefined_error')
);
}
} else {
// Meteor Error (User not logged in)
throw new Meteor.Error(
'apinf-usernotloggedin-error',
TAPi18n.__('apinf_usernotloggedin_error')
);
}
} |
<<<<<<<
export const fastTransitionDuration = 300; // in milliseconds
export const mediumTransitionDuration = 600; // in milliseconds
export const slowTransitionDuration = 1200; // in milliseconds
export const mapAnimationDurationInMilliseconds = 5000;
=======
export const fastTransitionDuration = 350; // in milliseconds
export const mediumTransitionDuration = 700; // in milliseconds
export const slowTransitionDuration = 1400; // in milliseconds
>>>>>>>
export const fastTransitionDuration = 350; // in milliseconds
export const mediumTransitionDuration = 700; // in milliseconds
export const slowTransitionDuration = 1400; // in milliseconds
export const mapAnimationDurationInMilliseconds = 5000; |
<<<<<<<
import fileNameEndsWith from '/core/helper_functions/file_name_ends_with';
=======
import DocumentationFiles from '/documentation/collection';
import { fileNameEndsWith } from '/core/helper_functions/file_name_ends_with';
>>>>>>>
import fileNameEndsWith from '/core/helper_functions/file_name_ends_with';
import DocumentationFiles from '/documentation/collection'; |
<<<<<<<
import { Settings } from '/settings/collection';
import Proxies from '/proxies/collection';
=======
import Settings from '/settings/collection';
import { Proxies } from '/proxies/collection';
>>>>>>>
import Settings from '/settings/collection';
import Proxies from '/proxies/collection'; |
<<<<<<<
import { ReactiveVar } from 'meteor/reactive-var';
=======
import { ApiBackends } from '/apis/collection/backend';
>>>>>>>
import { ReactiveVar } from 'meteor/reactive-var';
import { ApiBackends } from '/apis/collection/backend'; |
<<<<<<<
instance.autorun(() => {
if (instance.subscriptionsReady()) {
// Update reactive vatiable with proxies cursor when subscription is ready
instance.proxies.set(Proxies.find());
// Get proxies count
const proxiesCount = Proxies.find().count();
// Set button disabled if at least one proxy is already added
instance.isDisabled.set(proxiesCount >= 1);
}
});
=======
>>>>>>>
<<<<<<<
'click #add-proxy': function (event, instance) {
Modal.show('addProxy', { proxy: {}, isEdit: false });
},
=======
'click #add-proxy': function () {
// Show the add proxy form
Modal.show('proxyForm');
},
>>>>>>>
'click #add-proxy': function () {
// Show the add proxy form
Modal.show('proxyForm');
},
<<<<<<<
const instance = Template.instance();
return instance.proxies.get();
},
isDisabled () {
const instance = Template.instance();
return instance.isDisabled.get();
},
=======
// Get all proxies
const proxies = Proxies.find().fetch();
return proxies;
},
>>>>>>>
// Get all proxies
const proxies = Proxies.find().fetch();
return proxies;
},
hideAddProxyButton () {
const proxiesCount = Proxies.find().count();
// Set button disabled if at least one proxy is already added
return proxiesCount >= 1;
}, |
<<<<<<<
// On default don't display editor
instance.displayEditor = new ReactiveVar(false);
=======
instance.documentationExists = new ReactiveVar();
>>>>>>>
// On default don't display editor
instance.displayEditor = new ReactiveVar(false);
instance.documentationExists = new ReactiveVar();
<<<<<<<
displayEditor () {
return Template.instance().displayEditor.get();
},
=======
displayLinkBlock () {
const api = this.api;
const apiDoc = this.apiDoc;
// Display block if a user is manager of current API or URL is set
return api.currentUserCanManage() || apiDoc.otherUrl;
},
displayViewBlock () {
const api = this.api;
const instance = Template.instance();
// Display block if a user is manager of current API or swagger documentation is available
return api.currentUserCanManage() || instance.documentationExists.get();
},
>>>>>>>
displayEditor () {
return Template.instance().displayEditor.get();
},
displayLinkBlock () {
const api = this.api;
const apiDoc = this.apiDoc;
// Display block if a user is manager of current API or URL is set
return api.currentUserCanManage() || apiDoc.otherUrl;
},
displayViewBlock () {
const api = this.api;
const instance = Template.instance();
// Display block if a user is manager of current API or swagger documentation is available
return api.currentUserCanManage() || instance.documentationExists.get();
}, |
<<<<<<<
import { Proxies } from '/proxies/collection';
import ProxyBackends from '/proxy_backends/collection';
=======
import Proxies from '/proxies/collection';
import { ProxyBackends } from '/proxy_backends/collection';
>>>>>>>
import Proxies from '/proxies/collection';
import ProxyBackends from '/proxy_backends/collection'; |
<<<<<<<
Meteor.publish('allApiBackends', function () {
// Check if the user is signed in
if (this.userId) {
// Return all API Backends
return Apis.find();
}
// Return nothing
return null;
});
Meteor.publish('userManagedApis', function () {
=======
Meteor.publish('myManagedApis', function () {
>>>>>>>
Meteor.publish('userManagedApis', function () { |
<<<<<<<
});
Meteor.publish('organizationApisCount', function (organizationId) {
// Make sure 'organizationId' is a String
check(organizationId, String);
// Publish count of organization apis
const organizationApisCount = OrganizationApis.find({ organizationId });
// Publish an Api Counter for each Organization
Counts.publish(this, `organizationApisCount-${organizationId}`, organizationApisCount);
=======
});
Meteor.publishComposite('organizationComposite', (slug) => {
/*
Returning an organization with managers
TODO:
Move all organization related publicationd as children
*/
check(slug, String);
return {
find () {
return Organizations.find({ slug });
},
children: [
{
find (organization) {
return Meteor.users.find(
{ _id: { $in: organization.managerIds } },
{ fields: { username: 1, emails: 1, _id: 1 } });
},
},
],
};
>>>>>>>
});
Meteor.publish('organizationApisCount', function (organizationId) {
// Make sure 'organizationId' is a String
check(organizationId, String);
// Publish count of organization apis
const organizationApisCount = OrganizationApis.find({ organizationId });
// Publish an Api Counter for each Organization
Counts.publish(this, `organizationApisCount-${organizationId}`, organizationApisCount);
});
Meteor.publishComposite('organizationComposite', (slug) => {
/*
Returning an organization with managers
TODO:
Move all organization related publicationd as children
*/
check(slug, String);
return {
find () {
return Organizations.find({ slug });
},
children: [
{
find (organization) {
return Meteor.users.find(
{ _id: { $in: organization.managerIds } },
{ fields: { username: 1, emails: 1, _id: 1 } });
},
},
],
}; |
<<<<<<<
redirect: '/apis',
=======
layoutRegions: {
bar: 'navbar',
},
>>>>>>>
redirect: '/apis',
layoutRegions: {
bar: 'navbar',
},
<<<<<<<
redirect: '/apis',
=======
layoutRegions: {
bar: 'navbar',
},
>>>>>>>
redirect: '/apis',
layoutRegions: {
bar: 'navbar',
}, |
<<<<<<<
var renderProjects = function (tags, currentPageNumber, tagsString) {
=======
var renderProjects = function (tags, names) {
>>>>>>>
var renderProjects = function (tags, currentPageNumber, tagsString) {
var renderProjects = function (tags, names) {
<<<<<<<
"selectedTags": tags,
"currentPageNumber": currentPageNumber
=======
"selectedTags": tags,
"names": projectsSvc.getNames(),
"selectedNames": names
>>>>>>>
"selectedTags": tags,
"currentPageNumber": currentPageNumber
"names": projectsSvc.getNames(),
"selectedNames": names
<<<<<<<
=======
this.get("#/names/", function (context) {
renderProjects();
});
this.get("#/names/:names", function (context) {
var names = (this.params["names"] || "").toLowerCase().split(",");
renderProjects(null, names);
});
>>>>>>>
this.get("#/names/", function (context) {
renderProjects();
});
this.get("#/names/:names", function (context) {
var names = (this.params["names"] || "").toLowerCase().split(",");
renderProjects(null, names);
}); |
<<<<<<<
dispatch(server$traitNotify_Start(game, animal, traitCooperation, linkedAnimal));
dispatch(server$startFeeding(gameId, linkedAnimal.id, 1, 'GAME', animal.id));
=======
dispatch(server$traitNotify_Start(game, animal, traitCooperation, linkedAnimal.id));
dispatch(server$startFeeding(gameId, linkedAnimal, 1, 'GAME', animal.id));
>>>>>>>
dispatch(server$traitNotify_Start(game, animal, traitCooperation, linkedAnimal.id));
dispatch(server$startFeeding(gameId, linkedAnimal.id, 1, 'GAME', animal.id));
<<<<<<<
dispatch(server$traitNotify_Start(game, animal, traitCommunication, linkedAnimal));
dispatch(server$startFeeding(gameId, linkedAnimal.id, 1, tt.TraitCommunication, animal.id));
=======
dispatch(server$traitNotify_Start(game, animal, traitCommunication, linkedAnimal.id));
dispatch(server$startFeeding(gameId, linkedAnimal, 1, tt.TraitCommunication, animal.id));
>>>>>>>
dispatch(server$traitNotify_Start(game, animal, traitCommunication, linkedAnimal.id));
dispatch(server$startFeeding(gameId, linkedAnimal.id, 1, tt.TraitCommunication, animal.id)); |
<<<<<<<
return {
'en': 'translations/en.json',
'fr': 'translations/fr.json',
'id': 'translations/id.json'
};
=======
return {
'en': 'translations/en.json',
'id': 'translations/id.json',
'de': 'translations/de.json'
};
>>>>>>>
return {
'en': 'translations/en.json',
'fr': 'translations/fr.json',
'id': 'translations/id.json',
'de': 'translations/de.json'
};
<<<<<<<
this.stats.freeSpace = this.translate('LOADING').toLowerCase();
=======
this.stats.freeSpace = this.translate('LOADING').toLowerCase();
>>>>>>>
this.stats.freeSpace = this.translate('LOADING').toLowerCase();
<<<<<<<
console.log('alert for threshold violation (' + cpuTemp + '/' + this.config.thresholdCPUTemp + ')');
this.sendSocketNotification('ALERT', {config: this.config, type: 'WARNING', message: this.translate("TEMP_THRESHOLD_WARNING") + ' (' + this.stats.cpuTemp + '/' + this.config.thresholdCPUTemp + ')' });
=======
//console.log('alert for threshold violation (' + cpuTemp + '/' + this.config.thresholdCPUTemp + ')');
if (this.config.useSyslog) {
this.sendSocketNotification('ALERT',{
config: this.config,
type: 'WARNING',
message: this.translate("TEMP_THRESHOLD_WARNING") + ' (' + this.config.thresholdCPUTemp + '°C)'
});
}
if (this.config.useTelegram){
this.sendSocketNotification('ALERTTG', {
config: this.config,
message: this.translate("TEMP_THRESHOLD_WARNING") + ' (' + this.config.thresholdCPUTemp + '°C)'
});
}
>>>>>>>
console.log('alert for threshold violation (' + cpuTemp + '/' + this.config.thresholdCPUTemp + ')');
this.sendSocketNotification('ALERT', {config: this.config, type: 'WARNING', message: this.translate("TEMP_THRESHOLD_WARNING") + ' (' + this.stats.cpuTemp + '/' + this.config.thresholdCPUTemp + ')' });
<<<<<<<
this.stats.freeSpace = payload.freeSpace;
=======
this.stats.freeSpace = payload.freeSpace;
>>>>>>>
this.stats.freeSpace = payload.freeSpace;
<<<<<<<
'</tr>' +
'<tr>' +
'<td class="title" style="text-align:' + self.config.align + ';">' + this.translate("DISK_FREE") + ': </td>' +
'<td class="value" style="text-align:left;">' + this.stats.freeSpace + '</td>' +
'</tr>';
=======
'</tr>' +
'<td class="title" style="text-align:' + self.config.align + ';">' + this.translate("DISK_FREE") + ': </td>' +
'<td style="text-align: center;"><i class="fa fa-hdd-o" style="font-size:24px"></i>: </td>' +
'<td class="value" style="text-align:left;">' + this.stats.freeSpace + '</td>' +
'</tr>';
>>>>>>>
'</tr>' +
'<tr>' +
'<td class="title" style="text-align:' + self.config.align + ';">' + this.translate("DISK_FREE") + ': </td>' +
'<td style="text-align: center;"><i class="fa fa-hdd-o" style="font-size:24px"></i>: </td>' +
'<td class="value" style="text-align:left;">' + this.stats.freeSpace + '</td>' +
'</tr>'; |
<<<<<<<
autofix_dryrun: { type: "boolean" },
=======
debug: { type: "boolean" },
>>>>>>>
autofix_dryrun: { type: "boolean" },
debug: { type: "boolean" }, |
<<<<<<<
"long-lines": "warning",
=======
"no-constant": "warning",
"no-experimental": "warning",
>>>>>>>
"no-constant": "warning",
"no-experimental": "warning",
"long-lines": "warning", |
<<<<<<<
xhr.open("POST", this._options.action + queryString, true);
xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
xhr.send(file);
=======
xhr.open("POST", this._options.action + queryString, true);
xhr.setRequestHeader("X-File-Name", encodeURIComponent(name));
xhr.send(file);
>>>>>>>
xhr.open("POST", this._options.action + queryString, true);
xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
xhr.setRequestHeader("X-File-Name", encodeURIComponent(name));
xhr.send(file); |
<<<<<<<
if (metadata.author_info) {
for (const author of Object.keys(metadata.author_info)) {
body.push([
prettyString(author, {camelCase: false}),
metadata.author_info[author].n,
prettyString(metadata.author_info[author].title, {removeComma: true}),
prettyString(metadata.author_info[author].journal, {removeComma: true}),
isPaperURLValid(metadata.author_info[author]) ? formatURLString(metadata.author_info[author].paper_url) : "unknown",
authors[author].join(" ")
]);
}
=======
for (const author of Object.keys(metadata.author_info)) {
body.push([
prettyString(author, {camelCase: false}),
metadata.author_info[author].n,
prettyString(metadata.author_info[author].title, {removeComma: true}),
prettyString(metadata.author_info[author].journal, {removeComma: true}),
isPaperURLValid(metadata.author_info[author]) ? formatURLString(metadata.author_info[author].paper_url) : "unknown",
authors[author].join(",")
]);
>>>>>>>
if (metadata.author_info) {
for (const author of Object.keys(metadata.author_info)) {
body.push([
prettyString(author, {camelCase: false}),
metadata.author_info[author].n,
prettyString(metadata.author_info[author].title, {removeComma: true}),
prettyString(metadata.author_info[author].journal, {removeComma: true}),
isPaperURLValid(metadata.author_info[author]) ? formatURLString(metadata.author_info[author].paper_url) : "unknown",
authors[author].join(",")
]);
} |
<<<<<<<
const styles = this.getStyles();
return (
<div style={styles.container}>
<button
key={1}
style={materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "rect" });
modifyURLquery(this.context.router, {l: "rect"}, true);
}}>
<RectangularTreeLayout width={25} stroke="rgb(130,130,130)"/>
<span style={styles.title}> {"rectangular"} </span>
</button>
<button
key={2}
style={materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "radial" });
modifyURLquery(this.context.router, {l: "radial"}, true);
}}>
<RadialTreeLayout width={25} stroke="rgb(130,130,130)"/>
<span style={styles.title}> {"radial"} </span>
</button>
<button
key={3}
style={materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "unrooted" });
modifyURLquery(this.context.router, {l: "unrooted"}, true);
}}>
<UnrootedTreeLayout width={25} stroke="rgb(130,130,130)"/>
<span style={styles.title}> {"unrooted"} </span>
</button>
<button
key={4}
style={materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "clock" });
modifyURLquery(this.context.router, {l: "clock"}, true);
}}>
<ClockTreeLayout width={25} stroke="rgb(130,130,130)"/>
<span style={styles.title}> {"clock"} </span>
</button>
</div>
);
}
=======
const styles = this.getStyles();
const selected = this.props.layout;
return (
<div style={styles.container}>
<div style={{margin: 5}}>
<RectangularTreeLayout width={25} stroke={medGrey}/>
<button
key={1}
style={selected === "rect" ? materialButtonSelected : materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "rect" });
this.setLayoutQueryParam("rect");
}}>
<span style={styles.title}> {"rectangular"} </span>
</button>
</div>
<div style={{margin: 5}}>
<RadialTreeLayout width={25} stroke={medGrey}/>
<button
key={2}
style={selected === "radial" ? materialButtonSelected : materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "radial" });
this.setLayoutQueryParam("radial");
}}>
<span style={styles.title}> {"radial"} </span>
</button>
</div>
<div style={{margin: 5}}>
<UnrootedTreeLayout width={25} stroke={medGrey}/>
<button
key={3}
style={selected === "unrooted" ? materialButtonSelected : materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "unrooted" });
this.setLayoutQueryParam("unrooted");
}}>
<span style={styles.title}> {"unrooted"} </span>
</button>
</div>
<div style={{margin: 5}}>
<ClockTreeLayout width={25} stroke={medGrey}/>
<button
key={4}
style={selected === "clock" ? materialButtonSelected : materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "clock" });
this.setLayoutQueryParam("clock");
}}>
<span style={styles.title}> {"clock"} </span>
</button>
</div>
</div>
);
}
>>>>>>>
const styles = this.getStyles();
const selected = this.props.layout;
return (
<div style={styles.container}>
<div style={{margin: 5}}>
<RectangularTreeLayout width={25} stroke={medGrey}/>
<button
key={1}
style={selected === "rect" ? materialButtonSelected : materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "rect" });
modifyURLquery(this.context.router, {l: "rect"}, true);
}}>
<span style={styles.title}> {"rectangular"} </span>
</button>
</div>
<div style={{margin: 5}}>
<RadialTreeLayout width={25} stroke={medGrey}/>
<button
key={2}
style={selected === "radial" ? materialButtonSelected : materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "radial" });
modifyURLquery(this.context.router, {l: "radial"}, true);
}}>
<span style={styles.title}> {"radial"} </span>
</button>
</div>
<div style={{margin: 5}}>
<UnrootedTreeLayout width={25} stroke={medGrey}/>
<button
key={3}
style={selected === "unrooted" ? materialButtonSelected : materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "unrooted" });
modifyURLquery(this.context.router, {l: "unrooted"}, true);
}}>
<span style={styles.title}> {"unrooted"} </span>
</button>
</div>
<div style={{margin: 5}}>
<ClockTreeLayout width={25} stroke={medGrey}/>
<button
key={4}
style={selected === "clock" ? materialButtonSelected : materialButton}
onClick={() => {
this.props.dispatch({ type: CHANGE_LAYOUT, data: "clock" });
modifyURLquery(this.context.router, {l: "clock"}, true);
}}>
<span style={styles.title}> {"clock"} </span>
</button>
</div>
</div>
);
} |
<<<<<<<
if (opt.maxDays > 0 && countDays(time, opt.start) > opt.maxDays) return false;
if (opt.minDays > 0 && countDays(time, opt.start) < opt.minDays) return false;
=======
var time = opt.start;
var firstInvalid = 0, lastInvalid = 143403840000000; //a really large number
box.find('.day.toMonth.invalid').not('.tmp').each(function()
{
var _time = parseInt($(this).attr('time'));
if (_time > time && _time < lastInvalid)
{
lastInvalid = _time;
}
else if (_time < time && _time > firstInvalid)
{
firstInvalid = _time;
}
});
box.find('.day.toMonth.valid').each(function()
{
var time = parseInt($(this).attr('time'));
if ( time <= firstInvalid || time >= lastInvalid)
{
$(this).addClass('invalid').addClass('tmp').removeClass('valid');
}
});
if (opt.selectForward || opt.selectBackward)
{
box.find('.day.toMonth.valid').each(function()
{
var time = parseInt($(this).attr('time'));
if (
(opt.selectForward && time < opt.start )
||
(opt.selectBackward && time > opt.start)
)
{
$(this).addClass('invalid').addClass('tmp').removeClass('valid');
}
});
}
>>>>>>>
if (opt.maxDays > 0 && countDays(time, opt.start) > opt.maxDays) return false;
if (opt.minDays > 0 && countDays(time, opt.start) < opt.minDays) return false;
if (opt.selectForward && time < opt.start ) return false;
if (opt.selectBackward && time > opt.start) return false;
}
}
function updateSelectableRange()
{
box.find('.day.invalid.tmp').removeClass('tmp invalid').addClass('valid');
if (opt.start && !opt.end)
{
var time = opt.start;
var firstInvalid = 0, lastInvalid = 143403840000000; //a really large number
box.find('.day.toMonth.invalid').not('.tmp').each(function()
{
var _time = parseInt($(this).attr('time'));
if (_time > time && _time < lastInvalid)
{
lastInvalid = _time;
}
else if (_time < time && _time > firstInvalid)
{
firstInvalid = _time;
}
});
box.find('.day.toMonth.valid').each(function()
{
var time = parseInt($(this).attr('time'));
if ( time <= firstInvalid || time >= lastInvalid)
{
$(this).addClass('invalid').addClass('tmp').removeClass('valid');
}
if (!isValidTime(time))
$(this).addClass('invalid tmp').removeClass('valid');
else
$(this).addClass('valid tmp').removeClass('invalid');
});
<<<<<<<
html += '<div class="error-top">error</div>\
<div class="default-top">default</div>\
<input type="button" class="apply-btn disabled'+ getApplyBtnClass() +'" value="'+lang('apply')+'" />';
=======
html += '<input type="button" class="apply-btn disabled'+ getApplyBtnClass() +'" value="'+lang('apply')+'" />';
>>>>>>>
html += '<input type="button" class="apply-btn disabled'+ getApplyBtnClass() +'" value="'+lang('apply')+'" />';
<<<<<<<
var valid = isValidTime(day.getTime());
days.push({type:'lastMonth',day: day.getDate(),time:day.getTime(), valid:valid });
=======
var valid = true;
if (opt.startDate && compare_day(day,opt.startDate) < 0) valid = false;
if (opt.endDate && compare_day(day,opt.endDate) > 0) valid = false;
days.push(
{
date: day,
type:'lastMonth',
day: day.getDate(),
time:day.getTime(),
valid:valid
});
>>>>>>>
var valid = isValidTime(day.getTime());
if (opt.startDate && compare_day(day,opt.startDate) < 0) valid = false;
if (opt.endDate && compare_day(day,opt.endDate) > 0) valid = false;
days.push(
{
date: day,
type:'lastMonth',
day: day.getDate(),
time:day.getTime(),
valid:valid
});
<<<<<<<
var valid = isValidTime(today.getTime());
days.push({type: today.getMonth() == toMonth ? 'toMonth' : 'nextMonth',day: today.getDate(),time:today.getTime(), valid:valid });
=======
var valid = true;
if (opt.startDate && compare_day(today,opt.startDate) < 0) valid = false;
if (opt.endDate && compare_day(today,opt.endDate) > 0) valid = false;
days.push(
{
date: today,
type: today.getMonth() == toMonth ? 'toMonth' : 'nextMonth',
day: today.getDate(),
time:today.getTime(),
valid:valid
});
>>>>>>>
var valid = isValidTime(today.getTime());
if (opt.startDate && compare_day(today,opt.startDate) < 0) valid = false;
if (opt.endDate && compare_day(today,opt.endDate) > 0) valid = false;
days.push(
{
date: today,
type: today.getMonth() == toMonth ? 'toMonth' : 'nextMonth',
day: today.getDate(),
time:today.getTime(),
valid:valid
}); |
<<<<<<<
, os = require('os')
, async = require('async')
=======
, extend = require('extend')
>>>>>>>
, os = require('os')
, async = require('async')
, extend = require('extend')
<<<<<<<
=======
if (sock) {
this.sock = sock
} else {
this.sock = this._createSocket((typeof opts.reuseAddr === 'undefined') ? true : opts.reuseAddr)
this.sock.unref()
}
>>>>>>>
<<<<<<<
SSDP.prototype._createSockets = function () {
var interfaces = os.networkInterfaces()
, self = this
this.sockets = {}
=======
SSDP.prototype._createSocket = function (reuseAddr) {
if (parseFloat(process.version.replace(/\w/, ''))>=0.12) {
return dgram.createSocket({type: 'udp4', reuseAddr: reuseAddr})
}
>>>>>>>
SSDP.prototype._createSockets = function () {
var interfaces = os.networkInterfaces()
, self = this
this.sockets = {}
<<<<<<<
'200 OK', {
'ST': serviceType === c.SSDP_ALL ? usn : serviceType,
=======
'200 OK',
extend({
'ST': serviceType === 'ssdp:all' ? usn : serviceType,
>>>>>>>
'200 OK', extend({
'ST': serviceType === c.SSDP_ALL ? usn : serviceType, |
<<<<<<<
this.sock = this._createSocket((typeof opts.reuseAddr === 'undefined') ? true : opts.reuseAddr)
=======
this.sock = this._createSocket()
this.sock.unref()
>>>>>>>
this.sock = this._createSocket((typeof opts.reuseAddr === 'undefined') ? true : opts.reuseAddr)
this.sock.unref() |
<<<<<<<
loadTex:loadTex,
textureSize:textureSize,
=======
loadTexture:loadTexture,
>>>>>>>
textureSize:textureSize,
loadTexture:loadTexture, |
<<<<<<<
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/Fake_classname_tags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
=======
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
>>>>>>>
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/Fake_classname_tags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
<<<<<<<
module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/Fake_classname_tags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
=======
module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
>>>>>>>
module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/Fake_classname_tags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
<<<<<<<
}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, FakeApi, Fake_classname_tags123Api, PetApi, StoreApi, UserApi) {
=======
}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, FakeApi, PetApi, StoreApi, UserApi) {
>>>>>>>
}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, FakeApi, Fake_classname_tags123Api, PetApi, StoreApi, UserApi) { |
<<<<<<<
ranges: [],
roundRanges: [],
mostRecentRoundRanges: []
=======
ranges: [],
statuses: []
>>>>>>>
ranges: [],
roundRanges: [],
mostRecentRoundRanges: [],
statuses: []
<<<<<<<
$scope.acquiredOnCount = ComponentData.acquiredOnCount;
$scope.foundedOnCount = ComponentData.foundedOnCount;
$scope.fundingPerRound = ComponentData.fundingPerRound;
$scope.mostRecentFundingRound = ComponentData.mostRecentFundingRound;
=======
$scope.companyStatuses = ComponentData.companyStatusData;
>>>>>>>
$scope.acquiredOnCount = ComponentData.acquiredOnCount;
$scope.foundedOnCount = ComponentData.foundedOnCount;
$scope.fundingPerRound = ComponentData.fundingPerRound;
$scope.mostRecentFundingRound = ComponentData.mostRecentFundingRound;
$scope.companyStatuses = ComponentData.companyStatusData;
<<<<<<<
filterData.roundRanges = $scope.selectedRoundRanges;
filterData.mostRecentRoundRanges = $scope.selectedRecentRoundRanges;
=======
filterData.statuses = $scope.selectedStatuses;
>>>>>>>
filterData.roundRanges = $scope.selectedRoundRanges;
filterData.mostRecentRoundRanges = $scope.selectedRecentRoundRanges;
filterData.statuses = $scope.selectedStatuses; |
<<<<<<<
acquired_on: d3.time.format('%x')(randomDate(new Date(2000, 1, 1), new Date())), //Random date between two dates
=======
founded_on: d3.time.format('%x')(randomDate(14)),
>>>>>>>
acquired_on: d3.time.format('%x')(randomDate(new Date(2000, 1, 1), new Date())), //Random date between two dates
founded_on: d3.time.format('%x')(randomDate(new Date(2000, 1, 1), new Date())),
<<<<<<<
funded_on: d3.time.format('%x')(randomDate(new Date(2000, 1, 1), new Date())),
=======
funded_on: d3.time.format('%x')(randomDate(14)),
>>>>>>>
funded_on: d3.time.format('%x')(randomDate(new Date(2000, 1, 1), new Date())), |
<<<<<<<
this.totalFunding = _.memoize(function(companies, allCompanies) {
if(typeof allCompanies === 'undefined' || typeof companies === 'undefined') { return; }
function abbreviateNumber(value) {
var newValue = value;
if (value >= 1000) {
var suffixes = ["", "K", "M", "B","T"];
var suffixNum = Math.floor( ((""+value).length -1)/3 );
var shortValue = '';
for (var precision = 2; precision >= 1; precision--) {
shortValue = parseFloat( (suffixNum != 0 ? (value / Math.pow(1000,suffixNum) ) : value).toPrecision(precision));
var dotLessShortValue = (shortValue + '').replace(/[^a-zA-Z 0-9]+/g,'');
if (dotLessShortValue.length <= 3) { break; }
}
newValue = shortValue+suffixes[suffixNum];
}
console.log('label name: ' + newValue);
return newValue;
}
function labelfy(num) {
return '$' + abbreviateNumber(num);
}
var fundingValues = _.pluck(allCompanies, 'total_funding');
var maxNum = parseInt(_.max(fundingValues, function(n){ return parseInt(n); }));
var base = 2;
var minGraph = 100000;
var maxGraph = minGraph;
while(maxGraph < maxNum) {
maxGraph *= base;
}
var ranges = [{start: 1, end: minGraph, label: labelfy(minGraph), count: 0, objs: []}];
for(var i = minGraph; i < maxNum; i *= base) {
ranges.push(
{start: i, end: i * base, label: labelfy(i * base), count: 0, objs: []}
);
}
for(var j = 0; j < companies.length; j++) {
var company = companies[j];
for(var k = 0; k < ranges.length; k++) {
var range = ranges[k];
var total_funding = parseInt(company.total_funding);
if (range.start < total_funding && total_funding < range.end) {
range.count++;
range.objs.push(company);
break;
}
}
}
return ranges;
});
=======
/**
* Constructs geoJson data necessary for the company location map
*
* @param {array} companies A filtered list of companies to display on the map
* @return {object} A GeoJson hash that maps the latitude and longitude of each company in companies
*/
>>>>>>>
/**
* TODO: Rewrite this to take into account data that is outside of our expected bounds
* Constructs data necessary for the totalFunding bar graph
*
* @param {array} companies A filtered list of companies to include in the totalFunding graph
*/
this.totalFunding = _.memoize(function(companies, allCompanies) {
if(typeof allCompanies === 'undefined' || typeof companies === 'undefined') { return; }
function abbreviateNumber(value) {
var newValue = value;
if (value >= 1000) {
var suffixes = ["", "K", "M", "B","T"];
var suffixNum = Math.floor( ((""+value).length -1)/3 );
var shortValue = '';
for (var precision = 2; precision >= 1; precision--) {
shortValue = parseFloat( (suffixNum != 0 ? (value / Math.pow(1000,suffixNum) ) : value).toPrecision(precision));
var dotLessShortValue = (shortValue + '').replace(/[^a-zA-Z 0-9]+/g,'');
if (dotLessShortValue.length <= 3) { break; }
}
newValue = shortValue+suffixes[suffixNum];
}
console.log('label name: ' + newValue);
return newValue;
}
function labelfy(num) {
return '$' + abbreviateNumber(num);
}
var fundingValues = _.pluck(allCompanies, 'total_funding');
var maxNum = parseInt(_.max(fundingValues, function(n){ return parseInt(n); }));
var base = 2;
var minGraph = 100000;
var maxGraph = minGraph;
while(maxGraph < maxNum) {
maxGraph *= base;
}
var ranges = [{start: 1, end: minGraph, label: labelfy(minGraph), count: 0, objs: []}];
for(var i = minGraph; i < maxNum; i *= base) {
ranges.push(
{start: i, end: i * base, label: labelfy(i * base), count: 0, objs: []}
);
}
for(var j = 0; j < companies.length; j++) {
var company = companies[j];
for(var k = 0; k < ranges.length; k++) {
var range = ranges[k];
var total_funding = parseInt(company.total_funding);
if (range.start < total_funding && total_funding < range.end) {
range.count++;
range.objs.push(company);
break;
}
}
}
return ranges;
});
/**
* Constructs geoJson data necessary for the company location map
*
* @param {array} companies A filtered list of companies to display on the map
* @return {object} A GeoJson hash that maps the latitude and longitude of each company in companies
*/
<<<<<<<
=======
/**
* TODO: Rewrite this to take into account data that is outside of our expected bounds
* Constructs data necessary for the totalFunding bar graph
*
* @param {array} companies A filtered list of companies to include in the totalFunding graph
*/
this.totalFunding = _.memoize(function(companies) {
var total_raised_data = [];
if (companies && companies.length > 0) {
for(var i = 1; i <= 10; i++){
total_raised_data.push({
label: '$'+i+' - $'+((i === 1 ? 0 : i)+1) + 'M',
count: 0
});
}
_.each(companies, function(company) {
var label_index = Math.floor((company.total_funding + 1) / 1000000);
total_raised_data[label_index].count++;
});
}
return total_raised_data;
});
>>>>>>> |
<<<<<<<
=======
>>>>>>>
<<<<<<<
if(ranges.length === 0) { return true; }
if(company_funding.length === 0) { return false; }
for(var i = 0; i < ranges.length; i++) {
var range = ranges[i];
for(var j = 0; j < company_funding.length; j++) {
var funding = company_funding[j];
if(funding >= range.start && funding <= range.end) {
return true;
}
}
}
return false;
=======
return fallsWithinRange(company_funding, ranges);
});
},
byFundingPerRound: function() {
var ranges = this.filterData.roundRanges;
this.dimensions.byFundingPerRound.filter(function(roundFunding){
return fallsWithinRange(roundFunding, ranges);
});
},
byMostRecentFundingRound: function() {
var ranges = this.filterData.mostRecentRoundRanges;
this.dimensions.byMostRecentFundingRound.filter(function(company_funding) {
return fallsWithinRange(company_funding, ranges);
>>>>>>>
if(ranges.length === 0) { return true; }
if(company_funding.length === 0) { return false; }
for(var i = 0; i < ranges.length; i++) {
var range = ranges[i];
for(var j = 0; j < company_funding.length; j++) {
var funding = company_funding[j];
if(funding >= range.start && funding <= range.end) {
return true;
}
}
}
return false;
});
},
byFundingPerRound: function() {
var ranges = this.filterData.roundRanges;
this.dimensions.byFundingPerRound.filter(function(roundFunding){
return fallsWithinRange(roundFunding, ranges);
});
},
byMostRecentFundingRound: function() {
var ranges = this.filterData.mostRecentRoundRanges;
this.dimensions.byMostRecentFundingRound.filter(function(company_funding) {
return fallsWithinRange(company_funding, ranges); |
<<<<<<<
*
* Swagger Codegen version: 2.3.0-SNAPSHOT
*
=======
>>>>>>>
<<<<<<<
(function(factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Category', 'model/ClassModel', 'model/Client', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterBoolean', 'model/OuterComposite', 'model/OuterEnum', 'model/OuterNumber', 'model/OuterString', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'model/Cat', 'model/Dog', 'api/FakeApi', 'api/Fake_classname_tags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
} else if (typeof module === 'object' && module.exports) {
// CommonJS-like environments that support module.exports, like Node.
module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterBoolean'), require('./model/OuterComposite'), require('./model/OuterEnum'), require('./model/OuterNumber'), require('./model/OuterString'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./model/Cat'), require('./model/Dog'), require('./api/FakeApi'), require('./api/Fake_classname_tags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
}
}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Category, ClassModel, Client, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterBoolean, OuterComposite, OuterEnum, OuterNumber, OuterString, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, Cat, Dog, FakeApi, Fake_classname_tags123Api, PetApi, StoreApi, UserApi) {
'use strict';
/**
* This_spec_is_mainly_for_testing_Petstore_server_and_contains_fake_endpoints_models__Please_do_not_use_this_for_any_other_purpose__Special_characters__.<br>
* The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
* <p>
* An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
* <pre>
* var SwaggerPetstore = require('index'); // See note below*.
* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
* var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
* yyyModel.someProperty = 'someValue';
* ...
* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
* ...
* </pre>
* <em>*NOTE: For a top-level AMD script, use require(['index'], function(){...})
* and put the application logic within the callback function.</em>
* </p>
* <p>
* A non-AMD browser application (discouraged) might do something like this:
* <pre>
* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
* var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
* yyyModel.someProperty = 'someValue';
* ...
* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
* ...
* </pre>
* </p>
* @module index
* @version 1.0.0
*/
var exports = {
=======
import ApiClient from './ApiClient';
import AdditionalPropertiesClass from './model/AdditionalPropertiesClass';
import Animal from './model/Animal';
import AnimalFarm from './model/AnimalFarm';
import ApiResponse from './model/ApiResponse';
import ArrayOfArrayOfNumberOnly from './model/ArrayOfArrayOfNumberOnly';
import ArrayOfNumberOnly from './model/ArrayOfNumberOnly';
import ArrayTest from './model/ArrayTest';
import Capitalization from './model/Capitalization';
import Category from './model/Category';
import ClassModel from './model/ClassModel';
import Client from './model/Client';
import EnumArrays from './model/EnumArrays';
import EnumClass from './model/EnumClass';
import EnumTest from './model/EnumTest';
import FormatTest from './model/FormatTest';
import HasOnlyReadOnly from './model/HasOnlyReadOnly';
import List from './model/List';
import MapTest from './model/MapTest';
import MixedPropertiesAndAdditionalPropertiesClass from './model/MixedPropertiesAndAdditionalPropertiesClass';
import Model200Response from './model/Model200Response';
import ModelReturn from './model/ModelReturn';
import Name from './model/Name';
import NumberOnly from './model/NumberOnly';
import Order from './model/Order';
import OuterBoolean from './model/OuterBoolean';
import OuterComposite from './model/OuterComposite';
import OuterEnum from './model/OuterEnum';
import OuterNumber from './model/OuterNumber';
import OuterString from './model/OuterString';
import Pet from './model/Pet';
import ReadOnlyFirst from './model/ReadOnlyFirst';
import SpecialModelName from './model/SpecialModelName';
import Tag from './model/Tag';
import User from './model/User';
import Cat from './model/Cat';
import Dog from './model/Dog';
import FakeApi from './api/FakeApi';
import PetApi from './api/PetApi';
import StoreApi from './api/StoreApi';
import UserApi from './api/UserApi';
/**
* This_spec_is_mainly_for_testing_Petstore_server_and_contains_fake_endpoints_models__Please_do_not_use_this_for_any_other_purpose__Special_characters__.<br>
* The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
* <p>
* An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
* <pre>
* var SwaggerPetstore = require('index'); // See note below*.
* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
* var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
* yyyModel.someProperty = 'someValue';
* ...
* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
* ...
* </pre>
* <em>*NOTE: For a top-level AMD script, use require(['index'], function(){...})
* and put the application logic within the callback function.</em>
* </p>
* <p>
* A non-AMD browser application (discouraged) might do something like this:
* <pre>
* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
* var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
* yyyModel.someProperty = 'someValue';
* ...
* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
* ...
* </pre>
* </p>
* @module index
* @version 1.0.0
*/
export {
>>>>>>>
import ApiClient from './ApiClient';
import AdditionalPropertiesClass from './model/AdditionalPropertiesClass';
import Animal from './model/Animal';
import AnimalFarm from './model/AnimalFarm';
import ApiResponse from './model/ApiResponse';
import ArrayOfArrayOfNumberOnly from './model/ArrayOfArrayOfNumberOnly';
import ArrayOfNumberOnly from './model/ArrayOfNumberOnly';
import ArrayTest from './model/ArrayTest';
import Capitalization from './model/Capitalization';
import Category from './model/Category';
import ClassModel from './model/ClassModel';
import Client from './model/Client';
import EnumArrays from './model/EnumArrays';
import EnumClass from './model/EnumClass';
import EnumTest from './model/EnumTest';
import FormatTest from './model/FormatTest';
import HasOnlyReadOnly from './model/HasOnlyReadOnly';
import List from './model/List';
import MapTest from './model/MapTest';
import MixedPropertiesAndAdditionalPropertiesClass from './model/MixedPropertiesAndAdditionalPropertiesClass';
import Model200Response from './model/Model200Response';
import ModelReturn from './model/ModelReturn';
import Name from './model/Name';
import NumberOnly from './model/NumberOnly';
import Order from './model/Order';
import OuterBoolean from './model/OuterBoolean';
import OuterComposite from './model/OuterComposite';
import OuterEnum from './model/OuterEnum';
import OuterNumber from './model/OuterNumber';
import OuterString from './model/OuterString';
import Pet from './model/Pet';
import ReadOnlyFirst from './model/ReadOnlyFirst';
import SpecialModelName from './model/SpecialModelName';
import Tag from './model/Tag';
import User from './model/User';
import Cat from './model/Cat';
import Dog from './model/Dog';
import FakeApi from './api/FakeApi';
import Fake_classname_tags123Api from './api/Fake_classname_tags123Api';
import PetApi from './api/PetApi';
import StoreApi from './api/StoreApi';
import UserApi from './api/UserApi';
/**
* This_spec_is_mainly_for_testing_Petstore_server_and_contains_fake_endpoints_models__Please_do_not_use_this_for_any_other_purpose__Special_characters__.<br>
* The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
* <p>
* An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
* <pre>
* var SwaggerPetstore = require('index'); // See note below*.
* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
* var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
* yyyModel.someProperty = 'someValue';
* ...
* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
* ...
* </pre>
* <em>*NOTE: For a top-level AMD script, use require(['index'], function(){...})
* and put the application logic within the callback function.</em>
* </p>
* <p>
* A non-AMD browser application (discouraged) might do something like this:
* <pre>
* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
* var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
* yyyModel.someProperty = 'someValue';
* ...
* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
* ...
* </pre>
* </p>
* @module index
* @version 1.0.0
*/
export {
<<<<<<<
* The Fake_classname_tags123Api service constructor.
* @property {module:api/Fake_classname_tags123Api}
*/
Fake_classname_tags123Api: Fake_classname_tags123Api,
/**
* The PetApi service constructor.
* @property {module:api/PetApi}
*/
PetApi: PetApi,
=======
* The FakeApi service constructor.
* @property {module:api/FakeApi}
*/
FakeApi,
>>>>>>>
* The FakeApi service constructor.
* @property {module:api/FakeApi}
*/
FakeApi,
/**
* The Fake_classname_tags123Api service constructor.
* @property {module:api/Fake_classname_tags123Api}
*/
Fake_classname_tags123Api, |
<<<<<<<
import Toast from '../../../components/toast/index'
import DocsHeader from '../../components/doc-header'
=======
import AtToast from '../../../components/toast/index'
import AtButton from '../../../components/button/index'
>>>>>>>
import DocsHeader from '../../components/doc-header'
import AtToast from '../../../components/toast/index'
<<<<<<<
<View className='example-item'>
<Button size='mini' onClick={this.handleClick}>Open Toast</Button>
=======
<View className='example__body'>
<View className='example__body-button'>
<AtButton onClick={this.handleClick}>Open Toast</AtButton>
</View>
>>>>>>>
<View className='example-item'>
<Button onClick={this.handleClick}>Open Toast</Button>
<<<<<<<
<View className='example-item'>
<Button
size='mini'
onClick={this.handleClick}
data-text='只有文本'
data-hidden-icon
>
Open Toast
</Button>
=======
<View className='example__body'>
<View className='example__body-button'>
<AtButton
onClick={this.handleClick}
data-text='只有文本'
data-hidden-icon
>
Open Toast
</AtButton>
</View>
>>>>>>>
<View className='example-item'>
<Button
onClick={this.handleClick}
data-text='只有文本'
data-hidden-icon
>
Open Toast
</Button>
<<<<<<<
<View className='example-item'>
<Button data-text='' size='mini' onClick={this.handleClick}>Open Toast</Button>
=======
<View className='example__body'>
<View className='example__body-button'>
<AtButton data-text='' onClick={this.handleClick}>
Open Toast
</AtButton>
</View>
>>>>>>>
<View className='example__item'>
<Button data-text='' onClick={this.handleClick}>
Open Toast
</Button>
<<<<<<<
<View className='example-item'>
<Button
data-icon-type='success'
data-icon-size='80'
size='mini'
onClick={this.handleClick}
>
Open Toast
</Button>
=======
<View className='example__body'>
<View className='example__body-button'>
<AtButton
data-icon-type='success'
data-icon-size='80'
onClick={this.handleClick}
>
Open Toast
</AtButton>
</View>
>>>>>>>
<View className='example__item'>
<Button
data-icon-type='success'
data-icon-size='80'
onClick={this.handleClick}
>
Open Toast
</Button> |
<<<<<<<
<AtButton onClick={this.leftDrawerClick.bind(this)}>显示 Drawer</AtButton>
{this.state.leftDrawerShow && <AtDrawer show={this.state.leftDrawerShow} mask onClose={this.onClose.bind(this)} items={['菜单1', '菜单2']}>
=======
<AtButton onClick={this.leftDrawerClick.bind(this)}>显示drawer</AtButton>
{this.state.leftDrawerShow && <AtDrawer show={this.state.leftDrawerShow} mask onItemClick={this.onItemClick.bind(this)} onClose={this.onClose.bind(this)} items={['菜单1', '菜单2']}>
>>>>>>>
<AtButton onClick={this.leftDrawerClick.bind(this)}>显示 Drawer</AtButton>
{this.state.leftDrawerShow && <AtDrawer show={this.state.leftDrawerShow} mask onItemClick={this.onItemClick.bind(this)} onClose={this.onClose.bind(this)} items={['菜单1', '菜单2']}>
<<<<<<<
<AtButton onClick={this.rightDrawerClick.bind(this)}>显示 Drawer</AtButton>
{this.state.rightDrawerShow && <AtDrawer show={this.state.rightDrawerShow} right mask onClose={this.onClose.bind(this)} items={['菜单1', '菜单2']}>
=======
<AtButton onClick={this.rightDrawerClick.bind(this)}>显示drawer</AtButton>
{this.state.rightDrawerShow && <AtDrawer show={this.state.rightDrawerShow} right mask onItemClick={this.onItemClick.bind(this)} onClose={this.onClose.bind(this)} items={['菜单1', '菜单2']}>
>>>>>>>
<AtButton onClick={this.rightDrawerClick.bind(this)}>显示 Drawer</AtButton>
{this.state.rightDrawerShow && <AtDrawer show={this.state.rightDrawerShow} right mask onItemClick={this.onItemClick.bind(this)} onClose={this.onClose.bind(this)} items={['菜单1', '菜单2']}> |
<<<<<<<
'pages/view/steps/index',
=======
'pages/view/curtain/index',
>>>>>>>
'pages/view/steps/index',
'pages/view/curtain/index', |
<<<<<<<
// import AtModalActionButton from '../../../components/modal/action//index'
import DocsHeader from '../../components/doc-header'
=======
>>>>>>>
import DocsHeader from '../../components/doc-header'
<<<<<<<
<View className='example-item'>
<Button onClick={this.handleClick}>打开 Modal</Button>
=======
<View className='example__body'>
<AtButton onClick={this.handleClick}>打开Modal</AtButton>
>>>>>>>
<View className='example-item'>
<AtButton onClick={this.handleClick}>打开Modal</AtButton> |
<<<<<<<
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/Fake_classname_tags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
=======
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
>>>>>>>
define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Cat', 'model/Category', 'model/ClassModel', 'model/Client', 'model/Dog', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterEnum', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/Fake_classname_tags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
<<<<<<<
module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/Fake_classname_tags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
=======
module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
>>>>>>>
module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Cat'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/Dog'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterEnum'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/Fake_classname_tags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
<<<<<<<
}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, FakeApi, Fake_classname_tags123Api, PetApi, StoreApi, UserApi) {
=======
}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, FakeApi, PetApi, StoreApi, UserApi) {
>>>>>>>
}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Cat, Category, ClassModel, Client, Dog, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterEnum, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, FakeApi, Fake_classname_tags123Api, PetApi, StoreApi, UserApi) { |
<<<<<<<
'!' + path + '_site/**/*'
=======
path + '_config.yml',
'!' + path + '_site/**/*.*'
>>>>>>>
path + '_config.yml',
'!' + path + '_site/**/*' |
<<<<<<<
=======
browserify2: { // grunt-browserify2
dev: {
entry: './<%= project.path.client %>/js/index.js',
compile: '<%= project.path.temp %>/js/main.js',
debug: true,
beforeHook: function (bundle) {
bundle.transform(coffeeify);
bundle.transform(hbsfy);
}
},
dist: {
entry: './<%= project.path.client %>/js/index.js',
compile: '<%= project.path.dist %>/js/main.js',
beforeHook: function (bundle) {
bundle.transform(coffeeify);
bundle.transform(hbsfy);
},
afterHook: function (source) {
return uglify.minify(source, { fromString: true }).code;
}
}
},
cacheBust: {
dev: {
files: {
src: [
'<%= project.path.temp %>/index.html'
]
}
},
dist: {
files: {
src: [
'<%= project.path.dist %>/index.html'
]
}
}
},
>>>>>>>
browserify2: { // grunt-browserify2
dev: {
entry: './<%= project.path.client %>/js/index.js',
compile: '<%= project.path.temp %>/js/main.js',
debug: true,
beforeHook: function (bundle) {
bundle.transform(coffeeify);
bundle.transform(hbsfy);
}
},
dist: {
entry: './<%= project.path.client %>/js/index.js',
compile: '<%= project.path.dist %>/js/main.js',
beforeHook: function (bundle) {
bundle.transform(coffeeify);
bundle.transform(hbsfy);
},
afterHook: function (source) {
return uglify.minify(source, { fromString: true }).code;
}
}
},
cacheBust: {
dev: {
files: {
src: [
'<%= project.path.temp %>/index.html'
]
}
},
dist: {
files: {
src: [
'<%= project.path.dist %>/index.html'
]
}
}
},
<<<<<<<
files: [{
expand: true,
dot: true,
cwd: '<%= project.path.client %>',
dest: '<%= project.path.dist %>',
src: [
'../<%= project.path.bower %>/**/*',
'fonts/**/*',
'json/**/*.json',
'views/**/*',
'*.{ico,txt}'
]
}]
=======
files: [
{
expand: true,
flatten: true,
cwd: '<%= project.path.bower %>',
dest: '<%= project.path.dist %>/js/vendor',
src: [
'es5-shim/es5-shim.js',
'json3/lib/json3.js',
'modernizr/modernizr.js'
]
},
{
expand: true,
cwd: '<%= project.path.client %>',
dest: '<%= project.path.dist %>',
src: [
'../<%= project.path.bower %>/**/*',
'fonts/**/*',
'json/**/*.json',
'*.{ico,txt}'
]
}
]
>>>>>>>
files: [
{
expand: true,
flatten: true,
cwd: '<%= project.path.bower %>',
dest: '<%= project.path.dist %>/js/vendor',
src: [
'es5-shim/es5-shim.js',
'json3/lib/json3.js',
'modernizr/modernizr.js'
]
},
{
expand: true,
cwd: '<%= project.path.client %>',
dest: '<%= project.path.dist %>',
src: [
'../<%= project.path.bower %>/**/*',
'fonts/**/*',
'json/**/*.json',
'*.{ico,txt}'
]
}
]
<<<<<<<
'<%= project.path.dist %>/css/app.css': [
'<%= project.path.temp %>/css/{,*/}*.css',
'<%= project.path.client %>/css/{,*/}*.css'
=======
'<%= project.path.dist %>/css/main.css': [
'<%= project.path.temp %>/css/**/*.css',
'<%= project.path.dist %>/css/**/*.css'
>>>>>>>
'<%= project.path.dist %>/css/main.css': [
'<%= project.path.temp %>/css/**/*.css',
'<%= project.path.dist %>/css/**/*.css'
<<<<<<<
all: {
=======
server: {
>>>>>>>
server: {
<<<<<<<
server: [
'<%= project.path.client %>/js/**/*.js',
'!<%= project.path.client %>/js/vendor/**/*',
'<%= project.path.server %>/**/*.js',
'<%= project.path.test %>/server/**/*.js'
=======
client: [
'<%= project.path.client %>/js/**/*.js',
'!<%= project.path.client %>/js/node_modules/**/*.js',
'<%= project.path.client %>/js/node_modules/*.js',
'<%= project.path.client %>/node_modules/*.js',
>>>>>>>
client: [
'<%= project.path.client %>/js/**/*.js',
'!<%= project.path.client %>/js/node_modules/**/*.js',
'<%= project.path.client %>/js/node_modules/*.js',
'<%= project.path.client %>/node_modules/*.js',
<<<<<<<
options: {
livereload: true
}
=======
tasks: [
'copy:dev',
'cacheBust:dev'
]
},
css: {
options: {
livereload: true
},
files: ['<%= project.path.temp %>/css/**/*.css']
},
less: {
options: {
interrupt: true
},
files: ['<%= project.path.client %>/less/**/*.less'],
tasks: ['less:dev']
},
jsClient: {
options: {
interrupt: true
},
files: ['<%= jshint.client %>'],
tasks: ['browserify2:dev']
},
jsServer: {
options: {
interrupt: true
},
files: ['<%= jshint.server %>'],
tasks: ['express']
},
dist: {
options: {
interrupt: true,
livereload: true
},
files: [
'<%= project.path.dist %>/css/**/*.css',
'<%= project.path.dist %>/**/*.html',
'<%= project.path.dist %>/{fonts,js,json}/**/*',
'<%= project.path.dist %>/img/**/*.{png,jpg,jpeg}',
'<%= project.path.server %>/**/*.html'
]
>>>>>>>
tasks: [
'copy:dev',
'cacheBust:dev'
]
},
css: {
options: {
livereload: true
},
files: ['<%= project.path.temp %>/css/**/*.css']
},
less: {
options: {
interrupt: true
},
files: ['<%= project.path.client %>/less/**/*.less'],
tasks: ['less:dev']
},
jsClient: {
options: {
interrupt: true
},
files: ['<%= jshint.client %>'],
tasks: ['browserify2:dev']
},
jsServer: {
options: {
interrupt: true
},
files: ['<%= jshint.server %>'],
tasks: ['express']
},
dist: {
options: {
interrupt: true,
livereload: true
},
files: [
'<%= project.path.dist %>/css/**/*.css',
'<%= project.path.dist %>/**/*.html',
'<%= project.path.dist %>/{fonts,js,json}/**/*',
'<%= project.path.dist %>/img/**/*.{png,jpg,jpeg}',
'<%= project.path.server %>/**/*.html'
]
<<<<<<<
=======
grunt.registerTask('devBuild', [
'clean:dev',
'browserify2:dev',
'less:dev',
'copy:dev',
'cacheBust:dev'
]);
>>>>>>>
grunt.registerTask('devBuild', [
'clean:dev',
'browserify2:dev',
'less:dev',
'copy:dev',
'cacheBust:dev'
]);
<<<<<<<
'less',
=======
'browserify2:dist',
'less:dist',
>>>>>>>
'browserify2:dist',
'less:dist',
<<<<<<<
'imagemin',
'cssmin',
'htmlmin',
'concat',
'copy',
'usemin',
'ngmin',
'uglify'
=======
'imagemin:dist',
'htmlmin:dist',
'cssmin:dist',
'copy:dist',
'cacheBust:dist',
'usemin',
'uglify:dist'
>>>>>>>
'imagemin:dist',
'htmlmin:dist',
'cssmin:dist',
'copy:dist',
'cacheBust:dist',
'usemin',
'ngmin',
'uglify:dist'
<<<<<<<
'jshint:server',
'clean:server',
'less',
=======
>>>>>>>
<<<<<<<
grunt.task.run('watch:production');
=======
grunt.task.run('watch:dist');
>>>>>>>
grunt.task.run('watch:dist');
<<<<<<<
grunt.registerTask('test', [
'jshint:all',
'karma:multi'
]);
=======
grunt.registerTask('develop', ['devBuild', 'devServer']);
>>>>>>>
grunt.registerTask('test', [
'jshint:all',
'karma:multi'
]);
grunt.registerTask('develop', ['devBuild', 'devServer']); |
<<<<<<<
/**
* @module EventObject
* @author [email protected]
*/
KISSY.add('event-object', function(S, undefined) {
var doc = document,
props = 'altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which'.split(' ');
/**
* KISSY's event system normalizes the event object according to
* W3C standards. The event object is guaranteed to be passed to
* the event handler. Most properties from the original event are
* copied over and normalized to the new event object.
*/
function EventObject(currentTarget, domEvent, type) {
var self = this;
self.currentTarget = currentTarget;
self.originalEvent = domEvent || { };
if (domEvent) { // html element
self.type = domEvent.type;
self._fix();
}
else { // custom
self.type = type;
self.target = currentTarget;
}
// bug fix: in _fix() method, ie maybe reset currentTarget to undefined.
self.currentTarget = currentTarget;
self.fixed = true;
}
S.augment(EventObject, {
_fix: function() {
var self = this,
originalEvent = self.originalEvent,
l = props.length, prop,
ct = self.currentTarget,
ownerDoc = (ct.nodeType === 9) ? ct : (ct.ownerDocument || doc); // support iframe
// clone properties of the original event object
while (l) {
prop = props[--l];
self[prop] = originalEvent[prop];
}
// fix target property, if necessary
if (!self.target) {
self.target = self.srcElement || doc; // srcElement might not be defined either
}
// check if target is a textnode (safari)
if (self.target.nodeType === 3) {
self.target = self.target.parentNode;
}
// add relatedTarget, if necessary
if (!self.relatedTarget && self.fromElement) {
self.relatedTarget = (self.fromElement === self.target) ? self.toElement : self.fromElement;
}
// calculate pageX/Y if missing and clientX/Y available
if (self.pageX === undefined && self.clientX !== undefined) {
var docEl = ownerDoc.documentElement, bd = ownerDoc.body;
self.pageX = self.clientX + (docEl && docEl.scrollLeft || bd && bd.scrollLeft || 0) - (docEl && docEl.clientLeft || bd && bd.clientLeft || 0);
self.pageY = self.clientY + (docEl && docEl.scrollTop || bd && bd.scrollTop || 0) - (docEl && docEl.clientTop || bd && bd.clientTop || 0);
}
// add which for key events
if (self.which === undefined) {
self.which = (self.charCode !== undefined) ? self.charCode : self.keyCode;
}
// add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
if (self.metaKey === undefined) {
self.metaKey = self.ctrlKey;
}
// add which for click: 1 === left; 2 === middle; 3 === right
// Note: button is not normalized, so don't use it
if (!self.which && self.button !== undefined) {
self.which = (self.button & 1 ? 1 : (self.button & 2 ? 3 : ( self.button & 4 ? 2 : 0)));
}
},
/**
* Prevents the event's default behavior
*/
preventDefault: function() {
var e = this.originalEvent;
// if preventDefault exists run it on the original event
if (e.preventDefault) {
e.preventDefault();
}
// otherwise set the returnValue property of the original event to false (IE)
else {
e.returnValue = false;
}
this.isDefaultPrevented = true;
},
/**
* Stops the propagation to the next bubble target
*/
stopPropagation: function() {
var e = this.originalEvent;
// if stopPropagation exists run it on the original event
if (e.stopPropagation) {
e.stopPropagation();
}
// otherwise set the cancelBubble property of the original event to true (IE)
else {
e.cancelBubble = true;
}
this.isPropagationStopped = true;
},
/**
* Stops the propagation to the next bubble target and
* prevents any additional listeners from being exectued
* on the current target.
*/
stopImmediatePropagation: function() {
var e = this.originalEvent;
if (e.stopImmediatePropagation) {
e.stopImmediatePropagation();
} else {
this.stopPropagation();
}
this.isImmediatePropagationStopped = true;
},
/**
* Stops the event propagation and prevents the default
* event behavior.
* @param immediate {boolean} if true additional listeners
* on the current target will not be executed
*/
halt: function(immediate) {
if (immediate) {
this.stopImmediatePropagation();
} else {
this.stopPropagation();
}
this.preventDefault();
}
});
S.EventObject = EventObject;
});
/**
* NOTES:
*
* 2010.04
* - http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
*
* TODO:
* - pageX, clientX, scrollLeft, clientLeft 的详细测试
*/
=======
>>>>>>>
<<<<<<<
function io(s) {
s = S.merge(defaultConfig, s);
if (s.data && !S.isString(s.data)) s.data = S.param(s.data);
var jsonp, status = SUCCESS, data, type = s.type.toUpperCase();
// Handle JSONP, 参照 jQuery, 保留 callback=? 的约定
if (s.dataType === JSONP) {
if (type === GET) {
if (!jsre.test(s.url)) {
s.url = addQuery(s.url, s.jsonp + '=?');
}
} else if (!s.data || !jsre.test(s.data)) {
s.data = (s.data ? s.data + '&' : EMPTY) + s.jsonp + '=?';
}
s.dataType = JSON;
}
// Build temporary JSONP function
if (s.dataType === JSON && (s.data && jsre.test(s.data) || jsre.test(s.url))) {
jsonp = s['jsonpCallback'] || JSONP + S.now();
=======
function io(c) {
c = S.merge(defaultConfig, c);
if(!c.url) return;
if (c.data && !S.isString(c.data)) c.data = S.param(c.data);
c.context = c.context || c;
>>>>>>>
function io(c) {
c = S.merge(defaultConfig, c);
if(!c.url) return;
if (c.data && !S.isString(c.data)) c.data = S.param(c.data);
c.context = c.context || c;
<<<<<<<
handleEvent([SUCCESS, COMPLETE], data, status, xhr, s);
=======
handleEvent([SUCCESS, COMPLETE], data, status, xhr, c);
>>>>>>>
handleEvent([SUCCESS, COMPLETE], data, status, xhr, c);
<<<<<<<
if (s.dataType === SCRIPT) {
io.fire(START);
S.getScript(s.url, jsonp ? function() {
handleEvent([SUCCESS, COMPLETE], EMPTY, status, xhr, s);
} : null);
io.fire(SEND);
return; // 结束 json/jsonp/script 的流程
=======
if (c.dataType === SCRIPT) {
fire(START, c);
// jsonp 有自己的回调处理
scriptEl = S.getScript(c.url, jsonp ? null : function() {
handleEvent([SUCCESS, COMPLETE], EMPTY, status, xhr, c);
});
fire(SEND, c);
return scriptEl;
>>>>>>>
if (c.dataType === SCRIPT) {
fire(START, c);
// jsonp 有自己的回调处理
scriptEl = S.getScript(c.url, jsonp ? null : function() {
handleEvent([SUCCESS, COMPLETE], EMPTY, status, xhr, c);
});
fire(SEND, c);
return scriptEl;
<<<<<<<
handleEvent(COMPLETE, null, ERROR, xhr, s);
=======
handleEvent(COMPLETE, null, ERROR, xhr, c);
>>>>>>>
handleEvent(COMPLETE, null, ERROR, xhr, c);
<<<<<<<
// Make sure that the request was successful or notmodified
if (status === SUCCESS) {
// JSONP handles its own success callback
if (!jsonp) {
handleEvent(SUCCESS, data, status, xhr, s);
}
} else {
handleEvent(ERROR, data, status, xhr, s);
}
// Fire the complete handlers
handleEvent(COMPLETE, data, status, xhr, s);
=======
// fire events
handleEvent([status === SUCCESS ? SUCCESS : ERROR, COMPLETE], data, status, xhr, c);
>>>>>>>
// fire events
handleEvent([status === SUCCESS ? SUCCESS : ERROR, COMPLETE], data, status, xhr, c);
<<<<<<<
success: function(data, textStatus, xhr) {
if (S.isFunction(callback)) callback(data, textStatus, xhr);
=======
success: function(data, textStatus, xhr) {
callback && callback.call(this, data, textStatus, xhr);
>>>>>>>
success: function(data, textStatus, xhr) {
callback && callback.call(this, data, textStatus, xhr);
<<<<<<<
return this;
=======
>>>>>>>
<<<<<<<
return io.get(url, data, callback, JSON);
=======
return io.get(url, data, callback, JSONP);
>>>>>>>
return io.get(url, data, callback, JSONP);
<<<<<<<
function handleEvent(type, data, status, xhr, s) {
=======
function handleEvent(type, data, status, xhr, c) {
>>>>>>>
function handleEvent(type, data, status, xhr, c) {
<<<<<<<
handleEvent(t, data, status, xhr, s);
=======
handleEvent(t, data, status, xhr, c);
>>>>>>>
handleEvent(t, data, status, xhr, c);
<<<<<<<
// 只调用与 status 匹配的 s.type, 比如成功时才调 s.complete
if(status === type) s[type](data, status, xhr);
io.fire(type, { xhr: xhr });
=======
// 只调用与 status 匹配的 c.type, 比如成功时才调 c.success
if(status === type && c[type]) c[type].call(c.context, data, status, xhr);
fire(type, c);
>>>>>>>
// 只调用与 status 匹配的 c.type, 比如成功时才调 c.success
if(status === type && c[type]) c[type].call(c.context, data, status, xhr);
fire(type, c); |
<<<<<<<
=======
if (1 > 2) {
utils.isEmpty();
}
>>>>>>> |
<<<<<<<
} else if ((symbol === Clutter.KEY_Down) ||
(symbol === Clutter.KEY_Tab) ||
((symbol === Clutter.n) && ctrl)) {
cursor = cursor + 1 < boxes.length ? cursor + 1 : 0;
updateHighlight(boxes);
} else if ((symbol === Clutter.KEY_Up) ||
((symbol === Clutter.ISO_Left_Tab) && shift) ||
((symbol === Clutter.p) && ctrl)) {
cursor = cursor > 0 ? cursor - 1 : boxes.length - 1;
updateHighlight(boxes);
=======
} else if (symbol === Clutter.KEY_Down) {
cursor = cursor + 1 < boxes.length ? cursor + 1 : cursor;
updateHighlight(boxes, o.text);
} else if (symbol === Clutter.KEY_Up) {
cursor = cursor > 0 ? cursor - 1 : cursor;
updateHighlight(boxes, o.text);
>>>>>>>
} else if ((symbol === Clutter.KEY_Down) ||
(symbol === Clutter.KEY_Tab) ||
((symbol === Clutter.n) && ctrl)) {
cursor = cursor + 1 < boxes.length ? cursor + 1 : 0;
updateHighlight(boxes, o.text);
} else if ((symbol === Clutter.KEY_Up) ||
((symbol === Clutter.ISO_Left_Tab) && shift) ||
((symbol === Clutter.p) && ctrl)) {
cursor = cursor > 0 ? cursor - 1 : boxes.length - 1;
updateHighlight(boxes, o.text);
<<<<<<<
// If there's less boxes then in previous cursor position,
// set cursor to the last box
cursor = (cursor + 1 > boxes.length) ? boxes.length - 1 : cursor;
updateHighlight(boxes);
=======
updateHighlight(boxes, o.text);
>>>>>>>
// If there's less boxes then in previous cursor position,
// set cursor to the last box
cursor = (cursor + 1 > boxes.length) ? boxes.length - 1 : cursor;
updateHighlight(boxes, o.text); |
<<<<<<<
const box = new St.BoxLayout({style_class : 'switcher-box'});
=======
const box = new St.BoxLayout({style_class: 'switcher-box'});
>>>>>>>
const box = new St.BoxLayout({style_class: 'switcher-box'});
<<<<<<<
return {whole : box, shortcutBox : shortcutBox};
=======
return {whole: box, shortcutBox: shortcutBox, label: label};
>>>>>>>
return {whole: box, shortcutBox: shortcutBox, label: label};
<<<<<<<
function updateHighlight(boxes) {
boxes.forEach(box => box.whole.remove_style_class_name('switcher-highlight'));
boxes.length > cursor &&
boxes[cursor].whole.add_style_class_name('switcher-highlight');
=======
function escapeChars(text) {
return text.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&");
};
function highlightText(text, query) {
// Don't apply highlighting if there's no input
if (query == "")
return text;
// Escape special characters in query
query = escapeChars(query);
// Identify substring parts to be highlighted
let queryExpression = "(";
let queries = query.split(' ');
let queriesLength = queries.length;
for (let i = 0; i < queriesLength - 1; i++) {
if (queries[i] != "") {
queryExpression += queries[i] + "|";
}
}
queryExpression += queries[queriesLength - 1] + ")";
let queryRegExp = new RegExp(queryExpression, "i");
let tokenRegExp = new RegExp("^" + queryExpression + "$", "i");
// Build resulting string from highlighted and non-highlighted strings
let result = "";
let tokens = text.split(queryRegExp);
let tokensLength = tokens.length;
for (let i = 0; i < tokensLength; i++) {
if (tokens[i].match(tokenRegExp)) {
result += '<u><span underline_color=\"#4a90d9\" foreground=\"#ffffff\">' +
tokens[i] +
'</span></u>';
} else {
result += tokens[i];
}
}
return result;
}
function updateHighlight(boxes, query) {
boxes.forEach(box => {
box.whole.remove_style_class_name('switcher-highlight');
const highlightedText = highlightText(box.label.get_text(), query);
box.label.clutter_text.set_markup(highlightedText);
});
boxes.length > cursor &&
boxes[cursor].whole.add_style_class_name('switcher-highlight');
>>>>>>>
function escapeChars(text) {
return text.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&");
};
function highlightText(text, query) {
// Don't apply highlighting if there's no input
if (query == "")
return text;
// Escape special characters in query
query = escapeChars(query);
// Identify substring parts to be highlighted
const useFuzzy = Convenience.getSettings().get_boolean('fuzzy-matching');
let queryExpression = "(";
let queries = (useFuzzy) ? query.split(/ |/) : query.split(" ");
let queriesLength = queries.length;
for (let i = 0; i < queriesLength - 1; i++) {
if (queries[i] != "") {
queryExpression += queries[i] + "|";
}
}
queryExpression += queries[queriesLength - 1] + ")";
let queryRegExp = new RegExp(queryExpression, "i");
let tokenRegExp = new RegExp("^" + queryExpression + "$", "i");
// Build resulting string from highlighted and non-highlighted strings
let result = "";
let tokens = text.split(queryRegExp);
let tokensLength = tokens.length;
for (let i = 0; i < tokensLength; i++) {
if (tokens[i].match(tokenRegExp)) {
result += '<u><span underline_color=\"#4a90d9\" foreground=\"#ffffff\">' +
tokens[i] +
'</span></u>';
} else {
result += tokens[i];
}
}
return result;
}
function updateHighlight(boxes, query) {
boxes.forEach(box => {
box.whole.remove_style_class_name('switcher-highlight');
const highlightedText = highlightText(box.label.get_text(), query);
box.label.clutter_text.set_markup(highlightedText);
});
boxes.length > cursor &&
boxes[cursor].whole.add_style_class_name('switcher-highlight');
<<<<<<<
updateHighlight(boxes);
const entry =
new St.Entry({style_class : 'switcher-entry', hint_text : 'type filter'});
=======
updateHighlight(boxes, "");
const entry = new St.Entry({style_class: 'switcher-entry', hint_text: 'type filter'});
>>>>>>>
updateHighlight(boxes, "");
const entry =
new St.Entry({style_class : 'switcher-entry', hint_text : 'type filter'}); |
<<<<<<<
var ModeUtils = (function () {
=======
var ModeUtils = (function() {
let gnomeControlCenter;
let mainApplicationName;
// get gnome control center instance
gnomeControlCenter = new controlCenter.GnomeControlCenter();
if (gnomeControlCenter.mainApplicationId != '') {
try {
mainApplicationName = Shell.AppSystem.get_default()
.lookup_app(gnomeControlCenter.mainApplicationId).get_name();
}
catch (error) {
mainApplicationName = "";
}
}
>>>>>>>
var ModeUtils = (function () {
let gnomeControlCenter;
let mainApplicationName;
// get gnome control center instance
gnomeControlCenter = new controlCenter.GnomeControlCenter();
if (gnomeControlCenter.mainApplicationId != '') {
try {
mainApplicationName = Shell.AppSystem.get_default()
.lookup_app(gnomeControlCenter.mainApplicationId)
.get_name();
} catch (error) {
mainApplicationName = '';
}
}
<<<<<<<
let appInfos = () =>
Gio.AppInfo.get_all()
.filter(function (appInfo) {
=======
let appInfos = () => {
// get app ids for regular applications
let regularAppIDs = Gio.AppInfo.get_all()
.filter(function(appInfo) {
>>>>>>>
let appInfos = () => {
// get app ids for regular applications
let regularAppIDs = Gio.AppInfo.get_all()
.filter(function (appInfo) {
<<<<<<<
.map(function (app) {
return app.get_id();
=======
.map(function(app) {
return new switcherApplication.RegularApplication(
app.get_id()
);
>>>>>>>
.map(function (app) {
return new switcherApplication.RegularApplication(app.get_id());
<<<<<<<
appInfos().map(function (appID) {
return Shell.AppSystem.get_default().lookup_app(appID);
=======
appInfos().map(function(switcherApp) {
let shellApp = Shell.AppSystem.get_default().lookup_app(
switcherApp.appId
);
// TODO: should this really be done during appInfos creation?
// seems disjointed here
switcherApp.setShellApp(shellApp);
return switcherApp;
>>>>>>>
appInfos().map(function (switcherApp) {
let shellApp = Shell.AppSystem.get_default().lookup_app(
switcherApp.appId
);
// TODO: should this really be done during appInfos creation?
// seems disjointed here
switcherApp.setShellApp(shellApp);
return switcherApp; |
<<<<<<<
import FormRow from '../FormRow';
const styles = StyleSheet.create({
=======
const styles = StyleSheet.create( {
>>>>>>>
import FormRow from '../FormRow';
const styles = StyleSheet.create( {
<<<<<<<
<FormRow label={ this.props.name }>
<TouchableOpacity onPress={() => this.onPressValue()}>
<Text style={styles.container}>
{this.props.value.length
? this.props.value.join(', ')
: 'Select...'}
=======
<View>
<TouchableOpacity onPress={ () => this.onPressValue() }>
<Text style={ styles.container }>
{ this.props.value.length
? this.props.value.join( ', ' )
: 'Select...' }
>>>>>>>
<FormRow label={ this.props.name }>
<TouchableOpacity onPress={ () => this.onPressValue() }>
<Text style={ styles.container }>
{ this.props.value.length
? this.props.value.join( ', ' )
: 'Select...' }
<<<<<<<
{this.state.showingModal
? <Modal visible={true} animationType={'slide'}>
<View style={styles.modalHeader}>
<TouchableOpacity
onPress={() => this.setState({ showingModal: false })}
>
<Text style={styles.modalCloseText}>Done</Text>
</TouchableOpacity>
</View>
<ScrollView>
{this.props.schema.items.enum.map(value => {
return (
<TouchableOpacity
key={value}
style={styles.listItem}
onPress={() => this.onToggleValue(value)}
>
<Text style={styles.listItemText}>{value}</Text>
{this.props.value.indexOf(value) > -1
? <Icon name="check" size={20} color="#333333" />
: null}
</TouchableOpacity>
);
})}
</ScrollView>
</Modal>
: null}
</FormRow>
=======
{ this.state.showingModal ? (
<Modal visible={ true } animationType={ 'slide' }>
<View style={ styles.modalHeader }>
<TouchableOpacity
onPress={ () => this.setState( { showingModal: false } ) }
>
<Text style={ styles.modalCloseText }>Done</Text>
</TouchableOpacity>
</View>
<ScrollView>
{ this.props.schema.items.enum.map( value => {
return (
<TouchableOpacity
key={ value }
style={ styles.listItem }
onPress={ () => this.onToggleValue( value ) }
>
<Text style={ styles.listItemText }>{ value }</Text>
{ this.props.value.indexOf( value ) > -1 ? (
<Icon name="check" size={ 20 } color="#333333" />
) : null }
</TouchableOpacity>
);
} ) }
</ScrollView>
</Modal>
) : null }
</View>
>>>>>>>
{ this.state.showingModal ? (
<Modal visible={ true } animationType={ 'slide' }>
<View style={ styles.modalHeader }>
<TouchableOpacity
onPress={ () => this.setState( { showingModal: false } ) }
>
<Text style={ styles.modalCloseText }>Done</Text>
</TouchableOpacity>
</View>
<ScrollView>
{ this.props.schema.items.enum.map( value => {
return (
<TouchableOpacity
key={ value }
style={ styles.listItem }
onPress={ () => this.onToggleValue( value ) }
>
<Text style={ styles.listItemText }>{ value }</Text>
{ this.props.value.indexOf( value ) > -1 ? (
<Icon name="check" size={ 20 } color="#333333" />
) : null }
</TouchableOpacity>
);
} ) }
</ScrollView>
</Modal>
) : null }
</FormRow> |
<<<<<<<
_getDefaultScaleProps(props) {
const {innerWidth, innerHeight} = getInnerDimensions(props);
=======
_getScaleDefaults(props) {
const {innerWidth, innerHeight} = getInnerDimensions(
props,
DEFAULT_MARGINS
);
>>>>>>>
_getDefaultScaleProps(props) {
const {innerWidth, innerHeight} = getInnerDimensions(
props,
DEFAULT_MARGINS
); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.