code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/spec/widgets/time-series/torque-time-slider-view.spec.js b/spec/widgets/time-series/torque-time-slider-view.spec.js @@ -25,10 +25,10 @@ describe('widgets/time-series/torque-time-slider-view', function () {
});
this.histogramChartMargins = {
- top: 1,
- right: 2,
- bottom: 3,
- left: 4
+ top: 0,
+ right: 0,
+ bottom: 0,
+ left: 0
};
spyOn(HistogramChartView.prototype, '_setupFillColor').and.returnValue('red');
| 12 |
diff --git a/frontend/imports/ui/client/widgets/sendtokens.js b/frontend/imports/ui/client/widgets/sendtokens.js @@ -70,13 +70,13 @@ Template.sendtokens.viewmodel({
$('#transferconfirmation').modal('show');
$('#transferconfirmation').on('transfer:confirmed', (event) => {
event.stopPropagation();
- _transfer(transaction);
+ _process(transaction);
});
} else {
- _transfer(transaction);
+ _process(transaction);
}
- function _transfer (transaction) {
+ function _process (transaction) {
let recipient = transaction.recipient().toLowerCase();
if (!(/^0x/.test(recipient))) {
recipient = '0x'.concat(recipient);
| 10 |
diff --git a/generators/client/templates/vue/package.json.ejs b/generators/client/templates/vue/package.json.ejs @@ -31,10 +31,10 @@ limitations under the License.
"@fortawesome/free-solid-svg-icons": "5.11.2",
"@fortawesome/vue-fontawesome": "0.1.8",
"axios": "0.19.0",
- "bootstrap": "4.3.1",
- "bootstrap-vue": "2.0.4",
+ "bootstrap": "4.4.1",
+ "bootstrap-vue": "2.1.0",
<%_ if (clientTheme !== 'none') { _%>
- "bootswatch": "4.3.1",
+ "bootswatch": "4.4.1",
<%_ } _%>
"date-fns": "2.0.0-beta.2",
"swagger-ui": "2.2.10",
| 3 |
diff --git a/src/algorithms/model.test.ts b/src/algorithms/model.test.ts @@ -6,6 +6,8 @@ import { evolve } from './model'
import { ageDisstribution, allParamsFlat, severity } from './__test_data__/getPopulationParams.input.default'
+import { toBeCloseToNumber } from './utils/jest-extensions'
+
const identity = (x: number) => x
const jul2020 = new Date('2020-07-01')
@@ -30,30 +32,32 @@ const initializePopulationParams: InitializePopulationParams = {
ages: ageDisstribution,
}
+expect.extend({ toBeCloseToNumber })
+
describe('model', () => {
describe('infectionRate', () => {
it('baseline', () => {
- expect(infectionRate(dec2020num, 0.9, 3, 0.2)).toEqual(0.7768945041075702)
+ expect(infectionRate(dec2020num, 0.9, 3, 0.2)).toBeCloseToNumber(0.7768945041075702)
})
it('accounts for time correctly', () => {
- expect(infectionRate(jul2020num, 0.4, 3, 0.2)).toEqual(0.4194279777676749)
- expect(infectionRate(feb2021num, 1.5, 3, 0.2)).toEqual(1.5927050983124844)
+ expect(infectionRate(jul2020num, 0.4, 3, 0.2)).toBeCloseToNumber(0.4194279777676749)
+ expect(infectionRate(feb2021num, 1.5, 3, 0.2)).toBeCloseToNumber(1.5927050983124844)
})
it('accounts for avgInfectionRate correctly', () => {
- expect(infectionRate(dec2020num, 0.4, 3, 0.2)).toEqual(0.3452864462700312)
- expect(infectionRate(dec2020num, 1.5, 3, 0.2)).toEqual(1.294824173512617)
+ expect(infectionRate(dec2020num, 0.4, 3, 0.2)).toBeCloseToNumber(0.3452864462700312)
+ expect(infectionRate(dec2020num, 1.5, 3, 0.2)).toBeCloseToNumber(1.294824173512617)
})
it('accounts for peakMonth correctly', () => {
- expect(infectionRate(dec2020num, 0.9, 2, 0.2)).toEqual(0.8577915498773262)
- expect(infectionRate(dec2020num, 0.9, 7, 0.2)).toEqual(0.842905568053961)
+ expect(infectionRate(dec2020num, 0.9, 2, 0.2)).toBeCloseToNumber(0.8577915498773262)
+ expect(infectionRate(dec2020num, 0.9, 7, 0.2)).toBeCloseToNumber(0.842905568053961)
})
it('accounts for seasonalForcing correctly', () => {
- expect(infectionRate(dec2020num, 0.9, 3, 0.1)).toEqual(0.8384472520537851)
- expect(infectionRate(dec2020num, 0.9, 3, 0.4)).toEqual(0.6537890082151402)
+ expect(infectionRate(dec2020num, 0.9, 3, 0.1)).toBeCloseToNumber(0.8384472520537851)
+ expect(infectionRate(dec2020num, 0.9, 3, 0.4)).toBeCloseToNumber(0.6537890082151402)
})
})
| 14 |
diff --git a/assets/js/components/adminbar/common.stories.js b/assets/js/components/adminbar/common.stories.js @@ -35,8 +35,8 @@ const adminbarSearchConsoleOptions = {
url: 'https://www.sitekitbygoogle.com/blog/',
};
-const adminbarAnalyticsMockData = [
- // Mock options for isGatheringData selector
+const adminbarAnalyticsOptionSets = [
+ // Mock options for mocking isGatheringData selector's response.
{
dimensions: [ 'ga:date' ],
metrics: [ { expression: 'ga:users' } ],
@@ -45,7 +45,7 @@ const adminbarAnalyticsMockData = [
url: 'https://www.sitekitbygoogle.com/blog/',
},
- // Mock Total Users widget data
+ // Mock options for mocking Total Users report's response.
{
startDate: '2020-12-31',
endDate: '2021-01-27',
@@ -60,7 +60,7 @@ const adminbarAnalyticsMockData = [
url: 'https://www.sitekitbygoogle.com/blog/',
},
- // Mock Sessions widget data
+ // Mock options for mocking Sessions report's response.
{
startDate: '2020-12-31',
endDate: '2021-01-27',
@@ -77,6 +77,7 @@ const adminbarAnalyticsMockData = [
url: 'https://www.sitekitbygoogle.com/blog/',
},
];
+
export const setupBaseRegistry = ( registry, args ) => {
// Set some site information.
provideSiteInfo( registry, {
@@ -121,10 +122,10 @@ export function setupSearchConsoleMockReports( registry, data ) {
export const setupAnalyticsMockReports = (
registry,
- data = adminbarAnalyticsMockData
+ mockOptions = adminbarAnalyticsOptionSets
) => {
registry.dispatch( CORE_USER ).setReferenceDate( '2021-01-28' );
- data.forEach( ( options ) => {
+ mockOptions.forEach( ( options ) => {
registry
.dispatch( MODULES_ANALYTICS )
.receiveGetReport( getAnalyticsMockResponse( options ), {
@@ -168,10 +169,10 @@ export function setupSearchConsoleGatheringData( registry ) {
export const setupAnalyticsGatheringData = (
registry,
- data = adminbarAnalyticsMockData
+ mockOptionSets = adminbarAnalyticsOptionSets
) => {
registry.dispatch( CORE_USER ).setReferenceDate( '2021-01-28' );
- data.forEach( ( options ) => {
+ mockOptionSets.forEach( ( options ) => {
registry.dispatch( MODULES_ANALYTICS ).receiveGetReport(
[
{
@@ -207,11 +208,11 @@ export function setupSearchConsoleZeroData( registry ) {
export function setupAnalyticsZeroData(
registry,
- data = adminbarAnalyticsMockData
+ mockOptionSets = adminbarAnalyticsOptionSets
) {
registry.dispatch( CORE_USER ).setReferenceDate( '2021-01-28' );
- data.forEach( ( options ) => {
+ mockOptionSets.forEach( ( options ) => {
const report = getAnalyticsMockResponse( options );
const zeroReport = replaceValuesInAnalyticsReportWithZeroData( report );
registry.dispatch( MODULES_ANALYTICS ).receiveGetReport( zeroReport, {
| 10 |
diff --git a/plugins/identity/app/views/identity/projects/_wizard_steps.html.haml b/plugins/identity/app/views/identity/projects/_wizard_steps.html.haml = wizard_step({title: 'Cost Center',
mandatory: true,
status: 'pending'}) do
- %p The Cost Center service is currently unavailable.
+ %p The Billing service is currently unavailable.
-# RESOURCE MANAGEMENT
- if @resource_management_service_available
= wizard_step({title: 'Set Network',
mandatory: true,
status: 'pending'}) do
- %p Teh Network service is currently unavailable.
+ %p The Network service is currently unavailable.
- if @wizard_finished
%p
| 7 |
diff --git a/packages/app/src/test/setup-crowi.js b/packages/app/src/test/setup-crowi.js @@ -2,21 +2,17 @@ import Crowi from '~/server/crowi';
let _instance = null;
-async function createInstance() {
+async function getInstance(isNewInstance) {
+ if (isNewInstance) {
const crowi = new Crowi();
await crowi.initForTest();
-
return crowi;
}
-async function getInstance(isNewInstance) {
- if (isNewInstance) {
- return createInstance();
- }
-
// initialize singleton instance
if (_instance == null) {
- _instance = await createInstance();
+ _instance = new Crowi();
+ await _instance.initForTest();
}
return _instance;
}
| 7 |
diff --git a/assets/js/modules/analytics/util/account.test.js b/assets/js/modules/analytics/util/account.test.js * limitations under the License.
*/
-import { getAccountDefaults } from './account';
+/**
+ * Internal dependencies
+ */
+import * as accountUtils from './account';
describe( 'getAccountDefaults', () => {
const siteURL = 'https://example.com/';
const siteName = 'Example Site';
const timezone = 'Europe/Kiev';
+ const fallbackTimezone = 'Europe/Berlin';
+
+ // The fallback timezone is used here to avoid location-sensitive results,
+ // but also because the default fallback will raise errors otherwise due to the node environment.
+ const getAccountDefaults = ( args ) => accountUtils.getAccountDefaults( args, fallbackTimezone );
describe( 'accountName', () => {
it( 'should be equal to siteName when siteName is not empty', () => {
@@ -64,8 +72,8 @@ describe( 'getAccountDefaults', () => {
expect( getAccountDefaults( { siteName, siteURL, timezone } ).timezone ).toBe( 'Europe/Kiev' );
} );
- it( 'should use a local timezone when the provided timezone does not have an entry in countryCodesByTimezone', () => {
- expect( getAccountDefaults( { siteName, siteURL, timezone: 'UTC' } ).timeZone ).not.toBe( 'UTC' );
+ it( 'should use the fallback timezone when the provided timezone does not have an entry in countryCodesByTimezone', () => {
+ expect( getAccountDefaults( { siteName, siteURL, timezone: 'UTC' } ).timezone ).toBe( fallbackTimezone );
} );
} );
} );
| 4 |
diff --git a/INSTALL.md b/INSTALL.md -# Installing Windshaft-CartoDB #
+# Installing Windshaft-CartoDB
+
+## Requirements
-## Requirements ##
Make sure that you have the requirements needed. These are:
-- Core
- Node 10.x
- npm 6.x
- gcc 4.9
@@ -13,7 +13,8 @@ Make sure that you have the requirements needed. These are:
- Redis >= 4
- libcairo2-dev, libpango1.0-dev, libjpeg8-dev and libgif-dev for server side canvas support
-- For cache control
+### Optional
+
- Varnish (http://www.varnish-cache.org)
## PostGIS setup
| 7 |
diff --git a/js/core/bis_bidsutils.js b/js/core/bis_bidsutils.js @@ -157,7 +157,6 @@ let dicom2BIDS = async function (opts) {
//separate date string into individual chunks
let year = date.substring(0, 4), month = date.substring(4, 6), day = date.substring(6, 8), hour = date.substring(8, 10), minute = date.substring(10, 12);
- let dicomjobfilename = bis_genericio.joinFilenames(outputdirectory, 'dicom_job.json');
let dicomobj = {
"acquisition": 'DICOM',
"bidsversion": "1.1.0",
@@ -240,7 +239,24 @@ let dicom2BIDS = async function (opts) {
}
}
+ let bidsignore = '**/localizer\n**/dicom_job.json';
+ let date = new Date();
+ date = new Date().toLocaleDateString() + ' at ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
+ let datasetDescription = {
+ 'Name' : 'DICOM dataset converted on ' + date,
+ 'BIDSVersion': "1.2.0",
+ "License" : "",
+ "Authors" : "",
+ "Funding" : ""
+ };
+
+ let bidsignorefilename = bis_genericio.joinFilenames(outputdirectory, '.bidsignore');
+ let dicomjobfilename = bis_genericio.joinFilenames(outputdirectory, 'dicom_job_info.json');
+ let datasetdescriptionfilename = bis_genericio.joinFilenames(outputdirectory, 'dataset_description.json');
+
+ await bis_genericio.write(bidsignorefilename, bidsignore, false);
await bis_genericio.write(dicomjobfilename, JSON.stringify(dicomobj, null, 2), false);
+ await bis_genericio.write(datasetdescriptionfilename, JSON.stringify(datasetDescription, null, 2), false);
console.log('----- output directory', outputdirectory);
labelsMap = {};
@@ -265,7 +281,7 @@ let dicom2BIDS = async function (opts) {
filename = filename.split('_').join('-');
let bidsLabel = parseBIDSLabel(filename, directory), namesArray;
- let runNumber = getRunNumber(directory, bidsLabel, fileExtension);
+ let runNumber = getRunNumber(bidsLabel, fileExtension);
//may change in the future, though currently looks a bit more specific than needed
// -Zach
@@ -290,7 +306,9 @@ let dicom2BIDS = async function (opts) {
function getRunNumber(bidsLabel, fileExtension) {
let runNum;
+ console.log('bidsLabel', bidsLabel);
if (labelsMap[bidsLabel]) {
+ console.log('collision on', bidsLabel);
if (fileExtension.includes('nii')) {
//supporting files are moved before the image file in the code above
//so once we find the image we can safely increment the label in labelsMap
| 3 |
diff --git a/src/renderer/geometry/symbolizers/TextMarkerSymbolizer.js b/src/renderer/geometry/symbolizers/TextMarkerSymbolizer.js @@ -111,7 +111,7 @@ export default class TextMarkerSymbolizer extends PointSymbolizer {
'textWrapWidth': getValueOrDefault(s['textWrapWidth'], null),
'textWrapBefore': getValueOrDefault(s['textWrapBefore'], false),
- 'textWrapCharacter': getValueOrDefault(s['textWrapCharacter'], null),
+ 'textWrapCharacter': getValueOrDefault(s['textWrapCharacter'], '\n'),
'textLineSpacing': getValueOrDefault(s['textLineSpacing'], 0),
'textDx': getValueOrDefault(s['textDx'], 0),
| 12 |
diff --git a/bin/resources/app/index-live.html b/bin/resources/app/index-live.html <link id="project-style" rel="stylesheet" />
<style id="project-style-inline"></style>
<style id="tree-thumbs"></style>
+ <script type="text/javascript">
+ if (document.location.host == "yal.cc") {
+ if (location.protocol == "http:") {
+ document.location.protocol = "https:";
+ } else {
+ window._gaq = window._gaq||[];
+ _gaq.push(['_setAccount','UA-36439133-1']);_gaq.push(['_trackPageview']);
+ document.write('<'+'script type="text/javascript" async="true" src="https://www.google-analytics.com/ga.js"></'+'script>');
+ }
+ }
+ </script>
</head><body id="app">
<div id="main">
<div id="editor-td" style="width: 520px">
</div>
</div>
<!-- -->
-<script type="text/javascript" src="./formatter.js"></script>
-<script type="text/javascript" src="./misc/splitter.js?v=18-06-16-1"></script>
-<script type="text/javascript" src="./ace/src-noconflict/ace.js" charset="utf-8"></script>
+<script type="text/javascript" src="./formatter.js?v=19-03-06"></script>
+<script type="text/javascript" src="./misc/splitter.js?v=19-03-06"></script>
+<script type="text/javascript" src="./ace/src-noconflict/ace.js?v=19-03-06" charset="utf-8"></script>
<script type="text/javascript" src="./ace/src-noconflict/ext-language_tools.js"></script>
-<script type="text/javascript" src="./ace/mode-gml.js"></script>
+<script type="text/javascript" src="./ace/mode-gml.js?v=19-03-06"></script>
<script type="text/javascript" src="./lw/lzstring.js"></script>
-<script type="text/javascript" src="./lw/gmlive-web.js?v=18-06-16-1"></script>
-<script type="text/javascript" src="./lw/app.js?v=18-06-16-1"></script>
+<script type="text/javascript" src="./lw/gmlive-web.js?v=19-03-06"></script>
+<script type="text/javascript" src="./lw/app.js?v=19-03-06"></script>
<script type="text/javascript" src="./misc/gmcr.js" async></script>
</body>
| 1 |
diff --git a/lib/tedious/request.js b/lib/tedious/request.js @@ -600,7 +600,7 @@ class Request extends BaseRequest {
row.push(col.value)
} else {
const exi = row[col.metadata.colName]
- if (exi != null) {
+ if (exi !== undefined) {
if (exi instanceof Array) {
exi.push(col.value)
} else {
| 11 |
diff --git a/articles/connections/references/options-mgmt-api.md b/articles/connections/references/options-mgmt-api.md @@ -20,7 +20,6 @@ The following elements are available for the `options` attribute. These are opti
| `passwordPolicy` | string | The strength level of the password. Allowed values include `none`, `low`, `fair`, `good`, and `excellent`. Used with [database connections](/connections/database). |
| `password_complexity_options` | object | <%= include('./_includes/_options-prop-pw-complexity.md') %> Used with [database connections](/connections/database). |
| `password_history` | object | <%= include('./_includes/_options-prop-pw-history.md') %> Used with [database connections](/connections/database). |
- | `password_expiration` | object | <%= include('./_includes/_options-prop-pw-expiration.md') %> Used with [database connections](/connections/database). |
| `password_no_personal_info` | object | <%= include('./_includes/_options-prop-pw-no-pers-info.md') %> Used with [database connections](/connections/database). |
| `password_dictionary` | object | <%= include('./_includes/_options-prop-pw-dictionary.md') %> Used with [database connections](/connections/database). |
| `basic_profile` | boolean | Indicates that you want basic profile information (email address and email verified flag) stored in the Auth0 User Profile. Used with social and enterprise connections. |
| 2 |
diff --git a/config/passport.js b/config/passport.js @@ -36,6 +36,9 @@ passport.use(new LocalStrategy({ usernameField: 'email' }, (email, password, don
if (!user) {
return done(null, false, { msg: `Email ${email} not found.` });
}
+ if (!user.password) {
+ return done(null, false, { msg: 'Your account was registered using a sign-in provider. To enable password login, sign in using a provider, and then set a password under your user profile.' });
+ }
user.comparePassword(password, (err, isMatch) => {
if (err) { return done(err); }
if (isMatch) {
| 9 |
diff --git a/app/pages/project/workflow-selection-classroom.jsx b/app/pages/project/workflow-selection-classroom.jsx @@ -6,9 +6,22 @@ import { WorkflowSelection } from './workflow-selection';
export class ClassroomWorkflowSelection extends WorkflowSelection {
getSelectedWorkflow(props) {
- const { actions, locale, location, preferences } = props;
+ const { actions, locale, location, project, preferences } = props;
+
+ // Normally, WildCam Classrooms are "custom programs" with a different
+ // (cloned) workflow for each Assignment. We expect a numerical Workflow ID.
const workflowFromURL = this.sanitiseID(location.query.workflow);
if (workflowFromURL) return actions.classifier.loadWorkflow(workflowFromURL, locale, preferences);
+
+ // Some WildCam Classrooms are now "non-custom programs", meaning every
+ // Assignment is associated with the current main workflow.
+ // In this scenario, the expected param looks like: ?workflow=default
+ const defaultWorkflow = project.configuration && this.sanitiseID(project.configuration.default_workflow);
+ if (defaultWorkflow && location.query.workflow === 'default') {
+ return actions.classifier.loadWorkflow(defaultWorkflow, locale, preferences);
+ }
+
+ // If neither case above, it's a failure.
if (process.env.BABEL_ENV !== 'test') console.warn('Cannot select a workflow.');
return Promise.resolve(null);
}
@@ -27,4 +40,3 @@ const mapDispatchToProps = dispatch => ({
});
export default connect(mapStateToProps, mapDispatchToProps)(ClassroomWorkflowSelection);
-
| 11 |
diff --git a/assets/js/modules/analytics/datastore/accounts.js b/assets/js/modules/analytics/datastore/accounts.js @@ -41,6 +41,7 @@ const CATCH_FETCH_CREATE_ACCOUNT = 'CATCH_FETCH_CREATE_ACCOUNT';
export const INITIAL_STATE = {
accounts: undefined,
isFetchingAccountsPropertiesProfiles: false,
+ isCreatingAccount: false,
};
export const actions = {
@@ -224,7 +225,7 @@ export const reducer = ( state, { type, payload } ) => {
case FINISH_FETCH_CREATE_ACCOUNT:
return {
...state,
- isCreatingAccount: false,
+ isFetchingCreateAccount: false,
};
case CATCH_FETCH_CREATE_ACCOUNT:
@@ -232,13 +233,13 @@ export const reducer = ( state, { type, payload } ) => {
return {
...state,
error,
- isCreatingAccount: false,
+ isFetchingCreateAccount: false,
};
case START_FETCH_CREATE_ACCOUNT: {
return {
...state,
- isCreatingAccount: true,
+ isFetchingCreateAccount: true,
};
}
@@ -337,7 +338,7 @@ export const selectors = {
* @return {boolean} True if an account is being created, false otherwise.
*/
isDoingCreateAccount( state ) {
- return state.isCreatingAccount;
+ return !! state.isFetchingCreateAccount;
},
};
| 7 |
diff --git a/packages/build/src/error/monitor/normalize.js b/packages/build/src/error/monitor/normalize.js @@ -34,8 +34,10 @@ const normalizeMessage = function(message, [regExp, replacement]) {
}
const NORMALIZE_REGEXPS = [
+ // Base64 URL
+ [/(data:[^;]+;base64),[\w+/-]+/g, 'dataURI'],
// File paths
- [/(["'`, ]|^)([^"'`, ]*[/\\][^"'`, ]*)(["'`, ]|$)/gm, '$1/file/path$3'],
+ [/(["'`, ]|^)([^"'`, \n]*[/\\][^"'`, \n]*)(["'`, ]|$)/gm, '$1/file/path$3'],
// Semantic versions
[/\d+\.\d+\.\d+(-\d+)?/g, '1.0.0'],
[/version "[^"]+"/g, 'version "1.0.0"'],
| 7 |
diff --git a/vis/js/canvas.js b/vis/js/canvas.js @@ -289,16 +289,14 @@ class Canvas {
let time_macro = (config.service === "doaj")?("yyyy"):("d mmm yyyy");
$("#timespan").html(
- ((this.paramExists(context.params.from))?(dateFormat(new Date(context.params.from), "d mmm yyyy")):(""))
- + " - " + ((this.paramExists(context.params.to))?(dateFormat(new Date(context.params.to), "d mmm yyyy")):(""))
+ ((this.paramExists(context.params.from))?(dateFormat(new Date(context.params.from), time_macro)):(""))
+ + " - " + ((this.paramExists(context.params.to))?(dateFormat(new Date(context.params.to), time_macro)):(""))
);
- let dtypes = (context.params.hasOwnProperty("document_types"))?("document_types"):("article_types");
- let num_document_types = context.params[dtypes].length;
- $("#document_types").html(num_document_types + " " + config.localization[config.language].documenttypes_label);
-
if(this.paramExists(config.options)) {
+ let dtypes = (context.params.hasOwnProperty("document_types"))?("document_types"):("article_types");
+
let document_types_string = "";
let document_types = config.options.filter(function(obj) {
@@ -306,6 +304,9 @@ class Canvas {
});
if(context.params.hasOwnProperty(dtypes)) {
+ let num_document_types = context.params[dtypes].length;
+ $("#document_types").html(num_document_types + " " + config.localization[config.language].documenttypes_label);
+
context.params[dtypes].forEach(function (type) {
let type_obj = document_types[0].fields.filter(function(obj) {
return obj.id == type;
| 1 |
diff --git a/source/transfers/test/TransferHandlerRegistry.js b/source/transfers/test/TransferHandlerRegistry.js @@ -699,7 +699,7 @@ contract('TransferHandlerRegistry', async accounts => {
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 100,
+ amount: 100,
},
})
@@ -762,7 +762,7 @@ contract('TransferHandlerRegistry', async accounts => {
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 100,
+ amount: 100,
},
})
| 10 |
diff --git a/utils/entity.js b/utils/entity.js @@ -162,32 +162,37 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
hasBuiltInUserField &&
entityWithConfig.dto === 'no';
- entityWithConfig.derivedPrimaryKey = entityWithConfig.relationships.some(relationship => relationship.useJPADerivedIdentifier === true);
-
- if (!entityWithConfig.embedded && !entityWithConfig.derivedPrimaryKey) {
+ if (!entityWithConfig.embedded) {
entityWithConfig.idFields = entityWithConfig.fields.filter(field => field.id);
- if (entityWithConfig.idFields.length > 0) {
- if (entityWithConfig.idFields.length === 1) {
- const idField = entityWithConfig.idFields[0];
- // Allow ids type to be empty and fallback to default type for the database.
- if (!idField.fieldType) {
- idField.fieldType = generator.getPkType(entityWithConfig.databaseType);
- }
- entityWithConfig.primaryKeyType = idField.fieldType;
- } else {
- throw new Error('Composite id not implemented');
- }
- } else {
- entityWithConfig.primaryKeyType = generator.getPkType(entityWithConfig.databaseType);
+ entityWithConfig.idRelationships = entityWithConfig.relationships.filter(
+ relationship => relationship.id || relationship.useJPADerivedIdentifier === true
+ );
+ let idCount = entityWithConfig.idFields.length + entityWithConfig.idRelationships.length;
+
+ if (idCount === 0) {
const idField = {
fieldName: 'id',
- fieldType: entityWithConfig.primaryKeyType,
id: true,
fieldNameHumanized: 'ID',
fieldTranslationKey: 'global.field.id',
};
entityWithConfig.idFields.push(idField);
entityWithConfig.fields.unshift(idField);
+ idCount++;
+ }
+ if (idCount > 1) {
+ throw new Error('Composite id not implemented');
+ } else if (entityWithConfig.idRelationships.length === 1) {
+ entityWithConfig.derivedPrimaryKey = entityWithConfig.idRelationships[0];
+ entityWithConfig.derivedPrimaryKey.useJPADerivedIdentifier = true;
+ } else {
+ const idField = entityWithConfig.idFields[0];
+ // Allow ids type to be empty and fallback to default type for the database.
+ if (!idField.fieldType) {
+ idField.fieldType = generator.getPkType(entityWithConfig.databaseType);
+ }
+ entityWithConfig.primaryKey = { name: idField.fieldName, type: idField.fieldType };
+ entityWithConfig.primaryKeyType = idField.fieldType;
}
}
| 11 |
diff --git a/client/src/components/viewscreens/TacticalMap/index.js b/client/src/components/viewscreens/TacticalMap/index.js @@ -206,18 +206,13 @@ class TacticalMapViewscreen extends Component {
const selectedTacticalMap = this.props.data.tacticalMaps.find(
t => t.id === tacticalMapId
);
- const { cardName } = this.props;
+ const { core } = this.props;
const layers = this.state.layers[tacticalMapId];
- console.log(
- this.props.flightId || (this.props.flight && this.props.flight.id)
- );
return (
<div
className="viewscreen-tacticalMap"
style={{
- transform: cardName
- ? `scale(${window.innerWidth / 1920})`
- : null
+ transform: !core ? `scale(${window.innerWidth / 1920})` : null
}}
>
{selectedTacticalMap && (
| 1 |
diff --git a/index.js b/index.js @@ -21,7 +21,7 @@ const runMiddlewares = (middlewares, ctx, done) => {
runNext()
}
-const onErrorMiddlewares = (middlewares, ctx, done) => {
+const runErrorMiddlewares = (middlewares, ctx, done) => {
const stack = Array.from(middlewares)
const runNext = (err) => {
try {
@@ -69,7 +69,7 @@ const middy = (handler) => {
runMiddlewares(beforeMiddlewares, ctx, (err) => {
if (err) {
ctx.error = err
- return onErrorMiddlewares(errorMiddlewares, ctx, terminate)
+ return runErrorMiddlewares(errorMiddlewares, ctx, terminate)
}
handler.call(ctx, ctx.event, context, (err, response) => {
@@ -77,13 +77,13 @@ const middy = (handler) => {
if (err) {
ctx.error = err
- return onErrorMiddlewares(errorMiddlewares, ctx, terminate)
+ return runErrorMiddlewares(errorMiddlewares, ctx, terminate)
}
runMiddlewares(afterMiddlewares, ctx, (err) => {
if (err) {
ctx.error = err
- return onErrorMiddlewares(errorMiddlewares, ctx, terminate)
+ return runErrorMiddlewares(errorMiddlewares, ctx, terminate)
}
return terminate()
| 10 |
diff --git a/token-metadata/0x177BA0cac51bFC7eA24BAd39d81dcEFd59d74fAa/metadata.json b/token-metadata/0x177BA0cac51bFC7eA24BAd39d81dcEFd59d74fAa/metadata.json "symbol": "KIF",
"address": "0x177BA0cac51bFC7eA24BAd39d81dcEFd59d74fAa",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/generators/server/index.js b/generators/server/index.js @@ -469,7 +469,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
'java:war': './gradlew bootWar -Pwar -x test -x integrationTest',
'java:docker': './gradlew bootJar jibDockerBuild',
'backend:unit:test': `./gradlew test integrationTest ${excludeWebapp} ${javaCommonLog} ${javaTestLog}`,
- 'postci:e2e:package': 'cp build/libs/*SNAPSHOT.$npm_package_config_packaging e2e.$npm_package_config_packaging',
+ 'postci:e2e:package': 'cp build/libs/*.$npm_package_config_packaging e2e.$npm_package_config_packaging',
'backend:build-cache': 'npm run backend:info && npm run backend:nohttp:test && npm run ci:e2e:package',
});
}
| 11 |
diff --git a/server/services/searchLinkedCatAuthorview.php b/server/services/searchLinkedCatAuthorview.php @@ -14,9 +14,9 @@ $post_params = $_POST;
$result = search("linkedcat_authorview",
$dirty_query,
$post_params,
- array("author_name", "doc_count", "living_dates", "image_link"),
+ array("author_id", "doc_count", "living_dates", "image_link"),
";",
- null
+ null,
);
echo $result
| 13 |
diff --git a/core/algorithm-builder/environments/java/runJava.sh b/core/algorithm-builder/environments/java/runJava.sh @@ -10,4 +10,4 @@ else
fi
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/x86_64-linux-gnu/jni/
-java -Xms${MIN_MEM} -Xmx${MAX_MEM} -jar wrapper.jar algorithm_unique_folder/encapsulated-algorithm.jar 2>&1 |tee /hkube-logs/stdout.log
\ No newline at end of file
+java -Xms${MIN_MEM} -Xmx${MAX_MEM} -Dcom.amazonaws.sdk.disableCertChecking=true -jar wrapper.jar algorithm_unique_folder/encapsulated-algorithm.jar 2>&1 |tee /hkube-logs/stdout.log
\ No newline at end of file
| 11 |
diff --git a/src/core/xfa/xhtml.js b/src/core/xfa/xhtml.js @@ -107,13 +107,14 @@ const StyleMapping = new Map([
["margin-top", value => measureToString(getMeasurement(value))],
["text-indent", value => measureToString(getMeasurement(value))],
["font-family", value => value],
+ ["vertical-align", value => measureToString(getMeasurement(value))],
]);
const spacesRegExp = /\s+/g;
const crlfRegExp = /[\r\n]+/g;
const crlfForRichTextRegExp = /\r\n?/g;
-function mapStyle(styleStr, node) {
+function mapStyle(styleStr, node, richText) {
const style = Object.create(null);
if (!styleStr) {
return style;
@@ -158,6 +159,29 @@ function mapStyle(styleStr, node) {
);
}
+ if (
+ richText &&
+ style.verticalAlign &&
+ style.verticalAlign !== "0px" &&
+ style.fontSize
+ ) {
+ // A non-zero verticalAlign means that we've a sub/super-script and
+ // consequently the font size must be decreased.
+ // https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf#G11.2097514
+ // And the two following factors to position the scripts have been
+ // found here:
+ // https://en.wikipedia.org/wiki/Subscript_and_superscript#Desktop_publishing
+ const SUB_SUPER_SCRIPT_FACTOR = 0.583;
+ const VERTICAL_FACTOR = 0.333;
+ const fontSize = getMeasurement(style.fontSize);
+ style.fontSize = measureToString(fontSize * SUB_SUPER_SCRIPT_FACTOR);
+ style.verticalAlign = measureToString(
+ Math.sign(getMeasurement(style.verticalAlign)) *
+ fontSize *
+ VERTICAL_FACTOR
+ );
+ }
+
fixTextIndent(style);
return style;
}
@@ -333,7 +357,7 @@ class XhtmlObject extends XmlObject {
name: this[$nodeName],
attributes: {
href: this.href,
- style: mapStyle(this.style, this),
+ style: mapStyle(this.style, this, this[$richText]),
},
children,
value,
| 9 |
diff --git a/src/parsers/GmlSeeker.hx b/src/parsers/GmlSeeker.hx @@ -183,12 +183,7 @@ class GmlSeeker {
};
case '"'.code, "'".code, "`".code, "@".code: row += q.skipStringAuto(c, v);
case "#".code: {
- while (q.loop) {
- c = q.peek();
- if (c.isIdent1()) {
- q.skip();
- } else break;
- }
+ q.skipIdent1();
if (q.pos > start + 1) {
s = q.substring(start, q.pos);
switch (s) {
@@ -206,12 +201,7 @@ class GmlSeeker {
};
default: {
if (c.isIdent0()) {
- while (q.loop) {
- c = q.peek();
- if (c.isIdent1()) {
- q.skip();
- } else break;
- }
+ q.skipIdent1();
var id = q.substring(start, q.pos);
var m = ace.AceMacro.jsOrx(out.macroMap[id], GmlAPI.gmlMacros[id]);
if (m != null) {
@@ -403,7 +393,7 @@ class GmlSeeker {
q.skipLineEnd();
p = q.pos;
} else break;
- } while (q.loop);
+ } while (q.loopLocal);
s += q.substring(p, q.pos);
// we don't currently support configuration nesting
if (cfg == null || cfg == project.config) {
| 1 |
diff --git a/packages/material-ui-shell/src/containers/ResponsiveMenu/ResponsiveMenu.js b/packages/material-ui-shell/src/containers/ResponsiveMenu/ResponsiveMenu.js @@ -59,6 +59,7 @@ const ResponsiveMenu = ({ children, width }) => {
const classes = useStyles()
const { isRTL } = useAppTheme()
const {
+ toggleThis,
isDesktop,
isMiniMode,
isMenuOpen,
| 1 |
diff --git a/karma.conf.js b/karma.conf.js @@ -221,7 +221,7 @@ module.exports = function(config) {
sauceLabs: {
recordScreenshots: false,
connectOptions: {
- port: 5757,
+ // port: 5757,
logfile: 'sauce_connect.log'
},
public: 'public'
| 1 |
diff --git a/aura-components/src/main/components/ui/tabBar/tabBarHelper.js b/aura-components/src/main/components/ui/tabBar/tabBarHelper.js if (cmp.isValid()) {
helper.adjustOverflow(cmp);
}
- })
- );
+ }));
+ } else if (barWidth === 0 && overflowData.barWidth === 0) {
+ // Edge case, should hide the overflow menu when tabBar is reset.
+ this.toggleOverflowMenu(cmp, false);
}
},
| 9 |
diff --git a/app/assets/stylesheets/pageflow/ui/properties.scss b/app/assets/stylesheets/pageflow/ui/properties.scss --ui-backdrop-color: rgba(6, 32, 42, 0.6);
--ui-on-surface-color: hsl(197, 26%, 23%);
- --ui-on-surface-color-light: hsla(197, 26%, 23%, 0.6);
+ --ui-on-surface-color-light: hsla(197, 26%, 23%, 0.8);
--ui-on-surface-color-lighter: hsla(197, 26%, 23%, 0.3);
--ui-on-surface-color-lightest: hsla(197, 26%, 23%, 0.1);
- --ui-on-surface-color-light-solid: #{mix(#06202a, #fff, 60%)};
+ --ui-on-surface-color-light-solid: #{mix(#06202a, #fff, 80%)};
--ui-on-surface-color-lighter-solid: #{mix(#06202a, #fff, 30%)};
--ui-on-surface-color-lightest-solid: #{mix(#06202a, #fff, 10%)};
| 7 |
diff --git a/server/server.js b/server/server.js @@ -53,7 +53,7 @@ class Server {
cookie: {
maxAge: config.cookieLifetime,
secure: config.https,
- httpOnly: true,
+ httpOnly: false,
domain: config.domain
},
name: 'sessionId'
| 12 |
diff --git a/src/pages/settings/AppDownloadLinks.js b/src/pages/settings/AppDownloadLinks.js @@ -7,15 +7,25 @@ import CONST from '../../CONST';
import * as Expensicons from '../../components/Icon/Expensicons';
import ScreenWrapper from '../../components/ScreenWrapper';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
+import compose from '../../libs/compose';
import MenuItem from '../../components/MenuItem';
import styles from '../../styles/styles';
import * as Link from '../../libs/actions/Link';
+import PressableWithSecondaryInteraction from '../../components/PressableWithSecondaryInteraction';
+import ControlSelection from '../../libs/ControlSelection';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
+import canUseTouchScreen from '../../libs/canUseTouchscreen';
+import * as ReportActionContextMenu from '../home/report/ContextMenu/ReportActionContextMenu';
+import * as ContextMenuActions from '../home/report/ContextMenu/ContextMenuActions';
const propTypes = {
...withLocalizePropTypes,
+ ...windowDimensionsPropTypes,
};
const AppDownloadLinksPage = (props) => {
+ let popoverAnchor;
+
const menuItems = [
{
translationKey: 'initialSettingsPage.appDownloadLinks.android.label',
@@ -24,6 +34,7 @@ const AppDownloadLinksPage = (props) => {
action: () => {
Link.openExternalLink(CONST.APP_DOWNLOAD_LINKS.ANDROID);
},
+ link: CONST.APP_DOWNLOAD_LINKS.ANDROID,
},
{
translationKey: 'initialSettingsPage.appDownloadLinks.ios.label',
@@ -32,6 +43,7 @@ const AppDownloadLinksPage = (props) => {
action: () => {
Link.openExternalLink(CONST.APP_DOWNLOAD_LINKS.IOS);
},
+ link: CONST.APP_DOWNLOAD_LINKS.IOS,
},
{
translationKey: 'initialSettingsPage.appDownloadLinks.desktop.label',
@@ -40,9 +52,25 @@ const AppDownloadLinksPage = (props) => {
action: () => {
Link.openExternalLink(CONST.APP_DOWNLOAD_LINKS.DESKTOP);
},
+ link: CONST.APP_DOWNLOAD_LINKS.DESKTOP,
},
];
+ /**
+ * Show the ReportActionContextMenu modal popover.
+ *
+ * @param {Object} [event] - A press event.
+ * @param {string} [selection] - A copy text.
+ */
+ const showPopover = (event, selection) => {
+ ReportActionContextMenu.showContextMenu(
+ ContextMenuActions.CONTEXT_MENU_TYPES.LINK,
+ event,
+ selection,
+ popoverAnchor,
+ );
+ };
+
return (
<ScreenWrapper>
<HeaderWithCloseButton
@@ -53,14 +81,24 @@ const AppDownloadLinksPage = (props) => {
/>
<ScrollView style={[styles.mt5]}>
{_.map(menuItems, item => (
- <MenuItem
+ <PressableWithSecondaryInteraction
key={item.translationKey}
+ onPressIn={() => props.isSmallScreenWidth && canUseTouchScreen() && ControlSelection.block()}
+ onPressOut={() => ControlSelection.unblock()}
+ onSecondaryInteraction={e => showPopover(e, item.link)}
+ ref={el => popoverAnchor = el}
+ onKeyDown={(event) => {
+ event.target.blur();
+ }}
+ >
+ <MenuItem
title={props.translate(item.translationKey)}
icon={item.icon}
iconRight={item.iconRight}
onPress={() => item.action()}
shouldShowRightIcon
/>
+ </PressableWithSecondaryInteraction>
))}
</ScrollView>
</ScreenWrapper>
@@ -70,4 +108,7 @@ const AppDownloadLinksPage = (props) => {
AppDownloadLinksPage.propTypes = propTypes;
AppDownloadLinksPage.displayName = 'AppDownloadLinksPage';
-export default withLocalize(AppDownloadLinksPage);
+export default compose(
+ withWindowDimensions,
+ withLocalize,
+)(AppDownloadLinksPage);
| 11 |
diff --git a/includes/Core/Authentication/Profile.php b/includes/Core/Authentication/Profile.php @@ -112,13 +112,7 @@ final class Profile {
*/
private function retrieve_google_profile_from_api() {
- // Fall back to the user's WordPress profile information.
- $current_user = wp_get_current_user();
- $profile_data = array(
- 'email' => $current_user->user_email,
- 'photo' => get_avatar_url( $current_user->user_email ),
- 'timestamp' => 0, // Don't cache WP user data.
- );
+ $profile_data = false;
// Retrieve and store the user's Google profile data.
try {
| 2 |
diff --git a/src/components/dashboard/Send.js b/src/components/dashboard/Send.js @@ -45,10 +45,10 @@ const validate = to => {
return `Needs to be a valid address, email or mobile phone`
}
-const ContinueButton = ({ screenProps, to, disabled, onPress }) => (
+const ContinueButton = ({ screenProps, to, disabled, checkError }) => (
<CustomButton
onPress={() => {
- onPress()
+ if (checkError()) return
if (to && (isMobilePhone(to) || isEmail(to))) {
return screenProps.push('Amount', { to, nextRoutes: ['Reason', 'SendLinkSummary'] })
@@ -57,7 +57,7 @@ const ContinueButton = ({ screenProps, to, disabled, onPress }) => (
if (to && goodWallet.wallet.utils.isAddress(to)) {
return screenProps.push('Amount', { to, nextRoutes: ['Reason', 'SendQRSummary'] })
}
- log.info(`${to} Needs to be a valid address, email or mobile phone`)
+ log.debug(`Oops, no error and no action`)
}}
mode="contained"
disabled={disabled}
@@ -69,9 +69,14 @@ const ContinueButton = ({ screenProps, to, disabled, onPress }) => (
const Send = props => {
const [screenState, setScreenState] = useScreenState(props.screenProps)
const [error, setError] = useState()
- const checkError = () => setError(validate(to))
const { to } = screenState
+ const checkError = () => {
+ const err = validate(to)
+ setError(err)
+ return err
+ }
+
return (
<Wrapper>
<TopBar />
@@ -88,7 +93,7 @@ const Send = props => {
</Section.Row>
</View>
<View style={styles.bottomContainer}>
- <ContinueButton screenProps={props.screenProps} to={to} disabled={!to} onPress={checkError} />
+ <ContinueButton screenProps={props.screenProps} to={to} disabled={!to} checkError={checkError} />
</View>
</Section>
</Wrapper>
| 7 |
diff --git a/vis/js/io.js b/vis/js/io.js @@ -446,7 +446,10 @@ IO.prototype = {
return;
}
- let full_query = context.query;
+ let original_query = context.query;
+
+ //Replace terms within square brackets, as they denote fields in PubMed
+ let full_query = original_query.replace(/\[(.*?)\]/g, '');
//let query_wt_exclusions = full_query.replace(/(^|\s)-[^\s]*/g, " ");
//query_wt_exclusions = query_wt_exclusions.replace(/(^|\s)-\"(.*?)\"/g, " ");
| 14 |
diff --git a/edit.js b/edit.js @@ -35,7 +35,6 @@ import easing from './easing.js';
import {planet} from './planet.js';
import {player} from './player.js';
import {Bot} from './bot.js';
-// import './atlaspack.js';
import {Sky} from './Sky.js';
import {GuardianMesh} from './land.js';
| 2 |
diff --git a/Source/Scene/GroundPolylinePrimitive.js b/Source/Scene/GroundPolylinePrimitive.js @@ -101,9 +101,7 @@ define([
*
* scene.groundPrimitives.add(new Cesium.GroundPolylinePrimitive({
* geometryInstances : instance,
- * appearance : new Cesium.PolylineMaterialAppearance({
- * material : Cesium.Material.fromType('Color')
- * })
+ * appearance : new Cesium.PolylineMaterialAppearance()
* }));
*
* // 2. Draw a looped polyline on terrain with per-instance color and a distance display condition.
@@ -122,7 +120,7 @@ define([
* }),
* attributes : {
* color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromCssColorString('green').withAlpha(0.7)),
- distanceDisplayCondition : new Cesium.DistanceDisplayConditionGeometryInstanceAttribute(1000, 30000)
+ * distanceDisplayCondition : new Cesium.DistanceDisplayConditionGeometryInstanceAttribute(1000, 30000)
* },
* id : 'object returned when this instance is picked and to get/set per-instance attributes'
* });
| 7 |
diff --git a/core/field_bound_variable.js b/core/field_bound_variable.js @@ -424,13 +424,14 @@ Blockly.FieldBoundVariable.prototype.render_ = function() {
this.textElement_.setAttribute('x', left);
this.borderRect_.setAttribute('x', -Blockly.BlockSvg.SEP_SPACE_X / 2 + left);
+ var xy = new goog.math.Coordinate(0, 0);
+ if (blockShapeHeight <= this.size_.height) {
// Vertically center the block shape only if the current field size is
// capable of containing it.
- if (blockShapeHeight <= this.size_.height) {
- var top = (blockShapeHeight - dropdownHeight) / 2;
- this.blockShapedPath_.setAttribute('transform',
- 'translate(0, -' + top + ')');
+ xy.y -= (blockShapeHeight - dropdownHeight) / 2;
}
+ this.blockShapedPath_.setAttribute('transform',
+ 'translate(' + xy.x + ',' + xy.y + ')');
this.size_.width = blockShapeWidth - Blockly.BlockSvg.TAB_WIDTH;
this.size_.height = blockShapeHeight;
| 12 |
diff --git a/bids-validator/utils/unit.js b/bids-validator/utils/unit.js @@ -119,13 +119,14 @@ const superscriptNumbers = [
'\u2078',
'\u2079',
]
+const superscriptNegative = '\u207B'
const start = '^'
const end = '$'
const prefix = `(${prefixes.join('|')})?`
const root = `(${roots.join('|')})`
-const superscriptExp = `[${superscriptNumbers}]*`
-const operatorExp = `(\\^[0-9]+)?`
+const superscriptExp = `(${superscriptNegative}?[${superscriptNumbers}]+)?`
+const operatorExp = `(\\^-?[0-9]+)?`
const unitWithExponentPattern = new RegExp(
`${start}${prefix}${root}(${superscriptExp}|${operatorExp})${end}`,
)
| 11 |
diff --git a/packages/live-server/index.js b/packages/live-server/index.js @@ -320,7 +320,11 @@ LiveServer.start = function(options) {
clients.push(ws);
});
- var ignored = [];
+ var ignored = [
+ function(testPath) { // Always ignore dotfiles (important e.g. because editor hidden temp files)
+ return /(^[.#]|(?:__|~)$)/.test(path.basename(testPath));
+ }
+ ];
if (options.ignore) {
ignored = ignored.concat(options.ignore);
}
| 8 |
diff --git a/_templates/api-story-card/with-prompt/src/components/index.ejs.t b/_templates/api-story-card/with-prompt/src/components/index.ejs.t @@ -48,10 +48,10 @@ export default connect(
data: {
// FIXME: mockRidershipOverTime should be a variable
mockRidershipOverTime: api.selectors.getMockRidershipData(
- state.<%=package%> || state
+ state.package<%= h.changeCase.pascalCase(package)%> || state
)
}
- // state.packageName || state needed to make work in the project package and 2018 package
+ // state.packageProjectName || state needed to make work in the project package and 2018 package
}),
dispatch => ({
init() {
| 3 |
diff --git a/src/components/Player/Pages/Overview/Summary.jsx b/src/components/Player/Pages/Overview/Summary.jsx @@ -108,7 +108,7 @@ const SummOfRecMatches = ({ matchesData }) => {
{key === 'duration' ? formatSeconds(c.avg) : abbreviateNumber(c.avg)}
<span>{key === 'duration' ? formatSeconds(c.max.value) : abbreviateNumber(c.max.value)}
- <Link to={`matches/${c.max.matchId}`}>
+ <Link to={`/matches/${c.max.matchId}`}>
<img src={`${API_HOST}${hero.icon}`} alt={hero.localized_name} />
</Link>
</span>
| 1 |
diff --git a/config/router.config.js b/config/router.config.js @@ -100,12 +100,7 @@ export default [
name: 'EnterpriseSetting',
authority: ['admin', 'user']
},
- {
- path: '/enterprise/:eid/shared/:marketName',
- component: './EnterpriseShared',
- name: 'EnterpriseShared',
- authority: ['admin', 'user']
- },
+
{
path: '/enterprise/:eid/shared/app/:appId',
component: './EnterpriseShared/Details',
@@ -124,6 +119,12 @@ export default [
name: 'EnterpriseImport',
authority: ['admin', 'user']
},
+ {
+ path: '/enterprise/:eid/shared/:marketName',
+ component: './EnterpriseShared',
+ name: 'EnterpriseShared',
+ authority: ['admin', 'user']
+ },
{
path: '/enterprise/:eid/addCluster',
component: './AddCluster',
| 1 |
diff --git a/lib/alexaSmartHomeV2.js b/lib/alexaSmartHomeV2.js @@ -308,7 +308,7 @@ function AlexaSH2(adapter) {
friendlyName: friendlyNames[n],
friendlyDescription: friendlyDescription,
isReachable: true,
- actions: actions,
+ actions: JSON.parse(JSON.stringify(actions)),
additionalApplianceDetails: {
id: id.substring(0, 1024),
role: states[id].common.role,
@@ -381,7 +381,7 @@ function AlexaSH2(adapter) {
friendlyName: friendlyNames[n],
friendlyDescription: words['Group'][lang] + ' ' + friendlyNames[n],
isReachable: true,
- actions: actions,
+ actions: JSON.parse(JSON.stringify(actions)),
additionalApplianceDetails: {
group: true,
channels: {},
| 4 |
diff --git a/lib/assets/javascripts/new-dashboard/store/index.js b/lib/assets/javascripts/new-dashboard/store/index.js @@ -11,8 +11,6 @@ import search from './modules/search';
import notifications from './modules/notifications';
import recentContent from './modules/recent-content';
-import { updateVisualizationGlobally } from './mutations/visualizations';
-
Vue.use(Vuex);
const storeOptions = {
@@ -20,9 +18,6 @@ const storeOptions = {
client: new CartoNode.AuthenticatedClient()
},
getters: {},
- mutations: {
- updateVisualizationGlobally
- },
modules: {
config,
user,
| 2 |
diff --git a/token-metadata/0x798A9055a98913835bBFb45a0BbC209438dcFD97/metadata.json b/token-metadata/0x798A9055a98913835bBFb45a0BbC209438dcFD97/metadata.json "symbol": "NYB",
"address": "0x798A9055a98913835bBFb45a0BbC209438dcFD97",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/gulpfile.js b/gulpfile.js @@ -24,16 +24,16 @@ const knownOptions = {
}
};
-var options = minimist(process.argv.slice(2), knownOptions);
+const options = minimist(process.argv.slice(2), knownOptions);
const browsers = [];
-let configBrowsers = options.browsers || process.env['MAPTALKS_BROWSERS'] || '';
+const configBrowsers = options.browsers || process.env['MAPTALKS_BROWSERS'] || '';
configBrowsers.split(',').forEach(name => {
if (!name || name.length < 2) {
return;
}
- var lname = name.toLowerCase();
+ const lname = name.toLowerCase();
if (lname.indexOf('phantom') === 0) {
browsers.push('PhantomJS');
}
@@ -48,7 +48,7 @@ gulp.task('scripts', () => {
return bundler.bundle('src/index.js', rollupCfg.config);
});
-var stylesPattern = './assets/css/**/*.css';
+const stylesPattern = './assets/css/**/*.css';
gulp.task('styles', () => {
return gulp.src(stylesPattern)
@@ -80,7 +80,7 @@ gulp.task('watch', ['styles', 'images'], () => {
* Run test once and exit
*/
gulp.task('test', function (done) {
- var karmaConfig = {
+ const karmaConfig = {
configFile: path.join(__dirname, 'build/karma.test.config.js')
};
if (browsers.length > 0) {
@@ -103,7 +103,7 @@ gulp.task('test', function (done) {
* Watch for file changes and re-run tests on each change
*/
gulp.task('tdd', function (done) {
- var karmaConfig = {
+ const karmaConfig = {
configFile: path.join(__dirname, 'build/karma.tdd.config.js')
};
if (browsers.length > 0) {
@@ -116,10 +116,10 @@ gulp.task('tdd', function (done) {
}
};
}
- var started = false;
+ let started = false;
rollupWatch(() => {
if (!started) {
- var karmaServer = new Server(karmaConfig, done);
+ const karmaServer = new Server(karmaConfig, done);
karmaServer.start();
started = true;
}
@@ -140,16 +140,16 @@ gulp.task('reload', ['scripts'], () => {
});
gulp.task('doc', () => {
- var sources = require('./docs/files.js');
+ const sources = require('./docs/files.js');
del([
'../../maptalks.org/docs/api/**/*'
], {
force : true
});
- var conf = require('./jsdoc.json');
- var cmd = 'jsdoc';
- var args = ['-c', 'jsdoc.json'].concat(['API.md']).concat(sources);
- var exec = require('child_process').exec;
+ const conf = require('./jsdoc.json');
+ const cmd = 'jsdoc';
+ const args = ['-c', 'jsdoc.json'].concat(['API.md']).concat(sources);
+ const exec = require('child_process').exec;
exec([cmd].concat(args).join(' '), (error, stdout, stderr) => {
if (error) {
console.error('JSDoc returned with error: ' + stderr ? stderr : '');
| 3 |
diff --git a/rig.js b/rig.js @@ -146,9 +146,9 @@ class RigManager {
const avatarMesh = new THREE.Mesh(geometry, material);
avatarMesh.position.x = -0.5;
avatarMesh.position.y = -0.02;
- this.localRig.textMesh.add(avatarMesh);
- this.localRig.textMesh.sync();
+ this.localRig.textMesh.remove(this.localRig.textMesh.children[0]);
+ this.localRig.textMesh.add(avatarMesh);
}
async setLocalAvatarUrl(url, filename) {
| 2 |
diff --git a/common/lib/transport/messagequeue.ts b/common/lib/transport/messagequeue.ts import ErrorInfo from '../types/errorinfo';
import EventEmitter from '../util/eventemitter';
import Logger from '../util/logger';
-
-type PendingMessage = any;
+import { PendingMessage } from './protocol';
class MessageQueue extends EventEmitter {
messages: Array<PendingMessage>;
| 14 |
diff --git a/packages/gluestick/src/cli/colorScheme.js b/packages/gluestick/src/cli/colorScheme.js @@ -5,7 +5,9 @@ import type { LoggerTypes } from '../types';
const chalk = require('chalk');
const success = chalk.green;
-const info = chalk.gray;
+// Here we don't want to set color
+// cause of https://github.com/TrueCar/gluestick/issues/624
+const info = (msg) => msg;
const warn = chalk.yellow;
const filename = chalk.cyan;
const highlight = chalk.bold;
| 12 |
diff --git a/js/electron.js b/js/electron.js @@ -17,6 +17,7 @@ const BrowserWindow = electron.BrowserWindow;
let mainWindow;
function createWindow() {
+ app.commandLine.appendSwitch('autoplay-policy', 'no-user-gesture-required');
var electronOptionsDefaults = {
width: 800,
height: 600,
| 11 |
diff --git a/src/components/configurable-items/configurable-items.stories.js b/src/components/configurable-items/configurable-items.stories.js @@ -48,8 +48,7 @@ const handleChange = (rowIndex) => {
action('changed')();
};
const handleSave = (event) => {
- event.preventDefault();
- event.stopPropagation();
+ event.persist();
action('saved')();
};
| 14 |
diff --git a/token-metadata/0x56687cf29Ac9751Ce2a4E764680B6aD7E668942e/metadata.json b/token-metadata/0x56687cf29Ac9751Ce2a4E764680B6aD7E668942e/metadata.json "symbol": "JAMM",
"address": "0x56687cf29Ac9751Ce2a4E764680B6aD7E668942e",
"decimals": 4,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/package.json b/package.json "build:js": "npm-run-all build:lib build:bundle",
"build:lib": "node ./bin/build-lib.js",
"build": "npm-run-all --parallel build:js build:css build:companion --serial build:gzip size",
- "clean": "rm -rf packages/*/lib packages/@uppy/*/lib && rm -rf packages/uppy/dist && rm -rf packages/@uppy/robodog/dist",
+ "clean": "rm -rf packages/*/lib packages/@uppy/*/lib && rm -rf packages/*/dist packages/@uppy/*/dist",
"lint:fix": "npm run lint -- --fix",
"lint": "eslint . --cache",
"lint-staged": "lint-staged",
| 3 |
diff --git a/lib/plugins/aws/provider/awsProvider.js b/lib/plugins/aws/provider/awsProvider.js @@ -150,7 +150,16 @@ class AwsProvider {
that.serverless.cli.log("'Too many requests' received, sleeping 5 seconds");
setTimeout(doCall, 5000);
} else {
- reject(e);
+ if (e.message === 'The security token included in the request is invalid') {
+ const errorMessage = [
+ 'The AWS security token included in the request is invalid.',
+ 'Please check your ~./aws/credentials file and verify your keys are correct.',
+ 'More information on setting up credentials',
+ `can be found here: ${chalk.green('https://git.io/vXsdd')}.`
+ ].join('');
+ e.message = errorMessage;
+ }
+ reject(new this.serverless.classes.Error(e.message, e.statusCode));
}
});
};
| 7 |
diff --git a/core/workspace_svg.js b/core/workspace_svg.js @@ -479,7 +479,7 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
this.grid_.update(this.scale);
}
this.recordDeleteAreas();
- this.recordWorkspaceAreas();
+ this.recordWorkspaceArea();
return this.svgGroup_;
};
@@ -656,7 +656,7 @@ Blockly.WorkspaceSvg.prototype.getToolbox = function() {
Blockly.WorkspaceSvg.prototype.updateScreenCalculations_ = function() {
this.updateInverseScreenCTM();
this.recordDeleteAreas();
- this.recordWorkspaceAreas();
+ this.recordWorkspaceArea();
};
/**
@@ -1171,10 +1171,10 @@ Blockly.WorkspaceSvg.prototype.recordDeleteAreas = function() {
};
/**
- * Make the bounding rectangles which contain this workspace and flyout. These
- * are necessary to detect if mouse is over the elements.
+ * Make the bounding rectangle which contains this workspace. These are
+ * necessary to detect if mouse is over the elements.
*/
-Blockly.WorkspaceSvg.prototype.recordWorkspaceAreas = function() {
+Blockly.WorkspaceSvg.prototype.recordWorkspaceArea = function() {
if (this.isFlyout) {
var rect = this.ownerFlyout_.getBoundingRectangle();
} else {
@@ -1182,10 +1182,6 @@ Blockly.WorkspaceSvg.prototype.recordWorkspaceAreas = function() {
this.svgGroup_.getBoundingClientRect());
}
this.workspaceArea_ = rect;
-
- if (this.flyout_) {
- this.flyoutArea_ = this.flyout_.getBoundingRectangle();
- }
};
/**
@@ -1211,7 +1207,8 @@ Blockly.WorkspaceSvg.prototype.isDeleteArea = function(e) {
*/
Blockly.WorkspaceSvg.prototype.isFlyoutArea = function(e) {
var xy = new goog.math.Coordinate(e.clientX, e.clientY);
- return !!this.flyoutArea_ && this.flyoutArea_.contains(xy);
+ var rect = this.flyout_ && this.flyout_.getWorkspace().workspaceArea_;
+ return !!rect && rect.contains(xy);
};
/**
| 2 |
diff --git a/src/electron.js b/src/electron.js @@ -1194,6 +1194,11 @@ function updateBrightness(index, level, useCap = true) {
monitor = monitors[index]
}
+ if(!monitor) {
+ console.log(`Monitor does not exist: ${index}`)
+ return false
+ }
+
try {
const normalized = normalizeBrightness(level, false, (useCap ? monitor.min : 0), (useCap ? monitor.max : 100))
monitor.brightness = level
| 8 |
diff --git a/lib/misc/scopes.coffee b/lib/misc/scopes.coffee @@ -9,6 +9,12 @@ module.exports =
if scope.indexOf('keyword') > -1
return true
+ isStringScope: (scopes) ->
+ for scope in scopes
+ if scope.indexOf('string') > -1
+ return true
+ return false
+
forRange: (ed, range) ->
scopes = []
n_parens = 0
@@ -17,6 +23,7 @@ module.exports =
for t in l
{value} = t
+ if not @isStringScope(t.scopes)
if n_parens > 0 and value == ')'
n_parens -= 1
scopes.splice(scopes.lastIndexOf('paren'), 1)
| 8 |
diff --git a/src/client/js/components/Fab.jsx b/src/client/js/components/Fab.jsx @@ -16,7 +16,6 @@ const Fab = (props) => {
const { navigationContainer, appContainer } = props;
const { currentUser } = appContainer;
-
const [animateClasses, setAnimateClasses] = useState('invisible');
@@ -42,7 +41,7 @@ const Fab = (props) => {
};
}, [stickyChangeHandler]);
- function renderEditorButton() {
+ function renderPageCreateButton() {
return (
<>
<div className={`rounded-circle position-absolute ${animateClasses}`} style={{ bottom: '2.3rem', right: '4rem' }}>
@@ -60,7 +59,7 @@ const Fab = (props) => {
return (
<div className="grw-fab d-none d-md-block">
- {currentUser != null && renderEditorButton()}
+ {currentUser != null && renderPageCreateButton()}
<div className={`rounded-circle position-absolute ${animateClasses}`} style={{ bottom: 0, right: 0 }}>
<button type="button" className="btn btn-light btn-scroll-to-top rounded-circle p-0" onClick={() => navigationContainer.smoothScrollIntoView()}>
<ReturnTopIcon />
| 10 |
diff --git a/package.json b/package.json },
"repository": {
"type": "git",
- "url": "https://github.com/conveyal/datatools-ui.git"
+ "url": "https://github.com/ibi-group/datatools-ui.git"
},
"author": "Conveyal LLC",
"license": "MIT",
| 3 |
diff --git a/_config.yml b/_config.yml @@ -60,6 +60,18 @@ algolia:
application_id: 'ITI5JHZJM9'
index_name: 'diybiosphere'
lazy_update: true
+ attributesToIndex:
+ - title
+ - h1
+ - h2
+ - h3
+ - h4
+ - city
+ - country
+ - collection
+ - type-org
+ - unordered(text)
+ - unordered(tags)
# Collections
collections:
| 0 |
diff --git a/services/dataservices-metrics/lib/geocoder_usage_metrics.rb b/services/dataservices-metrics/lib/geocoder_usage_metrics.rb @@ -32,7 +32,7 @@ module CartoDB
def check_valid_data(service, metric, amount = 0)
raise ArgumentError.new('Invalid service') unless VALID_SERVICES.include?(service)
raise ArgumentError.new('Invalid metric') unless VALID_METRICS.include?(metric)
- raise ArgumentError.new('Invalid geocoder metric amount') if !amount.nil? and amount < 0
+ raise ArgumentError.new('Invalid geocoder metric amount') if amount.nil? || amount <= 0
end
end
end
| 1 |
diff --git a/.github/workflows/homebrew.yml b/.github/workflows/homebrew.yml @@ -32,6 +32,11 @@ jobs:
- name: Add "Versions" Tap
run: brew tap homebrew/homebrew-cask-versions
+ - name: Configure Git user
+ uses: Homebrew/actions/git-user-config@master
+ with:
+ username: 'insomnia-infra'
+
# Update Homebrew's Inso(mnia) formulae
# https://github.com/Homebrew/actions/tree/master/bump-formulae
- name: Bump Inso (Beta) Formula
| 12 |
diff --git a/content/articles/sales-forecasting-with-prophet/index.md b/content/articles/sales-forecasting-with-prophet/index.md @@ -6,7 +6,7 @@ url: /sales-forecasting-with-prophet/
title: Sales Forecasting with Prophet in Python
description: This tutorial will leverage the Prophet library to accurately estimate sales trends.
author: monica-dalmas
-date: 2022-02-22T00:00:00-9:30
+date: 2022-02-22T00:00:00-09:30
topics: [Machine Learning]
excerpt_separator: <!--more-->
images:
| 1 |
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js @@ -1222,8 +1222,14 @@ function syncTicks(ax) {
// get the tick for the current axis based on position
var vali = ax.p2l(pos);
-
+ var val1 = ax.p2l(pos - 0.5);
+ var val2 = ax.p2l(pos + 0.5);
+ var d = 1 + Math.round(Math.log10(Math.abs(val2 - val1)));
+ var e = Math.pow(10, -d);
+ var valR = Math.round(vali * e) / e;
+ var objR = axes.tickText(ax, valR);
var obj = axes.tickText(ax, vali);
+ obj.text = objR.text;
// assign minor ticks
if(baseAxis._vals[i].minor) {
| 7 |
diff --git a/src/victory-legend/victory-legend.js b/src/victory-legend/victory-legend.js @@ -111,16 +111,18 @@ export default class VictoryLegend extends React.Component {
getCalculatedProps() { // eslint-disable-line max-statements
const { role } = this.constructor;
const { data, orientation, theme } = this.props;
- let { height, width } = this.props;
-
+ let { height, padding, width } = this.props;
const legendTheme = theme && theme[role] ? theme[role] : {};
const colorScale = this.getColorScale(legendTheme);
const isHorizontal = orientation === "horizontal";
- const padding = Helpers.getPadding(this.props);
const symbolStyles = [];
const labelStyles = [];
let leftOffset = 0;
+ padding = Helpers.getPadding({ padding: padding || theme.padding });
+ height = height || theme.height;
+ width = width || theme.width;
+
const textSizes = data.map((datum, i) => {
const labelStyle = this.getStyles(datum, legendTheme, "labels");
symbolStyles[i] = this.getStyles(datum, legendTheme, "symbol", colorScale[i]);
@@ -142,7 +144,7 @@ export default class VictoryLegend extends React.Component {
return Object.assign({},
this.props,
- { isHorizontal, padding, textSizes, height, width, labelStyles, symbolStyles }
+ { isHorizontal, height, labelStyles, padding, symbolStyles, textSizes, width }
);
}
| 11 |
diff --git a/src/main/webapp/org/cboard/controller/config/widgetCtrl.js b/src/main/webapp/org/cboard/controller/config/widgetCtrl.js @@ -1564,7 +1564,7 @@ cBoard.controller('widgetCtrl', function ($scope, $stateParams, $http, $uibModal
$scope.curWidget.query = {};
$http.get('dashboard/getConfigParams.do?type=' + $scope.datasource.type + '&page=widget.html').then(function (response) {
$scope.params = response.data;
- for (i in $scope.params) {
+ for (var i in $scope.params) {
var name = $scope.params[i].name;
var value = $scope.params[i].value;
var checked = $scope.params[i].checked;
| 1 |
diff --git a/docusaurus.config.js b/docusaurus.config.js @@ -245,7 +245,7 @@ const config = {
zoom: {
selector: ':not(.mediaImage, .navbar__logo img)', // don't zoom these images
background: {
- light: 'rgb(255, 255, 255)',
+ light: 'rgb(50, 50, 50)',
dark: 'rgb(50, 50, 50)'
},
// options you can specify via https://github.com/francoischalifour/medium-zoom#usage
| 12 |
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js @@ -197,7 +197,10 @@ module.exports = {
nodir: true,
}).then(allFilePaths => {
const filePathStates = allFilePaths.reduce((p, c) => Object.assign(p, { [c]: true }), {});
- patterns.forEach(p => {
+ patterns
+ // nanomatch only does / style path delimiters, so convert them if on windows
+ .map(p => (process.platform === 'win32' ? p.replace(/\\/g, '/') : p))
+ .forEach(p => {
const exclude = p.startsWith('!');
const pattern = exclude ? p.slice(1) : p;
nanomatch(allFilePaths, [pattern], { dot: true })
| 14 |
diff --git a/app/menu.js b/app/menu.js // @flow
import { app, Menu, shell, BrowserWindow } from 'electron';
import path from 'path';
+import fs from 'fs';
import { clearCache } from './utils/utils';
export default class MenuBuilder {
@@ -105,7 +106,13 @@ export default class MenuBuilder {
{ label: 'Show Worker', click: () => { this.workerWindow.show(); } },
{ label: 'Show OpenCvWorker', click: () => { this.opencvWorkerWindow.show(); } },
{ label: 'Show log file', click: () => {
- shell.showItemInFolder(path.resolve(process.env.HOME || process.env.USERPROFILE, 'Library/Logs/', app.getName()));
+ const pathOfLogFolder = path.resolve(process.env.HOME || process.env.USERPROFILE, 'Library/Logs/', `${app.getName()}/`);
+ const pathOfLogFile = path.resolve(pathOfLogFolder, 'log.log');
+ if (fs.existsSync(pathOfLogFile)) {
+ shell.showItemInFolder(pathOfLogFile);
+ } else {
+ shell.showItemInFolder(pathOfLogFolder);
+ }
} },
]
};
@@ -226,7 +233,13 @@ export default class MenuBuilder {
{ label: 'Show Worker', click: () => { this.workerWindow.show(); } },
{ label: 'Show OpenCvWorker', click: () => { this.opencvWorkerWindow.show(); } },
{ label: 'Show log file', click: () => {
- shell.showItemInFolder(path.resolve(process.env.HOME || process.env.USERPROFILE, 'AppData\\Roaming\\', app.getName()));
+ const pathOfLogFolder = path.resolve(process.env.HOME || process.env.USERPROFILE, 'AppData\\Roaming\\', `${app.getName()}/`);
+ const pathOfLogFile = path.resolve(pathOfLogFolder, 'log.log');
+ if (fs.existsSync(pathOfLogFile)) {
+ shell.showItemInFolder(pathOfLogFile);
+ } else {
+ shell.showItemInFolder(pathOfLogFolder);
+ }
} },
]
};
| 7 |
diff --git a/apps/stopwatch/README.md b/apps/stopwatch/README.md @@ -31,3 +31,6 @@ Which one is which ?
+
+
+Written by: [Hugh Barney](https://github.com/hughbarney) For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/)
| 3 |
diff --git a/reproduction-template.js b/reproduction-template.js @@ -45,8 +45,6 @@ async function main() {
.eager('pets');
chai.expect(jennifer.pets[0].name).to.equal('Doggo');
-
- await knex.destroy()
}
///////////////////////////////////////////////////////////////
@@ -56,7 +54,7 @@ async function main() {
const knex = Knex({
client: 'sqlite3',
useNullAsDefault: true,
- debug: true,
+ debug: false,
connection: {
filename: ':memory:'
}
@@ -266,5 +264,11 @@ async function createSchema() {
}
main()
- .then(() => console.log('success'))
- .catch(console.error);
+ .then(() => {
+ console.log('success')
+ return knex.destroy()
+ })
+ .catch(err => {
+ console.error(err)
+ return knex.destroy()
+ });
| 7 |
diff --git a/404.js b/404.js @@ -12,6 +12,9 @@ const {Transaction, Common} = ethereumJsTx;
const web3SidechainEndpoint = 'https://ethereum.exokit.org';
const storageHost = 'https://storage.exokit.org';
+const expectedNetworkType = 'rinkeby';
+const openSeaUrlPrefix = `https://${expectedNetworkType === 'main' ? '' : expectedNetworkType + '.'}opensea.io/assets`;
+const openSeaUrl = `${openSeaUrlPrefix}/m3-v7`;
// const discordOauthUrl = `https://discord.com/api/oauth2/authorize?client_id=684141574808272937&redirect_uri=https%3A%2F%2Fapp.webaverse.com%2Fdiscordlogin.html&response_type=code&scope=identify`;
let mainnetAddress = null;
@@ -23,7 +26,7 @@ try {
await window.ethereum.enable();
networkType = await web3['main'].eth.net.getNetworkType();
- if (networkType === 'rinkeby') {
+ if (expectedNetworkType === 'rinkeby') {
mainnetAddress = web3['main'].currentProvider.selectedAddress;
} else {
document.write(`network is ${networkType}; switch to Rinkeby`);
| 0 |
diff --git a/static/css/bot.scss b/static/css/bot.scss @@ -110,6 +110,14 @@ body {
display: table;
}
+#all-accounts.main-nav, #toolbox-all-accounts.main-nav {
+ >li {
+ >ul {
+ width: 165px;
+ }
+ }
+}
+
.left-header {
float: left;
}
| 12 |
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb @@ -10,10 +10,10 @@ Paperclip.interpolates(:class_basename) do |attachment, style|
Pageflow::PaperclipInterpolations::Support.class_basename(attachment, style)
end
-Paperclip.interpolates(:attachments_path_name) do |attachment, _style|
+Paperclip.interpolates(:attachments_path_name) do |attachment, style|
record = attachment.instance
return record.attachments_path_name if record.respond_to?(:attachments_path_name)
- attachment.name.to_s.pluralize
+ self.attachment(attachment, style)
end
Paperclip.interpolates(:pageflow_placeholder) do |attachment, style|
| 7 |
diff --git a/test/TemplateRenderNunjucksTest.js b/test/TemplateRenderNunjucksTest.js @@ -867,3 +867,14 @@ test("Use addNunjucksGlobal with literal", async (t) => {
let fn = await tr.getCompiledTemplate("<p>{{ fortytwo }}</p>");
t.is(await fn(), "<p>42</p>");
});
+
+// Async not supported here
+test.skip("Use addNunjucksGlobal with async function", async (t) => {
+ let templateConfig = new TemplateConfig();
+ templateConfig.userConfig.addNunjucksGlobal("fortytwo", getPromise(42));
+
+ let tr = getNewTemplateRender("njk", null, templateConfig);
+
+ let fn = await tr.getCompiledTemplate("<p>{{ fortytwo() }}</p>");
+ t.is(await fn(), "<p>42</p>");
+});
| 0 |
diff --git a/README.md b/README.md @@ -82,11 +82,11 @@ You are welcome to test the current version:
5. Run quick_setup script:
```
cd lost/docker/quick_setup/
- python3 quick_setup.py /path/to/install/lost --release 2.0.0-alpha.11
+ python3 quick_setup.py /path/to/install/lost --release 2.0.0-alpha.12
```
If you want to use phpmyadmin, you can set it via argument
```
- python3 quick_setup.py /path/to/install/lost --release 2.0.0-alpha.11 --phpmyadmin
+ python3 quick_setup.py /path/to/install/lost --release 2.0.0-alpha.12 --phpmyadmin
```
6. Run LOST:
| 6 |
diff --git a/src/post/Feed/PostFeedCard.js b/src/post/Feed/PostFeedCard.js @@ -142,27 +142,6 @@ const PostFeedCard = ({
<div className="PostFeedCard__thumbs" dangerouslySetInnerHTML={{ __html: embeds[0].embed }} />
}
-
- <div className="PostFeedCard__cell PostFeedCard__cell--body">
- <h2>
- <PostModalLink
- post={post}
- notify={notify}
- onCommentRequest={onCommentRequest}
- onShowCommentsRequest={handleShowCommentsRequest}
- onShowLikesRequest={handleShowLikesRequest}
- onShowPayoutRequest={handleShowPayoutRequest}
- reblog={reblog}
- isReblogged={isReblogged}
- layout={layout}
- />
- </div>
-
-
- {_.has(embeds, '[0].embed') &&
- <div className="PostFeedCard__thumbs" dangerouslySetInnerHTML={{ __html: embeds[0].embed }} />
- }
-
{(imagePath && !_.has(embeds, '[0].embed')) &&
<div className="PostFeedCard__thumbs">
<PostModalLink
@@ -178,10 +157,16 @@ const PostFeedCard = ({
<div className="PostFeedCard__cell PostFeedCard__cell--bottom">
<PostActionButtons
post={post}
- handleShowLikesRequest={handleShowLikesRequest}
- handleShowCommentsRequest={handleShowCommentsRequest}
+ notify={notify}
+ onCommentRequest={onCommentRequest}
+ onShowCommentsRequest={handleShowCommentsRequest}
+ onShowLikesRequest={handleShowLikesRequest}
+ onShowPayoutRequest={handleShowPayoutRequest}
+ reblog={reblog}
+ isReblogged={isReblogged}
+ layout={layout}
/>
-
+ </div>
<Reactions
post={post}
| 1 |
diff --git a/lib/index.js b/lib/index.js @@ -201,7 +201,7 @@ Nightwatch.cli = function(callback) {
runner.setupAsync()
.then(() => runner.getTestsFiles())
// eslint-disable-next-line no-console
- .then((result) => console.log(JSON.stringify(result)));
+ .then((result) => console.log(Logger.inspectObject(result)));
} else {
if (!Utils.isFunction(callback)) {
throw new Error('Supplied callback argument needs to be a function.');
| 7 |
diff --git a/packages/app/src/stores/use-static-swr.tsx b/packages/app/src/stores/use-static-swr.tsx @@ -6,14 +6,14 @@ import useSWRImmutable from 'swr/immutable';
export function useStaticSWR<Data, Error>(key: Key): SWRResponse<Data, Error>;
-export function useStaticSWR<Data, Error>(key: Key, data: Data | null): SWRResponse<Data, Error>;
-export function useStaticSWR<Data, Error>(key: Key, data: Data | null,
+export function useStaticSWR<Data, Error>(key: Key, data: Data | undefined): SWRResponse<Data, Error>;
+export function useStaticSWR<Data, Error>(key: Key, data: Data | undefined,
configuration: SWRConfiguration<Data, Error> | undefined): SWRResponse<Data, Error>;
export function useStaticSWR<Data, Error>(
...args: readonly [Key]
- | readonly [Key, Data | null]
- | readonly [Key, Data | null, SWRConfiguration<Data, Error> | undefined]
+ | readonly [Key, Data | undefined]
+ | readonly [Key, Data | undefined, SWRConfiguration<Data, Error> | undefined]
): SWRResponse<Data, Error> {
const [key, data, configuration] = args;
@@ -22,7 +22,7 @@ export function useStaticSWR<Data, Error>(
const swrResponse = useSWRImmutable(key, null, configuration);
// mutate
- if (data != null) {
+ if (data !== undefined) {
const { mutate } = swrResponse;
mutate(data);
}
| 7 |
diff --git a/src/graphql/schema.js b/src/graphql/schema.js @@ -10,7 +10,7 @@ import ListReplies from './queries/ListReplies';
// Set individual objects
import CreateArticle from './mutations/CreateArticle';
import CreateReply from './mutations/CreateReply';
-import CreateReplyConnection from './mutations/CreateReplyConnection';
+import CreateArticleReply from './mutations/CreateArticleReply';
import CreateOrUpdateReplyConnectionFeedback from './mutations/CreateOrUpdateReplyConnectionFeedback';
import CreateReplyRequest from './mutations/CreateReplyRequest';
import UpdateReplyConnectionStatus from './mutations/UpdateReplyConnectionStatus';
@@ -31,7 +31,7 @@ export default new GraphQLSchema({
fields: {
CreateArticle,
CreateReply,
- CreateReplyConnection,
+ CreateArticleReply,
CreateReplyRequest,
CreateOrUpdateReplyConnectionFeedback,
UpdateReplyConnectionStatus,
| 10 |
diff --git a/buildScripts/createApp.js b/buildScripts/createApp.js const chalk = require('chalk'),
{ program } = require('commander'),
cp = require('child_process'),
+ cwd = process.cwd(),
envinfo = require('envinfo'),
fs = require('fs'),
inquirer = require('inquirer'),
@@ -15,7 +16,7 @@ program
.version(packageJson.version)
.option('-i, --info', 'print environment debug info')
.option('-a, --appName <value>')
- .option('-m, --mainThreadAddons <value>', 'Comma separated list of AmCharts, AnalyticsByGoogle, DragDrop, HighlightJS, LocalStorage, MapboxGL, Markdown, Siesta, Stylesheet\n Defaults to Stylesheet')
+ .option('-m, --mainThreadAddons <value>', 'Comma separated list of AmCharts, AnalyticsByGoogle, DragDrop, HighlightJS, LocalStorage, MapboxGL, Markdown, Siesta, Stylesheet\n Defaults to DragDrop, Stylesheet')
.option('-t, --themes <value>', '"all", "dark", "light"')
.option('-u, --useSharedWorkers <value>', '"yes", "no"')
.allowUnknownOption()
@@ -93,8 +94,8 @@ inquirer.prompt(questions).then(answers => {
useSharedWorkers = answers.useSharedWorkers || program['useSharedWorkers'],
lAppName = appName.toLowerCase(),
appPath = 'apps/' + lAppName + '/',
- dir = '../apps/' + lAppName,
- folder = path.resolve(__dirname, dir),
+ dir = 'apps/' + lAppName,
+ folder = path.resolve(cwd, dir),
startDate = new Date();
let themes = answers.themes || program['themes'];
@@ -224,14 +225,20 @@ inquirer.prompt(questions).then(answers => {
fs.writeFileSync(folder + '/MainContainer.mjs', mainContainerContent);
- let appJsonPath = path.resolve(__dirname, '../buildScripts/webpack/json/myApps.json'),
+ let appJsonPath = path.resolve(cwd, 'buildScripts/myApps.json'),
appJson;
+ if (fs.existsSync(appJsonPath)) {
+ appJson = require(appJsonPath);
+ } else {
+ appJsonPath = path.resolve(__dirname, '../buildScripts/webpack/json/myApps.json');
+
if (fs.existsSync(appJsonPath)) {
appJson = require(appJsonPath);
} else {
appJson = require(path.resolve(__dirname, '../buildScripts/webpack/json/myApps.template.json'));
}
+ }
appJson.apps[appName] = {
input : `./${appPath}app.mjs`,
| 4 |
diff --git a/packages/app/src/components/PageCommentList.tsx b/packages/app/src/components/PageCommentList.tsx @@ -86,8 +86,7 @@ const PageCommentList:FC<Props> = memo((props:Props):JSX.Element => {
return preprocessComment(highlightedComment);
}));
const preprocessedComments: ICommentHasIdList = comments.map((comment, index) => {
- comment.comment = preprocessedCommentList[index];
- return comment;
+ return { ...comment, comment: preprocessedCommentList[index] };
});
setFormatedComments(preprocessedComments);
}
| 4 |
diff --git a/package.json b/package.json "name": "WebMidi.js",
"tagline": "A JavaScript library to kickstart your MIDI projects"
},
+ "engines" : { "node" : ">=8.5" },
"scripts": {
"build:all": "npm run lint && npm run build:cjs && npm run build:esm && npm run build:iife",
"build:cjs": "node scripts/build/build.js -t cjs",
| 12 |
diff --git a/apps/pokeclk/README.md b/apps/pokeclk/README.md -# About this Watchface
+# Poketch Clock
-Based on the electronic device from the Pokemon game.
+A clock based on the Poketch electronic device found in Sinnoh
-# Features
+Add screen shots (if possible) to the app folder and link then into this file with 
+
+## Features
Has a dark mode
+
+## Requests
+
+Please file any issues here: [https://github.com/elykittytee/BangleApps/issues/new?title=Poketch%20Clock%20Bug](https://github.com/elykittytee/BangleApps/issues/new?title=Poketch%20Clock%20Bug)
+
+## Creator
+
+Eleanor Tayam
| 1 |
diff --git a/src/constants.js b/src/constants.js if (!Memory.username) {
const struc = _.find(Game.structures)
const creep = _.find(Game.creeps)
- Memory.username = (struc ? struc.owner.username : false) || (creep ? creep.owner.username : false)
+ Memory.username = (struc && struc.owner.username) || (creep && creep.owner.username)
}
global.USERNAME = Memory.username
| 7 |
diff --git a/tools/scripts/preuninstall b/tools/scripts/preuninstall @@ -54,8 +54,8 @@ function main() {
var action;
var stats;
var meta;
- var odir;
- var ndir;
+ var op;
+ var np;
var p;
var i;
@@ -68,17 +68,12 @@ function main() {
debug( 'Reverting changes...' );
for ( i = meta.length-1; i >= 0; i-- ) { // NOTE: reverting changes in reverse order!!!
action = meta[ i ][ 0 ];
- if ( action === 'move' ) {
- odir = meta[ i ][ 1 ];
- ndir = meta[ i ][ 2 ];
+ if ( action === 'rename' ) {
+ op = meta[ i ][ 1 ];
+ np = meta[ i ][ 2 ];
- debug( 'Moving: %s...', ndir );
- fs.renameSync( ndir, odir );
- } else if ( action === 'link' ) {
- p = meta[ i ][ 2 ];
-
- debug( 'Deleting: %s...', p );
- fs.unlinkSync( p );
+ debug( 'Renaming: %s...', np );
+ fs.renameSync( np, op );
} else if ( action === 'create' ) {
p = meta[ i ][ 1 ];
stats = fs.statSync( p );
| 10 |
diff --git a/src/blockchain/failedTxMonitor.js b/src/blockchain/failedTxMonitor.js @@ -3,6 +3,8 @@ const { toBN } = require('web3-utils');
const logger = require('winston');
const LPVaultArtifact = require('giveth-liquidpledging/build/LPVault.json');
const LPPCappedMilestoneArtifact = require('lpp-capped-milestone/build/LPPCappedMilestone.json');
+const LPMilestoneArtifact = require('lpp-milestones/build/LPMilestone.json');
+const BridgedMilestoneArtifact = require('lpp-milestones/build/BridgedMilestone.json');
const eventDecodersFromArtifact = require('./lib/eventDecodersFromArtifact');
const topicsFromArtifacts = require('./lib/topicsFromArtifacts');
@@ -21,7 +23,9 @@ function eventDecoders() {
return {
lp: eventDecodersFromArtifact(LiquidPledgingArtifact),
vault: eventDecodersFromArtifact(LPVaultArtifact),
- milestone: eventDecodersFromArtifact(LPPCappedMilestoneArtifact),
+ milestone: eventDecodersFromArtifact(LPPCappedMilestoneArtifact)
+ .concat(eventDecodersFromArtifact(LPMilestoneArtifact))
+ .concat(eventDecodersFromArtifact(BridgedMilestoneArtifact)),
};
}
@@ -357,7 +361,12 @@ const failedTxMonitor = (app, eventWatcher) => {
}
const topics = topicsFromArtifacts(
- [LiquidPledgingArtifact, LPPCappedMilestoneArtifact],
+ [
+ LiquidPledgingArtifact,
+ LPPCappedMilestoneArtifact,
+ LPMilestoneArtifact,
+ BridgedMilestoneArtifact,
+ ],
[
'ProjectAdded',
'CancelProject',
@@ -370,6 +379,11 @@ const failedTxMonitor = (app, eventWatcher) => {
'MilestoneCampaignReviewerChanged',
'MilestoneChangeRecipientRequested',
'MilestoneRecipientChanged',
+ 'RequestReview',
+ 'RejectCompleted',
+ 'ApproveCompleted',
+ 'ReviewerChanged',
+ 'RecipientChanged',
'PaymentCollected',
],
);
| 9 |
diff --git a/articles/api/authentication/api-authz/_authz-client.md b/articles/api/authentication/api-authz/_authz-client.md @@ -53,6 +53,7 @@ This is the OAuth 2.0 grant that regular web apps utilize in order to access an
| `client_id` <br/><span class="label label-danger">Required</span> | Your application's Client ID. |
| `state` <br/><span class="label label-primary">Recommended</span> | An opaque value the clients adds to the initial request that Auth0 includes when redirecting the back to the client. This value must be used by the client to prevent CSRF attacks. |
| `redirect_uri` | The URL to which Auth0 will redirect the browser after authorization has been granted by the user. |
+| `prompt` | To initiate a [silent authentication](/api-auth/tutorials/silent-authentication) request, use `prompt=none`. |
### Test with Authentication API Debugger
@@ -124,6 +125,7 @@ This is the OAuth 2.0 grant that mobile apps utilize in order to access an API.
| `redirect_uri` | The URL to which Auth0 will redirect the browser after authorization has been granted by the user. |
| `code_challenge_method` <br/><span class="label label-danger">Required</span> | Method used to generate the challenge. The PKCE spec defines two methods, `S256` and `plain`, however, Auth0 supports only `S256` since the latter is discouraged. |
| `code_challenge` <br/><span class="label label-danger">Required</span> | Generated challenge from the `code_verifier`. |
+| `prompt` | To initiate a [silent authentication](/api-auth/tutorials/silent-authentication) request, use `prompt=none`. |
### Test with Authentication API Debugger
| 0 |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml @@ -56,8 +56,7 @@ jobs:
if: steps.changesets.outputs.published != 'true'
run: |
git checkout master
- yarn version:canary
- yarn release:canary
+ yarn publish-canary
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
| 3 |
diff --git a/src/calendar.jsx b/src/calendar.jsx @@ -691,6 +691,12 @@ export default class Calendar extends React.Component {
);
};
+ handleTodayButtonClick = (e) => {
+ this.props.onSelect(getStartOfToday(), e);
+ this.props.setPreSelection(getStartOfToday());
+ };
+
+
renderTodayButton = () => {
if (!this.props.todayButton || this.props.showTimeSelectOnly) {
return;
@@ -698,7 +704,7 @@ export default class Calendar extends React.Component {
return (
<div
className="react-datepicker__today-button"
- onClick={(e) => this.props.onSelect(getStartOfToday(), e)}
+ onClick={(e) => this.handleTodayButtonClick(e)}
>
{this.props.todayButton}
</div>
| 12 |
diff --git a/test/jasmine/tests/config_test.js b/test/jasmine/tests/config_test.js var Plotly = require('@lib/index');
var Plots = Plotly.Plots;
var Lib = require('@src/lib');
+
+var d3 = require('d3');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var click = require('../assets/click');
@@ -760,4 +762,55 @@ describe('config argument', function() {
.then(done);
});
});
+
+ describe('scrollZoom interactions:', function() {
+ var gd;
+
+ afterEach(function() {
+ Plotly.purge(gd);
+ destroyGraphDiv();
+ });
+
+ function _scroll() {
+ var mainDrag = d3.select('.nsewdrag[data-subplot="xy"]').node();
+ mouseEvent('scroll', 200, 200, {deltaY: -200, element: mainDrag});
+ }
+
+ it('should not disable scrollZoom when *responsive:true*', function(done) {
+ gd = document.createElement('div');
+ gd.id = 'graph';
+ gd.style.height = '85vh';
+ gd.style.minHeight = '300px';
+ document.body.appendChild(gd);
+
+ // locking down fix for:
+ // https://github.com/plotly/plotly.js/issues/3337
+
+ var xrng0;
+ var yrng0;
+
+ Plotly.newPlot(gd, [{
+ y: [1, 2, 1]
+ }], {}, {
+ scrollZoom: true,
+ responsive: true
+ })
+ .then(function() {
+ xrng0 = gd._fullLayout.xaxis.range.slice();
+ yrng0 = gd._fullLayout.yaxis.range.slice();
+ })
+ .then(_scroll)
+ .then(function() {
+ var xrng = gd._fullLayout.xaxis.range;
+ expect(xrng[0]).toBeGreaterThan(xrng0[0], 'scrolled x-range[0]');
+ expect(xrng[1]).toBeLessThan(xrng0[1], 'scrolled x-range[1]');
+
+ var yrng = gd._fullLayout.yaxis.range;
+ expect(yrng[0]).toBeGreaterThan(yrng0[0], 'scrolled y-range[0]');
+ expect(yrng[1]).toBeLessThan(yrng0[1], 'scrolled y-range[1]');
+ })
+ .catch(failTest)
+ .then(done);
+ });
+ });
});
| 0 |
diff --git a/src/utils/index.js b/src/utils/index.js 'use strict';
-const _get = require('lodash/get');
-const _clone = require('lodash/clone');
+import _clone from 'lodash/clone';
+import _get from 'lodash/get';
+import compile from 'lodash/template';
import jsonLogic from 'json-logic-js';
-import { compile } from 'handlebars/dist/handlebars';
module.exports = {
jsonLogic, // Share
@@ -253,7 +253,12 @@ module.exports = {
* @returns {XML|string|*|void}
*/
interpolate: function(string, data) {
- return compile(string)(data);
+ const templateSettings = {
+ evaluate: /\{\{(.+?)\}\}/g,
+ interpolate: /\{\{=(.+?)\}\}/g,
+ escape: /\{\{-(.+?)\}\}/g
+ };
+ return compile(string, templateSettings)(data);
},
/**
| 14 |
diff --git a/src/generators/tailwind.js b/src/generators/tailwind.js @@ -60,6 +60,7 @@ module.exports = {
const tailwindPlugin = typeof tailwindConfig === 'object' ? tailwind(tailwindConfig) : tailwind()
const extractor = maizzleConfig.cleanup.purgeCSS.extractor || /[\w-/:]+(?<!:)/g
+ const purgeContent = maizzleConfig.cleanup.purgeCSS.content || [];
const purgeWhitelist = maizzleConfig.cleanup.purgeCSS.whitelist || []
const purgewhitelistPatterns = maizzleConfig.cleanup.purgeCSS.whitelistPatterns || []
@@ -67,7 +68,10 @@ module.exports = {
postcssNested(),
tailwindPlugin,
purgecss({
- content: [{ raw: html }],
+ content: [
+ ...purgeContent,
+ { raw: html }
+ ],
defaultExtractor: content => content.match(extractor) || [],
whitelist: purgeWhitelist,
whitelistPatterns: purgewhitelistPatterns
| 11 |
diff --git a/publish/src/commands/import-fee-periods.js b/publish/src/commands/import-fee-periods.js @@ -197,7 +197,7 @@ const importFeePeriods = async ({
index,
feePeriod.feePeriodId,
feePeriod.startingDebtIndex,
- index === 0 ? +feePeriod.startTime - 32400 : feePeriod.startTime,
+ feePeriod.startTime,
feePeriod.feesToDistribute,
feePeriod.feesClaimed,
feePeriod.rewardsToDistribute,
| 13 |
diff --git a/metaverse_modules/overworld/index.js b/metaverse_modules/overworld/index.js import * as THREE from 'three';
-import {ShaderLib} from 'three/src/renderers/shaders/ShaderLib.js';
-import {UniformsUtils} from 'three/src/renderers/shaders/UniformsUtils.js';
-// import * as ThreeVrm from '@pixiv/three-vrm';
-// const {MToonMaterial} = ThreeVrm;
-// window.ThreeVrm = ThreeVrm;
-// import easing from './easing.js';
-// import {StreetGeometry} from './StreetGeometry.js';
import metaversefile from 'metaversefile';
-const {useApp, useFrame, useRenderer, useCamera, useMaterials, useCleanup} = metaversefile;
-
-// const baseUrl = import.meta.url.replace(/(\/)[^\/\\]*$/, '$1');
-
-// const localVector = new THREE.Vector3();
-// const localQuaternion = new THREE.Quaternion();
+const {useApp} = metaversefile;
export default e => {
const app = useApp();
- // const physics = usePhysics();
- // const procGen = useProcGen();
- // const {alea, chunkWorldSize} = procGen;
- // const renderer = useRenderer();
- // const camera = useCamera();
- // const {WebaverseShaderMaterial} = useMaterials();
app.name = 'overworld';
@@ -45,6 +27,22 @@ export default e => {
}
]
},
+ {
+ type: 'app',
+ position: [0, 0, -300],
+ quaternion: [0, 1, 0, 0],
+ start_url: "../metaverse_modules/scene-preview/",
+ components: [
+ {
+ key: "previewPosition",
+ value: [0, 0, -150]
+ },
+ {
+ key: "sceneUrl",
+ value: "./scenes/battalion.scn"
+ },
+ ],
+ },
];
const objects = new Map();
@@ -84,18 +82,5 @@ export default e => {
await Promise.all(promises);
})());
- //
-
- /* const cubeRenderTarget = new THREE.WebGLCubeRenderTarget(
- resolution,
- {
- generateMipmaps: true,
- minFilter: THREE.LinearMipmapLinearFilter,
- // magFilter: THREE.LinearMipmapLinearFilter,
- },
- );
- cubeRenderTarget.texture.mapping = THREE.CubeRefractionMapping;
- const cubeCamera = new THREE.CubeCamera(near, camera.far, cubeRenderTarget); */
-
return app;
};
\ No newline at end of file
| 4 |
diff --git a/test/vgl-font.spec.js b/test/vgl-font.spec.js @@ -16,7 +16,7 @@ describe("VglFont component", function() {
}).$mount();
assert.isNull(vm.$refs.other.vglFonts.forGet["dm'&^>"]);
});
- it("Should be replaced when the image is loaded.", function(done) {
+ it("Should be replaced when the typeface is loaded.", function(done) {
const vm = new Vue({
template: `<vgl-namespace><vgl-font name="'<!--" src="base/node_modules/three/examples/fonts/helvetiker_regular.typeface.json" ref="f" /><other-component ref="other" /></vgl-namespace>`,
components: {
| 1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.