code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/js/views/ConnectedPeersPage.js b/js/views/ConnectedPeersPage.js @@ -2,9 +2,6 @@ import baseVw from './baseVw';
import loadTemplate from '../utils/loadTemplate';
import userShort from './UserCard';
import $ from 'jquery';
-import 'selectize';
-import { getTranslatedCountries } from '../data/countries';
-import _ from 'underscore';
export default class extends baseVw {
constructor(options = {}) {
| 4 |
diff --git a/source/swap/contracts/Swap.sol b/source/swap/contracts/Swap.sol @@ -190,7 +190,7 @@ contract Swap is ISwap, Ownable {
order.nonce,
block.timestamp,
order.signer.wallet,
- order.sender.amount,
+ order.signer.amount,
order.signer.id,
order.signer.token,
finalSenderWallet,
| 3 |
diff --git a/src/patterns/components/links/angular/info/inline.hbs b/src/patterns/components/links/angular/info/inline.hbs +<p class="sprk-u-mbs">
+ For intra-page links to work in Angular you will need
+ to set anchorScrolling: 'enabled' in
+ your RouterModule configuration.
+</p>
+
+<div class="drizzle-c-Command sprk-u-mbm">
+ <code class="drizzle-CodeHighlight">
+ RouterModule.forRoot(appRoutes, {
+ anchorScrolling: 'enabled'
+ })
+ </code>
+</div>
+
<p class="sprk-u-mbm">
See below for available customization options:
</p>
| 3 |
diff --git a/test/jasmine/tests/polar_test.js b/test/jasmine/tests/polar_test.js @@ -1150,8 +1150,6 @@ describe('Test polar interactions:', function() {
it('should not respond to drag interactions on plot area when dragmode === false', function(done) {
var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));
- fig.layout.dragmode = false;
-
// to avoid dragging on hover labels
fig.layout.hovermode = false;
@@ -1188,6 +1186,7 @@ describe('Test polar interactions:', function() {
_plot(fig)
.then(_assertBase)
+ .then(function() { return Plotly.relayout(gd, 'dragmode', false); })
.then(function() { return _drag(mid, [50, 50]); })
.then(function() {
_assertBase('from center move toward bottom-right');
@@ -1228,7 +1227,7 @@ describe('Test polar interactions:', function() {
.then(function() { _assertBase('from right edge to not far enough'); })
.then(function() {
expect(eventCnts.plotly_relayout)
- .toBe(0, 'no new relayout events after *not far enough* cases');
+ .toBe(1, 'no new relayout events after *not far enough* cases');
})
.then(delay(20))
.then(function() { return _doubleClick(mid); })
@@ -1245,8 +1244,6 @@ describe('Test polar interactions:', function() {
it('should not respond to drag interactions on radial drag area when dragmode === false', function(done) {
var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));
- fig.layout.dragmode = false;
-
// to avoid dragging on hover labels
fig.layout.hovermode = false;
@@ -1301,6 +1298,7 @@ describe('Test polar interactions:', function() {
_plot(fig)
.then(_assertBase)
+ .then(function() { return Plotly.relayout(gd, 'dragmode', false); })
.then(function() { return _drag(dragPos0, [-50, 0]); })
.then(function() {
_assertBase('move inward');
@@ -1322,14 +1320,13 @@ describe('Test polar interactions:', function() {
})
.then(_reset)
.then(function() {
- expect(eventCnts.plotly_relayout).toBe(0, 'total # of relayout events');
+ expect(eventCnts.plotly_relayout).toBe(1, 'total # of relayout events');
})
.then(done, done.fail);
});
it('should not respond to drag interactions on inner radial drag area when dragmode === false', function(done) {
var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));
- fig.layout.dragmode = false;
fig.layout.polar.hole = 0.2;
// to avoid dragging on hover labels
fig.layout.hovermode = false;
@@ -1359,6 +1356,8 @@ describe('Test polar interactions:', function() {
}
_plot(fig)
+ .then(_assertBase)
+ .then(function() { return Plotly.relayout(gd, 'dragmode', false); })
.then(function() { return _drag(dragPos0, [-50, 0]); })
.then(function() {
_assertBase('move inward');
@@ -1374,8 +1373,6 @@ describe('Test polar interactions:', function() {
it('should not respond to drag interactions on angular drag area when dragmode === false', function(done) {
var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));
- fig.layout.dragmode = false;
-
// to avoid dragging on hover labels
fig.layout.hovermode = false;
@@ -1421,6 +1418,7 @@ describe('Test polar interactions:', function() {
_plot(fig)
.then(_assertBase)
+ .then(function() { return Plotly.relayout(gd, 'dragmode', false); })
.then(function() { return _drag(dragPos0, [-20, -20]); })
.then(function() {
_assertBase('move counterclockwise');
@@ -1432,7 +1430,7 @@ describe('Test polar interactions:', function() {
})
.then(_reset)
.then(function() {
- expect(eventCnts.plotly_relayout).toBe(0, 'total # of relayout events');
+ expect(eventCnts.plotly_relayout).toBe(1, 'total # of relayout events');
})
.then(done, done.fail);
});
| 12 |
diff --git a/game.js b/game.js @@ -995,29 +995,6 @@ const _gameUpdate = (timestamp, timeDiff) => {
};
_updateEyes();
- const updateFov = () => {
- if (!renderer.xr.getSession()) {
- const fovInTime = 3;
- const fovOutTime = 0.3;
-
- const narutoRun = localPlayer.getAction('narutoRun');
- if (narutoRun) {
- if (ioManager.lastNonzeroDirectionVector.z < 0) {
- fovFactor += timeDiff / 1000 / fovInTime;
- } else {
- fovFactor -= timeDiff / 1000 / fovInTime;
- }
- } else {
- fovFactor -= timeDiff / 1000 / fovOutTime;
- }
- fovFactor = Math.min(Math.max(fovFactor, 0), 1);
-
- camera.fov = minFov + Math.pow(fovFactor, 0.75) * (maxFov - minFov);
- camera.updateProjectionMatrix();
- }
- };
- updateFov();
-
const crosshairEl = document.getElementById('crosshair');
if (crosshairEl) {
const visible = !!cameraManager.pointerLockElement &&
| 2 |
diff --git a/js/pages/trackers.es6.js b/js/pages/trackers.es6.js const Parent = window.DDG.base.Page;
+const backgroundPage = chrome.extension.getBackgroundPage();
+
const TrackerListView = require('./../views/trackerlist-truncated.es6.js');
const TrackerListModel = require('./../models/trackerlist-top-blocked.es6.js');
const trackerListTemplate = require('./../templates/trackerlist-truncated.es6.js');
@@ -22,6 +24,7 @@ const autocompleteTemplate = require('./../templates/autocomplete.es6.js');
function Trackers (ops) {
Parent.call(this, ops);
+
};
Trackers.prototype = $.extend({},
@@ -36,6 +39,8 @@ Trackers.prototype = $.extend({},
Parent.prototype.ready.call(this);
+ this.setBrowserClassOnBodyTag();
+
this.views.search = new SearchView({
pageView: this,
model: new SearchModel({searchText:''}), // TODO proper location of remembered query
@@ -87,6 +92,11 @@ Trackers.prototype = $.extend({},
template: autocompleteTemplate
});
+ },
+
+ setBrowserClassOnBodyTag: function () {
+ let browserClass = 'is-browser__' + backgroundPage.browser;
+ $('body').addClass(browserClass);
}
}
| 12 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -64,7 +64,7 @@ commands:
at: www
- run:
name: Tag build
- command: echo "<< parameters.target_branch >> $(date)" > www/version
+ command: echo "<< parameters.target_branch >> $(date -u +'%Y-%m-%dT%H:%M:%SZ')" > public/version
- run:
name: Install and configure dependencies
command: |
@@ -136,9 +136,10 @@ commands:
type: string
steps:
- slack/status:
- # fail_only: true
- failure_message: Binary bot release << parameters.target >> failed!
- success_message: Binary bot release << parameters.target >> done! version {{lookup('file', 'www/version') }}
+ include_project_field: false
+ failure_message: "<< parameters.target >> release failed for binary bot with version $(cat www/version)"
+ success_message: "<< parameters.target >> release succeeded for binary bot with version $(cat www/version)"
+
webhook: ${SLACK_WEBHOOK}
jobs:
test:
@@ -160,7 +161,7 @@ jobs:
- deploy:
target_branch: "staging"
- notify_slack:
- target: "staging"
+ target: "Staging"
release_production:
docker:
@@ -173,7 +174,7 @@ jobs:
- deploy:
target_branch: "production"
- notify_slack:
- target: "production"
+ target: "Production"
release_aws_production:
docker:
@@ -188,7 +189,7 @@ jobs:
- k8s_deploy:
target: "production"
- notify_slack:
- target: "production"
+ target: "Production"
workflows:
test:
| 3 |
diff --git a/src/comments/Comments.js b/src/comments/Comments.js @@ -27,6 +27,7 @@ export default class Comments extends Component {
super(props);
this.state = {
sortOrder: 'trending',
+ isFetchedOnce: false,
};
}
@@ -48,6 +49,16 @@ export default class Comments extends Component {
}
}
+ componentWillReceiveProps() {
+ const { comments, post } = this.props;
+
+ if (comments.listByPostId[post.id] && comments.listByPostId[post.id].isFetching) {
+ if (!this.state.isFetchedOnce) {
+ this.setState({ isFetchedOnce: true });
+ }
+ }
+ }
+
getNestedComments = (commentsObj, commentsIdArray, nestedComments) => {
commentsIdArray.forEach((commentId) => {
const nestedCommentArray = commentsObj.listByCommentId[commentId];
@@ -86,7 +97,9 @@ export default class Comments extends Component {
commentsChildren = this.getNestedComments(comments, comments.listByPostId[postId].list, {});
}
- if (comments.listByPostId[postId] && comments.listByPostId[postId].isFetching) {
+ if (comments.listByPostId[post.id]
+ && comments.listByPostId[post.id].isFetching
+ && !this.state.isFetchedOnce) {
return <Loading />;
}
| 9 |
diff --git a/app/models/site.rb b/app/models/site.rb @@ -147,7 +147,7 @@ class Site < ActiveRecord::Base
preference :feedback_url, :string
preference :terms_url, :string, :default => "/pages/terms"
preference :privacy_url, :string, :default => "/pages/privacy"
- preference :developers_url, :string, :default => "pages/developers"
+ preference :developers_url, :string, :default => "/pages/developers"
preference :twitter_url, :string
preference :iphone_app_url, :string
preference :android_app_url, :string
| 1 |
diff --git a/package.json b/package.json "test:web": "npm run link && react-app-rewired test",
"test:native": "npm run test:ios && npm run test:android",
"test:ios": "npm run animation:assets && ENVFILE=.env.test detox build -c ios.sim.debug && detox test -c ios.sim.debug",
- "test:android": "npm run animation:assets && ENVFILE=.env.test detox build -c android.emu.release && detox test -c android.emu.release",
+ "test:android": "npm run animation:assets && ENVFILE=.env.test detox build -c android.emu.debug && detox test -c android.emu.debug",
"coverage": "react-app-rewired test --coverage",
"coveralls": "cat ./coverage/lcov.info | node node_modules/.bin/coveralls",
"bundlesize:check": "bundlesize",
"type": "iPhone 11"
}
},
+ "android.emu.debug": {
+ "binaryPath": "android/app/build/outputs/apk/debug/app-debug.apk",
+ "build": "cd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..",
+ "type": "android.emulator",
+ "name": "emu"
+ },
"android.emu.release": {
"binaryPath": "android/app/build/outputs/apk/release/app-release.apk",
"build": "cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release && cd ..",
| 0 |
diff --git a/packages/fether-electron/src/main/utils/pino.js b/packages/fether-electron/src/main/utils/pino.js @@ -8,17 +8,26 @@ import fs from 'fs';
import { multistream } from 'pino-multi-stream';
import pino from 'pino';
+import { name } from '../../../package.json';
+
// Pino by default outputs JSON. We prettify that.
const pretty = pino.pretty();
pretty.pipe(process.stdout);
+// Create userData folder if it doesn't exist
+try {
+ fs.statSync(app.getPath('userData'));
+} catch (e) {
+ fs.mkdirSync(app.getPath('userData'));
+}
+
// Create 2 output streams:
-// - parity.log file (raw JSON)
+// - fether.log file (raw JSON)
// - stdout (prettified output)
const streams = [
{
level: 'info',
- stream: fs.createWriteStream(`${app.getPath('userData')}/parity.log`)
+ stream: fs.createWriteStream(`${app.getPath('userData')}/${name}.log`)
},
{ level: 'info', stream: pretty }
];
| 1 |
diff --git a/src/electron.js b/src/electron.js @@ -103,6 +103,28 @@ try {
console.error(e)
}
});
+
+
+ // Handle edge cases where "blur" event doesn't properly fire
+ mouseEvents.on("mousedown", (e) => {
+ if(panelSize.visible || !canReposition) {
+
+ // Check if clicking outside of panel/overlay
+ const pBounds = mainWindow.getBounds()
+ if( e.x < pBounds.x || e.x > pBounds.x + pBounds.width || e.y < pBounds.y || e.y > pBounds.y + pBounds.height ) {
+ if(!canReposition) {
+ // Overlay is displayed
+ hotkeyOverlayHide()
+ } else {
+ // Panel is displayed
+ sendToAllWindows("panelBlur")
+ showPanel(false)
+ }
+ }
+
+ }
+ })
+
} catch (e) {
console.error(e)
}
| 9 |
diff --git a/src/vaadin-date-picker-mixin.html b/src/vaadin-date-picker-mixin.html @@ -477,7 +477,9 @@ This program is available under Apache License Version 2.0, available at https:/
}
this.__userInputOccurred = false;
this.__dispatchChange = false;
+ this._ignoreFocusedDateChange = true;
this._focusedDate = selectedDate;
+ this._ignoreFocusedDateChange = false;
this._inputValue = selectedDate ? inputValue : '';
}
| 8 |
diff --git a/frontend/lost/src/tools/pipeline/src/nodes/datasource/modals/DatasourceNodeStartModal.js b/frontend/lost/src/tools/pipeline/src/nodes/datasource/modals/DatasourceNodeStartModal.js -import { BaseModal } from 'pipRoot/l3pfrontend/index'
+import { BaseModal, mapTree } from 'pipRoot/l3pfrontend/index'
import 'bootstrap-tree'
import 'bootstrap-tree/dist/bootstrap-treeview.min.css'
@@ -44,15 +44,17 @@ export default class DatasourceStartModal extends BaseModal {
break
} else {
$(this.html.refs['available']).text('Path is not avaiable')
- node.model.state.path.update('') // reset?
+ node.model.state.path.update('') // trigger reset instead?
node.model.state.validated.update(false)
}
}
})
// file tree
- $(this.html.refs['file-tree']).treeview({
- data: node.model.datasource.fileTree.nodes,
+ const data = mapTree(node.model.datasource.fileTree, {
+ childrenKey: "children",
+ map: [["name", "text"], ["children", "nodes"]]
})
+ $(this.html.refs['file-tree']).treeview({ data: data.nodes })
$(this.html.refs['file-tree']).treeview('collapseAll')
$(this.html.refs['file-tree']).on('nodeSelected', ($event, data) => {
$(this.html.refs['file-tree']).treeview('expandNode', data.nodeId)
| 4 |
diff --git a/assets/src/edit-story/components/canvas/multiSelectionMovable.js b/assets/src/edit-story/components/canvas/multiSelectionMovable.js @@ -44,8 +44,7 @@ function MultiSelectionMovable({ selectedElements }) {
});
const {
- actions: { updateElementsById, setSelectedElementsById },
- state: { currentPage },
+ actions: { updateElementsById },
} = useStory();
const {
state: {
@@ -203,16 +202,11 @@ function MultiSelectionMovable({ selectedElements }) {
eventTracker.current.coordinates
)
) {
- const clickedElement = Object.keys(nodesById).find(
- (id) =>
- currentPage.elements[0].id !== id &&
+ const clickedElement = Object.keys(nodesById).find((id) =>
nodesById[id].contains(inputEvent.target)
);
if (clickedElement) {
handleSelectElement(clickedElement, inputEvent);
- } else if (!inputEvent.shiftKey) {
- // Clear selection.
- setSelectedElementsById({ elementIds: [] });
}
// Click was handled.
return true;
| 9 |
diff --git a/assets/js/app/core/services/ListConfigService.js b/assets/js/app/core/services/ListConfigService.js "Confirm", "Really want to delete the selected item?",
['No don\'t', 'Yes! delete it'],
function accept() {
+
model.delete(item.id || item.name)
.then(function (res) {
-
- model.scope.items.data.splice(model.scope.items.data.indexOf(item), 1);
+ var context = model.scope.items.data || model.scope.items;
+ context.splice(context.indexOf(item), 1);
},function(err){
$log.error("ListConfigService : Model delete failed => ",err)
- })
+ });
}, function decline() {
- })
+ });
}
};
| 9 |
diff --git a/ui/scss/component/_comments.scss b/ui/scss/component/_comments.scss @@ -18,7 +18,7 @@ $thumbnailWidthSmall: 2rem;
}
.comment__create--reply {
- margin-top: var(--spacing-m);
+ margin-top: var(--spacing-l);
margin-left: calc(#{$thumbnailWidth} + var(--spacing-m));
position: relative;
}
@@ -157,7 +157,7 @@ $thumbnailWidthSmall: 2rem;
.comment__char-count {
align-self: flex-end;
font-size: var(--font-xsmall);
- padding-top: var(--spacing-xs);
+ padding-top: var(--spacing-xxs);
}
.comment__char-count-mde {
| 7 |
diff --git a/src/plots/frame_attributes.js b/src/plots/frame_attributes.js @@ -39,6 +39,7 @@ module.exports = {
},
data: {
valType: 'any',
+ role: 'object',
description: [
'A list of traces this frame modifies. The format is identical to the',
'normal trace definition.'
@@ -46,6 +47,7 @@ module.exports = {
},
layout: {
valType: 'any',
+ role: 'object',
description: [
'Layout properties which this frame modifies. The format is identical',
'to the normal layout definition.'
| 13 |
diff --git a/test/jasmine/tests/plot_api_test.js b/test/jasmine/tests/plot_api_test.js @@ -10,6 +10,7 @@ var subroutines = require('@src/plot_api/subroutines');
var helpers = require('@src/plot_api/helpers');
var d3 = require('d3');
+var customMatchers = require('../assets/custom_matchers');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var fail = require('../assets/fail_test');
@@ -105,6 +106,10 @@ describe('Test plot api', function() {
describe('Plotly.relayout', function() {
var gd;
+ beforeAll(function() {
+ jasmine.addMatchers(customMatchers);
+ });
+
beforeEach(function() {
gd = createGraphDiv();
});
@@ -252,6 +257,79 @@ describe('Test plot api', function() {
.catch(fail)
.then(done);
});
+
+ it('annotations, shapes and images linked to category axes should update properly on zoom/pan', function(done) {
+ var jsLogo = 'https://images.plot.ly/language-icons/api-home/js-logo.png';
+
+ function getPos(sel) {
+ var rect = sel.node().getBoundingClientRect();
+ return [rect.left, rect.bottom];
+ }
+
+ function getAnnotationPos() {
+ return getPos(d3.select('.annotation'));
+ }
+
+ function getShapePos() {
+ return getPos(d3.select('.layer-above').select('.shapelayer').select('path'));
+ }
+
+ function getImagePos() {
+ return getPos(d3.select('.layer-above').select('.imagelayer').select('image'));
+ }
+
+ Plotly.plot(gd, [{
+ x: ['a', 'b', 'c'],
+ y: [1, 2, 1]
+ }], {
+ xaxis: {range: [-1, 5]},
+ annotations: [{
+ xref: 'x',
+ yref: 'y',
+ x: 'b',
+ y: 2
+ }],
+ shapes: [{
+ xref: 'x',
+ yref: 'y',
+ type: 'line',
+ x0: 'c',
+ x1: 'c',
+ y0: -1,
+ y1: 4
+ }],
+ images: [{
+ xref: 'x',
+ yref: 'y',
+ source: jsLogo,
+ x: 'a',
+ y: 1,
+ sizex: 0.2,
+ sizey: 0.2
+ }]
+ })
+ .then(function() {
+ expect(getAnnotationPos()).toBeCloseToArray([247.5, 210.1]);
+ expect(getShapePos()).toBeCloseToArray([350, 369]);
+ expect(getImagePos()).toBeCloseToArray([170, 272.52]);
+
+ return Plotly.relayout(gd, 'xaxis.range', [0, 2]);
+ })
+ .then(function() {
+ expect(getAnnotationPos()).toBeCloseToArray([337.5, 210.1]);
+ expect(getShapePos()).toBeCloseToArray([620, 369]);
+ expect(getImagePos()).toBeCloseToArray([80, 272.52]);
+
+ return Plotly.relayout(gd, 'xaxis.range', [-1, 5]);
+ })
+ .then(function() {
+ expect(getAnnotationPos()).toBeCloseToArray([247.5, 210.1]);
+ expect(getShapePos()).toBeCloseToArray([350, 369]);
+ expect(getImagePos()).toBeCloseToArray([170, 272.52]);
+ })
+ .catch(fail)
+ .then(done);
+ });
});
describe('Plotly.restyle subroutines switchboard', function() {
| 0 |
diff --git a/lib/api/api-router.js b/lib/api/api-router.js @@ -86,7 +86,7 @@ module.exports = class ApiRouter {
const mapStore = new windshaft.storage.MapStore({
pool: redisPool,
expire_time: serverOptions.grainstore.default_layergroup_ttl,
- logger: global.logger
+ logger: global.log4js.getLogger('[windshaft]')
});
const rendererFactory = createRendererFactory({ redisPool, serverOptions, environmentOptions });
| 4 |
diff --git a/articles/protocols/saml/index.html b/articles/protocols/saml/index.html @@ -36,7 +36,7 @@ title: SAML
<i class="icon icon-budicon-695"></i><a href="/protocols/saml/saml-configuration/supported-options-and-bindings">Supported SAML Options and Bindings</a>
</li>
<li>
- <i class="icon icon-budicon-695"></i><a href="/docs/protocols/saml/saml-configuration/special-configuration-scenarios">Special Configuration Scenarios: IdP-Initiated SSO, Signing and Encrypting SAML Requests</a>
+ <i class="icon icon-budicon-695"></i><a href="/protocols/saml/saml-configuration/special-configuration-scenarios">Special Configuration Scenarios: IdP-Initiated SSO, Signing and Encrypting SAML Requests</a>
</li>
<li>
<i class="icon icon-budicon-695"></i><a href="/protocols/saml/saml-configuration/saml-assertions">Customize SAML Assertions</a>
| 1 |
diff --git a/contracts/IssuanceController.sol b/contracts/IssuanceController.sol @@ -71,8 +71,8 @@ contract IssuanceController is SafeDecimalMath, SelfDestructible, Pausable {
* @param _beneficiary The address which will receive any ether upon self destruct completion.
* @param _delay The timeframe from request of self destruct to ability to destroy.
* @param _oracle The address which is able to update price information.
- * @param _ethPrice The current price of ETH in USD, expressed in UNIT.
- * @param _havvenPrice The current price of Havven in USD, expressed in UNIT.
+ * @param _usdToEthPrice The current price of ETH in USD, expressed in UNIT.
+ * @param _usdToHavPrice The current price of Havven in USD, expressed in UNIT.
*/
constructor(address _owner, address _beneficiary, uint _delay, address _oracle, uint _usdToEthPrice, uint _usdToHavPrice)
/* Owned is initialised in SelfDestructible */
@@ -122,11 +122,11 @@ contract IssuanceController is SafeDecimalMath, SelfDestructible, Pausable {
* (so we can't lock ourselves out of updating the oracle for longer than this) */
require(lastPriceUpdateTime < timeSent && timeSent < now + ORACLE_FUTURE_LIMIT);
- ethPrice = newEthPrice;
- havvenPrice = newHavvenPrice;
+ usdToEthPrice = newEthPrice;
+ usdToHavPrice = newHavvenPrice;
lastPriceUpdateTime = timeSent;
- emit PricesUpdated(ethPrice, havvenPrice, lastPriceUpdateTime);
+ emit PricesUpdated(usdToEthPrice, usdToHavPrice, lastPriceUpdateTime);
}
/**
| 1 |
diff --git a/app/workers/certificates.php b/app/workers/certificates.php @@ -98,6 +98,23 @@ class CertificatesV1 extends Worker
&& isset($certificate['issueDate'])
&& (($certificate['issueDate'] + ($expiry)) > \time())
) { // Check last issue time
+
+ // Update document anyway, if needed
+ // This occurs when a cert is already generated because a different project is using the domain
+ // By updating here we ensure all domains has certificateId assigned (share same certificate document)
+ if(!isset($document['certificateId'])) {
+ $certificate = new Document(\array_merge($document, [
+ 'updated' => \time(),
+ 'certificateId' => $certificate->getId(),
+ ]));
+
+ $certificate = $dbForConsole->updateDocument('domains', $certificate->getId(), $certificate);
+
+ if(!$certificate) {
+ throw new Exception('Failed saving domain to DB');
+ }
+ }
+
throw new Exception('Renew isn\'t required');
}
| 11 |
diff --git a/src/user/UserProfile.js b/src/user/UserProfile.js @@ -204,10 +204,11 @@ class Profile extends Component {
route={this.props.route}
/>
- { (content.length === 0 && !isFetching) &&
- isOwnProfile ?
+ { (content.length === 0 && !isFetching && isOwnProfile) &&
<EmptyUserOwnProfile />
- :
+ }
+
+ { (content.length === 0 && !isFetching && !isOwnProfile) &&
<EmptyUserProfile />
}
</div>
| 1 |
diff --git a/src/app/Http/Controllers/Operations/ListOperation.php b/src/app/Http/Controllers/Operations/ListOperation.php @@ -114,7 +114,8 @@ trait ListOperation
// show newest items first, by default (if no order has been set for the primary column)
// if there was no order set, this will be the only one
// if there was an order set, this will be the last one (after all others were applied)
- $orderBy = $this->crud->query->getQuery()->orders;
+ // Note to self: `toBase()` returns also the orders contained in global scopes, while `getQuery()` don't.
+ $orderBy = $this->crud->query->toBase()->orders;
$table = $this->crud->model->getTable();
$key = $this->crud->model->getKeyName();
| 14 |
diff --git a/articles/tokens/id-token.md b/articles/tokens/id-token.md ---
-title: ID token
description: How to obtain, use and renew an id_token.
+toc: true
---
-
# ID Token
## Overview
@@ -14,7 +13,7 @@ You will need to decode this token to read the claims (or attributes) of the use
The `id_token` is consumed by the client and the claims included, are typically used for UI display. It was added to the OIDC specification as an optimization so the client can know the identity of the user, without having to make an additional network requests.
::: note
-If you need a refresher on OIDC refer to <a href="/protocols/oidc">OpenID Connect</a>.
+If you need a refresher on OIDC refer to [OpenID Connect](/protocols/oidc).
:::
The `id_token` conforms to an industry standard (IETF [RFC 7519](https://tools.ietf.org/html/rfc7519)) and contains three parts: a header, a body and a signature.
@@ -41,7 +40,7 @@ To check or update the algorithm your Client uses go to _[Client Settings](${man
## Control the contents of an ID token
-In order to retrieve an `id_token` the `responseType` should be set to `id_token`, both for client-side and server-side authentication flows.
+In order to retrieve an `id_token` the `responseType` should include the `id_token`, both for client-side and server-side authentication flows.
The attributes included in the issued `id_token` are controlled by the use of a [parameter called `scope`](/scopes).
- If `scope` is set to `openid`, then the `id_token` will contain only the `iss`, `sub`, `aud`, `exp` and `iat` claims.
@@ -69,25 +68,19 @@ lock.show();
The `id_token` will contain only the claims specified as the value of the `scope` parameter.
-### Add Claims using Rules
+### Add Custom Claims
-If you are using [OAuth 2.0 API Authorization](/api-auth), you can add arbitrary claims to the `id_token` using [Rules](/rules), with the following format: `context.idToken['http://my-namespace/claim-name'] = 'claim-value'`.
+You can add custom claims to your ID token (or [Access Token](/tokens/access-token)) using [Rules](/rules).
-Additionally, you can add custom claims for metadata: `context.idToken['http://my-namespace/preferred_contact'] = user.user_metadata.preferred_contact`.
+The claim name must conform to a namespaced format, which basically means addind any non-Auth0 HTTP or HTTPS URL as a prefix. The Auth0 namespaces you cannot use are `auth0.com`, `webtask.io` and `webtask.run`. The format you should follow is this: `http://my-namespace/claim-name`.
-```js
-function (user, context, callback) {
- const namespace = 'https://my-namespace/';
- context.idToken[namespace + 'claim-name'] = 'claim-value'
- context.idToken[namespace + 'favorite_color'] = user.favorite_color;
- context.idToken[namespace + 'preferred_contact'] = user.user_metadata.preferred_contact;
- callback(null, user, context);
-}
-```
+For more information on the namespaced format of custom claims, refer to [User profile claims and scope](/api-auth/tutorials/adoption/scope-custom-claims).
+
+For an example of how to add a custom claim, refer to [Add Custom Claims](/scopes/current#example-add-custom-claims).
### ID Token Payload
-::: panel-info Debugging a JWT
+::: note
The [JWT.io website](https://jwt.io) has a debugger that allows you to debug any JSON Web Token. This is useful if you want to quckly decode a JWT to see the information it contains.
:::
| 0 |
diff --git a/_projects/Metafluidics/Metafluidics.md b/_projects/Metafluidics/Metafluidics.md @@ -13,4 +13,5 @@ tags:
---
##About
-Metafluidics was built to provide a home for digital design files and all of the other information necessary to reproduce or remix a microfluidic device.
+<p>Metafluidics was built to provide a home for digital design files and all of the other information necessary to reproduce or remix a microfluidic device.</p>
+
| 0 |
diff --git a/tools/make/lib/ls/markdown.mk b/tools/make/lib/ls/markdown.mk @@ -22,7 +22,8 @@ FIND_MARKDOWN_FLAGS ?= \
-not -path "$(BUILD_DIR)/*" \
-not -path "$(DEPS_DIR)/**/$(TMP_FOLDER)/*" \
-not -path "$(REPORTS_DIR)/*" \
- -not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*"
+ -not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*" \
+ -not -path "$(TMP_DIR)/*"
ifneq ($(OS), Darwin)
FIND_MARKDOWN_FLAGS := -regextype posix-extended $(FIND_MARKDOWN_FLAGS)
| 8 |
diff --git a/website/riot/dict-edit-entry.riot b/website/riot/dict-edit-entry.riot // url contain linkable?
let match = window.location.hash.match(/.*\?link=(.*)/)
if (match != null && match[1] != null) {
- $('.linkable[name="'+match[1]+'"]').show();
- $('.linkable[name="'+match[1]+'"]')[0].scrollIntoView();
+ let linkname = decodeURIComponent(decodeURIComponent(match[1]));
+ if ($('.linkable[name="'+linkname+'"]').length > 0) {
+ $('.linkable[name="'+linkname+'"]').show();
+ $('.linkable[name="'+linkname+'"]')[0].scrollIntoView();
+ }
}
};
}
| 1 |
diff --git a/tests/phpunit/integration/Core/Permissions/PermissionsTest.php b/tests/phpunit/integration/Core/Permissions/PermissionsTest.php @@ -52,7 +52,7 @@ class PermissionsTest extends TestCase {
/**
* @processIsolation
*/
- public function test_register_with_dynamic_capabilities_enabled() {
+ public function test_register_with__dynamic_capabilities_enabled() {
$filters = array(
'map_meta_cap',
'googlesitekit_user_data',
@@ -76,7 +76,7 @@ class PermissionsTest extends TestCase {
/**
* @dataProvider data_role_without_permissions
*/
- public function test_all_roles_without_setup_does_not_have_any_capability_attached_to_it( $role ) {
+ public function test_all_roles__without_setup_does_not_have_any_capability_attached_to_it( $role ) {
$user = self::factory()->user->create_and_get( array( 'role' => $role ) );
$this->set_current_user( $user );
@@ -102,7 +102,7 @@ class PermissionsTest extends TestCase {
/**
* @dataProvider data_users_without_permissions_by_role
*/
- public function test_users_without_permissions( $role ) {
+ public function test_users__without_permissions( $role ) {
$this->set_current_user( self::factory()->user->create_and_get( array( 'role' => $role ) ) );
$permissions = array(
Permissions::AUTHENTICATE => false,
@@ -124,7 +124,7 @@ class PermissionsTest extends TestCase {
yield '`editor` role' => array( 'editor' );
}
- public function test_user_with_permissions_and_incomplete_setup() {
+ public function test_user__with_permissions_and_incomplete_setup() {
$this->set_current_user( self::factory()->user->create_and_get( array( 'role' => 'administrator' ) ) );
$permissions = array(
Permissions::AUTHENTICATE => false,
@@ -139,7 +139,7 @@ class PermissionsTest extends TestCase {
$this->assertSameSets( array_values( $permissions ), $permissions_instance->check_all_for_current_user() );
}
- public function test_user_with_permissions_and_setup_complete() {
+ public function test_user__with_permissions_and_setup_complete() {
$user = self::factory()->user->create_and_get( array( 'role' => 'administrator' ) );
$this->set_current_user( $user );
@@ -186,7 +186,7 @@ class PermissionsTest extends TestCase {
$this->assertSameSets( array_values( $permissions ), $permissions_instance->check_all_for_current_user() );
}
- public function test_unauthenticated_administrator_without_setup() {
+ public function test_unauthenticated_administrator__without_setup() {
$user = self::factory()->user->create_and_get( array( 'role' => 'administrator' ) );
$this->set_current_user( $user );
@@ -201,7 +201,7 @@ class PermissionsTest extends TestCase {
$this->assertFalse( $user->has_cap( Permissions::VIEW_MODULE_DETAILS ) );
}
- public function test_authenticated_user_with_administrator_role() {
+ public function test_authenticated_user__with_administrator_role() {
$user = self::factory()->user->create_and_get( array( 'role' => 'administrator' ) );
$this->set_current_user( $user );
@@ -225,7 +225,7 @@ class PermissionsTest extends TestCase {
$this->assertFalse( $user->has_cap( Permissions::VIEW_MODULE_DETAILS ) );
}
- public function test_authenticated_user_with_administrator_role_and_setup_complete() {
+ public function test_authenticated_user__with_administrator_role_and_setup_complete() {
$user = self::factory()->user->create_and_get( array( 'role' => 'administrator' ) );
$this->set_current_user( $user );
| 10 |
diff --git a/lib/waterline/utils/query/private/normalize-where-clause.js b/lib/waterline/utils/query/private/normalize-where-clause.js @@ -600,7 +600,7 @@ module.exports = function normalizeWhereClause(whereClause, modelIdentity, orm,
// Recursive call
try {
- _recursiveStep(conjunctOrDisjunct, recursionDepth+1, conjunctsOrDisjuncts, i, soleBranchKey === 'or');
+ _recursiveStep(conjunctOrDisjunct, recursionDepth+1, conjunctsOrDisjuncts, i);
} catch (e) {
switch (e.code) {
| 2 |
diff --git a/src/menelaus_web.erl b/src/menelaus_web.erl @@ -671,7 +671,7 @@ get_action(Req, {AppRoot, IsSSL, Plugins}, Path, PathTokens) ->
{{[admin, memcached], write},
fun menelaus_web_mcd_settings:handle_node_post/2, [Node]};
["pools", "default", "checkPermissions"] ->
- {{[pools], read},
+ {no_check,
fun menelaus_web_rbac:handle_check_permissions_post/1};
["settings", "indexes"] ->
{{[indexes], write}, fun menelaus_web_indexes:handle_settings_post/1};
| 11 |
diff --git a/lib/WasmReader/WasmByteCodeGenerator.cpp b/lib/WasmReader/WasmByteCodeGenerator.cpp @@ -1606,7 +1606,7 @@ EmitInfo WasmBytecodeGenerator::PopEvalStack(WasmTypes::WasmType expectedType, c
{
if (!mismatchMessage)
{
- mismatchMessage = _u("Type mismatch");
+ throw WasmCompilationException(_u("Type mismatch. Expected %s, got %s"), GetTypeName(expectedType), GetTypeName(info.type));
}
throw WasmCompilationException(mismatchMessage);
}
| 7 |
diff --git a/skeleton/my-great-widget.js b/skeleton/my-great-widget.js -/*
- widget area is 24 pixel high and 239 width : (0,0,239,23)
-*/
(() => {
- // const data, var or image
+ // add the width
+ var xpos = WIDGETPOS.tr-<the widget width>;
+ WIDGETPOS.tr-=<the widget width plus some extra pixel to keep distance to others>;
+ // draw your widget at xpos
function draw() {
- ...
+ // add your code
}
- WIDGETS["your widget name"] = { draw: draw };
+ // add your widget
+ WIDGETS["mywidget"]={draw:draw};
})()
\ No newline at end of file
| 3 |
diff --git a/components/Article/graphql/getDocument.js b/components/Article/graphql/getDocument.js @@ -84,7 +84,7 @@ export const getDocument = gql`
color
kind
image
- shareImageLogo
+ shareLogo
shareBackgroundImage
shareBackgroundImageInverted
section {
| 10 |
diff --git a/components/ReplyItem.js b/components/ReplyItem.js @@ -176,7 +176,12 @@ const useStyles = makeStyles(theme => ({
padding: '10px 25px',
background: theme.palette.primary[500],
color: theme.palette.common.white,
+ cursor: 'pointer',
borderRadius: 30,
+ '&:disabled': {
+ opacity: 0.7,
+ cursor: 'not-allowed',
+ },
},
}));
@@ -234,11 +239,15 @@ function ReplyItem({
negativeFeedbackCount,
ownVote,
}) {
- const [createReplyFeedback] = useMutation(CREATE_REPLY_FEEDBACK, {
+ const [createReplyFeedback, { loading: updatingReplyFeedback }] = useMutation(
+ CREATE_REPLY_FEEDBACK,
+ {
onCompleted() {
closeVotePopover();
+ setReason('');
},
- });
+ }
+ );
const [vote, setVote] = useState(null);
const [reason, setReason] = useState('');
@@ -420,11 +429,11 @@ function ReplyItem({
<button
type="button"
className={classes.sendButton}
+ disabled={updatingReplyFeedback}
onClick={() => {
createReplyFeedback({
variables: { articleId, replyId, vote, comment: reason },
});
- closeVotePopover();
}}
>{t`Send`}</button>
</div>
| 7 |
diff --git a/README.md b/README.md @@ -42,7 +42,7 @@ Waiting...
3. Head on over to your browser and navigate to `127.0.0.1:9000`. This should display the Project Sidewalk webpage. Note that the first time compilation takes time.
### Additional Tools
-1. Importing SQL dump: The Postgres database schema has already been set up in the db docker container. To import production db dump, get the dump as per [instructions](https://github.com/ProjectSidewalk/Instructions), rename the file `dump.sql`, place it in the `db` folder, and run `make import-dump` from the base folder.
+1. Importing SQL dump: The Postgres database schema has already been set up in the db docker container. To import production db dump, get the dump as per [instructions](https://github.com/ProjectSidewalk/Instructions), rename the file `dump`, place it in the `db` folder, and run `make import-dump` from the base folder.
2. SSH into containers: To ssh into the containers, run `make ssh target=[web|db]`. Note that `[web|db]` is not a literal syntax, it specifies which container you would want to ssh into. For example, you can do `make ssh target=web`.
| 1 |
diff --git a/curriculum/challenges/english/01-responsive-web-design/basic-css/create-a-custom-css-variable.english.md b/curriculum/challenges/english/01-responsive-web-design/basic-css/create-a-custom-css-variable.english.md @@ -8,7 +8,7 @@ forumTopicId: 301086
## Description
<section id='description'>
-To create a CSS variable, you just need to give it a name with two dashes in front of it and assign it a value like this:
+To create a CSS variable, you just need to give it a name with two hyphens in front of it and assign it a value like this:
```css
--penguin-skin: gray;
| 14 |
diff --git a/app/src/index.js b/app/src/index.js @@ -46,7 +46,7 @@ const supportedBrowsers={
'samsung internet for android' : '>=11.1.1.52'
};
-const intl = createIntl();
+const intl = createIntl({ locale: 'en', defaultLocale: 'en' });
if (process.env.REACT_APP_DEBUG === '*' || process.env.NODE_ENV !== 'production')
{
@@ -141,7 +141,7 @@ function run()
{
render(
<MuiThemeProvider theme={theme}>
- <IntlProvider value={intl}>
+ <IntlProvider value={intl} defaultLocale='en'>
<UnsupportedBrowser
webrtcUnavailable={webrtcUnavailable}
platform={device.platform}
| 12 |
diff --git a/src/components/CardCollection/index.js b/src/components/CardCollection/index.js @@ -53,9 +53,9 @@ class CardCollection extends React.Component {
super(props);
this.state = {
currentYear: fiscalYearList[7],
- currentBureau: "",
data: null,
currentServiceArea: "PS",
+ currentBureau: "FR",
}
// this.getData = this.getData.bind(this);
// this.getAllData = this.getAllData.bind(this);
| 12 |
diff --git a/packages/@uppy/dashboard/src/style.scss b/packages/@uppy/dashboard/src/style.scss .uppy-DashboardTabs {
- padding-top: 7px;
- padding-bottom: 7px;
+ padding: 7px;
+ padding-right: 28px;
border-bottom: 1px solid rgba($color-gray, 0.3);
}
list-style-type: none;
margin: 0;
padding: 0;
- display: flex;
- justify-content: center;
- align-items: center;
+ // display: flex;
+ // justify-content: center;
+ // align-items: center;
+ white-space: nowrap;
+ overflow-x: auto;
+ -webkit-overflow-scrolling: touch;
+ text-align: center;
}
.uppy-DashboardTab {
margin: 0;
padding: 0 0 10px 0;
overflow-y: auto;
+ -webkit-overflow-scrolling: touch;
position: absolute;
top: 0;
left: 0;
max-height: 40%;
flex-grow: 1;
overflow-y: auto;
+ -webkit-overflow-scrolling: touch;
}
.uppy-DashboardFileCard-fieldset {
| 1 |
diff --git a/run_tests.py b/run_tests.py @@ -16,10 +16,6 @@ if raised_exception:
if __name__ == '__main__':
test_suite = TestSuite()
- ver = str(subprocess.check_output(['npm', 'list', 'ganache-cli']))
- if ver.split("@")[-1].split(" ")[0] != "6.1.0-beta.0":
- raise Exception("Please install ganache-cli beta by running `npm install -g [email protected]`")
-
test_settings = load_test_settings()
test_suite = TestSuite()
| 2 |
diff --git a/token-metadata/0x177d39AC676ED1C67A2b268AD7F1E58826E5B0af/metadata.json b/token-metadata/0x177d39AC676ED1C67A2b268AD7F1E58826E5B0af/metadata.json "symbol": "CDT",
"address": "0x177d39AC676ED1C67A2b268AD7F1E58826E5B0af",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/contentview/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/contentview/template.vue this.iframe.head = this.iframe.doc.querySelector('head')
this.iframe.app = this.iframe.doc.querySelector('#peregrine-app')
this.iframe.doc.querySelector('#peregrine-app').setAttribute('contenteditable', 'false')
+ this.addIframeExtraStyles()
this.removeLinkTargets()
this.refreshInlineEditClones()
this.iframeEditMode()
this.iframe.doc.addEventListener('scroll', this.onIframeScroll)
this.iframe.doc.addEventListener('dragover', this.onIframeDragOver)
this.iframe.doc.addEventListener('drop', this.onIframeDrop)
- this.addIframeExtraStyles()
this.iframe.body.setAttribute('contenteditable', 'true')
- this.iframe.app.classList.remove('preview-mode')
+ this.iframe.html.classList.add('edit-mode')
const elements = this.iframe.app.querySelectorAll(`[${Attribute.INLINE}]`)
elements.forEach((el, index) => {
if (this.findComponentEl(el).classList.contains('from-template')) return
el.setAttribute('contenteditable', 'true')
if (el.classList.contains('inline-edit-clone')) {
- el.style.display = ''
el.innerHTML = elements[index + 1].innerHTML
} else {
- el.style.display = 'none'
if (this.component === el) {
this.target = elements[index - 1]
}
iframePreviewMode(editable = false) {
this.iframe.doc.removeEventListener('click', this.onIframeClick)
this.iframe.doc.removeEventListener('scroll', this.onIframeScroll)
- this.removeIframeExtraStyles()
this.iframe.body.setAttribute('contenteditable', 'false')
- this.iframe.app.classList.add('preview-mode')
+ this.iframe.html.classList.remove('edit-mode')
const elements = this.iframe.app.querySelectorAll(`[${Attribute.INLINE}]`)
elements.forEach((el, index) => {
if (this.findComponentEl(el).classList.contains('from-template')) return
el.setAttribute('contenteditable', editable)
if (el.classList.contains('inline-edit-clone')) {
- el.style.display = 'none'
if (this.component === el) {
this.target = elements[index + 1]
}
- } else {
- el.style.display = ''
}
})
},
addIframeExtraStyles() {
if (this.iframe.head.querySelector('#editing-extra-styles')) return
const css = `
- body {
+ html.edit-mode body {
cursor: default !important
}
- #peregrine-app [contenteditable="true"]:focus,
- #peregrine-app [contenteditable="true"]:hover {
+ html.edit-mode #peregrine-app [contenteditable="true"]:focus,
+ html.edit-mode #peregrine-app [contenteditable="true"]:hover {
outline: 1px solid #fe9701 !important;
}
- #peregrine-app .from-template {
+ html.edit-mode #peregrine-app .from-template {
cursor: not-allowed !important;
}
- #peregrine-app .from-template * {
+ html.edit-mode #peregrine-app .from-template * {
cursor: not-allowed !important;
- }`
+ }
+
+ html.edit-mode #peregrine-app .inline-edit-original {
+ display: none !important;
+ }
+
+ html:not(.edit-mode) #peregrine-app .inline-edit-clone {
+ display: none !important;
+ }
+ `
const style = this.iframe.doc.createElement('style')
this.iframe.head.appendChild(style)
style.type = 'text/css'
style.setAttribute('id', 'editing-extra-styles')
},
- removeIframeExtraStyles() {
- this.iframe.head.querySelectorAll('#editing-extra-styles').forEach((style) => {
- style.remove()
- })
- },
-
isContentEditableOrNested(el) {
const component = this.findComponentEl(el)
let found = el
| 7 |
diff --git a/modules/site/parent_templates/site/common/js/application.js b/modules/site/parent_templates/site/common/js/application.js @@ -3193,7 +3193,7 @@ var XBOOTSTRAP = (function ($, parent) { var self = parent.VARIABLES = {};
);
for (var k=0; k<variables.length; k++) {
- // if it's first attempt to replace vars on this page look at vars in image tags first
+ // if it's first attempt to replace vars on this page look at vars in image & mathjax tags first
// these are simply replaced with no surrounding tag so vars can be used as image sources etc.
if (tempText.indexOf('[' + variables[k].name + ']') != -1) {
var $tempText = $(tempText);
@@ -3206,6 +3206,17 @@ var XBOOTSTRAP = (function ($, parent) { var self = parent.VARIABLES = {};
tempText = $tempText.map(function(){ return this.outerHTML; }).get().join('');
}
+ if (tempText.indexOf('[' + variables[k].name + ']') != -1) {
+ var $tempText = $(tempText);
+ for (var m=0; m<$tempText.find('.mathjax').length; m++){
+ var tempImgTag = $tempText.find('.mathjax')[m].outerHTML,
+ regExp2 = new RegExp('\\[' + variables[k].name + '\\]', 'g');
+ tempImgTag = tempImgTag.replace(regExp2, checkDecimalSeparator(variables[k].value));
+ $($tempText.find('.mathjax')[m]).replaceWith(tempImgTag);
+ }
+ tempText = $tempText.map(function(){ return this.outerHTML; }).get().join('');
+ }
+
// replace with the variable text (this looks at both original variable mark up (e.g. [a]) & the tag it's replaced with as it might be updating a variable value that's already been inserted)
var regExp = new RegExp('\\[' + variables[k].name + '\\]|<span class="x_var x_var_' + variables[k].name + '">(.*?)</span>', 'g');
tempText = tempText.replace(regExp, '<span class="x_var x_var_' + variables[k].name + '">' + checkDecimalSeparator(variables[k].value) + '</span>');
| 11 |
diff --git a/website/site/content/docs/collection-types.md b/website/site/content/docs/collection-types.md @@ -7,7 +7,7 @@ position: 27
All editable content types are defined in the `collections` field of your `config.yml` file, and display in the left sidebar of the Content page of the editor UI.
-Collections come in two main types: `folder` and `file`.
+Collections come in two main types: `folder` and `files`.
## Folder collections
@@ -64,36 +64,11 @@ collections:
## File collections
-File collections represent a single file or grouping of files, useful for unique files with a custom set of fields.
+A `files` collection contains one or more uniquely configured files. Unlike items in `folder` collections, which repeat the same configuration over all files in the folder, each item in a `files` collection has an explicitly set path, filename, and configuration. This can be useful for unique files with a custom set of fields, like a settings file or a custom landing page with a unique content structure.
-### Single `file`
+When configuring a `files` collection, each file in the collection is configured separately, and listed under the `files` field of the collection. Each file has its own list of `fields`, and a unique filepath specified in the `file` field (relative to the base of the repo).
-Use `file` to specify a single file "collection". The value is a path to the file to be edited, relative to the base of the repository.
-
-Example using `file`:
-
-```yaml
-- label: "Site Settings"
- name: "general"
- file: "site/_data/settings.json"
- extension: "json"
- description: "General Site Settings"
- fields:
- - {label: "Global title", name: "site_title", widget: "string"}
- - label: "Post Settings"
- name: "posts"
- widget: "object"
- fields:
- - {label: "Number of posts on frontpage", name: front_limit, widget: number}
- - {label: "Default Author", name: author, widget: string}
- - {label: "Default Thumbnail", name: thumb, widget: image, class: "thumb"}
-```
-
-### Multiple `files`
-
-You can group multiple files together under a single item in the collection list by using the `files` option. The option takes a list of single `file`-type collections.
-
-Example using `files`:
+Example:
``` yaml
- label: "Pages"
| 2 |
diff --git a/lib/determine-basal/determine-basal.js b/lib/determine-basal/determine-basal.js @@ -432,7 +432,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
var lowtempimpact = (currenttemp.rate - basal) * ((30-minutes_running)/60) * sens;
var adjEventualBG = eventualBG + lowtempimpact;
// don't return early if microBolusAllowed etc.
- if ( adjEventualBG < min_bg && ! (microBolusAllowed && ((profile.temptargetSet && target_bg < 100) || rT.COB))) {
+ if ( adjEventualBG < min_bg && ! (microBolusAllowed && ((profile.temptargetSet && target_bg < 100) || rT.COB || iob_data.bolussnooze > 0))) {
rT.reason += "letting low temp of " + currenttemp.rate + " run.";
return rT;
}
@@ -441,7 +441,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
// if eventual BG is above min but BG is falling faster than expected Delta
if (minDelta < expectedDelta) {
// if in SMB mode, don't cancel SMB zero temp
- if (! (microBolusAllowed && ((profile.temptargetSet && target_bg < 100) || rT.COB))) {
+ if (! (microBolusAllowed && ((profile.temptargetSet && target_bg < 100) || rT.COB || iob_data.bolussnooze > 0))) {
if (glucose_status.delta < minDelta) {
rT.reason += "Eventual BG " + convert_bg(eventualBG, profile) + " > " + convert_bg(min_bg, profile) + " but Delta " + tick + " < Exp. Delta " + expectedDelta;
} else {
@@ -465,7 +465,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
}
// if in SMB mode, don't cancel SMB zero temp
- if (! (microBolusAllowed && ((profile.temptargetSet && target_bg < 100) || rT.COB))) {
+ if (! (microBolusAllowed && ((profile.temptargetSet && target_bg < 100) || rT.COB || iob_data.bolussnooze > 0))) {
rT.reason += convert_bg(eventualBG, profile)+"-"+convert_bg(snoozeBG, profile)+" in range: no temp required";
if (currenttemp.duration > 15 && (round_basal(basal, profile) === round_basal(currenttemp.rate, profile))) {
rT.reason += ", temp " + currenttemp.rate + " ~ req " + basal + "U/hr";
@@ -518,9 +518,9 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
var lastBolusAge = round(( new Date().getTime() - iob_data.lastBolusTime ) / 60000,1);
//console.error(lastBolusAge);
//console.error(profile.temptargetSet, target_bg, rT.COB);
- // only allow microboluses with COB or low temp targets
+ // only allow microboluses with COB or low temp targets, or within DIA/2 hours of a bolus
// only microbolus if insulinReq represents 20m or more of basal
- if (microBolusAllowed && ((profile.temptargetSet && target_bg < 100) || rT.COB)) { // && insulinReq > profile.current_basal/3) {
+ if (microBolusAllowed && ((profile.temptargetSet && target_bg < 100) || rT.COB || iob_data.bolussnooze > 0)) { // && insulinReq > profile.current_basal/3) {
// never bolus more than 30m worth of basal
maxBolus = profile.current_basal/2;
// bolus 1/3 the insulinReq, up to maxBolus
| 11 |
diff --git a/token-metadata/0xa10ae543dB5D967a73E9Abcc69c81a18A7Fc0A78/metadata.json b/token-metadata/0xa10ae543dB5D967a73E9Abcc69c81a18A7Fc0A78/metadata.json "symbol": "CLOUT",
"address": "0xa10ae543dB5D967a73E9Abcc69c81a18A7Fc0A78",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/app/src/scripts/admin/charts/admin.bar.jsx b/app/src/scripts/admin/charts/admin.bar.jsx @@ -75,6 +75,11 @@ const Bar = ({ year, logs, months }) => {
<VictoryBar data={total} />
</VictoryStack>
</VictoryChart>
+ <span>
+ <span className="failed">Failed</span>
+ <span className="succeed">Succeeded</span>
+ <span className="total">Total</span>
+ </span>
</div>
)
} else {
| 12 |
diff --git a/assets/js/components/notifications/module-settings-warning.js b/assets/js/components/notifications/module-settings-warning.js @@ -8,19 +8,9 @@ import ErrorIcon from '../../../svg/error.svg';
const { useSelect } = Data;
-/**
- * A single module. Keeps track of its own active state and settings.
- */
/*
-class ModuleSettingsWarning extends Component {
- render() {
- return null;
- }
-}
-
-export default withFilters( 'googlesitekit.ModuleSettingsWarning' )( ModuleSettingsWarning );
+ * A single module. Keeps track of its own active state and settings.
*/
-
export default function ModuleSettingsWarning( {
slug,
// context,
@@ -29,8 +19,8 @@ export default function ModuleSettingsWarning( {
// this to rerun after modules are loaded.
// Once #1769 is resolved, we can remove the call to getModules,
// and remove the !! modules cache busting param.
- const modules = useSelect( ( select ) => select( CORE_MODULES ).getModules() );
- const requirementsStatus = useSelect( ( select ) => select( CORE_MODULES ).getCheckRequirementsStatus( slug, !! modules ) );
+ const modules = useSelect( ( select ) => select( CORE_MODULES )?.getModules() );
+ const requirementsStatus = useSelect( ( select ) => select( CORE_MODULES )?.getCheckRequirementsStatus( slug, !! modules ) );
if ( requirementsStatus === null ) {
return null;
@@ -43,4 +33,3 @@ export default function ModuleSettingsWarning( {
</div>
);
}
-
| 2 |
diff --git a/modules/@apostrophecms/rich-text-widget/index.js b/modules/@apostrophecms/rich-text-widget/index.js @@ -165,7 +165,7 @@ module.exports = {
// Will be mixed in automatically for developers
tiptapTextCommands: {
setNode: [ 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre' ],
- setMark: [
+ toggleMark: [
'b', 'strong', 'code', 'mark', 'em', 'i',
'a', 's', 'del', 'strike', 'span', 'u'
],
| 4 |
diff --git a/assets/js/modules/analytics/common/anonymize-ip-switch.js b/assets/js/modules/analytics/common/anonymize-ip-switch.js @@ -40,7 +40,6 @@ export default function AnonymizeIPSwitch( { useSelect, useDispatch } ) {
<Switch
id="anonymizeIP"
label={ __( 'Anonymize IP addresses', 'google-site-kit' ) }
- // eslint-disable-next-line no-console
onClick={ onChange }
checked={ anonymizeIP }
hideLabel={ false }
| 2 |
diff --git a/shared/clients/test/__snapshots__/messages.test.js.snap b/shared/clients/test/__snapshots__/messages.test.js.snap @@ -9,12 +9,12 @@ Array [
"id": "robo",
},
},
- "id": 2016-12-31T23:00:00.000Z,
- "message": Object {
- "content": 2016-12-31T23:00:00.000Z,
- "type": "timestamp",
+ "content": Object {
+ "body": 2016-12-31T23:00:00.000Z,
},
+ "id": 2016-12-31T23:00:00.000Z,
"timestamp": 2016-12-31T23:00:00.000Z,
+ "type": "timestamp",
},
],
Array [
| 1 |
diff --git a/packages/openneuro-server/datalad/migration.js b/packages/openneuro-server/datalad/migration.js @@ -112,9 +112,17 @@ const migrate = (datasetId, uploader, label, created) => {
const migrateSnapshot = (datasetId, snapshotId) => {
console.log(`Snapshot migration of "${datasetId}-${snapshotId}"`)
return new Promise((resolve, reject) => {
+ const scitranSnapshotId =
+ snapshotId.length === 5
+ ? bids.encodeId(`${datasetId.slice(2)}-${snapshotId}`)
+ : snapshotId
+ console.log(`Getting files for snapshot: "${scitranSnapshotId}"`)
scitran.downloadSymlinkDataset(
- bids.encodeId(snapshotId),
+ bids.encodeId(scitranSnapshotId),
(err, hash) => {
+ if (err) {
+ console.log(err)
+ }
const snapshotDir = config.location + '/persistent/datasets/' + hash
uploadSnapshotContent(datasetId, snapshotId, snapshotDir).then(() =>
resolve(),
| 9 |
diff --git a/src/items/alien-archives/xaxmellia.json b/src/items/alien-archives/xaxmellia.json "race": "",
"class": "",
"biography": {
- "value": "<h2>Description</h2>\n<h3>Description</h3>\n<p>Xaxmellias are kaiju native to Daimalko. The first rose from an acidic lake in the caldera of a quiescent volcano, and the volcano erupted soon after. These colossi are capable of burrowing through soil and rubble in a bizarre corkscrew fashion, using this ability to hide and then ambushing prey, including rival kaiju.<br/><br/>The typical xaxmellia is 70 feet tall.<br/><br/>Site Owner: Blake DavisEmail Spam Checker: MX Guarddog</p>\n<p> </p>\n<section class=\"secret\">\n<h2>Ecology</h2>\n<h3>Environment</h3>\n<p>any (Daimalko)</p>\n<p> </p>\n<h3>Organization</h3>\n<p>solitary</p>\n<p> </p>\n",
+ "value": "<p>Xaxmellias are kaiju native to @Compendium[sfrpg.setting.G8uKED7AXY0If3U8]{Daimalko}. The first rose from an acidic lake in the caldera of a quiescent volcano, and the volcano erupted soon after. These colossi are capable of burrowing through soil and rubble in a bizarre corkscrew fashion, using this ability to hide and then ambushing prey, including rival kaiju.<br/><br/>The typical xaxmellia is 70 feet tall.</p>",
"public": ""
},
"type": "Magical Beast",
- "environment": "",
+ "environment": "any (Daimalko)",
+ "organization": "solitary",
"cr": 17,
"xp": {
"value": 102400
| 0 |
diff --git a/source/views/containers/TouchScrollView.js b/source/views/containers/TouchScrollView.js @@ -243,6 +243,9 @@ const touchIsOnSelectionHandle = (touch) => {
return false;
}
const rects = Array.from(selection.getRangeAt(0).getClientRects());
+ if (!rects.length) {
+ return false;
+ }
const touchX = touch.clientX;
const touchY = touch.clientY;
let tl = null;
| 9 |
diff --git a/unlock-app/src/services/storageService.js b/unlock-app/src/services/storageService.js @@ -63,17 +63,16 @@ export default class StorageService {
* Store the details of the provide Lock. In the case of failure a rejected promise is
* returned to the caller.
*
- * @param {*} lock
+ * @param {*} lockDetails
* @param {*} token
*/
- async storeLockDetails(lock, token) {
+ async storeLockDetails(lockDetails, token) {
const opts = {}
if (token) {
opts.headers = this.genAuthorizationHeader(token)
}
-
try {
- return await axios.post(`${this.host}/lock`, lock, opts)
+ return await axios.post(`${this.host}/lock`, lockDetails, opts)
} catch (error) {
return Promise.reject(error)
}
| 10 |
diff --git a/src/pages/Component/resource.js b/src/pages/Component/resource.js @@ -103,6 +103,7 @@ export default class Index extends PureComponent {
} = this.props;
const { existFileList, event_id } = this.state
const teamName = globalUtil.getCurrTeamName()
+ const regionName = globalUtil.getCurrRegionName()
const serviceId = appDetail && appDetail.service && appDetail.service.service_id
if (existFileList.length > 0) {
dispatch({
@@ -111,6 +112,7 @@ export default class Index extends PureComponent {
team_name: teamName,
event_id,
service_id:serviceId,
+ region_name:regionName
},
callback: (data) => {
this.setState({ uploadFile: false })
| 1 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -814,6 +814,10 @@ targetMesh.visible = false;
scene.add(targetMesh);
let highlightedObject = null;
+const deployMesh = _makeTargetMesh();
+deployMesh.visible = false;
+scene.add(deployMesh);
+
/* const _snapBuildPosition = p => {
p.x = Math.floor(p.x / BUILD_SNAP) * BUILD_SNAP + BUILD_SNAP / 2;
p.y = Math.floor(p.y / BUILD_SNAP) * BUILD_SNAP + BUILD_SNAP / 2;
@@ -1516,6 +1520,66 @@ const _updateWeapons = timeDiff => {
};
_handleGrab();
+ const _handleDeploy = () => {
+ if (deployMesh.visible) {
+ const transforms = rigManager.getRigTransforms();
+ const transform = transforms[1];
+ const {position, quaternion} = transform;
+
+ const maxDistance = 10;
+
+ let collision = geometryManager.geometryWorker.raycastPhysics(geometryManager.physics, position, quaternion);
+ if (collision) {
+ const {point} = collision;
+ deployMesh.position.fromArray(point);
+ deployMesh.quaternion.copy(quaternion);
+
+ if (deployMesh.position.distanceTo(position) > maxDistance) {
+ collision = null;
+ }
+ }
+ if (!collision) {
+ deployMesh.position.copy(position).add(localVector.set(0, 0, -maxDistance).applyQuaternion(quaternion));
+ deployMesh.quaternion.copy(quaternion);
+ /* physicsManager.applyVelocity(pxMesh.position, pxMesh.velocity, timeDiff);
+ pxMesh.velocity.add(localVector.set(0, -9.8 * timeDiff, 0).applyQuaternion(pxMesh.parent.getWorldQuaternion(localQuaternion).inverse()));
+ pxMesh.rotation.x += pxMesh.angularVelocity.x;
+ pxMesh.rotation.y += pxMesh.angularVelocity.y;
+ pxMesh.rotation.z += pxMesh.angularVelocity.z; */
+ }
+
+ deployMesh.material.uniforms.uTime.value = (Date.now()%1000)/1000;
+ }
+ /* const width = 1;
+ const length = 100;
+ localBox.setFromCenterAndSize(
+ localVector.set(0, 0, -length/2 - 0.05),
+ localVector2.set(width, width, length)
+ );
+
+ deployMesh.visible = false;
+ highlightedObject = null;
+
+ const objects = world.getObjects();
+ for (const candidate of objects) {
+ const transforms = rigManager.getRigTransforms();
+ const {position, quaternion} = transforms[0];
+ localMatrix.compose(candidate.position, candidate.quaternion, candidate.scale)
+ .premultiply(
+ localMatrix2.compose(position, quaternion, localVector2.set(1, 1, 1))
+ .invert()
+ )
+ .decompose(localVector, localQuaternion, localVector2);
+ if (localBox.containsPoint(localVector)) {
+ targetMesh.position.copy(candidate.position);
+ targetMesh.visible = true;
+ highlightedObject = candidate;
+ break;
+ }
+ } */
+ };
+ _handleDeploy();
+
/* const currentParcel = _getCurrentParcel(localVector);
if (!currentParcel.equals(lastParcel)) {
if (currentParcel.x !== lastParcel.x) {
@@ -2126,6 +2190,7 @@ const weaponsManager = {
}
menuMesh.visible = newOpen; */
menuEl.classList.toggle('open');
+ deployMesh.visible = menuEl.classList.contains('open');
},
menuVertical(offset, shift) {
menuMesh.offsetVertical(offset, shift);
| 0 |
diff --git a/assets/js/modules/tagmanager/components/settings/SettingsView.js b/assets/js/modules/tagmanager/components/settings/SettingsView.js @@ -92,7 +92,7 @@ export default function SettingsView() {
<div className="googlesitekit-settings-module__meta-items">
<div className="googlesitekit-settings-module__meta-item">
<h5 className="googlesitekit-settings-module__meta-item-type">
- { __( 'Subscribe with Google Code Snippet', 'google-site-kit' ) }
+ { __( 'Tag Manager Code Snippet', 'google-site-kit' ) }
</h5>
<p className="googlesitekit-settings-module__meta-item-data">
| 2 |
diff --git a/diorama.js b/diorama.js @@ -649,19 +649,6 @@ const _ensureSideSceneCompiled = () => {
const sideCamera = new THREE.PerspectiveCamera();
-const _makeCanvas = (w, h) => {
- const canvas = document.createElement('canvas');
- canvas.width = w;
- canvas.height = h;
- canvas.style.cssText = `\
- position: absolute;
- /* width: ${w}px;
- height: ${h}px; */
- top: 0px;
- left: 0px;
- `;
- return canvas;
-};
const _makeOutlineRenderTarget = (w, h) => new THREE.WebGLRenderTarget(w, h, {
minFilter: THREE.LinearFilter,
magFilter: THREE.LinearFilter,
| 2 |
diff --git a/conf/cityparams.conf b/conf/cityparams.conf @@ -137,7 +137,7 @@ city-params {
seattle-wa = 47.615
columbus-oh = 40.000
cdmx = 19.490
- spgg = 25.663
+ spgg = 25.648
pittsburgh-pa = 40.438
}
city-center-lng {
@@ -200,7 +200,7 @@ city-params {
seattle-wa = 12.0
columbus-oh = 13.0
cdmx = 14.0
- spgg = 13.25
+ spgg = 13.0
pittsburgh-pa = 13.75
}
api-demos {
| 3 |
diff --git a/token-metadata/0x07150e919B4De5fD6a63DE1F9384828396f25fDC/metadata.json b/token-metadata/0x07150e919B4De5fD6a63DE1F9384828396f25fDC/metadata.json "symbol": "BASE",
"address": "0x07150e919B4De5fD6a63DE1F9384828396f25fDC",
"decimals": 9,
- "dharmaVerificationStatus": "UNVERIFIED"
+ "dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
| 3 |
diff --git a/lib/assets/javascripts/new-dashboard/components/ExternalMapsList.vue b/lib/assets/javascripts/new-dashboard/components/ExternalMapsList.vue <template slot="title">
<VisualizationsTitle
:defaultTitle="$t(`ExternalMapsPage.header.title['${appliedFilter}']`)"
- :selectedItems="selectedMaps.length"
- :vizQuota="publicMapsQuota"
- :vizCount="publicMapsCount"
- :isOutOfQuota="isOutOfPublicMapsQuota"
- :counterLabel="'Public Maps'"/>
- </template>
-
- <template slot="warning">
- <NotificationBadge type="warning" v-if="shouldShowLimitsWarning">
- <div class="warning">
- <span v-if="isOutOfPublicMapsQuota && !isOutOfPrivateMapsQuota" class="is-bold" v-html="$t('MapsPage.header.warning.counter', { counter: `${publicMapsCount}/${publicMapsQuota}`, type: `public` })"></span>
- <span v-if="isOutOfPrivateMapsQuota && !isOutOfPublicMapsQuota" class="is-bold" v-html="$t('MapsPage.header.warning.counter', { counter: `${privateMapsCount}/${privateMapsQuota}`, type: `private` })"></span>
- <span v-if="isOutOfPublicMapsQuota && isOutOfPrivateMapsQuota" class="is-bold" v-html="$t('MapsPage.header.warning.doubleCounter', { publicCounter: `${publicMapsCount}/${publicMapsQuota}`, privateCounter: `${privateMapsCount}/${privateMapsQuota}`})"></span>
- <span v-html="$t('MapsPage.header.warning.upgrade', { path: upgradeUrl })"></span>
- </div>
- </NotificationBadge>
+ :selectedItems="selectedMaps.length" />
</template>
<template slot="dropdownButton">
</template>
</SectionTitle>
- <div class="grid-cell" v-if="initialState">
- <CreateMapCard></CreateMapCard>
- </div>
-
<div
v-if="shouldShowListHeader"
class="grid-cell grid-cell--noMargin grid-cell--col12 grid__head--sticky"
</template>
<script>
-import { mapState, mapGetters } from 'vuex';
+import { mapState } from 'vuex';
import CreateMapCard from 'new-dashboard/components/CreateMapCard';
import EmptyState from 'new-dashboard/components/States/EmptyState';
import ExternalMapBulkActions from 'new-dashboard/components/BulkActions/ExternalMapBulkActions.vue';
@@ -174,14 +155,6 @@ export default {
isFirstTimeViewingDashboard: state => state.config.isFirstTimeViewingDashboard,
upgradeUrl: state => state.config.upgrade_url
}),
- ...mapGetters({
- publicMapsQuota: 'user/publicMapsQuota',
- publicMapsCount: 'user/publicMapsCount',
- isOutOfPublicMapsQuota: 'user/isOutOfPublicMapsQuota',
- privateMapsQuota: 'user/privateMapsQuota',
- privateMapsCount: 'user/privateMapsCount',
- isOutOfPrivateMapsQuota: 'user/isOutOfPrivateMapsQuota'
- }),
areAllMapsSelected () {
return Object.keys(this.maps).length === this.selectedMaps.length;
},
@@ -214,9 +187,6 @@ export default {
isSomeMapSelected () {
return this.selectedMaps.length > 0;
},
- shouldShowLimitsWarning () {
- return !this.selectedMaps.length && this.isOutOfPublicMapsQuota;
- },
shouldShowViewSwitcher () {
return this.canChangeViewMode && !this.initialState && !this.emptyState && !this.selectedMaps.length;
},
| 2 |
diff --git a/priv/public/ui/app/components/directives/mn_storage_mode/mn_storage_mode.js b/priv/public/ui/app/components/directives/mn_storage_mode/mn_storage_mode.js function mnFormatStorageModeError() {
return function (error) {
- switch (error) {
- case "storageMode must be one of forestdb, memory_optimized, plasma":
+ if (!error) {
+ return;
+ }
+ var errorCode =
+ error.indexOf("Storage mode cannot be set to") > -1 ? 1 :
+ error.indexOf("storageMode must be one of") > -1 ? 2 :
+ 0;
+ switch (errorCode) {
+ case 1:
+ return "please choose another index storage mode";
+ case 2:
return "please choose an index storage mode";
default:
return error;
| 7 |
diff --git a/Source/Renderer/ShaderSource.js b/Source/Renderer/ShaderSource.js @@ -241,6 +241,7 @@ function combineShader(shaderSource, isFragmentShader, context) {
precision highp float;\n\
#else\n\
precision mediump float;\n\
+ #define highp mediump;\n\
#endif\n\n";
}
| 14 |
diff --git a/src/traces/violin/defaults.js b/src/traces/violin/defaults.js @@ -27,13 +27,11 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
coerce('bandwidth');
coerce('side');
-
var width = coerce('width');
if(!width) {
coerce('scalegroup', traceOut.name);
coerce('scalemode');
} else {
- // set scalegroup and scalemode to dflts if width
traceOut.scalegroup = '';
traceOut.scalemode = 'width';
}
| 1 |
diff --git a/packages/@snowpack/plugin-webpack/README.md b/packages/@snowpack/plugin-webpack/README.md @@ -21,10 +21,6 @@ npm install --save-dev @snowpack/plugin-webpack
}
```
-### Limitations
-
-Currently only works for Single Page Applications (SPA) with a single HTML entrypoint. See https://github.com/pikapkg/create-snowpack-app/issues/74 for more info.
-
### Plugin Options
- `sourceMap: boolean` - Enable sourcemaps in the bundled output.
| 2 |
diff --git a/templates/customdashboard/customdashboard/visual_dashboard.html b/templates/customdashboard/customdashboard/visual_dashboard.html {% extends "base.html" %}
{% block content %}
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
- <meta name="description" content="Survery Dashboard">
- <meta name="author" content=Hikaya"">
- <title>Hikaya Rollout Dashboard</title>
- <!-- Bootstrap core CSS -->
- <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.png" type="image/png"/>
-
- <!-- Bootstrap -->
- <link href="{{ STATIC_URL}}css/bootstrap.min.css" rel="stylesheet" type="text/css" />
-
- <!-- Custom styles for this template -->
- <link href="{{ STATIC_URL}}css/activity-dashboard.css" rel="stylesheet" type="text/css" />
- <link href="{{ STATIC_URL}}css/app.css" rel="stylesheet" type="text/css" />
- <!-- JQuery UI CSS -->
- <link href="{{ STATIC_URL }}css/ui-lightness/jquery-ui-1.10.4.min.css" rel="stylesheet" type="text/css" />
-
- <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
- <script type="text/javascript" src="{{ STATIC_URL }}js/jquery-1.11.1.min.js"></script>
- <script src="{{ STATIC_URL }}publicdashboard/js/vendor/Chart.min.js"></script>
- <link rel="borders" type="application/json" href="{{ STATIC_URL }}js/world_borders.geojson">
- <!-- Hosted Leaflet -->
- <script src="{{ STATIC_URL }}js/leaflet.js"></script>
- <script src="{{ STATIC_URL }}js/Chart.HorizontalBar.js"></script>
- <!--- Hosted Leaflet CSS -->
- <link rel="stylesheet" href="{{ STATIC_URL }}css/leaflet.css"/>
- <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
- <!--[if lt IE 9]>
- <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
- <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
- <![endif]-->
- </head>
-
- <div class="row">
+<div class="container">
<div class="panel panel-info">
<div class="panel-body">
<div style="float:left;">
</div>
</div>
- </div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-info">
</div>
</div>
</div>
- <div class="col-md-12">
+ <div class="">
<div class="panel panel-info">
<div class="panel-heading"><b>{{ user.activity_user.organization.level_2_label }} Sites</b> {% if get_filtered_name %} for <a href="/workflow/dashboard/{{ get_filtered_name.id }}">{{ get_filtered_name }}</a> {% endif %}</div>
<div class="panel-body">
<div>{% include "customdashboard/charts/bar_graph.html" %}</div>
<div>{% include "customdashboard/charts/polar.html" %}</div>
<div>{% include "customdashboard/charts/horizontal_bar_graph.html" %}</div>
+</div>
+
{% endblock content %}
\ No newline at end of file
| 0 |
diff --git a/src/plots/cartesian/layout_attributes.js b/src/plots/cartesian/layout_attributes.js @@ -1004,8 +1004,7 @@ module.exports = {
].join(' ')
},
shift: {
- valType: 'number',
- extras: [true, false],
+ valType: 'any',
dflt: false,
editType: 'plot',
description: [
| 12 |
diff --git a/source/components/NumericInput.js b/source/components/NumericInput.js @@ -326,14 +326,13 @@ class NumericInputBase extends Component<NumericInputProps, State> {
return this.props.bigNumberFormat ?? BigNumber.config().FORMAT;
}
- bigNumberToFormattedString(number: ?BigNumber.Instance) {
+ bigNumberToFormattedString(number: BigNumber.Instance) {
const { bigNumberFormat, decimalPlaces, roundingMode } = this.props;
- return number === null
- ? ''
- : number.toFormat(decimalPlaces, roundingMode, {
+ const result = number.toFormat(decimalPlaces, roundingMode, {
...BigNumber.config().FORMAT, // defaults
...bigNumberFormat, // custom overrides
});
+ return result === 'NaN' ? null : result;
}
formattedValueToBigNumber(value: string) {
@@ -373,13 +372,9 @@ class NumericInputBase extends Component<NumericInputProps, State> {
...rest
} = this.props;
- if (value != null && !BigNumber.isBigNumber(value)) {
- throw new Error('Prop "value" must be of type BigNumber or null.');
- }
-
const inputValue = this.state.fallbackInputValue
? this.state.fallbackInputValue
- : this.bigNumberToFormattedString(value);
+ : this.bigNumberToFormattedString(new BigNumber(value));
return (
<Input
| 7 |
diff --git a/edit.js b/edit.js @@ -960,6 +960,7 @@ let crosshairMesh = null;
scene.add(grenadeMesh);
crosshairMesh = weaponsModels.children.find(c => c.name === 'SM_Wep_Crosshair_04');
+ crosshairMesh.scale.set(50, 50, 50);
crosshairMesh.traverse(o => {
if (o.isMesh) {
o.material = new THREE.MeshBasicMaterial({
@@ -970,6 +971,35 @@ let crosshairMesh = null;
}
});
crosshairMesh.visible = false;
+ let animation = null;
+ crosshairMesh.trigger = () => {
+ if (animation) {
+ animation.end();
+ animation = null;
+ }
+ const startTime = Date.now();
+ const endTime = startTime + 300;
+ const originalScale = crosshairMesh.scale.clone();
+ animation = {
+ update() {
+ const now = Date.now();
+ const factor = (now - startTime) / (endTime - startTime);
+ if (factor < 1) {
+ crosshairMesh.scale.copy(originalScale)
+ .multiplyScalar(1 + (1-factor));
+ } else {
+ animation.end();
+ animation = null;
+ }
+ },
+ end() {
+ crosshairMesh.scale.copy(originalScale);
+ },
+ };
+ };
+ crosshairMesh.update = () => {
+ animation && animation.update();
+ };
scene.add(crosshairMesh);
})();
const redBuildMeshMaterial = new THREE.ShaderMaterial({
@@ -2414,6 +2444,7 @@ function animate(timestamp, frame) {
for (let i = 0; i < npcMeshes.length; i++) {
npcMeshes[i].update();
}
+ crosshairMesh && crosshairMesh.update();
const session = renderer.xr.getSession();
if (session) {
@@ -2514,7 +2545,6 @@ function animate(timestamp, frame) {
crosshairMesh.position.copy(localVector)
.add(localVector2.set(0, 0, -500).applyQuaternion(localQuaternion));
crosshairMesh.quaternion.copy(localQuaternion);
- crosshairMesh.scale.set(50, 50, 50);
crosshairMesh.visible = true;
}
break;
@@ -2696,8 +2726,9 @@ function animate(timestamp, frame) {
case 'rifle': {
_hit()
localVector2.copy(assaultRifleMesh.position)
- .add(localVector3.set(0, 0.09, -0.7).applyQuaternion(assaultRifleMesh.quaternion))
+ .add(localVector3.set(0, 0.09, -0.7).applyQuaternion(assaultRifleMesh.quaternion));
_explode(localVector2, assaultRifleMesh.quaternion);
+ crosshairMesh.trigger();
break;
}
case 'grenade': {
| 0 |
diff --git a/src/API/getPlayer.js b/src/API/getPlayer.js @@ -9,11 +9,12 @@ module.exports = async function (query, options = { guild: false }) {
const res = await this._makeRequest(`/player?uuid=${query}`);
if (options.guild) {
+ const Guild = require('../structures/Guild/Guild');
const guildRes = await this._makeRequest(`/guild?player=${query}`);
if (!guildRes.success) {
throw new Error(Errors.SOMETHING_WENT_WRONG.replace(/{cause}/, guildRes.cause));
}
- res.player.guild = guildRes.guild;
+ res.player.guild = new Guild(guildRes.guild);
}
return new Player(res.player, this);
};
| 4 |
diff --git a/css/preflight.css b/css/preflight.css @@ -508,6 +508,11 @@ fieldset {
padding: 0;
}
+ol,
+ul {
+ margin: 0;
+}
+
/**
* Suppress the focus outline on elements that cannot be accessed via keyboard.
* This prevents an unwanted focus outline from appearing around elements that
| 12 |
diff --git a/.eslintrc.js b/.eslintrc.js @@ -289,7 +289,7 @@ module.exports = {
'flowtype/require-return-type': [ 'error', 'always', { 'annotateUndefined': 'never', 'excludeArrowFunctions': true } ],
'flowtype/require-valid-file-annotation': [ 'error', 'always', { 'annotationStyle': 'block' } ],
'flowtype/semi': [ 'error', 'always' ],
- 'flowtype/space-after-type-colon': [ 'error', 'always' ],
+ 'flowtype/space-after-type-colon': [ 'error', 'always', { 'allowLineBreak': true } ],
'flowtype/space-before-generic-bracket': [ 'error', 'never' ],
'flowtype/space-before-type-colon': [ 'error', 'always' ],
'flowtype/type-id-match': [ 'error', '^([A-Z][a-z0-9]+)+$' ],
| 11 |
diff --git a/Gruntfile.js b/Gruntfile.js @@ -3,7 +3,7 @@ module.exports = function (grunt) {
const version = packageFile.version
const electronVersion = packageFile.electronVersion
- const ignoredDirs = ['.DS_Store', 'dist/app', 'ext/readability-master/test', /\.map$/g] // directories that will be ignored when building binaries
+ const ignoredDirs = ['.DS_Store', 'dist/app', 'ext/readability-master/test', /\.map$/g, /\.md$/g] // directories that will be ignored when building binaries
// Project configuration.
grunt.initConfig({
| 2 |
diff --git a/scenes/SceneEditAccount.js b/scenes/SceneEditAccount.js @@ -58,7 +58,7 @@ export default class SceneEditAccount extends React.Component {
};
_handleUpload = async (e) => {
- this.setState({ changingAvatar: true, changingBio: true });
+ this.setState({ changingAvatar: true });
let json = await UserBehaviors.uploadImage(e.target.files[0], this.props.resources, true);
if (!json) {
this.setState({ changingAvatar: false });
| 2 |
diff --git a/src/components/CheckBox.js b/src/components/CheckBox.js // @flow
import React from "react";
-import {
- findNodeHandle,
- Platform,
- StyleSheet,
- Switch,
- UIManager
-} from "react-native";
+import { StyleSheet, Switch } from "react-native";
import type { ViewStyleProp } from "react-native/Libraries/StyleSheet/StyleSheet";
import Text from "./Text";
import Touchable from "./Touchable";
@@ -30,18 +24,6 @@ class CheckBox extends React.Component<Props> {
);
}
- componentDidUpdate(prevProps: Props) {
- if (Platform.OS === "android") {
- // Notify user, that the radio button changed to checked state.
- if (this.props.checked && !prevProps.checked) {
- UIManager.sendAccessibilityEvent(
- findNodeHandle(this),
- UIManager.AccessibilityEventTypes.typeViewClicked
- );
- }
- }
- }
-
onPress = () => {
this.props.onChange();
};
| 2 |
diff --git a/src/apps.json b/src/apps.json "cats": [
56
],
+ "js": {
+ "Client.Anonymous": "\\;confidence:50%"
+ },
"script": "https?://www\\.hashing\\.win/scripts/min\\.js",
"icon": "coinimp.png",
"website": "https://www.coinimp.com"
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,15 @@ 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.39.3] -- 2018-07-25
+
+### Fixed
+- Fix overlaying subplot configuration relayouts [#2831]
+- Fix trace toggling from position-editable horizontal legends [#2829]
+- Fix `[un]selected.marker.opacity` settings on `scattergeo` traces [#2827]
+- Fix selections on some Robinson projections [#2827]
+
+
## [1.39.2] -- 2018-07-16
### Fixed
| 3 |
diff --git a/token-metadata/0xec67005c4E498Ec7f55E092bd1d35cbC47C91892/metadata.json b/token-metadata/0xec67005c4E498Ec7f55E092bd1d35cbC47C91892/metadata.json "symbol": "MLN",
"address": "0xec67005c4E498Ec7f55E092bd1d35cbC47C91892",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/avatars/animationHelpers.js b/avatars/animationHelpers.js @@ -323,6 +323,7 @@ export const loadPromise = (async () => {
eat: animations.find(a => a.isEating),
drink: animations.find(a => a.isDrinking),
throw: animations.find(a => a.isThrow),
+ pickUpThrow: animations.find(a => a.isPickUpThrow),
bowDraw: animations.find(a => a.isBowDraw),
bowIdle: animations.find(a => a.isBowIdle),
bowLoose: animations.find(a => a.isBowLoose),
| 0 |
diff --git a/checkfiles/checkfiles.py b/checkfiles/checkfiles.py @@ -656,7 +656,11 @@ def check_for_contentmd5sum_conflicts(item, result, output, errors, session, url
errors['lookup_for_content_md5sum'] = 'Network error occured, while looking for ' + \
'content md5sum conflict on the portal. ' + str(e)
else:
+ try:
r_graph = r.json().get('@graph')
+ except ValueError:
+ errors['content_md5sum_lookup_json_error'] = str(r)
+ else:
if len(r_graph) > 0:
conflicts = []
for entry in r_graph:
| 0 |
diff --git a/package.json b/package.json "moment": "^2.29.1",
"morgan": "^1.10.0",
"multihashing-async": "^2.1.2",
- "next": "^11.1.0",
+ "next": "^10.0.7",
"next-offline": "^5.0.5",
"oauth": "^0.9.15",
"pg": "^8.5.1",
| 1 |
diff --git a/magda-gateway/src/Authenticator.ts b/magda-gateway/src/Authenticator.ts @@ -26,7 +26,9 @@ export interface AuthenticatorOptions {
export const DEFAULT_SESSION_COOKIE_NAME: string = "connect.sid";
export let DEFAULT_SESSION_COOKIE_OPTIONS: SessionCookieOptions = {
- maxAge: 7 * 60 * 60 * 1000
+ maxAge: 7 * 60 * 60 * 1000,
+ // -- auto: secure will be auto set depends on the http or https connection
+ secure: "auto"
};
/**
| 12 |
diff --git a/packages/bitcore-client/src/wallet.ts b/packages/bitcore-client/src/wallet.ts import * as Bcrypt from 'bcrypt';
import { Deriver, Transactions } from 'crypto-wallet-core';
-import { sign } from 'secp256k1';
import 'source-map-support/register';
import { Client } from './client';
import { Encryption } from './encryption';
| 3 |
diff --git a/src/components/TableSelectCell.js b/src/components/TableSelectCell.js @@ -32,11 +32,7 @@ const defaultSelectCellStyles = theme => ({
zIndex: 110,
backgroundColor: theme.palette.background.paper,
},
- checkboxRoot: {
- '&$checked': {
- color: theme.palette.primary.main,
- },
- },
+ checkboxRoot: {},
checked: {},
disabled: {},
});
@@ -104,6 +100,7 @@ class TableSelectCell extends React.Component {
checked: classes.checked,
disabled: classes.disabled,
}}
+ color="primary"
disabled={!isRowSelectable}
{...otherProps}
/>
| 12 |
diff --git a/package.json b/package.json {
"name": "mermaid",
- "version": "8.7.0",
+ "version": "8.8.0",
"description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
"main": "dist/mermaid.core.js",
"keywords": [
| 12 |
diff --git a/src/components/Modeler.vue b/src/components/Modeler.vue @@ -233,6 +233,7 @@ export default {
this.$emit('parsed');
},
loadXML(xml) {
+ this.nodes = {};
this.moddle.fromXML(xml, (err, definitions) => {
if (!err) {
// Update definitions export to our own information
| 2 |
diff --git a/test/jasmine/tests/transform_aggregate_test.js b/test/jasmine/tests/transform_aggregate_test.js @@ -15,6 +15,7 @@ describe('aggregate', function() {
Plotly.newPlot(gd, [{
x: [1, 2, 3, 4, 'fail'],
y: [1.1, 2.2, 3.3, 'nope', 5.5],
+ customdata: [4, 'nope', 3, 2, 1],
marker: {
size: ['2001-01-01', 0.2, 0.1, 0.4, 0.5],
color: [2, 4, '', 10, 8],
@@ -34,6 +35,7 @@ describe('aggregate', function() {
{target: 'x', func: 'sum'},
// non-numerics will not count toward numerator or denominator for avg
{target: 'y', func: 'avg'},
+ {target: 'customdata', func: 'change'},
{target: 'marker.size', func: 'min'},
{target: 'marker.color', func: 'max'},
// marker.opacity doesn't have an entry, but it will default to first
@@ -54,6 +56,7 @@ describe('aggregate', function() {
expect(traceOut.x).toEqual([8, 2]);
expect(traceOut.y).toBeCloseToArray([3.3, 2.2], 5);
+ expect(traceOut.customdata).toEqual([-3, undefined]);
expect(traceOut.marker.size).toEqual([0.1, 0.2]);
expect(traceOut.marker.color).toEqual([10, 4]);
expect(traceOut.marker.opacity).toEqual([0.6, 'boo']);
@@ -221,15 +224,17 @@ describe('aggregate', function() {
expect(inverseMapping).toEqual({0: [0, 1, 4], 1: [2, 3]});
});
- it('handles median, mode, rms, & stddev for numeric data', function() {
+ it('handles median, mode, rms, stddev, change & range for numeric data', function() {
// again, nothing is going to barf with non-numeric data, but sometimes it
// won't make much sense.
Plotly.newPlot(gd, [{
x: [1, 1, 2, 2, 1],
y: [1, 2, 3, 4, 5],
+ customdata: [5, 4, 3, 2, 1],
marker: {
size: [1, 2, 3, 4, 5],
+ opacity: [0.6, 0.5, 0.2, 0.8, 1.0],
line: {width: [1, 1, 2, 2, 1]},
color: [1, 1, 2, 2, 1]
},
@@ -239,7 +244,9 @@ describe('aggregate', function() {
aggregations: [
{target: 'x', func: 'mode'},
{target: 'y', func: 'median'},
+ {target: 'customdata', func: 'change'},
{target: 'marker.size', func: 'rms'},
+ {target: 'marker.opacity', func: 'range'},
{target: 'marker.line.width', func: 'stddev', funcmode: 'population'},
{target: 'marker.color', func: 'stddev'}
]
@@ -252,7 +259,9 @@ describe('aggregate', function() {
// but 2 gets to that count first
expect(traceOut.x).toEqual([2, 1]);
expect(traceOut.y).toBeCloseToArray([3.5, 2], 5);
+ expect(traceOut.customdata).toEqual([-4, 0]);
expect(traceOut.marker.size).toBeCloseToArray([Math.sqrt(51 / 4), 2], 5);
+ expect(traceOut.marker.opacity).toEqual([0.8, 0]);
expect(traceOut.marker.line.width).toBeCloseToArray([0.5, 0], 5);
expect(traceOut.marker.color).toBeCloseToArray([Math.sqrt(1 / 3), 0], 5);
});
| 0 |
diff --git a/token-metadata/0x08f5a9235B08173b7569F83645d2c7fB55e8cCD8/metadata.json b/token-metadata/0x08f5a9235B08173b7569F83645d2c7fB55e8cCD8/metadata.json "symbol": "TNT",
"address": "0x08f5a9235B08173b7569F83645d2c7fB55e8cCD8",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/packages/vue-server-renderer/README.md b/packages/vue-server-renderer/README.md @@ -162,7 +162,7 @@ Provide a template for the entire page's HTML. The template should contain a com
In addition, when both a template and a render context is provided (e.g. when using the `bundleRenderer`), the renderer will also automatically inject the following properties found on the render context:
-- `context.head`: (string) any head markup that should be injected into the head of the page. Note when using the bundle format generated with `vue-ssr-webpack-plugin`, this property will automatically contain `<link rel="preload/prefetch">` directives for chunks in the bundle.
+- `context.head`: (string) any head markup that should be injected into the head of the page.
- `context.styles`: (string) any inline CSS that should be injected into the head of the page. Note that `vue-loader` 10.2.0+ (which uses `vue-style-loader` 2.0) will automatically populate this property with styles used in rendered components.
@@ -208,9 +208,13 @@ As an example, check out [`v-show`'s server-side implementation](https://github.
## Why Use `bundleRenderer`?
-In a typical Node.js app, the server is a long-running process. If we directly require our application code, the instantiated modules will be shared across every request. This imposes some inconvenient restrictions to the application structure: we will have to avoid any use of global stateful singletons (e.g. the store), otherwise state mutations caused by one request will affect the result of the next.
+When we bundle our front-end code with a module bundler such as webpack, it can introduce some complexity when we want to reuse the same code on the server. For example, if we use `vue-loader`, TypeScript or JSX, the code cannot run natively in Node. Our code may also rely on some webpack-specific features such as file handling with `file-loader` or style injection with `style-loader`, both of which can be problematic when running inside a native Node module environment.
-Instead, it's more straightforward to run our app "fresh" for each request, so that we don't have to think about avoiding state contamination across requests. This is exactly what `bundleRenderer` helps us achieve.
+The most straightforward solution to this is to leverage webpack's `target: 'node'` feature and simply use webpack to bundle our code on both the client AND the server.
+
+Having a compiled server bundle also provides another advantage in terms of code organization. In a typical Node.js app, the server is a long-running process. If we run our application modules directly, the instantiated modules will be shared across every request. This imposes some inconvenient restrictions to the application structure: we will have to avoid any use of global stateful singletons (e.g. the store), otherwise state mutations caused by one request will affect the result of the next.
+
+Instead, it's more straightforward to run our app "fresh", in a sandboxed context for each request, so that we don't have to think about avoiding state contamination across requests.
## Creating the Server Bundle
@@ -226,7 +230,9 @@ type RenderBundle = {
}
```
-Although theoretically you can use any build tool to generate the bundle, it is recommended to use Webpack + `vue-loader` + [vue-ssr-webpack-plugin](https://github.com/vuejs/vue-ssr-webpack-plugin) for this purpose. The usual workflow is setting up a base webpack configuration file for the client-side, then modify it to generate the server-side bundle with the following changes:
+Although theoretically you can use any build tool to generate the bundle, it is recommended to use webpack + `vue-loader` + [vue-ssr-webpack-plugin](https://github.com/vuejs/vue-ssr-webpack-plugin) for this purpose. This setup works seamlessly even if you use webpack's on-demand code splitting features such as dynamic `import()`.
+
+The usual workflow is setting up a base webpack configuration file for the client-side, then modify it to generate the server-side bundle with the following changes:
1. Set `target: 'node'` and `output: { libraryTarget: 'commonjs2' }` in your webpack config.
| 13 |
diff --git a/packages/core/parcel-bundler/test/javascript.js b/packages/core/parcel-bundler/test/javascript.js @@ -679,12 +679,9 @@ describe('javascript', function() {
assert(devRegExp.test(file) === true);
assert(prodRegExp.test(file) === false);
// Prod build test
- await bundle(
- __dirname + '/integration/babel-browserslist-multiple-env/index.js',
- {
+ await bundle(__dirname + projectBasePath + '/index.js', {
production: true
- }
- );
+ });
file = fs.readFileSync(__dirname + '/dist/index.js', 'utf8');
assert(prodRegExp.test(file) === true);
assert(devRegExp.test(file) === false);
| 1 |
diff --git a/tests/generators/index.html b/tests/generators/index.html @@ -446,9 +446,6 @@ h1 {
<br><a target="_blank" href="https://dartpad.dartlang.org/">interpreter</a>
</div>
</p>
- <p>
- <input type="button" value="download" onclick="downloadOutputCode()">
- </p>
</td></tr><tr><td height="99%">
<textarea id="importExport" readonly="readonly" wrap="off"></textarea>
</td></tr></table>
| 2 |
diff --git a/core/block_render_svg.js b/core/block_render_svg.js @@ -341,7 +341,7 @@ Blockly.BlockSvg.prototype.render = function(opt_bubble) {
var inputRows = this.renderCompute_(cursorX);
this.renderDraw_(cursorX, inputRows);
this.renderMoveConnections_();
- this.renderExternalTypeVarHeightlights_();
+ this.renderExternalTypeVarHeightlights_(inputRows);
if (opt_bubble !== false) {
// Render all blocks above this one (propagate a reflow).
@@ -698,14 +698,23 @@ Blockly.BlockSvg.prototype.renderMoveConnections_ = function() {
* external inputs.
* Should be called after all of connections on this block has been updated
* with the new locations.
+ * @param {!Array.<!Array.<!Object>>} inputRows 2D array of objects, each
+ * containing position information.
* @private
*/
-Blockly.BlockSvg.prototype.renderExternalTypeVarHeightlights_ = function() {
+Blockly.BlockSvg.prototype.renderExternalTypeVarHeightlights_ = function(
+ inputRows) {
+ for (var y = 0, row; row = inputRows[y]; y++) {
+ if (this.isCollapsed() || row.type != Blockly.INPUT_VALUE) {
+ continue;
+ }
+
for (var i = 0, input; input = this.inputList[i]; i++) {
- if (input.type == Blockly.INPUT_VALUE) {
+ if (input.connection) {
input.connection.renderTypeVarHighlights();
}
}
+ }
};
/**
| 1 |
diff --git a/src/compiler/parsing/watf/tokenizer.js b/src/compiler/parsing/watf/tokenizer.js @@ -235,11 +235,11 @@ function tokenize(input: string) {
if (NUMBER_KEYWORDS.test(input.substring(current, current + 3))) {
let tokenLength = 3;
- if (input.substring(current, (current += 4)) === "nan:") {
+ if (input.substring(current, current += 4) === 'nan:') {
tokenLength = 4;
}
value += input.substring(current, current + tokenLength);
- char = input[(current += tokenLength)];
+ char = input[current += tokenLength];
}
let numberLiterals = NUMBERS;
| 1 |
diff --git a/server/classes/headstart/preprocessing/Snapshot.php b/server/classes/headstart/preprocessing/Snapshot.php @@ -18,13 +18,14 @@ class Snapshot
$phantomjs = $ini_array["snapshot"]["phantomjs_path"];
$getsvg = $ini_array["snapshot"]["getsvg_path"];
- $host = $ini_array["general"]["host"];
+ $protocol = stripos($_SERVER['SERVER_PROTOCOL'],'https') === true ? 'https://' : 'http://';
+ $host = $protocol . $ini_array["general"]["host"];
$snap_php = $ini_array["snapshot"]["snapshot_php"];
$storage = $ini_array["snapshot"]["storage_path"];
$width = $ini_array["snapshot"]["snapshot_width"];
$url = "{$host}{$snap_php}?{$url_postfix}";
- $this->cmd = "{$phantomjs} {$getsvg} '{$url}' {$storage}{$post_data['file']}.png {$width}";
+ $this->cmd = "{$phantomjs} {$getsvg} \"{$url}\" {$storage}{$post_data['file']}.png {$width}";
}
public function takeSnapshot() {
| 1 |
diff --git a/common/stores/organisation-store.js b/common/stores/organisation-store.js @@ -17,7 +17,7 @@ const controller = {
] : [])).then((res) => {
if (id === store.id) {
// eslint-disable-next-line prefer-const
- let [projects, users, invites, usage] = res;
+ let [projects, users, invites] = res;
// projects = projects.results;
store.model = { users, invites: invites && invites.results };
@@ -25,7 +25,7 @@ const controller = {
data.get(`${Project.api}organisations/${id}/usage/`).then((usage) => {
store.model.usage = usage && usage.events;
store.loaded();
- });
+ }).catch(() => {});
}
return Promise.all(projects.map((project, i) => data.get(`${Project.api}environments/?project=${project.id}`)
| 11 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -626,6 +626,7 @@ When writing docs you can use the following variables instead of hard-coding the
| `auth0js_url` | The url to the auth0.js CDN location. | |
| `lock_url` | The url to the Lock script CDN location. | |
| `lock_passwordless_url` | The url to the Passwordless Lock script CDN location. | |
+| `env.DOMAIN_URL_SUPPORT` | Support Center URL | `https://support.auth0.com/` |
### User Specific Variables
| 0 |
diff --git a/docs/.vuepress/theme/components/Sidebar.vue b/docs/.vuepress/theme/components/Sidebar.vue @@ -88,7 +88,7 @@ function resolveOpenGroupIndex(route, items) {
right 0
width $sidebarWidth
height 80vh
- overflow-y scroll
+ overflow-y auto
font-size $fsXSmall
padding-left 1em
padding-right 2em
| 12 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.