code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/threeD-components/Inventory.js b/threeD-components/Inventory.js @@ -9,6 +9,11 @@ const InventoryCard = (props = {}) => {
</a>
`;
};
+const InventoryAvatar = props => {
+ return `<div class=avatar>
+ <img src="${location.protocol}//${location.host}/female.png">
+ </div>`;
+};
const InventoryDetails = props => {
const {selectedId, selectedHash, selectedFileName} = props;
return `\
@@ -104,7 +109,7 @@ const Inventory = (props = {}) => {
}
</style>
<div class="threeD-inventory">
- <div class=avatar></div>
+ ${InventoryAvatar()}
<div class=tiles>
${inventoryItems.map(item => InventoryCard(item)).join('\n')}
</div>
| 0 |
diff --git a/src/components/ContentWrap.jsx b/src/components/ContentWrap.jsx @@ -741,20 +741,9 @@ export default class ContentWrap extends Component {
/>
</div>
</div>
- <UserCodeMirror
- options={{
- mode: 'htmlmixed',
- profile: 'xhtml',
- gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
- noAutocomplete: true,
- matchTags: { bothTags: true },
- emmet: true
- }}
- prefs={this.props.prefs}
- onChange={this.onHtmlCodeChange.bind(this)}
- onCreation={el => (this.cm.html = el)}
- onFocus={this.editorFocusHandler.bind(this)}
- />
+ <div>
+ Welcome to ZenUML.
+ </div>
</div>
<div
data-code-wrap-id="1"
| 14 |
diff --git a/assets/js/googlesitekit/modules/datastore/modules.js b/assets/js/googlesitekit/modules/datastore/modules.js @@ -233,7 +233,6 @@ const baseActions = {
* @param {WPComponent} [settings.settingsViewComponent] Optional. React component to render the settings view panel. Default none.
* @param {WPComponent} [settings.setupComponent] Optional. React component to render the setup panel. Default none.
* @param {Function} [settings.checkRequirements] Optional. Function to check requirements for the module. Throws a WP error object for error or returns on success.
- * @return {void}
*/
*registerModule( slug, {
name,
| 2 |
diff --git a/docs/README.md b/docs/README.md @@ -137,6 +137,8 @@ Some fragments (`hero` fragment for example) may display images, if configured i
So the fragment will look in the following order `fragment > page > images (global)`. If you need to use an image in several pages you can put it in the `static/images/` directory and the image would be available globally. But if an image may differ between two pages or even two fragments of same type, it's possible to have it using this mechanism.
+Syna supports custom favicons in config.toml allowing for ICO, PNG or SVG image formats. In order to use one of the custom favicon formats, you can specify the image file name in config.toml and save the image file in the '/static' directory.
+
### Supported Colors
Fragments and various elements can be customized further using Bootstrap color classes.
| 0 |
diff --git a/layouts/partials/head.html b/layouts/partials/head.html <meta name="theme-author-url" content="https://about.okkur.org">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <meta http-equiv="Content-Language" content="{{ .Site.LanguageCode | default "en-us" }}">
<meta name="google" value="notranslate">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
| 4 |
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml @@ -26,72 +26,25 @@ on:
jobs:
pre-deploy:
- uses: GoodDollar/GoodDAPP/.github/workflows/android_utils.yml@3493-code-push
+ uses: ./.github/workflows/android_utils.yml
with:
target_branch: ${{ github.event.inputs.release }}
codepush:
name: Hot Code Push
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - name: Git branch name
- id: git-branch-name
- uses: EthanSK/git-branch-name-action@v1
- - name: Detect and set target branch
- run: |
- echo "TARGET_BRANCH=${{ inputs.target_branch || env.GIT_BRANCH_NAME }}" >> $GITHUB_ENV
- - name: Pre-checks - Env is Dev
- run: |
- echo "ENV=development" >> $GITHUB_ENV
- echo "SECRET_NAME=DEV_ENV" >> $GITHUB_ENV
- echo "APPCENTER_NAME=GoodDollar/GoodDollar-Android-development" >> $GITHUB_ENV
- echo "APPCENTER_TOKEN=${{ secrets.APPCENTER_ANDROID_DEV }}" >> $GITHUB_ENV
- echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_DEV }}" >> $GITHUB_ENV
- - name: Pre-checks - Env is QA
- if: ${{ env.TARGET_BRANCH == 'staging' }}
- run: |
- echo "ENV=staging" >> $GITHUB_ENV
- echo "SECRET_NAME=STAGING_ENV" >> $GITHUB_ENV
- echo "APPCENTER_NAME=GoodDollar/GoodDollar-Android-staging" >> $GITHUB_ENV
- echo "APPCENTER_TOKEN=${{ secrets.APPCENTER_ANDROID_STAGING }}" >> $GITHUB_ENV
- echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_STAGING }}" >> $GITHUB_ENV
- - name: Pre-checks - Env is PROD
- if: ${{ env.TARGET_BRANCH == 'next' }}
- run: |
- echo "ENV=prod" >> $GITHUB_ENV
- echo "SECRET_NAME=PROD_ENV" >> $GITHUB_ENV
- echo "APPCENTER_NAME=GoodDollar/GoodDollar-Android-production" >> $GITHUB_ENV
- echo "APPCENTER_TOKEN=${{ secrets.APPCENTER_ANDROID_PROD }}" >> $GITHUB_ENV
- echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_PROD }}" >> $GITHUB_ENV
- - uses: actions/setup-node@v1
- with:
- node-version: 14
- - name: Cache & install npm dependencies
- uses: bahmutov/npm-install@v1
- with:
- install-command: yarn --frozen-lockfile
- - name: add .env secrets
- env:
- SENTRYRC: ${{ secrets.sentryrc_file }}
- run: |
- env_name="${{ env.ENV }}"
- echo $env_name
- cat .env.$env_name
- echo "adding secrets to .env.$env_name file: ${{ env.SECRET_NAME }}"
- echo "$SENTRYRC" > android/sentry.properties
- echo "${{ secrets[env.SECRET_NAME] }}" >> .env.$env_name
- echo "REACT_APP_CODE_PUSH_KEY=${{ env.APPCENTER_CODEPUSH_TOKEN }}" >> .env.$env_name
- - name: Code push release
+ - name: Code push prepare
env:
BUILD_NUMBER: ${{ github.run_number }}
CODE_PUSH_DEPLOYMENT_KEY: ${{ env.APPCENTER_CODEPUSH_TOKEN }}
run: |
echo 'Code push release target version "${BUILD_NUMBER}"'
yarn lingui:compile
+ - name: Code push release
uses: joabalea/[email protected]
with:
command: npx appcenter codepush release-react ${{ env.APPCENTER_NAME }} android
- token: ${{ env.APPCENTER_TOKEN }}
+ token: ${{ env.APPCENTER_CODEPUSH_TOKEN }}
# This workflow contains a single job called "build"
build:
| 13 |
diff --git a/docs/guides/building-a-minecraft-demo.md b/docs/guides/building-a-minecraft-demo.md @@ -331,9 +331,8 @@ using `<a-mixin>` which can be reused to create voxels like a prefab:
<a-entity mixin="voxel" position="-1 0 -2"></a-entity>
<a-entity mixin="voxel" position="0 0 -2"></a-entity>
- <a-entity mixin="voxel" position="0 1 -2">
- <a-animation attribute="rotation" to="0 360 0" repeat="indefinite"></a-animation>
- </a-entity>
+ <a-entity mixin="voxel" position="0 1 -2"
+ animation="property: rotation; to: 0 360 0; loop: true"></a-entity>
<a-entity mixin="voxel" position="1 0 -2"></a-entity>
</a-scene>
```
@@ -343,9 +342,8 @@ And we've added voxels using that mixin:
```html
<a-entity mixin="voxel" position="-1 0 -2"></a-entity>
<a-entity mixin="voxel" position="0 0 -2"></a-entity>
-<a-entity mixin="voxel" position="0 1 -2">
- <a-animation attribute="rotation" to="0 360 0" repeat="indefinite"></a-animation>
-</a-entity>
+<a-entity mixin="voxel" position="0 1 -2"
+ animation="property: rotation; to: 0 360 0; loop: true"></a-entity>
<a-entity mixin="voxel" position="1 0 -2"></a-entity>
```
| 14 |
diff --git a/src/traces/isosurface/convert.js b/src/traces/isosurface/convert.js @@ -128,12 +128,21 @@ function createIsosurfaceTrace(scene, data) {
var gl = scene.glplot.gl;
- var RES = 64;
- var resX = RES;
- var resY = RES;
- var resZ = RES;
+ var minX = Math.min.apply(null, data.x);
+ var minY = Math.min.apply(null, data.y);
+ var minZ = Math.min.apply(null, data.z);
- var dims = [resX, resY, resZ];
+ var maxX = Math.max.apply(null, data.x);
+ var maxY = Math.max.apply(null, data.y);
+ var maxZ = Math.max.apply(null, data.z);
+
+
+ var RES = 40; // 64;
+ var width = RES + 1;
+ var height = RES + 1;
+ var depth = RES + 1;
+
+ var dims = [width, height, depth];
// var method = 'NETS';
var method = 'CUBES';
@@ -145,9 +154,11 @@ function createIsosurfaceTrace(scene, data) {
(method === SURFACE_NETS) ? createIsosurface.surfaceNets :
createIsosurface.surfaceNets; // i.e. default
- // var bounds = [[-4, -4, -4], [4, 4, 4]]; var f_xyz = function(x, y, z) { return x * y + y * z + z * x - x * y * z; };
- var bounds = [[-4, -4, -4], [4, 4, 4]]; var f_xyz = function(x, y, z) { return Math.sin(x) + Math.sin(y) + Math.sin(z) - 0.5; };
- // var bounds = [[-3, -3, -1], [3, 3, 1]]; var f_xyz = function(x, y, z) { return Math.sin(x) * Math.sin(y) + Math.sin(z); };
+ var bounds = [[minX, minY, minZ], [maxX, maxY, maxZ]];
+ var f_xyz;
+ // bounds = [[-4, -4, -4], [4, 4, 4]]; f_xyz = function(x, y, z) { return x * y + y * z + z * x - x * y * z; };
+ // bounds = [[-4, -4, -4], [4, 4, 4]]; f_xyz = function(x, y, z) { return Math.sin(x) + Math.sin(y) + Math.sin(z) - 0.5; };
+ // bounds = [[-3, -3, -1], [3, 3, 1]]; f_xyz = function(x, y, z) { return Math.sin(x) * Math.sin(y) + Math.sin(z); };
var passValues = true;
@@ -168,21 +179,20 @@ function createIsosurfaceTrace(scene, data) {
var fXYZs = [];
var n = 0;
- for(var k = 0; k <= resZ; k++) {
- for(var j = 0; j <= resY; j++) {
- for(var i = 0; i <= resX; i++) {
+ for(var k = 0; k <= depth; k++) {
+ for(var j = 0; j <= height; j++) {
+ for(var i = 0; i <= width; i++) {
- var x = i * (xEnd - xStart) / resX + xStart;
- var y = j * (yEnd - yStart) / resY + yStart;
- var z = k * (zEnd - zStart) / resZ + zStart;
+ var x = i * (xEnd - xStart) / (width - 1) + xStart;
+ var y = j * (yEnd - yStart) / (height - 1) + yStart;
+ var z = k * (zEnd - zStart) / (depth - 1) + zStart;
allXs[n] = x;
allYs[n] = y;
allZs[n] = z;
if(passValues) {
- fXYZs[n] = f_xyz(x, y, z); // fill values with function
- // fXYZs[n] = data.value[i + (resX + 1) * j + (resX + 1) * (resY + 1) * k]; // use input data from the mock
+ fXYZs[n] = data.value[i + width * j + width * height * k]; // use input data from the mock
}
n++;
@@ -191,9 +201,9 @@ function createIsosurfaceTrace(scene, data) {
}
if(passValues) {
- isosurfaceMesh = applyMethod(dims, fXYZs, bounds); // pass data array
+ isosurfaceMesh = applyMethod(dims, fXYZs); // pass data array without bounds
} else {
- isosurfaceMesh = applyMethod(dims, f_xyz, bounds); // pass function
+ isosurfaceMesh = applyMethod(dims, f_xyz, bounds); // pass function with bounds
}
var q, len;
| 4 |
diff --git a/src/samples/conference/public/script2.js b/src/samples/conference/public/script2.js @@ -218,8 +218,13 @@ var runSocketIOSample = function() {
var myRoom = getParameterByName('room');
var isHttps = (location.protocol === 'https:');
var mediaUrl = getParameterByName('url');
+ var transport = getParameterByName('transport') || 'tcp';
var isPublish = getParameterByName('publish');
+ var hasAudio = getParameterByName('audio');
+ var hasVideo = getParameterByName('video');
+ hasAudio = hasAudio === "true"?true:false;
+ hasVideo = hasVideo === "false"?false:true;
if (isHttps) {
var shareButton = document.getElementById('shareScreen');
if (shareButton) {
@@ -277,14 +282,16 @@ var runSocketIOSample = function() {
conference.join(token, function(resp) {
if (typeof mediaUrl === 'string' && mediaUrl !== '') {
Woogeen.ExternalStream.create({
- url: mediaUrl
+ url: mediaUrl,
+ video: hasVideo,
+ audio: hasAudio
}, function(err, stream) {
if (err) {
return L.Logger.error(
'create ExternalStream failed:', err);
}
localStream = stream;
- conference.publish(localStream, {}, function(st) {
+ conference.publish(localStream, {transport: transport}, function(st) {
L.Logger.info('stream published:', st.id());
}, function(err) {
L.Logger.error('publish failed:', err);
| 12 |
diff --git a/package.json b/package.json "dependencies": {
"body-parser": "^1.17.2",
"colors": "^1.1.2",
- "electron": "^1.6.10",
+ "electron": "1.4.15",
"express": "^4.15.3",
"express-ipfilter": "0.3.1",
"feedme": "latest",
| 4 |
diff --git a/activities/EbookReader.activity/js/activity.js b/activities/EbookReader.activity/js/activity.js @@ -45,6 +45,8 @@ var app = new Vue({
vm.currentBook = vm.currentLibrary.database[parsed.current];
vm.currentEpub = ePub(vm.currentLibrary.information.fileprefix+vm.currentBook.file);
vm.currentView = EbookReader;
+ } else if (vm.currentLibrary.database.length == 0) {
+ vm.loadLibrary(defaultUrlLibrary);
}
document.getElementById("spinner").style.visibility = "hidden";
}
| 9 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
-## Unreleased
+## 1.47.0
- Add MSSQL (Microsoft SQL Server) instrumentation (supports [mssql](https://www.npmjs.com/package/mssql), version >= 4 via [tedious driver](https://www.npmjs.com/package/tedious)).
- Tracing support for [mongodb](https://www.npmjs.com/package/mongodb) version >= 3.0.6.
| 6 |
diff --git a/assets/src/dashboard/theme.js b/assets/src/dashboard/theme.js @@ -101,7 +101,7 @@ const theme = {
background: 'transparent',
activeBackground: 'transparent',
borderRadius: 4,
- border: 'none',
+ border: borders.transparent,
arrowColor: colors.gray300,
},
},
| 1 |
diff --git a/spec/models/table_spec.rb b/spec/models/table_spec.rb @@ -1901,102 +1901,6 @@ describe Table do
end
end #validation_for_link_privacy
- describe '#the_geom_conversions' do
- it 'tests the_geom conversions and expected results' do
- # Empty table/default schema (no conversion)
- table = new_table(:name => 'one', :user_id => @user.id)
- table.save
- check_schema(table, [
- [:cartodb_id, 'integer'],
- [:description, 'text'], [:name, 'text'],
- [:the_geom, 'geometry', 'geometry', 'geometry']
- ])
-
- # latlong projection
- table = new_table(:name => nil, :user_id => @user.id)
- table.migrate_existing_table = 'two'
- @user.db_service.run_pg_query('
- CREATE TABLE two AS SELECT CDB_LatLng(0,0) AS the_geom
- ')
- table.save
- check_schema(table, [
- [:cartodb_id, 'bigint'],
- [:the_geom, 'geometry', 'geometry', 'point']
- ])
-
- # single multipoint, without srid
- table = new_table(:name => nil, :user_id => @user.id)
- table.migrate_existing_table = 'three'
- @user.db_service.run_pg_query('
- CREATE TABLE three AS SELECT ST_Collect(ST_MakePoint(0,0),ST_MakePoint(1,1)) AS the_geom;
- ')
- table.save
- check_schema(table, [
- [:cartodb_id, 'bigint'],
- [:the_geom, 'geometry', 'geometry', 'geometry'],
- ])
-
- # same as above (single multipoint), but with a SRID=4326 (latlong)
- table = new_table(:name => nil, :user_id => @user.id)
- table.migrate_existing_table = 'four'
- @user.db_service.run_pg_query('
- CREATE TABLE four AS SELECT ST_SetSRID(ST_Collect(ST_MakePoint(0,0),ST_MakePoint(1,1)),4326) AS the_geom
- ')
- table.save
- check_schema(table, [
- [:cartodb_id, 'bigint'],
- [:the_geom, 'geometry', 'geometry', 'point']
- ])
-
- # single polygon
- table = new_table(:name => nil, :user_id => @user.id)
- table.migrate_existing_table = 'five'
- @user.db_service.run_pg_query('
- CREATE TABLE five AS SELECT ST_SetSRID(ST_Buffer(ST_MakePoint(0,0),10), 4326) AS the_geom
- ')
- table.save
- check_schema(table, [
- [:cartodb_id, 'bigint'],
- [:the_geom, 'geometry', 'geometry', 'multipolygon']
- ])
-
- # single line
- table = new_table(:name => nil, :user_id => @user.id)
- table.migrate_existing_table = 'six'
- @user.db_service.run_pg_query('
- CREATE TABLE six AS SELECT ST_SetSRID(ST_Boundary(ST_Buffer(ST_MakePoint(0,0),10,1)), 4326) AS the_geom
- ')
- table.save
- check_schema(table, [
- [:cartodb_id, 'bigint'],
- [:the_geom, 'geometry', 'geometry', 'multilinestring']
- ])
-
- # field named "the_geom" being _not_ of type geometry
- table = new_table(:name => nil, :user_id => @user.id)
- table.migrate_existing_table = 'seven'
- @user.db_service.run_pg_query(%Q{
- CREATE TABLE seven AS SELECT 'wadus' AS the_geom;
- })
- table.save
- check_schema(table, [
- [:cartodb_id, 'bigint'],
- [:the_geom, 'geometry', 'geometry', 'geometry'],
- [:invalid_the_geom, 'unknown']
- ])
-
- # geometrycollection (concrete type) Unsupported
- table = new_table(:name => nil, :user_id => @user.id)
- table.migrate_existing_table = 'eight'
- @user.db_service.run_pg_query('
- CREATE TABLE eight AS SELECT ST_SetSRID(ST_Collect(ST_MakePoint(0,0), ST_Buffer(ST_MakePoint(10,0),1)), 4326) AS the_geom
- ')
- expect {
- table.save
- }.to raise_exception
- end
- end
-
describe '#test_import_cleanup' do
it 'tests correct removal of some fields upon importing a table' do
ogc_fid_field = 'ogc_fid'
| 2 |
diff --git a/extensions/projection/json-schema/schema.json b/extensions/projection/json-schema/schema.json }
}
}
+ },
+ "assets": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "object",
+ "properties": {
+ "proj:shape":{
+ "title":"Shape",
+ "type":"array",
+ "minItems":2,
+ "maxItems":2,
+ "items":{
+ "type":"integer"
+ }
+ },
+ "proj:transform":{
+ "title":"Transform",
+ "type":"array",
+ "minItems":6,
+ "maxItems":9,
+ "items":{
+ "type":"number"
+ }
+ }
+ }
+ }
}
}
}
| 0 |
diff --git a/userscript.user.js b/userscript.user.js @@ -10287,7 +10287,7 @@ var $$IMU_EXPORT$$;
// thanks to shivsah on github for the inspiration: https://github.com/qsniyg/maxurl/issues/95
mouseover_gallery_download_key: ["shift", "d"],
gallery_download_unchanged: true,
- gallery_zip_filename_format: "{host_domain_nosub?}-{download_unix}",
+ gallery_zip_filename_format: "{host_domain_nosub}-{download_unix}\n{download_unix}",
// thanks to acid-crash on github for the idea: https://github.com/qsniyg/maxurl/issues/20
mouseover_styles: "",
mouseover_enable_fade: true,
| 7 |
diff --git a/src/__tests__/fixtures/lambdaFunction.fixture.js b/src/__tests__/fixtures/lambdaFunction.fixture.js @@ -138,7 +138,6 @@ exports.defaultTimeoutHandler = async function defaultTimeoutHandler(
return context.getRemainingTimeInMillis();
};
-// eslint-disable-next-line no-empty-function
exports.getExecutionTimeInMillisHandler = async function getExecutionTimeInMillisHandler() {
await new Promise((resolve) => {
setTimeout(resolve, 100);
| 2 |
diff --git a/civictechprojects/views.py b/civictechprojects/views.py @@ -327,7 +327,7 @@ def approve_event(request, event_id):
@ensure_csrf_cookie
@xframe_options_exempt
-def index(request):
+def index(request, id='Unused but needed for routing purposes; do not remove!'):
page = get_page_section(request.get_full_path())
# Redirect to AddUserDetails page if First/Last name hasn't been entered yet
if page != FrontEndSection.AddUserDetails.value and request.user.is_authenticated and (not request.user.first_name or not request.user.last_name):
| 14 |
diff --git a/fabfile/__init__.py b/fabfile/__init__.py @@ -24,11 +24,6 @@ from render_utils import load_graphic_config
SPREADSHEET_COPY_URL_TEMPLATE = 'https://www.googleapis.com/drive/v2/files/%s/copy'
SPREADSHEET_VIEW_TEMPLATE = 'https://docs.google.com/spreadsheet/ccc?key=%s#gid=1'
-"""
-Base configuration
-"""
-env.settings = None
-
"""
Environments
| 2 |
diff --git a/updates/2017-09-05.yml b/updates/2017-09-05.yml @@ -8,4 +8,3 @@ added:
- tutorials
description: |
A [new tutorial](https://auth0.com/docs/clients/enable-android-app-links) was added on how to configure Android App Links for your Auth0 Android client.
-
\ No newline at end of file
| 0 |
diff --git a/Source/DataSources/GpxDataSource.js b/Source/DataSources/GpxDataSource.js @@ -424,7 +424,6 @@ define([
return href;
}
-
function processPositionGraphics(dataSource, entity) {
var label = entity.label;
if (!defined(label)) {
@@ -662,6 +661,7 @@ define([
//a list of track segments
var trackSegs = queryNodes(geometryNode, 'trkseg', namespaces.gpx);
var trackSegInfo;
+ var nonTimestampedPositions = [];
var times;
var data;
var lastStop;
@@ -674,7 +674,7 @@ define([
trackSegInfo = processTrkSeg(trackSegs[i]);
var positions = trackSegInfo.positions;
times = trackSegInfo.times;
-
+ if (times.length > 0) {
if (interpolate) { //TODO Copied from KML
//If we are interpolating, then we need to fill in the end of
//the last track and the beginning of this one with a sampled
@@ -690,12 +690,20 @@ define([
addToTrack(times, positions, composite, availability, dropShowProperty, true);
// needDropLine = needDropLine || (canExtrude && extrude);
}
+ } else {
+ nonTimestampedPositions = nonTimestampedPositions.concat(positions);
+ }
}
+ if (times.length > 0) {
entity.availability = availability;
entity.position = composite;
processPositionGraphics(dataSource, entity);
processPathGraphics(dataSource, entity);
+ } else {
+ entity.polyline = createDefaultPolyline();
+ entity.polyline.positions = nonTimestampedPositions;
+ }
// if (needDropLine) {
// createDropLine(dataSource, entity, styleEntity);
// entity.polyline.show = dropShowProperty;
| 7 |
diff --git a/app/assets/stylesheets/themes/_theme-template.scss b/app/assets/stylesheets/themes/_theme-template.scss @@ -1370,8 +1370,8 @@ $pulsate-red-end
> li {
border-radius: 2px;
color: $dark-text-color;
- padding: .2rem .75rem;
- margin: .3rem 0;
+ padding: 3px 11px;
+ margin: 5px;
&:hover {
color: $primary-text-color;
background-color: darken($light-panel-bg-color, 20%);
| 14 |
diff --git a/src/traces/isosurface/convert.js b/src/traces/isosurface/convert.js @@ -128,13 +128,6 @@ function createIsosurfaceTrace(scene, data) {
var gl = scene.glplot.gl;
- var minX = Math.min.apply(null, data.x);
- var minY = Math.min.apply(null, data.y);
- var minZ = Math.min.apply(null, data.z);
-
- var maxX = Math.max.apply(null, data.x);
- var maxY = Math.max.apply(null, data.y);
- var maxZ = Math.max.apply(null, data.z);
var width = data.x.length;
var height = data.y.length;
@@ -152,36 +145,19 @@ function createIsosurfaceTrace(scene, data) {
(method === SURFACE_NETS) ? createIsosurface.surfaceNets :
createIsosurface.surfaceNets; // i.e. default
- var bounds = [[minX, minY, minZ], [maxX, maxY, maxZ]];
-
- var xStart = bounds[0][0];
- var yStart = bounds[0][1];
- var zStart = bounds[0][2];
- var xEnd = bounds[1][0];
- var yEnd = bounds[1][1];
- var zEnd = bounds[1][2];
+ var i, j, k;
- var allXs = [];
- var allYs = [];
- var allZs = [];
var fXYZs = [];
+
var n = 0;
- for(var k = 0; k <= depth; k++) {
- for(var j = 0; j <= height; j++) {
- for(var i = 0; i <= width; i++) {
+ for(k = 0; k <= depth; k++) {
+ for(j = 0; j <= height; j++) {
+ for(i = 0; i <= width; i++) {
var index = i + width * j + width * height * k;
- var x = i * (xEnd - xStart) / (width - 1) + xStart;
- var y = j * (yEnd - yStart) / (height - 1) + yStart;
- var z = k * (zEnd - zStart) / (depth - 1) + zStart;
-
- allXs[n] = x;
- allYs[n] = y;
- allZs[n] = z;
-
fXYZs[n] = data.volume[index]; // use input data from the mock
n++;
@@ -193,17 +169,6 @@ function createIsosurfaceTrace(scene, data) {
var q, len;
- var positions = isosurfaceMesh.positions;
- len = positions.length;
- data.x = [];
- data.y = [];
- data.z = [];
- for(q = 0; q < len; q++) {
- data.x[q] = positions[q][0];
- data.y[q] = positions[q][1];
- data.z[q] = positions[q][2];
- }
-
var cells = isosurfaceMesh.cells;
len = cells.length;
data.i = [];
@@ -215,6 +180,59 @@ function createIsosurfaceTrace(scene, data) {
data.k[q] = cells[q][2];
}
+ var allXs = []; for(i = 0; i < width; i++) { allXs[i] = data.x[i]; }
+ var allYs = []; for(j = 0; j < height; j++) { allYs[j] = data.y[j]; }
+ var allZs = []; for(k = 0; k < depth; k++) { allZs[k] = data.z[k]; }
+
+ var positions = isosurfaceMesh.positions;
+ len = positions.length;
+
+ // handle non-uniform 3D space
+ for(var axis = 0; axis < 3; axis++) {
+ var xyz = (axis === 0) ? data.x : (axis === 1) ? data.y : data.z;
+
+ for(q = 0; q < len; q++) {
+ var here = positions[q][axis];
+ var prev, next;
+
+ var found = false;
+ for(i = 1; i < dims[axis]; i++) {
+ prev = xyz[i - 1];
+ next = xyz[i];
+
+ if((prev <= here && here <= next) || (prev >= here && here >= next)) {
+ found = true;
+ break;
+ }
+ }
+
+ if(!found) {
+ if(Math.abs(xyz[0] - here) <= Math.abs(xyz[dims[axis] - 1] - here)) {
+ prev = xyz[0];
+ next = xyz[1];
+ } else {
+ prev = xyz[dims[axis] - 2];
+ next = xyz[dims[axis] - 1];
+ }
+ }
+
+ if(here >= prev) {
+ positions[q][axis] = prev + (here - prev) * (next - prev);
+ } else {
+ positions[q][axis] = next + (here - next) * (prev - next);
+ }
+ }
+ }
+
+ data.x = [];
+ data.y = [];
+ data.z = [];
+ for(q = 0; q < len; q++) {
+ data.x[q] = positions[q][0];
+ data.y[q] = positions[q][1];
+ data.z[q] = positions[q][2];
+ }
+
var mesh = createMesh({gl: gl});
var result = new IsosurfaceTrace(scene, mesh, data.uid);
| 9 |
diff --git a/config/webpack.config.js b/config/webpack.config.js @@ -4,7 +4,7 @@ const webpack = require( "webpack" );
const webpackAssetsPath = path.join( "app", "webpack" );
const config = {
- mode: "production",
+ mode: "none",
context: path.resolve( webpackAssetsPath ),
entry: {
// list out the various bundles we need to make for different apps
| 12 |
diff --git a/resource/styles/scss/_search.scss b/resource/styles/scss/_search.scss // search help
.search-help {
- margin-left: none;
+ caption {
text-align: center;
- .right, .left {
- padding: 0px !important;
- border: solid 1px #000000;
- float: left;
}
- .left {
- width: 35%;
- }
- .right {
- width: 65%;
- }
- ul, li {
- border-bottom: solid 1px #000000;
+ td {
+ text-align: center;
+ padding-right: 1em;
}
- li {
- height: 3.6em;
- word-wrap: break-word;
+ .search-help, td, th {
+ border: solid 1px gray;
}
}
// top and sidebar input styles
-.search-top, .search-sidebar {
+.search-top,
+.search-sidebar {
.search-clear {
top: 3px;
right: 26px;
| 14 |
diff --git a/src/content/en/updates/2019/05/model-viewer-ar.md b/src/content/en/updates/2019/05/model-viewer-ar.md @@ -37,7 +37,7 @@ and methods. After
use it like any HTML element.
```html
-<model-viewer alt="A 3D model of an astronaut." src="Astronaut.gltf" ios-src="Astronaut.usdz" magic-leap ar>
+<model-viewer alt="A 3D model of an astronaut." src="Astronaut.gltf" ios-src="Astronaut.usdz" magic-leap ar>
```
This looks much the same as what I had in my earlier article. Notice the thing
@@ -56,13 +56,13 @@ below. Then watch
for updates.
```html
-<script type="module"
+<script type="module"
src="https://unpkg.com/@google/[email protected]/dist/model-viewer.js">
-</script>
+</script>
-<script nomodule
+<script nomodule
src="https://unpkg.com/@google/[email protected]/dist/model-viewer-legacy.js">
-</script>
+</script>
```
## Conclusion
| 1 |
diff --git a/dc-worker-manager.js b/dc-worker-manager.js @@ -168,6 +168,35 @@ export class DcWorkerManager {
})
);
}
+
+ async createTracker(lod, minLodRange, trackY, {signal} = {}) {
+ const worker = this.getNextWorker();
+ const result = await worker.request('createTracker', {
+ instance: this.instance,
+ lod,
+ minLodRange,
+ trackY,
+ }, {signal});
+ return result;
+ }
+ async destroyTracker(tracker, {signal} = {}) {
+ const worker = this.getNextWorker();
+ const result = await worker.request('destroyTracker', {
+ instance: this.instance,
+ tracker,
+ }, {signal});
+ return result;
+ }
+ async trackerUpdate(tracker, position, {signal} = {}) {
+ const worker = this.getNextWorker();
+ const result = await worker.request('trackerUpdate', {
+ instance: this.instance,
+ tracker,
+ position: position.toArray(),
+ }, {signal});
+ return result;
+ }
+
async generateTerrainChunk(chunkPosition, lodArray, {signal} = {}) {
// const chunkId = getLockChunkId(chunkPosition);
// return await this.locks.request(chunkId, async lock => {
| 0 |
diff --git a/src/pages/iou/steps/IOUAmountPage.js b/src/pages/iou/steps/IOUAmountPage.js @@ -79,7 +79,7 @@ class IOUAmountPage extends React.Component {
this.updateAmount = this.updateAmount.bind(this);
this.stripCommaFromAmount = this.stripCommaFromAmount.bind(this);
this.focusTextInput = this.focusTextInput.bind(this);
- this.handleAppStateChange = this.handleAppStateChange.bind(this);
+ this.dismissKeyboardWhenBackgrounded = this.dismissKeyboardWhenBackgrounded.bind(this);
this.state = {
amount: props.selectedAmount,
@@ -90,7 +90,7 @@ class IOUAmountPage extends React.Component {
this.focusTextInput();
this.unsubscribeAppStateSubscription = AppState.addEventListener(
'change',
- this.handleAppStateChange,
+ this.dismissKeyboardWhenBackgrounded,
);
}
@@ -109,7 +109,7 @@ class IOUAmountPage extends React.Component {
this.unsubscribeAppStateSubscription();
}
- handleAppStateChange(nextAppState) {
+ dismissKeyboardWhenBackgrounded(nextAppState) {
if (!nextAppState.match(/inactive|background/)) {
return;
}
| 10 |
diff --git a/lib/waterline.js b/lib/waterline.js @@ -234,8 +234,8 @@ function Waterline() {
usedSchemas[identity] = {
primaryKey: collection.primaryKey,
definition: collection.schema,
- tableName: collection.tableName || identity,
- identity: identity
+ tableName: collection.tableName,
+ identity: collection.identity
};
});
| 4 |
diff --git a/deps/exokit-bindings/canvascontext/src/canvas-context.cc b/deps/exokit-bindings/canvascontext/src/canvas-context.cc @@ -1334,6 +1334,8 @@ NAN_METHOD(CanvasRenderingContext2D::SetTexture) {
int height = info[2]->Int32Value();
WebGLRenderingContext *gl = ObjectWrap::Unwrap<WebGLRenderingContext>(Local<Object>::Cast(info[3]));
+ windowsystem::SetCurrentWindowContext(gl->windowHandle);
+
ctx->tex = tex;
windowsystem::SetCurrentWindowContext(ctx->windowHandle);
| 12 |
diff --git a/lib/Compilation.js b/lib/Compilation.js @@ -846,11 +846,6 @@ class Compilation extends Tapable {
iterationDependencies(dependencies);
const afterBuild = () => {
- if (currentProfile) {
- const afterBuilding = Date.now();
- currentProfile.building = afterBuilding - afterFactory;
- }
-
if (recursive && addModuleResult.dependencies) {
this.processModuleDependencies(dependentModule, callback);
} else {
@@ -890,6 +885,11 @@ class Compilation extends Tapable {
return errorOrWarningAndCallback(err);
}
+ if (currentProfile) {
+ const afterBuilding = Date.now();
+ currentProfile.building = afterBuilding - afterFactory;
+ }
+
semaphore.release();
afterBuild();
}
@@ -987,11 +987,6 @@ class Compilation extends Tapable {
module.addReason(null, dependency);
const afterBuild = () => {
- if (currentProfile) {
- const afterBuilding = Date.now();
- currentProfile.building = afterBuilding - afterFactory;
- }
-
if (addModuleResult.dependencies) {
this.processModuleDependencies(module, err => {
if (err) return callback(err);
| 2 |
diff --git a/index.js b/index.js @@ -67,7 +67,6 @@ app.on('window-all-closed', () => {
app.on('before-quit', function () {
app.mpris.clearActivity()
app.discord.rpc.disconnect()
- app.discord.rpc.clearActivity()
console.log("[DiscordRPC] Disconnecting from Discord.")
console.log("---------------------------------------------------------------------")
console.log("Application Closing...")
| 2 |
diff --git a/editor.js b/editor.js @@ -30,7 +30,7 @@ const ghDownload = ghDownloadDirectory.default;
// window.ghDownload = ghDownload;
const htmlRenderer = new HtmlRenderer();
-const testImgUrl = 'https://app.webaverse.com/assets/popup3.svg';
+const testImgUrl = window.location.protocol + '//' + window.location.host + '/assets/popup3.svg';
const testUserImgUrl = `https://preview.exokit.org/[https://app.webaverse.com/assets/type/robot.glb]/preview.png?width=128&height=128`;
/* import BrowserFS from '/browserfs.js';
@@ -579,6 +579,7 @@ const _makeObjectUiMesh = object => {
if (typeof contentId === 'number') {
const res = await fetch(`${tokensHost}/${contentId}`);
const j = await res.json();
+ // console.log('got json', j);
name = j.name;
hash = j.hash;
hash = hash.slice(0, 6) + '...' + hash.slice(-2);
@@ -597,6 +598,13 @@ const _makeObjectUiMesh = object => {
hash = '<url>';
description = contentId;
}
+ /* console.log('render name', {
+ contentId,
+ name,
+ type,
+ hash,
+ description,
+ }); */
await m.render({
name,
tokenId,
@@ -659,29 +667,22 @@ const _makeContextMenuMesh = mouseUiMesh => {
let height = 0;
let anchors = null;
let optionsTextures = [];
+ let blankOptionTexture = null;
(async () => {
- const results = await Promise.all(contextMenuOptions.map(async (option, i) => {
- if (option) {
- const result = await htmlRenderer.renderContextMenu({
- options: contextMenuOptions,
- selectedOptionIndex: i,
+ const _getContextMenuData = (options, selectedOptionIndex) =>
+ htmlRenderer.renderContextMenu({
+ options,
+ selectedOptionIndex,
width: 512,
height: 320,
});
- return result;
- } else {
- return null;
- }
- }));
- optionsTextures = results
- .filter((result, i) => contextMenuOptions[i] !== null)
- .map(result => {
+ const _makeContextMenuTexture = spec => {
const {
width: newWidth,
height: newHeight,
imageBitmap,
anchors: newAnchors,
- } = result;
+ } = spec;
const map = new THREE.Texture(imageBitmap);
map.minFilter = THREE.THREE.LinearMipmapLinearFilter;
map.magFilter = THREE.LinearFilter;
@@ -689,7 +690,26 @@ const _makeContextMenuMesh = mouseUiMesh => {
map.anisotropy = 16;
map.needsUpdate = true;
return map;
- });
+ };
+ let results;
+ await Promise.all([
+ (async () => {
+ results = await Promise.all(contextMenuOptions.map(async (object, i) => {
+ if (object) {
+ return await _getContextMenuData(contextMenuOptions, i);
+ } else {
+ return null;
+ }
+ }));
+ optionsTextures = results
+ .filter((result, i) => contextMenuOptions[i] !== null)
+ .map(_makeContextMenuTexture);
+ })(),
+ (async () => {
+ const blankResult = await _getContextMenuData(contextMenuOptions, -1);
+ blankOptionTexture = _makeContextMenuTexture(blankResult);
+ })(),
+ ]);
material.map = optionsTextures[0];
@@ -852,7 +872,7 @@ const _makeContextMenuMesh = mouseUiMesh => {
m.getHighlightedIndex = () => highlightedIndex;
m.intersectUv = uv => {
highlightedIndex = -1;
- if (anchors && width && height && optionsTextures) {
+ if (uv && anchors && width && height && optionsTextures) {
const coords = localVector2D.copy(uv)
.multiply(localVector2D2.set(width, height));
highlightedIndex = anchors.findIndex(anchor => {
@@ -861,8 +881,11 @@ const _makeContextMenuMesh = mouseUiMesh => {
(coords.y >= anchor.top && coords.y < anchor.bottom)
);
});
- material.map = optionsTextures[highlightedIndex];
}
+ material.map = highlightedIndex !== -1 ?
+ optionsTextures[highlightedIndex]
+ :
+ blankOptionTexture;
};
return m;
};
@@ -2698,6 +2721,8 @@ Promise.all([
const intersections = localRaycaster.intersectObject(contextMenuMesh, true, localArray);
if (intersections.length > 0) {
contextMenuMesh.intersectUv(intersections[0].uv);
+ } else {
+ contextMenuMesh.intersectUv(null);
}
}
});
| 0 |
diff --git a/static/admin/config.yml b/static/admin/config.yml @@ -59,6 +59,7 @@ collections:
- name: articles
label: Articles
folder: src/markdown/articles/
+ media_folder: static/images/articles/
path: '{{year}}/{{slug}}'
create: true
fields:
| 12 |
diff --git a/token-metadata/0x2859021eE7F2Cb10162E67F33Af2D22764B31aFf/metadata.json b/token-metadata/0x2859021eE7F2Cb10162E67F33Af2D22764B31aFf/metadata.json "symbol": "SNTR",
"address": "0x2859021eE7F2Cb10162E67F33Af2D22764B31aFf",
"decimals": 4,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/auth/Auth.js b/src/components/auth/Auth.js @@ -52,7 +52,7 @@ class Auth extends React.Component<Props> {
<View style={styles.topContainer}>
<Title style={styles.title}>Just a heads up!</Title>
<Description style={styles.paragraph}>
- {`All tokens in the Alpha are "test tokens".\n They have no real value yet and will be reset for future public release.`}
+ {`All tokens in the Alpha are "test tokens".\nThey have NO real value.\nThey will be deleted at the end of the Alpha.`}
</Description>
</View>
<View style={styles.bottomContainer}>
| 1 |
diff --git a/src/module/actor/actor-inventory-utils.js b/src/module/actor/actor-inventory-utils.js @@ -972,7 +972,7 @@ export class ActorItemHelper {
container.storage.push({
type: currentStorage?.type || "bulk",
subtype: currentStorage?.subtype || "",
- amount: currentStorage?.amount || itemData.storageCapacity || 0,
+ amount: currentStorage?.amount ?? itemData.storageCapacity ?? 0,
acceptsType: currentStorage?.acceptsType || itemData.acceptedItemTypes ? Object.keys(itemData.acceptedItemTypes) : [],
affectsEncumbrance: currentStorage?.affectsEncumbrance ?? ((itemData.contentBulkMultiplier === 0) ? false : true),
weightProperty: currentStorage?.weightProperty || "bulk"
@@ -990,7 +990,7 @@ export class ActorItemHelper {
container.storage.push({
type: "slot",
subtype: "armorUpgrade",
- amount: itemData.armor?.upgradeSlots || 0,
+ amount: itemData.armor?.upgradeSlots ?? 0,
acceptsType: ["upgrade", "weapon"],
affectsEncumbrance: true,
weightProperty: "slots"
@@ -998,7 +998,7 @@ export class ActorItemHelper {
container.storage.push({
type: "slot",
subtype: "weaponSlot",
- amount: itemData.weaponSlots || 0,
+ amount: itemData.weaponSlots ?? 0,
acceptsType: ["weapon"],
affectsEncumbrance: true,
weightProperty: "slots"
| 14 |
diff --git a/generators/generator-constants.js b/generators/generator-constants.js @@ -25,7 +25,7 @@ const NODE_VERSION = '12.14.0';
const YARN_VERSION = '1.21.1';
const NPM_VERSION = '6.13.6';
-const GRADLE_VERSION = '6.0.1';
+const GRADLE_VERSION = '6.1';
// Libraries version
const JIB_VERSION = '1.8.0';
| 3 |
diff --git a/web/components/pages/AuditLogPage.js b/web/components/pages/AuditLogPage.js @@ -17,7 +17,7 @@ const AuditLogPage = class extends Component {
}
filterRow = (logMessage, search) => {
- const stringToSearch = `${logMessage.log} ${logMessage.author.first_name} ${logMessage.author.last_name} ${logMessage.author.email} ${moment(logMessage.created_date).format('L LTS')}`;
+ const stringToSearch = `${logMessage.log} ${logMessage.author?logMessage.author.first_name:""} ${logMessage.author?logMessage.author.last_name:""} ${logMessage.author?logMessage.author.email:""} ${moment(logMessage.created_date).format('L LTS')}`;
return stringToSearch.toLowerCase().indexOf(search.toLowerCase()) !== -1;
}
| 9 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,8 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- The API portion of STAC has been split off into a [new repository: stac-api-spec](https://github.com/radiantearth/stac-api-spec) and will start being versioned and released separately than the core STAC spec.
### Added
+- 'alternate' as a listed 'rel' type with recommended 'text/html' to communicate there is an html version.
### Changed
+- Moved item recommendations to best practices, and added a bit more in item spec about 'search'
### Removed
| 3 |
diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js @@ -1619,7 +1619,7 @@ define([
--maxTextures;
}
- if (frameState.shadowState.shadowsEnabled) {
+ if (defined(frameState.shadowState) && frameState.shadowState.shadowsEnabled) {
--maxTextures;
}
if (defined(tileProvider.clippingPlanes)) {
| 1 |
diff --git a/token-metadata/0x5dbcF33D8c2E976c6b560249878e6F1491Bca25c/metadata.json b/token-metadata/0x5dbcF33D8c2E976c6b560249878e6F1491Bca25c/metadata.json "symbol": "YVAULT-LP-YCURVE",
"address": "0x5dbcF33D8c2E976c6b560249878e6F1491Bca25c",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/app-manager.js b/app-manager.js @@ -271,6 +271,16 @@ class AppManager extends EventTarget {
}
return null;
}
+ hasTrackedApp(instanceId) {
+ const {state} = this;
+ const apps = state.getArray(appsMapName);
+ for (const app of apps) {
+ if (app === instanceId) {
+ return true;
+ }
+ }
+ return false;
+ }
clear() {
const apps = this.apps.slice();
for (const app of apps) {
| 0 |
diff --git a/src/components/TextInput/baseTextInputPropTypes.js b/src/components/TextInput/baseTextInputPropTypes.js @@ -73,9 +73,6 @@ const propTypes = {
/** Indicate whether pressing Enter on multiline input is allowed to submit the form. */
submitOnEnter: PropTypes.bool,
-
- /** Whether the input should be disabled. */
- disabled: PropTypes.bool,
};
const defaultProps = {
@@ -108,7 +105,6 @@ const defaultProps = {
onInputChange: () => {},
shouldDelayFocus: false,
submitOnEnter: false,
- disabled: false,
};
export {propTypes, defaultProps};
| 13 |
diff --git a/assets/src/libraries/Book.test.js b/assets/src/libraries/Book.test.js @@ -82,7 +82,7 @@ describe('<Book />', () => {
}
});
- global.localStorage = {
+ global.sessionStorage = {
getItem : () => { return null }
}
| 1 |
diff --git a/app/services/visualization/common_data_service.rb b/app/services/visualization/common_data_service.rb @@ -55,6 +55,7 @@ module CartoDB
carto_user = Carto::User.find(user.id)
remotes_by_name = Carto::Visualization.remotes.where(user_id: user.id).map { |v| [v.name, v] }.to_h
+ ActiveRecord::Base.transaction do
get_datasets(visualizations_api_url).each do |dataset|
begin
visualization = remotes_by_name.delete(dataset['name'])
@@ -99,7 +100,6 @@ module CartoDB
)
# ActiveRecord array issue
external_source.update_attribute(:geometry_types, dataset['geometry_types'])
- external_source.save!
end
rescue => e
CartoDB.notify_exception(e, {
@@ -112,6 +112,7 @@ module CartoDB
failed += 1
end
end
+ end
remotes_by_name.each do |_, remote|
deleted += 1 if delete_remote_visualization(remote)
| 2 |
diff --git a/sirepo/package_data/static/js/srw.js b/sirepo/package_data/static/js/srw.js @@ -148,7 +148,7 @@ SIREPO.app.factory('srwService', function(appState, appDataService, beamlineServ
$rootScope.$on('$locationChangeSuccess', function (event) {
// reset reloadOnSearch so that back/next browser buttons will trigger a page load
- if($route.current) {
+ if($route.current && $route.current.$$route) {
$route.current.$$route.reloadOnSearch = true;
}
});
@@ -503,7 +503,7 @@ SIREPO.app.controller('SRWBeamlineController', function (appState, beamlineServi
};
self.setReloadOnSearch = function(value) {
- if($route.current) {
+ if($route.current && $route.current.$$route) {
$route.current.$$route.reloadOnSearch = value;
}
};
| 1 |
diff --git a/shared/bull/create-redis.js b/shared/bull/create-redis.js @@ -4,9 +4,9 @@ import Redis from 'ioredis';
const config =
process.env.NODE_ENV === 'production' && !process.env.FORCE_DEV
? {
- port: process.env.COMPOSE_REDIS_PORT,
- host: process.env.COMPOSE_REDIS_URL,
- password: process.env.COMPOSE_REDIS_PASSWORD,
+ port: process.env.REDIS_LABS_JOB_QUEUE_PORT,
+ host: process.env.REDIS_LABS_JOB_QUEUE_URL,
+ password: process.env.REDIS_LABS_JOB_QUEUE_PASSWORD,
}
: undefined; // Use the local instance of Redis in development by not passing any connection string
| 4 |
diff --git a/src/components/nodes/startTimerEvent/index.js b/src/components/nodes/startTimerEvent/index.js @@ -44,15 +44,22 @@ export default {
}
if (key === 'eventDefinitions') {
- // Set the timer event definition
+ const { body } = value[key];
+
+ const expression = definition.get(key)[0].timeCycle;
+ if (expression && expression.body === body) {
+ continue;
+ }
+
+ const eventDefinition = {
+ timeCycle: moddle.create('bpmn:Expression', { body }),
+ };
+
const eventDefinitions = [
- moddle.create('bpmn:TimerEventDefinition', {
- timeCycle: moddle.create('bpmn:Expression', {
- body: value[key][0].timeCycle.body,
- }),
- }),
+ moddle.create('bpmn:TimerEventDefinition', eventDefinition),
];
setNodeProp(node, 'eventDefinitions', eventDefinitions);
+
} else {
setNodeProp(node, key, value[key]);
}
| 2 |
diff --git a/config/redirects.js b/config/redirects.js @@ -1557,6 +1557,10 @@ module.exports = [
from: '/sso/current/single-page-apps-sso',
to: '/sso/current/single-page-apps'
},
+ {
+ from: '/sso/legacy/single-page-apps-sso',
+ to: '/sso/legacy/single-page-apps'
+ },
{
from: '/integrations/slack',
to: '/sso/current/integrations/slack'
| 0 |
diff --git a/src/resources/lang/it/crud.php b/src/resources/lang/it/crud.php @@ -32,7 +32,7 @@ return [
// Revisions
'revisions' => 'Revisioni',
- 'no_revisions' => 'Nessuna revisione Trovato',
+ 'no_revisions' => 'Nessuna revisione trovata',
'created_this' => 'ha creato questo',
'changed_the' => 'cambiato il',
'restore_this_value' => 'ripristinare questo valore',
| 3 |
diff --git a/lib/shared/addon/components/cru-cluster/component.js b/lib/shared/addon/components/cru-cluster/component.js @@ -466,13 +466,16 @@ export default Component.extend(ViewNewEdit, ChildHook, {
// A new cluster will not and the condition will be added as part of the creation.
// The local cluster is pre-cerated and does not have the condition set, so waiting for it in the edit case
// will cause an eventual tiemout and error message - hence we don't wait for the condition in the edit case
+
+ let waitPromise = originalCluster.waitForCondition('InitialRolesPopulated');
+
if (this.isEdit) {
- return new EmberPromise((resolve) => {
- resolve();
+ waitPromise = new EmberPromise((resolve) => {
+ resolve()
});
}
- return originalCluster.waitForCondition('InitialRolesPopulated').then(() => {
+ return waitPromise.then(() => {
return this.applyHooks().then(() => {
const clone = originalCluster.clone();
| 1 |
diff --git a/token-metadata/0x94939D55000B31B7808904a80aA7Bab05eF59Ed6/metadata.json b/token-metadata/0x94939D55000B31B7808904a80aA7Bab05eF59Ed6/metadata.json "symbol": "JIAOZI",
"address": "0x94939D55000B31B7808904a80aA7Bab05eF59Ed6",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/packages/idyll-components/src/tweet.js b/packages/idyll-components/src/tweet.js @@ -22,7 +22,11 @@ class Tweet extends Component {
const twttrEl = document.createElement('script');
twttrEl.setAttribute(
'src',
- `${document.location.protocol}//platform.twitter.com/widgets.js`
+ `${
+ document.location.protocol === 'file:'
+ ? 'https:'
+ : document.location.protocol
+ }//platform.twitter.com/widgets.js`
);
twttrEl.onload = () => resolve();
twttrEl.onerror = error => reject(error);
| 3 |
diff --git a/src/views/preview/preview.jsx b/src/views/preview/preview.jsx @@ -28,8 +28,6 @@ const frameless = require('../../lib/frameless');
const GUI = require('scratch-gui');
const IntlGUI = injectIntl(GUI.default);
-const isMobileDevice = () => screen.height <= frameless.mobile || screen.width <= frameless.mobile;
-
class Preview extends React.Component {
constructor (props) {
super(props);
@@ -39,7 +37,6 @@ class Preview extends React.Component {
'handleFavoriteToggle',
'handleLoadMore',
'handleLoveToggle',
- 'handleOrientationChange',
'handlePopState',
'handleReportClick',
'handleReportClose',
@@ -51,7 +48,8 @@ class Preview extends React.Component {
'handleUpdate',
'initCounts',
'pushHistory',
- 'renderLogin'
+ 'renderLogin',
+ 'setScreenFromOrientation'
]);
const pathname = window.location.pathname.toLowerCase();
const parts = pathname.split('/').filter(Boolean);
@@ -69,13 +67,7 @@ class Preview extends React.Component {
this.getExtensions(this.state.projectId);
this.addEventListeners();
/* In the beginning, if user is on mobile and landscape, go to fullscreen */
- if (this.props.playerMode && isMobileDevice()) {
- if (screen.orientation.type === 'landscape-primary') {
- this.props.setFullScreen(true);
- } else {
- this.props.setFullScreen(false);
- }
- }
+ this.setScreenFromOrientation();
}
componentDidUpdate (prevProps) {
if (this.props.sessionStatus !== prevProps.sessionStatus &&
@@ -119,11 +111,25 @@ class Preview extends React.Component {
}
addEventListeners () {
window.addEventListener('popstate', this.handlePopState);
- window.addEventListener('orientationchange', this.handleOrientationChange);
+ window.addEventListener('orientationchange', this.setScreenFromOrientation);
}
removeEventListeners () {
window.removeEventListener('popstate', this.handlePopState);
- window.addEventListener('orientationchange', this.handleOrientationChange);
+ window.addEventListener('orientationchange', this.setScreenFromOrientation);
+ }
+ setScreenFromOrientation () {
+ /*
+ * If the user is on a mobile device, switching to
+ * landscape format should make the fullscreen mode active
+ */
+ const isMobileDevice = screen.height <= frameless.mobile || screen.width <= frameless.mobile;
+ if (this.props.playerMode && isMobileDevice) {
+ if (screen.orientation.type === 'landscape-primary') {
+ this.props.setFullScreen(true);
+ } else {
+ this.props.setFullScreen(false);
+ }
+ }
}
getExtensions (projectId) {
storage
@@ -172,19 +178,6 @@ class Preview extends React.Component {
handleReportSubmit (formData) {
this.props.reportProject(this.state.projectId, formData);
}
- handleOrientationChange () {
- /*
- * If the user is on a mobile device, switching to
- * landscape format should make the fullscreen mode active
- */
- if (this.props.playerMode && isMobileDevice()) {
- if (screen.orientation.type === 'landscape-primary') {
- this.props.setFullScreen(true);
- } else {
- this.props.setFullScreen(false);
- }
- }
- }
handlePopState () {
const path = window.location.pathname.toLowerCase();
const playerMode = path.indexOf('editor') === -1;
| 7 |
diff --git a/app/services/carto/user_metadata_export_service.rb b/app/services/carto/user_metadata_export_service.rb @@ -140,7 +140,7 @@ module Carto
user.client_applications = build_client_applications_from_hash(exported_user[:client_application])
- # user.oauth_apps = build_oauth_apps_from_hash(exported_user[:oauth_apps])
+ user.oauth_apps = build_oauth_apps_from_hash(exported_user[:oauth_apps])
user.oauth_app_users = build_oauth_app_users_from_hash(exported_user[:oauth_app_users])
| 11 |
diff --git a/ui/src/components/EntityTable/EntityTable.jsx b/ui/src/components/EntityTable/EntityTable.jsx @@ -40,7 +40,7 @@ class EntityTable extends Component {
return (
<TableComponent
collection={collection}
- onStatusChange={this.onStatusChange}
+ onStatusChange={() => null}
entities={results}
sort={sort}
isPending={result.isPending}
| 12 |
diff --git a/assets/js/googlesitekit/data/create-settings-store.js b/assets/js/googlesitekit/data/create-settings-store.js @@ -299,7 +299,7 @@ export const createSettingsStore = ( type, identifier, datapoint, {
}
default: {
- // Check if this action is for a sub-setting reducer.
+ // Check if this action is for a reducer for an individual setting.
if ( 'undefined' !== typeof settingReducers[ action.type ] ) {
return settingReducers[ action.type ]( state, action );
}
@@ -367,6 +367,14 @@ export const createSettingsStore = ( type, identifier, datapoint, {
const pascalCaseSlug = slug.charAt( 0 ).toUpperCase() + slug.slice( 1 );
const constantSlug = slug.replace( /([a-z0-9]{1})([A-Z]{1})/g, '$1_$2' ).toUpperCase();
+ /**
+ * Sets the setting indicated by the action name to the given value.
+ *
+ * @since n.e.x.t
+ *
+ * @param {*} value Value for the setting.
+ * @return {Object} Redux-style action.
+ */
actions[ `set${ pascalCaseSlug }` ] = ( value ) => {
invariant( value, 'value is required.' );
@@ -390,6 +398,14 @@ export const createSettingsStore = ( type, identifier, datapoint, {
resolvers[ `get${ pascalCaseSlug }` ] = resolvers.getSettings;
+ /**
+ * Gets the current value for the setting indicated by the selector name.
+ *
+ * @since n.e.x.t
+ *
+ * @param {Object} state Data store's state.
+ * @return {*} Setting value, or undefined.
+ */
selectors[ `get${ pascalCaseSlug }` ] = ( state ) => {
const { settings } = state;
| 7 |
diff --git a/modules/controller/rpc-controller.js b/modules/controller/rpc-controller.js @@ -192,7 +192,7 @@ class RpcController {
for (const id of ids) {
let result = await this.dataService.resolve(id, true);
- if (!result) {
+ if (result) {
let {nquads, isAsset} = result;
let assertion = await this.dataService.createAssertion(nquads);
assertion.jsonld.metadata = JSON.parse(sortedStringify(assertion.jsonld.metadata))
| 3 |
diff --git a/src/plugins/StatusBar/index.js b/src/plugins/StatusBar/index.js @@ -8,7 +8,8 @@ const { prettyETA } = require('../../core/Utils')
const prettyBytes = require('prettier-bytes')
/**
- * A status bar.
+ * StatusBar: renders a status bar with upload/pause/resume/cancel/retry buttons,
+ * progress percentage and time remaining.
*/
module.exports = class StatusBar extends Plugin {
constructor (uppy, opts) {
| 0 |
diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js import Backbone from 'backbone';
import { bindAll, isArray, isUndefined, debounce } from 'underscore';
import { camelCase } from 'utils/mixins';
-import { includes } from 'underscore';
+import { includes, each } from 'underscore';
const clearProp = 'data-clear-style';
@@ -462,7 +462,7 @@ module.exports = Backbone.View.extend({
trg.view.$el[0].parentNode
) {
const styles = window.getComputedStyle(trg.view.$el[0].parentNode);
- Object.entries(requiresParent).forEach(([property, values]) => {
+ each(requiresParent, (values, property) => {
stylable =
stylable && styles[property] && includes(values, styles[property]);
});
| 14 |
diff --git a/test-integration/scripts/24-tests-e2e.sh b/test-integration/scripts/24-tests-e2e.sh @@ -20,21 +20,43 @@ fi
#-------------------------------------------------------------------------------
# Functions
#-------------------------------------------------------------------------------
-launchCurlOrE2e() {
+launchE2eTests() {
+ retryCount=0
+ maxRetry=1
+ until [ "$retryCount" -ge "$maxRetry" ]
+ do
+ result=0
+ if [[ -f "tsconfig.json" ]]; then
+ npm run e2e:headless
+ fi
+ result=$?
+ [ $result -eq 0 ] && break
+ retryCount=$((retryCount+1))
+ echo "*** e2e tests failed... retryCount =" $retryCount "/" $maxRetry
+ sleep 15
+ done
+ return $result
+ return $?
+}
+
+launchCurlTests() {
+ endpointsToTest=("$@")
retryCount=1
maxRetry=10
httpUrl="http://localhost:8080"
+
if [[ "$JHI_APP" == *"micro"* ]]; then
- httpUrl="http://localhost:8081/management/health"
+ httpUrl="http://localhost:8081"
fi
- rep=$(curl -v "$httpUrl")
+ for endpoint in "${endpointsToTest[@]}"; do
+ curl -fv "$httpUrl$endpoint"
status=$?
while [ "$status" -ne 0 ] && [ "$retryCount" -le "$maxRetry" ]; do
echo "*** [$(date)] Application not reachable yet. Sleep and retry - retryCount =" $retryCount "/" $maxRetry
retryCount=$((retryCount+1))
sleep 10
- rep=$(curl -v "$httpUrl")
+ curl -fv "$httpUrl$endpoint"
status=$?
done
@@ -42,27 +64,7 @@ launchCurlOrE2e() {
echo "*** [$(date)] Not connected after" $retryCount " retries."
return 1
fi
-
- if [ "$JHI_E2E" != 1 ]; then
- return 0
- fi
-
- retryCount=0
- maxRetry=1
- until [ "$retryCount" -ge "$maxRetry" ]
- do
- result=0
- if [[ -f "tsconfig.json" ]]; then
- npm run e2e:headless
- fi
- result=$?
- [ $result -eq 0 ] && break
- retryCount=$((retryCount+1))
- echo "*** e2e tests failed... retryCount =" $retryCount "/" $maxRetry
- sleep 15
done
- return $result
-
return $?
}
#-------------------------------------------------------------------------------
@@ -106,7 +108,20 @@ if [ "$JHI_RUN_APP" == 1 ]; then
fi
sleep 40
- launchCurlOrE2e
+ # Curl some test endpoints
+ endpointsToTest=(
+ '/'
+ '/management/health'
+ '/management/health/liveness'
+ '/management/health/readiness'
+ )
+ launchCurlTests "${endpointsToTest[@]}"
+
+ # Run E2E tests
+ if [ "$JHI_E2E" == 1 ]; then
+ launchE2eTests
+ fi
+
resultRunApp=$?
kill $(cat .pidRunApp)
| 7 |
diff --git a/Documentation/Usage.md b/Documentation/Usage.md @@ -359,8 +359,8 @@ let result = try! transaction.call()
##### Other Transaction Types
By default a `legacy` transaction will be created which is compatible across all chains, regardless of which fork.
-To create one of the new transaction types introduced with the `london` fork you will need to set some additonal parameters
-in the `TransactionOptions` object. Note you should only try to send one of tehse new types of transactions if you are on a chain
+To create one of the new transaction types introduced with the `london` fork you will need to set some additional parameters
+in the `TransactionOptions` object. Note you should only try to send one of these new types of transactions if you are on a chain
that supports them.
To send an EIP-2930 style transacton with an access list you need to set the transaction type, and the access list,
@@ -385,10 +385,10 @@ To send an EIP-1559 style transaction you set the transaction type, and the new
(you may also send an AccessList with an EIP-1559 transaction) When sending an EIP-1559 transaction, the older `gasPrice` parameter is ignored.
```swift
options.type = .eip1559
-options.maxFeePerGas = .manual(...) // the maximum price per unit of gas, inclusive of baseFee and tip
-options.maxPriorityFeePerGas = .manual(...) // the tip to be paid to the miner, per unit of gas
+options.maxFeePerGas = .automatic // the maximum price per unit of gas, inclusive of baseFee and tip
+options.maxPriorityFeePerGas = .automatic // the 'tip' to be paid to the miner, per unit of gas
```
-Note there is a new `Oracle` object available that can be used to assist with estimating the new gas fees
+Note: There is a new `Oracle` object available that can be used to assist with estimating the new gas fees if you wish to set them manually.
### Chain state
| 3 |
diff --git a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js @@ -273,11 +273,6 @@ export default class BaseProfileStore
}
}
- // THEMES.YOROI_MODERN is the default theme
- // TODO: Tests were written for the old theme so we need to use it for testing
- if (environment.isTest()) {
- return THEMES.YOROI_CLASSIC;
- }
return THEMES.YOROI_MODERN;
}
| 12 |
diff --git a/Bundle/WidgetMapBundle/Warmer/WidgetDataWarmer.php b/Bundle/WidgetMapBundle/Warmer/WidgetDataWarmer.php @@ -149,7 +149,7 @@ class WidgetDataWarmer
elseif ($metaData->isCollectionValuedAssociation($association['fieldName'])) {
//Even if Widget is cached, we need its Criterias used before cache call
- if (!$widgetCached || $targetClass == Criteria::class) {
+ if (!$widgetCached || $targetClass === Criteria::class) {
//If Collection is not null, treat it
if ($this->accessor->getValue($entity, $association['fieldName'])) {
@@ -212,15 +212,15 @@ class WidgetDataWarmer
/* @var AssociatedEntityToWarm[] $associatedEntitiesToWarm */
foreach ($associatedEntitiesToWarm as $associatedEntityToWarm) {
foreach ($foundEntities as $foundEntity) {
- if ($associatedEntityToWarm->getType() == AssociatedEntityToWarm::TYPE_MANY_TO_ONE
- && $foundEntity->getId() == $associatedEntityToWarm->getEntityId()
+ if ($associatedEntityToWarm->getType() === AssociatedEntityToWarm::TYPE_MANY_TO_ONE
+ && $foundEntity->getId() === $associatedEntityToWarm->getEntityId()
) {
$inheritorEntity = $associatedEntityToWarm->getInheritorEntity();
$inheritorPropertyName = $associatedEntityToWarm->getInheritorPropertyName();
$this->accessor->setValue($inheritorEntity, $inheritorPropertyName, $foundEntity);
continue;
- } elseif ($associatedEntityToWarm->getType() == AssociatedEntityToWarm::TYPE_ONE_TO_MANY
- && $this->accessor->getValue($foundEntity, $findMethod) == $associatedEntityToWarm->getInheritorEntity()
+ } elseif ($associatedEntityToWarm->getType() === AssociatedEntityToWarm::TYPE_ONE_TO_MANY
+ && $this->accessor->getValue($foundEntity, $findMethod) === $associatedEntityToWarm->getInheritorEntity()
) {
$inheritorEntity = $associatedEntityToWarm->getInheritorEntity();
$inheritorPropertyName = $associatedEntityToWarm->getInheritorPropertyName();
| 4 |
diff --git a/src/plugins/Tus10.js b/src/plugins/Tus10.js @@ -49,6 +49,7 @@ module.exports = class Tus10 extends Plugin {
this.handlePauseAll = this.handlePauseAll.bind(this)
this.handleResumeAll = this.handleResumeAll.bind(this)
+ this.handleRetryAll = this.handleRetryAll.bind(this)
this.handleResetProgress = this.handleResetProgress.bind(this)
this.handleUpload = this.handleUpload.bind(this)
}
@@ -96,6 +97,16 @@ module.exports = class Tus10 extends Plugin {
updatedFiles[file] = updatedFile
})
this.core.setState({files: updatedFiles})
+ return
+ case 'retryAll':
+ inProgressUpdatedFiles.forEach((file) => {
+ const updatedFile = Object.assign({}, updatedFiles[file], {
+ isPaused: false,
+ error: null
+ })
+ updatedFiles[file] = updatedFile
+ })
+ this.core.setState({files: updatedFiles})
}
}
@@ -107,6 +118,10 @@ module.exports = class Tus10 extends Plugin {
this.pauseResume('resumeAll')
}
+ handleRetryAll () {
+ this.pauseResume('retryAll')
+ }
+
handleResetProgress () {
const files = Object.assign({}, this.core.state.files)
Object.keys(files).forEach((fileID) => {
@@ -186,6 +201,11 @@ module.exports = class Tus10 extends Plugin {
upload.start()
})
+ this.onRetryAll(file.id, () => {
+ upload.abort()
+ upload.start()
+ })
+
this.onPauseAll(file.id, () => {
upload.abort()
})
@@ -194,16 +214,16 @@ module.exports = class Tus10 extends Plugin {
upload.start()
})
- this.core.on('core:retry-started', () => {
- const files = this.core.getState().files
- if (files[file.id].progress.uploadComplete ||
- !files[file.id].progress.uploadStarted ||
- files[file.id].isPaused
- ) {
- return
- }
- upload.start()
- })
+ // this.core.on('core:retry-started', () => {
+ // const files = this.core.getState().files
+ // if (files[file.id].progress.uploadComplete ||
+ // !files[file.id].progress.uploadStarted ||
+ // files[file.id].isPaused
+ // ) {
+ // return
+ // }
+ // upload.start()
+ // })
upload.start()
this.core.emit('core:upload-started', file.id, upload)
@@ -325,6 +345,13 @@ module.exports = class Tus10 extends Plugin {
})
}
+ onRetryAll (fileID, cb) {
+ this.core.on('core:retry-all', () => {
+ if (!this.core.getFile(fileID)) return
+ cb()
+ })
+ }
+
onPauseAll (fileID, cb) {
this.core.on('core:pause-all', () => {
if (!this.core.getFile(fileID)) return
@@ -369,11 +396,13 @@ module.exports = class Tus10 extends Plugin {
actions () {
this.core.on('core:pause-all', this.handlePauseAll)
this.core.on('core:resume-all', this.handleResumeAll)
+ this.core.on('core:retry-all', this.handleRetryAll)
this.core.on('core:reset-progress', this.handleResetProgress)
if (this.opts.autoRetry) {
this.core.on('back-online', () => {
- this.core.emit('core:retry-started')
+ // this.core.emit('core:retry-started')
+ this.core.emit('core:retry-all')
})
}
}
@@ -396,5 +425,6 @@ module.exports = class Tus10 extends Plugin {
this.core.removeUploader(this.handleUpload)
this.core.off('core:pause-all', this.handlePauseAll)
this.core.off('core:resume-all', this.handleResumeAll)
+ this.core.off('core:retry-all', this.handleRetryAll)
}
}
| 0 |
diff --git a/.travis.yml b/.travis.yml @@ -2,8 +2,10 @@ sudo: false
language: node_js
matrix:
include:
- - node_js: 14
+ - node_js: 10
script: 'npm run test-node:ci'
+ before_install:
+ - git config --global url."https://github.com/".insteadOf "git://github.com/"
- node_js: node
addons:
sauce_connect: true
| 4 |
diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js @@ -13,7 +13,7 @@ class RoomNameInput extends Component {
this.setSelection = this.setSelection.bind(this);
this.state = {
- selection: {start: 0, end: 0},
+ selection: undefined,
};
}
| 12 |
diff --git a/pages/index.js b/pages/index.js @@ -321,7 +321,7 @@ export async function getStaticProps () {
})
return [...new Set(data)]
- })(require.context('../public/data/', true, /2021[0-9]{4}.json$/))
+ })(require.context('../public/data/', true, /202[1-2][0-9]{4}.json$/))
const contributors = await getGitHubContributors()
const chartDatasets = normalizeChartData()
| 7 |
diff --git a/components/autocomplete/Autocomplete.js b/components/autocomplete/Autocomplete.js @@ -132,7 +132,7 @@ const factory = (Chip, Input) => {
};
handleQueryFocus = (event) => {
- this.suggestionsNode.scrollTop = 0;
+ event.target.scrollTop = 0;
this.setState({ active: '', focus: true });
if (this.props.onFocus) this.props.onFocus(event);
};
@@ -375,7 +375,6 @@ const factory = (Chip, Input) => {
return (
<ul
className={classnames(theme.suggestions, { [theme.up]: this.state.direction === 'up' })}
- ref={(node) => { this.suggestionsNode = node; }}
>
{suggestions}
</ul>
| 11 |
diff --git a/package.json b/package.json "prismarine-block": "^1.1.1",
"prismarine-chunk": "^1.10.0",
"prismarine-entity": "^0.2.0",
- "prismarine-item": "^1.0.1",
+ "prismarine-item": "^1.1.0",
"prismarine-recipe": "^1.0.1",
"prismarine-windows": "^1.1.1",
"protodef": "^1.6.7",
| 4 |
diff --git a/userscript.user.js b/userscript.user.js @@ -46340,10 +46340,22 @@ var $$IMU_EXPORT$$;
return src.replace(/(\/img\/[0-9a-f]+-[0-9]+).*?[?&](location=[^&]*).*?$/, "$1?$2");
}
- if (domain_nowww === "nos.nl") {
+ if (domain_nowww === "nos.nl" ||
+ // thanks to llacb47 on github: ...
+ // https://assets.nos.nl/data/image/2020/10/08/681829/xxl.jpg
+ // https://assets.nos.nl/data/image/2020/10/08/681829/original.jpg
+ // https://assets.nos.nl/data/image/2020/10/08/681773/384x216a.jpg
+ // https://assets.nos.nl/data/image/2020/10/08/681773/original.jpg
+ // https://assets.nos.nl/data/image/2020/10/08/681835/128x72.jpg
+ // https://assets.nos.nl/data/image/2020/10/08/681835/original.jpg
+ // https://assets.nos.nl/data/image/2020/10/08/681808/512x288a.jpg
+ // https://assets.nos.nl/data/image/2020/10/08/681808/original.jpg
+ // https://assets.nos.nl/data/image/2020/10/07/681323/480x270.jpg
+ // https://assets.nos.nl/data/image/2020/10/07/681323/original.jpg
+ domain === "assets.nos.nl") {
// https://nos.nl/data/image/2018/07/13/486455/xxl.jpg
// https://nos.nl/data/image/2018/07/13/486455/original.jpg
- return src.replace(/(\/data\/image\/[0-9]+\/[0-9]+\/[0-9]+\/[0-9]+\/)[a-z]+(\.[^/.]*)$/, "$1original$2");
+ return src.replace(/(\/data\/+image\/+[0-9]{4}\/+(?:[0-9]{2}\/+){2}[0-9]+\/+)(?:[a-z]+|[0-9]+x[0-9]+[a-z]*)(\.[^/.]+)(?:[?#].*)?$/, "$1original$2");
}
if (domain_nowww === "braunschweiger-zeitung.de" ||
| 7 |
diff --git a/articles/users/concepts/overview-metadata.md b/articles/users/concepts/overview-metadata.md @@ -46,7 +46,7 @@ You can use the [Management API](/api/management/v2) in order to retrieve, creat
|--|--|
| [Search user by id](/api/management/v2#!/Users/get_users_by_id) | Use this if you want to search for a user based on Id. For an example request see [User Search](/users/search/best-practices#users-by-id). |
| [Search user by email](/api/management/v2#!/Users_By_Email/get_users_by_email) | Use this if you want to search for a user based on email. For an example request see [User Search](/users/search/best-practices#users-by-email).|
-| [Get a list of users](/api/management/v2#!/Users/get_users) | Use this if you want to search for a list if users with other search criteria. For an example request see [User Search](/users/search/best-practices#users). See also [Search Metadata](#search-metadata) for a list of restrictions. |
+| [Get a list of users](/api/management/v2#!/Users/get_users) | Use this if you want to search for a list if users with other search criteria. For an example request see [User Search](/users/references/search-best-practices#users). See also [Export Metadata](/users/references/search-best-practices#export-metadata) for limitations. |
| [Create User](/api/management/v2#!/Users/post_users) | Create a new user and (optionally) set metadata. For a body sample see [POST /api/v2/users](/api/management/v2#!/Users/post_users).|
| [Update User](/api/management/v2#!/Users/patch_users_by_id) | Update a user using a JSON object. For example requests see [PATCH /api/v2/users/{id}](/api/management/v2#!/Users/patch_users_by_id).|
| 2 |
diff --git a/components/messagequeue/messagequeue.css b/components/messagequeue/messagequeue.css transition: opacity 0.7s ease-in-out;
opacity: 1;
}
-.small {
+.bullet-container > .small {
color: #004085;
background-color: #cce5ff;
border-color: #b8daff;
border: 1px solid;
border-radius: .25rem;
}
-.warning {
+.bullet-container > .warning {
color:#f6f6f6;
background-color:#ffc107;
}
-.info {
+.bullet-container > .info {
color:#f6f6f6;
background-color:#2684FF
}
-.error {
+.bullet-container > .error {
color:#f6f6f6;
background-color:#dc3545
}
| 1 |
diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js .text(DPGlobal.formatDate(d, titleFormat, this.o.language));
this.picker.find('tfoot .today')
.text(todaytxt)
- .toggle(this.o.todayBtn !== false);
+ .css('display', this.o.todayBtn === true ? 'table-cell' : 'none');
this.picker.find('tfoot .clear')
.text(cleartxt)
- .toggle(this.o.clearBtn !== false);
+ .css('display', this.o.clearBtn === true ? 'table-cell' : 'none');
this.picker.find('thead .datepicker-title')
.text(this.o.title)
- .toggle(this.o.title !== '');
+ .css('display', typeof this.o.title === 'string' && this.o.title !== '' ? 'table-cell' : 'none');
this.updateNavArrows();
this.fillMonths();
var prevMonth = UTCDate(year, month, 0),
| 14 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,58 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.35.0] -- 2018-03-07
+
+### Added
+- Add `automargin` attribute to cartesian axes which auto-expands margins
+ when ticks, tick labels and/or axis titles do not fit on the graph [#2243]
+- Add support for typed arrays as data array inputs [#2388]
+- Add layout `grids` attribute for easy subplot generation [#2399]
+- Implement `cliponaxis: false` for bar text [#2378]
+- Add opposite axis attributes for range slider to control y axis range behavior [#2364]
+- Generalize `hoverdistance` and `spikedistance` for area-like objects [#2379]
+- Bring `scattergl` auto-range logic to par with SVG `scatter` [#2404]
+- Add selected/unselected marker color size support to `scattermapbox` traces [#2361]
+
+### Changed
+- Remove all circular dependencies in our `src/` directory [#2429]
+- Build our CDN bundles with `browser-pack-flat` browserify plugin [#2447]
+- Bump `mapbox-gl` to `v0.44.0` [#2361]
+- Bump `glslify` to `v6.1.1` [#2377]
+- Stop relinking `customdata`, `ids` and any matching objects
+ in `gd._fullLayout` during `Plots.supplyDefaults` [#2375]
+
+### Fixed
+- Fix buggy auto-range / auto-margin interaction
+ leading to axis range inconsistencies on redraws
+ (this bug was mostly noticeable on graphs with legends) [#2437]
+- Bring back `scattergl` lines under select/lasso `dragmode`
+ (bug introduced in `1.33.0`) [#2377]
+- Fix `scattergl` visible toggling for graphs with multiple traces
+ with different modes (bug introduced in `1.33.0`) [#2442]
+- Bring back `spikelines` for traces other than `scatter`
+ (bug introduced in `1.33.0`) [#2379]
+- Fix `Plotly.Fx.hover` acting on multiple subplots
+ (bug introduced in `1.32.0`) [#2379]
+- Fix range slider with stacked y axes positioning
+ (bug introduced in `1.32.0`) [#2451]
+- Fix `scattergl` color clustering [#2377]
+- Fix `Plotly.restyle` for `scattergl` `fill` [#2377]
+- Fix multi-line y-axis label positioning [#2424]
+- Fix centered hover labels edge cases [#2440, #2445]
+- Fix hover labels in bar groups in compare mode [#2414]
+- Fix axes and axis lines removal [#2416]
+- Fix auto-sizing in `Plotly.react` [#2437]
+- Fix error bars for `Plotly.react` and uneven data arrays [#2360]
+- Fix edits for date-string referenced annotations [#2368]
+- Fix `z` hover labels with exponents [#2422]
+- Fix yet another histogram edge case [#2413]
+- Fix fall back for contour labels when there's only one contour [#2411]
+- Fix `scatterpolar` category angular period calculations [#2449]
+- Clear select outlines on mapbox zoomstart [#2361]
+- Fix legend click to causes legend scroll bug [#2426]
+
+
## [1.34.0] -- 2018-02-12
### Added
| 3 |
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js @@ -11,6 +11,7 @@ const selectors = require('../selectors')
module.exports = connect(mapStateToProps, mapDispatchToProps)(WalletView)
function mapStateToProps (state) {
+
return {
network: state.metamask.network,
sidebarOpen: state.appState.sidebarOpen,
@@ -37,7 +38,7 @@ function WalletView () {
const noop = () => {}
WalletView.prototype.render = function () {
- const { network, responsiveDisplayClassname, style, identities, selectedAddress, selectedIdentity } = this.props
+ const { network, responsiveDisplayClassname, style, identities, selectedAddress } = this.props
return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), {
style: {},
@@ -45,7 +46,7 @@ WalletView.prototype.render = function () {
// TODO: Separate component: wallet account details
h('div.flex-column', {
- style: {},
+ style: {}
}, [
h('div.flex-row.account-options-menu', {
@@ -91,9 +92,9 @@ WalletView.prototype.render = function () {
]),
h('span.account-name', {
- style: {},
+ style: {}
}, [
- selectedIdentity.name,
+ 'Account 1'
]),
h(AccountDropdowns, {
@@ -102,13 +103,12 @@ WalletView.prototype.render = function () {
left: 'calc(50% + 28px + 5.5px)',
top: '19.5%',
},
- selectedAddress,
+ selected: selectedAddress,
network,
identities,
enableAccountsSelector: true,
}, []),
]),
-
]),
h(Content, {
@@ -120,13 +120,13 @@ WalletView.prototype.render = function () {
// Wallet contents
h(Content, {
- title: 'Total Token Balance',
- amount: '45.439 ETH',
- fiatValue: '$13,000.00 USD',
+ title: "Total Token Balance",
+ amount: "45.439 ETH",
+ fiatValue: "$13,000.00 USD",
active: false,
style: {
marginTop: '1.3em',
- },
- }),
+ }
+ })
])
}
| 13 |
diff --git a/userscript.user.js b/userscript.user.js @@ -6788,8 +6788,6 @@ var $$IMU_EXPORT$$;
(domain_nowww === "warwick.film" && src.indexOf("/image/") >= 0) ||
// https://quizizz.com/media/resource/gs/quizizz-media/quizzes/7ba7f6b8-81fe-427a-b455-eb5fabc60880?w=90&h=90
(domain_nowww === "quizizz.com" && src.match(/\/media\/+resource\/+/)) ||
- // https://im.vsco.co/aws-us-west-2/b68580/74476754/5c7624c5ef3068500ce138b2/vsco5c7624c5c4814.jpg
- domain === "im.vsco.co" ||
// http://eroce.com/img/post-images/2017-03-17/35234/009.jpg?p=small
(domain_nowww === "eroce.com" && src.indexOf("/img/") >= 0) ||
// https://img-cdn.hipertextual.com/files/2019/05/hipertextual-juego-tronos-episodio-final-es-mas-visto-historia-hbo-2019773047.jpg?strip=all&lossy=1&quality=70&resize=740%2C490&ssl=1
@@ -35779,7 +35777,9 @@ var $$IMU_EXPORT$$;
return src.replace(/(:\/\/[^/]*\/[a-z]\/+)[0-9]+x[0-9]+\/+/, "$10x0/");
}
- if (domain_nosub === "vsco.co" && domain.match(/^image(?:-aws)?.*/)) {
+ if (domain_nosub === "vsco.co" && domain.match(/^image(?:-aws)?.*/) ||
+ // https://im.vsco.co/aws-us-west-2/b68580/74476754/5c7624c5ef3068500ce138b2/vsco5c7624c5c4814.jpg
+ domain === "im.vsco.co") {
// https://im.vsco.co/aws-us-west-2/f7e1c6/20638915/5cc9a1ed32fea5392de5c0e7/vsco5cc9a1ee9e4b5.jpg?w=360 -- gets automatically redirected
// https://image-aws-us-west-2.vsco.co/f7e1c6/20638915/5cc9a1ed32fea5392de5c0e7/vsco5cc9a1ee9e4b5.jpg
// thanks to modelfe on github: https://github.com/qsniyg/maxurl/issues/57
@@ -35787,8 +35787,36 @@ var $$IMU_EXPORT$$;
// https://image-aws-us-west-2.vsco.co/00b02e/28967640/5cdace744c51282134f55d8c/vsco5cdace96a2daa.jpg
// https://image.vsco.co/1/552f8734525d23396531/5603ae65d3dca50b0760e937/720x960/vsco_092415.jpg
// https://image.vsco.co/1/552f8734525d23396531/5603ae65d3dca50b0760e937/vsco_092415.jpg
- return src.replace(/(\/[0-9a-f]{20,}\/+)[0-9]+x[0-9]+\/+(vsco_?[0-9a-f]+\.[^/.]*)(?:[?#].*)?$/,
+ newsrc = src.replace(/(\/[0-9a-f]{20,}\/+)[0-9]+x[0-9]+\/+(vsco_?[0-9a-f]+\.[^/.]*)(?:[?#].*)?$/,
"$1$2");
+ if (newsrc !== src)
+ return newsrc;
+
+ match = src.match(/^[a-z]+:\/\/[^/]+\/+(?:aws-[^/]+\/+)?[0-9a-f]{6}\/+[0-9]+\/+([0-9a-f]{20,})\/+/);
+ if (match && options && options.force_page && options.cb && options.do_request) {
+ options.do_request({
+ url: "https://vsco.co/vsco/media/" + match[1],
+ method: "HEAD",
+ onload: function(resp) {
+ if (resp.readyState !== 4)
+ return;
+
+ if (resp.status !== 200)
+ return options.cb(null);
+
+ return options.cb({
+ url: src,
+ extra: {
+ page: resp.finalUrl
+ }
+ });
+ }
+ });
+
+ return {
+ waiting: true
+ };
+ }
}
if (domain_nowww === "screenbeauty.com") {
| 7 |
diff --git a/ReviewQueueHelper.user.js b/ReviewQueueHelper.user.js // @description Keyboard shortcuts, skips accepted questions and audits (to save review quota)
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.9.4
+// @version 1.9.5
//
// @include https://*stackoverflow.com/review*
// @include https://*serverfault.com/review*
@@ -207,9 +207,10 @@ async function waitForSOMU() {
// Keyboard shortcuts event handler
$(document).on('keyup', function(evt) {
- // Back buttons: escape (27) or tilde (192)
+ // Back buttons: escape (27)
+ // Unable to use tilde (192) as on the UK keyboard it is swapped the single quote keycode
const cancel = evt.keyCode === 27;
- const goback = evt.keyCode === 27 || evt.keyCode === 192;
+ const goback = evt.keyCode === 27;
// Get numeric key presses
let index = evt.keyCode - 49; // 49 = number 1 = 0 (index)
@@ -236,9 +237,8 @@ async function waitForSOMU() {
return;
}
- // Do nothing if a textbox or textarea is focused, unless it's a tilde key - so close dupe dialog has the shortcut
- // Also ignore single quote key, which triggers dialog close for some reason
- if(($('input:text:focus, textarea:focus').length > 0 && evt.keyCode !== 192) || (evt.which == "'" || evt.keyCode == 222)) return;
+ // Do nothing if a textbox or textarea is focused
+ if($('input:text:focus, textarea:focus').length > 0) return;
// Is close menu open?
const closeMenu = $('#popup-close-question:visible');
| 2 |
diff --git a/packages/@uppy/dashboard/src/components/icons.js b/packages/@uppy/dashboard/src/components/icons.js @@ -2,7 +2,7 @@ const { h } = require('preact')
// https://css-tricks.com/creating-svg-icon-system-react/
-function defaultTabIcon () {
+function defaultPickerIcon () {
return <svg aria-hidden="true" width="30" height="30" viewBox="0 0 30 30">
<path d="M15 30c8.284 0 15-6.716 15-15 0-8.284-6.716-15-15-15C6.716 0 0 6.716 0 15c0 8.284 6.716 15 15 15zm4.258-12.676v6.846h-8.426v-6.846H5.204l9.82-12.364 9.82 12.364H19.26z" />
</svg>
@@ -83,7 +83,7 @@ function iconText () {
}
module.exports = {
- defaultTabIcon,
+ defaultPickerIcon,
iconCopy,
iconResume,
iconPause,
| 10 |
diff --git a/README.md b/README.md [](https://codeclimate.com/github/moleculerjs/moleculer/maintainability)
[](https://david-dm.org/moleculerjs/moleculer)
[](https://snyk.io/test/github/moleculerjs/moleculer)
-[](https://gitter.im/moleculerjs/moleculer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[](https://gitter.im/ice-services/moleculer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[](https://www.npmjs.com/package/moleculer)
[](https://app.fossa.io/projects/git%2Bgithub.com%2Fmoleculerjs%2Fmoleculer?ref=badge_shield)
| 13 |
diff --git a/src/common/i18n.js b/src/common/i18n.js @@ -44,9 +44,11 @@ export const translate = (input, params = []) => {
const stringToBeTranslated = input.replace(/\{\$({0-9])\}/gi, '%$1');
let translatedString = i18nTranslate(stringToBeTranslated);
params.forEach((replacement, index) => {
+ if (translatedString && typeof translatedString === 'string') {
translatedString = translatedString.replaceAll(`\{\$${index}\}`, replacement);
+ }
});
- return RenderHTML(translatedString);
+ return RenderHTML(translatedString || '');
}
return i18nTranslate(input);
};
| 3 |
diff --git a/src/utils/tokenHelper.js b/src/utils/tokenHelper.js @@ -23,7 +23,7 @@ function getTokenBySymbol(symbol) {
getWhiteListTokens().forEach(token => {
tokensBySymbols[token.symbol] = token;
});
- tokensByAddress[ANY_TOKEN.symbol] = ANY_TOKEN;
+ tokensBySymbols[ANY_TOKEN.symbol] = ANY_TOKEN;
}
return tokensBySymbols[symbol] || { symbol };
}
| 14 |
diff --git a/packages/openneuro-app/src/scripts/datalad/dashboard/datasets/dataset-tab.jsx b/packages/openneuro-app/src/scripts/datalad/dashboard/datasets/dataset-tab.jsx @@ -84,7 +84,11 @@ const DatasetTab = ({
<div className="col-md-5">
<h2>{title(publicDashboard, savedDashboard)}</h2>
{isMobile && !loading && (
- <h6>Results {data.datasets.pageInfo.count} </h6>
+ <h6>
+ {data.datasets
+ ? `Results ${data.datasets.pageInfo.count}`
+ : 'Zero results'}{' '}
+ </h6>
)}
</div>
{!isMobile && (
| 1 |
diff --git a/magda-sleuther-format/src/format-engine/measureEvaluatorByHierarchy.ts b/magda-sleuther-format/src/format-engine/measureEvaluatorByHierarchy.ts @@ -16,17 +16,14 @@ export default function getBestMeasureResult(
//TODO produce a system that mitigates when all measures return null. What should happen then?
if (!sortedCandidates[0].measureResult) {
- return {
- format: null,
- absConfidenceLevel: 0,
- distribution: null
- };
+ return null;
} else {
return {
format: sortedCandidates[0].measureResult.formats[0],
- absConfidenceLevel: sortedCandidates[0].getProcessedData().absoluteConfidenceLevel,
+ absConfidenceLevel: sortedCandidates[0].getProcessedData()
+ .absoluteConfidenceLevel,
distribution: sortedCandidates[0].measureResult.distribution
- }
+ };
}
}
@@ -39,9 +36,15 @@ function candidateSortFn(
return -1;
} else if (candidate2.measureResult && !candidate1.measureResult) {
return 1;
- } else if (candidate1.getProcessedData().absoluteConfidenceLevel === candidate2.getProcessedData().absoluteConfidenceLevel) {
+ } else if (
+ candidate1.getProcessedData().absoluteConfidenceLevel ===
+ candidate2.getProcessedData().absoluteConfidenceLevel
+ ) {
return 0;
- } else if (candidate1.getProcessedData().absoluteConfidenceLevel < candidate2.getProcessedData().absoluteConfidenceLevel) {
+ } else if (
+ candidate1.getProcessedData().absoluteConfidenceLevel <
+ candidate2.getProcessedData().absoluteConfidenceLevel
+ ) {
return 1;
} else {
return -1;
| 13 |
diff --git a/lib/assets/core/javascripts/cartodb3/components/stack-layout/stack-layout-view.js b/lib/assets/core/javascripts/cartodb3/components/stack-layout/stack-layout-view.js @@ -53,10 +53,6 @@ module.exports = CoreView.extend({
var nextView = this.collection.at(this.model.get('position')).get('createStackView').apply(this, args);
this.$el.html(nextView.render().el);
- if (nextView.className) {
- this.$el.addClass(nextView.className);
- }
-
this.addView(nextView);
}
});
| 12 |
diff --git a/readme-profiles/vunderkind.md b/readme-profiles/vunderkind.md @@ -18,6 +18,6 @@ What I'm currently interested in:
- 3D
- Interaction design
-<img src="https://github-profile-trophy.vercel.app/?username=tae8838&theme=dracula&column=3&margin-w=15&margin-h=15 (https://github.com/ryo-ma/github-profile-trophy)">
+<img src="https://github-profile-trophy.vercel.app/?username=vunderkind&theme=dracula&column=3&margin-w=15&margin-h=15 (https://github.com/ryo-ma/github-profile-trophy)">
-<p> <img align="center" src="https://github-readme-stats.vercel.app/api?username=tae8838&show_icons=true&count_private=true&theme=dark" alt="tae8838" /></p>
+<p> <img align="center" src="https://github-readme-stats.vercel.app/api?username=vunderkind&show_icons=true&count_private=true&theme=dark" alt="vunderkind" /></p>
| 13 |
diff --git a/apps/cliock/ChangeLog b/apps/cliock/ChangeLog 0.08: Fixes issue where face would redraw on wake leading to all memory being used and watch crashing.
0.09: Add BTN1 status line with ID,Fw ver, mem %, battery %
0.10: Icon fixed for transparency
+0.11: added Heart Rate Monitor status and ability to turn on/off
| 3 |
diff --git a/public/stylesheets/choropleth.css b/public/stylesheets/choropleth.css display:inline-block;
position: absolute;
top: 22%;
- left: 22px;
+ left: 20.5px;
cursor:pointer;
color:#2D2A3F;
font: normal normal normal 12px/1.4em raleway,sans-serif;
font-family: 'Raleway', sans-serif;
font-size:10px;
- width: 43px;
+ width: 46px;
padding:5px 6px;
text-align: center;
text-decoration:none;
| 7 |
diff --git a/packages/webpack-plugin/lib/plugin-loader.js b/packages/webpack-plugin/lib/plugin-loader.js @@ -53,7 +53,7 @@ module.exports = function (source) {
const callback = (err) => {
checkEntryDeps(() => {
if (err) return nativeCallback(err)
- extract(JSON.stringify(pluginEntry), 'json', resourcePath, 0)
+ extract(JSON.stringify(pluginEntry), resourcePath + '.json', 0)
nativeCallback(null, defaultResultSource)
})
}
| 1 |
diff --git a/src/graphics/program-lib/chunks/TBNderivative.frag b/src/graphics/program-lib/chunks/TBNderivative.frag @@ -15,6 +15,7 @@ void getTBN() {
vec3 B = dp2perp * duv1.y + dp1perp * duv2.y;
// construct a scale-invariant frame
- float invmax = 1.0 / sqrt( max( dot(T,T), dot(B,B) ) );
+ float denom = max( dot(T,T), dot(B,B) );
+ float invmax = (denom == 0.0) ? 0.0 : 1.0 / sqrt( denom );
dTBN = mat3( T * invmax, B * invmax, dVertexNormalW );
}
| 9 |
diff --git a/src/plugins/Dashboard/FilePreview.js b/src/plugins/Dashboard/FilePreview.js @@ -13,8 +13,9 @@ module.exports = function FilePreview (props) {
return (
<div class="uppy-DashboardItem-previewIconWrap">
<span class="uppy-DashboardItem-previewIcon" style={{ color: color }}>{icon}</span>
- <span class="uppy-DashboardItem-previewType">{file.extension && file.extension.length < 5 ? file.extension : null}</span>
<svg class="uppy-DashboardItem-previewIconBg" width="72" height="93" viewBox="0 0 72 93"><g><path d="M24.08 5h38.922A2.997 2.997 0 0 1 66 8.003v74.994A2.997 2.997 0 0 1 63.004 86H8.996A2.998 2.998 0 0 1 6 83.01V22.234L24.08 5z" fill="#FFF" /><path d="M24 5L6 22.248h15.007A2.995 2.995 0 0 0 24 19.244V5z" fill="#E4E4E4" /></g></svg>
</div>
)
}
+
+// <span class="uppy-DashboardItem-previewType">{file.extension && file.extension.length < 5 ? file.extension : null}</span>
| 2 |
diff --git a/src/components/BrowserView/BrowserView.jsx b/src/components/BrowserView/BrowserView.jsx @@ -219,7 +219,7 @@ const BrowserView = () => {
size='small'
/>
)}
- label="Brightness"
+ label="Light Sensitivity"
/>
</div>
</div>
| 3 |
diff --git a/src/Broadcast.js b/src/Broadcast.js 'use strict';
const ansi = require('sty');
+ansi.enable(); // force ansi on even when there isn't a tty for the server
const wrap = require('wrap-ansi');
const TypeUtil = require('./TypeUtil');
const Broadcastable = require('./Broadcastable');
| 1 |
diff --git a/modules/layers/src/solid-polygon-layer/polygon.js b/modules/layers/src/solid-polygon-layer/polygon.js @@ -168,8 +168,6 @@ function copyFlatRing(
* Normalize any polygon representation into the "complex flat" format
* @param {Array|Object} polygon
* @param {Number} positionSize - size of a position, 2 (xy) or 3 (xyz)
- * @param {Number} [vertexCount] - pre-computed vertex count in the polygon.
- * If provided, will skip counting.
* @return {Object} - {positions: <Float64Array>, holeIndices: <Array|null>}
*/
/* eslint-disable max-statements */
| 2 |
diff --git a/contracts/Synthetix.sol b/contracts/Synthetix.sol @@ -66,7 +66,7 @@ contract Synthetix is ExternStateToken {
// Available Synths which can be used with the system
Synth[] public availableSynths;
mapping(bytes32 => Synth) public synths;
- mapping(address => bytes32) public reverseSynths;
+ mapping(address => bytes32) public synthsByAddress;
IFeePool public feePool;
ISynthetixEscrow public escrow;
@@ -172,11 +172,11 @@ contract Synthetix is ExternStateToken {
bytes32 currencyKey = synth.currencyKey();
require(synths[currencyKey] == Synth(0), "Synth already exists");
- require(reverseSynths[synth] == bytes32(0), "Synth with same currencyKey already exists");
+ require(synthsByAddress[synth] == bytes32(0), "Synth address already exists");
availableSynths.push(synth);
synths[currencyKey] = synth;
- reverseSynths[synth] = currencyKey;
+ synthsByAddress[synth] = currencyKey;
}
/**
@@ -212,7 +212,7 @@ contract Synthetix is ExternStateToken {
}
// And remove it from the synths mapping
- delete reverseSynths[synths[currencyKey]];
+ delete synthsByAddress[synths[currencyKey]];
delete synths[currencyKey];
// Note: No event here as Synthetix contract exceeds max contract size
@@ -275,7 +275,7 @@ contract Synthetix is ExternStateToken {
bytes32[] memory currencyKeys = new bytes32[](availableSynths.length);
for (uint i = 0; i < availableSynths.length; i++) {
- currencyKeys[i] = reverseSynths[availableSynths[i]];
+ currencyKeys[i] = synthsByAddress[availableSynths[i]];
}
return currencyKeys;
@@ -941,7 +941,7 @@ contract Synthetix is ExternStateToken {
// * @notice Only a synth can call this function
// */
// modifier onlySynth {
- // require(reverseSynths[msg.sender] != bytes32(0), "Only synth allowed");
+ // require(synthsByAddress[msg.sender] != bytes32(0), "Only synth allowed");
// _;
// }
/**
@@ -953,7 +953,7 @@ contract Synthetix is ExternStateToken {
internal
view
{
- require(reverseSynths[messageSender] != bytes32(0), "Only synth allowed");
+ require(synthsByAddress[messageSender] != bytes32(0), "Only synth allowed");
}
modifier onlyOracle
| 3 |
diff --git a/includes/Core/Authentication/Authentication.php b/includes/Core/Authentication/Authentication.php @@ -657,8 +657,6 @@ final class Authentication {
'sitename' => substr( $external_sitename, 0, 30 ), // limit to 30 chars.
'siteurl' => untrailingslashit( home_url() ),
);
-
- $data['externalCredentialsURL'] = esc_url_raw( add_query_arg( $external_page_params, 'https://developers.google.com/web/site-kit' ) );
$data['externalAPIKeyURL'] = esc_url_raw( add_query_arg( $external_page_params, 'https://developers.google.com/web/site-kit/apikey' ) );
}
| 2 |
diff --git a/src/lib/navigation.js b/src/lib/navigation.js // @flow
+/* eslint-disable import/prefer-default-export */
+
import type { ComponentType } from "react";
import { withNavigationFocus as rnWithNavigationFocus } from "react-navigation";
import type { NavigationScreenProp, NavigationState } from "react-navigation";
@@ -8,9 +10,12 @@ export type NavigationProps = {
isFocused: boolean
};
-/* eslint-disable import/prefer-default-export */
-export function withNavigationFocus<T>(
- Component: ComponentType<T & NavigationProps>
-): ComponentType<$Diff<T, NavigationProps>> {
- return rnWithNavigationFocus(Component);
-}
+// React Navigation has types for this function, but they don't work properly
+// https://github.com/react-navigation/react-navigation/blob/05cbd85d5ce2f9775a2cc7c76a206c7e6d224508/flow/react-navigation.js#L1120
+
+// Do you get a flow error?
+// Your connector props most likely don't match the component props.
+export const withNavigationFocus = <Props>(
+ Component: ComponentType<Props & NavigationProps>
+): ComponentType<$Diff<Props, NavigationProps>> => // HELLO: If flow error, read comment above
+ rnWithNavigationFocus(Component);
| 0 |
diff --git a/origami.json b/origami.json "origamiType": "service",
"origamiVersion": 1,
"support": "https://github.com/Financial-Times/polyfill-service/issues",
+ "supportContact": {
+ "email": "[email protected]",
+ "slack": "financialtimes/ft-origami"
+ },
"supportStatus": "active",
"serviceUrl": "https://polyfill.io"
}
| 0 |
diff --git a/src/index.js b/src/index.js @@ -11,7 +11,7 @@ const pathBuilder = require('./path-builder');
const pipeline = require('./pipeline');
require('babel-core/register')({
- presets: ['react']
+ presets: ['react', 'es2015']
});
const idyll = (options = {}, cb) => {
| 11 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.