conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
'views/Filter/filterView',
=======
'views/Filter/FilterView',
'helpers/eventsBinder',
>>>>>>>
'views/Filter/filterView',
'helpers/eventsBinder', |
<<<<<<<
}
},
department: {
$addToSet: {
_id: '$department._id',
name: {
$ifNull: ['$department.departmentName', 'None']
=======
},
'department' : {
$addToSet: {
_id : '$department._id',
name: {'$ifNull': ['$department.name', 'None']}
>>>>>>>
},
department : {
$addToSet: {
_id : '$department._id',
name: {$ifNull: ['$department.name', 'None']}
<<<<<<<
Employee.aggregate([{
$match: {
isEmployee: false
}
}, {
$lookup: {
from : 'Department',
localField : 'department',
foreignField: '_id',
as : 'department'
}
}, {
$lookup: {
from : 'JobPosition',
localField : 'jobPosition',
foreignField: '_id',
as : 'jobPosition'
}
}, {
$project: {
department : {$arrayElemAt: ['$department', 0]},
jobPosition: {$arrayElemAt: ['$jobPosition', 0]},
name : 1
}
}, {
$project: {
department : 1,
jobPosition: 1,
name : 1
}
}, {
$group: {
_id : null,
name: {
$addToSet: {
_id : '$_id',
name: {$concat: ['$name.first', ' ', '$name.last']}
}
},
department: {
$addToSet: {
_id : '$department._id',
name: {
$ifNull: ['$department.departmentName', 'None']
=======
Employee.aggregate([
{
$match: {'isEmployee': false}
}, {
$lookup: {
from : "Department",
localField : "department",
foreignField: "_id", as: "department"
}
}, {
$lookup: {
from : "JobPosition",
localField : "jobPosition",
foreignField: "_id", as: "jobPosition"
}
}, {
$project: {
department : {$arrayElemAt: ["$department", 0]},
jobPosition: {$arrayElemAt: ["$jobPosition", 0]},
name : 1
}
}, {
$project: {
department : 1,
jobPosition: 1,
name : 1
}
}, {
$group: {
_id : null,
'name' : {
$addToSet: {
_id : '$_id',
name: {$concat: ['$name.first', ' ', '$name.last']}
}
},
'department' : {
$addToSet: {
_id : '$department._id',
name: {'$ifNull': ['$department.name', 'None']}
>>>>>>>
Employee.aggregate([{
$match: {
isEmployee: false
}
}, {
$lookup: {
from : 'Department',
localField : 'department',
foreignField: '_id',
as : 'department'
}
}, {
$lookup: {
from : 'JobPosition',
localField : 'jobPosition',
foreignField: '_id',
as : 'jobPosition'
}
}, {
$project: {
department : {$arrayElemAt: ['$department', 0]},
jobPosition: {$arrayElemAt: ['$jobPosition', 0]},
name : 1
}
}, {
$project: {
department : 1,
jobPosition: 1,
name : 1
}
}, {
$group: {
_id : null,
name: {
$addToSet: {
_id : '$_id',
name: {$concat: ['$name.first', ' ', '$name.last']}
}
},
department: {
$addToSet: {
_id : '$department._id',
name: {
$ifNull: ['$department.name', 'None'] |
<<<<<<<
var CONSTANTS = require('../constants/mainConstants.js');
=======
var objectId = mongoose.Types.ObjectId;
var validatorEmployee = require('../helpers/validator');
var Payroll = require('../handlers/payroll');
var payrollHandler = new Payroll(models);
var ids = ['52203e707d4dba8813000003', '563f673270bbc2b740ce89ae', '55b8cb7d0ce4affc2a0015cb', '55ba2ef1d79a3a343900001c', '560255d1638625cf32000005'];
>>>>>>>
var validatorEmployee = require('../helpers/validator');
var Payroll = require('../handlers/payroll');
var payrollHandler = new Payroll(models);
var ids = ['52203e707d4dba8813000003', '563f673270bbc2b740ce89ae', '55b8cb7d0ce4affc2a0015cb', '55ba2ef1d79a3a343900001c', '560255d1638625cf32000005'];
var CONSTANTS = require('../constants/mainConstants.js'); |
<<<<<<<
var productCategoriesRouter = require('./productCategories')(models);
=======
var filterRouter = require('./filter')(models);
>>>>>>>
var filterRouter = require('./filter')(models);
var productCategoriesRouter = require('./productCategories')(models); |
<<<<<<<
actionType: null, //Content, Edit, Create
template: _.template(ContentTopBarTemplate),
events:{
"click a.changeContentView": 'changeContentViewType',
"click ul.changeContentIndex a": 'changeItemIndex',
"click #top-bar-deleteBtn": "deleteEvent",
"click #top-bar-discardBtn": "discardEvent",
"click #top-bar-editBtn": "editEvent",
"click #top-bar-createBtn": "createEvent",
"click #top-bar-importBtn": "importEvent"
=======
actionType : null, //Content, Edit, Create
template : _.template(ContentTopBarTemplate),
events: {
"click a.changeContentView" : 'changeContentViewType',
"click ul.changeContentIndex a" : 'changeItemIndex',
"click #top-bar-deleteBtn" : "deleteEvent",
"click #top-bar-discardBtn" : "discardEvent",
"click #top-bar-editBtn" : "editEvent",
"click #top-bar-createBtn" : "createEvent",
"click #top-bar-exportBtn" : "export",
"click #top-bar-exportToCsvBtn" : "exportToCsv",
"click #top-bar-exportToXlsxBtn": "exportToXlsx",
>>>>>>>
actionType: null, //Content, Edit, Create
template: _.template(ContentTopBarTemplate),
events:{
"click a.changeContentView": 'changeContentViewType',
"click ul.changeContentIndex a": 'changeItemIndex',
"click #top-bar-deleteBtn": "deleteEvent",
"click #top-bar-discardBtn": "discardEvent",
"click #top-bar-editBtn": "editEvent",
"click #top-bar-createBtn": "createEvent",
"click #top-bar-importBtn": "importEvent",
"click #top-bar-exportBtn" : "export",
"click #top-bar-exportToCsvBtn" : "exportToCsv",
"click #top-bar-exportToXlsxBtn": "exportToXlsx",
<<<<<<<
importEvent: function (event) {
event.preventDefault();
this.trigger('importEvent');
},
deleteEvent: function(event)
{
event.preventDefault();
var answer=confirm("Realy DELETE items ?!");
if (answer==true) this.trigger('deleteEvent');
=======
deleteEvent: function (event) {
event.preventDefault();
var answer = confirm("Realy DELETE items ?!");
if (answer == true) {
this.trigger('deleteEvent');
}
>>>>>>>
importEvent: function (event) {
event.preventDefault();
this.trigger('importEvent');
},
deleteEvent: function (event) {
event.preventDefault();
var answer = confirm("Realy DELETE items ?!");
if (answer == true) {
this.trigger('deleteEvent');
} |
<<<<<<<
var PayRoll = models.get(lastDB, 'PayRoll', PayRollSchema);
=======
var startDate;
var endDate;
var dateRangeObject;
function dateRange() {
"use strict";
var weeksArr = [];
var startWeek = moment().isoWeek() - 1;
var year = moment().isoWeekYear();
var week;
for (var i = 0; i <= 11; i++) {
if (startWeek + i > 53) {
week = startWeek + i - 53;
weeksArr.push((year + 1) * 100 + week);
} else {
week = startWeek + i;
weeksArr.push(year * 100 + week);
}
}
weeksArr.sort();
return {
startDate: weeksArr[0],
endDate : weeksArr[weeksArr.length - 1]
};
};
if (query) {
startFilter = query.filter;
if (startFilter) {
startDate = startFilter.startDate;
endDate = startFilter.startDate;
}
}
if (!startDate || !endDate) {
dateRangeObject = dateRange();
startDate = dateRangeObject.startDate;
endDate = dateRangeObject.endDate;
}
console.log(startDate, endDate);
>>>>>>>
var PayRoll = models.get(lastDB, 'PayRoll', PayRollSchema);
var startDate;
var endDate;
var dateRangeObject;
function dateRange() {
"use strict";
var weeksArr = [];
var startWeek = moment().isoWeek() - 1;
var year = moment().isoWeekYear();
var week;
for (var i = 0; i <= 11; i++) {
if (startWeek + i > 53) {
week = startWeek + i - 53;
weeksArr.push((year + 1) * 100 + week);
} else {
week = startWeek + i;
weeksArr.push(year * 100 + week);
}
}
weeksArr.sort();
return {
startDate: weeksArr[0],
endDate : weeksArr[weeksArr.length - 1]
};
};
if (query) {
startFilter = query.filter;
if (startFilter) {
startDate = startFilter.startDate;
endDate = startFilter.startDate;
}
}
if (!startDate || !endDate) {
dateRangeObject = dateRange();
startDate = dateRangeObject.startDate;
endDate = dateRangeObject.endDate;
}
console.log(startDate, endDate);
<<<<<<<
Order : getOrdersFiltersValues,
Payroll : getPayRollFiltersValues,
=======
Order : getOrdersFiltersValues,
DashVacation : getDashVacationFiltersValues
>>>>>>>
Order : getOrdersFiltersValues,
Payroll : getPayRollFiltersValues,
DashVacation : getDashVacationFiltersValues |
<<<<<<<
'click .sendObject': 'goToPreview',
'click .tabItem' : 'changeTab',
=======
'click .stageBtn': 'goToPreview',
'click ._importListTabs' : 'changeTab',
>>>>>>>
'click .stageBtn': 'goToPreview',
'click ._importListTabs' : 'changeTab',
<<<<<<<
dataService.getData(url, {}, function (data) {
=======
dataService.getData(url,{},function(data) {
>>>>>>>
dataService.getData(url, {}, function (data) {
<<<<<<<
return result;
=======
return result
>>>>>>>
return result
<<<<<<<
=======
$droppable.closest('._contentBlockRow').removeClass('hoverRow');
>>>>>>>
$droppable.closest('._contentBlockRow').removeClass('hoverRow'); |
<<<<<<<
if (xhr.status === 403) {
App.render({
type: 'error',
message: 'No access'
});
} else {
App.render({
type: 'error',
message: 'Some Error.'
});
}
=======
App.render({
type : 'error',
message: "Some Error."
});
>>>>>>>
App.render({
type : 'error',
message: 'Some Error.'
}); |
<<<<<<<
events: {
'click .stageSelect' : 'showNewSelect',
'click .list tbody td:not(.notForm)': 'goToEditDialog',
'click .newSelectList li' : 'chooseOption'
},
chooseOption: function (e) {
var self = this;
var $target = $(e.target);
var $targetElement = $target.parents('td');
var id = $targetElement.attr('id');
var model = this.collection.get(id);
model.save({
workflow: $target.attr('id')
}, {
headers: {
mid: 55
},
patch : true,
validate: false,
success : function () {
self.showFilteredPage(self.filter, self);
}
});
this.hideNewSelect();
return false;
},
=======
>>>>>>>
chooseOption: function (e) {
var self = this;
var $target = $(e.target);
var $targetElement = $target.parents('td');
var id = $targetElement.attr('id');
var model = this.collection.get(id);
model.save({
workflow: $target.attr('id')
}, {
headers: {
mid: 55
},
patch : true,
validate: false,
success : function () {
self.showFilteredPage(self.filter, self);
}
});
this.hideNewSelect();
return false;
},
<<<<<<<
this.recalcTotal();
=======
>>>>>>>
this.recalcTotal(); |
<<<<<<<
//We verify that rows were added to a subset, then submit the search parameters to the sampleExplorer controller.
function validateHeatMapsSample(completedFunction)
{
//We need to generate a JSON object that has all the subsets.
jsonDataToPass = buildSubsetJSON();
//Exit is we found no records in the subsets.
if(!jsonDataToPass)
{
Ext.Msg.alert("No subsets loaded","Please add records to a subset to run a workflow!");
return false;
}
//We need to validate samples to make sure we aren't mixing platforms/studies.
var DataSetList = [];
var DataTypeList = [];
//Loop through each subset and get a distinct list of DataSets and DataTypes.
for (subset in jsonDataToPass)
{
//Add this dataset and datatype to our list.
if(jsonDataToPass[subset].DataSet)DataSetList.push(jsonDataToPass[subset].DataSet.toString());
if(jsonDataToPass[subset].DataType)DataTypeList.push(jsonDataToPass[subset].DataType.toString());
}
//Distinct our arrays.
DataSetList = DataSetList.unique();
DataTypeList = DataTypeList.unique();
//Make sure each list only has one value.
if(DataSetList.size() > 1)
{
Ext.Msg.alert("Different study comparisons not allowed","You have selected samples from different studies. Please clear your entries and select samples from only one study.");
return false;
}
if(DataTypeList.size() > 1)
{
Ext.Msg.alert("Different data type comparisons not allowed","You have selected samples from different data types. Please clear your entries and select samples from only one data type.");
return false;
}
//Since our lists only have one value we can set the global variable for Data Type.
GLOBAL.DataType = DataTypeList[0];
/*
//Workflow specific validation.
//GWAS Needs 2 subsets.
if(jsonDataToPass.length() != 2)
{
Ext.Msg.alert('Genome-Wide Association Study needs control datasets (normal patients) in subset 1, and case datasets (disease patients) in subset 2.');
return false;
}
*/
//Pass the selected rows off to the sampleExplorer controller.
Ext.Ajax.request(
{
url : pageInfo.basePath+"/sampleExplorer/sampleValidateHeatMap",
method : 'POST',
timeout: '1800000',
jsonData : {"SearchJSON" : jsonDataToPass},
success : function(result, request)
{
validateheatmapComplete(result,completedFunction);
},
failure : function(result, request)
{
validateheatmapComplete(result,completedFunction);
}
}
);
}
//After the heatmap server call is done we eval the JSON returned and show the popup with the list of dropdowns.
function validateheatmapComplete(result,completedFunction)
{
//Get the JSON string we got from the server into a real JSON object.
// var mobj=result.responseText.evalJSON();
var mobj=jQuery.parseJSON(result.responseText);
//If we failed to retrieve any test from the heatmap server call, we alert the user here. Otherwise, show the popup.
if(mobj.NoData && mobj.NoData == "true")
{
Ext.Msg.alert("No Data!","No data found for the samples you selected!");
return;
}
//If we got data, store the JSON data globally.
GLOBAL.DefaultCohortInfo=mobj;
if(GLOBAL.Explorer == "SAMPLE")
{
//Run the function for post data retrieval.
completedFunction();
}
else
{
showCompareStepPathwaySelection();
}
}
//*******************************************************************
=======
>>>>>>>
//We verify that rows were added to a subset, then submit the search parameters to the sampleExplorer controller.
function validateHeatMapsSample(completedFunction)
{
//We need to generate a JSON object that has all the subsets.
jsonDataToPass = buildSubsetJSON();
//Exit is we found no records in the subsets.
if(!jsonDataToPass)
{
Ext.Msg.alert("No subsets loaded","Please add records to a subset to run a workflow!");
return false;
}
//We need to validate samples to make sure we aren't mixing platforms/studies.
var DataSetList = [];
var DataTypeList = [];
//Loop through each subset and get a distinct list of DataSets and DataTypes.
for (subset in jsonDataToPass)
{
//Add this dataset and datatype to our list.
if(jsonDataToPass[subset].DataSet)DataSetList.push(jsonDataToPass[subset].DataSet.toString());
if(jsonDataToPass[subset].DataType)DataTypeList.push(jsonDataToPass[subset].DataType.toString());
}
//Distinct our arrays.
DataSetList = DataSetList.unique();
DataTypeList = DataTypeList.unique();
//Make sure each list only has one value.
if(DataSetList.size() > 1)
{
Ext.Msg.alert("Different study comparisons not allowed","You have selected samples from different studies. Please clear your entries and select samples from only one study.");
return false;
}
if(DataTypeList.size() > 1)
{
Ext.Msg.alert("Different data type comparisons not allowed","You have selected samples from different data types. Please clear your entries and select samples from only one data type.");
return false;
}
//Since our lists only have one value we can set the global variable for Data Type.
GLOBAL.DataType = DataTypeList[0];
/*
//Workflow specific validation.
//GWAS Needs 2 subsets.
if(jsonDataToPass.length() != 2)
{
Ext.Msg.alert('Genome-Wide Association Study needs control datasets (normal patients) in subset 1, and case datasets (disease patients) in subset 2.');
return false;
}
*/
//Pass the selected rows off to the sampleExplorer controller.
Ext.Ajax.request(
{
url : pageInfo.basePath+"/sampleExplorer/sampleValidateHeatMap",
method : 'POST',
timeout: '1800000',
jsonData : {"SearchJSON" : jsonDataToPass},
success : function(result, request)
{
validateheatmapComplete(result,completedFunction);
},
failure : function(result, request)
{
validateheatmapComplete(result,completedFunction);
}
}
);
}
//After the heatmap server call is done we eval the JSON returned and show the popup with the list of dropdowns.
function validateheatmapComplete(result,completedFunction)
{
//Get the JSON string we got from the server into a real JSON object.
// var mobj=result.responseText.evalJSON();
var mobj=jQuery.parseJSON(result.responseText);
//If we failed to retrieve any test from the heatmap server call, we alert the user here. Otherwise, show the popup.
if(mobj.NoData && mobj.NoData == "true")
{
Ext.Msg.alert("No Data!","No data found for the samples you selected!");
return;
}
//If we got data, store the JSON data globally.
GLOBAL.DefaultCohortInfo=mobj;
if(GLOBAL.Explorer == "SAMPLE")
{
//Run the function for post data retrieval.
completedFunction();
}
else
{
showCompareStepPathwaySelection();
}
} |
<<<<<<<
'views/selectView/selectView',
'moment'
=======
'views/selectView/selectView',
'constants',
'moment'
>>>>>>>
'views/selectView/selectView',
'constants',
'moment'
<<<<<<<
function (CreateTemplate, EmployeeModel, common, populate, attachView, AssigneesView, selectView, moment) {
=======
function (Backbone, $, _, CreateTemplate, EmployeeModel, common, populate, AttachView, AssigneesView, SelectView, CONSTANTS, moment) {
"use strict";
>>>>>>>
function (Backbone, $, _, CreateTemplate, EmployeeModel, common, populate, AttachView, AssigneesView, SelectView, CONSTANTS, moment) {
"use strict";
<<<<<<<
this.responseObj['#genderDd'] = [
{
_id : 'male',
name: 'male'
}, {
_id : 'female',
name: 'female'
}
];
this.responseObj['#maritalDd'] = [
{
_id : 'married',
name: 'married'
}, {
_id : 'unmarried',
name: 'unmarried'
}
];
this.render();
},
events: {
"click #tabList a" : "switchTab",
"mouseenter .avatar" : "showEdit",
"mouseleave .avatar" : "hideEdit",
'keydown' : 'keydownHandler',
'click .dialog-tabs a' : 'changeTab',
"click .current-selected" : "showNewSelect",
"click .newSelectList li:not(.miniStylePagination)": "chooseOption",
"click" : "hideNewSelect",
"click td.editable" : "editJob"
},
showNewSelect: function (e, prev, next) {
=======
this.responseObj['#genderDd'] = [
{
_id : 'male',
name: 'male'
}, {
_id : 'female',
name: 'female'
}
];
this.responseObj['#maritalDd'] = [
{
_id : 'married',
name: 'married'
}, {
_id : 'unmarried',
name: 'unmarried'
}
];
this.render();
},
events: {
"click #tabList a" : "switchTab",
"mouseenter .avatar" : "showEdit",
"mouseleave .avatar" : "hideEdit",
'keydown' : 'keydownHandler',
'click .dialog-tabs a' : 'changeTab',
"click .current-selected" : "showNewSelect",
"click .newSelectList li:not(.miniStylePagination)": "chooseOption",
"click" : "hideNewSelect"
},
showNewSelect: function (e) {
>>>>>>>
this.responseObj['#genderDd'] = [
{
_id : 'male',
name: 'male'
}, {
_id : 'female',
name: 'female'
}
];
this.responseObj['#maritalDd'] = [
{
_id : 'married',
name: 'married'
}, {
_id : 'unmarried',
name: 'unmarried'
}
];
this.render();
},
events: {
"click #tabList a" : "switchTab",
"mouseenter .avatar" : "showEdit",
"mouseleave .avatar" : "hideEdit",
'keydown' : 'keydownHandler',
'click .dialog-tabs a' : 'changeTab',
"click .current-selected" : "showNewSelect",
"click .newSelectList li:not(.miniStylePagination)": "chooseOption",
"click" : "hideNewSelect",
"click td.editable" : "editJob"
},
showNewSelect: function (e) {
<<<<<<<
editJob: function (e) {
var self = this;
var $target = $(e.target);
var dataId = $target.attr('data-id');
var tempContainer;
tempContainer = ($target.text()).trim();
if (dataId === 'salary') {
$target.html('<input class="editing statusInfo" type="text" value="' + tempContainer + '">');
return false;
}
$target.html('<input class="editing statusInfo" type="text" value="' + tempContainer + '" ' + 'readonly' + '>');
$target.find('.editing').datepicker({
dateFormat : "d M, yy",
changeMonth: true,
changeYear : true,
minDate : self.hiredDate,
onSelect : function () {
var editingDates = self.$el.find('.editing');
editingDates.each(function () {
$(this).parent().text($(this).val()).removeClass('changeContent');
$(this).remove();
});
}
}).addClass('datepicker');
return false;
},
chooseOption: function (e) {
//$(e.target).parents("dd").find(".current-selected").text($(e.target).text()).attr("data-id", $(e.target).attr("id"));
var $target = $(e.target);
var $td = $target.closest('td');
var parentUl = $target.parent();
var element = $target.closest('a') || parentUl.closest('a');
var id = element.attr('id') || parentUl.attr('id');
var valueId = $target.attr('id');
var managersIds = this.responseObj['#departmentManagers'];
var managers = this.responseObj['#projectManagerDD'];
var managerId;
var manager;
$td.removeClass('errorContent');
if (id === 'jobPositionDd' || 'departmentsDd' || 'projectManagerDD' || 'jobTypeDd' || 'hireFireDd') {
element.text($target.text());
element.attr('data-id', valueId);
if (id === 'departmentsDd') {
managersIds.forEach(function (managerObj) {
if (managerObj._id === valueId) {
managerId = managerObj.name;
}
});
managers.forEach(function (managerObj) {
if (managerObj._id === managerId) {
manager = managerObj.name;
}
});
if (manager) {
element = element.closest('tr').find('a#projectManagerDD');
element.text(manager);
element.attr('data-id', managerId);
}
}
} else {
$(e.target).parents("dd").find(".current-selected").text($(e.target).text()).attr("data-id", $(e.target).attr("id"));
}
},
=======
chooseOption: function (e) {
$(e.target).parents("dd").find(".current-selected").text($(e.target).text()).attr("data-id", $(e.target).attr("id"));
},
>>>>>>>
editJob: function (e) {
var self = this;
var $target = $(e.target);
var dataId = $target.attr('data-id');
var tempContainer;
tempContainer = ($target.text()).trim();
if (dataId === 'salary') {
$target.html('<input class="editing statusInfo" type="text" value="' + tempContainer + '">');
return false;
}
$target.html('<input class="editing statusInfo" type="text" value="' + tempContainer + '" ' + 'readonly' + '>');
$target.find('.editing').datepicker({
dateFormat : "d M, yy",
changeMonth: true,
changeYear : true,
minDate : self.hiredDate,
onSelect : function () {
var editingDates = self.$el.find('.editing');
editingDates.each(function () {
$(this).parent().text($(this).val()).removeClass('changeContent');
$(this).remove();
});
}
}).addClass('datepicker');
return false;
},
chooseOption: function (e) {
//$(e.target).parents("dd").find(".current-selected").text($(e.target).text()).attr("data-id", $(e.target).attr("id"));
var $target = $(e.target);
var $td = $target.closest('td');
var parentUl = $target.parent();
var element = $target.closest('a') || parentUl.closest('a');
var id = element.attr('id') || parentUl.attr('id');
var valueId = $target.attr('id');
var managersIds = this.responseObj['#departmentManagers'];
var managers = this.responseObj['#projectManagerDD'];
var managerId;
var manager;
$td.removeClass('errorContent');
if (id === 'jobPositionDd' || 'departmentsDd' || 'projectManagerDD' || 'jobTypeDd' || 'hireFireDd') {
element.text($target.text());
element.attr('data-id', valueId);
if (id === 'departmentsDd') {
managersIds.forEach(function (managerObj) {
if (managerObj._id === valueId) {
managerId = managerObj.name;
}
});
managers.forEach(function (managerObj) {
if (managerObj._id === managerId) {
manager = managerObj.name;
}
});
if (manager) {
element = element.closest('tr').find('a#projectManagerDD');
element.text(manager);
element.attr('data-id', managerId);
}
}
} else {
$(e.target).parents("dd").find(".current-selected").text($(e.target).text()).attr("data-id", $(e.target).attr("id"));
}
},
<<<<<<<
populate.get("#jobTypeDd", "/jobType", {}, "name", this, true);
populate.get("#departmentManagers", "/DepartmentsForDd", {}, "departmentManager", this);
populate.get("#nationality", "/nationality", {}, "_id", this, true);
populate.get2name("#projectManagerDD", "/getPersonsForDd", {}, this, true);
populate.get("#jobPositionDd", "/JobPositionForDd", {}, "name", this, true, true);
populate.get("#relatedUsersDd", "/UsersForDd", {}, "login", this, true, true);
populate.get("#departmentsDd", "/DepartmentsForDd", {}, "departmentName", this, true);
=======
populate.get("#jobTypeDd", CONSTANTS.URLS.JOBPOSITIONS_JOBTYPE, {}, "name", this, true);
populate.get("#nationality", CONSTANTS.URLS.EMPLOYEES_NATIONALITY, {}, "_id", this, true);
populate.get2name("#projectManagerDD", CONSTANTS.URLS.EMPLOYEES_PERSONSFORDD, {}, this, true);
populate.get("#jobPositionDd", CONSTANTS.URLS.JOBPOSITIONS_FORDD, {}, "name", this, true, true);
populate.get("#relatedUsersDd", CONSTANTS.URLS.USERS_FOR_DD, {}, "login", this, true, true);
populate.get("#departmentsDd", CONSTANTS.URLS.DEPARTMENTS_FORDD, {}, "departmentName", this, true);
>>>>>>>
populate.get("#departmentManagers", "/DepartmentsForDd", {}, "departmentManager", this);
populate.get("#jobTypeDd", CONSTANTS.URLS.JOBPOSITIONS_JOBTYPE, {}, "name", this, true);
populate.get("#nationality", CONSTANTS.URLS.EMPLOYEES_NATIONALITY, {}, "_id", this, true);
populate.get2name("#projectManagerDD", CONSTANTS.URLS.EMPLOYEES_PERSONSFORDD, {}, this, true);
populate.get("#jobPositionDd", CONSTANTS.URLS.JOBPOSITIONS_FORDD, {}, "name", this, true, true);
populate.get("#relatedUsersDd", CONSTANTS.URLS.USERS_FOR_DD, {}, "login", this, true, true);
populate.get("#departmentsDd", CONSTANTS.URLS.DEPARTMENTS_FORDD, {}, "departmentName", this, true);
<<<<<<<
$('#dateBirth').datepicker({
changeMonth: true,
changeYear : true,
yearRange : '-100y:c+nn',
maxDate : '-18y',
minDate : null
});
=======
$('#dateBirth').datepicker({
changeMonth: true,
changeYear : true,
yearRange : '-100y:c+nn',
maxDate : '-18y'
});
>>>>>>>
$('#dateBirth').datepicker({
changeMonth: true,
changeYear : true,
yearRange : '-100y:c+nn',
maxDate : '-18y',
minDate : null
}); |
<<<<<<<
showDialog: function (orderId) {
var self = this;
=======
/*showDialog: function (orderId) {
>>>>>>>
showDialog: function (orderId) {
var self = this;
<<<<<<<
var self = this;
=======
e.preventDefault();
var self = this;
>>>>>>>
var self = this;
<<<<<<<
// var isWtrack = App.weTrack;
new editView({
model : model,
redirect : true,
collection : self.collection,
notCreate : true,
eventChannel: self.eventChannel
});
=======
new editView({model: model, redirect: true, collection: self.collection, notCreate: true});
>>>>>>>
new editView({
model : model,
redirect : true,
collection : self.collection,
notCreate : true,
eventChannel: self.eventChannel
}); |
<<<<<<<
listItemView : listItemView,
contentCollection : contentCollection,
FilterView : FilterView,
=======
ListItemView : ListItemView,
ContentCollection : ContentCollection,
filterView : FilterView,
>>>>>>>
ListItemView : ListItemView,
ContentCollection : ContentCollection,
FilterView : FilterView, |
<<<<<<<
'dataService',
'moment'
=======
'dataService',
'common'
>>>>>>>
'dataService',
'moment'
'common'
<<<<<<<
function (generateTemplate, wTrackPerEmployeeTemplate, wTrackPerEmployee, currentModel, currentCollection, populate, dataService, moment) {
=======
function (generateTemplate, wTrackPerEmployeeTemplate, wTrackPerEmployee, populate, dataService, common) {
>>>>>>>
function (generateTemplate, wTrackPerEmployeeTemplate, wTrackPerEmployee, currentModel, currentCollection, populate, dataService, moment, common) {
<<<<<<<
savedNewModel: function (modelObject) {
if (modelObject.success) {
}
},
=======
asyncLoadImgs: function (model) {
common.getImagesPM([model.toJSON().projectmanager._id], "/getEmployeesImages", "#" + model.toJSON()._id, function(result){
$(".miniAvatarPM").attr("data-id", result.data[0]._id).find("img").attr("src", result.data[0].imageSrc);
});
common.getImagesPM([model.toJSON().customer._id], "/getCustomersImages", "#" + model.toJSON()._id, function(result){
$(".miniAvatarCustomer").attr("data-id", result.data[0]._id).find("img").attr("src", result.data[0].imageSrc);
});
},
>>>>>>>
asyncLoadImgs: function (model) {
common.getImagesPM([model.toJSON().projectmanager._id], "/getEmployeesImages", "#" + model.toJSON()._id, function(result){
$(".miniAvatarPM").attr("data-id", result.data[0]._id).find("img").attr("src", result.data[0].imageSrc);
});
common.getImagesPM([model.toJSON().customer._id], "/getCustomersImages", "#" + model.toJSON()._id, function(result){
$(".miniAvatarCustomer").attr("data-id", result.data[0]._id).find("img").attr("src", result.data[0].imageSrc);
});
},
savedNewModel: function (modelObject) {
if (modelObject.success) {
}
}, |
<<<<<<<
JOBSDASHBOARD : 'jobsDashboard',
PAYROLLPAYMENTS : 'PayrollPayments',
=======
JOBSDASHBOARD : 'jobsDashboard',
PRODUCTSETTINGS : "productSettings",
>>>>>>>
JOBSDASHBOARD : 'jobsDashboard',
PAYROLLPAYMENTS : 'PayrollPayments',
PRODUCTSETTINGS : "productSettings", |
<<<<<<<
function checkDb(db) {
var validDbs = ["weTrack", "production", "development", "maxdb"];
return validDbs.indexOf(db) !== -1;
}
=======
>>>>>>>
<<<<<<<
var moduleId;
var isWtrack;
var Invoice;
var date;
=======
var moduleId = 64;
var Invoice = models.get(db, 'wTrackInvoice', wTrackInvoiceSchema);;
>>>>>>>
var moduleId = 64;
var Invoice = models.get(db, 'wTrackInvoice', wTrackInvoiceSchema);;
var date;
<<<<<<<
date = moment(new Date(data.invoiceDate));
date = date.format('YYYY-MM-DD');
if (data.proforma) {
isProforma = true;
delete data.proforma;
}
if (checkDb(db)) {
moduleId = 64;
isWtrack = true;
}
if (isWtrack) {
Invoice = models.get(db, 'wTrackInvoice', wTrackInvoiceSchema);
} else {
Invoice = models.get(db, 'Invoice', InvoiceSchema);
}
=======
>>>>>>>
date = moment(new Date(data.invoiceDate));
date = date.format('YYYY-MM-DD');
if (data.proforma) {
isProforma = true;
delete data.proforma;
}
Invoice = models.get(db, 'wTrackInvoice', wTrackInvoiceSchema);
<<<<<<<
if (checkDb(db)) {
moduleId = 64;
}
=======
>>>>>>>
<<<<<<<
next(err);
=======
return next(err);
>>>>>>>
return next(err);
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
var moduleId = 56;
var isWtrack;
var Invoice;
var baseUrl = req.baseUrl;
if (checkDb(db)) {
moduleId = 64;
isWtrack = true;
}
if (isWtrack) {
Invoice = models.get(req.session.lastDb, 'wTrackInvoice', wTrackInvoiceSchema);
} else {
Invoice = models.get(req.session.lastDb, 'Invoice', InvoiceSchema);
}
=======
var moduleId = 64;
var Invoice = models.get(req.session.lastDb, 'wTrackInvoice', wTrackInvoiceSchema);
>>>>>>>
var moduleId = 64;
var Invoice = models.get(req.session.lastDb, 'wTrackInvoice', wTrackInvoiceSchema);
var baseUrl = req.baseUrl; |
<<<<<<<
'views/Filter/filterView',
=======
'views/Filter/FilterView',
'helpers/eventsBinder',
>>>>>>>
'views/Filter/filterView',
'helpers/eventsBinder', |
<<<<<<<
// Filter custom event listen ------begin
FilterView.bind('filter', function(filter) {
self.showFilteredPage(filter, self);
});
FilterView.bind('defaultFilter', function () {
self.showFilteredPage({}, self);
=======
self.showFilteredPage()
});
FilterView.bind('defaultFilter', function () {
self.showFilteredPage();
});
// Filter custom event listen ------end
>>>>>>>
// Filter custom event listen ------begin
FilterView.bind('filter', function(filter) {
self.showFilteredPage(filter, self);
});
FilterView.bind('defaultFilter', function () {
self.showFilteredPage({}, self);
<<<<<<<
=======
var checkedElements = this.$el.find('input:checkbox:checked');
var chosen = this.$el.find('.chosen');
>>>>>>> |
<<<<<<<
'helpers'],
function (Backbone,
$,
_,
ProjectsFormTemplate,
DetailsTemplate,
ProformRevenueTemplate,
jobsWTracksTemplate,
invoiceStats,
proformaStats,
ReportView,
selectView,
EditViewOrder,
editViewQuotation,
editViewInvoice,
editViewProforma,
EditView,
noteView,
attachView,
AssigneesView,
wTrackView,
ProjectMembersView,
PaymentView,
InvoiceView,
ProformaView,
QuotationView,
GenerateWTrack,
oredrView,
wTrackCollection,
quotationCollection,
invoiceCollection,
paymentCollection,
jobsCollection,
proformaCollection,
projectMembersCol,
quotationModel,
invoiceModel,
addAttachTemplate,
common,
populate,
custom,
dataService,
async,
helpers) {
'use strict';
=======
'helpers',
'constants'
],
function (Backbone, $, _, ProjectsFormTemplate, DetailsTemplate, ProformRevenueTemplate, jobsWTracksTemplate, invoiceStats, selectView, EditViewOrder, editViewQuotation, editViewInvoice, EditView, noteView, attachView, AssigneesView, BonusView, wTrackView, PaymentView, InvoiceView, QuotationView, GenerateWTrack, oredrView, wTrackCollection, quotationCollection, invoiceCollection, paymentCollection, jobsCollection, quotationModel, invoiceModel, addAttachTemplate, common, populate, custom, dataService, async, helpers, CONSTANTS) {
"use strict";
>>>>>>>
'helpers'
], function (Backbone,
$,
_,
ProjectsFormTemplate,
DetailsTemplate,
ProformRevenueTemplate,
jobsWTracksTemplate,
invoiceStats,
proformaStats,
ReportView,
selectView,
EditViewOrder,
editViewQuotation,
editViewInvoice,
editViewProforma,
EditView,
noteView,
attachView,
AssigneesView,
wTrackView,
ProjectMembersView,
PaymentView,
InvoiceView,
ProformaView,
QuotationView,
GenerateWTrack,
oredrView,
wTrackCollection,
quotationCollection,
invoiceCollection,
paymentCollection,
jobsCollection,
proformaCollection,
projectMembersCol,
quotationModel,
invoiceModel,
addAttachTemplate,
common,
populate,
custom,
dataService,
async,
helpers) {
'use strict';
<<<<<<<
populate.get('#projectTypeDD', '/projectType', {}, 'name', this, false, true);
populate.get2name('#customerDd', '/Customer', {}, this, false, false);
populate.getWorkflow('#workflowsDd', '#workflowNamesDd', '/WorkflowsForDd', {id: 'Projects'}, 'name', this);
populate.getWorkflow('#workflow', '#workflowNames', '/WorkflowsForDd', {id: 'Jobs'}, 'name', this);
populate.get("#payment_terms", "/paymentTerm", {}, 'name', this, true, true);
populate.get("#payment_method", "/paymentMethod", {}, 'name', this, true, true);
=======
populate.get("#projectTypeDD", CONSTANTS.URLS.PROJECT_TYPE, {}, "name", this, false, true);
populate.get2name("#projectManagerDD", CONSTANTS.URLS.EMPLOYEES_PERSONSFORDD, {}, this);
populate.get2name("#customerDd", CONSTANTS.URLS.CUSTOMERS, {}, this, false, false);
populate.getWorkflow("#workflowsDd", "#workflowNamesDd", CONSTANTS.URLS.WORKFLOWS_FORDD, {id: "Projects"}, "name", this);
populate.getWorkflow("#workflow", "#workflowNames", CONSTANTS.URLS.WORKFLOWS_FORDD, {id: "Jobs"}, "name", this);
>>>>>>>
populate.get('#projectTypeDD', CONSTANTS.URLS.PROJECT_TYPE, {}, 'name', this, false, true);
populate.get2name('#customerDd', CONSTANTS.URLS.CUSTOMERS, {}, this, false, false);
populate.getWorkflow('#workflowsDd', '#workflowNamesDd', CONSTANTS.URLS.WORKFLOWS_FORDD, {id: 'Projects'}, 'name', this);
populate.getWorkflow('#workflow', '#workflowNames', CONSTANTS.URLS.WORKFLOWS_FORDD, {id: 'Jobs'}, 'name', this);
populate.get("#payment_terms", "/paymentTerm", {}, 'name', this, true, true);
populate.get("#payment_method", "/paymentMethod", {}, 'name', this, true, true); |
<<<<<<<
//for default filter && defaultViewType
if (option && option.contentType && App.filtersObject.savedFilters[option.contentType]) {
savedFilter = App.filtersObject.savedFilters[option.contentType];
=======
// for default filter && defaultViewType
if (option && option.contentType && App.savedFilters[option.contentType]) {
savedFilter = App.savedFilters[option.contentType];
>>>>>>>
// for default filter && defaultViewType
if (option && option.contentType && App.filtersObject.savedFilters[option.contentType]) {
savedFilter = App.filtersObject.savedFilters[option.contentType];
<<<<<<<
var length;
var filtersForContent;
var key;
var filter;
var beName;
var beNamesNaw;
var filterWithName;
//if (App && App.filtersObject.savedFilters && App.filtersObject.savedFilters[contentType]) {
// filtersForContent = App.filtersObject.savedFilters[contentType];
// length = filtersForContent.length;
// filter = filtersForContent[length - 1];
// filterWithName = filter['filter'];
// var key = Object.keys(filterWithName)[0];
//
// savedFilter = filter[key];
//} else {
=======
>>>>>>>
<<<<<<<
if (savedFilters[i]['_id'] === id) {
keys = Object.keys(savedFilters[i]['filter']);
App.filtersObject.filter = savedFilters[i]['filter'][keys[0]];
return App.filtersObject.filter;
=======
if (savedFilters[i]._id === id) {
keys = Object.keys(savedFilters[i].filter);
App.filter = savedFilters[i].filter[keys[0]];
return App.filter;
>>>>>>>
if (savedFilters[i]._id === id) {
keys = Object.keys(savedFilters[i].filter);
App.filtersObject.filter = savedFilters[i].filter[keys[0]];
return App.filtersObject.filter; |
<<<<<<<
'click .stageBtn' : 'goToPreview'
},
resetForm: function () {
this.render(this.data);
=======
'click .stageBtn': 'goToPreview',
'click .tabItem' : 'changeTab',
'click .cleanButton' : 'clean'
>>>>>>>
'click .stageBtn': 'goToPreview',
'click .tabItem' : 'changeTab',
'click .cleanButton' : 'clean'
<<<<<<<
$(document).mousemove(function (e) {
self.X = e.pageX; // положения по оси X
self.Y = e.pageY; // положения по оси Y
//console.log("X: " + self.X + " Y: " + self.Y); // вывод результата в консоль
});
=======
>>>>>>>
<<<<<<<
=======
},
resetForm: function() {
this.render(this.data);
},
clean: function(e) {
var $button = $(e.target).closest('div').find('.secondColumn');
$button.text('');
$button.data('name', '');
//$button.data('parent', '');
//$button.removeAttr('data-name');
//$button.removeAttr('data-parent');
$button.removeClass('dbFieldItemDrag');
},
changeTab: function() {
>>>>>>>
},
resetForm: function() {
this.render(this.data);
},
clean: function(e) {
var $button = $(e.target).closest('div').find('.secondColumn');
$button.text('');
$button.data('name', '');
//$button.data('parent', '');
//$button.removeAttr('data-name');
//$button.removeAttr('data-parent');
$button.removeClass('dbFieldItemDrag');
},
changeTab: function() {
<<<<<<<
/*activate : function(event, ui) {
var $draggable = ui.draggable;
//$draggable.addClass('draggableActive');
//console.log(self.X, self.Y);
//$draggable.css({'position':'fixed'});
},*/
=======
>>>>>>>
<<<<<<<
.append('<li class="fieldItem" data-parent="' + droppableParentName + '" style="cursor: pointer" data-name="' + droppableName + '">' + droppableName + '</li>')
.find('li[data-name="' + droppableName + '"]')
=======
.append('<li><div class="fieldItem" data-parent="' + droppableParentName + '" style="cursor: pointer" data-name="' + droppableName + '">' + droppableName +'</div></li>')
.find('div[data-name="' + droppableName +'"]')
>>>>>>>
.append('<li><div class="fieldItem" data-parent="' + droppableParentName + '" style="cursor: pointer" data-name="' + droppableName + '">' + droppableName +'</div></li>')
.find('div[data-name="' + droppableName +'"]')
<<<<<<<
revert: true,
start : function (event, ui) {
var $draggable = $(this);
$draggable.addClass('draggableActive');
//$draggable.css('position', 'fixed');
}
=======
revert: true
>>>>>>>
revert: true
<<<<<<<
revert: true,
start : function () {
var $draggable = $(this);
$draggable.addClass('draggableActive');
//$draggable.css({top: self.y, left: self.x});
},
drag: function (event, ui) {
ui.position.left = self.X - 20;
ui.position.top = self.Y - 20;
}
=======
revert: true,
helper: 'clone',
start: function(){
$(this).hide();
},
stop: function(){
$(this).show()
}
>>>>>>>
revert: true,
helper: 'clone',
start: function(){
$(this).hide();
},
stop: function(){
$(this).show()
} |
<<<<<<<
import Name from './Name'
import EditorArea from './EditorArea'
=======
import Editor from './Editor'
import Preview from './Preview'
import Toolbar from './toolbar/Toolbar'
>>>>>>>
import EditorArea from './EditorArea'
<<<<<<<
=======
let editorContainer
if (type === 'richtext') {
editorContainer = (
<Editor type={type} onEditor={onEditor} onChange={onEditorValueChange} />
)
} else {
editorContainer = (
<div>
{viewMode === 'both' ? (
<div className='flex-ns flex-row'>
<div className='ph3 pl0-ns pr3-ns w-50-ns'>
<Editor type={type} onEditor={onEditor} onChange={onEditorValueChange} />
</div>
<div className='ph3 pl3 pr0-ns w-50-ns'>
<Preview md={md} />
</div>
<div style={{ flexGrow: 0 }}>
<Toolbar
theme='light'
docType={type}
docName={name}
docKeys={rawKeys}
snapshots={snapshots}
onTakeSnapshot={onTakeSnapshot} />
</div>
</div>
) : (
<div>
{viewMode === 'source' ? (
<div className='flex-ns flex-row' style={{ minHeight: '300px' }}>
<div className='flex-auto'>
<Editor type={type} onEditor={onEditor} onChange={onEditorValueChange} />
</div>
<Toolbar
theme='dark'
docType={type}
docName={name}
docKeys={rawKeys}
snapshots={snapshots}
onTakeSnapshot={onTakeSnapshot} />
</div>
) : (
<div className='flex-ns flex-row' style={{ minHeight: '300px' }}>
<div className='flex-auto'>
<Preview md={md} />
</div>
<Toolbar
theme='light'
docType={type}
docName={name}
docKeys={rawKeys}
snapshots={snapshots}
onTakeSnapshot={onTakeSnapshot} />
</div>
)}
</div>
)}
</div>
)
}
>>>>>>>
<<<<<<<
<EditorArea
docName={name}
docType={type}
docKeys={rawKeys}
viewMode={viewMode}
onEditor={onEditor}
onEditorValueChange={onEditorValueChange}
snapshots={snapshots}
onTakeSnapshot={onTakeSnapshot}
previewMd={md} />
<div>
<Status status={status} />
</div>
=======
<div>
{editorContainer}
</div>
>>>>>>>
<EditorArea
docName={name}
docType={type}
docKeys={rawKeys}
viewMode={viewMode}
onEditor={onEditor}
onEditorValueChange={onEditorValueChange}
snapshots={snapshots}
onTakeSnapshot={onTakeSnapshot}
previewMd={md} />
<div>
<Status status={status} />
</div> |
<<<<<<<
.alias('g', 'smplayer').describe('g', 'autoplay in smplayer*').boolean('g')
=======
.describe('mpchc', 'autoplay in MPC-HC player*').boolean('boolean')
>>>>>>>
.alias('g', 'smplayer').describe('g', 'autoplay in smplayer*').boolean('g')
.describe('mpchc', 'autoplay in MPC-HC player*').boolean('boolean') |
<<<<<<<
if (params.faceDetection === undefined) params.faceDetection = {};
if (params.faceDetection.workSize === undefined) params.faceDetection.workSize = 160;
if (params.faceDetection.minScale === undefined) params.faceDetection.minScale = 2;
if (params.faceDetection.scaleFactor === undefined) params.faceDetection.scaleFactor = 1.15;
if (params.faceDetection.useCanny === undefined) params.faceDetection.useCanny = false;
if (params.faceDetection.edgesDensity === undefined) params.faceDetection.edgesDensity = 0.13;
if (params.faceDetection.equalizeHistogram === undefined) params.faceDetection.equalizeHistogram = true;
=======
>>>>>>>
if (params.faceDetection === undefined) params.faceDetection = {};
if (params.faceDetection.workSize === undefined) params.faceDetection.workSize = 160;
if (params.faceDetection.minScale === undefined) params.faceDetection.minScale = 2;
if (params.faceDetection.scaleFactor === undefined) params.faceDetection.scaleFactor = 1.15;
if (params.faceDetection.useCanny === undefined) params.faceDetection.useCanny = false;
if (params.faceDetection.edgesDensity === undefined) params.faceDetection.edgesDensity = 0.13;
if (params.faceDetection.equalizeHistogram === undefined) params.faceDetection.equalizeHistogram = true;
<<<<<<<
=======
var gettingPosition = false;
>>>>>>>
var gettingPosition = false;
<<<<<<<
var webglFi, svmFi, mosseCalc, jf;
=======
var webglFi, svmFi, mosseCalc;
>>>>>>>
var webglFi, svmFi, mosseCalc, jf;
<<<<<<<
this.track = function(element, box) {
var evt = document.createEvent("Event");
evt.initEvent("clmtrackrBeforeTrack", true, true);
document.dispatchEvent(evt)
=======
this.track = function(element, box, gi) {
>>>>>>>
this.track = function(element, box, gi) {
var evt = document.createEvent("Event");
evt.initEvent("clmtrackrBeforeTrack", true, true);
document.dispatchEvent(evt)
<<<<<<<
if (first) {
// do viola-jones on canvas to get initial guess, if we don't have any points
var gi = getInitialPosition(element, box);
if (!gi) {
// send an event on no face found
var evt = document.createEvent("Event");
evt.initEvent("clmtrackrNotFound", true, true);
document.dispatchEvent(evt)
return false;
}
=======
if (gi) {
>>>>>>>
if (gi) {
<<<<<<<
document.dispatchEvent(evt)
=======
document.dispatchEvent(evt);
>>>>>>>
document.dispatchEvent(evt);
<<<<<<<
// detect position of face on canvas/video element
var detectPosition = function(el) {
var comp = jf.findFace(params.faceDetection);
if (comp) {
candidate = comp;
=======
var faceDetected = function (e, callback) {
var comp = e.data.comp;
if (comp && comp.length > 0) {
candidate = comp[0];
>>>>>>>
var faceDetected = function (e, callback) {
var comp = e.data.comp;
if (comp) {
candidate = comp;
<<<<<<<
return candidate;
=======
for (var i = 1; i < comp.length; i++) {
if (comp[i].confidence > candidate.confidence) {
candidate = comp[i];
}
}
// return candidate;
callback(candidate);
}
// detect position of face on canvas/video element
var detectPosition = function(el, callback) {
var canvas = document.createElement('canvas');
canvas.width = el.width;
canvas.height = el.height;
var cc = canvas.getContext('2d');
cc.drawImage(el, 0, 0, el.width, el.height);
var jf = new jsfeat_face(canvas);
jf.faceDetected = faceDetected;
//TODO Allow option that limit simultaneous trigger of WebWorkers
var comp = jf.findFace(callback);
>>>>>>>
// return candidate;
callback(candidate);
}
// detect position of face on canvas/video element
var detectPosition = function(el, callback) {
jf.faceDetected = faceDetected;
//TODO Allow option that limit simultaneous trigger of WebWorkers
var comp = jf.findFace(params, callback);
<<<<<<<
return [scaling, rotation, translateX, translateY];
=======
callback([scaling, rotation, translateX, translateY]);
>>>>>>>
callback([scaling, rotation, translateX, translateY]); |
<<<<<<<
actions: [{
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*',)/g,
templateFile: './route/route.hbs',
}],
=======
actions: data => {
const actions = [];
if (reducerExists(data.component)) {
actions.push({
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*'\,)/g,
templateFile: './route/routeWithReducer.hbs',
});
} else {
actions.push({
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*'\,)/g,
templateFile: './route/route.hbs',
});
}
return actions;
},
>>>>>>>
actions: data => {
const actions = [];
if (reducerExists(data.component)) {
actions.push({
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*',)/g,
templateFile: './route/routeWithReducer.hbs',
});
} else {
actions.push({
type: 'modify',
path: '../../app/routes.js',
pattern: /(\s{\n\s{6}path: '\*',)/g,
templateFile: './route/route.hbs',
});
}
return actions;
}, |
<<<<<<<
return message.replace(/\{0\}/gi, ko.utils.unwrapObservable(params));
=======
}
return message.replace(/\{0\}/gi, params);
>>>>>>>
}
return message.replace(/\{0\}/gi, ko.utils.unwrapObservable(params)); |
<<<<<<<
//#endregion
//#region setRules Tests
module("setRules Tests");
test("setRules applies rules to all properties", function () {
var definition = {
property1: {
required: true,
min: 10,
max: 99,
ignoredDefinition: { required: true }
},
child: {
property2: {
pattern: {
params: "^[a-z0-9].$",
message: "Only AlphaNumeric please"
}
},
grandchild: {
property3: {
number: true
}
},
ignoredDefinition: { required: true }
},
nestedArray: {
property4: { email: true },
ignoredDefinition: { required: true }
}
};
var target = {
property1: ko.observable(),
ignoredProperty: ko.observable(),
child: {
property2: ko.observable(),
ignoredProperty: ko.observable(),
grandchild: {
property3: ko.observable(),
ignoredProperty: ko.observable(),
}
},
nestedArray: ko.observableArray([
{ property4: ko.observable(), ignoredProperty: ko.observable() },
{ property4: ko.observable(), ignoredProperty: ko.observable() },
{ property4: ko.observable(), ignoredProperty: ko.observable() }
])
};
ko.validation.setRules(target, definition);
//check that all rules have been applied
deepEqual(target.property1.rules(), [
{ rule: "required", params: true },
{ rule: "min", params: 10 },
{ rule: "max", params: 99 }
]);
deepEqual(target.child.property2.rules(), [
{ rule: "pattern", message: "Only AlphaNumeric please", params: "^[a-z0-9].$", condition: undefined }
]);
deepEqual(target.child.grandchild.property3.rules(), [
{ rule: "number", params: true }
]);
for (var i = 0; i < target.nestedArray.length; i) {
deepEqual(target.nestedArray[i].property3.rules(), [
{ rule: "email", params: true }
]);
}
//check that ignored properties have not had rules added
ok(!target.ignoredProperty.rules);
ok(!target.child.ignoredProperty.rules);
ok(!target.child.grandchild.ignoredProperty.rules);
ok(!target.nestedArray()[0].ignoredProperty.rules);
ok(!target.nestedArray()[1].ignoredProperty.rules);
ok(!target.nestedArray()[2].ignoredProperty.rules);
});
=======
//#endregion
//# validation process tests
module("Validation process", {
setup: function () {
var isStarted = false;
ko.validation._validateObservable = ko.validation.validateObservable;
ko.validation.validateObservable = function () {
ok(true, "Triggered only once");
if (!isStarted) {
isStarted = true;
start();
}
return ko.validation._validateObservable.apply(this, arguments);
};
},
teardown: function () {
ko.validation.validateObservable = ko.validation._validateObservable;
}
});
asyncTest("can be throttled using global configuration", function () {
expect(2); // one for initialization and when value changed
ko.validation.init({ validate: {
throttle: 10
}}, true);
var observable = ko.observable().extend({ validatable: true });
observable("1");
observable.extend({ minLength: 2 });
ko.validation.init({ validate: {} }, true);
});
asyncTest("can be throttled using using local configuration", function () {
expect(2); // one for initialization and when value changed
var observable = ko.observable().extend({ validatable: {
throttle: 10
} });
observable.extend({ minLength: 2 });
observable("1");
});
>>>>>>>
//#endregion
//# validation process tests
module("Validation process", {
setup: function () {
var isStarted = false;
ko.validation._validateObservable = ko.validation.validateObservable;
ko.validation.validateObservable = function () {
ok(true, "Triggered only once");
if (!isStarted) {
isStarted = true;
start();
}
return ko.validation._validateObservable.apply(this, arguments);
};
},
teardown: function () {
ko.validation.validateObservable = ko.validation._validateObservable;
}
});
asyncTest("can be throttled using global configuration", function () {
expect(2); // one for initialization and when value changed
ko.validation.init({ validate: {
throttle: 10
}}, true);
var observable = ko.observable().extend({ validatable: true });
observable("1");
observable.extend({ minLength: 2 });
ko.validation.init({ validate: {} }, true);
});
asyncTest("can be throttled using using local configuration", function () {
expect(2); // one for initialization and when value changed
var observable = ko.observable().extend({ validatable: {
throttle: 10
} });
observable.extend({ minLength: 2 });
observable("1");
});
//#endregion
//#region setRules Tests
module("setRules Tests");
test("setRules applies rules to all properties", function () {
var definition = {
property1: {
required: true,
min: 10,
max: 99,
ignoredDefinition: { required: true }
},
child: {
property2: {
pattern: {
params: "^[a-z0-9].$",
message: "Only AlphaNumeric please"
}
},
grandchild: {
property3: {
number: true
}
},
ignoredDefinition: { required: true }
},
nestedArray: {
property4: { email: true },
ignoredDefinition: { required: true }
}
};
var target = {
property1: ko.observable(),
ignoredProperty: ko.observable(),
child: {
property2: ko.observable(),
ignoredProperty: ko.observable(),
grandchild: {
property3: ko.observable(),
ignoredProperty: ko.observable(),
}
},
nestedArray: ko.observableArray([
{ property4: ko.observable(), ignoredProperty: ko.observable() },
{ property4: ko.observable(), ignoredProperty: ko.observable() },
{ property4: ko.observable(), ignoredProperty: ko.observable() }
])
};
ko.validation.setRules(target, definition);
//check that all rules have been applied
deepEqual(target.property1.rules(), [
{ rule: "required", params: true },
{ rule: "min", params: 10 },
{ rule: "max", params: 99 }
]);
deepEqual(target.child.property2.rules(), [
{ rule: "pattern", message: "Only AlphaNumeric please", params: "^[a-z0-9].$", condition: undefined }
]);
deepEqual(target.child.grandchild.property3.rules(), [
{ rule: "number", params: true }
]);
for (var i = 0; i < target.nestedArray.length; i) {
deepEqual(target.nestedArray[i].property3.rules(), [
{ rule: "email", params: true }
]);
}
//check that ignored properties have not had rules added
ok(!target.ignoredProperty.rules);
ok(!target.child.ignoredProperty.rules);
ok(!target.child.grandchild.ignoredProperty.rules);
ok(!target.nestedArray()[0].ignoredProperty.rules);
ok(!target.nestedArray()[1].ignoredProperty.rules);
ok(!target.nestedArray()[2].ignoredProperty.rules);
}); |
<<<<<<<
var dataSourcesByType = {
'image': [{source: 'flickr', 'display': 'Flickr'}, {source: 'imgur', display: 'Imgur'}],
'viz': [{source: 'oec', display: 'Observatory of Economic Complexity'}],
'gif': [{source: 'giphy', display: 'Giphy'}],
'video': [{source: 'youtube', display: 'Youtube'}],
// 'map': [{source: 'google', display: 'Google Maps'}],
'audio': [{source: 'soundcloud', display: 'SoundCloud'}],
}
_.each(dataSourcesByType, function(dataSources, type){
var templateName = 'create_' + type + '_section';
console.log(templateName, dataSources)
Template[templateName].helpers({dataSources: dataSources});
});
=======
Template.create_audio_section.created = searchTemplateCreatedBoilerplate('audio', 'soundcloud');
Template.create_audio_section.rendered = searchTemplateRenderedBoilerplate();
Template.create_image_section.helpers({
dataSources: [
{source: 'flickr', display: 'Flickr'},
//{source: 'getty', display: 'Getty Images'},
{source: 'imgur', display: 'Imgur'}
]
}
);
>>>>>>>
var dataSourcesByType = {
'image': [{source: 'flickr', 'display': 'Flickr'}, {source: 'imgur', display: 'Imgur'}],
'viz': [{source: 'oec', display: 'Observatory of Economic Complexity'}],
'gif': [{source: 'giphy', display: 'Giphy'}],
'video': [{source: 'youtube', display: 'Youtube'}],
// 'map': [{source: 'google', display: 'Google Maps'}],
'audio': [{source: 'soundcloud', display: 'SoundCloud'}],
}
_.each(dataSourcesByType, function(dataSources, type){
var templateName = 'create_' + type + '_section';
Template[templateName].helpers({dataSources: dataSources});
});
Template.create_audio_section.created = searchTemplateCreatedBoilerplate('audio', 'soundcloud');
Template.create_audio_section.rendered = searchTemplateRenderedBoilerplate(); |
<<<<<<<
headerImageUrl: function() {
return '//' + Meteor.settings["public"].AWS_BUCKET + '.s3.amazonaws.com/header-images/' + this.headerImage;
},
authorUsername: function() {
return this.userPathSegment
=======
headerImageUrl: headerImageUrl,
author: function(){
return Meteor.users.findOne(this.authorId)
}
});
Template.banner_buttons.helpers({
showCreateStory: function() {
if (!Meteor.user()){
return true
}
var accessPriority = Meteor.user().accessPriority;
return accessPriority && accessPriority <= window.createAccessLevel;
>>>>>>>
headerImageUrl: function() {
return '//' + Meteor.settings["public"].AWS_BUCKET + '.s3.amazonaws.com/header-images/' + this.headerImage;
},
authorUsername: function() {
return this.userPathSegment
},
author: function(){
return Meteor.users.findOne(this.authorId)
}
});
Template.banner_buttons.helpers({
showCreateStory: function() {
if (!Meteor.user()){
return true
}
var accessPriority = Meteor.user().accessPriority;
return accessPriority && accessPriority <= window.createAccessLevel; |
<<<<<<<
uiModel.goToLoadingState();
return from(loadGltf(model.mainFile, view, model.additionalFiles).then( (gltf) => {
=======
return from(resourceLoader.loadGltf(model.mainFile, model.additionalFiles).then( (gltf) => {
>>>>>>>
uiModel.goToLoadingState();
return from(resourceLoader.loadGltf(model.mainFile, model.additionalFiles).then( (gltf) => { |
<<<<<<<
'environmentVisibilityChanged$', 'punctualLightsChanged$', 'iblChanged$', 'renderEnvChanged$', 'morphingChanged$',
'addEnvironment$', 'colorChanged$', 'environmentRotationChanged$', 'animationPlayChanged$',
=======
'environmentVisibilityChanged$', 'punctualLightsChanged$', 'iblChanged$', 'morphingChanged$',
'addEnvironment$', 'colorChanged$', 'environmentRotationChanged$', 'animationPlayChanged$', 'selectedAnimationsChanged$',
>>>>>>>
'environmentVisibilityChanged$', 'punctualLightsChanged$', 'iblChanged$', 'renderEnvChanged$', 'morphingChanged$',
'addEnvironment$', 'colorChanged$', 'environmentRotationChanged$', 'animationPlayChanged$', 'selectedAnimationsChanged$', |
<<<<<<<
export {GltfView, getIsGltf, getIsGlb, getIsHdr, computePrimitiveCentroids, loadGltfFromPath, loadEnvironment, initKtxLib, initDracoLib, loadGltfFromDrop };
=======
export {
GltfView,
getIsGltf,
getIsGlb,
computePrimitiveCentroids,
loadGltf,
loadPrefilteredEnvironmentFromPath,
initKtxLib,
initDracoLib,
getContainingFolder,
combinePaths,
getFileNameWithoutExtension,
glTF,
};
>>>>>>>
export {
GltfView,
getIsGltf,
getIsGlb,
getIsHdr,
computePrimitiveCentroids,
loadGltf,
loadEnvironment,
initKtxLib,
initDracoLib,
getContainingFolder,
combinePaths,
getFileNameWithoutExtension,
glTF,
}; |
<<<<<<<
fromJsonMeshes(jsonMeshes)
{
for (let i = 0; i < jsonMeshes.length; ++i)
{
let mesh = new gltfMesh();
mesh.fromJson(jsonMeshes[i]);
this.meshes.push(mesh);
}
}
=======
fromJsonSamplers(jsonSamplers)
{
for (let i = 0; i < jsonSamplers.length; ++i)
{
let sampler = new gltfSampler();
sampler.fromJson(jsonSamplers[i]);
this.samplers.push(sampler);
}
}
fromJsonImages(jsonImages)
{
for (let i = 0; i < jsonImages.length; ++i)
{
let image = new gltfImage();
image.fromJson(jsonImages[i]);
this.images.push(image);
}
}
fromJsonTextures(jsonTextures)
{
for (let i = 0; i < jsonTextures.length; ++i)
{
let texture = new gltfTexture();
texture.fromJson(jsonTextures[i]);
this.textures.push(texture);
}
}
>>>>>>>
fromJsonMeshes(jsonMeshes)
{
for (let i = 0; i < jsonMeshes.length; ++i)
{
let mesh = new gltfMesh();
mesh.fromJson(jsonMeshes[i]);
this.meshes.push(mesh);
}
}
fromJsonSamplers(jsonSamplers)
{
for (let i = 0; i < jsonSamplers.length; ++i)
{
let sampler = new gltfSampler();
sampler.fromJson(jsonSamplers[i]);
this.samplers.push(sampler);
}
}
fromJsonImages(jsonImages)
{
for (let i = 0; i < jsonImages.length; ++i)
{
let image = new gltfImage();
image.fromJson(jsonImages[i]);
this.images.push(image);
}
}
fromJsonTextures(jsonTextures)
{
for (let i = 0; i < jsonTextures.length; ++i)
{
let texture = new gltfTexture();
texture.fromJson(jsonTextures[i]);
this.textures.push(texture);
}
}
<<<<<<<
if (json.meshes !== undefined)
{
this.fromJsonMeshes(json.meshes);
}
=======
if(json.samplers !== undefined)
{
this.fromJsonSamplers(json.samplers);
}
if(json.textures !== undefined)
{
this.fromJsonTextures(json.textures);
}
if(json.images !== undefined)
{
this.fromJsonImages(json.images);
}
>>>>>>>
if (json.meshes !== undefined)
{
this.fromJsonMeshes(json.meshes);
}
if(json.samplers !== undefined)
{
this.fromJsonSamplers(json.samplers);
}
if(json.textures !== undefined)
{
this.fromJsonTextures(json.textures);
}
if(json.images !== undefined)
{
this.fromJsonImages(json.images);
} |
<<<<<<<
const inputObservables = UIModel.getInputObservables(document.getElementById("canvas"));
this.model = merge(dropdownGltfChanged, inputObservables.gltfDropped);
this.hdr = inputObservables.hdrDropped;
this.variant = app.variantChanged$.pipe(pluck("event", "msg"));
}
static getInputObservables(inputDomElement)
{
const observables = {};
fromEvent(inputDomElement, "dragover").subscribe( event => event.preventDefault() ); // just prevent the default behaviour
const dropEvent = fromEvent(inputDomElement, "drop").pipe( map( event => {
// prevent the default drop event
event.preventDefault();
return event;
}));
observables.filesDropped = dropEvent.pipe(map( (event) => {
// Use DataTransfer files interface to access the file(s)
return Array.from(event.dataTransfer.files);
}));
observables.gltfDropped = observables.filesDropped.pipe(
// filter out any non .gltf or .glb files
filter( (files) => files.filter( file => getIsGlb(file.name) || getIsGltf(file.name))),
map( (files) => {
// restructure the data by separating mainFile (gltf/glb) from additionalFiles
const mainFile = files.find( (file) => getIsGlb(file.name) || getIsGltf(file.name));
const additionalFiles = files.filter( (file) => file !== mainFile);
return {mainFile: mainFile, additionalFiles: additionalFiles};
}),
);
observables.hdrDropped = observables.filesDropped.pipe(
map( (files) => {
// extract only the hdr file from the stream of files
return files.find( (file) => file.name.endsWith(".hdr"));
}),
filter(file => file),
)
return observables;
=======
this.animationPlay = app.animationPlayChanged$.pipe(pluck("event", "msg"));
>>>>>>>
this.animationPlay = app.animationPlayChanged$.pipe(pluck("event", "msg"));
const inputObservables = UIModel.getInputObservables(document.getElementById("canvas"));
this.model = merge(dropdownGltfChanged, inputObservables.gltfDropped);
this.hdr = inputObservables.hdrDropped;
this.variant = app.variantChanged$.pipe(pluck("event", "msg"));
}
static getInputObservables(inputDomElement)
{
const observables = {};
fromEvent(inputDomElement, "dragover").subscribe( event => event.preventDefault() ); // just prevent the default behaviour
const dropEvent = fromEvent(inputDomElement, "drop").pipe( map( event => {
// prevent the default drop event
event.preventDefault();
return event;
}));
observables.filesDropped = dropEvent.pipe(map( (event) => {
// Use DataTransfer files interface to access the file(s)
return Array.from(event.dataTransfer.files);
}));
observables.gltfDropped = observables.filesDropped.pipe(
// filter out any non .gltf or .glb files
filter( (files) => files.filter( file => getIsGlb(file.name) || getIsGltf(file.name))),
map( (files) => {
// restructure the data by separating mainFile (gltf/glb) from additionalFiles
const mainFile = files.find( (file) => getIsGlb(file.name) || getIsGltf(file.name));
const additionalFiles = files.filter( (file) => file !== mainFile);
return {mainFile: mainFile, additionalFiles: additionalFiles};
}),
);
observables.hdrDropped = observables.filesDropped.pipe(
map( (files) => {
// extract only the hdr file from the stream of files
return files.find( (file) => file.name.endsWith(".hdr"));
}),
filter(file => file),
)
return observables; |
<<<<<<<
gui.onModelSelected = (modelPath, basePath) => self.loadFromPath(modelPath, basePath);
gui.onNextSceneSelected = () => self.sceneIndex++;
gui.onPreviousSceneSelected = () => self.sceneIndex--;
=======
gui.onLoadModel = (model) => self.loadFromPath(this.pathProvider.resolve(model));
gui.onLoadNextScene = () => self.sceneIndex++;
gui.onLoadPreviousScene = () => self.sceneIndex--;
>>>>>>>
gui.onModelSelected = (model) => self.loadFromPath(this.pathProvider.resolve(model));
gui.onNextSceneSelected = () => self.sceneIndex++;
gui.onPreviousSceneSelected = () => self.sceneIndex--; |
<<<<<<<
import { ToneMaps, DebugOutput, Environments } from './rendering_parameters.js';
import { ImageMimeType } from './image.js';
=======
import { ToneMaps, DebugOutput } from './rendering_parameters.js';
import metallicRoughnessShader from './shaders/metallic-roughness.frag';
import primitiveShader from './shaders/primitive.vert';
import texturesShader from './shaders/textures.glsl';
import tonemappingShader from'./shaders/tonemapping.glsl';
>>>>>>>
import { ToneMaps, DebugOutput, Environments } from './rendering_parameters.js';
import { ImageMimeType } from './image.js';
import metallicRoughnessShader from './shaders/metallic-roughness.frag';
import primitiveShader from './shaders/primitive.vert';
import texturesShader from './shaders/textures.glsl';
import tonemappingShader from'./shaders/tonemapping.glsl'; |
<<<<<<<
this.$.httpPass.loadData(),
this.$.identities.loadData(),
this.$.editPrefs.loadData(),
this.$.diffPrefs.loadData(),
=======
>>>>>>>
this.$.identities.loadData(),
this.$.editPrefs.loadData(),
this.$.diffPrefs.loadData(), |
<<<<<<<
zh: {
=======
kr: {
translations: translationKr,
},
"zh": {
>>>>>>>
kr: {
translations: translationKr,
},
zh: { |
<<<<<<<
handler.activationHandler && handler.activationHandler(component);
=======
// We want to run the handler in a $timeout so the UI updates, but we also don't want it to run asyncronously
// so that the steps below this one are run before the handler. So we run in a waitTimeout.
await this.waitTimeout(() => {
handler.activationHandler(component);
})
>>>>>>>
// We want to run the handler in a $timeout so the UI updates, but we also don't want it to run asyncronously
// so that the steps below this one are run before the handler. So we run in a waitTimeout.
await this.waitTimeout(() => {
handler.activationHandler && handler.activationHandler(component);
})
<<<<<<<
handler.activationHandler && handler.activationHandler(component);
=======
await this.waitTimeout(() => {
handler.activationHandler(component);
})
>>>>>>>
await this.waitTimeout(() => {
handler.activationHandler && handler.activationHandler(component);
})
<<<<<<<
handler.activationHandler && handler.activationHandler(component);
=======
await this.waitTimeout(() => {
handler.activationHandler(component);
})
>>>>>>>
await this.waitTimeout(() => {
handler.activationHandler && handler.activationHandler(component);
})
<<<<<<<
handler.activationHandler && handler.activationHandler(component);
=======
await this.waitTimeout(() => {
handler.activationHandler(component);
})
>>>>>>>
await this.waitTimeout(() => {
handler.activationHandler && handler.activationHandler(component);
}) |
<<<<<<<
* Shows browser-specific overlay with guidance how to proceed with gUM prompt.
* @param {string} browser - name of browser for which to show the guidance
* overlay.
*/
UI.showUserMediaPermissionsGuidanceOverlay = function (browser) {
GumPermissionsOverlay.show(browser);
};
/**
* Hides browser-specific overlay with guidance how to proceed with gUM prompt.
*/
UI.hideUserMediaPermissionsGuidanceOverlay = function () {
GumPermissionsOverlay.hide();
};
/**
* Shows or hides the keyboard shortcuts panel.'
=======
* Shows or hides the keyboard shortcuts panel, depending on the current state.'
>>>>>>>
* Shows browser-specific overlay with guidance how to proceed with gUM prompt.
* @param {string} browser - name of browser for which to show the guidance
* overlay.
*/
UI.showUserMediaPermissionsGuidanceOverlay = function (browser) {
GumPermissionsOverlay.show(browser);
};
/**
* Hides browser-specific overlay with guidance how to proceed with gUM prompt.
*/
UI.hideUserMediaPermissionsGuidanceOverlay = function () {
GumPermissionsOverlay.hide();
};
/**
* Shows or hides the keyboard shortcuts panel, depending on the current state.' |
<<<<<<<
var result = "<table style='width:100%'>" +
"<tr>" +
"<td><span class='jitsipopover_blue' data-i18n='connectionindicator.bitrate'></span></td>" +
"<td><span class='jitsipopover_green'>↓</span>" +
downloadBitrate + " <span class='jitsipopover_orange'>↑</span>" +
uploadBitrate + "</td>" +
"</tr><tr>" +
"<td><span class='jitsipopover_blue' data-i18n='connectionindicator.packetloss'></span></td>" +
"<td>" + packetLoss + "</td>" +
"</tr><tr>" +
"<td><span class='jitsipopover_blue' data-i18n='connectionindicator.resolution'></span></td>" +
"<td>" + resolutionStr + "</td></tr></table>";
=======
let result = (
`<table class="connection-info__container" style='width:100%'>
<tr>
<td>
<span data-i18n='connectionindicator.bitrate'>
${translate("connectionindicator.bitrate")}
</span>
</td>
<td>
<span class='connection-info__download'>↓</span>${downloadBitrate}
<span class='connection-info__upload'>↑</span>${uploadBitrate}
</td>
</tr>
<tr>
<td>
<span data-i18n='connectionindicator.packetloss'>
${translate("connectionindicator.packetloss")}
</span>
</td>
<td>${packetLoss}</td>
</tr>
<tr>
<td>
<span data-i18n='connectionindicator.resolution'>
${translate("connectionindicator.resolution")}
</span>
</td>
<td>
${resolutionStr}
</td>
</tr>
</table>`);
>>>>>>>
let result = (
`<table class="connection-info__container" style='width:100%'>
<tr>
<td>
<span data-i18n='connectionindicator.bitrate'></span>
</td>
<td>
<span class='connection-info__download'>↓</span>${downloadBitrate}
<span class='connection-info__upload'>↑</span>${uploadBitrate}
</td>
</tr>
<tr>
<td>
<span data-i18n='connectionindicator.packetloss'></span>
</td>
<td>${packetLoss}</td>
</tr>
<tr>
<td>
<span data-i18n='connectionindicator.resolution'></span>
</td>
<td>
${resolutionStr}
</td>
</tr>
</table>`);
<<<<<<<
(this.showMoreValue ? "less" : "more") + "'></div><br />";
=======
(this.showMoreValue ? "less" : "more") + "'>" +
translate("connectionindicator." + (this.showMoreValue ? "less" : "more")) +
"</a>";
>>>>>>>
(this.showMoreValue ? "less" : "more") + "'></a>";
<<<<<<<
"<td><span class='jitsipopover_blue' " +
"data-i18n='connectionindicator.address'></span></td>" +
=======
"<td><span " +
"data-i18n='connectionindicator.address'>" +
translate("connectionindicator.address") + "</span></td>" +
>>>>>>>
"<td><span " +
"data-i18n='connectionindicator.address'></span></td>" +
<<<<<<<
"<td><span class='jitsipopover_blue' data-i18n='connectionindicator.transport'></span></td>" +
=======
"<td><span data-i18n='connectionindicator.transport'>" +
translate("connectionindicator.transport") + "</span></td>" +
>>>>>>>
"<td><span data-i18n='connectionindicator.transport'>" +
"</span></td>" +
<<<<<<<
"<span class='jitsipopover_blue' data-i18n='connectionindicator.bandwidth'></span>" +
=======
"<span data-i18n='connectionindicator.bandwidth'>" +
translate("connectionindicator.bandwidth") + "</span>" +
>>>>>>>
"<span data-i18n='connectionindicator.bandwidth'></span>" +
<<<<<<<
=======
APP.translation.translateElement($(".connection-info"));
>>>>>>> |
<<<<<<<
enableRecording: true,
enableWelcomePage: false,
enableSimulcast: false,
logStats: false // Enable logging of PeerConnection stats via the focus
=======
enableRecording: false,
enableWelcomePage: true,
enableSimulcast: false,
enableFirefoxSupport: false //firefox support is still experimental, only one-to-one conferences with chrome focus
// will work when simulcast, bundle, mux, lastN and SCTP are disabled.
>>>>>>>
enableRecording: false,
enableWelcomePage: true,
enableSimulcast: false,
enableFirefoxSupport: false, //firefox support is still experimental, only one-to-one conferences with chrome focus
// will work when simulcast, bundle, mux, lastN and SCTP are disabled.
logStats: false // Enable logging of PeerConnection stats via the focus |
<<<<<<<
startRtpStatsCollector();
=======
// Bind data channel listener in case we're a regular participant
if (config.openSctp)
{
bindDataChannelListener(sess.peerconnection);
}
>>>>>>>
startRtpStatsCollector();
// Bind data channel listener in case we're a regular participant
if (config.openSctp)
{
bindDataChannelListener(sess.peerconnection);
}
<<<<<<<
$(document).bind('conferenceCreated.jingle', function (event, focus)
{
startRtpStatsCollector();
});
=======
$(document).bind('conferenceCreated.jingle', function (event, focus)
{
// Bind data channel listener in case we're the focus
if (config.openSctp)
{
bindDataChannelListener(focus.peerconnection);
}
});
>>>>>>>
$(document).bind('conferenceCreated.jingle', function (event, focus)
{
startRtpStatsCollector();
// Bind data channel listener in case we're the focus
if (config.openSctp)
{
bindDataChannelListener(focus.peerconnection);
}
}); |
<<<<<<<
=======
/* Popup window that show login page */
var authenticationWindow = null;
/* Initial "authentication required" dialog */
var authDialog = null;
/* Loop retry ID that wits for other user to create the room */
var authRetryId = null;
>>>>>>>
/* Initial "authentication required" dialog */
var authDialog = null;
/* Loop retry ID that wits for other user to create the room */
var authRetryId = null;
<<<<<<<
=======
$(document).bind('auth_required.moderator', function () {
// This is the loop that will wait for the room to be created by
// someone else. 'auth_required.moderator' will bring us back here.
authRetryId = window.setTimeout(
function () {
Moderator.allocateConferenceFocus(roomName, doJoinAfterFocus);
}, 5000);
// Show prompt only if it's not open
if (authDialog !== null) {
return;
}
// extract room name from '[email protected]'
var room = roomName.substr(0, roomName.indexOf('@'));
authDialog = messageHandler.openDialog(
'Stop',
'Authentication is required to create room:<br/><b>' + room +
'</b></br> You can either authenticate to create the room or ' +
'just wait for someone else to do so.',
true,
{
Authenticate: 'authNow'
},
function (onSubmitEvent, submitValue) {
// Do not close the dialog yet
onSubmitEvent.preventDefault();
// Open login popup
if (submitValue === 'authNow') {
authenticateClicked();
}
}
);
});
function authenticateClicked() {
// If auth window exists just bring it to the front
if (authenticationWindow) {
authenticationWindow.focus();
return;
}
// Get authentication URL
Moderator.getAuthUrl(function (url) {
// Open popup with authentication URL
authenticationWindow = messageHandler.openCenteredPopup(
url, 910, 660,
// On closed
function () {
// Close authentication dialog if opened
if (authDialog) {
messageHandler.closeDialog();
authDialog = null;
}
// On popup closed - retry room allocation
Moderator.allocateConferenceFocus(roomName, doJoinAfterFocus);
authenticationWindow = null;
});
if (!authenticationWindow) {
Toolbar.showAuthenticateButton(true);
messageHandler.openMessageDialog(
null, "Your browser is blocking popup windows from this site." +
" Please enable popups in your browser security settings" +
" and try again.");
}
});
};
>>>>>>>
<<<<<<<
UI.start();
=======
if(config.enableWelcomePage && window.location.pathname == "/" &&
(!window.localStorage.welcomePageDisabled
|| window.localStorage.welcomePageDisabled == "false"))
{
$("#videoconference_page").hide();
$("#domain_name").text(
window.location.protocol + "//" + window.location.host + "/");
$("span[name='appName']").text(interfaceConfig.APP_NAME);
if (interfaceConfig.SHOW_JITSI_WATERMARK) {
var leftWatermarkDiv
= $("#welcome_page_header div[class='watermark leftwatermark']");
if(leftWatermarkDiv && leftWatermarkDiv.length > 0)
{
leftWatermarkDiv.css({display: 'block'});
leftWatermarkDiv.parent().get(0).href
= interfaceConfig.JITSI_WATERMARK_LINK;
}
}
if (interfaceConfig.SHOW_BRAND_WATERMARK) {
var rightWatermarkDiv
= $("#welcome_page_header div[class='watermark rightwatermark']");
if(rightWatermarkDiv && rightWatermarkDiv.length > 0) {
rightWatermarkDiv.css({display: 'block'});
rightWatermarkDiv.parent().get(0).href
= interfaceConfig.BRAND_WATERMARK_LINK;
rightWatermarkDiv.get(0).style.backgroundImage
= "url(images/rightwatermark.png)";
}
}
if (interfaceConfig.SHOW_POWERED_BY) {
$("#welcome_page_header>a[class='poweredby']")
.css({display: 'block'});
}
function enter_room()
{
var val = $("#enter_room_field").val();
if(!val) {
val = $("#enter_room_field").attr("room_name");
}
if (val) {
window.location.pathname = "/" + val;
}
}
$("#enter_room_button").click(function()
{
enter_room();
});
$("#enter_room_field").keydown(function (event) {
if (event.keyCode === 13 /* enter */) {
enter_room();
}
});
if (!(interfaceConfig.GENERATE_ROOMNAMES_ON_WELCOME_PAGE === false)){
var updateTimeout;
var animateTimeout;
$("#reload_roomname").click(function () {
clearTimeout(updateTimeout);
clearTimeout(animateTimeout);
update_roomname();
});
$("#reload_roomname").show();
function animate(word) {
var currentVal = $("#enter_room_field").attr("placeholder");
$("#enter_room_field").attr("placeholder", currentVal + word.substr(0, 1));
animateTimeout = setTimeout(function() {
animate(word.substring(1, word.length))
}, 70);
}
function update_roomname()
{
var word = RoomNameGenerator.generateRoomWithoutSeparator();
$("#enter_room_field").attr("room_name", word);
$("#enter_room_field").attr("placeholder", "");
clearTimeout(animateTimeout);
animate(word);
updateTimeout = setTimeout(update_roomname, 10000);
}
update_roomname();
}
$("#disable_welcome").click(function () {
window.localStorage.welcomePageDisabled
= $("#disable_welcome").is(":checked");
});
return;
}
if (interfaceConfig.SHOW_JITSI_WATERMARK) {
var leftWatermarkDiv
= $("#largeVideoContainer div[class='watermark leftwatermark']");
leftWatermarkDiv.css({display: 'block'});
leftWatermarkDiv.parent().get(0).href
= interfaceConfig.JITSI_WATERMARK_LINK;
}
if (interfaceConfig.SHOW_BRAND_WATERMARK) {
var rightWatermarkDiv
= $("#largeVideoContainer div[class='watermark rightwatermark']");
rightWatermarkDiv.css({display: 'block'});
rightWatermarkDiv.parent().get(0).href
= interfaceConfig.BRAND_WATERMARK_LINK;
rightWatermarkDiv.get(0).style.backgroundImage
= "url(images/rightwatermark.png)";
}
if (interfaceConfig.SHOW_POWERED_BY) {
$("#largeVideoContainer>a[class='poweredby']").css({display: 'block'});
}
$("#welcome_page").hide();
Chat.init();
$('body').popover({ selector: '[data-toggle=popover]',
trigger: 'click hover',
content: function() {
return this.getAttribute("content") +
KeyboardShortcut.getShortcut(this.getAttribute("shortcut"));
}
});
statistics.start();
statistics.addAudioLevelListener(audioLevelUpdated);
>>>>>>>
UI.start(); |
<<<<<<<
/**
* Removes the element indicating the moderator(owner) of the conference.
*/
SmallVideo.prototype.removeModeratorIndicatorElement = function () {
$('#' + this.videoSpanId + ' .focusindicator').remove();
};
=======
/**
* This is an especially interesting function. A naive reader might think that
* it returns this SmallVideo's "video" element. But it is much more exciting.
* It first finds this video's parent element using jquery, then uses a utility
* from lib-jitsi-meet to extract the video element from it (with two more
* jquery calls), and finally uses jquery again to encapsulate the video element
* in an array. This last step allows (some might prefer "forces") users of
* this function to access the video element via the 0th element of the returned
* array (after checking its length of course!).
*/
>>>>>>>
/**
* Removes the element indicating the moderator(owner) of the conference.
*/
SmallVideo.prototype.removeModeratorIndicatorElement = function () {
$('#' + this.videoSpanId + ' .focusindicator').remove();
};
/**
* This is an especially interesting function. A naive reader might think that
* it returns this SmallVideo's "video" element. But it is much more exciting.
* It first finds this video's parent element using jquery, then uses a utility
* from lib-jitsi-meet to extract the video element from it (with two more
* jquery calls), and finally uses jquery again to encapsulate the video element
* in an array. This last step allows (some might prefer "forces") users of
* this function to access the video element via the 0th element of the returned
* array (after checking its length of course!).
*/ |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
toast = window.chat.toast,
=======
toastTimeOut = 10000,
chromeToast = null,
>>>>>>>
toast = window.chat.toast,
<<<<<<<
=======
function canToast() {
// We can toast if it's not disabled
return window.webkitNotifications && window.webkitNotifications.checkPermission() !== ToastStatus.Blocked;
}
function toastMessage(message) {
if (!window.webkitNotifications ||
window.webkitNotifications.checkPermission() !== ToastStatus.Allowed) {
return;
}
// Hide any previously displayed toast
hideToast();
chromeToast = window.webkitNotifications.createNotification(
'Content/images/logo32.png',
message.trimmedName,
message.message);
chromeToast.ondisplay = function () {
setTimeout(function () {
chromeToast.cancel();
}, toastTimeOut);
};
chromeToast.onclick = function () {
hideToast();
};
chromeToast.show();
}
function hideToast() {
if (chromeToast && chromeToast.cancel) {
chromeToast.cancel();
}
}
function enableToast(callback) {
var deferred = $.Deferred();
if (window.webkitNotifications) {
// If not configured, request permission
if (window.webkitNotifications.checkPermission() === ToastStatus.NotConfigured) {
window.webkitNotifications.requestPermission(function () {
if (window.webkitNotifications.checkPermission()) {
deferred.reject();
}
else {
deferred.resolve();
}
});
}
else if (window.webkitNotifications.checkPermission() === ToastStatus.Allowed) {
// If we're allowed then just resolve here
deferred.resolve();
}
else {
// We don't have permission
deferred.reject();
}
}
return deferred;
}
function ensureToast() {
if (window.webkitNotifications &&
window.webkitNotifications.checkPermission() === ToastStatus.NotConfigured) {
preferences.canToast = false;
}
}
>>>>>>>
function canToast() {
// We can toast if it's not disabled
return window.webkitNotifications && window.webkitNotifications.checkPermission() !== ToastStatus.Blocked;
}
function toastMessage(message) {
if (!window.webkitNotifications ||
window.webkitNotifications.checkPermission() !== ToastStatus.Allowed) {
return;
}
// Hide any previously displayed toast
hideToast();
chromeToast = window.webkitNotifications.createNotification(
'Content/images/logo32.png',
message.trimmedName,
message.message);
chromeToast.ondisplay = function () {
setTimeout(function () {
chromeToast.cancel();
}, toastTimeOut);
};
chromeToast.onclick = function () {
hideToast();
};
chromeToast.show();
}
function hideToast() {
if (chromeToast && chromeToast.cancel) {
chromeToast.cancel();
}
}
function enableToast(callback) {
var deferred = $.Deferred();
if (window.webkitNotifications) {
// If not configured, request permission
if (window.webkitNotifications.checkPermission() === ToastStatus.NotConfigured) {
window.webkitNotifications.requestPermission(function () {
if (window.webkitNotifications.checkPermission()) {
deferred.reject();
}
else {
deferred.resolve();
}
});
}
else if (window.webkitNotifications.checkPermission() === ToastStatus.Allowed) {
// If we're allowed then just resolve here
deferred.resolve();
}
else {
// We don't have permission
deferred.reject();
}
}
return deferred;
}
function ensureToast() {
if (window.webkitNotifications &&
window.webkitNotifications.checkPermission() === ToastStatus.NotConfigured) {
preferences.canToast = false;
}
}
<<<<<<<
toast.hideToast();
$(ui).trigger('ui.focus');
=======
$ui.trigger(ui.events.focusit);
>>>>>>>
$ui.trigger(ui.events.focusit);
<<<<<<<
// TODO: persist and restore previous toast enabled setting
toast.initializeToast($enableDisableToast);
=======
if (canToast()) {
$toast.show();
}
else {
// We need to set the toast setting to false
preferences.canToast = false;
}
>>>>>>>
if (canToast()) {
$toast.show();
}
else {
// We need to set the toast setting to false
preferences.canToast = false;
}
<<<<<<<
$enableDisableToast.click(function () {
toast.toggleEnableToast($enableDisableToast);
=======
$toast.click(function () {
var $this = $(this),
enabled = !$this.hasClass('off');
if (enabled) {
// If it's enabled toggle the preference
setPreference('canToast', !enabled);
$this.toggleClass('off');
}
else {
enableToast()
.done(function () {
setPreference('canToast', true);
$this.removeClass('off');
})
.fail(function () {
setPreference('canToast', false);
$this.addClass('off');
});
}
>>>>>>>
$toast.click(function () {
var $this = $(this),
enabled = !$this.hasClass('off');
if (enabled) {
// If it's enabled toggle the preference
setPreference('canToast', !enabled);
$this.toggleClass('off');
}
else {
enableToast()
.done(function () {
setPreference('canToast', true);
$this.removeClass('off');
})
.fail(function () {
setPreference('canToast', false);
$this.addClass('off');
});
}
<<<<<<<
if (!ui.focus) {
toast.toastMessage(message);
}
=======
>>>>>>> |
<<<<<<<
test('getEdgeHost', () => {
TracerGlobals.setTracerInputs({ token: '', edgeHost: 'zarathustra.com' });
expect(utils.getEdgeHost()).toEqual('zarathustra.com');
TracerGlobals.setTracerInputs({ token: '', edgeHost: '' });
expect(utils.getEdgeHost()).toEqual(
'us-east-1.lumigo-tracer-edge.golumigo.com'
);
});
test('getEdgeUrl', () => {
const expected = {
host: 'us-east-1.lumigo-tracer-edge.golumigo.com',
path: '/api/spans',
};
expect(utils.getEdgeUrl()).toEqual(expected);
});
=======
test('callAfterEmptyEventLoop', async () => {
const prependOnceListenerSpy = jest.spyOn(process, 'prependOnceListener');
prependOnceListenerSpy.mockReturnValueOnce(null);
const fn = jest.fn();
const arg1 = 'x';
const arg2 = 'y';
const args = [arg1, arg2];
utils.callAfterEmptyEventLoop(fn, args);
const beforeExitAsyncCallback = prependOnceListenerSpy.mock.calls[0][1];
await beforeExitAsyncCallback();
expect(fn).toHaveBeenCalledWith(arg1, arg2);
});
>>>>>>>
test('callAfterEmptyEventLoop', async () => {
const prependOnceListenerSpy = jest.spyOn(process, 'prependOnceListener');
prependOnceListenerSpy.mockReturnValueOnce(null);
const fn = jest.fn();
const arg1 = 'x';
const arg2 = 'y';
const args = [arg1, arg2];
utils.callAfterEmptyEventLoop(fn, args);
const beforeExitAsyncCallback = prependOnceListenerSpy.mock.calls[0][1];
await beforeExitAsyncCallback();
expect(fn).toHaveBeenCalledWith(arg1, arg2);
});
test('getEdgeHost', () => {
TracerGlobals.setTracerInputs({ token: '', edgeHost: 'zarathustra.com' });
expect(utils.getEdgeHost()).toEqual('zarathustra.com');
TracerGlobals.setTracerInputs({ token: '', edgeHost: '' });
expect(utils.getEdgeHost()).toEqual(
'us-east-1.lumigo-tracer-edge.golumigo.com'
);
});
test('getEdgeUrl', () => {
const expected = {
host: 'us-east-1.lumigo-tracer-edge.golumigo.com',
path: '/api/spans',
};
expect(utils.getEdgeUrl()).toEqual(expected);
}); |
<<<<<<<
if (isExpr(on)) {
on = on.toString(opts);
}
else {
on = _.map(_.keys(on), function(key) {
return handleColumn(key, opts) + ' = ' + handleColumn(on[key], opts);
}).join(', ')
}
return this.type + ' JOIN ' + tbl + ' ON ' + on;
=======
return this.type + ' JOIN ' + tbl + ' ON ' + _.map(_.keys(on), function(key) {
return handleColumn(key, opts) + ' = ' + handleColumn(on[key], opts);
}).join(' AND ');
>>>>>>>
if (isExpr(on)) {
on = on.toString(opts);
}
else {
on = _.map(_.keys(on), function(key) {
return handleColumn(key, opts) + ' = ' + handleColumn(on[key], opts);
}).join(' AND ')
}
return this.type + ' JOIN ' + tbl + ' ON ' + on; |
<<<<<<<
//setTimeout("loadOntPanel()", 3000);
// westPanel.add(prevTree);
// eastPanel.add(exportPanel);
=======
>>>>>>>
<<<<<<<
function loginComplete()
=======
function loginComplete(pmresponse)
{
if(GLOBAL.Debug)
{
alert(pmresponse.responseText);
}
oDomDoc = pmresponse.responseXML;
var statusNode = oDomDoc.selectSingleNode('//response_header/result_status/status');
var statusType = statusNode.getAttribute("type");
var statusText = statusNode.firstChild.nodeValue;
if(statusType == "ERROR")
{
if(loginform.isVisible())
{
loginform.el.unmask();
}
// Show a dialog using config options :
Ext.Msg.show(
{
title : 'Login error',
msg : statusText,
buttons : Ext.Msg.OK,
fn : function()
{
Ext.Msg.hide();
}
,
icon : Ext.MessageBox.ERROR
}
);
}
else
>>>>>>>
function loginComplete()
<<<<<<<
=======
// get the project id
GLOBAL.ProjectID = projectid;
>>>>>>>
<<<<<<<
qtip : 'root'
}
);
for (var c = 0; c < ontresponse.length; c ++ )
=======
qtip : 'root'
}
);
for(var c = 0; c < concepts.length; c ++ )
>>>>>>>
qtip : 'root'
}
);
for (var c = 0; c < ontresponse.length; c ++ )
<<<<<<<
{
text : name,
draggable : false,
id : key,
qtip : tooltip,
expanded : autoExpand,
=======
{
text : name,
draggable : false,
id : key,
qtip : tooltip,
expanded : expand,
>>>>>>>
{
text : name,
draggable : false,
id : key,
qtip : tooltip,
expanded : autoExpand,
<<<<<<<
}
=======
}
>>>>>>>
}
<<<<<<<
function getPreviousQueryFromIDComplete(subset, result) {
if (result.status != 200) {
queryPanel.el.unmask();
return;
}
var doc = result.responseXML;
//resetQuery(); //if i do this now it wipes out the other subset i just loaded need to make it subset specific
var panels = doc.selectNodes("//panel");
panel:
for (var p = 0; p < panels.length; p++) {
var panelnumber = p + 1
showCriteriaGroup(panelnumber); //in case its hidden;
var panel = document.getElementById("queryCriteriaDiv" + subset + "_" + panelnumber);
var invert = panels[p].selectSingleNode("invert").firstChild.nodeValue;
if (invert == "1") {
excludeGroup(null, subset, panelnumber);
} //set the invert for the panel
var items = panels[p].selectNodes("item")
for (var it = 0; it < items.length; it++) {
var item = items[it];
var key = item.selectSingleNode("item_key").firstChild.nodeValue;
if (key == "\\\\Public Studies\\Public Studies\\SECURITY\\")
continue panel;
/*need all this information for reconstruction but not all is available*/
var valuetype = getValue(item.selectSingleNode("constrain_by_value/value_type"), "");
var mode;
if (valuetype == "FLAG") {
mode = "highlow";
}
else if (valuetype == "NUMBER") {
mode = "numeric";
}
else {
mode == "novalue";
}
var valuenode = item.selectSingleNode("contrain_by_value");
var oktousevalues;
if (valuenode != null && typeof(valuenode) != undefined) {
oktousevalues = "Y";
}
var operator = getValue(item.selectSingleNode("constrain_by_value/value_operator"), "");
var numvalue = getValue(item.selectSingleNode("constrain_by_value/value_constraint"), "");
var lowvalue;
var highvalue;
if (operator == "BETWEEN") {
lowvalue = numvalue.substring(0, numvalue.indexOf("and"));
highvalue = numvalue.substring(numvalue.indexOf("and") + 3);
}
else {
lowvalue = numvalue;
}
var highlowselect = "";
if (mode == "highlow") {
highlowselect = numvalue;
}
var value = new Value(mode, operator, highlowselect, lowvalue, highvalue, '');
/* the panel (probably) only needs the concept key and the
* constraint, hence we not need to fill the rest of the parameters,
* which is good because we don't have that information...
*/
var myConcept = new Concept('', key, -1, '', '', '', '', '', oktousevalues, value);
createPanelItemNew(panel, myConcept);
}
}
queryPanel.el.unmask();
=======
function getPreviousQueryFromIDComplete(subset, result)
{
var doc = result.responseXML;
var panels = doc.selectNodes("//panel");
for(var p = 0; p < panels.length; p ++ )
{
var panelnumber = panels[p].selectSingleNode("panel_number").firstChild.nodeValue;
if (panelnumber=="21") continue;
showCriteriaGroup(panelnumber); //in case its hidden;
var panel=document.getElementById("queryCriteriaDiv"+subset+"_"+panelnumber);
var invert = panels[p].selectSingleNode("invert").firstChild.nodeValue;
if(invert=="1"){excludeGroup(null, subset, panelnumber);} //set the invert for the panel
var occurences = panels[p].selectSingleNode("total_item_occurrences").firstChild.nodeValue;
// TODO : set the invert
// TODO : set the occurences
// make the items
var items = panels[p].selectNodes("item")
for(var it = 0; it < items.length; it ++ )
{
var item = items[it];
var level = item.selectSingleNode("hlevel").firstChild.nodeValue;
var name = getValue(item.selectSingleNode("item_name"),"");
var key = item.selectSingleNode("item_key").firstChild.nodeValue;
var tooltip = getValue(item.selectSingleNode("tooltip"),"");
var itemclass = item.selectSingleNode("class").firstChild.nodeValue;
/*need all this information for reconstruction but not all is available*/
var valuetype=getValue(item.selectSingleNode("constrain_by_value/value_type"),"");
var mode;
if(valuetype=="FLAG"){mode="highlow";}
else if(valuetype=="NUMBER"){mode="numeric";}
else {mode=="novalue";}
var valuenode=item.selectSingleNode("contrain_by_value");
var oktousevalues;
if(valuenode!=null && typeof(valuenode)!=undefined){oktousevalues="Y";}
var operator=getValue(item.selectSingleNode("constrain_by_value/value_operator"),"");
var numvalue=getValue(item.selectSingleNode("constrain_by_value/value_constraint"),"");
var lowvalue;
var highvalue;
if(operator=="BETWEEN")
{
lowvalue=numvalue.substring(0, numvalue.indexOf("and"));
highvalue=numvalue.substring(numvalue.indexOf("and")+3);
}
else
{
lowvalue=numvalue;
}
var highlowselect="";
if(mode=="highlow"){highlowselect=numvalue;}
var units=getValue(item.selectSingleNode("constrain_by_value/value_unit_of_measure"),"");
var dimcode="";
var comment="";
var normalunits=units;
var tablename="";
var value=new Value(mode, operator, highlowselect, lowvalue, highvalue, units);
var myConcept=new Concept(name, key, level, tooltip, tablename, dimcode, comment, normalunits, oktousevalues, value);
createPanelItemNew(panel, myConcept);
}
}
queryPanel.el.unmask();
>>>>>>>
function getPreviousQueryFromIDComplete(subset, result) {
if (result.status != 200) {
queryPanel.el.unmask();
return;
}
var doc = result.responseXML;
//resetQuery(); //if i do this now it wipes out the other subset i just loaded need to make it subset specific
var panels = doc.selectNodes("//panel");
panel:
for (var p = 0; p < panels.length; p++) {
var panelnumber = p + 1
showCriteriaGroup(panelnumber); //in case its hidden;
var panel = document.getElementById("queryCriteriaDiv" + subset + "_" + panelnumber);
var invert = panels[p].selectSingleNode("invert").firstChild.nodeValue;
if (invert == "1") {
excludeGroup(null, subset, panelnumber);
} //set the invert for the panel
var items = panels[p].selectNodes("item")
for (var it = 0; it < items.length; it++) {
var item = items[it];
var key = item.selectSingleNode("item_key").firstChild.nodeValue;
if (key == "\\\\Public Studies\\Public Studies\\SECURITY\\")
continue panel;
/*need all this information for reconstruction but not all is available*/
var valuetype = getValue(item.selectSingleNode("constrain_by_value/value_type"), "");
var mode;
if (valuetype == "FLAG") {
mode = "highlow";
}
else if (valuetype == "NUMBER") {
mode = "numeric";
}
else {
mode == "novalue";
}
var valuenode = item.selectSingleNode("contrain_by_value");
var oktousevalues;
if (valuenode != null && typeof(valuenode) != undefined) {
oktousevalues = "Y";
}
var operator = getValue(item.selectSingleNode("constrain_by_value/value_operator"), "");
var numvalue = getValue(item.selectSingleNode("constrain_by_value/value_constraint"), "");
var lowvalue;
var highvalue;
if (operator == "BETWEEN") {
lowvalue = numvalue.substring(0, numvalue.indexOf("and"));
highvalue = numvalue.substring(numvalue.indexOf("and") + 3);
}
else {
lowvalue = numvalue;
}
var highlowselect = "";
if (mode == "highlow") {
highlowselect = numvalue;
}
var value = new Value(mode, operator, highlowselect, lowvalue, highvalue, '');
/* the panel (probably) only needs the concept key and the
* constraint, hence we not need to fill the rest of the parameters,
* which is good because we don't have that information...
*/
var myConcept = new Concept('', key, -1, '', '', '', '', '', oktousevalues, value);
createPanelItemNew(panel, myConcept);
}
}
queryPanel.el.unmask(); |
<<<<<<<
button.html("<i class='fa fa-refresh fa-spin'></i> Trying...");
$.ajax({
url: appPrefixed('/a/tools/regex_test'),
data: {
"string":URI.encode($("#xtrc-example").text()),
"regex":$("#regex_value").val()
},
success: function(matchResult) {
if (matchResult.finds) {
if (matchResult.match != null) {
highlightMatchResult(matchResult);
} else {
showWarning("Regular expression does not contain any matcher group to extract.");
}
=======
button.html("<i class='icon-refresh icon-spin'></i> Trying...");
var promise = testRegex($("#regex_value").val());
promise.done(function (matchResult) {
if (matchResult.finds) {
if (matchResult.match != null) {
highlightMatchResult(matchResult);
>>>>>>>
button.html("<i class='fa fa-refresh fa-spin'></i> Trying...");
var promise = testRegex($("#regex_value").val());
promise.done(function (matchResult) {
if (matchResult.finds) {
if (matchResult.match != null) {
highlightMatchResult(matchResult);
<<<<<<<
button.html("<i class='fa fa-refresh fa-spin'></i> Trying...");
$.ajax({
url: appPrefixed('/a/tools/substring_test'),
data: {
"string":$("#xtrc-example").text(),
"start":beginIndex,
"end":endIndex
},
success: function(result) {
if(result.successful) {
highlightMatchResult(result);
} else {
showWarning(warningText);
}
},
error: function() {
showError(warningText);
},
complete: function() {
button.html("Try!");
=======
button.html("<i class='icon-refresh icon-spin'></i> Trying...");
var promise = testSubstring(beginIndex, endIndex);
promise.done(function (result) {
if (result.successful) {
highlightMatchResult(result);
} else {
showWarning(warningText);
>>>>>>>
button.html("<i class='fa fa-refresh fa-spin'></i> Trying...");
var promise = testSubstring(beginIndex, endIndex);
promise.done(function (result) {
if (result.successful) {
highlightMatchResult(result);
} else {
showWarning(warningText);
<<<<<<<
button.html("<i class='fa fa-refresh fa-spin'></i> Trying...");
$.ajax({
url: appPrefixed('/a/tools/split_and_index_test'),
data: {
"string":$("#xtrc-example").text(),
"split_by":$("#split_by").val(),
"index":$("#index").val()
},
success: function(result) {
if(result.successful) {
highlightMatchResult(result);
} else {
showWarning(warningText);
}
},
error: function() {
showError(warningText);
},
complete: function() {
button.html("Try!");
=======
button.html("<i class='icon-refresh icon-spin'></i> Trying...");
var promise = testSplitAndIndex($("#split_by").val(), $("#index").val());
promise.done(function (result) {
if (result.successful) {
highlightMatchResult(result);
} else {
showWarning(warningText);
>>>>>>>
button.html("<i class='fa fa-refresh fa-spin'></i> Trying...");
var promise = testSplitAndIndex($("#split_by").val(), $("#index").val());
promise.done(function (result) {
if (result.successful) {
highlightMatchResult(result);
} else {
showWarning(warningText);
<<<<<<<
button.html("<i class='fa fa-refresh fa-spin'></i> Trying...");
$.ajax({
url: appPrefixed('/a/tools/grok_test'),
data: {
"string":$("#xtrc-example").text(),
"pattern":$("#grok_pattern").val()
},
success: function(result) {
if(result.finds) {
showGrokMatches(result);
} else {
showWarning(warningText);
}
},
error: function() {
showError(warningText);
},
complete: function() {
button.html("Try!");
=======
button.html("<i class='icon-refresh icon-spin'></i> Trying...");
var promise = testGrok($("#grok_pattern").val());
promise.done(function (result) {
if (result.finds) {
showGrokMatches(result);
} else {
showWarning(warningText);
>>>>>>>
button.html("<i class='fa fa-refresh fa-spin'></i> Trying...");
var promise = testGrok($("#grok_pattern").val());
promise.done(function (result) {
if (result.finds) {
showGrokMatches(result);
} else {
showWarning(warningText);
<<<<<<<
button.html("<i class='fa fa-refresh fa-spin'></i> Trying...");
$.ajax({
url: appPrefixed('/a/tools/regex_test'),
data: {
"string":$("#xtrc-example").text(),
"regex":$("#condition_value").val()
},
success: function(matchResult) {
var resultMsg = $("#try-xtrc-condition-result");
resultMsg.removeClass("success-match");
resultMsg.removeClass("fail-match");
if(matchResult.finds) {
resultMsg.html("Matches! Extractor would run against this example.");
resultMsg.addClass("success-match");
} else {
resultMsg.html("Does not match! Extractor would not run.");
resultMsg.addClass("fail-match");
}
=======
button.html("<i class='icon-refresh icon-spin'></i> Trying...");
>>>>>>>
button.html("<i class='fa fa-refresh fa-spin'></i> Trying..."); |
<<<<<<<
gulp.task('build:scripts', () =>
gulp.src('app/src/scripts/*.js')
.pipe(babel())
.pipe(gulp.dest('app/dist')));
gulp.task('build', ['build:main', 'build:pug', 'build:css', 'build:js', 'build:scripts']);
=======
gulp.task('build:js:common', () =>
gulp.src('app/src/common/*.js')
.pipe(babel())
.pipe(gulp.dest('app/dist')));
gulp.task('build', ['build:js:main', 'build:pug', 'build:css', 'build:js:renderer', 'build:js:common']);
>>>>>>>
gulp.task('build:scripts', () =>
gulp.src('app/src/scripts/*.js')
.pipe(babel())
.pipe(gulp.dest('app/dist')));
gulp.task('build:js:common', () =>
gulp.src('app/src/common/*.js')
.pipe(babel())
.pipe(gulp.dest('app/dist')));
gulp.task('build', ['build:js:main', 'build:pug', 'build:css', 'build:js:renderer', 'build:scripts', 'build:js:common']);
<<<<<<<
gulp.watch('app/src/renderer/js/*.js', ['build:js']);
gulp.watch('app/src/scripts/*.js', ['build:scripts']);
gulp.watch('app/src/main/*.js', ['build:main']);
=======
gulp.watch('app/src/renderer/js/*.js', ['build:js:renderer']);
gulp.watch('app/src/common/*.js', ['build:js:common']);
gulp.watch('app/src/main/*.js', ['build:js:main']);
>>>>>>>
gulp.watch('app/src/renderer/js/*.js', ['build:js:renderer']);
gulp.watch('app/src/scripts/*.js', ['build:scripts']);
gulp.watch('app/src/common/*.js', ['build:js:common']); |
<<<<<<<
=======
import {ipcRenderer} from 'electron';
>>>>>>>
import {ipcRenderer} from 'electron';
<<<<<<<
import {convert as convertToGif} from './mp4-to-gif';
require('./reporter');
=======
import {init as initErrorReporter} from './reporter';
>>>>>>>
import {convert as convertToGif} from './mp4-to-gif';
import {init as initErrorReporter} from './reporter';
<<<<<<<
ipcRenderer.on('save-dialog-closed', () => {
progressBarSection.classList.add('hidden');
header.classList.remove('hidden');
controlsSection.classList.remove('hidden');
progressBar.value = 0;
setMainWindowSize();
});
=======
initErrorReporter();
>>>>>>>
ipcRenderer.on('save-dialog-closed', () => {
progressBarSection.classList.add('hidden');
header.classList.remove('hidden');
controlsSection.classList.remove('hidden');
progressBar.value = 0;
setMainWindowSize();
});
initErrorReporter(); |
<<<<<<<
var mejsoptions = {
defaultVideoWidth: 480,
defaultVideoHeight: 270,
videoWidth: -1,
videoHeight: -1,
audioWidth: -1,
audioHeight: 30,
startVolume: 0.8,
loop: false,
enableAutosize: true,
features: ['playpause','current','progress','duration','tracks','volume','fullscreen'],
alwaysShowControls: false,
iPadUseNativeControls: false,
iPhoneUseNativeControls: false,
AndroidUseNativeControls: false,
alwaysShowHours: false,
showTimecodeFrameCount: false,
framesPerSecond: 25,
enableKeyboard: true,
pauseOtherPlayers: true,
duration: false
};
// Additional parameters default values
var params = $.extend({}, {
chapterlinks: 'all',
width: '100%',
duration: false,
chaptersVisible: false,
timecontrolsVisible: false,
summaryVisible: false
}, options);
// turn each player in the current set into a Podlove Web Player
return this.each(function(index, player){
var richplayer = false,
haschapters = false;
//fine tuning params
if (params.width.toLowerCase() == 'auto') {
params.width = '100%';
} else {
params.width = params.width.replace('px', '');
=======
var mejsoptions = {
defaultVideoWidth: 480,
defaultVideoHeight: 270,
videoWidth: -1,
videoHeight: -1,
audioWidth: -1,
audioHeight: 30,
startVolume: 0.8,
loop: false,
enableAutosize: true,
features: ['playpause','current','progress','duration','tracks','volume','fullscreen'],
alwaysShowControls: false,
iPadUseNativeControls: false,
iPhoneUseNativeControls: false,
AndroidUseNativeControls: false,
alwaysShowHours: false,
showTimecodeFrameCount: false,
framesPerSecond: 25,
enableKeyboard: true,
pauseOtherPlayers: true,
duration: false
};
// Additional parameters default values
var params = $.extend({}, {
chapterlinks: 'all',
width: '100%',
duration: false,
chaptersVisible: false,
timecontrolsVisible: false,
sharebuttonsVisible: false,
summaryVisible: false
}, options);
//fine tuning params
if (params.width.toLowerCase() == 'auto') {
params.width = '100%';
} else {
params.width = params.width.replace('px', '');
}
//audio params
if (player.tagName == 'AUDIO') {
if (typeof params.audioWidth !== 'undefined') {
params.width = params.audioWidth;
>>>>>>>
var mejsoptions = {
defaultVideoWidth: 480,
defaultVideoHeight: 270,
videoWidth: -1,
videoHeight: -1,
audioWidth: -1,
audioHeight: 30,
startVolume: 0.8,
loop: false,
enableAutosize: true,
features: ['playpause','current','progress','duration','tracks','volume','fullscreen'],
alwaysShowControls: false,
iPadUseNativeControls: false,
iPhoneUseNativeControls: false,
AndroidUseNativeControls: false,
alwaysShowHours: false,
showTimecodeFrameCount: false,
framesPerSecond: 25,
enableKeyboard: true,
pauseOtherPlayers: true,
duration: false
};
// Additional parameters default values
var params = $.extend({}, {
chapterlinks: 'all',
width: '100%',
duration: false,
chaptersVisible: false,
timecontrolsVisible: false,
sharebuttonsVisible: false,
summaryVisible: false
}, options);
// turn each player in the current set into a Podlove Web Player
return this.each(function(index, player){
var richplayer = false,
haschapters = false;
//fine tuning params
if (params.width.toLowerCase() == 'auto') {
params.width = '100%';
} else {
params.width = params.width.replace('px', '');
<<<<<<<
=======
// init MEJS to player
mejsoptions.success = function (player) {
addBehavior(player, params);
if (deepLink !== false && players.length === 1) {
$('html, body').delay(150).animate({
scrollTop: $('.podlovewebplayer_wrapper:first').offset().top - 25
});
}
};
>>>>>>>
<<<<<<<
});
if (chapterdiv.length === 1) {
metainfo.find('a.chaptertoggle').on('click', function() {
chapterdiv.toggleClass('active');
if (chapterdiv.hasClass('active')) {
chapterdiv.height(chapterdiv.data('height') + 'px');
=======
$(this).closest('.podlovewebplayer_wrapper').find('.chaptertoggle').click(function() {
$(this).closest('.podlovewebplayer_wrapper').find('.podlovewebplayer_chapterbox').toggleClass('active');
if ($(this).closest('.podlovewebplayer_wrapper').find('.podlovewebplayer_chapterbox').hasClass('active')) {
$(this).closest('.podlovewebplayer_wrapper').find('.podlovewebplayer_chapterbox').height($(this).closest('.podlovewebplayer_wrapper').find('.podlovewebplayer_chapterbox').data('height') + 'px');
>>>>>>>
$(this).closest('.podlovewebplayer_wrapper').find('.chaptertoggle').click(function() {
$(this).closest('.podlovewebplayer_wrapper').find('.podlovewebplayer_chapterbox').toggleClass('active');
if ($(this).closest('.podlovewebplayer_wrapper').find('.podlovewebplayer_chapterbox').hasClass('active')) {
$(this).closest('.podlovewebplayer_wrapper').find('.podlovewebplayer_chapterbox').height($(this).closest('.podlovewebplayer_wrapper').find('.podlovewebplayer_chapterbox').data('height') + 'px'); |
<<<<<<<
tick: 0,
deltaTime: 0,
=======
count: 0,
>>>>>>>
tick: 0, |
<<<<<<<
require('../framebuffer-ref-count')
require('../framebuffer-resize')
require('../framebuffer-depth-stencil')
require('../framebuffer-codegen')
require('../stats')
=======
require('../stats')
require('../stats_gputime')
>>>>>>>
require('../framebuffer-ref-count')
require('../framebuffer-resize')
require('../framebuffer-depth-stencil')
require('../framebuffer-codegen')
require('../stats')
require('../stats_gputime') |
<<<<<<<
this.processNextItem();
}
};
/**
* @private
* Process the next pending event.
*/
SignalQueue.prototype.processNextItem = function() {
var firstPendingItem = this.queue[0];
// Would normally use double-dispatch for this sort of thing, but
// this is simpler and sufficient for now.
switch (typeof firstPendingItem) {
case 'string':
this.deliverFirstPendingEvent(firstPendingItem);
break;
case 'function':
this.invokeFirstPendingCallback(firstPendingItem);
break;
default:
error("Dropping unknown type of item in signal queue.", firstPendingItem);
this.onFirstPendingItemCompleted();
=======
log("No pending events; delivering immediately.", event);
this.deliverFirstPendingEvent();
>>>>>>>
log("No pending items; processing immediately.", item);
this.processNextItem();
}
};
/**
* @private
* Process the next pending event.
*/
SignalQueue.prototype.processNextItem = function() {
var firstPendingItem = this.queue[0];
// Would normally use double-dispatch for this sort of thing, but
// this is simpler and sufficient for now.
switch (typeof firstPendingItem) {
case 'string':
this.deliverFirstPendingEvent(firstPendingItem);
break;
case 'function':
this.invokeFirstPendingCallback(firstPendingItem);
break;
default:
error("Dropping unknown type of item in signal queue.", firstPendingItem);
this.onFirstPendingItemCompleted();
<<<<<<<
=======
var firstPendingEvent = signalQueue.queue[0];
log("Delivering pending event.", firstPendingEvent);
>>>>>>>
log("Delivering pending event.", firstPendingEvent);
<<<<<<<
SignalQueue.prototype.invokeFirstPendingCallback = function(firstPendingCallback) {
firstPendingCallback();
this.onFirstPendingItemCompleted();
};
/**
* @private
* Handler for when the first item in the queue has been completed.
*/
SignalQueue.prototype.onFirstPendingItemCompleted = function() {
=======
SignalQueue.prototype.onFirstPendingEventCompleted = function() {
log("Marking pending event as complete.");
>>>>>>>
SignalQueue.prototype.invokeFirstPendingCallback = function(firstPendingCallback) {
firstPendingCallback();
this.onFirstPendingItemCompleted();
};
/**
* @private
* Handler for when the first item in the queue has been completed.
*/
SignalQueue.prototype.onFirstPendingItemCompleted = function() {
log("Marking pending item as complete.");
<<<<<<<
if (0 < pendingEvents.length) {
this.processNextItem();
=======
var remainingEvents = pendingEvents.length;
if (0 < remainingEvents) {
log("Processing next event; remaining count:", remainingEvents);
this.deliverFirstPendingEvent();
} else {
log("All pending events have been delivered.");
>>>>>>>
var remainingEvents = pendingEvents.length;
if (0 < remainingEvents) {
log("Processing next item; remaining count:", remainingEvents);
this.processNextItem();
} else {
log("All pending items have been delivered.");
<<<<<<<
* Events are normally delivered to the server serially in the order they
* are signalled. A queued event will be delivered when any of the following
* occurs:
*
* - A prior event is successfully flushed.
* - An error occurs flushed the prior event. (No retry is attempted.)
* - It takes too long (1 second by default) for the prior event to be
* flushed.
*
* @param {!string} type The type of event to log.
=======
* @param {string} type The type of event to log.
>>>>>>>
* Events are normally delivered to the server serially in the order they
* are signalled. A queued event will be delivered when any of the following
* occurs:
*
* - A prior event is successfully flushed.
* - An error occurs flushed the prior event. (No retry is attempted.)
* - It takes too long (1 second by default) for the prior event to be
* flushed.
*
* @param {string} type The type of event to log. |
<<<<<<<
import Conf from './../context/conf';
import minimatch from 'minimatch';
let hookLoader, instrumentJs, shouldIgnore, shallInstrumentClientScript, shallInstrumentServerScript;
=======
import Conf from './../context/conf';
import minimatch from 'minimatch';
let hookLoader, instrumentJs, shouldIgnore, shallInstrumentClientScript, shallInstrumentServerScript, fileMatch;
>>>>>>>
import Conf from './../context/conf';
import minimatch from 'minimatch';
let hookLoader, instrumentJs, shouldIgnore, shallInstrumentClientScript, shallInstrumentServerScript, fileMatch;
<<<<<<<
//var im = Npm.require('istanbul-middleware');
var istanbulAPI = Npm.require('istanbul-api'),
Hook = istanbulAPI.libHook,
Instrument = istanbulAPI.libInstrument,
instrumenter = undefined;
/**
* hooks `runInThisContext` to add instrumentation to matching files when they are loaded on the server
* @method hookLoader
* @param {Object} opts instrumenter options
*/
hookLoader = function (opts) {
opts = opts || {};
opts.verbose = true;
opts.coverageVariable = '__coverage__'; //force this always
if (instrumenter !== undefined) {
throw 'Instrumenter already defined ! You cannot call this method twice';
}
instrumenter = Instrument.createInstrumenter(opts);
var transformer = instrumenter.instrumentSync.bind(instrumenter);
Hook.hookRunInThisContext(
shallInstrumentServerScript,
transformer,
{
verbose: opts.verbose,
}
);
};
instrumentJs = function (content, path, callback) {
SourceMap.registerSourceMap(path);
return instrumenter.instrument(content, path, callback);
};
shouldIgnore = function (filePath, isAServerSideFile) {
if(!Conf) {
Log.info('[Config file not found or invalid]: ', Conf);
return false;
}
if (Conf.include) {
Log.info('[Including]');
Log.info('[Verifying]: ', filePath);
if (Conf.include.some(pattern => fileMatch(pattern))) {
Log.info('[Included]: ', filePath);
return false;
}
}
let shouldIgnore = false;
if (!Conf.exclude) return false;
if (Conf.exclude.general) {
shouldIgnore = Conf.exclude.general.some(pattern => fileMatch(pattern));
Log.info('[Ignoring][general]');
Log.info('[Verifying]: ', filePath);
if(shouldIgnore) {
Log.info('[Ignored]: ', filePath);
}
}
if (!shouldIgnore && Conf.exclude.server && isAServerSideFile) {
shouldIgnore = Conf.exclude.server.some(pattern => fileMatch(pattern));
Log.info('[Ignoring][server]');
Log.info('[Verifying]: ', filePath);
if(shouldIgnore) {
Log.info('[Ignored]: ', filePath);
}
}
if (!shouldIgnore && Conf.exclude.client && !isAServerSideFile) {
shouldIgnore = Conf.exclude.client.some(pattern => fileMatch(pattern));
Log.info('[Ignoring][client]');
Log.info('[Verifying]: ', filePath);
if(shouldIgnore) {
Log.info('[Ignored]: ', filePath);
}
}
return shouldIgnore;
function fileMatch(pattern) {
let fileMatched = minimatch(filePath, pattern, { dot: true });
return fileMatched;
}
};
shallInstrumentClientScript = function (fileurl) {
if (fileurl.indexOf('.js') > -1) {
if (fileurl.indexOf('packages') === 1) {
if (!shouldIgnore(fileurl, false)) {
Log.info('[ClientSide][InApp] file instrumented: ' + fileurl);
return true;
} else {
Log.info('[ClientSide][InApp] file ignored: ' + fileurl);
return false;
}
} else {
let instrumented = !shouldIgnore(fileurl, false);
if (instrumented) {
Log.info('[ClientSide][Public] file instrumented: ' + fileurl);
} else {
Log.info('[ClientSide][Public] file ignored: ' + fileurl);
}
return instrumented;
}
}
return false;
};
/**
*
* a match function with signature `fn(file)` that returns true if `file` needs to be instrumented
* if the result is true, it also reads the corresponding source map
* @returns {Function}
*/
shallInstrumentServerScript = function (file) {
var root = __meteor_bootstrap__.serverDir;
if (file.indexOf(root) !== 0) {
Log.info('[ServerSide][OutsideApp] file ignored: ' + file);
return false;
}
file = file.substring(root.length);
if (file.indexOf('node_modules') >= 0) {
Log.info('[ServerSide][node_modules] file ignored: ' + file);
return false;
}
if (file.indexOf('packages') === 1) {
if (!shouldIgnore(file, true)) {
SourceMap.registerSourceMap(root + file);
Log.info('[ServerSide][Package] file instrumented: ' + file);
return true;
} else {
Log.info('[ServerSide][Package] file ignored: ' + file);
}
} else {
if (!shouldIgnore(root + file, true)) {
SourceMap.registerSourceMap(root + file);
Log.info('[ServerSide][App.js] file instrumented: ' + file);
return true;
} else {
Log.info('[ServerSide][App.js] file ignored: ' + file);
}
}
return false;
};
=======
//var im = Npm.require('istanbul-middleware');
var istanbulAPI = Npm.require('istanbul-api'),
Hook = istanbulAPI.libHook,
Instrument = istanbulAPI.libInstrument,
instrumenter = undefined;
/**
* hooks `runInThisContext` to add instrumentation to matching files when they are loaded on the server
* @method hookLoader
* @param {Object} opts instrumenter options
*/
hookLoader = function (opts) {
opts = opts || {};
opts.verbose = true;
opts.coverageVariable = '__coverage__'; //force this always
if (instrumenter !== undefined) {
throw 'Instrumenter already defined ! You cannot call this method twice';
}
instrumenter = Instrument.createInstrumenter(opts);
var transformer = instrumenter.instrumentSync.bind(instrumenter);
Hook.hookRunInThisContext(
shallInstrumentServerScript,
transformer,
{
verbose: opts.verbose,
}
);
};
instrumentJs = function (content, path, callback) {
SourceMap.registerSourceMap(path);
return instrumenter.instrument(content, path, callback);
};
fileMatch = function (pattern) {
let fileMatched = minimatch(filePath, pattern, {dot: true});
return fileMatched;
}
shouldIgnore = function (filePath, isAServerSideFile) {
if (!Conf) {
Log.info('[Config file not found or invalid]: ', Conf);
return false;
}
// Force the inclusion of any file using config file
if (Conf.include) {
Log.info('[Verifying][force include]: ', filePath);
if (Conf.include.some(pattern => Instrumenter.fileMatch(pattern))) {
Log.info('[Included][using include config]: ', filePath);
return false;
}
}
let shouldIgnore = false;
if (Conf.exclude.general) {
shouldIgnore = Conf.exclude.general.some(pattern => Instrumenter.fileMatch(pattern));
Log.info('[Verifying][exclude.general]: ', filePath);
if (shouldIgnore) {
Log.info('[Ignored][exclude.general]: ', filePath);
return shouldIgnore;
}
}
if (Conf.exclude.server && isAServerSideFile) {
shouldIgnore = Conf.exclude.server.some(pattern => Instrumenter.fileMatch(pattern));
Log.info('[Verifying][exclude.server]: ', filePath);
if (shouldIgnore) {
Log.info('[Ignored][exclude.server]: ', filePath);
return shouldIgnore;
}
}
if (!shouldIgnore && Conf.exclude.client && !isAServerSideFile) {
shouldIgnore = Conf.exclude.client.some(pattern => Instrumenter.fileMatch(pattern));
Log.info('[Verifying][exclude.client]: ', filePath);
if (shouldIgnore) {
Log.info('[Ignored][exclude.client]: ', filePath);
return shouldIgnore;
}
}
};
shallInstrumentClientScript = function (fileurl) {
if (fileurl.indexOf('.js') > -1) {
if (fileurl.indexOf('packages') === 1) {
if (!shouldIgnore(fileurl, false)) {
Log.info('[ClientSide][InApp] file instrumented: ' + fileurl);
return true;
} else {
Log.info('[ClientSide][InApp] file ignored: ' + fileurl);
return false;
}
} else {
let instrumented = !shouldIgnore(fileurl, false);
if (instrumented) {
Log.info('[ClientSide][Public] file instrumented: ' + fileurl);
} else {
Log.info('[ClientSide][Public] file ignored: ' + fileurl);
}
return instrumented;
}
}
return false;
};
/**
*
* a match function with signature `fn(file)` that returns true if `file` needs to be instrumented
* if the result is true, it also reads the corresponding source map
* @returns {Function}
*/
shallInstrumentServerScript = function (file) {
var root = __meteor_bootstrap__.serverDir;
if (file.indexOf(root) !== 0) {
Log.info('[ServerSide][OutsideApp] file ignored: ' + file);
return false;
}
file = file.substring(root.length);
if (file.indexOf('node_modules') >= 0) {
Log.info('[ServerSide][node_modules] file ignored: ' + file);
return false;
}
if (file.indexOf('packages') === 1) {
if (!shouldIgnore(file, true)) {
SourceMap.registerSourceMap(root + file);
Log.info('[ServerSide][Package] file instrumented: ' + file);
return true;
} else {
Log.info('[ServerSide][Package] file ignored: ' + file);
}
} else {
if (!shouldIgnore(root + file, true)) {
SourceMap.registerSourceMap(root + file);
Log.info('[ServerSide][App.js] file instrumented: ' + file);
return true;
} else {
Log.info('[ServerSide][App.js] file ignored: ' + file);
}
}
return false;
};
>>>>>>>
//var im = Npm.require('istanbul-middleware');
var istanbulAPI = Npm.require('istanbul-api'),
Hook = istanbulAPI.libHook,
Instrument = istanbulAPI.libInstrument,
instrumenter = undefined;
/**
* hooks `runInThisContext` to add instrumentation to matching files when they are loaded on the server
* @method hookLoader
* @param {Object} opts instrumenter options
*/
hookLoader = function (opts) {
opts = opts || {};
opts.verbose = true;
opts.coverageVariable = '__coverage__'; //force this always
if (instrumenter !== undefined) {
throw 'Instrumenter already defined ! You cannot call this method twice';
}
instrumenter = Instrument.createInstrumenter(opts);
var transformer = instrumenter.instrumentSync.bind(instrumenter);
Hook.hookRunInThisContext(
shallInstrumentServerScript,
transformer,
{
verbose: opts.verbose,
}
);
};
instrumentJs = function (content, path, callback) {
SourceMap.registerSourceMap(path);
return instrumenter.instrument(content, path, callback);
};
fileMatch = function (pattern) {
let fileMatched = minimatch(filePath, pattern, {dot: true});
return fileMatched;
};
shouldIgnore = function (filePath, isAServerSideFile) {
// Force the inclusion of any file using config file
if (Conf.include) {
Log.info('[Verifying][force include]: ', filePath);
if (Conf.include.some(pattern => Instrumenter.fileMatch(pattern))) {
Log.info('[Included][using include config]: ', filePath);
return false;
}
}
let shouldIgnore = false;
if (Conf.exclude.general) {
shouldIgnore = Conf.exclude.general.some(pattern => Instrumenter.fileMatch(pattern));
Log.info('[Verifying][exclude.general]: ', filePath);
if (shouldIgnore) {
Log.info('[Ignored][exclude.general]: ', filePath);
return shouldIgnore;
}
}
if (Conf.exclude.server && isAServerSideFile) {
shouldIgnore = Conf.exclude.server.some(pattern => Instrumenter.fileMatch(pattern));
Log.info('[Verifying][exclude.server]: ', filePath);
if (shouldIgnore) {
Log.info('[Ignored][exclude.server]: ', filePath);
return shouldIgnore;
}
}
if (!shouldIgnore && Conf.exclude.client && !isAServerSideFile) {
shouldIgnore = Conf.exclude.client.some(pattern => Instrumenter.fileMatch(pattern));
Log.info('[Verifying][exclude.client]: ', filePath);
if (shouldIgnore) {
Log.info('[Ignored][exclude.client]: ', filePath);
return shouldIgnore;
}
}
};
shallInstrumentClientScript = function (fileurl) {
if (fileurl.indexOf('.js') > -1) {
if (fileurl.indexOf('packages') === 1) {
if (!shouldIgnore(fileurl, false)) {
Log.info('[ClientSide][InApp] file instrumented: ' + fileurl);
return true;
} else {
Log.info('[ClientSide][InApp] file ignored: ' + fileurl);
return false;
}
} else {
let instrumented = !shouldIgnore(fileurl, false);
if (instrumented) {
Log.info('[ClientSide][Public] file instrumented: ' + fileurl);
} else {
Log.info('[ClientSide][Public] file ignored: ' + fileurl);
}
return instrumented;
}
}
return false;
};
/**
*
* a match function with signature `fn(file)` that returns true if `file` needs to be instrumented
* if the result is true, it also reads the corresponding source map
* @returns {Function}
*/
shallInstrumentServerScript = function (file) {
var root = __meteor_bootstrap__.serverDir;
if (file.indexOf(root) !== 0) {
Log.info('[ServerSide][OutsideApp] file ignored: ' + file);
return false;
}
file = file.substring(root.length);
if (file.indexOf('node_modules') >= 0) {
Log.info('[ServerSide][node_modules] file ignored: ' + file);
return false;
}
if (file.indexOf('packages') === 1) {
if (!shouldIgnore(file, true)) {
SourceMap.registerSourceMap(root + file);
Log.info('[ServerSide][Package] file instrumented: ' + file);
return true;
} else {
Log.info('[ServerSide][Package] file ignored: ' + file);
}
} else {
if (!shouldIgnore(root + file, true)) {
SourceMap.registerSourceMap(root + file);
Log.info('[ServerSide][App.js] file instrumented: ' + file);
return true;
} else {
Log.info('[ServerSide][App.js] file ignored: ' + file);
}
}
return false;
};
<<<<<<<
hookLoader,
instrumentJs,
shouldIgnore,
shallInstrumentClientScript,
shallInstrumentServerScript
=======
hookLoader,
instrumentJs,
shouldIgnore,
fileMatch,
shallInstrumentClientScript,
shallInstrumentServerScript
>>>>>>>
hookLoader,
instrumentJs,
shouldIgnore,
fileMatch,
shallInstrumentClientScript,
shallInstrumentServerScript |
<<<<<<<
// TODO -- To be reviewed ([email protected])
analysisHeatmapPanel = new Ext.Panel(
{
id : 'analysisHeatmapPanel',
title : 'Heatmap',
region : 'center',
split : true,
height : 90,
layout : 'fit',
listeners :
{
activate : function(p) {
GLOBAL.CurrentSubsetIDs[1] = null;
GLOBAL.CurrentSubsetIDs[2] = null;
p.body.mask("Magic is happening ...", 'x-mask-loading');
runAllQueries(getImperialHeatmapData, p);
return;
},
deactivate: function(){
//resultsTabPanel.tools.help.dom.style.display="none";
}
},
collapsible : true
}
);
// --
=======
metacoreEnrichmentPanel = new Ext.Panel(
{
id : 'metacoreEnrichmentPanel',
title : 'MetaCore Enrichment Analysis',
region : 'center',
split : true,
height : 90,
layout : 'fit',
//autoLoad : getExportJobs,
tbar : new Ext.Toolbar({
id : 'metacoreEnrichmentWorkflowToolbar',
title : 'Analysis menu',
items : []
}),
autoScroll : true,
autoLoad:
{
url : pageInfo.basePath+'/metacoreEnrichment/index',
method:'GET',
// callback: setDataAssociationAvailableFlag,
evalScripts:true
},
listeners :
{
activate : function(p) {
renderCohortSummaryMetaCoreEnrichment("cohortSummaryMetaCoreEnrichment");
initMetaCoreTab();
},
deactivate: function(){
//resultsTabPanel.tools.help.dom.style.display="none";
}
},
collapsible : true
}
);
>>>>>>>
metacoreEnrichmentPanel = new Ext.Panel(
{
id : 'metacoreEnrichmentPanel',
title : 'MetaCore Enrichment Analysis',
region : 'center',
split : true,
height : 90,
layout : 'fit',
//autoLoad : getExportJobs,
tbar : new Ext.Toolbar({
id : 'metacoreEnrichmentWorkflowToolbar',
title : 'Analysis menu',
items : []
}),
autoScroll : true,
autoLoad:
{
url : pageInfo.basePath+'/metacoreEnrichment/index',
method:'GET',
// callback: setDataAssociationAvailableFlag,
evalScripts:true
},
listeners :
{
activate : function(p) {
renderCohortSummaryMetaCoreEnrichment("cohortSummaryMetaCoreEnrichment");
initMetaCoreTab();
},
deactivate: function(){
//resultsTabPanel.tools.help.dom.style.display="none";
}
},
collapsible : true
}
);
analysisHeatmapPanel = new Ext.Panel(
{
id : 'analysisHeatmapPanel',
title : 'Heatmap',
region : 'center',
split : true,
height : 90,
layout : 'fit',
listeners :
{
activate : function(p) {
GLOBAL.CurrentSubsetIDs[1] = null;
GLOBAL.CurrentSubsetIDs[2] = null;
p.body.mask("Magic is happening ...", 'x-mask-loading');
runAllQueries(getImperialHeatmapData, p);
return;
},
deactivate: function(){
//resultsTabPanel.tools.help.dom.style.display="none";
}
},
collapsible : true
}
);
// --
<<<<<<<
// TODO -- To be reviewed ([email protected])
resultsTabPanel.add(analysisHeatmapPanel);
// --
=======
if (GLOBAL.metacoreAnalyticsEnabled) {
resultsTabPanel.add(metacoreEnrichmentPanel);
}
>>>>>>>
resultsTabPanel.add(analysisHeatmapPanel);
if (GLOBAL.metacoreAnalyticsEnabled) {
resultsTabPanel.add(metacoreEnrichmentPanel);
} |
<<<<<<<
import RouteBasic from 'Components/Routes/Basic'
import RouteMenuBubble from 'Components/Routes/MenuBubble'
import RouteLinks from 'Components/Routes/Links'
import RouteImages from 'Components/Routes/Images'
import RouteHidingMenuBar from 'Components/Routes/HidingMenuBar'
import RouteTodoList from 'Components/Routes/TodoList'
import RouteMarkdownShortcuts from 'Components/Routes/MarkdownShortcuts'
import RouteCodeHighlighting from 'Components/Routes/CodeHighlighting'
import RouteReadOnly from 'Components/Routes/ReadOnly'
import RouteEmbeds from 'Components/Routes/Embeds'
import RouteMentions from 'Components/Routes/Mentions'
import RouteExport from 'Components/Routes/Export'
=======
>>>>>>>
<<<<<<<
path: '/mentions',
component: RouteMentions,
meta: {
githubUrl: 'https://github.com/heyscrumpy/tiptap/tree/master/examples/Components/Routes/Mentions',
},
},
{
=======
path: '/placeholder',
component: () => import('Components/Routes/Placeholder'),
meta: {
githubUrl: 'https://github.com/heyscrumpy/tiptap/tree/master/examples/Components/Routes/Placeholder',
},
},
{
>>>>>>>
path: '/mentions',
component: () => import('Components/Routes/Mentions'),
meta: {
githubUrl: 'https://github.com/heyscrumpy/tiptap/tree/master/examples/Components/Routes/Mentions',
},
},
{
path: '/placeholder',
component: () => import('Components/Routes/Placeholder'),
meta: {
githubUrl: 'https://github.com/heyscrumpy/tiptap/tree/master/examples/Components/Routes/Placeholder',
},
},
{ |
<<<<<<<
onTransaction: () => true,
=======
onDrop: () => {},
>>>>>>>
onDrop: () => {},
onTransaction: () => true, |
<<<<<<<
gameAction: ability.actions.playCard(context => ({
promptForSelect: {
activePromptTitle: 'Choose a spell event',
cardType: CardTypes.Event,
controller: Players.Self,
location: Locations.ConflictDiscardPile,
cardCondition: card => card.hasTrait('spell')
},
resetOnCancel: true,
postHandler: spellContext => {
let card = spellContext.source;
context.game.addMessage('{0} is removed from the game by {1}\'s ability', card, context.source);
context.player.moveCard(card, Locations.RemovedFromGame);
}
=======
gameAction: AbilityDsl.actions.selectCard(context => ({
activePromptTitle: 'Choose a spell event',
cardType: CardTypes.Event,
controller: Players.Self,
location: Locations.ConflictDiscardPile,
cardCondition: card => card.hasTrait('spell'),
gameAction: AbilityDsl.actions.playCard({
resetOnCancel: true,
postHandler: card => {
context.game.addMessage('{0} is removed from the game by {1}\'s ability', card, context.source);
context.player.moveCard(card, Locations.RemovedFromGame);
}
})
>>>>>>>
gameAction: AbilityDsl.actions.selectCard(context => ({
activePromptTitle: 'Choose a spell event',
cardType: CardTypes.Event,
controller: Players.Self,
location: Locations.ConflictDiscardPile,
cardCondition: card => card.hasTrait('spell'),
gameAction: AbilityDsl.actions.playCard({
resetOnCancel: true,
postHandler: spellContext => {
let card = spellContext.source;
context.game.addMessage('{0} is removed from the game by {1}\'s ability', card, context.source);
context.player.moveCard(card, Locations.RemovedFromGame);
}
}) |
<<<<<<<
const PlayAttachmentAction = require('./playattachmentaction.js');
=======
const PlayCharacterAction = require('./playcharacteraction.js');
>>>>>>>
const PlayAttachmentAction = require('./playattachmentaction.js');
const PlayCharacterAction = require('./playcharacteraction.js');
<<<<<<<
new PlayAttachmentAction(),
=======
new PlayCharacterAction(),
>>>>>>>
new PlayAttachmentAction(),
new PlayCharacterAction(), |
<<<<<<<
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
=======
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from his provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
>>>>>>>
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
<<<<<<<
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
=======
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from his provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
>>>>>>>
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
<<<<<<<
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
=======
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from his provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
}
>>>>>>>
if(cardsToDiscard.length > 0) {
this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard);
_.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile'));
} |
<<<<<<<
=======
strongholdCardClicked(sourcePlayer) {
var player = this.getPlayerByName(sourcePlayer);
if(!player) {
return;
}
if(player.stronghold.bowed) {
player.readyCard(player.stronghold);
} else {
player.bowCard(player.stronghold);
}
this.addMessage('{0} {1} their stronghold', player, player.stronghold.bowed ? 'bows' : 'readies');
}
/*
* Marks a province as selected for choosing a stronghold provice at the
* start of the game
* @param {Player} player
* @param {String} provinceId - uuid of the selected province
* @returns {undefined}
*/
>>>>>>>
/*
* Marks a province as selected for choosing a stronghold provice at the
* start of the game
* @param {Player} player
* @param {String} provinceId - uuid of the selected province
* @returns {undefined}
*/ |
<<<<<<<
* Bows multiple cards
* @param {[DrawCard]} cards
* @param {EffectSource} source
*/
bowCards(cards, source) {
_.each(cards, card => this.bowCard(card, source));
}
/**
* Raises an avent for an effect readying a card
=======
* Raises an event for an effect readying a card
>>>>>>>
* Bows multiple cards
* @param {[DrawCard]} cards
* @param {EffectSource} source
*/
bowCards(cards, source) {
_.each(cards, card => this.bowCard(card, source));
}
/**
* Raises an event for an effect readying a card |
<<<<<<<
hideWhenFaceUp: () => EffectBuilder.card.static(EffectNames.HideWhenFaceUp),
immunity: (properties) => EffectBuilder.card.static(EffectNames.AbilityRestrictions, new CannotRestriction(properties)),
=======
immunity: (properties) => EffectBuilder.card.static(EffectNames.AbilityRestrictions, new Restriction(properties)),
>>>>>>>
hideWhenFaceUp: () => EffectBuilder.card.static(EffectNames.HideWhenFaceUp),
immunity: (properties) => EffectBuilder.card.static(EffectNames.AbilityRestrictions, new Restriction(properties)), |
<<<<<<<
directives.id = props.getId ? props.getId() : props.id || props._id || directives.id;
=======
if (!directives.id) {
directives.id = props.getId ? props.getId() : props.id || props._id;
}
>>>>>>>
if (!directives.id) directives.id = props.getId ? props.getId() : props.id || props._id; |
<<<<<<<
=======
util.arrayFrom(this.querySelectorAll('[ons-tab-inactive], ons-tab-inactive'))
.forEach(element => element.style.display = 'none');
util.arrayFrom(this.querySelectorAll('[ons-tab-active], ons-tab-active'))
.forEach(element => element.style.display = 'inherit');
}
setInactive() {
this._input.checked = false;
this.classList.remove('active');
this.removeAttribute('active');
if (this.hasAttribute('icon')) {
const icon = this.getAttribute('icon');
const iconElement = this._button.querySelector('.tabbar__icon').children[0];
iconElement.setAttribute('icon', icon);
}
util.arrayFrom(this.querySelectorAll('[ons-tab-inactive], ons-tab-inactive'))
.forEach(element => element.style.display = 'inherit');
util.arrayFrom(this.querySelectorAll('[ons-tab-active], ons-tab-active'))
.forEach(element => element.style.display = 'none');
>>>>>>>
<<<<<<<
tabbar.setActiveTab(this._index);
=======
this._onClick();
!this.isActive() && this.setActive();
>>>>>>>
this._onClick();
!this.isActive() && this.setActive(true);
<<<<<<<
=======
_findTabbarElement() {
return util.findParent(this, 'ons-tabbar');
}
_findTabIndex() {
const elements = this.parentNode.children;
for (let i = 0; i < elements.length; i++) {
if (this === elements[i]) {
return i;
}
}
}
>>>>>>> |
<<<<<<<
const _ = require('lodash');
const isPlainObject = _.isPlainObject;
const Boom = require('boom');
=======
const _ = require('lodash');
>>>>>>>
const _ = require('lodash');
const isPlainObject = _.isPlainObject; |
<<<<<<<
return runSequence('core-test', 'e2e-test', done);
});
////////////////////////////////////////
// e2e-test
////////////////////////////////////////
gulp.task('e2e-test', function(done) {
// `runSequence` causes dependency tasks to be run many times.
// To prevent this issue, we have to use gulp 4.x and an appropriate gulpfile which follows 4.x format.
runSequence('e2e-test-protractor', 'e2e-test-webdriverio', done);
});
gulp.task('e2e-test-protractor', ['webdriver-download', 'prepare'], function(){
const port = 8081;
$.connect.server({
root: __dirname,
port: port
});
const conf = {
configFile: './test/e2e/protractor.conf.js',
args: [
'--baseUrl', 'http://127.0.0.1:' + port,
'--seleniumServerJar', path.join(__dirname, '.selenium/selenium-server-standalone-3.0.1.jar'),
'--chromeDriver', path.join(__dirname, '.selenium/chromedriver')
]
};
const specs = argv.specs ? argv.specs.split(',').map(s => s.trim()) : ['test/e2e/**/*js'];
return gulp.src(specs)
.pipe($.protractor.protractor(conf))
.on('error', function(e) {
console.error(e);
$.connect.serverClose();
})
.on('end', function() {
$.connect.serverClose();
});
});
gulp.task('e2e-test-webdriverio', ['webdriver-download', 'prepare'], function(done){
done();
=======
return runSequence('unit-test', done);
>>>>>>>
return runSequence('unit-test', done);
});
////////////////////////////////////////
// e2e-test
////////////////////////////////////////
gulp.task('e2e-test', function(done) {
// `runSequence` causes dependency tasks to be run many times.
// To prevent this issue, we have to use gulp 4.x and an appropriate gulpfile which follows 4.x format.
runSequence('e2e-test-protractor', 'e2e-test-webdriverio', done);
});
gulp.task('e2e-test-protractor', ['webdriver-download', 'prepare'], function(){
const port = 8081;
$.connect.server({
root: __dirname,
port: port
});
const conf = {
configFile: './test/e2e/protractor.conf.js',
args: [
'--baseUrl', 'http://127.0.0.1:' + port,
'--seleniumServerJar', path.join(__dirname, '.selenium/selenium-server-standalone-3.0.1.jar'),
'--chromeDriver', path.join(__dirname, '.selenium/chromedriver')
]
};
const specs = argv.specs ? argv.specs.split(',').map(s => s.trim()) : ['test/e2e/**/*js'];
return gulp.src(specs)
.pipe($.protractor.protractor(conf))
.on('error', function(e) {
console.error(e);
$.connect.serverClose();
})
.on('end', function() {
$.connect.serverClose();
});
});
gulp.task('e2e-test-webdriverio', ['webdriver-download', 'prepare'], function(done){
done(); |
<<<<<<<
import ActionSheetExample from './examples/ActionSheet';
=======
import ToastExample from './examples/Toast';
>>>>>>>
import ActionSheetExample from './examples/ActionSheet';
import ToastExample from './examples/Toast';
<<<<<<<
title: 'Action sheet',
component: ActionSheetExample
},
{
=======
title: 'Toast',
component: ToastExample
},
{
>>>>>>>
title: 'Action sheet',
component: ActionSheetExample
},
{
title: 'Toast',
component: ToastExample
},
{ |
<<<<<<<
_createdCallback() {
=======
/**
* @attribute on[-]infinite[-]scroll
* @type {String}
* @description
* [en]Path of the function to be executed on infinite scrolling. Example: app.loadData[/en]
* [ja]機能スクロール上で実行されている関数のパス。例：app.loadData[/ja]
*/
/**
* @property onInfiniteScroll
* @description
* [en]Function to be executed on infinite scroll. [/en]
* [ja]機能スクロール上で実行されている関数。[/ja]
*/
createdCallback() {
>>>>>>>
/**
* @attribute on[-]infinite[-]scroll
* @type {String}
* @description
* [en]Path of the function to be executed on infinite scrolling. Example: app.loadData[/en]
* [ja]機能スクロール上で実行されている関数のパス。例：app.loadData[/ja]
*/
/**
* @property onInfiniteScroll
* @description
* [en]Function to be executed on infinite scroll. [/en]
* [ja]機能スクロール上で実行されている関数。[/ja]
*/
_createdCallback() { |
<<<<<<<
_compile() {
if (this.getAttribute('position') === 'auto') {
this.setAttribute('position', platform.isAndroid() ? 'top' : 'bottom');
}
var wrapper = document.createDocumentFragment();
var content = document.createElement('div');
content.classList.add('ons-tab-bar__content');
content.classList.add('tab-bar__content');
=======
var content = util.create('.ons-tab-bar__content.tab-bar__content');
var tabbar = util.create('.tab-bar.ons-tab-bar__footer.ons-tabbar-inner');
>>>>>>>
_compile() {
var content = util.create('.ons-tab-bar__content.tab-bar__content');
var tabbar = util.create('.tab-bar.ons-tab-bar__footer.ons-tabbar-inner');
<<<<<<<
=======
ModifierUtil.initModifier(this, scheme);
this._updatePosition();
>>>>>>>
this._updatePosition(); |
<<<<<<<
this._clearDerivingEvents = $onsen.deriveEvents(this, element[0], ['reactive', 'postchange', 'prechange', 'init', 'show', 'hide', 'destroy']);
=======
this._boundOnPrechange = this._onPrechange.bind(this);
this._boundOnPostchange = this._onPostchange.bind(this);
this._element.on('prechange', this._boundOnPrechange);
this._element.on('postchange', this._boundOnPostchange);
this._clearDerivingEvents = $onsen.deriveEvents(this, element[0], ['reactive', 'postchange', 'prechange']);
>>>>>>>
this._clearDerivingEvents = $onsen.deriveEvents(this, element[0], ['reactive', 'postchange', 'prechange', 'init', 'show', 'hide', 'destroy']);
this._boundOnPrechange = this._onPrechange.bind(this);
this._boundOnPostchange = this._onPostchange.bind(this);
this._element.on('prechange', this._boundOnPrechange);
this._element.on('postchange', this._boundOnPostchange);
this._clearDerivingEvents = $onsen.deriveEvents(this, element[0], ['reactive', 'postchange', 'prechange']); |
<<<<<<<
import contentReady from 'ons/content-ready';
=======
import OnsSplitterElement from './ons-splitter';
>>>>>>>
import contentReady from 'ons/content-ready';
import OnsSplitterElement from './ons-splitter'; |
<<<<<<<
var toolbarButton = new GenericView(scope, element, attrs);
$onsen.declareVarAttribute(attrs, toolbarButton);
$onsen.aliasStack.register('ons.toolbarButton', toolbarButton);
element.data('ons-toolbar-button', toolbarButton);
scope.$on('$destroy', function() {
toolbarButton._events = undefined;
$onsen.removeModifierMethods(toolbarButton);
element.data('ons-toolbar-button', undefined);
$onsen.aliasStack.unregister('ons.toolbarButton', toolbarButton);
element = null;
});
=======
var modifierTemplater = $onsen.generateModifierTemplater(attrs);
>>>>>>>
var toolbarButton = new GenericView(scope, element, attrs);
$onsen.declareVarAttribute(attrs, toolbarButton);
$onsen.aliasStack.register('ons.toolbarButton', toolbarButton);
element.data('ons-toolbar-button', toolbarButton);
scope.$on('$destroy', function() {
toolbarButton._events = undefined;
$onsen.removeModifierMethods(toolbarButton);
element.data('ons-toolbar-button', undefined);
$onsen.aliasStack.unregister('ons.toolbarButton', toolbarButton);
element = null;
});
var modifierTemplater = $onsen.generateModifierTemplater(attrs);
<<<<<<<
scope.modifierTemplater = $onsen.generateModifierTemplater(attrs);
$onsen.addModifierMethods(toolbarButton, 'toolbar-button--*', element.children());
=======
element.children('span').addClass(modifierTemplater('toolbar-button--*'));
>>>>>>>
scope.modifierTemplater = $onsen.generateModifierTemplater(attrs);
$onsen.addModifierMethods(toolbarButton, 'toolbar-button--*', element.children());
element.children('span').addClass(modifierTemplater('toolbar-button--*')); |
<<<<<<<
const locations = {
ios: [1, 21],
material: [0, 16]
};
const getX = (e) => {
if (e.gesture) {
e = e.gesture.srcEvent;
}
return e.clientX || e.changedTouches[0].clientX;
};
class SwitchElement extends BaseElement {
=======
/**
* @element ons-switch
* @category form
* @description
* [en]Switch component. Can display either an iOS flat switch or a Material Design switch.[/en]
* [ja]スイッチを表示するコンポーネントです。[/ja]
* @codepen LpXZQQ
* @guide UsingFormComponents
* [en]Using form components[/en]
* [ja]フォームを使う[/ja]
* @guide EventHandling
* [en]Event handling descriptions[/en]
* [ja]イベント処理の使い方[/ja]
* @seealso ons-button
* [en]ons-button component[/en]
* [ja]ons-buttonコンポーネント[/ja]
* @example
* <ons-switch checked></ons-switch>
* <ons-switch modifier="material"></ons-switch>
*/
class SwitchElement extends ExtendableLabelElement {
>>>>>>>
const locations = {
ios: [1, 21],
material: [0, 16]
};
const getX = (e) => {
if (e.gesture) {
e = e.gesture.srcEvent;
}
return e.clientX || e.changedTouches[0].clientX;
};
class SwitchElement extends ExtendableLabelElement {
/**
* @element ons-switch
* @category form
* @description
* [en]Switch component. Can display either an iOS flat switch or a Material Design switch.[/en]
* [ja]スイッチを表示するコンポーネントです。[/ja]
* @codepen LpXZQQ
* @guide UsingFormComponents
* [en]Using form components[/en]
* [ja]フォームを使う[/ja]
* @guide EventHandling
* [en]Event handling descriptions[/en]
* [ja]イベント処理の使い方[/ja]
* @seealso ons-button
* [en]ons-button component[/en]
* [ja]ons-buttonコンポーネント[/ja]
* @example
* <ons-switch checked></ons-switch>
* <ons-switch modifier="material"></ons-switch>
*/ |
<<<<<<<
var VALID_TARGETS = ['database', 'storage', 'firestore', 'functions', 'hosting'];
if (!previews.functions && !previews.firestore) {
VALID_TARGETS.splice(2, 2);
} else if (!previews.functions) {
VALID_TARGETS.splice(3, 1);
} else if (!previews.firestore) {
VALID_TARGETS.splice(2, 1);
}
var deployScopes = previews.functions ? [scopes.CLOUD_PLATFORM] : [];
=======
var VALID_TARGETS = ['database', 'storage', 'functions', 'hosting'];
>>>>>>>
var VALID_TARGETS = ['database', 'storage', 'firestore', 'functions', 'hosting'];
if (!previews.firestore) {
VALID_TARGETS.splice(2, 1);
} |
<<<<<<<
var VALID_TARGETS = ['database', 'storage', 'firestore', 'functions', 'hosting'];
if (!previews.functions && !previews.firestore) {
VALID_TARGETS.splice(2, 2);
} else if (!previews.functions) {
VALID_TARGETS.splice(3, 1);
} else if (!previews.firestore) {
VALID_TARGETS.splice(2, 1);
}
var deployScopes = previews.functions ? [scopes.CLOUD_PLATFORM] : [];
=======
var VALID_TARGETS = ['database', 'storage', 'functions', 'hosting'];
>>>>>>>
var VALID_TARGETS = ['database', 'storage', 'firestore', 'functions', 'hosting'];
if (!previews.firestore) {
VALID_TARGETS.splice(2, 1);
} |
<<<<<<<
var tokens = Token.ize(lhs)
if(op != "." ) tokens.tail().eaten.right.push(Token.ize(" "))
=======
var tokens = Token.ize(lhs)
if(op != "." ) tokens.tail().eaten.right.push(Token.ize(" "))
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
* - *data* - Raw object with keys and values to pass with request as query params. Default `null`.
=======
* - *data* - Raw object with keys and values to pass with request. Default `null`.
* - *headers* - Set of request headers to add. Default `{}`.
>>>>>>>
* - *data* - Raw object with keys and values to pass with request as query params. Default `null`.
* - *headers* - Set of request headers to add. Default `{}`.
<<<<<<<
// Set 'Content-type' header for POST requests
if( settings.method === "POST" && params ){
req.setRequestHeader( "Content-type", "application/x-www-form-urlencoded" );
}
=======
for( var key in settings.headers ){
if( settings.headers.hasOwnProperty( key ) ){
req.setRequestHeader(key, settings.headers[ key ]);
}
}
>>>>>>>
// Set 'Content-type' header for POST requests
if( settings.method === "POST" && params ){
req.setRequestHeader( "Content-type", "application/x-www-form-urlencoded" );
}
for( var key in settings.headers ){
if( settings.headers.hasOwnProperty( key ) ){
req.setRequestHeader(key, settings.headers[ key ]);
}
} |
<<<<<<<
if (config.debug) var log = console.log.bind(window.console)
else var log = function () {}
=======
// Can activate this for users using a little code
if (config.dev) {
var log = console.log.bind(window.console)
} else var log = function () {}
>>>>>>>
// Can activate this for users using a little code
if (config.dev) {
var log = console.log.bind(window.console)
} else var log = function () {}
<<<<<<<
time: time ? time : null,
=======
>>>>>>>
<<<<<<<
=======
// optimise mutationObserver https://stackoverflow.com/questions/31659567/performance-of-mutationobserver-to-detect-nodes-in-entire-dom
// especially the point about using getElementById
function fbTokenReady(name, callback) {
var found = false
var observer = new MutationObserver(function (mutations) {
mutations.forEach(function (mutation) {
for (var i = 0; i < mutation.addedNodes.length; i++) {
var node = document.getElementsByName(name)
node = node[0]
if (!found && notUndefined(node)) {
found = true
observer.disconnect()
if (callback) {
callback(node)
}
}
}
})
})
observer.observe(document, {
childList: true,
subtree: true,
attributes: false,
characterData: false,
})
}
>>>>>>>
<<<<<<<
Object.keys(settings.domains).forEach(function (nudgeDomain) {
if (
domainToCheck.includes(nudgeDomain) &&
settings.domains[nudgeDomain].nudge
// Worth noting this means that previously nudged but now nudge = off sites will be httpPages
) {
=======
settings.nudge_domains.forEach((nudgeDomain) => {
if (domainToCheck.includes(nudgeDomain)) {
>>>>>>>
settings.nudge_domains.forEach((nudgeDomain) => {
if (domainToCheck.includes(nudgeDomain)) {
<<<<<<<
settings.whitelist.forEach(function (whitelistDomain) {
=======
settings.whitelist_domains.forEach(function (whitelistDomain) {
>>>>>>>
settings.whitelist_domains.forEach(function (whitelistDomain) {
<<<<<<<
function getSettings(callback) {
chrome.runtime.sendMessage({ type: "settings" }, function (response) {
callback(response.settings)
=======
// Load syncStorage
const loadSyncStorage = async () => {
return new Promise((resolve) => {
chrome.storage.sync.get(null, function (storage) {
resolve(storage)
})
>>>>>>>
// Load syncStorage
const loadSyncStorage = async () => {
return new Promise((resolve) => {
chrome.storage.sync.get(null, function (storage) {
resolve(storage)
})
<<<<<<<
async function loadSettings() {
return new Promise((resolve) => {
chrome.runtime.sendMessage({ type: "settings" }, function (response) {
=======
async function loadSettingsRequest() {
return new Promise((resolve) => {
chrome.runtime.sendMessage({ type: "settings" }, function (response) {
>>>>>>>
async function loadSettingsRequest() {
return new Promise((resolve) => {
chrome.runtime.sendMessage({ type: "settings" }, function (response) {
<<<<<<<
domain,
domainSetting,
=======
>>>>>>> |
<<<<<<<
/**
* Call {@link #setValue()} and {@link #onChange()}
* @param {String|String[]} value The new choice or choices depending on the
* format of this field.
*/
selectionChanged(value) {
this.setValue(value);
this.onChange();
}
=======
/*
* Called by Aurelia when it sets the current selection to selectedChoice.
*/
selectedChoiceChanged() {
this.setValue(this.selectedChoice);
}
>>>>>>>
/**
* Call {@link #setValue()} and {@link #onChange()}
* @param {String|String[]} value The new choice or choices depending on the
* format of this field.
*/
selectionChanged(value) {
this.setValue(value);
this.onChange();
}
/**
* Called by Aurelia when it sets the current selection to selectedChoice.
*/
selectedChoiceChanged() {
this.setValue(this.selectedChoice);
} |
<<<<<<<
if(response.statusCode === 403){
reject('User account is not signed in. Requested operation is forbidden. Please sign in to Structor Market.');
}else if (response.statusCode === 401) {
reject('User account is not authenticated. Please sign in to Structor Market.');
=======
if(response.statusCode >= 301 && response.statusCode <= 302){
this.post(response.headers.location, requestBody, isAuth)
.then(data => {
resolve(data);
})
.catch(err => {
reject(err);
});
} else if (response.statusCode === 401) {
reject('User is not authenticated');
>>>>>>>
if(response.statusCode >= 301 && response.statusCode <= 302){
this.post(response.headers.location, requestBody, isAuth)
.then(data => {
resolve(data);
})
.catch(err => {
reject(err);
});
} else if (response.statusCode === 401) {
reject('User is not authenticated');
if(response.statusCode === 403){
reject('User account is not signed in. Requested operation is forbidden. Please sign in to Structor Market.');
}else if (response.statusCode === 401) {
reject('User account is not authenticated. Please sign in to Structor Market.'); |
<<<<<<<
export const invertLuminance = base => {
const color = chroma(base)
const luminance = color.luminance()
const [ h, s ] = color.hsl()
const next = chroma.hsl(h, s, 1 - luminance)
return next.hex()
}
const colors = createColors('#06e')
=======
export const colors = createColors('#06e')
>>>>>>>
export const invertLuminance = base => {
const color = chroma(base)
const luminance = color.luminance()
const [ h, s ] = color.hsl()
const next = chroma.hsl(h, s, 1 - luminance)
return next.hex()
}
export const colors = createColors('#06e') |
<<<<<<<
EVENT_THROTTLE: 100,
defaultEvents: ['keydown', 'mousedown', 'scroll', 'touchstart', 'storage'],
enabledEvents: null,
_eventsListened: null,
_eventSubscriberCount: null,
_throttledEventHandlers: null,
_boundEventHandler: null,
localStorageKey: 'ember-user-activity',
// Fastboot compatibility
_fastboot: computed(function() {
let owner = getOwner(this);
return owner.lookup('service:fastboot');
}),
_isFastBoot: readOnly('_fastboot.isFastBoot'),
=======
EVENT_THROTTLE = 100;
defaultEvents = ['keydown', 'mousedown', 'scroll', 'touchstart'];
enabledEvents = null;
_eventsListened = null;
_eventSubscriberCount = null;
_throttledEventHandlers = null;
_boundEventHandler = null;
>>>>>>>
EVENT_THROTTLE = 100;
defaultEvents = ['keydown', 'mousedown', 'scroll', 'touchstart', 'storage'];
enabledEvents = null;
_eventsListened = null;
_eventSubscriberCount = null;
_throttledEventHandlers = null;
_boundEventHandler = null;
localStorageKey = 'ember-user-activity';
<<<<<<<
if (event.type === 'storage' && event.key !== this.localStorageKey) {
return;
}
throttle(this, this._throttledEventHandlers[event.type], event, this.get('EVENT_THROTTLE'));
},
=======
throttle(this, this._throttledEventHandlers[event.type], event, this.EVENT_THROTTLE);
}
>>>>>>>
if (event.type === 'storage' && event.key !== this.localStorageKey) {
return;
}
throttle(this, this._throttledEventHandlers[event.type], event, this.EVENT_THROTTLE);
}
<<<<<<<
if (this._eventsListened.indexOf('storage') > -1 && storageAvailable('localStorage')) {
localStorage.setItem(this.localStorageKey, new Date());
}
},
=======
}
>>>>>>>
if (this._eventsListened.indexOf('storage') > -1 && storageAvailable('localStorage')) {
localStorage.setItem(this.localStorageKey, new Date());
}
}
<<<<<<<
if (this.localStorageKey && storageAvailable('localStorage')) {
localStorage.removeItem(this.localStorageKey);
}
this._super(...arguments);
=======
super.willDestroy(...arguments);
>>>>>>>
if (this.localStorageKey && storageAvailable('localStorage')) {
localStorage.removeItem(this.localStorageKey);
}
super.willDestroy(...arguments); |
<<<<<<<
$scope.params = {
=======
$scope.params = params || {
bulk: false,
>>>>>>>
$scope.params = params || { |
<<<<<<<
require('papp-polyfill');
=======
import fetch from './utils/fetch';
>>>>>>>
require('papp-polyfill');
import fetch from './utils/fetch'; |
<<<<<<<
var ansiEscapes = require('ansi-escapes');
=======
>>>>>>>
var ansiEscapes = require('ansi-escapes');
<<<<<<<
var suggesText = this.opt.suggestOnly ? ', tab to autocomplete' : '';
message += chalk.dim('(Use arrow keys or type to search' + suggesText + ')');
=======
content += chalk.dim('(Use arrow keys or type to search)');
>>>>>>>
var suggesText = this.opt.suggestOnly ? ', tab to autocomplete' : '';
message += chalk.dim('(Use arrow keys or type to search' + suggesText + ')');
<<<<<<<
if (this.opt.suggestOnly) {
this.rl.write(line);
choice.value = line;
this.answer = line;
this.rl.line = '';
} else {
choice = this.currentChoices.getChoice(this.selected);
this.answer = choice.value;
}
=======
var choice = this.currentChoices.getChoice(this.selected);
this.answer = choice.value;
this.answerName = choice.name;
this.shortAnswer = choice.short;
>>>>>>>
if (this.opt.suggestOnly) {
this.rl.write(line);
choice.value = line;
this.answer = line;
this.rl.line = '';
} else {
choice = this.currentChoices.getChoice(this.selected);
this.answer = choice.value;
this.answerName = choice.name;
this.shortAnswer = choice.short;
}
<<<<<<<
=======
utils.up(this.rl, 2);
>>>>>>>
utils.up(this.rl, 2); |
<<<<<<<
<S.Container>
<S.LeftColumn>
<S.Infos>
<S.InfosTechs>{challenge.techs}</S.InfosTechs>
<S.InfosLevel>{challenge.level}</S.InfosLevel>
<S.InfosType>{challenge.type}</S.InfosType>
</S.Infos>
<AwesomeSlider bullets={false} mobileTouch={true}>
=======
<div className="container-detail">
<div className="left-container">
<div className="stack">
<div className="challenge-techs">{challenge.techs}</div>
<div className="challenge-level">{challenge.level}</div>
<div className="challenge-type">{challenge.type}</div>
</div>
<AwesomeSlider className="slider" bullets={false} mobileTouch={true}>
>>>>>>>
<S.Container>
<S.LeftColumn>
<S.Infos>
<S.InfosTechs>{challenge.techs}</S.InfosTechs>
<S.InfosType>{challenge.type}</S.InfosType>
<S.InfosLevel>{challenge.level}</S.InfosLevel>
</S.Infos>
<AwesomeSlider className="slider" bullets={false} mobileTouch={true}> |
<<<<<<<
RawList.defaultProps = {
tabIndex: -1,
};
export default RawList;
=======
export default onClickOutside(RawList);
>>>>>>>
RawList.defaultProps = {
tabIndex: -1,
};
export default onClickOutside(RawList); |
<<<<<<<
import BarChart from '../components/charts/BarChartComponent';
=======
>>>>>>>
import BarChart from '../components/charts/BarChartComponent';
<<<<<<<
const {breadcrumb} = this.props;
const data = [
{name: "Alice", value: 2},
{name: "Bob", value: 3},
{name: "Carol", value: 1},
{name: "Dwayne", value: 5},
{name: "Anne", value: 8},
{name: "Robin", value: 28},
{name: "Eve", value: 12},
{name: "Karen", value: 6},
{name: "Lisa", value: 22},
{name: "Tom", value: 18}
];
const data2 = [
{name: "Alice", value: 2},
{name: "Bob", value: 3},
{name: "Carol", value: 1},
{name: "Dwayne", value: 5},
{name: "Anne", value: 8},
{name: "Robin", value: 18},
{name: "Eve", value: 12},
{name: "Karen", value: 6},
{name: "Lisa", value: 22},
{name: "Tom", value: 18},
{name: "Valice", value: 12},
{name: "Boob", value: 23},
{name: "Darol", value: 31},
{name: "Cwayne", value: 45},
{name: "Tanne", value: 58},
{name: "Mobin", value: 28},
{name: "Meve", value: 12},
{name: "Caren", value: 46},
{name: "Gisa", value: 42},
{name: "Pom", value: 18},
{name: "Slice", value: 2},
{name: "Yob", value: 3},
{name: "CCarol", value: 1},
{name: "Duayne", value: 35},
{name: "Canne", value: 18},
{name: "Oobin", value: 28},
{name: "Weve", value: 12},
{name: "Laren", value: 16},
{name: "Zisa", value: 22},
{name: "Oom", value: 18}
];
const data3 = [
{name: "Alice", value: 42},
{name: "Bob", value: 33},
{name: "Carol", value: 41},
{name: "Dwayne", value: 5},
{name: "Anne", value: 8},
{name: "Robin", value: 28},
{name: "Eve", value: 12},
{name: "Karen", value: 6},
{name: "Lisa", value: 22},
{name: "Tom", value: 18},
{name: "CCarol", value: 1},
{name: "Duayne", value: 35},
{name: "Canne", value: 18},
{name: "Oobin", value: 28},
{name: "Weve", value: 12},
{name: "Laren", value: 16},
{name: "Zisa", value: 22},
{name: "Oom", value: 18}
];
=======
>>>>>>>
const {breadcrumb} = this.props;
const data = [
{name: "Alice", value: 2},
{name: "Bob", value: 3},
{name: "Carol", value: 1},
{name: "Dwayne", value: 5},
{name: "Anne", value: 8},
{name: "Robin", value: 28},
{name: "Eve", value: 12},
{name: "Karen", value: 6},
{name: "Lisa", value: 22},
{name: "Tom", value: 18}
];
const data2 = [
{name: "Alice", value: 2},
{name: "Bob", value: 3},
{name: "Carol", value: 1},
{name: "Dwayne", value: 5},
{name: "Anne", value: 8},
{name: "Robin", value: 18},
{name: "Eve", value: 12},
{name: "Karen", value: 6},
{name: "Lisa", value: 22},
{name: "Tom", value: 18},
{name: "Valice", value: 12},
{name: "Boob", value: 23},
{name: "Darol", value: 31},
{name: "Cwayne", value: 45},
{name: "Tanne", value: 58},
{name: "Mobin", value: 28},
{name: "Meve", value: 12},
{name: "Caren", value: 46},
{name: "Gisa", value: 42},
{name: "Pom", value: 18},
{name: "Slice", value: 2},
{name: "Yob", value: 3},
{name: "CCarol", value: 1},
{name: "Duayne", value: 35},
{name: "Canne", value: 18},
{name: "Oobin", value: 28},
{name: "Weve", value: 12},
{name: "Laren", value: 16},
{name: "Zisa", value: 22},
{name: "Oom", value: 18}
];
const data3 = [
{name: "Alice", value: 42},
{name: "Bob", value: 33},
{name: "Carol", value: 41},
{name: "Dwayne", value: 5},
{name: "Anne", value: 8},
{name: "Robin", value: 28},
{name: "Eve", value: 12},
{name: "Karen", value: 6},
{name: "Lisa", value: 22},
{name: "Tom", value: 18},
{name: "CCarol", value: 1},
{name: "Duayne", value: 35},
{name: "Canne", value: 18},
{name: "Oobin", value: 28},
{name: "Weve", value: 12},
{name: "Laren", value: 16},
{name: "Zisa", value: 22},
{name: "Oom", value: 18}
]; |
<<<<<<<
NEW_DOCUMENT: mod + '+' + 'm',
FOCUS_FAST_LINE_ENTRY: mod + '+' + 'q',
=======
NEW_DOCUMENT: mod + '+' + 'm'
>>>>>>>
NEW_DOCUMENT: mod + '+' + 'm'
<<<<<<<
=======
TABLE_CONTEXT: {
TOGGLE_QUICK_INPUT: mod + '+' + 'q',
TOGGLE_EXPAND: mod + '+' + 'l'
}
>>>>>>>
TABLE_CONTEXT: {
TOGGLE_QUICK_INPUT: mod + '+' + 'q',
TOGGLE_EXPAND: mod + '+' + 'l'
} |
<<<<<<<
closeCallback={this.closeModalCallback}
=======
closeCallback={(isNew) => this.closeModalCallback(
modal.modalType, isNew, modal.layout.pinstanceId
)}
rawModalVisible={rawModal.visible}
>>>>>>>
closeCallback={this.closeModalCallback}
rawModalVisible={rawModal.visible} |
<<<<<<<
isShown, isHidden, handleBackdropLock, subentity, subentityId, tabIndex, viewId,
dropdownOpenCallback
=======
isShown, isHidden, handleBackdropLock, subentity, subentityId, tabIndex, viewId,
autoFocus
>>>>>>>
isShown, isHidden, handleBackdropLock, subentity, subentityId, tabIndex, viewId,
dropdownOpenCallback, autoFocus
<<<<<<<
dropdownOpenCallback={dropdownOpenCallback}
=======
ref={c => {(c && autoFocus) && c.focus()}}
>>>>>>>
dropdownOpenCallback={dropdownOpenCallback}
ref={c => {(c && autoFocus) && c.focus()}} |
<<<<<<<
import { SalesInvoice, SalesInvoiceLine } from '../../support/utils/sales_invoice';
import { getLanguageSpecific, appendHumanReadableNow } from '../../support/utils/utils';
import { DocumentActionKey, DocumentStatusKey } from '../../support/utils/constants';
import { BPartner } from '../../support/utils/bpartner';
import { DunningCandidates } from '../../page_objects/dunning_candidates';
import { applyFilters, selectNotFrequentFilterWidget, toggleNotFrequentFilters } from '../../support/functions';
import { DunningType } from '../../support/utils/dunning_type';
describe('Create Dunning Candidates', function() {
let dunningTypeName;
let businessPartnerName;
let paymentTerm;
let salesInvoiceTargetDocumentType;
let productName;
let originalQuantity;
=======
import { SalesInvoice, SalesInvoiceLine } from '../../support/utils/sales_invoice';
import { humanReadableNow } from '../../support/utils/utils';
import { DocumentStatusKey } from '../../support/utils/constants';
import { BPartner } from '../../support/utils/bpartner';
import { DunningCandidates } from '../../page_objects/dunning_candidates';
import { applyFilters, selectNotFrequentFilterWidget, toggleNotFrequentFilters } from '../../support/functions';
import { DunningType } from '../../support/utils/dunning_type';
describe('Create Dunning Candidates', function() {
// human readable date with millis!
const date = humanReadableNow();
const dunningTypeName = `Dunning ${date}`;
// const dunningTypeName = `Dunning 2019-07-05T10:09:30.514Z`;
const businessPartnerName = `Customer Dunning ${date}`;
const paymentTerm = 'immediately';
const salesInvoiceTargetDocumentType = 'Sales Invoice';
const productName = 'Convenience Salat 250g';
const originalQuantity = 200;
>>>>>>>
import { SalesInvoice, SalesInvoiceLine } from '../../support/utils/sales_invoice';
import { appendHumanReadableNow } from '../../support/utils/utils';
import { DocumentStatusKey } from '../../support/utils/constants';
import { BPartner } from '../../support/utils/bpartner';
import { DunningCandidates } from '../../page_objects/dunning_candidates';
import { applyFilters, selectNotFrequentFilterWidget, toggleNotFrequentFilters } from '../../support/functions';
import { DunningType } from '../../support/utils/dunning_type';
describe('Create Dunning Candidates', function() {
let dunningTypeName;
let businessPartnerName;
let paymentTerm;
let salesInvoiceTargetDocumentType;
let productName;
let originalQuantity;
<<<<<<<
it('Read the fixture', function() {
cy.fixture('dunning/create_dunning_candidates.json').then(f => {
businessPartnerName = appendHumanReadableNow(f['businessPartnerName']);
productName = f['productName'];
originalQuantity = f['originalQuantity'];
dunningTypeName = appendHumanReadableNow(f['dunningTypeName']);
paymentTerm = f['paymentTerm'];
salesInvoiceTargetDocumentType = f['salesInvoiceTargetDocumentType'];
});
});
it('Prepare dunning type', function() {
=======
it('Prepare dunning type', function() {
>>>>>>>
it('Read the fixture', function() {
cy.fixture('dunning/create_dunning_candidates.json').then(f => {
businessPartnerName = appendHumanReadableNow(f['businessPartnerName']);
productName = f['productName'];
originalQuantity = f['originalQuantity'];
dunningTypeName = appendHumanReadableNow(f['dunningTypeName']);
paymentTerm = f['paymentTerm'];
salesInvoiceTargetDocumentType = f['salesInvoiceTargetDocumentType'];
});
});
it('Prepare dunning type', function() {
<<<<<<<
const bpartner = new BPartner({ ...customerJson, name: businessPartnerName })
.setCustomer(true)
=======
const bpartner = new BPartner({ ...customerJson, name: businessPartnerName })
>>>>>>>
const bpartner = new BPartner({ ...customerJson, name: businessPartnerName })
.setCustomer(true)
<<<<<<<
.addLine(new SalesInvoiceLine().setProduct(productName).setQuantity(originalQuantity))
.setDocumentAction(getLanguageSpecific(salesInvoiceJson, DocumentActionKey.Complete))
.setDocumentStatus(getLanguageSpecific(salesInvoiceJson, DocumentStatusKey.Completed))
=======
.addLine(new SalesInvoiceLine().setProduct(productName).setQuantity(originalQuantity))
>>>>>>>
.addLine(new SalesInvoiceLine().setProduct(productName).setQuantity(originalQuantity)) |
<<<<<<<
var WebpackGitHash = require('webpack-git-hash');
var commitHash = require('child_process')
.execSync('git rev-parse --short HEAD')
.toString();
=======
var fs = require('fs');
const plugins = [
new webpack.DefinePlugin({
'process.env': {
NODE_ENV: JSON.stringify('production'),
},
}),
new HtmlWebpackPlugin({
template: './index.html',
}),
];
if (!fs.existsSync(path.join(__dirname, 'plugins.js'))) {
plugins.push(
new webpack.DefinePlugin({
PLUGINS: JSON.stringify([]),
})
);
}
>>>>>>>
var WebpackGitHash = require('webpack-git-hash');
var commitHash = require('child_process')
.execSync('git rev-parse --short HEAD')
.toString();
var fs = require('fs');
const plugins = [
new webpack.DefinePlugin({
'process.env': {
NODE_ENV: JSON.stringify('production'),
COMMIT_HASH: JSON.stringify(commitHash),
},
}),
new HtmlWebpackPlugin({
template: './index.html',
}),
new WebpackGitHash(),
];
if (!fs.existsSync(path.join(__dirname, 'plugins.js'))) {
plugins.push(
new webpack.DefinePlugin({
PLUGINS: JSON.stringify([]),
})
);
}
<<<<<<<
path: './dist',
filename: 'bundle-[hash]-git-[githash].js',
=======
path: path.join(__dirname, 'dist'),
filename: 'bundle[hash].js',
>>>>>>>
path: path.join(__dirname, 'dist'),
filename: 'bundle-[hash]-git-[githash].js',
<<<<<<<
plugins: [
new webpack.DefinePlugin({
'process.env': {
NODE_ENV: JSON.stringify('production'),
},
COMMIT_HASH: JSON.stringify(commitHash),
}),
new HtmlWebpackPlugin({
template: './index.html',
}),
new WebpackGitHash(),
],
=======
plugins,
>>>>>>>
plugins, |
<<<<<<<
<div
ref={c => (this.dropdown = c)}
className={classnames('input-dropdown-container', {
'input-disabled': readonly,
'input-dropdown-container-static': rowId,
'input-table': rowId && !isModal,
'lookup-dropdown': lookupList,
'select-dropdown': !lookupList,
focused: isFocused,
opened: isToggled,
'input-mandatory': !lookupList && mandatory && !selected,
})}
tabIndex={tabIndex}
onFocus={readonly ? null : onFocus}
onClick={readonly ? null : this.handleClick}
onKeyDown={this.handleKeyDown}
onKeyUp={this.handleKeyUp}
=======
<TetherComponent
attachment="top left"
targetAttachment="bottom left"
constraints={[
{
to: 'scrollParent',
},
{
to: 'window',
pin: ['bottom'],
},
]}
>>>>>>>
<TetherComponent
attachment="top left"
targetAttachment="bottom left"
constraints={[
{
to: 'scrollParent',
},
{
to: 'window',
pin: ['bottom'],
},
]}
<<<<<<<
RawList.defaultProps = {
tabIndex: -1,
};
export default onClickOutside(RawList);
=======
export default RawList;
>>>>>>>
RawList.defaultProps = {
tabIndex: -1,
};
export default RawList; |
<<<<<<<
listenOnKeys={listenOnKeys}
listenOnKeysFalse={listenOnKeysFalse}
closeTableField={closeTableField}
=======
inputValue={data}
>>>>>>>
listenOnKeys={listenOnKeys}
listenOnKeysFalse={listenOnKeysFalse}
closeTableField={closeTableField}
inputValue={data} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.