conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
/**
* Summary tables have a complex life cycle and they have to be removed from the list and destroyed before
* the new binding context is applied as they are a different type of item than others in the list
* and can't be reused.
*
* @param {object} oSummaryTableReference Reference to the summary table
* @private
*/
_destroySummaryTable: function (oSummaryTableReference) {
var oParent = oSummaryTableReference.getParent();
oParent && oParent.removeAggregation("subSection", oSummaryTableReference, true);
oSummaryTableReference.destroy();
},
=======
_navigateRouter: function(sEntityType, sEntityId, bShouldStoreToHistory) {
this.getRouter().stop();
this.getRouter().navTo("apiId", {
id: this._sTopicid,
entityType: sEntityType,
entityId: sEntityId
}, !bShouldStoreToHistory);
this.getRouter().initialize(true);
},
_modifyURL: function(sSection, sSubSection, bShouldStoreToHistory) {
sSection = sSection.getTitle().toLowerCase();
sSubSection = (sSubSection && sSubSection.getTitle() !== 'Overview') ? sSubSection.getTitle() : '';
if (sSection === 'properties') {
sSection = 'controlProperties';
}
if (sSection === 'fields') {
sSection = 'properties';
}
this._navigateRouter(sSection, sSubSection, bShouldStoreToHistory);
},
>>>>>>>
/**
* Summary tables have a complex life cycle and they have to be removed from the list and destroyed before
* the new binding context is applied as they are a different type of item than others in the list
* and can't be reused.
*
* @param {object} oSummaryTableReference Reference to the summary table
* @private
*/
_destroySummaryTable: function (oSummaryTableReference) {
var oParent = oSummaryTableReference.getParent();
oParent && oParent.removeAggregation("subSection", oSummaryTableReference, true);
oSummaryTableReference.destroy();
},
_navigateRouter: function(sEntityType, sEntityId, bShouldStoreToHistory) {
this.getRouter().stop();
this.getRouter().navTo("apiId", {
id: this._sTopicid,
entityType: sEntityType,
entityId: sEntityId
}, !bShouldStoreToHistory);
this.getRouter().initialize(true);
},
_modifyURL: function(sSection, sSubSection, bShouldStoreToHistory) {
sSection = sSection.getTitle().toLowerCase();
sSubSection = (sSubSection && sSubSection.getTitle() !== 'Overview') ? sSubSection.getTitle() : '';
if (sSection === 'properties') {
sSection = 'controlProperties';
}
if (sSection === 'fields') {
sSection = 'properties';
}
this._navigateRouter(sSection, sSubSection, bShouldStoreToHistory);
}, |
<<<<<<<
QUnit.test("Multiple Unit-Instances with bound custom units and other distinct format options", function (assert) {
// new Meter type
var CustomUnitType = UnitType.extend("sap.ui.core.test.CustomUnitType", {
constructor: function (oFormatOptions, oConstraints) {
UnitType.apply(this, [oFormatOptions, oConstraints, ["customUnits"]]);
}
});
var oCustomUnitConfig = {
"length-meter": {
"unitPattern-count-one": "{0} m",
"unitPattern-count-many": "{0} m",
"unitPattern-count-other": "{0} m",
"decimals": 4
}
};
var oCustomUnitTypeInstanceSpy = this.spy(NumberFormat, "getUnitInstance");
var oCustomUnitType = new CustomUnitType(/* showMeasure is true by default*/);
var oCustomUnitType2 = new CustomUnitType({showMeasure: false});
var oCustomUnitType3 = new CustomUnitType({showMeasure: false});
// straight forward case
assert.equal(oCustomUnitType.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568 m");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 1, "1st instance created");
// additional format options
assert.equal(oCustomUnitType2.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568", "formatted value respects the 'decimals' of custom unit");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 2, "2nd instance created, because of different format options");
assert.equal(oCustomUnitType3.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568", "formatted value respects the 'decimals' of custom unit");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 2, "No additional instance is created, 2nd instance is taken from cache");
});
=======
QUnit.test("Multiple Unit-Instances with bound custom units and other distinct format options", function (assert) {
// new Meter type
var CustomUnitType = UnitType.extend("sap.ui.core.test.CustomUnitType", {
constructor: function (oFormatOptions, oConstraints) {
UnitType.apply(this, [oFormatOptions, oConstraints, ["customUnits"]]);
}
});
var oCustomUnitConfig = {
"length-meter": {
"unitPattern-count-one": "{0} m",
"unitPattern-count-many": "{0} m",
"unitPattern-count-other": "{0} m",
"decimals": 4
}
};
var oCustomUnitTypeInstanceSpy = this.spy(NumberFormat, "getUnitInstance");
var oCustomUnitType = new CustomUnitType(/* showMeasure is true by default*/);
var oCustomUnitType2 = new CustomUnitType({showMeasure: false});
var oCustomUnitType3 = new CustomUnitType({showMeasure: false});
// straight forward case
assert.equal(oCustomUnitType.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568 m");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 1, "1st instance created");
// additional format options
assert.equal(oCustomUnitType2.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568", "formatted value respects the 'decimals' of custom unit");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 2, "2nd instance created, because of different format options");
assert.equal(oCustomUnitType3.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568", "formatted value respects the 'decimals' of custom unit");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 2, "No additional instance is created, 2nd instance is taken from cache");
});
QUnit.test("Parse/Format emptyString values", function (assert) {
// default: "" --> NaN
var oUnitType = new UnitType(/* emptyString is NaN by default */);
assert.throws(function () {
oUnitType.parseValue("", "string");
}, new ParseException("Enter a valid unit amount"));
// "" --> NaN
var oUnitType2 = new UnitType({emptyString: NaN});
assert.throws(function () {
oUnitType2.parseValue("", "string");
}, new ParseException("Enter a valid unit amount"));
// "" --> ""
var oUnitType3 = new UnitType({emptyString: ""});
assert.deepEqual(oUnitType3.parseValue("", "string"), ["", undefined], "Empty string is returned");
// "" --> null
var oUnitType4 = new UnitType({emptyString: null});
assert.deepEqual(oUnitType4.parseValue("", "string"), [null, undefined], "null is returned");
// "" --> 0
var oUnitType5 = new UnitType({emptyString: 0});
assert.deepEqual(oUnitType5.parseValue("", "string"), [0, undefined], "0 is returned");
});
QUnit.test("Parse/Format emptyString values (parseAsString)", function (assert) {
// default: "" --> "NaN"
var oUnitType = new UnitType({parseAsString: true /* emptyString is NaN by default */});
assert.throws(function () {
oUnitType.parseValue("", "string");
}, new ParseException("Enter a valid unit amount"));
// "" --> "NaN"
var oUnitType2 = new UnitType({emptyString: NaN, parseAsString: true});
assert.throws(function () {
oUnitType2.parseValue("", "string");
}, new ParseException("Enter a valid unit amount"));
// "" --> ""
var oUnitType3 = new UnitType({emptyString: "", parseAsString: true});
assert.deepEqual(oUnitType3.parseValue("", "string"), ["", undefined], "Empty string is returned");
// "" --> null
var oUnitType4 = new UnitType({emptyString: null, parseAsString: true});
assert.deepEqual(oUnitType4.parseValue("", "string"), [null, undefined], "null is returned");
// "" --> 0
var oUnitType5 = new UnitType({emptyString: 0, parseAsString: true});
assert.deepEqual(oUnitType5.parseValue("", "string"), ["0", undefined], "0 is returned");
});
>>>>>>>
QUnit.test("Multiple Unit-Instances with bound custom units and other distinct format options", function (assert) {
// new Meter type
var CustomUnitType = UnitType.extend("sap.ui.core.test.CustomUnitType", {
constructor: function (oFormatOptions, oConstraints) {
UnitType.apply(this, [oFormatOptions, oConstraints, ["customUnits"]]);
}
});
var oCustomUnitConfig = {
"length-meter": {
"unitPattern-count-one": "{0} m",
"unitPattern-count-many": "{0} m",
"unitPattern-count-other": "{0} m",
"decimals": 4
}
};
var oCustomUnitTypeInstanceSpy = this.spy(NumberFormat, "getUnitInstance");
var oCustomUnitType = new CustomUnitType(/* showMeasure is true by default*/);
var oCustomUnitType2 = new CustomUnitType({showMeasure: false});
var oCustomUnitType3 = new CustomUnitType({showMeasure: false});
// straight forward case
assert.equal(oCustomUnitType.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568 m");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 1, "1st instance created");
// additional format options
assert.equal(oCustomUnitType2.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568", "formatted value respects the 'decimals' of custom unit");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 2, "2nd instance created, because of different format options");
assert.equal(oCustomUnitType3.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568", "formatted value respects the 'decimals' of custom unit");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 2, "No additional instance is created, 2nd instance is taken from cache");
});
QUnit.test("Parse/Format emptyString values", function (assert) {
// default: "" --> NaN
var oUnitType = new UnitType(/* emptyString is NaN by default */);
assert.throws(function () {
oUnitType.parseValue("", "string");
}, new ParseException("Enter a valid unit amount"));
// "" --> NaN
var oUnitType2 = new UnitType({emptyString: NaN});
assert.throws(function () {
oUnitType2.parseValue("", "string");
}, new ParseException("Enter a valid unit amount"));
// "" --> ""
var oUnitType3 = new UnitType({emptyString: ""});
assert.deepEqual(oUnitType3.parseValue("", "string"), ["", undefined], "Empty string is returned");
// "" --> null
var oUnitType4 = new UnitType({emptyString: null});
assert.deepEqual(oUnitType4.parseValue("", "string"), [null, undefined], "null is returned");
// "" --> 0
var oUnitType5 = new UnitType({emptyString: 0});
assert.deepEqual(oUnitType5.parseValue("", "string"), [0, undefined], "0 is returned");
});
QUnit.test("Parse/Format emptyString values (parseAsString)", function (assert) {
// default: "" --> "NaN"
var oUnitType = new UnitType({parseAsString: true /* emptyString is NaN by default */});
assert.throws(function () {
oUnitType.parseValue("", "string");
}, new ParseException("Enter a valid unit amount"));
// "" --> "NaN"
var oUnitType2 = new UnitType({emptyString: NaN, parseAsString: true});
assert.throws(function () {
oUnitType2.parseValue("", "string");
}, new ParseException("Enter a valid unit amount"));
// "" --> ""
var oUnitType3 = new UnitType({emptyString: "", parseAsString: true});
assert.deepEqual(oUnitType3.parseValue("", "string"), ["", undefined], "Empty string is returned");
// "" --> null
var oUnitType4 = new UnitType({emptyString: null, parseAsString: true});
assert.deepEqual(oUnitType4.parseValue("", "string"), [null, undefined], "null is returned");
// "" --> 0
var oUnitType5 = new UnitType({emptyString: 0, parseAsString: true});
assert.deepEqual(oUnitType5.parseValue("", "string"), ["0", undefined], "0 is returned");
});
QUnit.test("Multiple Unit-Instances with bound custom units and other distinct format options", function (assert) {
// new Meter type
var CustomUnitType = UnitType.extend("sap.ui.core.test.CustomUnitType", {
constructor: function (oFormatOptions, oConstraints) {
UnitType.apply(this, [oFormatOptions, oConstraints, ["customUnits"]]);
}
});
var oCustomUnitConfig = {
"length-meter": {
"unitPattern-count-one": "{0} m",
"unitPattern-count-many": "{0} m",
"unitPattern-count-other": "{0} m",
"decimals": 4
}
};
var oCustomUnitTypeInstanceSpy = this.spy(NumberFormat, "getUnitInstance");
var oCustomUnitType = new CustomUnitType(/* showMeasure is true by default*/);
var oCustomUnitType2 = new CustomUnitType({showMeasure: false});
var oCustomUnitType3 = new CustomUnitType({showMeasure: false});
// straight forward case
assert.equal(oCustomUnitType.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568 m");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 1, "1st instance created");
// additional format options
assert.equal(oCustomUnitType2.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568", "formatted value respects the 'decimals' of custom unit");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 2, "2nd instance created, because of different format options");
assert.equal(oCustomUnitType3.formatValue([123.456789, "length-meter", oCustomUnitConfig], "string").toString(), "123.4568", "formatted value respects the 'decimals' of custom unit");
assert.equal(oCustomUnitTypeInstanceSpy.callCount, 2, "No additional instance is created, 2nd instance is taken from cache");
}); |
<<<<<<<
* Use tab navigation mode instead of the default Anchor bar mode.
* <br><b>Note: </b>Keep in mind that the <code>sap.m.IconTabBar</code> control is no longer used for the tab navigation mode.
=======
* Determines the ARIA level of the <code>ObjectPageSection</code> and <code>ObjectPageSubSection</code> titles.
* The ARIA level is used by assisting technologies, such as screen readers, to create a hierarchical site map for faster navigation.
*
* <br><b>Note:</b>
* <ul>
* <li>Defining a <code>sectionTitleLevel</code> will add <code>aria-level</code> attribute from 1 to 6
* instead of changing the titles` HTML tag from H1 to H6.
* <br>For example: if <code>sectionTitleLevel</code> is <code>TitleLevel.H1</code>,
* it will result as aria-level of 1 added to the <code>ObjectPageSection</code> title.
* </li>
*
* <li> The <code>ObjectPageSubSection</code> title
* would have <code>aria-level</code> one level lower than the defined.
* For example: if <code>sectionTitleLevel</code> is <code>TitleLevel.H1</code>,
* it will result as aria-level of 2 added to the <code>ObjectPageSubSection</code> title.</li>
*
* <li> It is possible to define a <code>titleLevel</code> on <code>ObjectPageSection</code> or <code>ObjectPageSubSection</code> level.
* In this case the value of this property will be ignored.
* </li>
* </ul>
* @since 1.44.0
*/
sectionTitleLevel : {type : "sap.ui.core.TitleLevel", group : "Appearance", defaultValue : sap.ui.core.TitleLevel.Auto},
/**
* Use sap.m.IconTabBar instead of the default Anchor bar
>>>>>>>
* Determines the ARIA level of the <code>ObjectPageSection</code> and <code>ObjectPageSubSection</code> titles.
* The ARIA level is used by assisting technologies, such as screen readers, to create a hierarchical site map for faster navigation.
*
* <br><b>Note:</b>
* <ul>
* <li>Defining a <code>sectionTitleLevel</code> will add <code>aria-level</code> attribute from 1 to 6
* instead of changing the titles` HTML tag from H1 to H6.
* <br>For example: if <code>sectionTitleLevel</code> is <code>TitleLevel.H1</code>,
* it will result as aria-level of 1 added to the <code>ObjectPageSection</code> title.
* </li>
*
* <li> The <code>ObjectPageSubSection</code> title
* would have <code>aria-level</code> one level lower than the defined.
* For example: if <code>sectionTitleLevel</code> is <code>TitleLevel.H1</code>,
* it will result as aria-level of 2 added to the <code>ObjectPageSubSection</code> title.</li>
*
* <li> It is possible to define a <code>titleLevel</code> on <code>ObjectPageSection</code> or <code>ObjectPageSubSection</code> level.
* In this case the value of this property will be ignored.
* </li>
* </ul>
* @since 1.44.0
*/
sectionTitleLevel : {type : "sap.ui.core.TitleLevel", group : "Appearance", defaultValue : sap.ui.core.TitleLevel.Auto},
/**
* Use tab navigation mode instead of the default Anchor bar mode.
* <br><b>Note: </b>Keep in mind that the <code>sap.m.IconTabBar</code> control is no longer used for the tab navigation mode. |
<<<<<<<
import CdrA from 'componentsdir/anchor/CdrA';
import CdrBreadcrumb from 'componentsdir/breadcrumb/CdrBreadcrumb';
=======
import CdrLink from 'componentsdir/link/CdrLink';
>>>>>>>
import CdrLink from 'componentsdir/link/CdrLink';
import CdrBreadcrumb from 'componentsdir/breadcrumb/CdrBreadcrumb';
<<<<<<<
CdrA,
CdrBreadcrumb,
=======
CdrLink,
>>>>>>>
CdrLink,
CdrBreadcrumb, |
<<<<<<<
XMLTemplateProcessor, XMLPreprocessor, BindingMode, ChangeReason, Context, JSONModel/*,
jQuerySapXml*/) {
=======
XMLTemplateProcessor, XMLPreprocessor, BindingMode, Context, JSONModel, ObjectPath/*, jQuerySapXml*/) {
>>>>>>>
XMLTemplateProcessor, XMLPreprocessor, BindingMode, ChangeReason, Context, JSONModel,
ObjectPath/*, jQuerySapXml*/) { |
<<<<<<<
sap.ui.define(['jquery.sap.global', 'sap/ui/model/Model', 'sap/ui/model/odata/ODataUtils', 'sap/ui/model/odata/CountMode', 'sap/ui/model/odata/ODataContextBinding', './ODataListBinding', 'sap/ui/model/odata/ODataMetadata', 'sap/ui/model/odata/ODataPropertyBinding', 'sap/ui/model/odata/v2/ODataTreeBinding', 'sap/ui/model/odata/v2/ODataMetaModel', 'sap/ui/thirdparty/URI', 'sap/ui/thirdparty/datajs'],
function(jQuery, Model, ODataUtils, CountMode, ODataContextBinding, ODataListBinding, ODataMetadata, ODataPropertyBinding, ODataTreeBinding, ODataMetaModel, URI1, datajs) {
=======
sap.ui.define(['jquery.sap.global', 'sap/ui/model/Model', 'sap/ui/model/odata/ODataUtils', 'sap/ui/model/odata/CountMode', './ODataContextBinding', './ODataListBinding', 'sap/ui/model/odata/ODataMetadata', 'sap/ui/model/odata/ODataPropertyBinding', 'sap/ui/model/odata/v2/ODataTreeBinding', 'sap/ui/thirdparty/URI', 'sap/ui/thirdparty/datajs'],
function(jQuery, Model, ODataUtils, CountMode, ODataContextBinding, ODataListBinding, ODataMetadata, ODataPropertyBinding, ODataTreeBinding, URI1, datajs) {
>>>>>>>
sap.ui.define(['jquery.sap.global', 'sap/ui/model/Model', 'sap/ui/model/odata/ODataUtils', 'sap/ui/model/odata/CountMode', './ODataContextBinding', './ODataListBinding', 'sap/ui/model/odata/ODataMetadata', 'sap/ui/model/odata/ODataPropertyBinding', 'sap/ui/model/odata/v2/ODataTreeBinding', 'sap/ui/model/odata/v2/ODataMetaModel', 'sap/ui/thirdparty/URI', 'sap/ui/thirdparty/datajs'],
function(jQuery, Model, ODataUtils, CountMode, ODataContextBinding, ODataListBinding, ODataMetadata, ODataPropertyBinding, ODataTreeBinding, ODataMetaModel, URI1, datajs) {
<<<<<<<
* @return sap.ui.model.Context
* @private
=======
* @public
>>>>>>>
* @return sap.ui.model.Context
* @public |
<<<<<<<
import Forms from './forms/_index';
=======
import Media from './media/_index';
>>>>>>>
import Media from './media/_index';
import Forms from './forms/_index';
<<<<<<<
Forms,
=======
Media,
>>>>>>>
Media,
Forms, |
<<<<<<<
* A context, used for building the path and for fetching key predicates
=======
* A context
* @param {boolean} [bNoEditUrl]
* Whether no edit URL is required
>>>>>>>
* A context, used for building the path and for fetching key predicates
* @param {boolean} [bNoEditUrl]
* Whether no edit URL is required |
<<<<<<<
//*****************************************************************************************
QUnit.test("format option UTC", function (assert) {
var oType = createInstance(sTypeName, {UTC : true}),
oDateTime = new Date(Date.UTC(2014, 10, 27, 13, 47, 26)),
sFormattedDateTime = "Nov 27, 2014, 1:47:26 PM";
assert.strictEqual(oType.formatValue(oDateTime, "string"), sFormattedDateTime);
assert.deepEqual(oType.parseValue(sFormattedDateTime, "string"), oDateTime);
});
=======
//*****************************************************************************************
QUnit.test("getModelFormat", function (assert) {
var oType = createInstance(sTypeName),
oFormat = oType.getModelFormat();
assert.equal(oFormat.format(oDateTime), oDateTime, "format");
assert.equal(oFormat.parse(sFormattedDateTime), sFormattedDateTime, "parse");
});
>>>>>>>
//*****************************************************************************************
QUnit.test("format option UTC", function (assert) {
var oType = createInstance(sTypeName, {UTC : true}),
oDateTime = new Date(Date.UTC(2014, 10, 27, 13, 47, 26)),
sFormattedDateTime = "Nov 27, 2014, 1:47:26 PM";
assert.strictEqual(oType.formatValue(oDateTime, "string"), sFormattedDateTime);
assert.deepEqual(oType.parseValue(sFormattedDateTime, "string"), oDateTime);
});
//*****************************************************************************************
QUnit.test("getModelFormat", function (assert) {
var oType = createInstance(sTypeName),
oFormat = oType.getModelFormat();
assert.equal(oFormat.format(oDateTime), oDateTime, "format");
assert.equal(oFormat.parse(sFormattedDateTime), sFormattedDateTime, "parse");
});
<<<<<<<
//*********************************************************************************************
QUnit.test("V4: format option UTC", function (assert) {
var oType = new DateTimeOffset({UTC : true}, {V4 : true}),
sDateTime = "2014-11-27T13:47:26Z",
sFormattedDateTime = "Nov 27, 2014, 1:47:26 PM";
assert.strictEqual(oType.formatValue(sDateTime, "string"), sFormattedDateTime);
assert.strictEqual(oType.parseValue(sFormattedDateTime, "string"), sDateTime);
});
=======
//*********************************************************************************************
QUnit.test("V4: getModelFormat", function (assert) {
var oDateTimeOffset = new DateTimeOffset(undefined, {precision : 3}).setV4(),
oFormat = oDateTimeOffset.getModelFormat(),
oParsedDate = oFormat.parse(sDateTimeOffsetWithMS);
assert.ok(oParsedDate instanceof Date, "parse delivers a Date");
assert.strictEqual(oParsedDate.getTime(), oDateTimeWithMS.getTime(), "parse value");
assert.strictEqual(oFormat.format(oParsedDate), sDateTimeOffsetWithMS, "format");
});
>>>>>>>
//*********************************************************************************************
QUnit.test("V4: format option UTC", function (assert) {
var oType = new DateTimeOffset({UTC : true}, {V4 : true}),
sDateTime = "2014-11-27T13:47:26Z",
sFormattedDateTime = "Nov 27, 2014, 1:47:26 PM";
assert.strictEqual(oType.formatValue(sDateTime, "string"), sFormattedDateTime);
assert.strictEqual(oType.parseValue(sFormattedDateTime, "string"), sDateTime);
});
//*********************************************************************************************
QUnit.test("V4: getModelFormat", function (assert) {
var oDateTimeOffset = new DateTimeOffset(undefined, {precision : 3}).setV4(),
oFormat = oDateTimeOffset.getModelFormat(),
oParsedDate = oFormat.parse(sDateTimeOffsetWithMS);
assert.ok(oParsedDate instanceof Date, "parse delivers a Date");
assert.strictEqual(oParsedDate.getTime(), oDateTimeWithMS.getTime(), "parse value");
assert.strictEqual(oFormat.format(oParsedDate), sDateTimeOffsetWithMS, "format");
}); |
<<<<<<<
import CdrTable from 'componentsdir/table/CdrTable';
=======
import CdrAccordion from 'componentsdir/accordion/CdrAccordion';
import CdrAccordionItem from 'componentsdir/accordion/CdrAccordionItem';
>>>>>>>
import CdrTable from 'componentsdir/table/CdrTable';
import CdrAccordion from 'componentsdir/accordion/CdrAccordion';
import CdrAccordionItem from 'componentsdir/accordion/CdrAccordionItem'; |
<<<<<<<
import Tables from 'componentsdir/table/examples/Table';
=======
import Input from 'componentsdir/input/examples/Inputs';
>>>>>>>
import Tables from 'componentsdir/table/examples/Table';
import Input from 'componentsdir/input/examples/Inputs'; |
<<<<<<<
app.factory("Spotify", ['$rootScope', '$resource', '$localStorage', '$http', function( $rootScope, $resource, $localStorage, $http ){
=======
app.factory("Spotify", ['$resource', '$localStorage', '$http', function( $resource, $localStorage, $http ){
console.log( $localStorage );
>>>>>>>
app.factory("Spotify", ['$rootScope', '$resource', '$localStorage', '$http', function( $rootScope, $resource, $localStorage, $http ){
console.log( $localStorage );
<<<<<<<
=======
console.log(response);
>>>>>>> |
<<<<<<<
// Objects with different constructors are not equivalent, but `Object`s
// from different frames are.
var aCtor = a.constructor, bCtor = b.constructor;
if (
aCtor !== bCtor &&
// Handle Object.create(x) cases
'constructor' in a && 'constructor' in b &&
!(_.isFunction(aCtor) && aCtor instanceof aCtor &&
_.isFunction(bCtor) && bCtor instanceof bCtor)
) {
return false;
}
=======
>>>>>>>
<<<<<<<
if (className === '[object Array]') {
=======
if (areArray) {
>>>>>>>
if (areArrays) { |
<<<<<<<
raises(function() { _.keys(null); }, exception, 'throws an error for `null` values');
raises(function() { _.keys(void 0); }, exception, 'throws an error for `undefined` values');
raises(function() { _.keys(1); }, exception, 'throws an error for number primitives');
raises(function() { _.keys('a'); }, exception, 'throws an error for string primitives');
raises(function() { _.keys(true); }, exception, 'throws an error for boolean primitives');
=======
// the test above is not safe because it relies on for-in enumeration order
var a = []; a[1] = 0;
equals(_.keys(a).join(', '), '1', 'is not fooled by sparse arrays; see issue #95');
>>>>>>>
// the test above is not safe because it relies on for-in enumeration order
var a = []; a[1] = 0;
equals(_.keys(a).join(', '), '1', 'is not fooled by sparse arrays; see issue #95');
raises(function() { _.keys(null); }, exception, 'throws an error for `null` values');
raises(function() { _.keys(void 0); }, exception, 'throws an error for `undefined` values');
raises(function() { _.keys(1); }, exception, 'throws an error for number primitives');
raises(function() { _.keys('a'); }, exception, 'throws an error for string primitives');
raises(function() { _.keys(true); }, exception, 'throws an error for boolean primitives'); |
<<<<<<<
const { menuItemOpened } = appChromeActionCreators;
=======
import logoInWhite from './logo_white.png';
>>>>>>>
const { menuItemOpened } = appChromeActionCreators;
import logoInWhite from './logo_white.png';
<<<<<<<
key: 'stroom',
title: 'Stroom',
=======
title: <img src={logoInWhite} alt='Stroom logo'/>,
>>>>>>>
key: 'stroom',
title: <img src={logoInWhite} alt='Stroom logo'/>,
<<<<<<<
<div className="app-chrome__sidebar-menu">
{getMenuItems(menuItems, menuItemsOpen, menuItemOpened)}
</div>
=======
<Menu vertical fluid color={SIDE_BAR_COLOUR} inverted>
{menuItems.map(menuItem => (
<Menu.Item
key={menuItem.title}
active={menuItem.title === activeMenuItem}
name={menuItem.title}
onClick={menuItem.onClick}
className={menuItem.className}
>
<Icon name={menuItem.icon} />
{menuItem.title}
</Menu.Item>
))}
</Menu>
>>>>>>>
<div className="app-chrome__sidebar-menu">
{getMenuItems(menuItems, menuItemsOpen, menuItemOpened)}
</div> |
<<<<<<<
import CdrThemer from 'componentsdir/themer/CdrThemer';
=======
import CdrDataTable from 'componentsdir/dataTable/CdrDataTable';
>>>>>>>
import CdrThemer from 'componentsdir/themer/CdrThemer';
import CdrDataTable from 'componentsdir/dataTable/CdrDataTable';
<<<<<<<
CdrThemer,
=======
CdrDataTable,
>>>>>>>
CdrThemer,
CdrDataTable, |
<<<<<<<
import ThemedPopup from 'components/ThemedPopup'
import DocRefListingEntry from './DocRefListingEntry';
=======
import DndDocRefListingEntry from './DndDocRefListingEntry';
>>>>>>>
import ThemedPopup from 'components/ThemedPopup'
import DocRefListingEntry from './DocRefListingEntry';
import DndDocRefListingEntry from './DndDocRefListingEntry'; |
<<<<<<<
Node.prototype.render = function () {
this.garden.ctx.beginPath();
this.garden.ctx.arc(this.x, this.y, this.getDiameter(), 0, 2 * Math.PI);
this.garden.ctx.fill();
};
Node.prototype.getDiameter = function () {
return this.m;
};
var pixelRatio = window.devicePixelRatio;
=======
var pixelRatio$1 = window.devicePixelRatio;
>>>>>>>
Node.prototype.render = function () {
this.garden.ctx.beginPath();
this.garden.ctx.arc(this.x, this.y, this.getDiameter(), 0, 2 * Math.PI);
this.garden.ctx.fill();
};
Node.prototype.getDiameter = function () {
return this.m;
};
var pixelRatio$1 = window.devicePixelRatio;
<<<<<<<
var node = new Node(nodeGarden);
var angle = Math.random() * 2 * Math.PI;
node.reset({ x: e.pageX + 100 * Math.cos(angle), y: e.pageY + 100 * Math.sin(angle) });
nodeGarden.nodes.push(node);
console.log(nodeGarden.nodes.length);
=======
resetNode++;
if (resetNode > nodeGarden.nodes.length - 1) {
resetNode = 0;
}
nodeGarden.nodes[resetNode].reset({ x: e.pageX * pixelRatio, y: e.pageY * pixelRatio, vx: 0, vy: 0 });
>>>>>>>
var node = new Node(nodeGarden);
var angle = Math.random() * 2 * Math.PI;
node.reset({ x: e.pageX + 100 * Math.cos(angle), y: e.pageY + 100 * Math.sin(angle) });
nodeGarden.nodes.push(node); |
<<<<<<<
let node = new Node(nodeGarden)
let angle = Math.random()*2*Math.PI
node.reset({x: e.pageX + 100*Math.cos(angle), y: e.pageY + 100*Math.sin(angle)})
nodeGarden.nodes.push(node)
console.log(nodeGarden.nodes.length)
=======
resetNode++
if (resetNode > nodeGarden.nodes.length - 1) {
resetNode = 0
}
nodeGarden.nodes[resetNode].reset({x: e.pageX * pixelRatio, y: e.pageY * pixelRatio, vx: 0, vy: 0})
>>>>>>>
let node = new Node(nodeGarden)
let angle = Math.random()*2*Math.PI
node.reset({x: e.pageX + 100*Math.cos(angle), y: e.pageY + 100*Math.sin(angle)})
nodeGarden.nodes.push(node) |
<<<<<<<
var _handlePageLimit = function () {
if (WebIM.config.isMultiLoginSessions && window.localStorage) {
var keyValue = 'empagecount' + pageLimitKey;
window.addEventListener('storage', function () {
window.localStorage.setItem(keyValue, Demo.user);
});
_clearPageSign();
window.localStorage.setItem(keyValue, Demo.user);
}
};
var _clearPageSign = function () {
if (window.localStorage) {
try {
window.localStorage.clear();
} catch (e) {
}
}
};
var _getPageCount = function () {
var sum = 0;
if (WebIM.config.isMultiLoginSessions && window.localStorage) {
for (var o in localStorage) {
if (/^empagecount/.test(o) && Demo.user == localStorage[o]) {
sum++;
}
}
}
console.log(sum);
return sum;
};
=======
>>>>>>>
<<<<<<<
this.sendQueue = new Queue(); //instead of sending message immediately,cache them in this queue
this.intervalId = null; //clearInterval return value
this.dnsArr = ['182.92.174.78', '112.126.66.111']; //dns server ips
this.dnsIndex = 0; //the dns ip used in dnsArr currently
this.dnsTotal = this.dnsArr.length; //max number of getting dns retries
this.restHosts = null; //rest server ips
this.restIndex = 0; //the rest ip used in restHosts currently
this.restTotal = 0; //max number of getting rest token retries
this.xmppHosts = null; //xmpp server ips
this.xmppIndex = 0; //the xmpp ip used in xmppHosts currently
this.xmppTotal = 0; //max number of creating xmpp server connection(ws/bosh) retries
=======
//todo 接收的事件，放到数组里的时候，加上g.isInBackground字段。每帧执行一个事件的时候，如果g.isInBackground=true,就pass
this.sendQueue = new Queue(); //接收到的事件队列
this.intervalId = null;
this.pageLimit = 2; // Amount of a user could open tabs in the same browser
this.pageLimitKey = new Date().getTime(); // A random number used for create the localstorage's key
};
connection.prototype.handlePageLimit = function () {
var keyValue = 'empagecount' + this.pageLimitKey;
window.addEventListener('storage', function () {
window.localStorage.setItem(keyValue, Demo.user);
});
this.clearPageSign();
window.localStorage.setItem(keyValue, Demo.user);
};
connection.prototype.clearPageSign = function () {
if (window.localStorage) {
try {
window.localStorage.clear();
} catch (e) {
console.log(e.message);
}
}
};
connection.prototype.getPageCount = function () {
var sum = 0;
for (var o in localStorage) {
if (/^empagecount/.test(o) && Demo.user == localStorage[o]) {
sum++;
}
}
return sum;
>>>>>>>
this.sendQueue = new Queue(); //instead of sending message immediately,cache them in this queue
this.intervalId = null; //clearInterval return value
this.pageLimit = 2; // Amount of a user could open tabs in the same browser
this.pageLimitKey = new Date().getTime(); // A random number used for create the localstorage's key
this.dnsArr = ['182.92.174.78', '112.126.66.111']; //dns server ips
this.dnsIndex = 0; //the dns ip used in dnsArr currently
this.dnsTotal = this.dnsArr.length; //max number of getting dns retries
this.restHosts = null; //rest server ips
this.restIndex = 0; //the rest ip used in restHosts currently
this.restTotal = 0; //max number of getting rest token retries
this.xmppHosts = null; //xmpp server ips
this.xmppIndex = 0; //the xmpp ip used in xmppHosts currently
this.xmppTotal = 0; //max number of creating xmpp server connection(ws/bosh) retries
};
connection.prototype.handlePageLimit = function () {
var keyValue = 'empagecount' + this.pageLimitKey;
window.addEventListener('storage', function () {
window.localStorage.setItem(keyValue, Demo.user);
});
this.clearPageSign();
window.localStorage.setItem(keyValue, Demo.user);
};
connection.prototype.clearPageSign = function () {
if (window.localStorage) {
try {
window.localStorage.clear();
} catch (e) {
console.log(e.message);
}
}
};
connection.prototype.getPageCount = function () {
var sum = 0;
for (var o in localStorage) {
if (/^empagecount/.test(o) && Demo.user == localStorage[o]) {
sum++;
}
}
return sum;
<<<<<<<
connection.prototype.getStrophe = function () {
if (WebIM && WebIM.config.isDNS) {
//TODO: try this.xmppTotal times on fail
var url = '';
var host = this.xmppHosts[this.xmppIndex];
var domain = _utils.getXmlFirstChild(host, 'domain');
var ip = _utils.getXmlFirstChild(host, 'ip');
if (ip) {
var port = _utils.getXmlFirstChild(host, 'port');
url = ip.textContent + ':' + port.textContent;
} else {
url = domain.textContent;
}
if (url != '') {
var parter = /(.+\/\/).+(\/.+)/;
this.url = this.url.replace(parter, "$1" + url + "$2");
}
}
var stropheConn = new Strophe.Connection(this.url, {
inactivity: this.inactivity,
maxRetries: this.maxRetries,
pollingTime: this.pollingTime
});
return stropheConn;
};
connection.prototype.getHostsByTag = function (data, tagName) {
var tag = _utils.getXmlFirstChild(data, tagName);
if (!tag) {
console.log(tagName + ' hosts error');
return null;
}
var hosts = tag.getElementsByTagName('hosts');
if (hosts.length == 0) {
console.log(tagName + ' hosts error2');
return null;
}
return hosts[0].getElementsByTagName('host');
};
connection.prototype.openFromDNS = function (options) {
if (this.restIndex >= this.restTotal) {
console.log('rest hosts all tried,quit');
return;
}
var self = this;
var url = '';
var host = this.restHosts[this.restIndex];
var domain = _utils.getXmlFirstChild(host, 'domain');
var ip = _utils.getXmlFirstChild(host, 'ip');
if (ip) {
var port = _utils.getXmlFirstChild(host, 'port');
url = ip.textContent + ':' + port.textContent;
} else {
url = domain.textContent;
}
if (url != '') {
WebIM.config.apiURL = '//' + url;
options.apiUrl = '//' + url;
}
Demo.conn.open(options);
};
connection.prototype.getDNS = function (options) {
var self = this;
var suc = function (data, xhr) {
data = new DOMParser().parseFromString(data, "text/xml").documentElement;
//get rest ips
var restHosts = self.getHostsByTag(data, 'rest');
if (!restHosts) {
console.log('rest hosts error3');
return;
}
self.restHosts = restHosts;
self.restTotal = restHosts.length;
//get xmpp ips
var xmppHosts = self.getHostsByTag(data, 'webim');
if (!xmppHosts) {
console.log('xmpp hosts error3');
return;
}
self.xmppHosts = xmppHosts;
self.xmppTotal = xmppHosts.length;
self.openFromDNS(options);
};
var error = function (res, xhr, msg) {
console.log('getDNS error', res, msg);
self.dnsIndex++;
if (self.dnsIndex < self.dnsTotal) {
self.getDNS(options);
}
};
var options2 = {
url: '//' + this.dnsArr[this.dnsIndex] + '/easemob/server.xml',
dataType: 'text',
type: 'GET',
// url: 'http://www.easemob.com/easemob/server.xml',
// dataType: 'xml',
data: {app_key: encodeURIComponent("easemob-demo#sandboxdemo")},
// data: {app_key: encodeURIComponent(options.appKey)},
success: suc || _utils.emptyfn,
error: error || _utils.emptyfn
};
_utils.ajax(options2);
};
connection.prototype.open = function (options) {
=======
connection.prototype.getRestToken = function (options) {
>>>>>>>
connection.prototype.getStrophe = function () {
if (WebIM && WebIM.config.isDNS) {
//TODO: try this.xmppTotal times on fail
var url = '';
var host = this.xmppHosts[this.xmppIndex];
var domain = _utils.getXmlFirstChild(host, 'domain');
var ip = _utils.getXmlFirstChild(host, 'ip');
if (ip) {
var port = _utils.getXmlFirstChild(host, 'port');
url = ip.textContent + ':' + port.textContent;
} else {
url = domain.textContent;
}
if (url != '') {
var parter = /(.+\/\/).+(\/.+)/;
this.url = this.url.replace(parter, "$1" + url + "$2");
}
}
var stropheConn = new Strophe.Connection(this.url, {
inactivity: this.inactivity,
maxRetries: this.maxRetries,
pollingTime: this.pollingTime
});
return stropheConn;
};
connection.prototype.getHostsByTag = function (data, tagName) {
var tag = _utils.getXmlFirstChild(data, tagName);
if (!tag) {
console.log(tagName + ' hosts error');
return null;
}
var hosts = tag.getElementsByTagName('hosts');
if (hosts.length == 0) {
console.log(tagName + ' hosts error2');
return null;
}
return hosts[0].getElementsByTagName('host');
};
connection.prototype.openFromDNS = function (options) {
if (this.restIndex >= this.restTotal) {
console.log('rest hosts all tried,quit');
return;
}
var self = this;
var url = '';
var host = this.restHosts[this.restIndex];
var domain = _utils.getXmlFirstChild(host, 'domain');
var ip = _utils.getXmlFirstChild(host, 'ip');
if (ip) {
var port = _utils.getXmlFirstChild(host, 'port');
url = ip.textContent + ':' + port.textContent;
} else {
url = domain.textContent;
}
if (url != '') {
WebIM.config.apiURL = '//' + url;
options.apiUrl = '//' + url;
}
Demo.conn.open(options);
};
connection.prototype.getDNS = function (options) {
var self = this;
var suc = function (data, xhr) {
data = new DOMParser().parseFromString(data, "text/xml").documentElement;
//get rest ips
var restHosts = self.getHostsByTag(data, 'rest');
if (!restHosts) {
console.log('rest hosts error3');
return;
}
self.restHosts = restHosts;
self.restTotal = restHosts.length;
//get xmpp ips
var xmppHosts = self.getHostsByTag(data, 'webim');
if (!xmppHosts) {
console.log('xmpp hosts error3');
return;
}
self.xmppHosts = xmppHosts;
self.xmppTotal = xmppHosts.length;
self.openFromDNS(options);
};
var error = function (res, xhr, msg) {
console.log('getDNS error', res, msg);
self.dnsIndex++;
if (self.dnsIndex < self.dnsTotal) {
self.getDNS(options);
}
};
var options2 = {
url: '//' + this.dnsArr[this.dnsIndex] + '/easemob/server.xml',
dataType: 'text',
type: 'GET',
// url: 'http://www.easemob.com/easemob/server.xml',
// dataType: 'xml',
data: {app_key: encodeURIComponent("easemob-demo#sandboxdemo")},
// data: {app_key: encodeURIComponent(options.appKey)},
success: suc || _utils.emptyfn,
error: error || _utils.emptyfn
};
_utils.ajax(options2);
};
connection.prototype.getRestToken = function (options) { |
<<<<<<<
=======
const sharedConfig = merge({}, commonConfig, {
entry: { shared: path.resolve(__dirname, 'src/shared-process/index') },
target: 'electron-renderer',
plugins: [
new HtmlWebpackPlugin({
template: path.join(__dirname, 'static', 'error.html'),
// without this we overwrite index.html
filename: 'error.html',
// we don't need any scripts to run on this page
excludeChunks: ['main', 'renderer', 'shared', 'ask-pass'],
}),
new HtmlWebpackPlugin({
filename: 'shared.html',
chunks: ['shared'],
}),
new webpack.DefinePlugin(
Object.assign({}, replacements, {
__PROCESS_KIND__: JSON.stringify('shared'),
})
),
],
})
>>>>>>>
<<<<<<<
new webpack.DefinePlugin(Object.assign({ }, replacements, { '__PROCESS_KIND__': JSON.stringify('askpass') })),
]
=======
new webpack.DefinePlugin(
Object.assign({}, replacements, {
__PROCESS_KIND__: JSON.stringify('askpass'),
})
),
],
>>>>>>>
new webpack.DefinePlugin(
Object.assign({}, replacements, {
__PROCESS_KIND__: JSON.stringify('askpass'),
})
),
], |
<<<<<<<
or: [
{user: user.id},
{role: _.pluck(user.roles, 'id')}
]
});
=======
role: _.pluck(user.roles, 'id')
}).populate('criteria');
>>>>>>>
or: [
{user: user.id},
{role: _.pluck(user.roles, 'id')}
]
}).populate('criteria');
<<<<<<<
},
/**
* Check if the user (out of role) is granted to perform action on given objects
* @param objects
* @param user
* @param action
* @param model
* @returns {*}
*/
isAllowedToPerformAction: function (objects, user, action, model) {
if (!_.isArray(objects)) {
return PermissionService.isAllowedToPerformSingle(user.id, action, model)(objects);
}
return new Promise.map(objects, PermissionService.isAllowedToPerformSingle(user.id, action, model));
},
/**
* Resolve if the user have the permission to perform this action
* @param user
* @param action
* @param model
* @returns {Function}
*/
isAllowedToPerformSingle: function (user, action, model) {
return function (obj) {
return new Promise(function (resolve, reject) {
Model.findOne({
identity: model
}).then(function (model) {
return Permission.find({
model: model.id,
object: obj.id,
action: action,
relation: 'user',
user: user
});
}).then(function (permission) {
if (permission.length > 0) {
resolve(true);
} else {
resolve(false);
}
}).catch(reject);
});
}
=======
},
/**
* create a new role
* @param options
* @param options.name {string} - role name
* @param options.permissions {permission object, or array of permissions objects}
* @param options.permissions.model {string} - the name of the model that the permission is associated with
* @param options.permissions.criteria - optional criteria object
* @param options.permissions.criteria.where - optional waterline query syntax object for specifying permissions
* @param options.permissions.criteria.blacklist {string array} - optional attribute blacklist
* @param options.users {array of user names} - optional array of user ids that have this role
*/
createRole: function (options) {
var ok = Promise.resolve();
var permissions = options.permissions;
if (!_.isArray(permissions)) {
permissions = [permissions];
}
// look up the model id based on the model name for each permission, and change it to an id
ok = ok.then(function () {
return Promise.map(permissions, function (permission) {
return Model.findOne({name: permission.model})
.then(function (model) {
permission.model = model.id;
return permission;
});
});
});
// look up user ids based on usernames, and replace the names with ids
ok = ok.then(function (permissions) {
if (options.users) {
return User.find({username: options.users})
.then(function (users) {
options.users = users;
});
}
});
ok = ok.then(function (users) {
return Role.create(options);
});
return ok;
},
/**
*
* @param options {permission object, or array of permissions objects}
* @param options.role {string} - the role name that the permission is associated with
* @param options.model {string} - the model name that the permission is associated with
* @param options.action {string} - the http action that the permission allows
* @param options.criteria - optional criteria object
* @param options.criteria.where - optional waterline query syntax object for specifying permissions
* @param options.criteria.blacklist {string array} - optional attribute blacklist
*/
grant: function (permissions) {
if (!_.isArray(permissions)) {
permissions = [permissions];
}
// look up the models based on name, and replace them with ids
var ok = Promise.map(permissions, function (permission) {
return Model.findOne({name: permission.model})
.then(function (model) {
permission.model = model.id;
return Role.findOne({name: permission.role})
.then(function (role) {
permission.role = role.id;
});
});
});
ok = ok.then(function () {
return Permission.create(permissions);
});
return ok;
},
/**
* add one or more users to a particular role
* TODO should this work with multiple roles?
* @param usernames {string or string array} - list of names of users
* @param rolename {string} - the name of the role that the users should be added to
*/
addUsersToRole: function (usernames, rolename) {
if (_.isEmpty(usernames)) {
return Promise.reject(new Error('One or more usernames must be provided'));
}
if (!_.isArray(usernames)) {
usernames = [usernames];
}
return Role.findOne({name: rolename}).populate('users').then(function (role) {
User.find({username: usernames}).then(function (users) {
role.users.add(users);
return role.save();
});
});
},
/**
* remove one or more users from a particular role
* TODO should this work with multiple roles
* @params usernames {string or string array} - name or list of names of users
* @params rolename {string} - the name of the role that the users should be removed from
*/
removeUsersFromRole: function (usernames, rolename) {
if (_.isEmpty(usernames)) {
return Promise.reject(new Error('One or more usernames must be provided'));
}
if (!_.isArray(usernames)) {
usernames = [usernames];
}
return Role.findOne({name: rolename}).populate('users').then(function (role) {
User.find({username: usernames}).then(function (users) {
// for remove we need to get the ids, cant pass the whole model like add
var userids = users.map(function (user) { return user && user.id; });
role.users.remove(userids);
return role.save();
});
});
},
/**
* revoke permission from role
* @param options
* @param options.role {string} - the name of the role related to the permission
* @param options.model {string} - the name of the model for the permission
* @param options.action {string} - the name of the action for the permission
* @param options.relation {string} - the type of the relation (owner or role)
*/
revoke: function (options) {
var ok = Promise.all([Role.findOne({name: options.role}), Model.findOne({name: options.model})]);
ok = ok.then(function (result) {
var role = result[0];
var model = result[1];
return Permission.destroy({role: role.id,
model: model.id,
action: options.action,
relation: options.relation
});
});
return ok;
>>>>>>>
},
/**
* create a new role
* @param options
* @param options.name {string} - role name
* @param options.permissions {permission object, or array of permissions objects}
* @param options.permissions.model {string} - the name of the model that the permission is associated with
* @param options.permissions.criteria - optional criteria object
* @param options.permissions.criteria.where - optional waterline query syntax object for specifying permissions
* @param options.permissions.criteria.blacklist {string array} - optional attribute blacklist
* @param options.users {array of user names} - optional array of user ids that have this role
*/
createRole: function (options) {
var ok = Promise.resolve();
var permissions = options.permissions;
if (!_.isArray(permissions)) {
permissions = [permissions];
}
// look up the model id based on the model name for each permission, and change it to an id
ok = ok.then(function () {
return Promise.map(permissions, function (permission) {
return Model.findOne({name: permission.model})
.then(function (model) {
permission.model = model.id;
return permission;
});
});
});
// look up user ids based on usernames, and replace the names with ids
ok = ok.then(function (permissions) {
if (options.users) {
return User.find({username: options.users})
.then(function (users) {
options.users = users;
});
}
});
ok = ok.then(function (users) {
return Role.create(options);
});
return ok;
},
/**
*
* @param options {permission object, or array of permissions objects}
* @param options.role {string} - the role name that the permission is associated with
* @param options.model {string} - the model name that the permission is associated with
* @param options.action {string} - the http action that the permission allows
* @param options.criteria - optional criteria object
* @param options.criteria.where - optional waterline query syntax object for specifying permissions
* @param options.criteria.blacklist {string array} - optional attribute blacklist
*/
grant: function (permissions) {
if (!_.isArray(permissions)) {
permissions = [permissions];
}
// look up the models based on name, and replace them with ids
var ok = Promise.map(permissions, function (permission) {
return Model.findOne({name: permission.model})
.then(function (model) {
permission.model = model.id;
return Role.findOne({name: permission.role})
.then(function (role) {
permission.role = role.id;
});
});
});
ok = ok.then(function () {
return Permission.create(permissions);
});
return ok;
},
/**
* add one or more users to a particular role
* TODO should this work with multiple roles?
* @param usernames {string or string array} - list of names of users
* @param rolename {string} - the name of the role that the users should be added to
*/
addUsersToRole: function (usernames, rolename) {
if (_.isEmpty(usernames)) {
return Promise.reject(new Error('One or more usernames must be provided'));
}
if (!_.isArray(usernames)) {
usernames = [usernames];
}
return Role.findOne({name: rolename}).populate('users').then(function (role) {
User.find({username: usernames}).then(function (users) {
role.users.add(users);
return role.save();
});
});
},
/**
* remove one or more users from a particular role
* TODO should this work with multiple roles
* @params usernames {string or string array} - name or list of names of users
* @params rolename {string} - the name of the role that the users should be removed from
*/
removeUsersFromRole: function (usernames, rolename) {
if (_.isEmpty(usernames)) {
return Promise.reject(new Error('One or more usernames must be provided'));
}
if (!_.isArray(usernames)) {
usernames = [usernames];
}
return Role.findOne({name: rolename}).populate('users').then(function (role) {
User.find({username: usernames}).then(function (users) {
// for remove we need to get the ids, cant pass the whole model like add
var userids = users.map(function (user) { return user && user.id; });
role.users.remove(userids);
return role.save();
});
});
},
/**
* revoke permission from role
* @param options
* @param options.role {string} - the name of the role related to the permission
* @param options.model {string} - the name of the model for the permission
* @param options.action {string} - the name of the action for the permission
* @param options.relation {string} - the type of the relation (owner or role)
*/
revoke: function (options) {
var ok = Promise.all([Role.findOne({name: options.role}), Model.findOne({name: options.model})]);
ok = ok.then(function (result) {
var role = result[0];
var model = result[1];
return Permission.destroy({role: role.id,
model: model.id,
action: options.action,
relation: options.relation
});
});
return ok;
},
/**
* Check if the user (out of role) is granted to perform action on given objects
* @param objects
* @param user
* @param action
* @param model
* @returns {*}
*/
isAllowedToPerformAction: function (objects, user, action, model) {
if (!_.isArray(objects)) {
return PermissionService.isAllowedToPerformSingle(user.id, action, model)(objects);
}
return new Promise.map(objects, PermissionService.isAllowedToPerformSingle(user.id, action, model));
},
/**
* Resolve if the user have the permission to perform this action
* @param user
* @param action
* @param model
* @returns {Function}
*/
isAllowedToPerformSingle: function (user, action, model) {
return function (obj) {
return new Promise(function (resolve, reject) {
Model.findOne({
identity: model
}).then(function (model) {
return Permission.find({
model: model.id,
object: obj.id,
action: action,
relation: 'user',
user: user
});
}).then(function (permission) {
if (permission.length > 0) {
resolve(true);
} else {
resolve(false);
}
}).catch(reject);
});
} |
<<<<<<<
.then(function (objects) {
this.objects = objects;
return PermissionService.isAllowedToPerformAction(this.objects, req.user, action, ModelService.getTargetModelName(req), req.body);
})
.then(function(canPerform) {
if (PermissionService.hasForeignObjects(objects, req.user) && !canPerform) {
return res.forbidden({
error: 'Cannot perform action [' + action + '] on foreign object'
=======
.then(function(objects) {
// PermissionService.isAllowedToPerformAction checks if the user has 'user' based permissions (vs role or owner based permissions)
return PermissionService.isAllowedToPerformAction(objects, req.user, action, ModelService.getTargetModelName(req), req.body)
.then(function(hasUserPermissions) {
if (hasUserPermissions) {
return next();
}
if (PermissionService.hasForeignObjects(objects, req.user)) {
return res.badRequest({
error: 'Cannot perform action [' + action + '] on foreign object'
});
}
next();
>>>>>>>
.then(function(objects) {
// PermissionService.isAllowedToPerformAction checks if the user has 'user' based permissions (vs role or owner based permissions)
return PermissionService.isAllowedToPerformAction(objects, req.user, action, ModelService.getTargetModelName(req), req.body)
.then(function(hasUserPermissions) {
if (hasUserPermissions) {
return next();
}
if (PermissionService.hasForeignObjects(objects, req.user)) {
return res.forbidden({
error: 'Cannot perform action [' + action + '] on foreign object'
});
}
next(); |
<<<<<<<
if (permission.relation == 'user' && permission.user == "") {
next(new Error('A Permission with relation user MUST have the user attribute set'));
}
if (permission.relation == 'role' && permission.role == "") {
next(new Error('A Permission with relation role MUST have the role attribute set'));
}
=======
if (permission.action === 'delete' &&
_.filter(permission.criteria, function (criteria) { return !_.isEmpty(criteria.blacklist); }).length) {
next(new Error('Creating a Permission with an attribute blacklist is not allowed when action=delete'));
}
>>>>>>>
if (permission.action === 'delete' &&
_.filter(permission.criteria, function (criteria) { return !_.isEmpty(criteria.blacklist); }).length) {
next(new Error('Creating a Permission with an attribute blacklist is not allowed when action=delete'));
}
if (permission.relation == 'user' && permission.user == "") {
next(new Error('A Permission with relation user MUST have the user attribute set'));
}
if (permission.relation == 'role' && permission.role == "") {
next(new Error('A Permission with relation role MUST have the role attribute set'));
} |
<<<<<<<
//var Hapi = plugin.hapi;
=======
>>>>>>>
<<<<<<<
settings.pluginRoutePrefix = plugin.config.route.prefix || '';
=======
var routeConfig = utils.getRoutesModifiers(plugin);
settings.pluginRoutePrefix = routeConfig.route.prefix || '';
>>>>>>>
var routeConfig = utils.getRoutesModifiers(plugin);
settings.pluginRoutePrefix = routeConfig.route.prefix || '';
<<<<<<<
resources: function(request, reply) {
var serverSettings = Hoek.reach(request, 'server.settings.app.swagger');
=======
resourceListing: function(request, reply) {
var requestConnection = utils.getRequestConnection(request);
var serverSettings = Hoek.reach(requestConnection, 'settings.app.swagger');
var currentSettings = utils.getCurrentSettings(settings, serverSettings);
var tags = request.query.tags;
var apiRefs = internals.apiList(currentSettings, requestConnection.table(), tags, Hoek.reach(requestConnection, 'settings.app.swagger'));
var basePath = utils.extractBaseHost(currentSettings, request);
basePath += settings.pluginRoutePrefix + settings.endpoint + settings.endpointDeclarationSuffix;
if (tags) {
basePath += '?tags=' + encodeURIComponent(tags) + '&path=';
} else {
basePath += '?path=';
}
var resourceListingResponse = {
swaggerVersion: SWAGGER_VERSION,
basePath: basePath,
apis: apiRefs
};
utils.setNotEmpty(resourceListingResponse, 'apiVersion', currentSettings.apiVersion);
utils.setNotEmpty(resourceListingResponse, 'info', currentSettings.info);
utils.setNotEmpty(resourceListingResponse, 'authorizations', currentSettings.authorizations);
reply(null, resourceListingResponse);
},
apiDeclaration: function(request, reply) {
var requestConnection = utils.getRequestConnection(request);
var serverSettings = Hoek.reach(requestConnection, 'settings.app.swagger');
>>>>>>>
resources: function(request, reply) {
var requestConnection = utils.getRequestConnection(request);
var serverSettings = Hoek.reach(requestConnection, 'settings.app.swagger');
<<<<<<<
var host = utils.extractBaseHost(currentSettings, request);
var resources = internals.resources(currentSettings, request.server.table(), request.query.tags);
var data = {
swagger: SWAGGER_VERSION,
host: host,
schemes: currentSettings.schemes,
externalDocs: currentSettings.externalDocs,
paths: resources.paths,
definitions: resources.definitions
=======
var models = {};
var path = request.query.path.substr(1);
// request.server fallback for hapi < 8
var apis = internals.apiDeclaration(currentSettings, requestConnection.table(), path, models, request.query.tags);
if (_.isEmpty(apis)) {
return reply(Boom.notFound());
}
var resourcePath = '/' + path;
var basePath = utils.extractBaseHost(currentSettings, request);
var stripPrefix = currentSettings.stripPrefix;
if (stripPrefix) {
basePath += stripPrefix;
}
var apiDeclaration = {
swaggerVersion: SWAGGER_VERSION,
basePath: basePath,
resourcePath: resourcePath,
produces: currentSettings.produces,
apis: apis,
models: models
>>>>>>>
var host = utils.extractBaseHost(currentSettings, request);
var resources = internals.resources(currentSettings, request.server.table(), request.query.tags);
var data = {
swagger: SWAGGER_VERSION,
host: host,
schemes: currentSettings.schemes,
externalDocs: currentSettings.externalDocs,
paths: resources.paths,
definitions: resources.definitions |
<<<<<<<
// Back page
=======
// Back page
>>>>>>>
// Back page
<<<<<<<
if (d.pagePlace[view[0]]==view[0]) apage = view[0];
else if (d.pagePlace[view[1]]==view[1]) apage = view[1];
=======
>>>>>>>
if (d.pagePlace[view[0]]==view[0]) apage = view[0];
else if (d.pagePlace[view[1]]==view[1]) apage = view[1];
<<<<<<<
=======
>>>>>>>
<<<<<<<
if (d.opt.backShadow)
=======
if (d.opt.backShadow)
>>>>>>>
if (d.opt.backShadow) |
<<<<<<<
import Tabs from '../packages/tabs/index.js';
import Tab from '../packages/tab/index.js';
=======
import ImagePreview from '../packages/image-preview/index.js';
import Col from '../packages/col/index.js';
import Row from '../packages/row/index.js';
import Actionsheet from '../packages/actionsheet/index.js';
>>>>>>>
import Tabs from '../packages/tabs/index.js';
import Tab from '../packages/tab/index.js';
import ImagePreview from '../packages/image-preview/index.js';
import Col from '../packages/col/index.js';
import Row from '../packages/row/index.js';
import Actionsheet from '../packages/actionsheet/index.js';
<<<<<<<
Vue.component(Tabs.name, Tabs);
Vue.component(Tab.name, Tab);
=======
Vue.component(Col.name, Col);
Vue.component(Row.name, Row);
Vue.component(Actionsheet.name, Actionsheet);
>>>>>>>
Vue.component(Tabs.name, Tabs);
Vue.component(Tab.name, Tab);
Vue.component(Col.name, Col);
Vue.component(Row.name, Row);
Vue.component(Actionsheet.name, Actionsheet);
<<<<<<<
Step,
Tabs,
Tab
=======
Step,
ImagePreview,
Col,
Row,
Actionsheet
>>>>>>>
Step,
Tabs,
Tab,
ImagePreview,
Col,
Row,
Actionsheet |
<<<<<<<
import Toast from '../packages/toast/index.js';
=======
import Uploader from '../packages/uploader/index.js';
import Swipe from '../packages/swipe/index.js';
import SwipeItem from '../packages/swipe-item/index.js';
>>>>>>>
import Toast from '../packages/toast/index.js';
import Uploader from '../packages/uploader/index.js';
import Swipe from '../packages/swipe/index.js';
import SwipeItem from '../packages/swipe-item/index.js';
<<<<<<<
Progress,
Toast
=======
Progress,
Uploader,
Swipe,
SwipeItem
>>>>>>>
Progress,
Toast,
Uploader,
Swipe,
SwipeItem |
<<<<<<<
import Uploader from '../packages/uploader/index.js';
=======
import Swipe from '../packages/swipe/index.js';
import SwipeItem from '../packages/swipe-item/index.js';
>>>>>>>
import Uploader from '../packages/uploader/index.js';
import Swipe from '../packages/swipe/index.js';
import SwipeItem from '../packages/swipe-item/index.js';
<<<<<<<
Vue.component(Uploader.name, Uploader);
=======
Vue.component(Swipe.name, Swipe);
Vue.component(SwipeItem.name, SwipeItem);
>>>>>>>
Vue.component(Uploader.name, Uploader);
Vue.component(Swipe.name, Swipe);
Vue.component(SwipeItem.name, SwipeItem);
<<<<<<<
Progress,
Uploader
=======
Progress,
Swipe,
SwipeItem
>>>>>>>
Progress,
Uploader,
Swipe,
SwipeItem |
<<<<<<<
callback(null, new Error('There is no suitable adapter for this type of device'));
return;
=======
return console.error("Users.Device: No suitable adapter for push notifications");
>>>>>>>
callback(null, new Error('There is no suitable adapter for this type of device'));
return;
<<<<<<<
this.getServiceWorkerRegistration(function(sw, err) {
if (err)
callback(null, err);
else {
var userVisibleOnly = true;
if (options && !options.userVisibleOnly) {
userVisibleOnly = false;
}
sw.pushManager.subscribe({
userVisibleOnly: userVisibleOnly,
applicationServerKey: _urlB64ToUint8Array(self.appConfig.publicKey)
}).then(function (subscription) {
_saveSubscription(subscription, self.appConfig);
if (callback) {
callback(subscription);
}
}).catch(function (err) {
if (Notification.permission === 'denied') {
console.warn('Permission for Notifications was denied');
} else {
console.warn('Unable to subscribe to push.', err);
}
if (callback) {
callback(null, err);
}
});
=======
function urlB64ToUint8Array(base64String) {
var padding = '='.repeat((4 - base64String.length % 4) % 4);
var base64 = (base64String + padding).replace(/\-/g, '+').replace(/_/g, '/');
var rawData = window.atob(base64);
var outputArray = new Uint8Array(rawData.length);
for (var i = 0; i < rawData.length; ++i) {
outputArray[i] = rawData.charCodeAt(i);
}
return outputArray;
}
var appConfig = Q.getObject('Q.Users.browserApps.' + Q.info.browser.name + '.' + Q.info.app);
var userVisibleOnly = true;
if (options && !options.userVisibleOnly) {
userVisibleOnly = false;
}
this.serviceWorkerRegistration.pushManager.subscribe({
userVisibleOnly: userVisibleOnly,
applicationServerKey: urlB64ToUint8Array(self.appConfig.publicKey)
}).then(function (subscription) {
_saveSubscription(subscription);
callback(subscription);
}).catch(function (e) {
if (Notification.permission === 'denied') {
console.error('Users.Device: Permission for Notifications was denied');
} else {
console.error('Users.Device: Unable to subscribe to push.', e);
>>>>>>>
this.getServiceWorkerRegistration(function(sw, err) {
if (err)
callback(null, err);
else {
var userVisibleOnly = true;
if (options && !options.userVisibleOnly) {
userVisibleOnly = false;
}
sw.pushManager.subscribe({
userVisibleOnly: userVisibleOnly,
applicationServerKey: _urlB64ToUint8Array(self.appConfig.publicKey)
}).then(function (subscription) {
_saveSubscription(subscription, self.appConfig);
if (callback) {
callback(subscription);
}
}).catch(function (err) {
if (Notification.permission === 'denied') {
console.error('Users.Device: Permission for Notifications was denied');
} else {
console.error('Users.Device: Unable to subscribe to push.', err);
}
if (callback) {
callback(null, err);
}
});
<<<<<<<
this.getServiceWorkerRegistration(function(sw, err) {
if (err)
callback(null, err);
else {
sw.pushManager.getSubscription()
.then(function (subscription) {
if (subscription) {
_deleteSubscription(subscription.endpoint);
return subscription.unsubscribe();
}
})
.catch(function (error) {
console.log('Error while unsubscribing', error);
if (callback) {
callback(false, error);
}
})
.then(function () {
console.log('User is unsubscribed.');
if (callback) {
callback(true);
}
});
}
});
=======
this.serviceWorkerRegistration.pushManager.getSubscription()
.then(function (subscription) {
if (subscription) {
return subscription.unsubscribe();
}
}).catch(function (error) {
console.error('Users.Device: Error unsubscribing', error);
}).then(function () {
//updateSubscriptionOnServer(null);
console.log('Users.Device: User is unsubscribed.');
callback(true);
});
>>>>>>>
this.getServiceWorkerRegistration(function(sw, err) {
if (err)
callback(null, err);
else {
sw.pushManager.getSubscription()
.then(function (subscription) {
if (subscription) {
_deleteSubscription(subscription.endpoint);
return subscription.unsubscribe();
}
})
.catch(function (error) {
console.error('Users.Device: Error unsubscribing', error);
if (callback) {
callback(false, error);
}
})
.then(function () {
console.log('Users.Device: User is unsubscribed.');
if (callback) {
callback(true);
}
});
}
});
<<<<<<<
if (!'serviceWorker' in navigator && 'PushManager' in window) {
if (callback)
callback(null, new Error("Push messaging is not supported"));
return;
}
=======
if (Q.info.url.substr(0, 8) !== 'https://') {
return false;
}
>>>>>>>
if (Q.info.url.substr(0, 8) !== 'https://') {
if (callback)
callback(null, new Error("Push notifications require HTTPS"));
return;
}
if (!'serviceWorker' in navigator && 'PushManager' in window) {
if (callback)
callback(null, new Error("Push messaging is not supported"));
return;
}
<<<<<<<
.then(function (swReg) {
navigator.serviceWorker.addEventListener('message', function(event){
Users.Device.onNotification.handle(event.data);
});
console.log('Service Worker is registered.');
if (callback)
callback(swReg);
})
.catch(function (error) {
callback(null, error);
console.error('Service Worker Error', error);
});
=======
.then(function (swReg) {
console.log('Service Worker is registered', swReg);
self.serviceWorkerRegistration = swReg;
if (callback)
callback(swReg);
}).catch(function (error) {
callback(null, error);
console.error('Users.Device: Service Worker Error', error);
});
return true;
>>>>>>>
.then(function (swReg) {
navigator.serviceWorker.addEventListener('message', function(event){
Users.Device.onNotification.handle(event.data);
});
console.log('Service Worker is registered.');
if (callback)
callback(swReg);
})
.catch(function (error) {
callback(null, error);
console.error('Users.Device: Service Worker Error', error);
}); |
<<<<<<<
// handle "choose from contacts" button
$('.Streams_invite_choose_contact', dialog)
.on(Q.Pointer.fastclick, function () {
var $this = $(this);
var $eContacts = $(".Streams_invite_contacts", dialog);
$eContacts.html("");
var options = {
prefix: "Users",
data: $eContacts.data("contacts") || null
}
Users.Dialogs.contacts(options, function (contacts) {
if (!contacts) {
return;
}
for (let i = 0; i < contacts.length; i++) {
let prefix = (Object.keys(contacts[i])[Object.keys(contacts[i]).length-1] == "email" )? "email": "mobile";
$eContacts.append("<div><i class='qp-communities-"+ prefix +"'></i><span>"+ contacts[i].name +"</span></div>")
}
$eContacts.data("contacts", contacts);
$this.text(text.chooseAgainFromContacts);
})
});
// handle "go" button
$('.Streams_invite_submit button', dialog)
.on(Q.Pointer.fastclick, function () {
Q.handle(callback, Streams, [{
identifier: $(".Streams_invite_submit input[type=text]", dialog).val()
}]);
Q.Dialogs.pop(); // close the Dialog
});
=======
if (!Q.info.isTouchscreen) {
$('.Streams_invite_submit input[type=text]').focus();
}
// handle go button
$('.Streams_invite_submit').on('submit', function (e) {
Q.handle(callback, Streams, [{
identifier: $("input[type=text]", this).val()
}]);
Q.Dialogs.pop(); // close the Dialog
e.preventDefault();
});
>>>>>>>
// handle "choose from contacts" button
$('.Streams_invite_choose_contact', dialog)
.on(Q.Pointer.fastclick, function () {
var $this = $(this);
var $eContacts = $(".Streams_invite_contacts", dialog);
$eContacts.html("");
var options = {
prefix: "Users",
data: $eContacts.data("contacts") || null
}
Users.Dialogs.contacts(options, function (contacts) {
if (!contacts) {
return;
}
for (let i = 0; i < contacts.length; i++) {
let prefix = (Object.keys(contacts[i])[Object.keys(contacts[i]).length-1] == "email" )? "email": "mobile";
$eContacts.append("<div><i class='qp-communities-"+ prefix +"'></i><span>"+ contacts[i].name +"</span></div>")
}
$eContacts.data("contacts", contacts);
$this.text(text.chooseAgainFromContacts);
})
});
if (!Q.info.isTouchscreen) {
$('.Streams_invite_submit input[type=text]').focus();
}
// handle go button
$('.Streams_invite_submit').on('submit', function (e) {
Q.handle(callback, Streams, [{
identifier: $("input[type=text]", this).val()
}]);
Q.Dialogs.pop(); // close the Dialog
e.preventDefault();
}); |
<<<<<<<
=======
remoteStreamEl.addEventListener('abord', function (e) {
myconsole.log('VIDEO ERROR ABORTED', e)
})
remoteStreamEl.addEventListener('emptied', function (e) {
myconsole.log('VIDEO ERROR emptied', e)
})
remoteStreamEl.addEventListener('error', function (e) {
myconsole.log('VIDEO ERROR error', e)
})
remoteStreamEl.addEventListener('pause', function (e) {
myconsole.log('VIDEO ERROR pause', e)
})
remoteStreamEl.addEventListener('suspend', function (e) {
myconsole.log('VIDEO ERROR suspend', e)
})
remoteStreamEl.addEventListener('stalled', function (e) {
myconsole.log('VIDEO ERROR stalled', e)
})
remoteStreamEl.addEventListener('interruptbegin', function (e) {
myconsole.log('VIDEO ERROR interruptbegin', e)
})
remoteStreamEl.remote.addEventListener('connect', function (e) {
myconsole.log('VIDEO ERROR connect', e)
})
remoteStreamEl.remote.addEventListener('disconnect', function (e) {
myconsole.log('VIDEO ERROR disconnect', e)
})
>>>>>>>
<<<<<<<
return;
console.log('createVideoCanvas');
=======
myconsole.log('createVideoCanvas');
>>>>>>>
return;
console.log('createVideoCanvas');
<<<<<<<
//if(_debug) console.log('enabledAudioTracks 0', t.mediaStreamTrack.enabled, t.mediaStreamTrack.readyState);
=======
if(_debug) myconsole.log('enabledAudioTracks 0', t.mediaStreamTrack.enabled, t.mediaStreamTrack.readyState);
>>>>>>>
//if(_debug) console.log('enabledAudioTracks 0', t.mediaStreamTrack.enabled, t.mediaStreamTrack.readyState);
<<<<<<<
=======
if(_debug) myconsole.log('enabledAudioTracks 1', (t.mediaStreamTrack != null && t.mediaStreamTrack.enabled && t.mediaStreamTrack.readyState == 'live'), t.mediaStreamTrack.enabled, t.mediaStreamTrack.readyState);
>>>>>>>
<<<<<<<
=======
if(_debug) myconsole.log('checkOnlineStatus enabledAudioTracks', audioTracks.length, enabledAudioTracks.length, participant.remoteMicIsEnabled);
>>>>>>>
<<<<<<<
if (failureCallback != null) failureCallback();
console.error(err.name + ": " + err.message);
=======
myconsole.error(err.name + ": " + err.message);
>>>>>>>
if (failureCallback != null) failureCallback();
console.error(err.name + ": " + err.message);
<<<<<<<
console.error(`Unable to connect to Room: ${error.message}`);
console.log(`Unable to connect to Room: ${error.message}`);
=======
myconsole.error(`Unable to connect to Room: ${error.message}`);
>>>>>>>
console.error(`Unable to connect to Room: ${error.message}`);
console.log(`Unable to connect to Room: ${error.message}`);
<<<<<<<
console.error('error');
console.log('error');
=======
myconsole.log('error');
>>>>>>>
console.error('error');
console.log('error'); |
<<<<<<<
=======
var NodePreviewView = NodeViewBase.extend({
template: node_preview_view_template,
// Override the NodeViewBase events, I want the whole thing draggable, not
// just the drag handle.
events: {
'mousedown': 'startBeingDragged'
},
checkDidReposition: function(model, resp, options) {
this.triggerReposition(model);
},
canAcceptParent: function(parent) {
return this.app.validateRelationship(parent, this.model);
},
startBeingDragged: function(event) {
NodeViewBase.prototype.startBeingDragged.apply(this, arguments);
// only on a left click.
if ( event.which !== 1 )
return;
var placeholder = this.placeholder = $('<li class="drag_placeholder"> </li>').css({
width: this.$el.width(),
padding: this.$el.css('padding')
});
this.$el.after(placeholder);
},
cssClasses: function() {
return this.model.get('css_classes');
}
});
>>>>>>> |
<<<<<<<
'https', 'url',
=======
...['fs', 'https', 'path', 'querystring', 'url'],
>>>>>>>
'https', 'querystring', 'url', |
<<<<<<<
const { inputEl } = getComboBoxElements(comboBoxEl);
selectEl.value = selectedOption.value;
inputEl.value = selectedOption.text;
=======
const { inputEl } = getComboBoxElements(el);
changeElementValue(selectEl, selectedOption.value);
changeElementValue(inputEl, selectedOption.text);
>>>>>>>
const { inputEl } = getComboBoxElements(comboBoxEl);
changeElementValue(selectEl, selectedOption.value);
changeElementValue(inputEl, selectedOption.text); |
<<<<<<<
var path = require('path');
var pkg = require('../../package.json');
=======
>>>>>>>
var path = require('path');
var pkg = require('../../package.json');
<<<<<<<
var paths = [
'src/templates',
'src/components',
].map(dir => path.join(__dirname, '../../', dir));
var options = {
env: new nj.Environment(new nj.FileSystemLoader(paths)),
};
=======
var data = require('./template-data');
>>>>>>>
var data = require('./template-data');
var paths = [
'src/templates',
'src/components',
].map(dir => path.join(__dirname, '../../', dir));
var options = {
env: new nj.Environment(new nj.FileSystemLoader(paths)),
};
<<<<<<<
.pipe(nunjucks.compile({
lang: 'en-US',
'package': pkg,
uswds: {
path: '..',
},
}, options))
=======
.pipe(nunjucks.compile(data))
>>>>>>>
.pipe(nunjucks.compile(data, options)) |
<<<<<<<
const COMBO_BOX_CLASS = `${PREFIX}-combo-box`;
const COMBO_BOX_PRISTINE_CLASS = `${COMBO_BOX_CLASS}--pristine`;
const SELECT_CLASS = `${COMBO_BOX_CLASS}__select`;
const INPUT_CLASS = `${COMBO_BOX_CLASS}__input`;
const CLEAR_INPUT_BUTTON_CLASS = `${COMBO_BOX_CLASS}__clear-input`;
const CLEAR_INPUT_BUTTON_WRAPPER_CLASS = `${CLEAR_INPUT_BUTTON_CLASS}__wrapper`;
const INPUT_BUTTON_SEPARATOR_CLASS = `${COMBO_BOX_CLASS}__input-button-separator`;
const TOGGLE_LIST_BUTTON_CLASS = `${COMBO_BOX_CLASS}__toggle-list`;
const TOGGLE_LIST_BUTTON_WRAPPER_CLASS = `${TOGGLE_LIST_BUTTON_CLASS}__wrapper`;
const LIST_CLASS = `${COMBO_BOX_CLASS}__list`;
const LIST_OPTION_CLASS = `${COMBO_BOX_CLASS}__list-option`;
=======
const COMBO_BOX = `.${PREFIX}-combo-box`;
const INPUT_CLASS = `${PREFIX}-combo-box__input`;
const LIST_CLASS = `${PREFIX}-combo-box__list`;
const SELECT_CLASS = `${PREFIX}-combo-box__select`;
const LIST_OPTION_CLASS = `${PREFIX}-combo-box__list-option`;
const STATUS_CLASS = `${PREFIX}-combo-box__status`;
>>>>>>>
const COMBO_BOX_CLASS = `${PREFIX}-combo-box`;
const COMBO_BOX_PRISTINE_CLASS = `${COMBO_BOX_CLASS}--pristine`;
const SELECT_CLASS = `${COMBO_BOX_CLASS}__select`;
const INPUT_CLASS = `${COMBO_BOX_CLASS}__input`;
const CLEAR_INPUT_BUTTON_CLASS = `${COMBO_BOX_CLASS}__clear-input`;
const CLEAR_INPUT_BUTTON_WRAPPER_CLASS = `${CLEAR_INPUT_BUTTON_CLASS}__wrapper`;
const INPUT_BUTTON_SEPARATOR_CLASS = `${COMBO_BOX_CLASS}__input-button-separator`;
const TOGGLE_LIST_BUTTON_CLASS = `${COMBO_BOX_CLASS}__toggle-list`;
const TOGGLE_LIST_BUTTON_WRAPPER_CLASS = `${TOGGLE_LIST_BUTTON_CLASS}__wrapper`;
const LIST_CLASS = `${COMBO_BOX_CLASS}__list`;
const LIST_OPTION_CLASS = `${COMBO_BOX_CLASS}__list-option`;
<<<<<<<
const COMBO_BOX = `.${COMBO_BOX_CLASS}`;
const SELECT = `.${SELECT_CLASS}`;
=======
const SELECT = `.${SELECT_CLASS}`;
>>>>>>>
const COMBO_BOX = `.${COMBO_BOX_CLASS}`;
const SELECT = `.${SELECT_CLASS}`;
<<<<<<<
const { inputEl } = getComboBoxContext(comboBoxEl);
=======
const { inputEl } = getComboBoxElements(comboBoxEl);
>>>>>>>
const { inputEl } = getComboBoxContext(comboBoxEl);
<<<<<<<
if (focusedOptionEl) {
focusedOptionEl.classList.remove(LIST_OPTION_FOCUSED_CLASS);
}
listEl.scrollTop = 0;
=======
>>>>>>>
if (focusedOptionEl) {
focusedOptionEl.classList.remove(LIST_OPTION_FOCUSED_CLASS);
}
listEl.scrollTop = 0;
<<<<<<<
=======
event.preventDefault();
>>>>>>>
<<<<<<<
/**
* Handle the enter event from an input element within the combo box component.
*
* @param {KeyboardEvent} event An event within the combo box component
*/
const handleTabFromListOption = event => {
selectItem(event.target);
event.preventDefault();
};
/**
* Handle the enter event from list option within the combo box component.
*
* @param {KeyboardEvent} event An event within the combo box component
*/
const handleEnterFromListOption = event => {
selectItem(event.target);
event.preventDefault();
=======
/**
* Handle the enter event from list option within the combo box component.
*
* @param {KeyboardEvent} event An event within the combo box component
*/
const handleEnterFromListOption = event => {
selectItem(event.target);
event.preventDefault();
>>>>>>>
/**
* Handle the enter event from an input element within the combo box component.
*
* @param {KeyboardEvent} event An event within the combo box component
*/
const handleTabFromListOption = event => {
selectItem(event.target);
event.preventDefault();
};
/**
* Handle the enter event from list option within the combo box component.
*
* @param {KeyboardEvent} event An event within the combo box component
*/
const handleEnterFromListOption = event => {
selectItem(event.target);
event.preventDefault();
<<<<<<<
const handleUpFromListOption = event => {
const { comboBoxEl, listEl, focusedOptionEl } = getComboBoxContext(
=======
const handleUpFromListOption = event => {
const { comboBoxEl, listEl, focusedOptionEl } = getComboBoxElements(
>>>>>>>
const handleUpFromListOption = event => {
const { comboBoxEl, listEl, focusedOptionEl } = getComboBoxContext(
<<<<<<<
if (!this.contains(event.relatedTarget)) {
resetSelection(this);
hideList(this);
=======
const { comboBoxEl } = getComboBoxElements(event.target);
if (!comboBoxEl.contains(event.relatedTarget)) {
hideList(comboBoxEl);
>>>>>>>
if (!this.contains(event.relatedTarget)) {
resetSelection(this);
hideList(this);
<<<<<<<
Enter: handleEnterFromListOption,
Tab: handleTabFromListOption
=======
Enter: handleEnterFromListOption
>>>>>>>
Enter: handleEnterFromListOption,
Tab: handleTabFromListOption |
<<<<<<<
isPristine,
disableFiltering
=======
isPristine,
>>>>>>>
isPristine,
disableFiltering,
<<<<<<<
const enhanceComboBox = _comboBoxEl => {
const comboBoxEl = _comboBoxEl.closest(COMBO_BOX);
if (comboBoxEl.dataset.enhanced) return;
=======
const enhanceComboBox = (comboBoxEl) => {
>>>>>>>
const enhanceComboBox = (_comboBoxEl) => {
const comboBoxEl = _comboBoxEl.closest(COMBO_BOX);
if (comboBoxEl.dataset.enhanced) return;
<<<<<<<
isPristine,
disableFiltering
=======
isPristine,
>>>>>>>
isPristine,
disableFiltering,
<<<<<<<
itemToFocus = listEl.querySelector("#" + selectedItemId);
} else if (disableFiltering && firstFoundId) {
itemToFocus = listEl.querySelector("#" + firstFoundId);
}
if (itemToFocus) {
highlightOption(listEl, itemToFocus, {
skipFocus: true
=======
const selectedOptionEl = listEl.querySelector("#" + selectedItemId);
highlightOption(listEl, null, selectedOptionEl, {
skipFocus: true,
>>>>>>>
itemToFocus = listEl.querySelector("#" + selectedItemId);
} else if (disableFiltering && firstFoundId) {
itemToFocus = listEl.querySelector("#" + firstFoundId);
}
if (itemToFocus) {
highlightOption(listEl, itemToFocus, {
skipFocus: true,
<<<<<<<
const completeSelection = el => {
const { comboBoxEl, selectEl, inputEl, statusEl } = getComboBoxContext(el);
=======
const completeSelection = (el) => {
const {
comboBoxEl,
selectEl,
inputEl,
statusEl,
focusedOptionEl,
} = getComboBoxContext(el);
>>>>>>>
const completeSelection = (el) => {
const { comboBoxEl, selectEl, inputEl, statusEl } = getComboBoxContext(el);
<<<<<<<
const handleDownFromInput = event => {
const { comboBoxEl, listEl } = getComboBoxContext(event.target);
=======
const handleDown = (event) => {
const { comboBoxEl, listEl, focusedOptionEl } = getComboBoxContext(
event.target
);
>>>>>>>
const handleDownFromInput = (event) => {
const { comboBoxEl, listEl } = getComboBoxContext(event.target);
<<<<<<<
highlightOption(listOptionEl, listOptionEl, {
preventScroll: true
=======
const { comboBoxEl, focusedOptionEl } = getComboBoxContext(listOptionEl);
highlightOption(comboBoxEl, focusedOptionEl, listOptionEl, {
preventScroll: true,
>>>>>>>
highlightOption(listOptionEl, listOptionEl, {
preventScroll: true,
<<<<<<<
Escape: handleEscape
=======
ArrowDown: handleDown,
Down: handleDown,
Escape: handleEscape,
>>>>>>>
Escape: handleEscape,
<<<<<<<
Enter: handleEnterFromInput,
ArrowDown: handleDownFromInput,
Down: handleDownFromInput
=======
Enter: handleEnterFromInput,
>>>>>>>
Enter: handleEnterFromInput,
ArrowDown: handleDownFromInput,
Down: handleDownFromInput,
<<<<<<<
hideList,
COMBO_BOX_CLASS
=======
hideList,
>>>>>>>
hideList,
COMBO_BOX_CLASS, |
<<<<<<<
datePicker,
dateRangePicker,
=======
fileInput,
>>>>>>>
datePicker,
dateRangePicker,
fileInput, |
<<<<<<<
var diff;
log.info('ready-to-show');
w.setFullScreen(true);
=======
log.info('ready-to-show');
if ( debugMode !== true ) {
w.setFullScreen(true);
}
>>>>>>>
var diff;
log.info('ready-to-show');
if ( debugMode !== true ) {
w.setFullScreen(true);
}
<<<<<<<
diff = process.hrtime(tickCount);
log.info(`rendered in ${diff[0] * 1e9 + diff[1]} nanoseconds`);
=======
//w.minimize();
w.focus();
stateManager.ignoreReset = false;
>>>>>>>
//w.minimize();
w.focus();
diff = process.hrtime(tickCount);
log.info(`rendered in ${diff[0] * 1e9 + diff[1]} nanoseconds`);
<<<<<<<
// w.minimize();
// w.focus();
=======
//w.minimize();
>>>>>>>
// w.minimize();
// w.focus(); |
<<<<<<<
var BAD_X, Base, CHECK, Dns, E, GenericWebSite, Github, Reddit, SocialNetwork, Twitter, alloc_stub, cheerio, colors, env, iced, log, my_request, proofs, proxyca, request, root_certs, semver, __iced_k, __iced_k_noop, _certs, _ref,
=======
var BAD_X, Base, CHECK, Coinbase, Dns, E, GenericWebSite, Github, SocialNetwork, Twitter, alloc_stub, cheerio, colors, env, iced, log, my_request, proofs, proxyca, request, root_certs, semver, __iced_k, __iced_k_noop, _certs, _ref,
>>>>>>>
var BAD_X, Base, CHECK, Coinbase, Dns, E, GenericWebSite, Github, Reddit, SocialNetwork, Twitter, alloc_stub, cheerio, colors, env, iced, log, my_request, proofs, proxyca, request, root_certs, semver, __iced_k, __iced_k_noop, _certs, _ref,
<<<<<<<
exports.Reddit = Reddit = (function(_super) {
__extends(Reddit, _super);
function Reddit() {}
Reddit.prototype.get_scraper_klass = function() {
return proofs.RedditScraper;
};
Reddit.prototype.which = function() {
return "reddit";
};
return Reddit;
})(SocialNetwork);
=======
exports.Coinbase = Coinbase = (function(_super) {
__extends(Coinbase, _super);
function Coinbase() {
({
get_scraper_klass: function() {
return proofs.CoinbaseScraper;
},
which: function() {
return "coinbase";
}
});
}
return Coinbase;
})(SocialNetwork);
>>>>>>>
exports.Reddit = Reddit = (function(_super) {
__extends(Reddit, _super);
function Reddit() {}
Reddit.prototype.get_scraper_klass = function() {
return proofs.RedditScraper;
};
Reddit.prototype.which = function() {
return "reddit";
};
return Reddit;
})(SocialNetwork);
exports.Coinbase = Coinbase = (function(_super) {
__extends(Coinbase, _super);
function Coinbase() {
({
get_scraper_klass: function() {
return proofs.CoinbaseScraper;
},
which: function() {
return "coinbase";
}
});
}
return Coinbase;
})(SocialNetwork); |
<<<<<<<
var AnnouncementSigGen, BaseSigGen, CryptocurrencySigGen, DnsProofGen, E, GenericWebSiteProofGen, GithubProofGen, KeybaseProofGen, KeybasePushProofGen, RedditProofGen, RevokeProofSigGen, SignatureEngine, SocialNetworkProofGen, TrackerProofGen, TwitterProofGen, UntrackerProofGen, colors, constants, decode, env, iced, log, make_esc, master_ring, proofs, req, session, strip_at, urlmod, __iced_k, __iced_k_noop,
=======
var AnnouncementSigGen, BaseSigGen, CoinbaseProofGen, CryptocurrencySigGen, DnsProofGen, E, GenericWebSiteProofGen, GithubProofGen, KeybaseProofGen, KeybasePushProofGen, RevokeProofSigGen, SignatureEngine, SocialNetworkProofGen, TrackerProofGen, TwitterProofGen, UntrackerProofGen, colors, constants, decode, env, iced, log, make_esc, master_ring, proofs, req, session, strip_at, urlmod, __iced_k, __iced_k_noop,
>>>>>>>
var AnnouncementSigGen, BaseSigGen, CoinbaseProofGen, CryptocurrencySigGen, DnsProofGen, E, GenericWebSiteProofGen, GithubProofGen, KeybaseProofGen, KeybasePushProofGen, RedditProofGen, RevokeProofSigGen, SignatureEngine, SocialNetworkProofGen, TrackerProofGen, TwitterProofGen, UntrackerProofGen, colors, constants, decode, env, iced, log, make_esc, master_ring, proofs, req, session, strip_at, urlmod, __iced_k, __iced_k_noop,
<<<<<<<
lineno: 491
=======
lineno: 466
>>>>>>>
lineno: 499 |
<<<<<<<
it('returns A status for files that are added', function(done) {
gitlog({ repo: testRepoLocation }, function(err, commits) {
commits[0].status[0].should.equal('A')
done()
})
})
it('returns C100 status for files that are copied', function(done) {
gitlog({ repo: testRepoLocation, findCopiesHarder: true }, function(err, commits) {
commits[1].status[0].should.equal('C100')
done()
})
})
it('returns M status for files that are modified', function(done) {
gitlog({ repo: testRepoLocation }, function(err, commits) {
commits[2].status[0].should.equal('M')
done()
})
})
it('returns D status for files that are deleted', function(done) {
gitlog({ repo: testRepoLocation }, function(err, commits) {
commits[3].status[0].should.equal('D')
done()
})
})
// This fails inconsistently on different versions of git
// https://github.com/domharrington/node-gitlog/issues/24
//
// it('returns R100 & D status for files that are renamed (100 is % of similarity) or A', function(done) {
// gitlog({ repo: testRepoLocation, number: 100 }, function(err, commits) {
// if (semver.gte(gitVer, '2.0.0')){
// commits[4].status[0].should.equal('R100')
// commits[4].status[1].should.equal('D')
// } else {
// commits[4].status[0].should.equal('A')
// }
// done()
// })
// })
=======
it('returns synchronously if no callback is provided', function () {
var commits = gitlog({ repo: testRepoLocation })
commits.length.should.equal(10)
})
>>>>>>>
it('returns A status for files that are added', function(done) {
gitlog({ repo: testRepoLocation }, function(err, commits) {
commits[0].status[0].should.equal('A')
done()
})
})
it('returns C100 status for files that are copied', function(done) {
gitlog({ repo: testRepoLocation, findCopiesHarder: true }, function(err, commits) {
commits[1].status[0].should.equal('C100')
done()
})
})
it('returns M status for files that are modified', function(done) {
gitlog({ repo: testRepoLocation }, function(err, commits) {
commits[2].status[0].should.equal('M')
done()
})
})
it('returns D status for files that are deleted', function(done) {
gitlog({ repo: testRepoLocation }, function(err, commits) {
commits[3].status[0].should.equal('D')
done()
})
})
// This fails inconsistently on different versions of git
// https://github.com/domharrington/node-gitlog/issues/24
//
// it('returns R100 & D status for files that are renamed (100 is % of similarity) or A', function(done) {
// gitlog({ repo: testRepoLocation, number: 100 }, function(err, commits) {
// if (semver.gte(gitVer, '2.0.0')){
// commits[4].status[0].should.equal('R100')
// commits[4].status[1].should.equal('D')
// } else {
// commits[4].status[0].should.equal('A')
// }
// done()
// })
// })
it('returns synchronously if no callback is provided', function () {
var commits = gitlog({ repo: testRepoLocation })
commits.length.should.equal(10)
}) |
<<<<<<<
=======
let refresh = document.createElement("div");
refresh.innerHTML = "<h4 style='color: #999'>Once you've traveled refresh your tab and close/open Dev Tools to resume tree updates</h4>"
>>>>>>>
<<<<<<<
_panelWindow.document.getElementById('treeContainer').appendChild(timeTravelButton)
=======
_panelWindow.document.getElementById('treeContainer').appendChild(timeTravelButton)
_panelWindow.document.addEventListener('DOMContentLoaded', function() {
var link = _panelWindow.document.getElementById('timeTravelButton');
// onClick's logic below:
link.addEventListener('click', startTimeTravel);
});
>>>>>>>
_panelWindow.document.getElementById('treeContainer').appendChild(timeTravelButton)
<<<<<<<
let evaluation2 = 'inspect($$(".timeTravel"))[0].setAttribute("style", "width:100%; height: 100vh; background-color: ' + pageBgColor +'; position: absolute; top: 0; left: 0; z-index: 999999;")'
chrome.devtools.inspectedWindow.eval(evaluation2, function () {
return
})
=======
let evaluation2 = 'inspect($$(".timeTravel"))[0].setAttribute("style", "width:100%; height: 100vh; background-color: rgba(255,255,255,.9); position: absolute; top: 0; left: 0; z-index: 99; display: block")'
chrome.devtools.inspectedWindow.eval(evaluation2, function () {
return
})
>>>>>>>
let evaluation2 = 'inspect($$(".timeTravel"))[0].setAttribute("style", "width:100%; height: 100vh; background-color: ' + pageBgColor + '; position: absolute; top: 0; left: 0; z-index: 999999;")'
chrome.devtools.inspectedWindow.eval(evaluation2, function () {
return
})
<<<<<<<
=======
function methodToggle(e) {
e.preventDefault();
var element = panel.document.querySelector('.methods-list').classList.toggle('opened');
console.log(element)
}
>>>>>>>
function methodToggle(e) {
e.preventDefault();
var element = panel.document.querySelector('.methods-list').classList.toggle('opened');
console.log(element)
} |
<<<<<<<
=======
>>>>>>>
<<<<<<<
console.log('new data before push', newData, data)
chrome.storage.local.set({ 'states': newData }, function () {
=======
console.log('new data before push', newData, data)
chrome.storage.local.set({ 'states': newData }, function () {
>>>>>>>
console.log('new data before push', newData, data)
chrome.storage.local.set({ 'states': newData }, function () {
<<<<<<<
console.log('traveled through time!', newData, index)
let removal = _panelWindow.document.getElementById("treeVisualization");
if (typeof removal === 'node') _panelWindow.document.getElementById("treeContainer").removeChild(removal);
drawTree(newData, _panelWindow, index)
=======
console.log('traveled through time!', newData, index)
drawTree(newData[index], _panelWindow)
>>>>>>>
console.log('traveled through time!', newData, index)
let removal = _panelWindow.document.getElementById("treeVisualization");
if (typeof removal === 'node') _panelWindow.document.getElementById("treeContainer").removeChild(removal);
drawTree(newData, _panelWindow, index)
<<<<<<<
slider.setAttribute('value', maxLength);
const travelTo = slider.value;
console.log('travelto', travelTo)
slider.addEventListener('input', function () {
if (travelTo === slider.value) {
console.log('slider moved', travelTo);
timeTravel(travelTo);
}
})
=======
slider.setAttribute('value', maxLength);
let travelTo = slider.value;
slider.addEventListener('change', function () {
console.log('slider moved');
if (count === oldCount) {
chrome.storage.sync.get('count', function(data){count = data.count})
timeTravel(travelTo);
} else {oldCount = count}
})
>>>>>>>
slider.setAttribute('value', maxLength);
let travelTo = slider.value;
slider.addEventListener('change', function () {
console.log('slider moved');
if (count === oldCount) {
chrome.storage.sync.get('count', function(data){count = data.count})
timeTravel(travelTo);
} else {oldCount = count}
})
<<<<<<<
}
}, 400);
=======
}
}, 400);
>>>>>>>
}
}, 400);
<<<<<<<
});
const drawTree = (data, panel, dataIndex = data.length) => {
console.log('tree rendering', data, dataIndex)
=======
});
const drawTree = (data, panel) => {
console.log('tree rerendered', data)
>>>>>>>
});
const drawTree = (data, panel, dataIndex = data.length) => {
console.log('tree rendering', data, dataIndex)
<<<<<<<
data = data[dataIndex - 1];
=======
if (Array.isArray(data[0])) data = data[data.length - 1];
>>>>>>>
data = data[dataIndex - 1];
<<<<<<<
console.log('treeData array', treeData)
=======
>>>>>>>
console.log('treeData array', treeData)
<<<<<<<
console.log('treeData object', treeData)
// console.log(treeData)
var margin = { top: 20, right: 90, bottom: 30, left: 90 },
width = 660 - margin.left - margin.right,
=======
const margin = {top: 20, right: 60, bottom: 30, left: 120},
width = 960 - margin.left - margin.right,
>>>>>>>
console.log('treeData object', treeData)
// console.log(treeData)
var margin = { top: 20, right: 90, bottom: 30, left: 90 },
width = 660 - margin.left - margin.right,
<<<<<<<
// remove component ID when displaying name on tree
.text(function (d) { return d.data.name.slice(0, d.data.name.lastIndexOf("-")) });
console.log('tree rendered', data, dataIndex)
//dejavue custom d3 functionality
//click handler function for node text
function clickHandler(d) {
if (panel.document.getElementById("compdata")) {
let removal = _panelWindow.document.getElementById("compdata");
panel.document.getElementById("componentInfo").removeChild(removal)
}
let divv = document.createElement("div");
divv.setAttribute('id', 'compdata');
divv.innerHTML = `
=======
.attr('cursor', 'pointer');
>>>>>>>
.attr('cursor', 'pointer'); |
<<<<<<<
if (inputs.DEPLOYMENT_DESCRIPTOR) { jsonBody.deployment_descriptor = inputs.DEPLOYMENT_DESCRIPTOR }
=======
if (inputs.DEPLOYMENT_ACCOUNTS) { jsonBody.deployment_accounts = inputs.DEPLOYMENT_ACCOUNTS }
>>>>>>>
if (inputs.DEPLOYMENT_DESCRIPTOR) { jsonBody.deployment_descriptor = inputs.DEPLOYMENT_DESCRIPTOR }
if (inputs.DEPLOYMENT_ACCOUNTS) { jsonBody.deployment_accounts = inputs.DEPLOYMENT_ACCOUNTS } |
<<<<<<<
let deploymentTargets;
var errorHandler = errorHandlerModule();
var config = configModule.getConfig(event, context);
logger.init(event, context);
var service_creation_data = event.body;
try {
var isValidName = function (name) {
return /^[A-Za-z0-9\-]+$/.test(name);
};
if (!service_creation_data) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("Service inputs are not defined")));
} else if (!service_creation_data.service_type) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'service_type' is not defined")));
} else if (!service_creation_data.service_name || !isValidName(service_creation_data.service_name)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'service_name' is not defined or has invalid characters")));
} else if (service_creation_data.service_type !== "website" && (!service_creation_data.runtime)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'runtime' is not defined")));
} else if (service_creation_data.domain && !isValidName(service_creation_data.domain)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("Namespace is not appropriate")));
} else if (service_creation_data.service_name && service_creation_data.service_name.length > 20) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'Service Name' can have up to 20 characters")));
} else if (service_creation_data.domain && service_creation_data.domain.length > 20) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'Namespace' can have up to 20 characters")));
} else if (!service_creation_data.platform) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'platform' is not defined")));
}
// validate service types
const allowedSvcTypes = Object.keys(config.DEPLOYMENT_TARGETS);
if(allowedSvcTypes.indexOf(service_creation_data.service_type) !== -1) {
logger.info(`Valid service type provided ${service_creation_data.service_type}`);
=======
let deploymentTargets = {};
let deploymentAccounts = [];
var errorHandler = errorHandlerModule();
var config = configModule.getConfig(event, context);
logger.init(event, context);
var service_creation_data = event.body;
try {
var isValidName = function (name) {
return /^[A-Za-z0-9\-]+$/.test(name);
};
if (!service_creation_data) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("Service inputs are not defined")));
} else if (!service_creation_data.service_type) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'service_type' is not defined")));
} else if (!service_creation_data.service_name || !isValidName(service_creation_data.service_name)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'service_name' is not defined or has invalid characters")));
} else if (service_creation_data.service_type !== "website" && (!service_creation_data.runtime)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'runtime' is not defined")));
} else if (service_creation_data.domain && !isValidName(service_creation_data.domain)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("Namespace is not appropriate")));
} else if (service_creation_data.service_name && service_creation_data.service_name.length > 20) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'Service Name' can have up to 20 characters")));
} else if (service_creation_data.domain && service_creation_data.domain.length > 20) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'Namespace' can have up to 20 characters")));
}
// validate service types
const allowedSvcTypes = Object.keys(config.DEPLOYMENT_TARGETS);
if (allowedSvcTypes.indexOf(service_creation_data.service_type) !== -1) {
logger.info(`Valid service type provided ${service_creation_data.service_type}`);
} else {
return cb(JSON.stringify(errorHandler.throwInputValidationError(`Invalid service type provided - ${service_creation_data.service_type}`)));
}
// validate deployment targets
if (service_creation_data.deployment_targets && typeof service_creation_data.deployment_targets === "object") {
const allowedSubServiceType = config.DEPLOYMENT_TARGETS[service_creation_data.service_type];
deploymentTargets = validateDeploymentTargets(allowedSubServiceType, service_creation_data.deployment_targets, service_creation_data.service_type)
if (deploymentTargets.error) {
return cb(JSON.stringify(errorHandler.throwInputValidationError(deploymentTargets.error)));
}
} else {
return cb(JSON.stringify(errorHandler.throwInputValidationError(`Deployment targets is missing or is not in a valid format`)));
}
// Validate and set deployment accounts
let primaryAccountCount = 0;
if (Array.isArray(service_creation_data.deployment_accounts) && service_creation_data.deployment_accounts) {
for (let eachDeploymentAccount of service_creation_data.deployment_accounts) {
if ((typeof eachDeploymentAccount.primary == "boolean") && eachDeploymentAccount.primary) {
primaryAccountCount++
let deploymentAccount = {
'accountId': eachDeploymentAccount.accountId || config.PRIMARY_DEPLOYMENT_ACCOUNT.accountId,
'region': eachDeploymentAccount.region || config.PRIMARY_DEPLOYMENT_ACCOUNT.region,
'provider': eachDeploymentAccount.provider || config.PRIMARY_DEPLOYMENT_ACCOUNT.provider,
'primary': eachDeploymentAccount.primary
}
deploymentAccounts.push(deploymentAccount);
>>>>>>>
let deploymentTargets = {};
let deploymentAccounts = [];
var errorHandler = errorHandlerModule();
var config = configModule.getConfig(event, context);
logger.init(event, context);
var service_creation_data = event.body;
try {
var isValidName = function (name) {
return /^[A-Za-z0-9\-]+$/.test(name);
};
if (!service_creation_data) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("Service inputs are not defined")));
} else if (!service_creation_data.service_type) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'service_type' is not defined")));
} else if (!service_creation_data.service_name || !isValidName(service_creation_data.service_name)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'service_name' is not defined or has invalid characters")));
} else if (service_creation_data.service_type !== "website" && (!service_creation_data.runtime)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'runtime' is not defined")));
} else if (service_creation_data.domain && !isValidName(service_creation_data.domain)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("Namespace is not appropriate")));
} else if (service_creation_data.service_name && service_creation_data.service_name.length > 20) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'Service Name' can have up to 20 characters")));
} else if (service_creation_data.domain && service_creation_data.domain.length > 20) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'Namespace' can have up to 20 characters")));
} else if (!service_creation_data.platform) {
return cb(JSON.stringify(errorHandler.throwInputValidationError("'platform' is not defined")));
}
// validate service types
const allowedSvcTypes = Object.keys(config.DEPLOYMENT_TARGETS);
if (allowedSvcTypes.indexOf(service_creation_data.service_type) !== -1) {
logger.info(`Valid service type provided ${service_creation_data.service_type}`);
} else {
return cb(JSON.stringify(errorHandler.throwInputValidationError(`Invalid service type provided - ${service_creation_data.service_type}`)));
}
// validate deployment targets
if (service_creation_data.deployment_targets && typeof service_creation_data.deployment_targets === "object") {
const allowedSubServiceType = config.DEPLOYMENT_TARGETS[service_creation_data.service_type];
deploymentTargets = validateDeploymentTargets(allowedSubServiceType, service_creation_data.deployment_targets, service_creation_data.service_type)
if (deploymentTargets.error) {
return cb(JSON.stringify(errorHandler.throwInputValidationError(deploymentTargets.error)));
}
} else {
return cb(JSON.stringify(errorHandler.throwInputValidationError(`Deployment targets is missing or is not in a valid format`)));
}
// Validate and set deployment accounts
let primaryAccountCount = 0;
if (Array.isArray(service_creation_data.deployment_accounts) && service_creation_data.deployment_accounts) {
for (let eachDeploymentAccount of service_creation_data.deployment_accounts) {
if ((typeof eachDeploymentAccount.primary == "boolean") && eachDeploymentAccount.primary) {
primaryAccountCount++
let deploymentAccount = {
'accountId': eachDeploymentAccount.accountId || config.PRIMARY_DEPLOYMENT_ACCOUNT.accountId,
'region': eachDeploymentAccount.region || config.PRIMARY_DEPLOYMENT_ACCOUNT.region,
'provider': eachDeploymentAccount.provider || config.PRIMARY_DEPLOYMENT_ACCOUNT.provider,
'primary': eachDeploymentAccount.primary
}
deploymentAccounts.push(deploymentAccount);
<<<<<<<
var getServiceData = (service_creation_data, authToken, configData, deploymentTargets) => {
return new Promise((resolve, reject) => {
var inputs = {
"TOKEN": authToken,
"SERVICE_API_URL": configData.SERVICE_API_URL,
"SERVICE_API_RESOURCE": configData.SERVICE_API_RESOURCE,
"SERVICE_NAME": service_creation_data.service_name.toLowerCase(),
"DOMAIN": service_creation_data.domain.toLowerCase(),
"DESCRIPTION": service_creation_data.description,
"TYPE": service_creation_data.service_type,
"RUNTIME": service_creation_data.runtime,
"REGION": service_creation_data.region,
"USERNAME": user_id,
"IS_PUBLIC_ENDPOINT": service_creation_data.is_public_endpoint || false,
"STATUS": "creation_started",
"PLATFORM": service_creation_data.platform
};
var serviceMetadataObj = {};
if (service_creation_data.tags) {
inputs.TAGS = service_creation_data.tags;
}
=======
var getServiceData = (service_creation_data, authToken, configData, deploymentTargets, deploymentAccounts) => {
return new Promise((resolve, reject) => {
var inputs = {
"TOKEN": authToken,
"SERVICE_API_URL": configData.SERVICE_API_URL,
"SERVICE_API_RESOURCE": configData.SERVICE_API_RESOURCE,
"SERVICE_NAME": service_creation_data.service_name.toLowerCase(),
"DOMAIN": service_creation_data.domain.toLowerCase(),
"DESCRIPTION": service_creation_data.description,
"TYPE": service_creation_data.service_type,
"RUNTIME": service_creation_data.runtime,
"REGION": service_creation_data.region,
"USERNAME": user_id,
"IS_PUBLIC_ENDPOINT": service_creation_data.is_public_endpoint || false,
"STATUS": "creation_started"
};
var serviceMetadataObj = {};
if (service_creation_data.tags) {
inputs.TAGS = service_creation_data.tags;
}
>>>>>>>
var getServiceData = (service_creation_data, authToken, configData, deploymentTargets, deploymentAccounts) => {
return new Promise((resolve, reject) => {
var inputs = {
"TOKEN": authToken,
"SERVICE_API_URL": configData.SERVICE_API_URL,
"SERVICE_API_RESOURCE": configData.SERVICE_API_RESOURCE,
"SERVICE_NAME": service_creation_data.service_name.toLowerCase(),
"DOMAIN": service_creation_data.domain.toLowerCase(),
"DESCRIPTION": service_creation_data.description,
"TYPE": service_creation_data.service_type,
"RUNTIME": service_creation_data.runtime,
"REGION": service_creation_data.region,
"USERNAME": user_id,
"IS_PUBLIC_ENDPOINT": service_creation_data.is_public_endpoint || false,
"STATUS": "creation_started",
"PLATFORM": service_creation_data.platform
};
var serviceMetadataObj = {};
if (service_creation_data.tags) {
inputs.TAGS = service_creation_data.tags;
} |
<<<<<<<
const request = require('request');
const monitorManagementClient = require('azure-arm-monitor');
const msRestAzure = require('ms-rest-azure');
const moment = require("moment-timezone");
const momentDurationFormatSetup = require("moment-duration-format");
=======
const global_config = require("./config/global-config.json");
const metricConfig = require("./components/metrics.json");
>>>>>>>
const request = require('request');
const monitorManagementClient = require('azure-arm-monitor');
const msRestAzure = require('ms-rest-azure');
const momentDurationFormatSetup = require("moment-duration-format");
const global_config = require("./config/global-config.json");
const metricConfig = require("./components/metrics.json");
<<<<<<<
.then(res => exportable.getMetricsDetails(res, config, eventBody))
=======
.then(res => exportable.getMetricsDetails(res, eventBody, config))
>>>>>>>
.then(res => exportable.getMetricsDetails(res, eventBody, config))
<<<<<<<
assetsArray.filter(assetItem => assetItem.provider == 'aws').forEach((assetItem) => {
=======
logger.debug("Validating assets");
assetsArray.forEach((assetItem) => {
>>>>>>>
logger.debug("Validating assets");
assetsArray.filter(assetItem => assetItem.provider == 'aws').forEach((assetItem) => {
<<<<<<<
function getMetricsDetails(newAssetArray, config, eventBody) {
=======
function getMetricsDetails(newAssetArray, eventBody, config) {
>>>>>>>
function getMetricsDetails(newAssetArray, eventBody, config) {
<<<<<<<
newAssetArray.filter(assetParam => assetParam.provider == 'aws').forEach(assetParam => {
exportable.cloudWatchDetails(assetParam)
=======
newAssetArray.forEach(assetParam => {
if (assetParam.nameSpace === 'aws') {
exportable.cloudWatchDetails(assetParam)
.then(res => {
metricsStatsArray.push(res);
if (metricsStatsArray.length === newAssetArray.length) {
resolve(metricsStatsArray);
}
})
.catch(error => reject(error));
}
else if (assetParam.nameSpace === 'gcp') {
exportable.apigeeMetricDetails(assetParam, eventBody, config)
>>>>>>>
newAssetArray.forEach(assetParam => {
if (assetParam.nameSpace === 'aws') {
exportable.cloudWatchDetails(assetParam)
.then(res => {
metricsStatsArray.push(res);
if (metricsStatsArray.length === newAssetArray.length) {
resolve(metricsStatsArray);
}
})
.catch(error => reject(error));
}
else if (assetParam.nameSpace === 'gcp') {
exportable.apigeeMetricDetails(assetParam, eventBody, config)
.then(res => {
metricsStatsArray.push(res);
if (metricsStatsArray.length === newAssetArray.length) {
resolve(metricsStatsArray);
}
})
.catch(error => reject(error));
}
});
// call azure api if 'azure' is found as a provider
newAssetArray.filter(assetParam => assetParam.provider == 'azure').forEach(assetParam => {
exportable.azureMetricDefinitions(config, assetParam)
.then( definitions => exportable.azureMetricDetails(definitions, config, assetParam, eventBody))
<<<<<<<
cloudWatchDetails,
azureMetricDefinitions,
azureMetricDetails
=======
cloudWatchDetails,
apigeeMetricDetails
>>>>>>>
cloudWatchDetails,
azureMetricDefinitions,
azureMetricDetails,
apigeeMetricDetails |
<<<<<<<
reject(message);
}
=======
request({
url: config.JOB_BUILD_URL,
method: 'POST',
headers: {
"Authorization": base_auth_token
},
qs: input
}, function (err, response, body) {
if (err) {
logger.error(`Error while starting service onboarding: ${err}`);
err.jenkins_api_failure = true;
reject(err);
} else {
if (response.statusCode <= 299) { // handle all 2xx response codes as success
resolve(`Successfully created your service.`);
} else {
logger.error(`Failed while request to service onboarding job ${JSON.stringify(response)}`);
var message = {
'message': `Failed to kick off service onboarding job.`,
'jenkins_api_failure': true
};
reject(message);
}
}
});
} catch (e) {
logger.error(`Error during startServiceOnboarding: ${e.message}`);
reject(e);
>>>>>>>
reject(message);
}
<<<<<<<
return new Promise((resolve, reject) => {
var svcPayload = {
uri: configData.SERVICE_API_URL + configData.TOKEN_URL,
method: 'post',
json: {
"username": configData.SERVICE_USER,
"password": configData.TOKEN_CREDS
},
rejectUnauthorized: false
};
request(svcPayload, (error, response, body) => {
if (response.statusCode === 200 && body && body.data) {
var authToken = body.data.token;
return resolve(authToken);
} else {
return reject({
"error": "Could not get authentication token for updating service catalog.",
"message": response.body.message
=======
return new Promise((resolve, reject) => {
var svcPayload = {
uri: configData.SERVICE_API_URL + configData.TOKEN_URL,
method: 'post',
json: {
"username": configData.SERVICE_USER,
"password": configData.TOKEN_CREDS
},
rejectUnauthorized: false
};
request(svcPayload, (error, response, body) => {
if (response.statusCode === 200 && body && body.data) {
authToken = body.data.token;
return resolve(authToken);
} else {
return reject({
"error": `Could not get authentication token for updating service catalog.`,
"message": response.body.message
});
}
>>>>>>>
return new Promise((resolve, reject) => {
var svcPayload = {
uri: configData.SERVICE_API_URL + configData.TOKEN_URL,
method: 'post',
json: {
"username": configData.SERVICE_USER,
"password": configData.TOKEN_CREDS
},
rejectUnauthorized: false
};
request(svcPayload, (error, response, body) => {
if (response.statusCode === 200 && body && body.data) {
authToken = body.data.token;
return resolve(authToken);
} else {
return reject({
"error": `Could not get authentication token for updating service catalog.`,
"message": response.body.message
<<<<<<<
return new Promise((resolve, reject) => {
crud.create(service_data, (err, results) => {
if (err) {
reject({
"message": err.error
=======
return new Promise((resolve, reject) => {
crud.create(service_data, (err, results) => {
if (err) {
reject({
"message": err.error
});
} else {
logger.info(`created a new service in service catalog.`);
serviceId = results.data.service_id;
resolve(results.data.service_id);
}
>>>>>>>
return new Promise((resolve, reject) => {
crud.create(service_data, (err, results) => {
if (err) {
reject({
"message": err.error
<<<<<<<
var getServiceData = (service_creation_data, authToken, configData) => {
return new Promise((resolve, reject) => {
var inputs = {
"TOKEN": authToken,
"SERVICE_API_URL": configData.SERVICE_API_URL,
"SERVICE_API_RESOURCE": configData.SERVICE_API_RESOURCE,
"SERVICE_NAME": service_creation_data.service_name.toLowerCase(),
"DOMAIN": service_creation_data.domain.toLowerCase(),
"DESCRIPTION": service_creation_data.description,
"TYPE": service_creation_data.service_type,
"RUNTIME": service_creation_data.runtime,
"USERNAME": user_id,
"IS_PUBLIC_ENDPOINT": service_creation_data.is_public_endpoint || false,
"STATUS": "creation_started"
};
var serviceMetadataObj = {};
if (service_creation_data.tags) {
inputs.TAGS = service_creation_data.tags;
}
=======
var getServiceData = (service_creation_data, authToken, configData, deploymentTargets) => {
return new Promise((resolve, reject) => {
var inputs = {
"TOKEN": authToken,
"SERVICE_API_URL": configData.SERVICE_API_URL,
"SERVICE_API_RESOURCE": configData.SERVICE_API_RESOURCE,
"SERVICE_NAME": service_creation_data.service_name.toLowerCase(),
"DOMAIN": service_creation_data.domain.toLowerCase(),
"DESCRIPTION": service_creation_data.description,
"TYPE": service_creation_data.service_type,
"RUNTIME": service_creation_data.runtime,
"REGION": service_creation_data.region,
"USERNAME": user_id,
"IS_PUBLIC_ENDPOINT": service_creation_data.is_public_endpoint || false,
"STATUS": "creation_started"
};
var serviceMetadataObj = {};
if (service_creation_data.tags) {
inputs.TAGS = service_creation_data.tags;
}
>>>>>>>
var getServiceData = (service_creation_data, authToken, configData, deploymentTargets) => {
return new Promise((resolve, reject) => {
var inputs = {
"TOKEN": authToken,
"SERVICE_API_URL": configData.SERVICE_API_URL,
"SERVICE_API_RESOURCE": configData.SERVICE_API_RESOURCE,
"SERVICE_NAME": service_creation_data.service_name.toLowerCase(),
"DOMAIN": service_creation_data.domain.toLowerCase(),
"DESCRIPTION": service_creation_data.description,
"TYPE": service_creation_data.service_type,
"RUNTIME": service_creation_data.runtime,
"REGION": service_creation_data.region,
"USERNAME": user_id,
"IS_PUBLIC_ENDPOINT": service_creation_data.is_public_endpoint || false,
"STATUS": "creation_started"
};
var serviceMetadataObj = {};
if (service_creation_data.tags) {
inputs.TAGS = service_creation_data.tags;
}
<<<<<<<
// Set deployment_accounts to the propertiesObject variable
let primaryAccountCount = 0;
let deployment_accounts = [];
if (service_creation_data.deployment_accounts) {
for (let eachDeploymentAccount of service_creation_data.deployment_accounts) {
if (eachDeploymentAccount.primary) {
primaryAccountCount++
let deploymentAccount = {
'accountId': eachDeploymentAccount.accountId || config.PRIMARY_DEPLOYMENT_ACCOUNT.accountId,
'region': eachDeploymentAccount.region || config.PRIMARY_DEPLOYMENT_ACCOUNT.region,
'provider': eachDeploymentAccount.provider || config.PRIMARY_DEPLOYMENT_ACCOUNT.provider,
'primary': eachDeploymentAccount.primary
}
deployment_accounts.push(deploymentAccount);
} else {
if (eachDeploymentAccount.accountId && eachDeploymentAccount.region && eachDeploymentAccount.provider) {
deployment_accounts.push(eachDeploymentAccount);
} else {
logger.error('accountId, region and provider are required for a non-primary deployment account');
return cb(JSON.stringify(errorHandler.throwInputValidationError('accountId, region and provider are required for a non-primary deployment account')));
}
=======
//Adding providerRuntime key in service catalog
if (service_creation_data.service_type === "api" || service_creation_data.service_type === "function") {
serviceMetadataObj.providerRuntime = service_creation_data.runtime;
}
// Pass the flag to enable authentication on API
if (service_creation_data.service_type === "api") {
inputs.DEPLOYMENT_TARGETS = deploymentTargets;
serviceMetadataObj.enable_api_security = service_creation_data.enable_api_security || false;
if (service_creation_data.authorizer_arn) {
// Validate ARN format - arn:aws:lambda:region:account-id:function:function-name
if (!validateARN(service_creation_data.authorizer_arn)) {
return cb(JSON.stringify(errorHandler.throwInputValidationError(`authorizer arn is invalid, expected format=arn:aws:lambda:region:account-id:function:function-name`)));
} else {
serviceMetadataObj.authorizer_arn = service_creation_data.authorizer_arn;
}
}
>>>>>>>
// Set deployment_accounts to the propertiesObject variable
let primaryAccountCount = 0;
let deployment_accounts = [];
if (service_creation_data.deployment_accounts) {
for (let eachDeploymentAccount of service_creation_data.deployment_accounts) {
if (eachDeploymentAccount.primary) {
primaryAccountCount++
let deploymentAccount = {
'accountId': eachDeploymentAccount.accountId || config.PRIMARY_DEPLOYMENT_ACCOUNT.accountId,
'region': eachDeploymentAccount.region || config.PRIMARY_DEPLOYMENT_ACCOUNT.region,
'provider': eachDeploymentAccount.provider || config.PRIMARY_DEPLOYMENT_ACCOUNT.provider,
'primary': eachDeploymentAccount.primary
}
deployment_accounts.push(deploymentAccount);
} else {
if (eachDeploymentAccount.accountId && eachDeploymentAccount.region && eachDeploymentAccount.provider) {
deployment_accounts.push(eachDeploymentAccount);
} else {
logger.error('accountId, region and provider are required for a non-primary deployment account');
return cb(JSON.stringify(errorHandler.throwInputValidationError('accountId, region and provider are required for a non-primary deployment account')));
}
<<<<<<<
//Adding providerRuntime key in service catalog
if (service_creation_data.service_type === "api" || service_creation_data.service_type === "function") {
serviceMetadataObj.providerRuntime = service_creation_data.runtime;
}
=======
>>>>>>>
//Adding providerRuntime key in service catalog
if (service_creation_data.service_type === "api" || service_creation_data.service_type === "function") {
serviceMetadataObj.providerRuntime = service_creation_data.runtime;
} |
<<<<<<<
async createFunctionApp( appName, storageAccountKey, tags = {}, storageAccountName = this.storageAccountName, resourceGroupName = this.resourceGroupName, location = 'westus', connectionString = '', runtime = 'node') {
let envelope = {
tags: tags,
location: location,
kind: "functionApp",
properties: {},
siteConfig: {
appSettings: [
{
"name": "FUNCTIONS_WORKER_RUNTIME",
"value": runtime
},
{
"name": "FUNCTIONS_EXTENSION_VERSION",
"value": "~2"
},
{
"name": "WEBSITE_NODE_DEFAULT_VERSION",
"value": "8.11.1"
},
{
"name": "AzureWebJobsStorage",
"value": `DefaultEndpointsProtocol=https;AccountName=${storageAccountName};AccountKey=${storageAccountKey}`
},
{
"name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING",
"value": `DefaultEndpointsProtocol=https;AccountName=${storageAccountName};AccountKey=${storageAccountKey}`
},
{
"name": "WEBSITE_CONTENTSHARE",
"value": storageAccountName
},
{
"name": "CONNECTION_STRING",
"value": connectionString
}
]
}
}
return await this.createWebApp(appName, envelope, resourceGroupName = this.resourceGroupName );
=======
async createFunctionApp( appName, storageAccountKey, tags = {}, storageAccountName = this.storageAccountName, resourceGroupName = this.resourceGroupName, location = 'westus', connectionString = '') {
let envelope = {
tags: tags,
location: location,
kind: "functionApp",
properties: {},
siteConfig: {
appSettings: [
{
"name": "FUNCTIONS_WORKER_RUNTIME",
"value": "node"
},
{
"name": "FUNCTIONS_EXTENSION_VERSION",
"value": "~2"
},
{
"name": "WEBSITE_NODE_DEFAULT_VERSION",
"value": "8.11.1"
},
{
"name": "AzureWebJobsStorage",
"value": `DefaultEndpointsProtocol=https;AccountName=${storageAccountName};AccountKey=${storageAccountKey}`
},
{
"name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING",
"value": `DefaultEndpointsProtocol=https;AccountName=${storageAccountName};AccountKey=${storageAccountKey}`
},
{
"name": "WEBSITE_CONTENTSHARE",
"value": storageAccountName
},
{
"name": "CONNECTION_STRING",
"value": connectionString
}
]
}
>>>>>>>
async createFunctionApp( appName, storageAccountKey, tags = {}, storageAccountName = this.storageAccountName, resourceGroupName = this.resourceGroupName, location = 'westus', connectionString = '') {
let envelope = {
tags: tags,
location: location,
kind: "functionApp",
properties: {},
siteConfig: {
appSettings: [
{
"name": "FUNCTIONS_WORKER_RUNTIME",
"value": "node"
},
async createFunctionApp( appName, storageAccountKey, tags = {}, storageAccountName = this.storageAccountName, resourceGroupName = this.resourceGroupName, location = 'westus', connectionString = '', runtime = 'node') {
let envelope = {
tags: tags,
location: location,
kind: "functionApp",
properties: {},
siteConfig: {
appSettings: [
{
"name": "FUNCTIONS_WORKER_RUNTIME",
"value": runtime
},
{
"name": "FUNCTIONS_EXTENSION_VERSION",
"value": "~2"
},
{
"name": "WEBSITE_NODE_DEFAULT_VERSION",
"value": "8.11.1"
},
{
"name": "AzureWebJobsStorage",
"value": `DefaultEndpointsProtocol=https;AccountName=${storageAccountName};AccountKey=${storageAccountKey}`
},
{
"name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING",
"value": `DefaultEndpointsProtocol=https;AccountName=${storageAccountName};AccountKey=${storageAccountKey}`
},
{
"name": "WEBSITE_CONTENTSHARE",
"value": storageAccountName
},
{
"name": "CONNECTION_STRING",
"value": connectionString
}
]
} |
<<<<<<<
if (inputs.DEPLOYMENT_DESCRIPTOR) { jsonBody.deployment_descriptor = inputs.DEPLOYMENT_DESCRIPTOR }
=======
if (inputs.DEPLOYMENT_TARGETS) { jsonBody.deployment_targets = inputs.DEPLOYMENT_TARGETS }
>>>>>>>
if (inputs.DEPLOYMENT_DESCRIPTOR) { jsonBody.deployment_descriptor = inputs.DEPLOYMENT_DESCRIPTOR }
if (inputs.DEPLOYMENT_TARGETS) { jsonBody.deployment_targets = inputs.DEPLOYMENT_TARGETS } |
<<<<<<<
);
ps.open();
}.bind(this));
}.bind(this),
mouseover:function(){
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuIcon").setStyles({
"background-image":"url(/x_component_TeamWork/$Project/default/icon/icon_caidan_click.png)"
});
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuText").setStyles({
"color":"#4A90E2"
});
}.bind(this),
mouseout:function(){
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuIcon").setStyles({
"background-image":"url(/x_component_TeamWork/$Project/default/icon/icon_caidan.png)"
});
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuText").setStyles({
"color":"#666666"
});
}.bind(this)
});
this.topBarSettingMenuIcon = new Element("div.topBarSettingMenuIcon",{styles:this.css.topBarSettingMenuIcon}).inject(this.topBarSettingMenuContainer);
this.topBarSettingMenuText = new Element("div.topBarSettingMenuText",{styles:this.css.topBarSettingMenuText,text:this.lp.setting}).inject(this.topBarSettingMenuContainer);
}
=======
},{
container : this.container,
lp : this.app.lp.projectSetting,
css:_self.css
}
);
ps.open();
}.bind(this));
}.bind(this),
mouseover:function(){
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuIcon").setStyles({
"background-image":"url(../x_component_TeamWork/$Project/default/icon/icon_caidan_click.png)"
});
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuText").setStyles({
"color":"#4A90E2"
});
}.bind(this),
mouseout:function(){
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuIcon").setStyles({
"background-image":"url(../x_component_TeamWork/$Project/default/icon/icon_caidan.png)"
});
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuText").setStyles({
"color":"#666666"
});
}.bind(this)
});
this.topBarSettingMenuIcon = new Element("div.topBarSettingMenuIcon",{styles:this.css.topBarSettingMenuIcon}).inject(this.topBarSettingMenuContainer);
this.topBarSettingMenuText = new Element("div.topBarSettingMenuText",{styles:this.css.topBarSettingMenuText,text:this.lp.setting}).inject(this.topBarSettingMenuContainer);
>>>>>>>
);
ps.open();
}.bind(this));
}.bind(this),
mouseover:function(){
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuIcon").setStyles({
"background-image":"url(../x_component_TeamWork/$Project/default/icon/icon_caidan_click.png)"
});
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuText").setStyles({
"color":"#4A90E2"
});
}.bind(this),
mouseout:function(){
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuIcon").setStyles({
"background-image":"url(../x_component_TeamWork/$Project/default/icon/icon_caidan.png)"
});
this.topBarSettingMenuContainer.getElements(".topBarSettingMenuText").setStyles({
"color":"#666666"
});
}.bind(this)
});
this.topBarSettingMenuIcon = new Element("div.topBarSettingMenuIcon",{styles:this.css.topBarSettingMenuIcon}).inject(this.topBarSettingMenuContainer);
this.topBarSettingMenuText = new Element("div.topBarSettingMenuText",{styles:this.css.topBarSettingMenuText,text:this.lp.setting}).inject(this.topBarSettingMenuContainer);
} |
<<<<<<<
var options = {
accessToken: 'abc123',
countries: "CA,US",
types: "poi,place",
bbox: [-1, -1, 1, 1],
language: 'en,fr',
limit: 2
}
var eventsManager = new MapboxEventsManager(options)
assert.equals(eventsManager.endpoint, 'https://api.mapbox.com/events/v2', 'the correct event endpoint is set');
assert.equals(eventsManager.access_token, options.accessToken, 'sets the right access tokens for the request');
assert.deepEqual(eventsManager.countries, ['CA', 'US'], 'correctly parses the country parameter into an array');
assert.deepEqual(eventsManager.language, ['en', 'fr'], 'correctly parses the language parameter into an array');
assert.deepEqual(eventsManager.bbox, [-1, -1, 1, 1], 'correctly parses the bounding box parameter');
assert.equals(eventsManager.limit, 2, 'correctly parses the language parameter');
assert.equals(eventsManager.limit, 2, 'correctly parses the language parameter');
assert.ok(eventsManager.start, 'defines a start event');
assert.equals(typeof eventsManager.start, 'function', 'start event is a function');
assert.ok(eventsManager.select, 'defines a select event');
assert.equals(typeof eventsManager.select, 'function', 'select event is a function');
assert.equals(typeof eventsManager.keyevent, 'function', 'key event is a function');
assert.equals(typeof eventsManager.version, 'string', 'it has a version string');
assert.equals(eventsManager.flushInterval, 1000, 'the correct default flush interval is set');
assert.equals(eventsManager.maxQueueSize, 100, 'the correct default queue size is set');
assert.ok(eventsManager.userAgent.startsWith('mapbox-gl-geocoder.0.2.0'), 'has a user agent string of the correct format');
assert.ok(eventsManager.origin, 'has an origin');
assert.end();
=======
var options = {
accessToken: 'abc123',
countries: "CA,US",
types: "poi,place",
bbox: [-1, -1, 1, 1],
language: 'en,fr',
limit: 2
}
var eventsManager = new MapboxEventsManager(options)
assert.equals(eventsManager.endpoint, '/events/v2', 'the correct event endpoint is set');
assert.equals(eventsManager.access_token, options.accessToken, 'sets the right access tokens for the request');
assert.deepEqual(eventsManager.countries, ['CA', 'US'], 'correctly parses the country parameter into an array');
assert.deepEqual(eventsManager.language, ['en', 'fr'], 'correctly parses the language parameter into an array');
assert.deepEqual(eventsManager.bbox, [-1, -1, 1, 1], 'correctly parses the bounding box parameter');
assert.equals(eventsManager.limit, 2, 'correctly parses the language parameter');
assert.equals(eventsManager.limit, 2, 'correctly parses the language parameter');
assert.ok(eventsManager.start, 'defines a start event');
assert.equals(typeof eventsManager.start, 'function', 'start event is a function');
assert.ok(eventsManager.select, 'defines a select event');
assert.equals(typeof eventsManager.select, 'function', 'select event is a function');
assert.equals(typeof eventsManager.version, 'string', 'it has a version string');
assert.ok(eventsManager.userAgent.startsWith('mapbox-gl-geocoder.0.0.1'), 'has a user agent string of the correct format');
assert.ok(eventsManager.origin, 'has an origin');
assert.end();
>>>>>>>
var options = {
accessToken: 'abc123',
countries: "CA,US",
types: "poi,place",
bbox: [-1, -1, 1, 1],
language: 'en,fr',
limit: 2
}
var eventsManager = new MapboxEventsManager(options)
assert.equals(eventsManager.origin, 'https://api.mapbox.com', 'the correct event origin is set');
assert.equals(eventsManager.endpoint, 'events/v2', 'the correct event endpoint is set');
assert.equals(eventsManager.access_token, options.accessToken, 'sets the right access tokens for the request');
assert.deepEqual(eventsManager.countries, ['CA', 'US'], 'correctly parses the country parameter into an array');
assert.deepEqual(eventsManager.language, ['en', 'fr'], 'correctly parses the language parameter into an array');
assert.deepEqual(eventsManager.bbox, [-1, -1, 1, 1], 'correctly parses the bounding box parameter');
assert.equals(eventsManager.limit, 2, 'correctly parses the language parameter');
assert.equals(eventsManager.limit, 2, 'correctly parses the language parameter');
assert.ok(eventsManager.start, 'defines a start event');
assert.equals(typeof eventsManager.start, 'function', 'start event is a function');
assert.ok(eventsManager.select, 'defines a select event');
assert.equals(typeof eventsManager.select, 'function', 'select event is a function');
assert.equals(typeof eventsManager.keyevent, 'function', 'key event is a function');
assert.equals(typeof eventsManager.version, 'string', 'it has a version string');
assert.equals(eventsManager.flushInterval, 1000, 'the correct default flush interval is set');
assert.equals(eventsManager.maxQueueSize, 100, 'the correct default queue size is set');
assert.ok(eventsManager.userAgent.startsWith('mapbox-gl-geocoder.0.2.0'), 'has a user agent string of the correct format');
assert.ok(eventsManager.origin, 'has an origin');
assert.deepEqual(eventsManager.options, options, 'sets the options for later use');
assert.end();
<<<<<<<
var eventsManager = new MapboxEventsManager({
accessToken: 'abc123'
})
var sendMethod = sinon.spy(eventsManager, "send");
var pushMethod = sinon.spy(eventsManager, "push");
var requestMethod = sinon.stub(eventsManager, "request").yields(null, {statusCode: 204});
var geocoder = new MapboxGeocoder({accessToken: 'abc123'});
eventsManager.start(geocoder);
assert.ok(pushMethod.called, 'the event was pushed to the queue');
assert.notOk(sendMethod.called, 'the send method is not called on each event');
var calledWithArgs = pushMethod.args[0][0];
assert.equals(calledWithArgs.event, 'search.start', 'pushes the correct event type');
sendMethod.restore();
pushMethod.restore();
requestMethod.restore();
assert.end();
=======
var eventsManager = new MapboxEventsManager({
accessToken: 'abc123'
})
var sendMethod = sinon.spy(eventsManager, "send")
var requestMethod = sinon.stub(eventsManager, "request").yields(null, {statusCode: 204});
var geocoder = new MapboxGeocoder({accessToken: 'abc123'});
eventsManager.start(geocoder, function () {
assert.ok(requestMethod.called, 'the http request was initated');
assert.ok(requestMethod.calledOnce, 'the send method was called exactly once');
var calledWithArgs = sendMethod.args[0][0];
assert.ok(calledWithArgs.event, 'search.start', 'sends the correct event type')
assert.end();
})
>>>>>>>
var eventsManager = new MapboxEventsManager({
accessToken: 'abc123'
})
var sendMethod = sinon.spy(eventsManager, "send");
var pushMethod = sinon.spy(eventsManager, "push");
var requestMethod = sinon.stub(eventsManager, "request").yields(null, {statusCode: 204});
var geocoder = new MapboxGeocoder({accessToken: 'abc123'});
geocoder.inputString = "My String";
eventsManager.start(geocoder);
assert.ok(pushMethod.called, 'the event was pushed to the queue');
assert.notOk(sendMethod.called, 'the send method is not called on each event');
var calledWithArgs = pushMethod.args[0][0];
assert.equals(calledWithArgs.event, 'search.start', 'pushes the correct event type');
sendMethod.restore();
pushMethod.restore();
requestMethod.restore();
assert.end();
<<<<<<<
var eventsManager = new MapboxEventsManager({
accessToken: 'abc123'
})
var sendMethod = sinon.spy(eventsManager, "send")
var requestMethod = sinon.stub(eventsManager, "request").yields(null, {statusCode: 204});
var pushMethod = sinon.spy(eventsManager, "push");
var geocoder = new MapboxGeocoder({accessToken: 'abc123'});
var selectedFeature = {
id: 'layer.1234',
place_name: 'Peets Coffee, 123 Main Street, San Francisco, CA, 94122, United States',
}
eventsManager.select(selectedFeature, geocoder);
assert.ok(pushMethod.called, 'the event was pushed to the queue');
assert.notOk(sendMethod.called, 'the send method is not called on each event');
var calledWithArgs = pushMethod.args[0][0];
assert.equals(calledWithArgs.event, 'search.select', 'pushes the correct event type');
assert.equals(calledWithArgs.resultId, 'layer.1234', 'pushes the correct result id');
assert.equals(calledWithArgs.resultPlaceName, 'Peets Coffee, 123 Main Street, San Francisco, CA, 94122, United States', 'pushes the correct place name');
sendMethod.restore();
pushMethod.restore();
requestMethod.restore();
assert.end();
=======
var eventsManager = new MapboxEventsManager({
accessToken: 'abc123'
})
var sendMethod = sinon.spy(eventsManager, "send")
var requestMethod = sinon.stub(eventsManager, "request").yields(null, {statusCode: 204});
var geocoder = new MapboxGeocoder({accessToken: 'abc123'});
eventsManager.start(geocoder, function () {
assert.ok(requestMethod.called, 'the http request was initated');
assert.ok(requestMethod.calledOnce, 'the send method was called exactly once');
var calledWithArgs = sendMethod.args[0][0];
assert.ok(calledWithArgs.event, 'search.select', 'sends the correct event type')
assert.end();
})
>>>>>>>
var eventsManager = new MapboxEventsManager({
accessToken: 'abc123'
})
var sendMethod = sinon.spy(eventsManager, "send")
var requestMethod = sinon.stub(eventsManager, "request").yields(null, {statusCode: 204});
var pushMethod = sinon.spy(eventsManager, "push");
var geocoder = new MapboxGeocoder({accessToken: 'abc123'});
geocoder.inputString = "My String";
var selectedFeature = {
id: 'layer.1234',
place_name: 'Peets Coffee, 123 Main Street, San Francisco, CA, 94122, United States',
}
eventsManager.select(selectedFeature, geocoder);
assert.ok(pushMethod.called, 'the event was pushed to the queue');
assert.notOk(sendMethod.called, 'the send method is not called on each event');
var calledWithArgs = pushMethod.args[0][0];
assert.equals(calledWithArgs.event, 'search.select', 'pushes the correct event type');
assert.equals(calledWithArgs.resultId, 'layer.1234', 'pushes the correct result id');
assert.equals(calledWithArgs.resultPlaceName, 'Peets Coffee, 123 Main Street, San Francisco, CA, 94122, United States', 'pushes the correct place name');
sendMethod.restore();
pushMethod.restore();
requestMethod.restore();
assert.end();
<<<<<<<
var eventsManager = new MapboxEventsManager({
accessToken: 'abc123'
})
assert.equals(typeof eventsManager.generateSessionID(), 'string', 'generates a string id');
assert.notEqual(eventsManager.generateSessionID(), eventsManager.generateSessionID(), 'session id is generated randomly');
assert.equals(eventsManager.generateSessionID().length, 64, 'generates an ID of the correct length');
assert.end();
=======
var eventsManager = new MapboxEventsManager({
accessToken: 'abc123'
})
assert.ok(typeof eventsManager.generateSessionID(), 'string', 'generates a string id');
assert.notEqual(eventsManager.generateSessionID(), eventsManager.generateSessionID(), 'session id is generated randomly');
assert.equals(eventsManager.generateSessionID().length, 21, 'generates an ID of the correct length');
assert.end();
>>>>>>>
var eventsManager = new MapboxEventsManager({
accessToken: 'abc123'
})
assert.equals(typeof eventsManager.generateSessionID(), 'string', 'generates a string id');
assert.notEqual(eventsManager.generateSessionID(), eventsManager.generateSessionID(), 'session id is generated randomly');
assert.equals(eventsManager.generateSessionID().length, 21, 'generates an ID of the correct length');
assert.end(); |
<<<<<<<
$rootScope.newCreated = true; // trigger a cache re-load
$location.path('/cluster/'+ $scope.cluster + '/schema/' + newSubject + '/version/latest');
=======
$rootScope.listChanges = true; // trigger a cache re-load
$location.path('/schema/' + newSubject + '/version/latest');
>>>>>>>
$rootScope.listChanges = true; // trigger a cache re-load
$location.path('/cluster/'+ $scope.cluster + '/schema/' + newSubject + '/version/latest'); |
<<<<<<<
var fileManager = {};
var supported = typeof FileReader !== 'undefined';
fileManager.notSupportedAdvisoryMsg = '';
=======
var supported = typeof FileReader !== 'undefined';
>>>>>>>
var fileManager = {};
var supported = typeof FileReader !== 'undefined';
<<<<<<<
fileManager.init = function() {
if ( fileManager.isSupported() ) {
return Promise.resolve( true );
=======
function init() {
if ( supported ) {
return Promise.resolve();
>>>>>>>
fileManager.init = function() {
if ( fileManager.isSupported() ) {
return Promise.resolve( true );
<<<<<<<
module.exports = fileManager;
=======
module.exports = {
isSupported: isSupported,
isWaitingForPermissions: isWaitingForPermissions,
init: init,
getFileUrl: getFileUrl,
getCurrentFiles: getCurrentFiles
};
>>>>>>>
module.exports = fileManager; |
<<<<<<<
case 'tel':
case 'file':
$node.removeAttr( 'data-previous-file-name data-loaded-file-name' );
/* falls through */
=======
>>>>>>>
case 'tel': |
<<<<<<<
if(message.uuid === User.user.id || (User.user.backer && User.user.backer.admin)){
var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false;
Groups.Group.deleteChatMessage({gid:group._id, messageId:message.id, previousMsg:previousMsg}, undefined, function(data){
if(data.chat) group.chat = data.chat;
var i = _.findIndex(group.chat, {id: message.id});
if(i !== -1) group.chat.splice(i, 1);
=======
if(message.uuid === User.user.id || (User.user.backer && User.user.contributor.admin)){
Groups.Group.deleteChatMessage({gid: group._id, messageId: message.id}, undefined, function(){
var i = _.indexOf(group.chat, message);
if(i !== -1) group.chat.splice(i, 1);
>>>>>>>
if(message.uuid === User.user.id || (User.user.backer && User.user.contributor.admin)){
var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false;
Groups.Group.deleteChatMessage({gid:group._id, messageId:message.id, previousMsg:previousMsg}, undefined, function(data){
if(data.chat) group.chat = data.chat;
var i = _.findIndex(group.chat, {id: message.id});
if(i !== -1) group.chat.splice(i, 1); |
<<<<<<<
if (targetType === 'user') {
party.sendChat(`\`${common.i18n.t('chatCastSpellUser', {username: user.profile.name, spell: spell.text(), target: partyMembers.profile.name}, 'en')}\``, null, null, {
type: 'spell_cast_user',
user: user.profile.name,
class: klass,
spell: spellId,
target: partyMembers.profile.name,
});
} else {
party.sendChat(`\`${common.i18n.t('chatCastSpellParty', {username: user.profile.name, spell: spell.text()}, 'en')}\``, null, null, {
type: 'spell_cast_party',
user: user.profile.name,
class: klass,
spell: spellId,
});
}
await party.save();
=======
let message = `\`${user.profile.name} casts ${spell.text()}${targetType === 'user' ? ` on ${partyMembers.profile.name}` : ' for the party'}.\``;
const newChatMessage = party.sendChat(message);
await newChatMessage.save();
>>>>>>>
if (targetType === 'user') {
const newChatMessage = party.sendChat(`\`${common.i18n.t('chatCastSpellUser', {username: user.profile.name, spell: spell.text(), target: partyMembers.profile.name}, 'en')}\``, null, null, {
type: 'spell_cast_user',
user: user.profile.name,
class: klass,
spell: spellId,
target: partyMembers.profile.name,
});
await newChatMessage.save();
} else {
const newChatMessage = party.sendChat(`\`${common.i18n.t('chatCastSpellParty', {username: user.profile.name, spell: spell.text()}, 'en')}\``, null, null, {
type: 'spell_cast_party',
user: user.profile.name,
class: klass,
spell: spellId,
});
await newChatMessage.save();
} |
<<<<<<<
mentionParty: {$type: Boolean, default: true},
mentionJoinedGuild: {$type: Boolean, default: true},
mentionUnjoinedGuild: {$type: Boolean, default: true},
=======
partyActivity: {$type: Boolean, default: true},
>>>>>>>
mentionParty: {$type: Boolean, default: true},
mentionJoinedGuild: {$type: Boolean, default: true},
mentionUnjoinedGuild: {$type: Boolean, default: true},
partyActivity: {$type: Boolean, default: true}, |
<<<<<<<
/**
* @api {post} /groups/:groupId/chat/:chatId/seen Seen a group chat message
* @apiVersion 3.0.0
* @apiName SeenChat
* @apiGroup Chat
*
* @apiParam {groupId} groupId The group _id
*
* @apiSuccess {None}
*/
api.seenChat = {
method: 'POST',
url: '/groups/:groupId/chat/seen',
middlewares: [authWithHeaders(), cron],
async handler (req, res) {
let user = res.locals.user;
let groupId = req.params.groupId;
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
let group = await Group.getGroup({user, groupId});
if (!group) throw new NotFound(res.t('groupNotFound'));
// Skip the auth step, we want this to be fast. If !found with uuid/token, then it just doesn't save
let update = { $unset: {} };
update.$unset[`newMessages.${groupId}`] = '';
await User.update({_id: user._id}, update).exec();
res.respond(200);
},
};
/**
* @api {delete} /groups/:groupId/chat/:chatId Delete chat message from a group
* @apiVersion 3.0.0
* @apiName DeleteChat
* @apiGroup Chat
*
* @apiParam {string} groupId The group _id (or 'party')
* @apiParam {string} chatId The chat _id
*
* @apiSuccess {Array} The update chat array
* @apiSuccess {Object} An empty object when the previous message was deleted
*/
api.deleteChat = {
method: 'DELETE',
url: '/groups/:groupId/chat/:chatId',
middlewares: [authWithHeaders(), cron],
async handler (req, res) {
let user = res.locals.user;
let groupId = req.params.groupId;
let chatId = req.params.chatId;
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
req.checkParams('chatId', res.t('chatIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
let group = await Group.getGroup({user, groupId, fields: 'chat'});
if (!group) throw new NotFound(res.t('groupNotFound'));
let message = _.find(group.chat, {id: chatId});
if (!message) throw new NotFound(res.t('messageGroupChatNotFound'));
if (user._id !== message.uuid && !user.contributor.admin) {
throw new NotAuthorized(res.t('onlyCreatorOrAdminCanDeleteChat'));
}
let lastClientMsg = req.query.previousMsg;
let chatUpdated = lastClientMsg && group.chat && group.chat[0] && group.chat[0].id !== lastClientMsg ? true : false;
await Group.update(
{_id: group._id},
{$pull: {chat: {id: chatId} } }
);
if (chatUpdated) {
group = group.toJSON();
_.remove(group.chat, function removeChat (chat) {
return chat.id === chatId;
});
res.json(group.chat);
} else {
res.send(200, {});
}
},
};
=======
/**
* @api {post} /groups/:groupId/chat/:chatId/clear-flags Clear a group chat message's flags
* @apiVersion 3.0.0
* @apiName ClearFlags
* @apiGroup Chat
*
* @apiParam {groupId} groupId The group _id
* @apiParam {chatId} chatId The chat message _id
*
* @apiSuccess {Object} An empty object
*/
api.clearChatFlags = {
method: 'Post',
url: '/groups/:groupId/chat/:chatId/clearflags',
middlewares: [authWithHeaders(), cron],
async handler (req, res) {
let user = res.locals.user;
let groupId = req.params.groupId;
let chatId = req.params.chatId;
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
req.checkParams('chatId', res.t('chatIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
if (!user.contributor.admin) {
throw new NotAuthorized(res.t('messageGroupChatAdminClearFlagCount'));
}
let group = await Group.getGroup({user, groupId});
if (!group) throw new NotFound(res.t('groupNotFound'));
let message = _.find(group.chat, {id: chatId});
if (!message) throw new NotFound(res.t('messageGroupChatNotFound'));
message.flagCount = 0;
await Group.update(
{_id: group._id, 'chat.id': message.id},
{$set: {'chat.$.flagCount': message.flagCount}}
);
res.respond(200, {});
},
};
>>>>>>>
/**
* @api {post} /groups/:groupId/chat/:chatId/clear-flags Clear a group chat message's flags
* @apiVersion 3.0.0
* @apiName ClearFlags
* @apiGroup Chat
*
* @apiParam {groupId} groupId The group _id
* @apiParam {chatId} chatId The chat message _id
*
* @apiSuccess {Object} An empty object
*/
api.clearChatFlags = {
method: 'Post',
url: '/groups/:groupId/chat/:chatId/clearflags',
middlewares: [authWithHeaders(), cron],
async handler (req, res) {
let user = res.locals.user;
let groupId = req.params.groupId;
let chatId = req.params.chatId;
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
req.checkParams('chatId', res.t('chatIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
if (!user.contributor.admin) {
throw new NotAuthorized(res.t('messageGroupChatAdminClearFlagCount'));
}
let group = await Group.getGroup({user, groupId});
if (!group) throw new NotFound(res.t('groupNotFound'));
let message = _.find(group.chat, {id: chatId});
if (!message) throw new NotFound(res.t('messageGroupChatNotFound'));
message.flagCount = 0;
await Group.update(
{_id: group._id, 'chat.id': message.id},
{$set: {'chat.$.flagCount': message.flagCount}}
);
res.respond(200, {});
},
};
/**
* @api {post} /groups/:groupId/chat/:chatId/seen Seen a group chat message
* @apiVersion 3.0.0
* @apiName SeenChat
* @apiGroup Chat
*
* @apiParam {groupId} groupId The group _id
*
* @apiSuccess {None}
*/
api.seenChat = {
method: 'POST',
url: '/groups/:groupId/chat/seen',
middlewares: [authWithHeaders(), cron],
async handler (req, res) {
let user = res.locals.user;
let groupId = req.params.groupId;
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
let group = await Group.getGroup({user, groupId});
if (!group) throw new NotFound(res.t('groupNotFound'));
// Skip the auth step, we want this to be fast. If !found with uuid/token, then it just doesn't save
let update = { $unset: {} };
update.$unset[`newMessages.${groupId}`] = '';
await User.update({_id: user._id}, update).exec();
res.respond(200);
},
};
/**
* @api {delete} /groups/:groupId/chat/:chatId Delete chat message from a group
* @apiVersion 3.0.0
* @apiName DeleteChat
* @apiGroup Chat
*
* @apiParam {string} groupId The group _id (or 'party')
* @apiParam {string} chatId The chat _id
*
* @apiSuccess {Array} The update chat array
* @apiSuccess {Object} An empty object when the previous message was deleted
*/
api.deleteChat = {
method: 'DELETE',
url: '/groups/:groupId/chat/:chatId',
middlewares: [authWithHeaders(), cron],
async handler (req, res) {
let user = res.locals.user;
let groupId = req.params.groupId;
let chatId = req.params.chatId;
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
req.checkParams('chatId', res.t('chatIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
let group = await Group.getGroup({user, groupId, fields: 'chat'});
if (!group) throw new NotFound(res.t('groupNotFound'));
let message = _.find(group.chat, {id: chatId});
if (!message) throw new NotFound(res.t('messageGroupChatNotFound'));
if (user._id !== message.uuid && !user.contributor.admin) {
throw new NotAuthorized(res.t('onlyCreatorOrAdminCanDeleteChat'));
}
let lastClientMsg = req.query.previousMsg;
let chatUpdated = lastClientMsg && group.chat && group.chat[0] && group.chat[0].id !== lastClientMsg ? true : false;
await Group.update(
{_id: group._id},
{$pull: {chat: {id: chatId} } }
);
if (chatUpdated) {
group = group.toJSON();
_.remove(group.chat, function removeChat (chat) {
return chat.id === chatId;
});
res.json(group.chat);
} else {
res.send(200, {});
}
},
}; |
<<<<<<<
if (confirm("Purchase for 5 Gems?") !== true) return;
if (User.user.balance < cost) return $rootScope.openModal('buyGems');
=======
if (confirm(window.env.t('purchaseFor5')) !== true) return;
if (User.user.balance < cost) return $rootScope.modals.buyGems = true;
>>>>>>>
if (confirm(window.env.t('purchaseFor5')) !== true) return;
if (User.user.balance < cost) return $rootScope.openModal('buyGems');
<<<<<<<
if (confirm("Purchase for 2 Gems?") !== true) return;
if (User.user.balance < cost) return $rootScope.openModal('buyGems');
=======
if (confirm(window.env.t('purchaseFor2')) !== true) return;
if (User.user.balance < cost) return $rootScope.modals.buyGems = true;
>>>>>>>
if (confirm(window.env.t('purchaseFor2')) !== true) return;
if (User.user.balance < cost) return $rootScope.openModal('buyGems'); |
<<<<<<<
if (v.key.match(/[armor|head|shield]_warrior_0/)) {
m[v.key].default = true;
}
=======
if (v.key.match(/[armor|head|shield]_warrior_0/) || v.gearSet === 'glasses')
m[v.key]['default'] = true;
>>>>>>>
if (v.key.match(/[armor|head|shield]_warrior_0/) || v.gearSet === 'glasses') {
m[v.key].default = true;
} |
<<<<<<<
schema.statics.toJSONCleanChat = function groupToJSONCleanChat (group, user) {
group = _translateSystemMessages(group, user);
=======
schema.statics.toJSONCleanChat = async function groupToJSONCleanChat (group, user) {
// @TODO: Adding this here for support the old chat, but we should depreciate accessing chat like this
// Also only return chat if requested, eventually we don't want to return chat here
if (group && group.chat) {
await getGroupChat(group);
}
>>>>>>>
schema.statics.toJSONCleanChat = async function groupToJSONCleanChat (group, user) {
// @TODO: Adding this here for support the old chat, but we should depreciate accessing chat like this
// Also only return chat if requested, eventually we don't want to return chat here
if (group && group.chat) {
await getGroupChat(group);
}
group = _translateSystemMessages(group, user);
<<<<<<<
// info: An object containing relevant information about a system message,
// so it can be translated to any language.
export function chatDefaults (msg, user, info = {}) {
let message = {
id: shared.uuid(),
=======
export function chatDefaults (msg, user) {
const id = shared.uuid();
const message = {
id,
_id: id,
>>>>>>>
// info: An object containing relevant information about a system message,
// so it can be translated to any language.
export function chatDefaults (msg, user, info = {}) {
const id = shared.uuid();
const message = {
id,
_id: id,
<<<<<<<
schema.methods.sendChat = function sendChat (message, user, metaData, info = {}) {
let newMessage = chatDefaults(message, user, info);
=======
schema.methods.sendChat = function sendChat (message, user, metaData) {
let newMessage = chatDefaults(message, user);
let newChatMessage = new Chat();
newChatMessage = Object.assign(newChatMessage, newMessage);
newChatMessage.groupId = this._id;
>>>>>>>
schema.methods.sendChat = function sendChat (message, user, metaData, info = {}) {
let newMessage = chatDefaults(message, user, info);
let newChatMessage = new Chat();
newChatMessage = Object.assign(newChatMessage, newMessage);
newChatMessage.groupId = this._id;
<<<<<<<
this.sendChat(`\`${shared.i18n.t('chatQuestStarted', {questName: quest.text('en')}, 'en')}\``, null, {
=======
const newMessage = this.sendChat(`\`Your quest, ${quest.text('en')}, has started.\``, null, {
>>>>>>>
const newMessage = this.sendChat(`\`${shared.i18n.t('chatQuestStarted', {questName: quest.text('en')}, 'en')}\``, null, {
<<<<<<<
if (CRON_SAFE_MODE || CRON_SEMI_SAFE_MODE) {
group.sendChat(`\`${shared.i18n.t('chatBossDontAttack', {bossName: quest.boss.name('en')}, 'en')}\``, null, null, {
type: 'boss_dont_attack',
user: user.profile.name,
quest: group.quest.key,
userDamage: progress.up.toFixed(1),
});
} else {
group.sendChat(`\`${shared.i18n.t('chatBossDamage', {username: user.profile.name, bossName: quest.boss.name('en'), userDamage: progress.up.toFixed(1), bossDamage: Math.abs(down).toFixed(1)}, user.preferences.language)}\``, null, null, {
type: 'boss_damage',
user: user.profile.name,
quest: group.quest.key,
userDamage: progress.up.toFixed(1),
bossDamage: Math.abs(down).toFixed(1),
});
}
=======
// TODO Create a party preferred language option so emits like this can be localized. Suggestion: Always display the English version too. Or, if English is not displayed to the players, at least include it in a new field in the chat object that's visible in the database - essential for admins when troubleshooting quests!
let playerAttack = `${user.profile.name} attacks ${quest.boss.name('en')} for ${progress.up.toFixed(1)} damage.`;
let bossAttack = CRON_SAFE_MODE || CRON_SEMI_SAFE_MODE ? `${quest.boss.name('en')} does not attack, because it respects the fact that there are some bugs\` \`post-maintenance and it doesn't want to hurt anyone unfairly. It will continue its rampage soon!` : `${quest.boss.name('en')} attacks party for ${Math.abs(down).toFixed(1)} damage.`;
// TODO Consider putting the safe mode boss attack message in an ENV var
const groupMessage = group.sendChat(`\`${playerAttack}\` \`${bossAttack}\``);
promises.push(groupMessage.save());
>>>>>>>
if (CRON_SAFE_MODE || CRON_SEMI_SAFE_MODE) {
const groupMessage = group.sendChat(`\`${shared.i18n.t('chatBossDontAttack', {bossName: quest.boss.name('en')}, 'en')}\``, null, null, {
type: 'boss_dont_attack',
user: user.profile.name,
quest: group.quest.key,
userDamage: progress.up.toFixed(1),
});
promises.push(groupMessage.save());
} else {
const groupMessage = group.sendChat(`\`${shared.i18n.t('chatBossDamage', {username: user.profile.name, bossName: quest.boss.name('en'), userDamage: progress.up.toFixed(1), bossDamage: Math.abs(down).toFixed(1)}, user.preferences.language)}\``, null, null, {
type: 'boss_damage',
user: user.profile.name,
quest: group.quest.key,
userDamage: progress.up.toFixed(1),
bossDamage: Math.abs(down).toFixed(1),
});
promises.push(groupMessage.save());
}
<<<<<<<
group.sendChat(quest.boss.rage.effect('en'), null, null, {
type: 'boss_rage',
quest: quest.key,
});
=======
const rageMessage = group.sendChat(quest.boss.rage.effect('en'));
promises.push(rageMessage.save());
>>>>>>>
const rageMessage = group.sendChat(quest.boss.rage.effect('en'), null, null, {
type: 'boss_rage',
quest: quest.key,
});
promises.push(rageMessage.save());
<<<<<<<
group.sendChat(`\`${shared.i18n.t('chatBossDefeated', {bossName: quest.boss.name('en')}, 'en')}\``, null, null, {
type: 'boss_defeated',
quest: quest.key,
});
=======
const questFinishChat = group.sendChat(`\`You defeated ${quest.boss.name('en')}! Questing party members receive the rewards of victory.\``);
promises.push(questFinishChat.save());
>>>>>>>
const questFinishChat = group.sendChat(`\`${shared.i18n.t('chatBossDefeated', {bossName: quest.boss.name('en')}, 'en')}\``, null, null, {
type: 'boss_defeated',
quest: quest.key,
});
promises.push(questFinishChat.save());
<<<<<<<
group.sendChat(`\`${shared.i18n.t('chatFindItems', {username: user.profile.name, items: foundText}, 'en')}\``, null, null, {
type: 'user_found_items',
user: user.profile.name,
quest: quest.key,
items: itemsFound,
});
=======
const foundChat = group.sendChat(`\`${user.profile.name} found ${foundText}.\``);
>>>>>>>
const foundChat = group.sendChat(`\`${shared.i18n.t('chatFindItems', {username: user.profile.name, items: foundText}, 'en')}\``, null, null, {
type: 'user_found_items',
user: user.profile.name,
quest: quest.key,
items: itemsFound,
});
<<<<<<<
group.sendChat(`\`${shared.i18n.t('chatItemQuestFinish', 'en')}\``, null, null, {
type: 'all_items_found',
});
=======
const allItemsFoundChat = group.sendChat('`All items found! Party has received their rewards.`');
>>>>>>>
const allItemsFoundChat = group.sendChat(`\`${shared.i18n.t('chatItemQuestFinish', 'en')}\``, null, null, {
type: 'all_items_found',
});
<<<<<<<
tavern.sendChat(quest.completionChat('en'), null, null, {
type: 'tavern_quest_completed',
quest: quest.key,
});
=======
const completeChat = tavern.sendChat(quest.completionChat('en'));
chatPromises.push(completeChat.save());
>>>>>>>
const completeChat = tavern.sendChat(quest.completionChat('en'), null, null, {
type: 'tavern_quest_completed',
quest: quest.key,
});
chatPromises.push(completeChat.save());
<<<<<<<
tavern.sendChat(`\`${shared.i18n.t('tavernBossTired', {rageName: quest.boss.rage.title('en'), bossName: quest.boss.name('en')}, 'en')}\``, null, null, {
type: 'tavern_boss_rage_tired',
quest: quest.key,
});
=======
const tiredChat = tavern.sendChat(`\`${quest.boss.name('en')} tries to unleash ${quest.boss.rage.title('en')} but is too tired.\``);
chatPromises.push(tiredChat.save());
>>>>>>>
const tiredChat = tavern.sendChat(`\`${shared.i18n.t('tavernBossTired', {rageName: quest.boss.rage.title('en'), bossName: quest.boss.name('en')}, 'en')}\``, null, null, {
type: 'tavern_boss_rage_tired',
quest: quest.key,
});
chatPromises.push(tiredChat.save());
<<<<<<<
tavern.sendChat(quest.boss.rage[scene]('en'), null, null, {
type: 'tavern_boss_rage',
quest: quest.key,
scene,
});
=======
const rageChat = tavern.sendChat(quest.boss.rage[scene]('en'));
chatPromises.push(rageChat.save());
>>>>>>>
const rageChat = tavern.sendChat(quest.boss.rage[scene]('en'), null, null, {
type: 'tavern_boss_rage',
quest: quest.key,
scene,
});
chatPromises.push(rageChat.save());
<<<<<<<
tavern.sendChat(quest.boss.desperation.text('en'), null, null, {
type: 'tavern_boss_desperation',
quest: quest.key,
});
=======
const progressChat = tavern.sendChat(quest.boss.desperation.text('en'));
chatPromises.push(progressChat.save());
>>>>>>>
const progressChat = tavern.sendChat(quest.boss.desperation.text('en'), null, null, {
type: 'tavern_boss_desperation',
quest: quest.key,
});
chatPromises.push(progressChat.save()); |
<<<<<<<
import { sendNotification as sendPushNotification } from '../pushNotifications'; // eslint-disable-line import/no-cycle
=======
import { sendNotification as sendPushNotification } from '../pushNotifications';
import { calculateSubscriptionTerminationDate } from './util';
>>>>>>>
import { sendNotification as sendPushNotification } from '../pushNotifications'; // eslint-disable-line import/no-cycle
import { calculateSubscriptionTerminationDate } from './util'; |
<<<<<<<
habits: {type: Boolean, default: false},
dailies: {type: Boolean, default: false},
todos: {type: Boolean, default: false},
rewards: {type: Boolean, default: false},
party: {type: Boolean, default: false},
pets: {type: Boolean, default: false},
gems: {type: Boolean, default: false},
skills: {type: Boolean, default: false},
classes: {type: Boolean, default: false},
tavern: {type: Boolean, default: false},
equipment: {type: Boolean, default: false},
items: {type: Boolean, default: false},
inviteParty: {type: Boolean, default: false},
=======
habits: {type: Boolean, 'default': false},
dailies: {type: Boolean, 'default': false},
todos: {type: Boolean, 'default': false},
rewards: {type: Boolean, 'default': false},
party: {type: Boolean, 'default': false},
pets: {type: Boolean, 'default': false},
gems: {type: Boolean, 'default': false},
skills: {type: Boolean, 'default': false},
classes: {type: Boolean, 'default': false},
tavern: {type: Boolean, 'default': false},
equipment: {type: Boolean, 'default': false},
items: {type: Boolean, 'default': false},
>>>>>>>
habits: {type: Boolean, default: false},
dailies: {type: Boolean, default: false},
todos: {type: Boolean, default: false},
rewards: {type: Boolean, default: false},
party: {type: Boolean, default: false},
pets: {type: Boolean, default: false},
gems: {type: Boolean, default: false},
skills: {type: Boolean, default: false},
classes: {type: Boolean, default: false},
tavern: {type: Boolean, default: false},
equipment: {type: Boolean, default: false},
items: {type: Boolean, default: false}, |
<<<<<<<
import purchase from './ops/purchase';
import purchaseHourglass from './ops/hourglassPurchase';
import readCard from './ops/readCard';
=======
import openMysteryItem from './ops/openMysteryItem';
>>>>>>>
import purchase from './ops/purchase';
import purchaseHourglass from './ops/hourglassPurchase';
import readCard from './ops/readCard';
import openMysteryItem from './ops/openMysteryItem';
<<<<<<<
purchase,
purchaseHourglass,
readCard,
=======
openMysteryItem,
>>>>>>>
purchase,
purchaseHourglass,
readCard,
openMysteryItem, |
<<<<<<<
import addWebhook from './ops/addWebhook';
import updateWebhook from './ops/updateWebhook';
import deleteWebhook from './ops/deleteWebhook';
=======
import releasePets from './ops/releasePets';
import releaseBoth from './ops/releaseBoth';
import releaseMounts from './ops/releaseMounts';
>>>>>>>
import addWebhook from './ops/addWebhook';
import updateWebhook from './ops/updateWebhook';
import deleteWebhook from './ops/deleteWebhook';
import releasePets from './ops/releasePets';
import releaseBoth from './ops/releaseBoth';
import releaseMounts from './ops/releaseMounts';
<<<<<<<
addWebhook,
updateWebhook,
deleteWebhook,
=======
releasePets,
releaseBoth,
releaseMounts,
>>>>>>>
addWebhook,
updateWebhook,
deleteWebhook,
releasePets,
releaseBoth,
releaseMounts, |
<<<<<<<
if (msg.username == undefined) {
return false;
}
return msg.user.indexOf($scope.query.text) == 0; // query should be prefix of item.user
=======
return msg.user.indexOf($scope.query.text) == 0; // query should be prefix of msg.user
>>>>>>>
return msg.user.indexOf($scope.query.text) == 0; |
<<<<<<<
randomDrop = function(user, modifiers) {
var acceptableDrops, chanceMultiplier, delta, drop, priority, rarity, reachedDropLimit, streak, _base, _base1, _base2, _name, _name1, _ref1;
delta = modifiers.delta, priority = modifiers.priority, streak = modifiers.streak;
=======
randomDrop = function(user, delta, priority, streak, options) {
var acceptableDrops, chanceMultiplier, drop, paths, rarity, reachedDropLimit, _base, _base1, _base2, _base3, _name, _name1, _name2, _ref1;
>>>>>>>
randomDrop = function(user, modifiers) {
var acceptableDrops, chanceMultiplier, delta, drop, priority, rarity, reachedDropLimit, streak, _base, _base1, _base2, _base3, _name, _name1, _name2, _ref1;
delta = modifiers.delta, priority = modifiers.priority, streak = modifiers.streak; |
<<<<<<<
const newMessage = this.sendChat(`\`${shared.i18n.t('chatQuestStarted', {questName: quest.text('en')}, 'en')}\``, null, {
participatingMembers: this.getParticipatingQuestMembers().join(', '),
}, {
type: 'quest_start',
quest: quest.key,
});
=======
>>>>>>> |
<<<<<<<
common.setDebuffPotionItems(user);
// Add 10 MP, or 10% of max MP if that'd be more. Perform this after Perfect Day for maximum benefit
=======
// Add 10 MP, or 10% of max MP if that'd be more.
// Perform this after Perfect Day for maximum benefit
>>>>>>>
common.setDebuffPotionItems(user);
// Add 10 MP, or 10% of max MP if that'd be more.
// Perform this after Perfect Day for maximum benefit |
<<<<<<<
thankyou: Number,
=======
thankyou: Number,
costumeContests: Number
},
auth: {
blocked: Boolean,
facebook: Schema.Types.Mixed,
local: {
email: String,
hashed_password: String,
salt: String,
username: String,
lowerCaseUsername: String // Store a lowercase version of username to check for duplicates
},
timestamps: {
created: {type: Date,'default': Date.now},
loggedin: {type: Date,'default': Date.now}
}
>>>>>>>
thankyou: Number,
costumeContests: Number |
<<<<<<<
/**
* @api {post} /user/purchase/:type/:key Purchase Gem Items.
* @apiVersion 3.0.0
* @apiName UserPurchase
* @apiGroup User
*
* @apiParam {string} type Type of item to purchase
* @apiParam {string} key Item's key
*
* @apiSuccess {Object} data `items balance`
*/
api.purchase = {
method: 'POST',
middlewares: [authWithHeaders(), cron],
url: '/user/purchase/:type/:key',
async handler (req, res) {
let user = res.locals.user;
let purchaseResponse = common.ops.purchase(user, req, res.analytics);
await user.save();
res.respond(200, purchaseResponse);
},
};
=======
/**
* @api {post} /user/purchase-hourglass/:type/:key Purchase Hourglass.
* @apiVersion 3.0.0
* @apiName UserPurchaseHourglass
* @apiGroup User
*
* @apiParam {string} type {pets|mounts}. The type of item to purchase
* @apiParam {string} key Ex: {MantisShrimp-Base}. The key for the mount/pet
*
* @apiSuccess {Object} data `items purchased.plan.consecutive`
*/
api.userPurchaseHourglass = {
method: 'POST',
middlewares: [authWithHeaders(), cron],
url: '/user/purchase-hourglass/:type/:key',
async handler (req, res) {
let user = res.locals.user;
let purchaseHourglassResponse = common.ops.purchaseHourglass(user, req, res.analytics);
await user.save();
res.respond(200, purchaseHourglassResponse);
},
};
>>>>>>>
/**
* @api {post} /user/purchase/:type/:key Purchase Gem Items.
* @apiVersion 3.0.0
* @apiName UserPurchase
* @apiGroup User
*
* @apiParam {string} type Type of item to purchase
* @apiParam {string} key Item's key
*
* @apiSuccess {Object} data `items balance`
*/
api.purchase = {
method: 'POST',
middlewares: [authWithHeaders(), cron],
url: '/user/purchase/:type/:key',
async handler (req, res) {
let user = res.locals.user;
let purchaseResponse = common.ops.purchase(user, req, res.analytics);
await user.save();
res.respond(200, purchaseResponse);
},
};
/**
* @api {post} /user/purchase-hourglass/:type/:key Purchase Hourglass.
* @apiVersion 3.0.0
* @apiName UserPurchaseHourglass
* @apiGroup User
*
* @apiParam {string} type {pets|mounts}. The type of item to purchase
* @apiParam {string} key Ex: {MantisShrimp-Base}. The key for the mount/pet
*
* @apiSuccess {Object} data `items purchased.plan.consecutive`
*/
api.userPurchaseHourglass = {
method: 'POST',
middlewares: [authWithHeaders(), cron],
url: '/user/purchase-hourglass/:type/:key',
async handler (req, res) {
let user = res.locals.user;
let purchaseHourglassResponse = common.ops.purchaseHourglass(user, req, res.analytics);
await user.save();
res.respond(200, purchaseHourglassResponse);
},
}; |
<<<<<<<
import hatch from './ops/hatch';
import feed from './ops/feed';
import equip from './ops/equip';
=======
import changeClass from './ops/changeClass';
import disableClasses from './ops/disableClasses';
>>>>>>>
import hatch from './ops/hatch';
import feed from './ops/feed';
import equip from './ops/equip';
import changeClass from './ops/changeClass';
import disableClasses from './ops/disableClasses';
<<<<<<<
hatch,
feed,
equip,
=======
changeClass,
disableClasses,
>>>>>>>
hatch,
feed,
equip,
changeClass,
disableClasses, |
<<<<<<<
var compact = require('es5-ext/array/#/compact')
, aFrom = require('es5-ext/array/from')
, last = require('es5-ext/array/#/last')
, customError = require('es5-ext/error/custom')
, map = require('es5-ext/object/map')
, callable = require('es5-ext/object/valid-callable')
, validValue = require('es5-ext/object/valid-value')
, isString = require('es5-ext/string/is-string')
, sLast = require('es5-ext/string/#/last')
, indent = require('es5-ext/string/#/indent')
, endsWith = require('es5-ext/string/#/ends-with')
, d = require('d')
=======
var commonLeft = require('es5-ext/lib/Array/prototype/common-left')
, copy = require('es5-ext/lib/Array/prototype/copy')
, last = require('es5-ext/lib/Array/prototype/last')
, CustomError = require('es5-ext/lib/Error/custom')
, d = require('es5-ext/lib/Object/descriptor')
, map = require('es5-ext/lib/Object/map')
, callable = require('es5-ext/lib/Object/valid-callable')
, validValue = require('es5-ext/lib/Object/valid-value')
, isString = require('es5-ext/lib/String/is-string')
, trimCommon = require('es5-ext/lib/String/prototype/trim-common-left')
, sLast = require('es5-ext/lib/String/prototype/last')
, indent = require('es5-ext/lib/String/prototype/indent')
, endsWith = require('es5-ext/lib/String/prototype/ends-with')
>>>>>>>
var aFrom = require('es5-ext/array/from')
, last = require('es5-ext/array/#/last')
, customError = require('es5-ext/error/custom')
, map = require('es5-ext/object/map')
, callable = require('es5-ext/object/valid-callable')
, validValue = require('es5-ext/object/valid-value')
, isString = require('es5-ext/string/is-string')
, sLast = require('es5-ext/string/#/last')
, indent = require('es5-ext/string/#/indent')
, endsWith = require('es5-ext/string/#/ends-with')
, d = require('d')
<<<<<<<
return deps.map(function (node) {
var path = node.value;
if (!path) {
if (!ignoreErrors) {
throw customError("Not parsable require call: `" + node.raw +
"` at " + filename + ":" + node.line + "\n You may" +
" ignore such errors with ignoreErrors option ('ignore-errors'" +
" when running from command line)", 'DYNAMIC_REQUIRE');
}
console.warn("Not parsable require call (ignored): `" + node.raw +
"` at " + filename + ":" + node.line);
=======
return deps.filter(function (node) {
if (node.value != null) return true;
if (!ignoreErrors) {
throw new CustomError("Not parsable require call: `" + node.raw +
"` at " + filename + ":" + node.line + "\n You may" +
" ignore such errors with ignoreErrors option ('ignore-errors'" +
" when running from command line)", 'DYNAMIC_REQUIRE');
>>>>>>>
return deps.filter(function (node) {
if (node.value != null) return true;
if (!ignoreErrors) {
throw customError("Not parsable require call: `" + node.raw +
"` at " + filename + ":" + node.line + "\n You may" +
" ignore such errors with ignoreErrors option ('ignore-errors'" +
" when running from command line)", 'DYNAMIC_REQUIRE');
<<<<<<<
resolve: function (fromfile, dirname, scope, tree, filename) {
// console.log("R", filename);
tree = aFrom(tree);
if (filename[0] === '.') {
return this.resolveLocal(fromfile, dirname, scope, tree, filename);
=======
resolve: function (fromfile, dirname, scope, tree, dep) {
// console.log("R", dep.value);
tree = copy.call(tree);
if (dep.value[0] === '.') {
return this.resolveLocal(fromfile, dirname, scope, tree, dep);
>>>>>>>
resolve: function (fromfile, dirname, scope, tree, dep) {
// console.log("R", dep.value);
tree = aFrom(tree);
if (dep.value[0] === '.') {
return this.resolveLocal(fromfile, dirname, scope, tree, dep); |
<<<<<<<
var shared = require('../../common/script/index.coffee');
shared.i18n.translations = require('../../website/src/libs/api-v2/i18n.js').translations
=======
var shared = require('../../common/script/index.js');
shared.i18n.translations = require('../../website/src/libs/i18n.js').translations
>>>>>>>
var shared = require('../../common/script/index.js');
shared.i18n.translations = require('../../website/src/libs/api-v2/i18n.js').translations |
<<<<<<<
import purchase from './ops/purchase';
=======
import purchaseHourglass from './ops/hourglassPurchase';
>>>>>>>
import purchase from './ops/purchase';
import purchaseHourglass from './ops/hourglassPurchase';
<<<<<<<
purchase,
=======
purchaseHourglass,
>>>>>>>
purchase,
purchaseHourglass, |
<<<<<<<
text: msg,
info,
=======
text: msg.substring(0, 3000),
>>>>>>>
text: msg.substring(0, 3000),
info, |
<<<<<<<
beforeEach(() => {
return user.post('/tasks/user', {
=======
beforeEach(async () => {
task = await user.post('/tasks', {
>>>>>>>
beforeEach(async () => {
task = await user.post('/tasks/user', {
<<<<<<<
it('cannot delete a task owned by someone else', () => {
return generateUser()
.then((anotherUser) => {
return anotherUser.post('/tasks/user', {
text: 'test habit',
type: 'habit',
});
})
.then((task2) => {
return expect(user.del(`/tasks/${task2._id}`)).to.eventually.be.rejected.and.eql({
code: 404,
error: 'NotFound',
message: t('taskNotFound'),
});
});
=======
it('cannot delete a task owned by someone else', async () => {
let anotherUser = await generateUser();
let anotherUsersTask = await anotherUser.post('/tasks', {
text: 'test habit',
type: 'habit',
});
await expect(user.del(`/tasks/${anotherUsersTask._id}`)).to.eventually.be.rejected.and.eql({
code: 404,
error: 'NotFound',
message: t('taskNotFound'),
});
>>>>>>>
it('cannot delete a task owned by someone else', async () => {
let anotherUser = await generateUser();
let anotherUsersTask = await anotherUser.post('/tasks/user', {
text: 'test habit',
type: 'habit',
});
await expect(user.del(`/tasks/${anotherUsersTask._id}`)).to.eventually.be.rejected.and.eql({
code: 404,
error: 'NotFound',
message: t('taskNotFound'),
}); |
<<<<<<<
ONBOARDING_PANEL_STATE: 'onboarding-panel-state',
=======
GIFTING_BANNER_DISPLAY: 'gifting-banner-display',
>>>>>>>
ONBOARDING_PANEL_STATE: 'onboarding-panel-state',
GIFTING_BANNER_DISPLAY: 'gifting-banner-display', |
<<<<<<<
function editTask(task, user) {
task._editing = true;
task._tags = !user.preferences.tagsCollapsed;
task._advanced = !user.preferences.advancedCollapsed;
task._edit = angular.copy(task);
if($rootScope.charts[task._id]) $rootScope.charts[task.id] = false;
}
function cancelTaskEdit(task) {
task._edit = undefined;
task._editing = false;
};
=======
>>>>>>>
function editTask(task, user) {
task._editing = true;
task._tags = !user.preferences.tagsCollapsed;
task._advanced = !user.preferences.advancedCollapsed;
task._edit = angular.copy(task);
if($rootScope.charts[task._id]) $rootScope.charts[task.id] = false;
}
function cancelTaskEdit(task) {
task._edit = undefined;
task._editing = false;
};
<<<<<<<
editTask: editTask,
cancelTaskEdit: cancelTaskEdit,
=======
>>>>>>>
editTask: editTask,
cancelTaskEdit: cancelTaskEdit, |
<<<<<<<
.controller('ChatCtrl', ['$scope', 'Groups', 'Chat', 'User', '$http', 'ApiUrl', 'Notification', 'Members', '$rootScope', function($scope, Groups, Chat, User, $http, ApiUrl, Notification, Members, $rootScope){
=======
.controller('ChatCtrl', ['$scope', 'Groups', 'User', '$http', 'ApiUrl', 'Notification', 'Members', '$rootScope', 'Analytics',
function($scope, Groups, User, $http, ApiUrl, Notification, Members, $rootScope, Analytics){
>>>>>>>
.controller('ChatCtrl', ['$scope', 'Groups', 'Chat', 'User', '$http', 'ApiUrl', 'Notification', 'Members', '$rootScope', 'Analytics',
function($scope, Groups, Chat, User, $http, ApiUrl, Notification, Members, $rootScope, Analytics){
<<<<<<<
.controller("PartyCtrl", ['$rootScope','$scope', 'Groups', 'Chat', 'User', 'Challenges', '$state', '$compile',
function($rootScope,$scope, Groups, Chat, User, Challenges, $state, $compile) {
=======
.controller("PartyCtrl", ['$rootScope','$scope', 'Groups', 'User', 'Challenges', '$state', '$compile', 'Analytics',
function($rootScope,$scope, Groups, User, Challenges, $state, $compile, Analytics) {
>>>>>>>
.controller("PartyCtrl", ['$rootScope','$scope', 'Groups', 'Chat', 'User', 'Challenges', '$state', '$compile', 'Analytics',
function($rootScope,$scope, Groups, Chat, User, Challenges, $state, $compile, Analytics) { |
<<<<<<<
beforeEach(() => {
return user.post('/tasks/user', {
=======
beforeEach(async () => {
task = await user.post('/tasks', {
>>>>>>>
beforeEach(async () => {
task = await user.post('/tasks/user', {
<<<<<<<
beforeEach(() => {
return user.post('/tasks/user', {
=======
beforeEach(async () => {
habit = await user.post('/tasks', {
>>>>>>>
beforeEach(async () => {
habit = await user.post('/tasks/user', {
<<<<<<<
beforeEach(() => {
return user.post('/tasks/user', {
=======
beforeEach(async () => {
todo = await user.post('/tasks', {
>>>>>>>
beforeEach(async () => {
todo = await user.post('/tasks/user', {
<<<<<<<
beforeEach(() => {
return user.post('/tasks/user', {
=======
beforeEach(async () => {
daily = await user.post('/tasks', {
>>>>>>>
beforeEach(async () => {
daily = await user.post('/tasks/user', {
<<<<<<<
beforeEach(() => {
return user.post('/tasks/user', {
=======
beforeEach(async () => {
reward = await user.post('/tasks', {
>>>>>>>
beforeEach(async () => {
reward = await user.post('/tasks/user', { |
<<<<<<<
this.$get = function() {
return {};
};
}]);
angular.module('foundation.init.state')
.controller('DefaultController', ['$scope', '$stateParams', '$state', function($scope, $stateParams, $state) {
var params = [];
angular.forEach($stateParams, function(value, key) {
params[key] = value;
});
$scope.params = params;
$scope.current = $state.current.name;
if($state.current.views) {
$scope.vars = $state.current.data.vars;
$scope.composed = $state.current.data.vars.children;
} else {
$scope.vars = $state.current.data.vars;
}
}
]);
=======
this.$get = angular.noop;
function buildState(path, state) {
return {
templateUrl: path,
controller: getController(state),
}
}
function getController(state) {
var ctrl = state.controller || 'DefaultController';
if (!/\w\s+as\s+\w/.test(ctrl)) {
ctrl += ' as PageCtrl';
}
return ctrl;
}
}]);
>>>>>>>
this.$get = angular.noop;
function buildState(path, state) {
return {
templateUrl: path,
controller: getController(state),
};
}
function getController(state) {
var ctrl = state.controller || 'DefaultController';
if (!/\w\s+as\s+\w/.test(ctrl)) {
ctrl += ' as PageCtrl';
}
return ctrl;
}
}]);
angular.module('foundation.init.state')
.controller('DefaultController', ['$scope', '$stateParams', '$state', function($scope, $stateParams, $state) {
var params = [];
angular.forEach($stateParams, function(value, key) {
params[key] = value;
});
$scope.params = params;
$scope.current = $state.current.name;
if($state.current.views) {
$scope.vars = $state.current.data.vars;
$scope.composed = $state.current.data.vars.children;
} else {
$scope.vars = $state.current.data.vars;
}
}
]); |
<<<<<<<
.service('FoundationAdapter', FoundationAdapter)
=======
>>>>>>>
.service('FoundationAdapter', FoundationAdapter) |
<<<<<<<
},
"pascal": {
"title": "Pascal",
"owner": "Golmote"
=======
},
"matlab": {
"title": "MATLAB",
"owner": "Golmote"
},
"less": {
"title": "Less",
"require": "css",
"owner": "Golmote"
},
"r": {
"title": "R",
"owner": "Golmote"
>>>>>>>
},
"matlab": {
"title": "MATLAB",
"owner": "Golmote"
},
"less": {
"title": "Less",
"require": "css",
"owner": "Golmote"
},
"r": {
"title": "R",
"owner": "Golmote"
},
"pascal": {
"title": "Pascal",
"owner": "Golmote" |
<<<<<<<
},
"jade": {
"title": "Jade",
"require": "javascript",
"owner": "Golmote"
=======
},
"matlab": {
"title": "MATLAB",
"owner": "Golmote"
},
"less": {
"title": "Less",
"require": "css",
"owner": "Golmote"
},
"r": {
"title": "R",
"owner": "Golmote"
},
"lolcode": {
"title": "LOLCODE",
"owner": "Golmote"
},
"fortran": {
"title": "Fortran",
"owner": "Golmote"
},
"erlang": {
"title": "Erlang",
"owner": "Golmote"
},
"haml": {
"title": "Haml",
"require": "ruby",
"owner": "Golmote"
>>>>>>>
},
"matlab": {
"title": "MATLAB",
"owner": "Golmote"
},
"less": {
"title": "Less",
"require": "css",
"owner": "Golmote"
},
"r": {
"title": "R",
"owner": "Golmote"
},
"lolcode": {
"title": "LOLCODE",
"owner": "Golmote"
},
"fortran": {
"title": "Fortran",
"owner": "Golmote"
},
"erlang": {
"title": "Erlang",
"owner": "Golmote"
},
"haml": {
"title": "Haml",
"require": "ruby",
"owner": "Golmote"
},
"jade": {
"title": "Jade",
"require": "javascript",
"owner": "Golmote" |
<<<<<<<
},
"handlebars": {
"title": "Handlebars",
"owner": "Golmote"
=======
},
"perl": {
"title": "Perl",
"owner": "Golmote"
>>>>>>>
},
"perl": {
"title": "Perl",
"owner": "Golmote"
},
"handlebars": {
"title": "Handlebars",
"owner": "Golmote" |
<<<<<<<
"oz": {
"title": "Oz",
"owner": "Golmote"
},
=======
"parigp": {
"title": "PARI/GP",
"owner": "Golmote"
},
>>>>>>>
"oz": {
"title": "Oz",
"owner": "Golmote"
},
"parigp": {
"title": "PARI/GP",
"owner": "Golmote"
}, |
<<<<<<<
'function': {
pattern: /[a-z0-9_]+\(/ig,
inside: {
punctuation: /\(/
}
},
'number': /\b-?(0x)?\d*\.?[\da-f]+\b/g,
'operator': /[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,
=======
'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,
'operator': /[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,
>>>>>>>
'function': {
pattern: /[a-z0-9_]+\(/ig,
inside: {
punctuation: /\(/
}
},
'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,
'operator': /[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g, |
<<<<<<<
},
"textile": {
"title": "Textile",
"require": "markup",
"owner": "Golmote"
=======
},
"smalltalk": {
"title": "Smalltalk",
"owner": "Golmote"
>>>>>>>
},
"smalltalk": {
"title": "Smalltalk",
"owner": "Golmote"
},
"textile": {
"title": "Textile",
"require": "markup",
"owner": "Golmote" |
<<<<<<<
"renpy": {
"title": "Ren'py",
"owner": "HyuchiaDiego"
},
=======
"reason": {
"title": "Reason",
"require": "clike",
"owner": "Golmote"
},
>>>>>>>
"renpy": {
"title": "Ren'py",
"owner": "HyuchiaDiego"
},
"reason": {
"title": "Reason",
"require": "clike",
"owner": "Golmote"
}, |
<<<<<<<
},
"lolcode": {
"title": "LOLCODE",
"owner": "Golmote"
=======
},
"matlab": {
"title": "MATLAB",
"owner": "Golmote"
},
"less": {
"title": "Less",
"require": "css",
"owner": "Golmote"
},
"r": {
"title": "R",
"owner": "Golmote"
>>>>>>>
},
"matlab": {
"title": "MATLAB",
"owner": "Golmote"
},
"less": {
"title": "Less",
"require": "css",
"owner": "Golmote"
},
"r": {
"title": "R",
"owner": "Golmote"
},
"lolcode": {
"title": "LOLCODE",
"owner": "Golmote" |
<<<<<<<
=======
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! fs */ "fs");
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_3__);
/* harmony import */ var http__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! http */ "http");
/* harmony import */ var http__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(http__WEBPACK_IMPORTED_MODULE_4__);
//creates shell of desktop application in electron
// let mainWindow: Electron.BrowserWindow | null;
>>>>>>> datagen
var mainWindow;
function createWindow() {
mainWindow = new electron__WEBPACK_IMPORTED_MODULE_0__["BrowserWindow"]({
<<<<<<< /mnt/batch/tasks/workitems/adfv2-General_1/job-1/6e8d87ea-b218-4f68-b545-b164dccde8cf/wd/.temp/athenacommon/5b51107c-0f97-44ab-83b8-470d606d3e4a.js
<<<<<<< HEAD
width: 1600,
height: 1400,
=======
width: 1200,
height: 800,
>>>>>>> datagen
=======
width: 1500,
height: 1000,
minHeight: 1000,
minWidth: 1500,
>>>>>>>
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! fs */ "fs");
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_3__);
/* harmony import */ var http__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! http */ "http");
/* harmony import */ var http__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(http__WEBPACK_IMPORTED_MODULE_4__);
//creates shell of desktop application in electron
// let mainWindow: Electron.BrowserWindow | null;
var mainWindow;
function createWindow() {
mainWindow = new electron__WEBPACK_IMPORTED_MODULE_0__["BrowserWindow"]({
width: 1200,
height: 800, |
<<<<<<<
},
custom_hash: function(test) {
var actual = grunt.file.read('tmp/custom_hash');
var expected = grunt.file.read('test/expected/custom_hash');
test.equal(actual, expected, 'Should generate sha512 hashes');
=======
},
include_dirs: function(test) {
var actual = grunt.file.read('tmp/include_dirs');
var expected = grunt.file.read('test/expected/include_dirs');
test.equal(actual, expected, 'Should generate a json file containing hashes of the files AND directories under fixtures/, but not hashes for files inside nested directories');
test.done();
}
>>>>>>>
},
custom_hash: function(test) {
var actual = grunt.file.read('tmp/custom_hash');
var expected = grunt.file.read('test/expected/custom_hash');
test.equal(actual, expected, 'Should generate sha512 hashes');
test.done();
},
include_dirs: function(test) {
var actual = grunt.file.read('tmp/include_dirs');
var expected = grunt.file.read('test/expected/include_dirs');
test.equal(actual, expected, 'Should generate a json file containing hashes of the files AND directories under fixtures/, but not hashes for files inside nested directories'); |
<<<<<<<
* Builds a commmonly used Gulp task for building a components styles..
* @param {string} destFolder Contains the path to the destination folder.
* @param {string} srcTemplate Contains the path to the source template to be applied.
* @param {string} componentName Name of the component.
* @param {string} deps LESS Dependencies to be added to the styles.
* @param {function} cssPlugin The gulp plugin or function used for the specific css preprocessor
* @return {stream} returns a stream.
=======
* A commonly used Gulp task for building a component's styles.
* @param {String} destFolder Contains the path to the destination folder.
* @param {String} srcTemplate Contains the path to the source template to be applied.
* @param {String} componentName Name of the component.
* @param {String} deps LESS Dependencies to be added to the styles.
* @returns {Stream} returns a stream.
>>>>>>>
* Builds a commmonly used Gulp task for building a components styles..
* @param {string} destFolder Contains the path to the destination folder.
* @param {string} srcTemplate Contains the path to the source template to be applied.
* @param {string} componentName Name of the component.
* @param {string} deps LESS Dependencies to be added to the styles.
* @param {function} cssPlugin The gulp plugin or function used for the specific css preprocessor
* @return {stream} returns a stream.
<<<<<<<
.pipe(Plugins.gulpif(Config.debugMode, Plugins.debug({
title: "Source template found"
})))
=======
.pipe(Plugins.plumber(ErrorHandling.onErrorInPipe))
>>>>>>>
.pipe(Plugins.gulpif(Config.debugMode, Plugins.debug({
title: "Building Com ponent Styles"
})))
.pipe(Plugins.plumber(ErrorHandling.onErrorInPipe))
<<<<<<<
.on('error', ErrorHandling.onErrorInPipe)
.pipe(cssPlugin())
.on('error', ErrorHandling.onErrorInPipe)
.pipe(Plugins.header(Banners.getBannerTemplate(), Banners.getBannerData()))
.on('error', ErrorHandling.onErrorInPipe)
=======
.pipe(Plugins.less().on('error', ErrorHandling.LESSCompileErrors))
.pipe(Plugins.header(Banners.getBannerTemplate(), Banners.getBannerData()))
>>>>>>>
.pipe(cssPlugin())
.pipe(Plugins.header(Banners.getBannerTemplate(), Banners.getBannerData())) |
<<<<<<<
this.gulpif = require('gulp-if');
this.changed = require('gulp-changed');
this.sass = require('gulp-sass');
this.jshint = require('gulp-jshint');
this.plumber = require('gulp-plumber');
this.lesshint = require('gulp-lesshint');
this.scsslint = require('gulp-sass-lint');
this.scsslint = require('gulp-sass-lint');
this.fileinclude = require('gulp-file-include');
=======
this.gulpif = require('gulp-if');
this.changed = require('gulp-changed');
this.sass = require('gulp-sass');
this.lessToScss = require('gulp-less-to-scss');
this.jshint = require('gulp-jshint');
this.plumber = require('gulp-plumber');
this.lesshint = require('gulp-lesshint');
this.scsslint = require('gulp-sass-lint');
>>>>>>>
this.gulpif = require('gulp-if');
this.changed = require('gulp-changed');
this.sass = require('gulp-sass');
this.lessToScss = require('gulp-less-to-scss');
this.jshint = require('gulp-jshint');
this.plumber = require('gulp-plumber');
this.lesshint = require('gulp-lesshint');
this.scsslint = require('gulp-sass-lint');
this.scsslint = require('gulp-sass-lint');
this.fileinclude = require('gulp-file-include'); |
<<<<<<<
componentsPath: 'src/components',
templatePath: srcPath + '/templates'
};
this.port = process.env.PORT || 2020;
this.projectURL = "http://localhost";
this.projectDirectory = path.resolve(__dirname, '../../' + this.paths.distSamples);
this.servePaths = [
{
'urlPath': '/css',
'folderPath': '../css'
},
{
'urlPath': '/bundles',
'folderPath': '../bundles'
}
];
this.nugetConfig = {
id: "OfficeUIFabric",
title: "Office UI Fabric",
version: pkg.version,
authors: "Microsoft Corporation",
owners: "Microsoft Corporation",
description: "Fabric is a responsive, mobile-first, front-end framework, designed to make it quick and simple for you to create web experiences using the Office Design Language. It’s easy to get up and running with Fabric—whether you’re creating a new Office experience from scratch or adding new features to an existing one.",
summary: "The front-end framework for building experiences for Office and Office 365.",
language: "en-us",
projectUrl: "https://github.com/OfficeDev/Office-UI-Fabric",
licenseUrl: "https://github.com/OfficeDev/Office-UI-Fabric/blob/master/LICENSE",
copyright: "Copyright (c) Microsoft Corporation",
requireLicenseAcceptance: true,
tags: "Microsoft UI Fabric CSS",
outputDir: this.paths.distPackages
};
this.nugetPaths = [
{ src: this.paths.distCSS, dest: "/content/Content/" },
{ src: this.paths.distSass, dest: "/content/Content/sass/" },
{ src: this.paths.distJS, dest: "/content/Scripts/" }
];
=======
componentsPath : 'src/components',
templatePath : srcPath + '/templates',
srcLibPath: 'lib',
distLibPath: distPath + '/lib'
};
this.port = process.env.PORT || 2020;
this.projectURL = "http://localhost";
this.projectDirectory = path.resolve(__dirname, '../../' + this.paths.distSamples);
this.servePaths = [
{
'urlPath': '/css',
'folderPath': '../css'
},
{
'urlPath': '/js',
'folderPath': '../js'
},
{
'urlPath': '/lib',
'folderPath': '../lib'
}
];
this.typescriptConfig = {
module: 'commonjs',
declaration: true,
target: 'ES5',
noEmitOnError: true
};
this.typescriptProject = Plugins.tsc.createProject(this.typescriptConfig);
this.nugetConfig = {
id: "OfficeUIFabric",
title: "Office UI Fabric",
version: pkg.version,
authors: "Microsoft Corporation",
owners: "Microsoft Corporation",
description: "Fabric is a responsive, mobile-first, front-end framework, designed to make it quick and simple for you to create web experiences using the Office Design Language. It’s easy to get up and running with Fabric—whether you’re creating a new Office experience from scratch or adding new features to an existing one.",
summary: "The front-end framework for building experiences for Office and Office 365.",
language: "en-us",
projectUrl: "https://github.com/OfficeDev/Office-UI-Fabric",
licenseUrl: "https://github.com/OfficeDev/Office-UI-Fabric/blob/master/LICENSE",
copyright: "Copyright (c) Microsoft Corporation",
requireLicenseAcceptance: true,
tags: "Microsoft UI Fabric CSS",
outputDir: this.paths.distPackages
};
this.nugetPaths = [
{src: this.paths.distCSS, dest: "/content/Content/"},
{src: this.paths.distSass, dest: "/content/Content/sass/"},
{src: this.paths.distJS, dest: "/content/Scripts/"}
];
>>>>>>>
componentsPath : 'src/components',
templatePath : srcPath + '/templates',
srcLibPath: 'lib',
distLibPath: distPath + '/lib'
};
this.port = process.env.PORT || 2020;
this.projectURL = "http://localhost";
this.projectDirectory = path.resolve(__dirname, '../../' + this.paths.distSamples);
this.servePaths = [
{
'urlPath': '/css',
'folderPath': '../css'
},
{
'urlPath': '/js',
'folderPath': '../js'
},
{
'urlPath': '/lib',
'folderPath': '../lib'
},
{
'urlPath': '/bundles',
'folderPath': '../bundles'
}
];
this.typescriptConfig = {
module: 'commonjs',
declaration: true,
target: 'ES5',
noEmitOnError: true
};
this.typescriptProject = Plugins.tsc.createProject(this.typescriptConfig);
this.nugetConfig = {
id: "OfficeUIFabric",
title: "Office UI Fabric",
version: pkg.version,
authors: "Microsoft Corporation",
owners: "Microsoft Corporation",
description: "Fabric is a responsive, mobile-first, front-end framework, designed to make it quick and simple for you to create web experiences using the Office Design Language. It’s easy to get up and running with Fabric—whether you’re creating a new Office experience from scratch or adding new features to an existing one.",
summary: "The front-end framework for building experiences for Office and Office 365.",
language: "en-us",
projectUrl: "https://github.com/OfficeDev/Office-UI-Fabric",
licenseUrl: "https://github.com/OfficeDev/Office-UI-Fabric/blob/master/LICENSE",
copyright: "Copyright (c) Microsoft Corporation",
requireLicenseAcceptance: true,
tags: "Microsoft UI Fabric CSS",
outputDir: this.paths.distPackages
};
this.nugetPaths = [
{src: this.paths.distCSS, dest: "/content/Content/"},
{src: this.paths.distSass, dest: "/content/Content/sass/"},
{src: this.paths.distJS, dest: "/content/Scripts/"}
]; |
<<<<<<<
producer.createTopics([topic], false, cb);
=======
producer.createTopics([topic], false, function (err, data) {
if (err) {
throw err;
}
cb(data);
});
};
exports.initialize = function (app) {
>>>>>>>
producer.createTopics([topic], false, cb);
};
exports.initialize = function (app) { |
<<<<<<<
const run = async () => {
=======
function decimalToInteger(value, decimals) {
const parts = [...value.split("."), ""];
return parts[0] + parts[1].padEnd(decimals, "0");
}
function percentageToPPM(value) {
return decimalToInteger(value.replace("%", ""), 4);
}
async function run() {
>>>>>>>
const decimalToInteger = (value, decimals) => {
const parts = [...value.split('.'), ''];
return parts[0] + parts[1].padEnd(decimals, '0');
};
const percentageToPPM = (value) => {
return decimalToInteger(value.replace('%', ''), 4);
};
const run = async () => {
<<<<<<<
const contractRegistry = await web3Func(deploy, 'contractRegistry', 'ContractRegistry', []);
const converterFactory = await web3Func(deploy, 'converterFactory', 'ConverterFactory', []);
const bancorFormula = await web3Func(deploy, 'bancorFormula', 'BancorFormula', []);
const bancorNetwork = await web3Func(deploy, 'bancorNetwork', 'BancorNetwork', [contractRegistry._address]);
const conversionPathFinder = await web3Func(deploy, 'conversionPathFinder', 'ConversionPathFinder', [contractRegistry._address]);
const converterRegistry = await web3Func(deploy, 'converterRegistry', 'ConverterRegistry', [contractRegistry._address]);
const converterRegistryData = await web3Func(deploy, 'converterRegistryData', 'ConverterRegistryData', [contractRegistry._address]);
const liquidTokenConverterFactory = await web3Func(deploy, 'liquidTokenConverterFactory', 'LiquidTokenConverterFactory', []);
const liquidityPoolV1ConverterFactory = await web3Func(deploy, 'liquidityPoolV1ConverterFactory', 'LiquidityPoolV1ConverterFactory', []);
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('ContractRegistry'), contractRegistry._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('ConverterFactory'), converterFactory._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('BancorFormula'), bancorFormula._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('BancorNetwork'), bancorNetwork._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('ConversionPathFinder'), conversionPathFinder._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('BancorConverterRegistry'), converterRegistry._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('BancorConverterRegistryData'), converterRegistryData._address));
await execute(converterFactory.methods.registerTypedConverterFactory(liquidTokenConverterFactory._address));
=======
const contractRegistry = await web3Func(deploy, "contractRegistry" , "ContractRegistry" , []);
const converterFactory = await web3Func(deploy, "converterFactory" , "ConverterFactory" , []);
const bancorFormula = await web3Func(deploy, "bancorFormula" , "BancorFormula" , []);
const bancorNetwork = await web3Func(deploy, "bancorNetwork" , "BancorNetwork" , [contractRegistry._address]);
const conversionPathFinder = await web3Func(deploy, "conversionPathFinder" , "ConversionPathFinder" , [contractRegistry._address]);
const converterUpgrader = await web3Func(deploy, "converterUpgrader" , "ConverterUpgrader" , [contractRegistry._address, addresses.ETH]);
const converterRegistry = await web3Func(deploy, "converterRegistry" , "ConverterRegistry" , [contractRegistry._address]);
const converterRegistryData = await web3Func(deploy, "converterRegistryData" , "ConverterRegistryData" , [contractRegistry._address]);
const liquidTokenConverterFactory = await web3Func(deploy, "liquidTokenConverterFactory" , "LiquidTokenConverterFactory" , []);
const liquidityPoolV1ConverterFactory = await web3Func(deploy, "liquidityPoolV1ConverterFactory", "LiquidityPoolV1ConverterFactory", []);
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex("ContractRegistry" ), contractRegistry ._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex("ConverterFactory" ), converterFactory ._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex("BancorFormula" ), bancorFormula ._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex("BancorNetwork" ), bancorNetwork ._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex("ConversionPathFinder" ), conversionPathFinder ._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex("BancorConverterUpgrader" ), converterUpgrader ._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex("BancorConverterRegistry" ), converterRegistry ._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex("BancorConverterRegistryData"), converterRegistryData._address));
await execute(converterFactory.methods.registerTypedConverterFactory(liquidTokenConverterFactory ._address));
>>>>>>>
const contractRegistry = await web3Func(deploy, 'contractRegistry', 'ContractRegistry', []);
const converterFactory = await web3Func(deploy, 'converterFactory', 'ConverterFactory', []);
const bancorFormula = await web3Func(deploy, 'bancorFormula', 'BancorFormula', []);
const bancorNetwork = await web3Func(deploy, 'bancorNetwork', 'BancorNetwork', [contractRegistry._address]);
const conversionPathFinder = await web3Func(deploy, 'conversionPathFinder', 'ConversionPathFinder', [contractRegistry._address]);
const converterUpgrader = await web3Func(deploy, 'converterUpgrader', 'ConverterUpgrader', [contractRegistry._address, addresses.ETH]);
const converterRegistry = await web3Func(deploy, 'converterRegistry', 'ConverterRegistry', [contractRegistry._address]);
const converterRegistryData = await web3Func(deploy, 'converterRegistryData', 'ConverterRegistryData', [contractRegistry._address]);
const liquidTokenConverterFactory = await web3Func(deploy, 'liquidTokenConverterFactory', 'LiquidTokenConverterFactory', []);
const liquidityPoolV1ConverterFactory = await web3Func(deploy, 'liquidityPoolV1ConverterFactory', 'LiquidityPoolV1ConverterFactory', []);
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('ContractRegistry'), contractRegistry._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('ConverterFactory'), converterFactory._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('BancorFormula'), bancorFormula._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('BancorNetwork'), bancorNetwork._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('ConversionPathFinder'), conversionPathFinder._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('BancorConverterUpgrader'), converterUpgrader._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('BancorConverterRegistry'), converterRegistry._address));
await execute(contractRegistry.methods.registerAddress(Web3.utils.asciiToHex('BancorConverterRegistryData'), converterRegistryData._address));
await execute(converterFactory.methods.registerTypedConverterFactory(liquidTokenConverterFactory._address));
<<<<<<<
const supply = reserve.supply;
const token = await web3Func(deploy, 'erc20Token' + symbol, 'ERC20Token', [name, symbol, decimals, supply]);
=======
const supply = decimalToInteger(reserve.supply, decimals);
const token = await web3Func(deploy, "erc20Token" + symbol, "ERC20Token", [name, symbol, decimals, supply]);
>>>>>>>
const supply = decimalToInteger(reserve.supply, decimals);
const token = await web3Func(deploy, 'erc20Token' + symbol, 'ERC20Token', [name, symbol, decimals, supply]);
<<<<<<<
const fee = converter.fee;
const type = converter.reserves.length > 1 ? 1 : 0;
const tokens = converter.reserves.map(reserve => addresses[reserve.symbol]);
const weights = converter.reserves.map(reserve => reserve.weight);
const amounts = converter.reserves.map(reserve => reserve.balance);
const value = [...converter.reserves.filter(reserve => reserve.symbol === 'ETH'), {}][0].balance;
=======
const fee = percentageToPPM(converter.fee);
const type = converter.reserves.length > 1 ? 1 : 0;
const tokens = converter.reserves.map(reserve => addresses[reserve.symbol]);
const weights = converter.reserves.map(reserve => percentageToPPM(reserve.weight));
const amounts = converter.reserves.map(reserve => decimalToInteger(reserve.balance, decimals));
const value = amounts[converter.reserves.findIndex(reserve => reserve.symbol == "ETH")];
>>>>>>>
const fee = percentageToPPM(converter.fee);
const type = converter.reserves.length > 1 ? 1 : 0;
const tokens = converter.reserves.map(reserve => addresses[reserve.symbol]);
const weights = converter.reserves.map(reserve => percentageToPPM(reserve.weight));
const amounts = converter.reserves.map(reserve => decimalToInteger(reserve.balance, decimals));
const value = amounts[converter.reserves.findIndex(reserve => reserve.symbol === 'ETH')]; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.