code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js b/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js @@ -1127,7 +1127,7 @@ import knockout from '../../ThirdParty/knockout.js';
var length = settings.length;
for (var i = 0; i < length; ++i) {
var setting = settings[i];
- this[setting] = this[setting];
+ this[setting] = this[setting]; // eslint-disable-line no-self-assign
}
// update view model with existing tileset settings
| 8 |
diff --git a/articles/quickstart/native/ionic3/download.md b/articles/quickstart/native/ionic3/download.md @@ -10,9 +10,7 @@ com.auth0.ionic://${account.namespace}/cordova/com.auth0.ionic/callback
http://localhost:8080
```
3) Ensure that [Ionic 3](https://ionicframework.com/docs/intro/installation/) and [Cordova](https://ionicframework.com/docs/cli/#using-cordova) are installed.
-
-4) Check that mobile development environments are setup correctly for Android or iOS. Follow [these recommendations](https://ionicframework.com/docs/intro/deploying/) by the Ionic team on setting it all up for deployment on mobile.
-
+4) Check that mobile development environments [are setup correctly](https://ionicframework.com/docs/intro/deploying/).
5) Make sure [Node.JS LTS](https://nodejs.org/en/download/) is installed and execute the following commands in the sample directory:
```bash
npm install
| 7 |
diff --git a/vaadin-grid-styles.html b/vaadin-grid-styles.html @@ -19,6 +19,7 @@ This program is available under Apache License Version 2.0, available at https:/
display: block;
animation: 1ms vaadin-grid-appear;
height: 400px;
+ transform: translateZ(0);
}
#scroller {
| 12 |
diff --git a/src/renderer/lib/state.js b/src/renderer/lib/state.js @@ -119,7 +119,7 @@ function setupStateSaved () {
downloadPath: config.DEFAULT_DOWNLOAD_PATH,
isFileHandler: false,
openExternalPlayer: false,
- externalPlayerPath: null,
+ externalPlayerPath: '',
startup: false,
soundNotifications: true,
autoAddTorrents: false,
@@ -207,6 +207,8 @@ function load (cb) {
onSavedState(err)
return
}
+ } else if (saved.prefs.externalPlayerPath == null) {
+ saved.prefs.externalPlayerPath = ''
}
onSavedState(null, saved)
})
| 12 |
diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js @@ -164,6 +164,7 @@ BlazeComponent.extendComponent({
const boardId = Session.get('currentBoard');
const actionId = Actions.insert({
actionType: 'removeMember',
+ // deepcode ignore NoHardcodedCredentials: it's no credential
username: '*',
boardId,
desc,
| 1 |
diff --git a/lib/resize.js b/lib/resize.js @@ -253,6 +253,7 @@ function ignoreAspectRatio () {
* Do not enlarge the output image if the input image width *or* height are already less than the required dimensions.
* This is equivalent to GraphicsMagick's `>` geometry option:
* "*change the dimensions of the image only if its width or height exceeds the geometry specification*".
+ * Use with `max()` to preserve the image's aspect ratio.
*
* The default behaviour *before* function call is `false`, meaning the image will be enlarged.
*
| 0 |
diff --git a/grails-app/services/streama/TheMovieDbService.groovy b/grails-app/services/streama/TheMovieDbService.groovy @@ -146,18 +146,22 @@ class TheMovieDbService {
def requestUrl = BASE_URL + '/search/' + type + '?query=' + query + '&api_key=' + API_KEY
- URL url = new URL(requestUrl)
- HttpURLConnection conn = url.openConnection()
- log.debug("conn.responseCode: ${conn.responseCode}")
- if(conn.responseCode != 200){
- throw new Exception("TMDB request failed with statusCode: " + conn?.responseCode + ", responseMessage: " + conn?.responseMessage + ", url: " + requestUrl)
- }
+ def data
+ URL url
+
+ try {
+ url = new URL(requestUrl)
def JsonContent = url.getText("UTF-8")
- def data = new JsonSlurper().parseText(JsonContent)
+ data = new JsonSlurper().parseText(JsonContent)
if(data.results?.size() > 1 && year){
data.results = data.results.findAll{it.release_date.take(4) == year}
}
apiCacheData["$type:$name"] = data
+ }
+ catch(e) {
+ HttpURLConnection conn = url.openConnection()
+ throw new Exception("TMDB request failed with statusCode: " + conn?.responseCode + ", responseMessage: " + conn?.responseMessage + ", url: " + requestUrl)
+ }
return data
}
| 7 |
diff --git a/src/events/http/HttpServer.js b/src/events/http/HttpServer.js @@ -235,6 +235,11 @@ export default class HttpServer {
const authSchemeName = `scheme-${authKey}`
const authStrategyName = `strategy-${authKey}` // set strategy name for the route config
+ // TEMP options.location, for compatibility with serverless-webpack:
+ // https://github.com/dherault/serverless-offline/issues/787
+ // TODO FIXME look into better way to work with serverless-webpack
+ const servicePath = resolve(this._config.servicePath, this._options.location || '')
+
debugLog(`Creating Authorization scheme for ${authKey}`)
// Create the Auth Scheme for the endpoint
@@ -244,7 +249,7 @@ export default class HttpServer {
authFunctionName,
path,
this._options,
- this._config.servicePath,
+ servicePath,
this._service.provider,
)
| 0 |
diff --git a/src/components/api-request.js b/src/components/api-request.js @@ -549,7 +549,7 @@ export default class ApiRequest extends LitElement {
</div>
<div class="param-type">${paramSchema.type}</div>
</td>
- <td style="${fieldType === 'object' ? 'width:100%; padding:0;' : 'width:160px;'} min-width:100px;">
+ <td style="${fieldType === 'object' ? 'width:100%; padding:0;' : 'width:160px;'} min-width:100px;" colspan="${fieldType === 'object' ? 2 : 1}">
${fieldType === 'array'
? fieldSchema.items.format === 'binary'
? html`
@@ -605,7 +605,7 @@ export default class ApiRequest extends LitElement {
</div>
</div>
${html`
- <div class="tab-content col" data-tab = 'model' style="display:none; padding:0 10px; width:100%;">
+ <div class="tab-content col" data-tab = 'model' style="display:${this.activeSchemaTab === 'model' ? 'block' : 'none'}; padding-left:5px; width:100%;">
<schema-tree
.data = '${formdataPartSchema}'
schema-expand-level = "${this.schemaExpandLevel}"
@@ -614,7 +614,7 @@ export default class ApiRequest extends LitElement {
</div>`
}
${html`
- <div class="tab-content col" data-tab = 'example' style="display:block; padding:0 10px; width:100%">
+ <div class="tab-content col" data-tab = 'example' style="display:${this.activeSchemaTab === 'example' ? 'block' : 'none'}; padding-left:5px; width:100%">
<textarea
class = "textarea"
style = "width:100%; border:none; resize:vertical;"
@@ -643,6 +643,9 @@ export default class ApiRequest extends LitElement {
}`
}
</td>
+ ${fieldType === 'object'
+ ? ''
+ : html`
<td>
<div class="param-constraint">
${paramSchema.default || paramSchema.constrain || paramSchema.allowedValues
@@ -655,15 +658,20 @@ export default class ApiRequest extends LitElement {
: ''
}
</div>
- </td>
+ </td>`
+ }
</tr>
+ ${fieldType === 'object'
+ ? ''
+ : html`
<tr>
${this.allowTry === 'true' ? html`<td style="border:none"> </td>` : ''}
<td colspan="2" style="border:none; margin-top:0; padding:0 5px 8px 5px;">
<span class="m-markdown-small">${unsafeHTML(marked(fieldSchema.description || ''))}</span>
</td>
</tr>
- `);
+ `
+ }`);
}
return html`
<table style="width:100%;" class="m-table">
| 7 |
diff --git a/test/functional/specs/Identity/C2581.js b/test/functional/specs/Identity/C2581.js import { t } from "testcafe";
import createFixture from "../../helpers/createFixture";
-import SequentialHook from "../../helpers/requestHooks/sequentialHook";
import cookies from "../../helpers/cookies";
import {
compose,
@@ -9,17 +8,18 @@ import {
} from "../../helpers/constants/configParts";
import { MAIN_IDENTITY_COOKIE_NAME } from "../../helpers/constants/cookies";
import createAlloyProxy from "../../helpers/createAlloyProxy";
+import createNetworkLogger from "../../helpers/networkLogger";
const debugEnabledConfig = compose(
orgMainConfigMain,
debugEnabled
);
-const interactHook = new SequentialHook(/v1\/interact\?/);
+const networkLogger = createNetworkLogger();
createFixture({
title: "C2581: Queue events when no ECID available on client",
- requestHooks: [interactHook]
+ requestHooks: [networkLogger.edgeEndpointLogs]
});
test.meta({
@@ -31,12 +31,19 @@ test.meta({
test("Test C2581: Queue requests until we receive an ECID.", async () => {
const alloy = createAlloyProxy();
await alloy.configure(debugEnabledConfig);
+ // this should get an ECID
await alloy.sendEventAsync({ renderDecisions: true });
+ // this should wait until the first event returns
+ // so it can send the ECID in the request
await alloy.sendEvent();
- await t.expect(interactHook.numRequests).eql(2);
- await t
- .expect(interactHook.haveRequestsBeenSequential())
- .ok("Interact requests were not sequential");
+ await t.expect(networkLogger.edgeEndpointLogs.requests.length).eql(2);
+
+ // make sure we have an ecid
const identityCookieValue = await cookies.get(MAIN_IDENTITY_COOKIE_NAME);
await t.expect(identityCookieValue).ok("No identity cookie found.");
+
+ // make sure the ecid was sent as part of the second request
+ await t
+ .expect(networkLogger.edgeEndpointLogs.requests[1].request.body)
+ .contains(identityCookieValue);
});
| 2 |
diff --git a/lib/pageHandler.js b/lib/pageHandler.js const { createJsDialogEventName } = require('./util');
const {handleUrlRedirection} = require('./helper');
+const nodeURL = require('url');
let page, xhrEvent, logEvent, framePromises, frameNavigationPromise;
const setPage = async (pg, event, eventLogger, domContentCallback) => {
@@ -68,10 +69,18 @@ const handleNavigation = async (url) => {
let resolveResponse, requestId;
const handleRequest = (request) => {
+ if(!request.request || !request.request.url) return;
let requestUrl = request.request.urlFragment !== undefined && request.request.urlFragment !== null ?
request.request.url + request.request.urlFragment : request.request.url;
- requestUrl = handleUrlRedirection(requestUrl).split('://')[1].replace(/^\/*/gm,'');
- const urlToNavigate = handleUrlRedirection(url).split('://')[1].replace(/^\/*/gm,'');
+ let urlToNavigate = nodeURL.parse(url);
+ requestUrl = nodeURL.parse(requestUrl);
+ if(urlToNavigate.protocol === 'file:'){
+ urlToNavigate = nodeURL.fileURLToPath(urlToNavigate.href);
+ requestUrl = nodeURL.fileURLToPath(requestUrl.href);
+ } else {
+ requestUrl = handleUrlRedirection(requestUrl.href);
+ urlToNavigate = handleUrlRedirection(urlToNavigate.href);
+ }
if(requestUrl === urlToNavigate) requestId = request.requestId;
};
xhrEvent.addListener('requestStarted', handleRequest);
| 9 |
diff --git a/src/config.js b/src/config.js @@ -19,7 +19,8 @@ export const DEV_WS_API = 'wss://dev.franzinfra.com';
export const LIVE_WS_API = 'wss://api.franzinfra.com';
export const LOCAL_API_WEBSITE = 'http://localhost:3333';
-export const DEV_API_WEBSITE = 'https://meetfranz.com';
+// export const DEV_API_WEBSITE = 'https://meetfranz.com';
+export const DEV_API_WEBSITE = 'http://hash-3ac3ccd2472269cf585c58a4f6973d86f3c9e7bd.franzstaging.com/'; // TODO: revert me
export const LIVE_API_WEBSITE = 'https://meetfranz.com';
export const STATS_API = 'https://stats.franzinfra.com';
| 14 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,12 @@ 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.28.2] -- 2017-06-21
+
+### Fixed
+- Fix IE rendering error (`node.children` doesn't work on SVG nodes in IE) [#1803]
+
+
## [1.28.1] -- 2017-06-20
### Fixed
| 3 |
diff --git a/lib/services/doctor-service.ts b/lib/services/doctor-service.ts @@ -116,6 +116,16 @@ class DoctorService implements IDoctorService {
}
private printInfosCore(infos: NativeScriptDoctor.IInfo[]): void {
+ if (!helpers.isInteractive()) {
+ infos.map(info => {
+ let message = info.message;
+ if (info.type === constants.WARNING_TYPE_NAME) {
+ message = `WARNING: ${info.message.yellow} ${EOL} ${info.additionalInformation} ${EOL}`;
+ }
+ this.$logger.out(message);
+ });
+ }
+
infos.filter(info => info.type === constants.INFO_TYPE_NAME)
.map(info => {
const spinner = this.$terminalSpinnerService.createSpinner();
| 9 |
diff --git a/website/js/admin.vue b/website/js/admin.vue @@ -145,6 +145,13 @@ module.exports={
icon:"info",
href:"#/connect"
},
+ {
+ title:"Genesys Cloud",
+ id:"genesys",
+ subTitle:"Instructions for integrating with Genesys Cloud",
+ icon:"info",
+ href:"#/genesys"
+ },
{
title:"Lambda Hooks",
id:"hooks",
| 3 |
diff --git a/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs @@ -119,14 +119,11 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@Value("${spring.security.oauth2.client.provider.oidc.issuer-uri}")
private String issuerUri;
-
- private final JHipsterProperties jHipsterProperties;
<%_ } _%>
private final SecurityProblemSupport problemSupport;
public SecurityConfiguration(<% if (authenticationType === 'session' && !skipUserManagement) { %>JHipsterProperties jHipsterProperties, RememberMeServices rememberMeServices, <% } if (authenticationType === 'jwt') { %>TokenProvider tokenProvider, <% } %><% if (applicationType !== 'microservice') { %>CorsFilter corsFilter, <% } %> JHipsterProperties jHipsterProperties, SecurityProblemSupport problemSupport) {
<%_ if (authenticationType === 'session' && !skipUserManagement) { _%>
- this.jHipsterProperties = jHipsterProperties;
this.rememberMeServices = rememberMeServices;
<%_ } _%>
<%_ if (authenticationType === 'jwt') { _%>
| 2 |
diff --git a/activities/DollarStreet.activity/js/place.js b/activities/DollarStreet.activity/js/place.js @@ -7,7 +7,7 @@ var StreetPlace = {
<div class="place-padding">
<div v-bind:class="containerClass" @click="onPlaceClicked">
<img v-bind:src="image" @load="loaded" @error="error" class="place-image" v-bind:style="{visibility:visible?'visible':'hidden'}"/>
- <img v-bind:src="rightNotLoadedImage" class="place-image place-image2" v-bind:style="{visibility:!visible?'visible':'hidden'}"/>
+ <img v-bind:src="rightNotLoadedImage" class="place-image place-image2" v-bind:style="{visibility:!visible||hasError?'visible':'hidden'}"/>
<div v-if="size>0" v-bind:class="descriptionClass">
<span>{{" "+formattedIncome}}</span>
<br>
| 9 |
diff --git a/token-metadata/0xe6410569602124506658Ff992F258616Ea2D4A3D/metadata.json b/token-metadata/0xe6410569602124506658Ff992F258616Ea2D4A3D/metadata.json "symbol": "KATANA",
"address": "0xe6410569602124506658Ff992F258616Ea2D4A3D",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.50.0",
+ "version": "0.51.0",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/changelog/60_UNRELEASED_2020-xx-xx.md b/changelog/60_UNRELEASED_2020-xx-xx.md @@ -69,6 +69,8 @@ _- (Because the stock quantity unit is now the base for everything, it cannot be
### Recipe improvements/fixes
- It's now possible to print recipes (button next to the recipe title) (thanks @zsarnett)
+- Changed that recipe costs are now based on the costs of the products picked by the default consume rule "First expiring first, then first in first out" (thanks @kriddles)
+ - Recipe costs were based on the last purchase price per product before, so this now better reflects the current real costs
- Improved the recipe add workflow (a recipe called "New recipe" is now not automatically created when starting to add a recipe) (thanks @zsarnett)
- Fixed that images on the recipe gallery view were not scaled correctly on larger screens (thanks @zsarnett)
- Fixed that decimal ingredient amounts maybe resulted in wrong conversions or truncated decimal places if your locale does not use a dot as the decimal separator (thanks @m-byte)
| 0 |
diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js @@ -376,6 +376,8 @@ class Flow {
} else if (this.activeNodes[id]) {
// TEMP: this is a subflow internal node within this flow
return this.activeNodes[id];
+ } else if (this.subflowInstanceNodes[id]) {
+ return this.subflowInstanceNodes[id];
} else if (cancelBubble) {
// The node could be inside one of this flow's subflows
var node;
| 11 |
diff --git a/packages/wast-parser/src/tokenizer.js b/packages/wast-parser/src/tokenizer.js @@ -361,7 +361,8 @@ function tokenize(input: string) {
regexToState(/\./, DEC_FRAC),
]),
DEC_FRAC: combineTransitions([
- regexToState(/[0-9]/, DEC_FRAC),
+ regexToState(/[0-9]/, DEC_FRAC, 1, true),
+ regexToState(/e|E/, DEC_SIGNED_EXP),
]),
DEC: combineTransitions([
regexToState(/[0-9]/, DEC, 1, true),
@@ -416,8 +417,7 @@ function tokenize(input: string) {
case DEC_FRAC: {
state = states.DEC_FRAC()
- // TODO: This is a hack, provide the correct transitions instead
- //break
+ break
}
case DEC: {
| 1 |
diff --git a/lib/document.js b/lib/document.js @@ -1154,14 +1154,15 @@ Document.prototype.$set = function $set(path, val, type, options) {
}
}
- // Ensure all properties are in correct order by deleting and recreating every property.
- for (const key of Object.keys(this.$__schema.tree)) {
- if (this._doc.hasOwnProperty(key)) {
- const val = this._doc[key];
- delete this._doc[key];
- this._doc[key] = val;
- }
- }
+ // Ensure all properties are in correct order
+ const orderedDoc = {};
+ const orderedKeys = Object.keys(this.$__schema.tree);
+ for (let i = 0, len = orderedKeys.length; i < len; ++i) {
+ (key = orderedKeys[i]) &&
+ (this._doc.hasOwnProperty(key)) &&
+ (orderedDoc[key] = undefined);
+ }
+ this._doc = Object.assign(orderedDoc, this._doc);
return this;
}
| 7 |
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/field/material-range/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/field/material-range/template.vue :name="schema.inputName"
:required="schema.required"
:step="schema.step"/>
- <div class="rail" @click="value = 0"></div>
<div v-if="isBlank" class="empty-range">
+ <div class="rail" @click="value = min"></div>
</div>
<input
type="text"
| 12 |
diff --git a/plugins/styled-bars/back.js b/plugins/styled-bars/back.js @@ -11,7 +11,7 @@ mainMenuTemplate = function (winHook) {
//get template
let template = originTemplate(winHook);
//fix checkbox and roles
- fixCheck(template);
+ fixMenu(template);
//return as normal
return template;
}
@@ -52,12 +52,12 @@ function switchMenuVisibility() {
}
//go over each item in menu
-function fixCheck(ogTemplate) {
- for (let position in ogTemplate) {
- let item = ogTemplate[position];
+function fixMenu(template) {
+ for (let index in template) {
+ let item = template[index];
//apply function on submenu
if (item.submenu != null) {
- fixCheck(item.submenu);
+ fixMenu(item.submenu);
}
//change onClick of checkbox+radio
else if (item.type === 'checkbox' || item.type === 'radio') {
@@ -98,7 +98,7 @@ function fixRoles(MenuItem) {
MenuItem.click = () => { win.webContents.setZoomLevel(0); }
break;
default:
- console.log(MenuItem.role + ' was not expected');
+ console.log(`Error fixing MenuRoles: "${MenuItem.role}" was not expected`);
}
delete MenuItem.role;
}
| 10 |
diff --git a/data.js b/data.js @@ -3996,6 +3996,14 @@ module.exports = [
url: "https://github.com/dciccale/parsy",
source: "https://raw.githubusercontent.com/dciccale/parsy/master/lib/parsy.js"
},
+ {
+ name: "Talker.js",
+ github: "secondstreet/talker.js",
+ tags: ["events", "window.postMessage", "iframe", "promise", "communication", "message"],
+ description: "Simple event delegation library",
+ url: "https://github.com/secondstreet/talker.js",
+ source: "https://raw.githubusercontent.com/secondstreet/talker.js/master/src/talker.js"
+ },
{
name: "Gator",
github: "ccampbell/gator",
| 0 |
diff --git a/packages/config/src/bin/main.js b/packages/config/src/bin/main.js @@ -12,9 +12,8 @@ const { parseFlags } = require('./flags')
// CLI entry point
const runCli = async function() {
- const { stable, ...flags } = parseFlags()
-
try {
+ const { stable, ...flags } = parseFlags()
const result = await resolveConfig(flags)
handleCliSuccess(result, stable)
} catch (error) {
| 7 |
diff --git a/src/server/modules/post/sql.js b/src/server/modules/post/sql.js @@ -39,13 +39,13 @@ export default class Post {
getTotal() {
return knex('post')
- .count('id as count')
+ .countDistinct('id as count')
.first();
}
getNextPageFlag(id) {
return knex('post')
- .count('id as count')
+ .countDistinct('id as count')
.where('id', '<', id)
.first();
}
| 4 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js b/packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js @@ -45,6 +45,22 @@ RED.notifications = (function() {
var persistentNotifications = {};
+ var shade = (function() {
+ var shadeUsers = 0;
+ return {
+ show: function() {
+ shadeUsers++;
+ $("#red-ui-full-shade").show();
+ },
+ hide: function() {
+ shadeUsers--;
+ if (shadeUsers === 0) {
+ $("#red-ui-full-shade").hide();
+ }
+ }
+ }
+ })();
+
var currentNotifications = [];
var c = 0;
function notify(msg,type,fixed,timeout) {
@@ -54,6 +70,10 @@ RED.notifications = (function() {
fixed = options.fixed;
timeout = options.timeout;
type = options.type;
+ } else {
+ options.type = type;
+ options.fixed = fixed;
+ options.timeout = options.timeout;
}
if (options.id && persistentNotifications.hasOwnProperty(options.id)) {
@@ -62,7 +82,7 @@ RED.notifications = (function() {
}
if (options.modal) {
- $("#red-ui-full-shade").show();
+ shade.show();
}
if (currentNotifications.length > 4) {
@@ -79,6 +99,8 @@ RED.notifications = (function() {
var n = document.createElement("div");
n.id="red-ui-notification-"+c;
n.className = "red-ui-notification";
+ n.options = options;
+
n.fixed = fixed;
if (type) {
n.className = "red-ui-notification red-ui-notification-"+type;
@@ -115,7 +137,6 @@ RED.notifications = (function() {
})
}
-
$("#red-ui-notifications").append(n);
if (!RED.notifications.hide) {
$(n).slideDown(300);
@@ -141,8 +162,8 @@ RED.notifications = (function() {
} else {
nn.parentNode.removeChild(nn);
}
- if (options.modal) {
- $("#red-ui-full-shade").hide();
+ if (nn.options.modal) {
+ shade.hide();
}
};
})();
@@ -173,7 +194,7 @@ RED.notifications = (function() {
n.update = (function() {
var nn = n;
- return function(msg,options) {
+ return function(msg,newOptions) {
if (typeof msg === "string") {
if (!/<p>/i.test(msg)) {
msg = "<p>"+msg+"</p>";
@@ -182,16 +203,31 @@ RED.notifications = (function() {
} else {
$(nn).empty().append(msg);
}
- var timeout;
- if (typeof options === 'number') {
- timeout = options;
- } else if (options !== undefined) {
- if (!options.fixed) {
- timeout = options.timeout || 5000;
+ var newTimeout;
+ if (typeof newOptions === 'number') {
+ newTimeout = newOptions;
+ nn.options.timeout = newTimeout;
+ } else if (newOptions !== undefined) {
+
+ if (!options.modal && newOptions.modal) {
+ nn.options.modal = true;
+ shade.show();
+ } else if (options.modal && newOptions.modal === false) {
+ nn.options.modal = false;
+ shade.hide();
}
- if (options.buttons) {
+
+ var newType = newOptions.hasOwnProperty('type')?newOptions.type:type;
+ if (newType) {
+ n.className = "red-ui-notification red-ui-notification-"+newType;
+ }
+
+ if (!newOptions.fixed) {
+ newTimeout = (newOptions.hasOwnProperty('timeout')?newOptions.timeout:timeout)||5000;
+ }
+ if (newOptions.buttons) {
var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(nn)
- options.buttons.forEach(function(buttonDef) {
+ newOptions.buttons.forEach(function(buttonDef) {
var b = $('<button>').text(buttonDef.text).on("click", buttonDef.click).appendTo(buttonSet);
if (buttonDef.id) {
b.attr('id',buttonDef.id);
@@ -202,15 +238,22 @@ RED.notifications = (function() {
})
}
}
- if (timeout !== undefined && timeout > 0) {
+ $(nn).off("click.red-ui-notification-close");
+ if (newTimeout !== undefined && newTimeout > 0) {
+ window.clearTimeout(nn.timeoutid);
+ nn.timeoutid = window.setTimeout(nn.close,newTimeout);
+ setTimeout(function() {
+ $(nn).on("click.red-ui-notification-close", function() {
+ nn.close();
window.clearTimeout(nn.timeoutid);
- nn.timeoutid = window.setTimeout(nn.close,timeout);
+ });
+ },50);
} else {
window.clearTimeout(nn.timeoutid);
}
if (nn.hidden) {
nn.showNotification();
- } else if (!options || !options.silent){
+ } else if (!newOptions || !newOptions.silent){
$(nn).addClass("red-ui-notification-shake-horizontal");
setTimeout(function() {
$(nn).removeClass("red-ui-notification-shake-horizontal");
@@ -221,7 +264,7 @@ RED.notifications = (function() {
})();
if (!fixed) {
- $(n).on("click", (function() {
+ $(n).on("click.red-ui-notification-close", (function() {
var nn = n;
return function() {
nn.close();
| 11 |
diff --git a/js/plugins/urlHandler.js b/js/plugins/urlHandler.js if (typeof window!=="undefined" &&
window.location &&
(window.location.origin=="https://localhost" ||
+ window.location.origin=="https://espruino.github.io" ||
window.location.origin=="https://www.espruino.com")) {
setTimeout(function() {
handle(window.location.href);
| 11 |
diff --git a/token-metadata/0xea004e8FA3701B8E58E41b78D50996e0f7176CbD/metadata.json b/token-metadata/0xea004e8FA3701B8E58E41b78D50996e0f7176CbD/metadata.json "symbol": "YFFC",
"address": "0xea004e8FA3701B8E58E41b78D50996e0f7176CbD",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/source/transfers/package.json b/source/transfers/package.json {
"name": "@airswap/transfers",
"version": "0.0.1",
- "description": "A registry to manage a variety of token transfers for the Swap Protocol",
+ "description": "A registry to manage token transfers on the AirSwap Network",
"license": "Apache-2.0",
"repository": {
"type": "git",
| 3 |
diff --git a/js/core/bis_genericio.js b/js/core/bis_genericio.js @@ -635,7 +635,7 @@ let runDICOMConversion = (params,external=false) => {
* Runs the pipeline creation module through the file server
* @param {Object} params - Parameters for the pipeline module
*/
-let runPipelineModule = (params, savemanually = false) => {
+let runPipelineModule = (params) => {
return new Promise( (resolve, reject) => {
if (fileServerClient) {
fileServerClient.runModule('pipeline', params, false, console.log, true)
| 1 |
diff --git a/server/game/game.js b/server/game/game.js @@ -310,9 +310,9 @@ class Game extends EventEmitter {
}
transferHonor(winner, loser, honor) {
- var appliedHonor = Math.min(loser.faction.honor, honor);
- loser.faction.honor -= appliedHonor;
- winner.faction.honor += appliedHonor;
+ var appliedHonor = Math.min(loser.honor, honor);
+ loser.honor -= appliedHonor;
+ winner.honor += appliedHonor;
this.raiseEvent('onStatChanged', loser, 'honor');
this.raiseEvent('onStatChanged', winner, 'honor');
@@ -821,10 +821,9 @@ class Game extends EventEmitter {
}
playerSummaries[player.name] = {
- agenda: player.agenda ? player.agenda.code : undefined,
deck: deck,
emailHash: player.emailHash,
- faction: player.faction.code,
+ faction: player.faction.value,
id: player.id,
lobbyId: player.lobbyId,
left: player.left,
| 2 |
diff --git a/demo/stores/component/component.js b/demo/stores/component/component.js @@ -10,8 +10,10 @@ import ComponentConstants from './../../constants/component';
import definitions from './../../definitions';
import patternDefinitions from './../../pattern-definitions';
+import { assign } from 'lodash';
+
const data = ImmutableHelper.parseJSON(
- Object.assign({}, definitions, patternDefinitions)
+ assign({}, definitions, patternDefinitions)
);
// expose tableData for the table component demo
| 14 |
diff --git a/src/kiri/tools.js b/src/kiri/tools.js @@ -115,11 +115,18 @@ api.event.on('mouse.hover', (ev) => {
let opos = track.pos;
obj.add(pmesh);
pmesh.position.x = point.x - opos.x + norm.x * 0.1;
+ if (track.indexed) {
+ let delta = track.delta;
+ let rad = track.indexRad;
+ let py = (point.y - delta.z + track.tzoff) * 1.001;
+ let pz = (point.z + delta.y) * 1.001;
+ let v = new THREE.Vector3(point.x, py, pz)
+ .applyAxisAngle(new THREE.Vector3(1,0,0), rad);
+ pmesh.position.y = -v.z;
+ pmesh.position.z = v.y;
+ } else {
pmesh.position.y = -point.z - opos.y + norm.y * 0.1;
pmesh.position.z = point.y + norm.z * 0.1;
- // todo also need to account for z top offset in cam mode
- if (track.indexed) {
- pmesh.position.z += track.indexed / 2 + track.tzoff;
}
let q = new Quaternion().setFromUnitVectors(
new Vector3(0,0,1),
| 3 |
diff --git a/src/utils.js b/src/utils.js @@ -532,33 +532,16 @@ const utils = class utils {
return ret;
}
- static flatten(arr, result) {
- let i = 0;
- result = result || [];
- if (utils.isArray(arr)) {
- if (!utils.isArray(arr[0])) {
- result.push.apply(result, arr);
- } else {
- for (; i < arr.length; i++) {
- if (utils.isArray(arr[i])) {
- utils.flatten(arr[i], result);
- } else {
- result.push(result, arr[i]);
- }
+ static flatten(arr) {
+ for (let i = 0; i < arr.length; ++i) {
+ if (Array.isArray(arr[i])) {
+ arr[i].splice(0, 0, i, 1);
+ Array.prototype.splice.apply(arr, arr[i]);
+ --i;
}
}
- } else if (typeof arr === 'object') {
- const keys = Object.keys(arr);
- for (; i < keys.length; i++) {
- const objectValue = arr[keys[i]];
- if (utils.isArray(objectValue)) {
- utils.flatten(objectValue, result);
- } else {
- result.push(objectValue);
- }
- }
- }
- return result;
+
+ return arr;
}
static splitArray(array, part) {
| 4 |
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 v-on:dragover = "onDragOver"
v-on:drop = "onDrop"
v-bind:style = "`right: ${scrollbarWidth}px;`">
+ <div class="editview-container" ref="editviewContainer">
<div
v-bind:class = "editableClass"
ref = "editable"
</div>
</div>
</div>
+ </div>
<iframe
- v-on:load = "setWheelEventListener"
+ v-on:load = "onIframeLoaded"
ref = "editview"
id = "editview"
v-bind:src = "pagePath"
@@ -82,10 +84,16 @@ export default {
window.addEventListener('resize', this.onResize)
document.addEventListener('keydown', this.onKeyDown)
document.addEventListener('keyup', this.onKeyUp)
- this.setScrollBarWidth(window.navigator.userAgent)
})
},
+ updated(){
+ if(this.selectedComponent !== null){
+ var targetBox = this.selectedComponent.getBoundingClientRect()
+ this.setEditableStyle(targetBox, 'selected')
+ }
+ },
+
props: ['model'],
data(){
@@ -183,41 +191,33 @@ export default {
/* Iframe (editview) methods ===============
============================================ */
- setWheelEventListener(ev){
- ev.target.contentWindow.addEventListener('wheel', this.onScrollIframe)
- ev.target.contentWindow.addEventListener('scroll', this.onScrollIframe)
+ onIframeLoaded(ev){
+ var iframeBody = ev.target.contentWindow.document.body
+ var editviewContainer = this.$refs.editviewContainer
+ iframeBody.style.overflow = 'hidden'
+ /* TODO: find better way to find when iframe content finishes loading */
+ setTimeout(function(){
+ var iframeHeight = iframeBody.offsetHeight
+ editviewContainer.style.height = iframeHeight + 'px'
+ }, 1000)
},
- onScrollIframe(ev){
- if(this.selectedComponent !== null){
- this.$nextTick(function () {
- var selectedComponentRect = this.getBoundingClientRect(this.selectedComponent)
- this.updateEditablePos(selectedComponentRect.top)
- })
- }
- },
+ // onScrollIframe(ev){
+ // if(this.selectedComponent !== null){
+ // this.$nextTick(function () {
+ // var selectedComponentRect = this.getBoundingClientRect(this.selectedComponent)
+ // this.updateEditablePos(selectedComponentRect.top)
+ // })
+ // }
+ // },
/* Overlay (editviewoverlay) methods ======
============================================ */
- setScrollBarWidth(userAgent) {
- let widths = { edge: 12, mac: 15, win: 17, unknown: 17 }
- this.scrollbarWidth = widths[$perAdminApp.getOSBrowser()]
- if(!this.scrollbarWidth){
- this.scrollbarWidth = widths.unknown
- }
- },
-
onScrollOverlay(ev){
- ev.preventDefault()
this.$nextTick(function () {
- var isScrolling = false
- ev.target.style['pointer-events'] = 'none'
- if(isScrolling) {
- clearTimeout(timer)
- }
- isScrolling = setTimeout(function() {
- ev.target.style['pointer-events'] = 'auto'
- }, 66)
+ var scrollAmount = ev.target.scrollTop
+ var editview = this.$refs.editview
+ editview.contentWindow.scrollTo(0, scrollAmount)
})
},
| 4 |
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/field/pathbrowser/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/field/pathbrowser/template.vue #L%
-->
<template>
- <div class="pathbrowser input-field">
+ <div class="field-wrap field-with-button">
<input
class="form-control"
- style="width: calc(100% - 60px); display: inline; padding-right: 0px"
type="text"
v-model="value"
:disabled="disabled"
:maxlength="schema.max"
:placeholder="schema.placeholder"
- :readonly="schema.readonly" >
- <button v-on:click.stop.prevent="browse" style="float: right; height: 46px; width: 54px;"><i class="material-icons">insert_drive_file</i></button>
+ :readonly="schema.readonly" />
+ <button v-on:click.stop.prevent="browse">
+ <i class="material-icons">insert_drive_file</i>
+ </button>
</div>
</template>
}
}
</script>
-
-<style>
- .pathbrowser {
- width: 100%;
- }
-</style>
| 7 |
diff --git a/src/EventEmitter.js b/src/EventEmitter.js @@ -17,7 +17,7 @@ class EventEmitter {
}
const observers = this.observers[event];
- for (const i = observers.length - 1; i >= 0; i--) {
+ for (let i = observers.length - 1; i >= 0; i--) {
const observer = observers[i];
if (observer === listener) {
observers.splice(i, 1);
| 14 |
diff --git a/assets/js/modules/adsense/components/dashboard/DashboardTopEarningPagesWidget.js b/assets/js/modules/adsense/components/dashboard/DashboardTopEarningPagesWidget.js @@ -76,7 +76,7 @@ function DashboardTopEarningPagesWidget() {
}
if ( error ) {
- return getDataErrorComponent( 'adsense', error.message, false, false, false, error );
+ return getDataErrorComponent( 'analytics', error.message, false, false, false, error );
}
if ( ! isAdSenseLinked ) {
| 12 |
diff --git a/spec/widgets/auto-style/category.spec.js b/spec/widgets/auto-style/category.spec.js @@ -56,7 +56,6 @@ describe('src/widgets/auto-style/category', function () {
this.dataview.set('data', data);
this.layer.set('initialStyle', '#layer { marker-line-width: 0.5; marker-line-color: #fcfafa; marker-line-opacity: 1; marker-width: 6.076923076923077; marker-fill: #e49115; marker-fill-opacity: 0.9; marker-allow-overlap: true;}');
this.updateColorsByData();
- console.log(this.categoryAutoStyler.getStyle());
expect(this.categoryAutoStyler.getStyle()).toBe('#layer { marker-line-width: 0.5; marker-line-color: #fcfafa; marker-line-opacity: 1; marker-width: 6.076923076923077; marker-fill: ramp([something], ("#7F3C8D", "#11A579", "#3969AC", "#F2B701", "#E73F74", "#A5AA99"), ("soccer", "basketball", "baseball", "handball", "hockey", "Oh\\"Yeah")); marker-fill-opacity: 0.9; marker-allow-overlap: true;}');
});
| 2 |
diff --git a/src/components/topic/StoryTable.js b/src/components/topic/StoryTable.js import React from 'react';
import { FormattedMessage, FormattedNumber, injectIntl } from 'react-intl';
import ArrowDropDownIcon from 'material-ui/svg-icons/navigation/arrow-drop-down';
-import Link from 'react-router/lib/Link';
import messages from '../../resources/messages';
import { storyPubDateToTimestamp } from '../../lib/dateUtil';
import { googleFavIconUrl, storyDomainName } from '../../lib/urlUtil';
@@ -20,10 +19,6 @@ class StoryTable extends React.Component {
onChangeSort('social');
}
- openInNewWindow = (link) => {
- window.open(link, '_blank');
- }
-
render() {
const { stories, onChangeSort, sortedBy, maxTitleLength } = this.props;
const { formatMessage, formatDate } = this.props.intl;
@@ -80,21 +75,15 @@ class StoryTable extends React.Component {
return (
<tr key={story.stories_id} className={(idx % 2 === 0) ? 'even' : 'odd'}>
<td>
- <Link
- to={story.url}
- onClick={(e) => { e.preventDefault(); this.openInNewWindow(e.target.href); }}
- >{title}
- </Link>
+ <a href={story.url} rel="noopener noreferrer" target="_blank">{title}</a>
</td>
<td>
+ <a href={story.media_url} rel="noopener noreferrer" target="_blank">
<img className="google-icon" src={googleFavIconUrl(domain)} alt={domain} />
+ </a>
</td>
<td>
- <Link
- to={story.media_url}
- onClick={(e) => { e.preventDefault(); this.openInNewWindow(e.target.href); }}
- >{story.media_name}
- </Link>
+ <a href={story.media_url} rel="noopener noreferrer" target="_blank">{story.media_name}</a>
</td>
<td><span className={`story-date ${dateStyle}`}>{dateToShow}</span></td>
<td><FormattedNumber value={story.bitly_click_count !== undefined ? story.bitly_click_count : '?'} /></td>
| 4 |
diff --git a/mediacontroller/yaps/core/storage.js b/mediacontroller/yaps/core/storage.js * @since v1
*/
const Minio = require('minio')
-const deasync = require('deasync')
+const sleep = require('syncho').sleep
class Storage {
@@ -23,13 +23,12 @@ class Storage {
// Get this out of here...
uploadFileSync(filename, filePath, metadata = {}) {
- const fPutObjectSync = deasync()
let result
this.fsConn.fPutObject('default', filename, filePath, metadata,
(err, etag) => result = err ? err : etag )
- while(result === undefined) require('deasync').sleep(100)
+ while(result === undefined) sleep(100)
return result
}
@@ -41,18 +40,20 @@ class Storage {
exist = e ? false : true
})
- while(exist === undefined) require('deasync').sleep(100)
+ while(exist === undefined) sleep(100)
if (!exist) return void(0)
// It exist, so lets get the URL
- let url
+ /*let url
this.fsConn.presignedGetObject('default', filename, 1000, function(e, presignedUrl) {
if (e) throw e
url = presignedUrl
- })
+ })*/
+
+ //while(url === undefined) sleep(100)
- while(url === undefined) require('deasync').sleep(100)
+ const url = `http://${process.env.FS_HOST}:${process.env.FS_PORT}/${process.env.FS_DEFAULT_BUCKET}/${filename}`
return url
}
| 14 |
diff --git a/components/core/ApplicationUserControls.js b/components/core/ApplicationUserControls.js @@ -181,7 +181,7 @@ export class ApplicationUserControlsPopup extends React.Component {
{
text: (
<div css={Styles.MOBILE_HIDDEN}>
- <DownloadExtensionButton full style={{ marginTop: "4px", marginBottom: "28px" }} />
+ <DownloadExtensionButton full style={{ marginTop: "4px", marginBottom: "4px" }} />
</div>
),
},
| 2 |
diff --git a/app/views/admin/organizations/settings.html.erb b/app/views/admin/organizations/settings.html.erb </div>
</div>
- <div class="FormAccount-row">
- <div class="FormAccount-rowLabel">
- <label class="CDB-Text CDB-Size-medium is-semibold u-mainTextColor">Brand color</label>
- </div>
- <div class="FormAccount-rowData">
- <button type="button" class="js-colorPicker UserSettings-ColorPicker" style="background:<%= @organization.color.blank? ? "#354046" : @organization.color %>">
- <span class="ColorPicker-handle">
- <b class="ColorPicker-handleTriangle"></b>
- </span>
- </button>
- <%= f.hidden_field :color, :class => "js-colorInput" %>
- </div>
- </div>
-
<div class="FormAccount-row IconPicker js-iconPicker">
</div>
</div>
</div>
- <div class="FormAccount-row">
- <div class="FormAccount-rowLabel">
- <label class="CDB-Text CDB-Size-medium is-semibold u-mainTextColor">Disqus shortname</label>
- </div>
- <div class="FormAccount-rowData">
- <%= f.text_field :discus_shortname, :class => "CDB-InputText CDB-Text FormAccount-input FormAccount-input--med", :placeholder => "If empty, CARTO will moderate them for you" %>
- <div class="FormAccount-rowInfo FormAccount-rowInfo--marginLeft">
- <p class="CDB-Text CDB-Size-small u-altTextColor">Be notified by new comments in your pages</p>
- </div>
- </div>
- </div>
-
<div class="FormAccount-row">
<div class="FormAccount-rowLabel">
<label class="CDB-Text CDB-Size-medium is-semibold u-mainTextColor">Internal support email</label>
| 2 |
diff --git a/templates/master/cfn/index.js b/templates/master/cfn/index.js @@ -39,7 +39,7 @@ module.exports={
"S3ObjectVersion":{"Fn::GetAtt":["CFNVersion","version"]}
},
"Handler": "index.handler",
- "MemorySize": "128",
+ "MemorySize": "3008",
"Role": {"Fn::GetAtt": ["CFNLambdaRole","Arn"]},
"Runtime": "nodejs8.10",
"Timeout": 60,
| 3 |
diff --git a/src/components/Graph.jsx b/src/components/Graph.jsx @@ -7,6 +7,7 @@ import {
VictoryLine,
VictoryLabel,
VictoryAxis,
+ VictoryContainer,
} from 'victory';
import Symbol from './Symbol.jsx';
@@ -156,8 +157,13 @@ const Graph = props => {
y: props.yMax,
x: props.xMax,
}}
- // containerComponent={<VictoryVoronoiContainer/>}
- // animate={{ duration: 2000, easing: "bounce" }}
+ containerComponent={
+ <VictoryContainer
+ style={{
+ touchAction: "auto"
+ }}
+ />
+ }
>
<VictoryAxis
axisLabelComponent={<VictoryLabel x={177}/>}
| 1 |
diff --git a/bot/src/start.js b/bot/src/start.js @@ -116,6 +116,10 @@ function createBot() {
});
loadScheduleIntervals(monochrome);
+
+ process.on('uncaughtException', (err) => {
+ monochrome.getLogger().fatal({ event: 'UNCAUGHT_EXCEPTION', err });
+ });
});
return monochrome;
| 9 |
diff --git a/components/Frame/Popover/NavLink.js b/components/Frame/Popover/NavLink.js @@ -67,22 +67,17 @@ export const NavA = React.forwardRef(
transitionDelay: '33ms',
'@media (hover)': {
':hover': {
- color: colorScheme.getFormatCSSColor(formatColor)
+ color: colorScheme.getCSSColor(formatColor, 'format')
}
}
}),
[colorScheme, formatColor]
)
- const colorRule = useMemo(
- () =>
+ const colorRule =
isActive && activeFormatColor && formatColor
- ? css({
- color: colorScheme.getFormatCSSColor(formatColor)
- })
- : colorScheme.set('color', 'text'),
- [isActive, activeFormatColor, formatColor]
- )
+ ? colorScheme.set('color', formatColor, 'format')
+ : colorScheme.set('color', 'text')
return (
<a
| 4 |
diff --git a/bake.html b/bake.html <head>
<title>Webaverse Model Baker</title>
<link rel=stylesheet type='text/css' href="index.css">
+ <style>
+ #textarea {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ width: 400px;
+ height: 200px;
+ }
+ #textarea.hidden {
+ display: none;
+ }
+ </style>
</head>
<body>
+<textarea class=hidden id=textarea></textarea>
+
<script src="./bin/geometry.js"></script>
<script type=module>
import * as THREE from './three.module.js';
});
const size = arrayBuffer.byteLength;
- console.log('got', {numOldMeshes, numOldMaterials, numOldTriangles, numOldTextures}, {numMeshes, numMaterials, numTriangles, numTextures, size}, {geometries, materials, arrayBuffer});
+ const statsSpec = {numOldMeshes, numOldMaterials, numOldTriangles, numOldTextures, numMeshes, numMaterials, numTriangles, numTextures, size};
+ console.log('got', statsSpec, {geometries, materials, arrayBuffer});
+
+ const textarea = document.getElementById('textarea');
+ textarea.value = JSON.stringify(statsSpec, null, 2);
+ textarea.classList.remove('hidden');
/* for (const {from, to} of replacementMeshes) {
console.log('replacing', from, to);
| 0 |
diff --git a/docs/introduction.md b/docs/introduction.md @@ -47,7 +47,7 @@ const nextState = produce(baseState, draftState => {
})
```
-The interesting thing about Immer is that the `baseState` will be untouched, but the `nextState` will a new immutable tree that reflects all changes made to `draftState` (and strucurally sharing the things that weren't changed).
+The interesting thing about Immer is that the `baseState` will be untouched, but the `nextState` will be a new immutable tree that reflects all changes made to `draftState` (and structurally sharing the things that weren't changed).
Head to the [next section](produce) to further dive into `produce`.
| 7 |
diff --git a/docs/blog/2018-03-06-to-2018-03-20.md b/docs/blog/2018-03-06-to-2018-03-20.md @@ -4,7 +4,7 @@ Sprint of March 6 - 20, 2018
Welcome to the first of a regular bi-monthly Voyager update! The Cosmos Voyager team plans out a number of new features and bug fixes to be accomplished every two weeks. This update will give you an executive summary of the improvements and fixes.
## Additions
-* We welcomed David "NodeGuy" Braun to our team.
+* We welcomed David "NodeGuy" Braun to our team. David previously worked at Monax.
* We defined the required features of the Voyager MVP.
* We defined the primary customers of the Voyager MVP -- investors and crypto beginners.
* We were blocked by gaia-2 stability issues, so we rebuilt the mock server so that developers and users can test Voyager without a testnet.
| 3 |
diff --git a/articles/libraries/auth0js/migration-guide.md b/articles/libraries/auth0js/migration-guide.md @@ -16,7 +16,7 @@ Take a look below for more information about changes and additions to auth0.js i
Initialization of auth0.js in your application will now use `auth0.WebAuth` instead of `Auth0`
```html
-<script src="https://cdn.auth0.com/js/auth0/8.0.4/auth0.min.js"></script>
+<script src="https://cdn.auth0.com/js/auth0/8.1.0/auth0.min.js"></script>
<script type="text/javascript">
var webAuth = new auth0.WebAuth({
domain: 'YOUR_AUTH0_DOMAIN',
@@ -31,13 +31,15 @@ The `login` method of version 7 was divided into several different methods in ve
### webAuth.authorize()
-The `authorize` method can be used for logging in users via the [Hosted Login Page](/libraries/auth0js#hosted-login-page), or via social connections, as exhibited below. The default behavior for `authorize` is redirect, but popup can be specified.
+The `authorize` method can be used for logging in users via the [Hosted Login Page](/libraries/auth0js#hosted-login-page), or via social connections, as exhibited below.
For hosted login, one must call the authorize endpoint
```js
-webAuth.authorize({ //Any additional options can go here });
+webAuth.authorize({
+ //Any additional options can go here
+});
```
For social logins, the connection will need to be specified
@@ -48,10 +50,16 @@ webAuth.authorize({
});
```
+### webAuth.popup.authorize()
+
+For popup authentication, the `popup.authorize` method can be used.
+
Hosted login with popup
```js
-webAuth.popup.authorize({ //Any additional options can go here });
+webAuth.popup.authorize({
+ //Any additional options can go here
+});
```
And social login with popup
@@ -62,9 +70,9 @@ webAuth.popup.authorize({
});
```
-### webAuth.loginWithCredentials()
+### webAuth.redirect.loginWithCredentials()
-To login with credentials to enterprise connections, the `loginWithCredentials` method is used. Redirect or popup should be specified.
+To login with credentials to enterprise connections, the `redirect.loginWithCredentials` method is used.
With redirect
@@ -77,7 +85,9 @@ webAuth.redirect.loginWithCredentials({
});
```
-Or with popup
+### webAuth.popup.loginWithCredentials()
+
+Or, popup authentication can be performed with `popup.loginWithCredentials`.
```js
webAuth.popup.loginWithCredentials({
| 3 |
diff --git a/html/settings/_settings.scss b/html/settings/_settings.scss @@ -495,7 +495,7 @@ $sprk-border-radius: 5px !default;
/// Value for border-radius on the Alert component.
$sprk-alert-border-radius: 4px !default;
/// Value for border on the Alert component.
-$sprk-alert-border: 1px solid $sprk-gray !default;
+$sprk-alert-border: 2px solid $sprk-gray !default;
/// Value for shadow on the Alert component.
$sprk-alert-shadow: 0 3px 10px 1px rgba(0, 0, 0, 0.08) !default;
/// Value for color of the Alert component.
@@ -530,27 +530,27 @@ $sprk-alert-dismiss-icon-size: $sprk-space-m !default;
/// The icon color of the Information Alert component.
$sprk-alert-icon-color-info: $sprk-blue !default;
/// The border value of the Information Alert component.
-$sprk-alert-border-info: 1px solid $sprk-blue !default;
+$sprk-alert-border-info: 2px solid $sprk-blue !default;
/// The background color of the Information Alert component.
-$sprk-alert-bg-color-info: rgb(241, 250, 255) !default;
+$sprk-alert-bg-color-info: $sprk-alert-bg-color !default;
/// The value for the color property in the Information Alert component.
$sprk-alert-text-color-info: $sprk-black !default;
// Success
/// The icon color of the Success Alert component.
$sprk-alert-icon-color-success: $sprk-green !default;
/// The border value of the Success Alert component.
-$sprk-alert-border-success: 1px solid $sprk-green !default;
+$sprk-alert-border-success: 2px solid $sprk-green !default;
/// The background color of the Success Alert component.
-$sprk-alert-bg-color-success: rgb(237, 253, 251) !default;
+$sprk-alert-bg-color-success: $sprk-alert-bg-color !default;
/// The value for the color property in the Success Alert component.
$sprk-alert-text-color-success: $sprk-black !default;
// Fail
/// The icon color of the Fail Alert component.
-$sprk-alert-icon-color-fail: $sprk-yellow !default;
+$sprk-alert-icon-color-fail: $sprk-pink !default;
/// The border value of the Fail Alert component.
-$sprk-alert-border-fail: 1px solid $sprk-yellow !default;
+$sprk-alert-border-fail: 2px solid $sprk-pink !default;
/// The background color of the Fail Alert component.
-$sprk-alert-bg-color-fail: rgb(255, 248, 232) !default;
+$sprk-alert-bg-color-fail: $sprk-alert-bg-color !default;
/// The value for the color property in the Fail Alert component.
$sprk-alert-text-color-fail: $sprk-black !default;
| 3 |
diff --git a/src/redux/studio-comment-actions.js b/src/redux/studio-comment-actions.js @@ -3,7 +3,7 @@ const eachLimit = require('async/eachLimit');
const api = require('../lib/api');
const log = require('../lib/log');
-const COMMENT_LIMIT = 25;
+const COMMENT_LIMIT = 20;
const {
addNewComment,
| 13 |
diff --git a/examples/README.md b/examples/README.md [code-splitting-specify-chunk-name](code-splitting-specify-chunk-name)
-[move-to-parent](move-to-parent)
-
-[multiple-commons-chunks](multiple-commons-chunks)
-
-[multiple-entry-points-commons-chunk-css-bundle](multiple-entry-points-commons-chunk-css-bundle)
-
[named-chunks](named-chunks) example demonstrating merging of chunks with named chunks
[two-explicit-vendor-chunks](two-explicit-vendor-chunks)
## CommonJS
[commonjs](commonjs) example demonstrating a very simple program
-## Css Bundle
-[css-bundle](css-bundle)
-
-[multiple-entry-points-commons-chunk-css-bundle](multiple-entry-points-commons-chunk-css-bundle)
-
## DLL
[dll](dll)
| 2 |
diff --git a/.github/workflows/actions/android-pre-build/action.yml b/.github/workflows/actions/android-pre-build/action.yml @@ -11,7 +11,6 @@ runs:
- uses: actions/checkout@v2
- name: Git branch name
id: git-branch-name
- shell: bash
uses: EthanSK/git-branch-name-action@v1
- name: Detect and set target branch
run: |
@@ -32,6 +31,7 @@ runs:
echo "APPCENTER_NAME=GoodDollar/GoodDollar-Android-staging" >> $GITHUB_ENV
echo "APPCENTER_TOKEN=${{ secrets.APPCENTER_ANDROID_STAGING }}" >> $GITHUB_ENV
echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_STAGING }}" >> $GITHUB_ENV
+ shell: bash
- name: Pre-checks - Env is PROD
if: ${{ env.TARGET_BRANCH == 'next' }}
run: |
@@ -40,6 +40,7 @@ runs:
echo "APPCENTER_NAME=GoodDollar/GoodDollar-Android-production" >> $GITHUB_ENV
echo "APPCENTER_TOKEN=${{ secrets.APPCENTER_ANDROID_PROD }}" >> $GITHUB_ENV
echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_PROD }}" >> $GITHUB_ENV
+ shell: bash
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
@@ -59,3 +60,4 @@ runs:
echo "$SENTRYRC" > android/sentry.properties
echo "${{ secrets[env.SECRET_NAME] }}" >> .env.$env_name
echo "REACT_APP_CODE_PUSH_KEY=${{ env.APPCENTER_CODEPUSH_TOKEN }}" >> .env.$env_name
+ shell: bash
| 0 |
diff --git a/components/bases-locales/validator/report/summary/issues-sumup.js b/components/bases-locales/validator/report/summary/issues-sumup.js @@ -7,10 +7,6 @@ import theme from '@/styles/theme'
import IssueRows from './issue-rows'
-const isFloatNumber = value => {
- return value % 1 !== 0
-}
-
function IssuesSumup({issues, issueType, totalRowsCount, handleSelect}) {
const issuesRows = Object.keys(issues).map(issue => {
return issues[issue]
@@ -21,7 +17,7 @@ function IssuesSumup({issues, issueType, totalRowsCount, handleSelect}) {
const issuesGroupedByLine = groupBy(issuesFlatten, 'line')
const issuesCount = Object.keys(issuesGroupedByLine).length
const percentageIssues = (issuesCount * 100) / totalRowsCount
- const percentageRounded = isFloatNumber(percentageIssues) ? percentageIssues.toFixed(2) : percentageIssues
+ const percentageRounded = Number.isInteger(percentageIssues) ? percentageIssues : percentageIssues.toFixed(2)
return (
<div className='issues-container'>
| 14 |
diff --git a/src/pages/settings/Profile/LoginField.js b/src/pages/settings/Profile/LoginField.js @@ -101,9 +101,10 @@ class LoginField extends Component {
/>
</View>
) : (
- <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.pt]}>
+ <View style={[styles.mt2]}>
<Text style={[styles.textLabelSupporting]}>{this.props.label}</Text>
- <Text style={[styles.mt1]} numberOfLines={1}>
+ <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.pt]}>
+ <Text numberOfLines={1}>
{this.props.type === CONST.LOGIN_TYPE.PHONE
? this.props.toLocalPhone(this.props.login.partnerUserID)
: this.props.login.partnerUserID}
@@ -121,6 +122,7 @@ class LoginField extends Component {
))}
/>
</View>
+ </View>
)}
</View>
)}
| 7 |
diff --git a/lib/apollo/apolloLink.js b/lib/apollo/apolloLink.js -import { ApolloLink } from '@apollo/client'
+import { ApolloLink, HttpLink } from '@apollo/client'
import { WebSocketLink } from '@apollo/client/link/ws'
import { API_URL, API_WS_URL, API_AUTHORIZATION_HEADER } from '../constants'
@@ -7,7 +7,6 @@ import {
inNativeAppBrowserLegacy
} from '../withInNativeApp'
import { createAppWorkerLink, hasSubscriptionOperation } from './appWorkerLink'
-import { BatchHttpLink } from '@apollo/client/link/batch-http'
const withResponseInterceptor = ({ onResponse }) =>
new ApolloLink((operation, forward) => {
@@ -40,7 +39,7 @@ export const createLink = (headers = {}, onResponse = () => {}) => {
if (inNativeAppBrowser && inNativeAppBrowserLegacy) {
return createAppWorkerLink()
}
- const http = new BatchHttpLink({
+ const http = new HttpLink({
uri: rewriteAPIHost(API_URL),
credentials: 'include',
headers: {
| 14 |
diff --git a/plugins/identity/app/controllers/identity/projects_controller.rb b/plugins/identity/app/controllers/identity/projects_controller.rb @@ -174,7 +174,7 @@ module Identity
end
def update_cost_control_wizard_status
- billing_data = service_user.domain_admin_service(:cost_control).find_project_masterdata(@scoped_project_id)
+ billing_data = service_user.domain_admin_service(:cost_control).find_project_masterdata(@scoped_project_id) rescue nil
if billing_data and billing_data.cost_object_id
@project_profile.update_wizard_status(
'cost_control',
| 8 |
diff --git a/sirepo/package_data/template/opal/examples/lcls-gun.json b/sirepo/package_data/template/opal/examples/lcls-gun.json "interpl": "LINEAR",
"itsolver": "CG",
"maxiters": 100,
- "mt": 32,
+ "mt": 14,
"mx": 8,
"my": 8,
"name": "FS_SC",
"y2": "#varepsilon y",
"y3": "#varepsilon z"
},
- "rpnCache": {
- "(Edes + EMASS) / EMASS": 1.0000027397318179,
- "250.0*1e-12": 2.5e-10,
- "Edes": 1.4e-09,
- "P0": 1.1961600796052967e-06,
- "SFB": 0.243,
- "beam_bunch_charge": 2.5e-10,
- "beam_current": 713999625,
- "beta": 0.00234082060771566,
- "gamma": 1.0000027397318179,
- "gamma * beta * EMASS": 1.1961600796052967e-06,
- "n_particles": 10000,
- "rf_freq": 2855998500000,
- "rf_freq*beam_bunch_charge*1e6": 713999625,
- "sqrt(1 - (1 / pow(gamma, 2)))": 0.00234082060771566
- },
"rpnVariables": [
{
"name": "beam_bunch_charge",
},
{
"name": "n_particles",
- "value": 10000
+ "value": 1000
},
{
"name": "P0",
| 1 |
diff --git a/src/mixins/linkConfig.js b/src/mixins/linkConfig.js @@ -44,7 +44,6 @@ export default {
line: { stroke: '#5096db' },
'.joint-highlight-stroke': { 'display': 'none' },
});
- this.shapeView.showTools();
} else {
resetShapeColor(this.shape);
this.shapeView.hideTools();
| 2 |
diff --git a/.github/workflows/compressed-size.yml b/.github/workflows/compressed-size.yml @@ -53,4 +53,4 @@ jobs:
pattern: './dist/assets/**/*.{css,js}'
# The sub-match below will be replaced by asterisks.
# The length of 20 corresponds to webpack's `output.hashDigestLength`.
- strip-hash: "\\-([a-f0-9]{20})\\.(?:css|js)$"
+ strip-hash: "([a-f0-9]{20})\\.(?:css|js)$"
| 2 |
diff --git a/lib/assets/core/test/spec/cartodb3/editor/editor-pane.spec.js b/lib/assets/core/test/spec/cartodb3/editor/editor-pane.spec.js @@ -246,36 +246,6 @@ describe('editor/editor-pane', function () {
});
});
- describe('add button', function () {
- beforeEach(function () {
- this.widgetDefModel = new WidgetDefinitionModel({
- type: 'formula',
- title: 'formula example',
- layer_id: 'l-1',
- column: 'areas',
- operation: 'avg',
- order: 0
- }, {
- configModel: this.configModel,
- mapId: 'm-123'
- });
- });
-
- it('should be displayed when there are items on the selected tab', function () {
- expect(this.view.$('.js-add').hasClass('is-hidden')).toBeTruthy();
-
- this.widgetDefinitionsCollection.add(this.widgetDefModel);
-
- expect(this.view.$('.js-add').hasClass('is-hidden')).toBeFalsy();
- });
-
- it('should be hidden when an item is removed', function () {
- this.widgetDefinitionsCollection.add(this.widgetDefModel);
- this.widgetDefinitionsCollection.reset([]);
- expect(this.view.$('.js-add').hasClass('is-hidden')).toBeTruthy();
- });
- });
-
describe('max layers', function () {
var otherLayer = new LayerDefinitionModel({
id: 'l-2',
| 2 |
diff --git a/lib/modules/apostrophe-pieces-pages/index.js b/lib/modules/apostrophe-pieces-pages/index.js @@ -267,7 +267,12 @@ module.exports = {
return callback(null);
}
var cursor = self.indexCursor(req);
- return cursor.previous(doc).toObject(function(err, _previous) {
+ return cursor.previous(doc)
+ .applyFilters(
+ typeof(self.options.previous) === 'object' ?
+ self.options.previous : {}
+ )
+ .toObject(function(err, _previous) {
if (err) {
return callback(err);
}
@@ -284,11 +289,17 @@ module.exports = {
return callback(null);
}
var cursor = self.indexCursor(req);
- return cursor.next(doc).toObject(function(err, _next) {
+ return cursor.next(doc)
+ .applyFilters(
+ typeof(self.options.next) === 'object' ?
+ self.options.next : {}
+ )
+ .toObject(function(err, _next) {
if (err) {
return callback(err);
}
next = _next;
+ console.log(next);
return callback(null);
});
}
| 11 |
diff --git a/docs/README.md b/docs/README.md @@ -37,7 +37,7 @@ You can also watch some popular mermaid tutorials on the [mermaid Overview](./n0
## [New Mermaid Live-Editor Beta](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ)
-## [New Configuration Protocols in version 8.6.0](https://github.com/NeilCuzon/mermaid/edit/develop/docs/8.6.0_docs.md)
+## [New Configuration Protocols in version 8.6.0](./8.6.0_docs.md)
## New diagrams in 8.5
| 1 |
diff --git a/sdk/src/classes.js b/sdk/src/classes.js @@ -23,7 +23,13 @@ F2.extend('', {
* @method init
* @optional
*/
- init:function() {}
+ init:function() {},
+ /**
+ * An optional destroy function that will automatically be called when
+ * F2.{{#crossLink "F2\removeApp"}}{{/crossLink}} and subsequently
+ * the {{#crossLink "F2.Constants.AppHandlers\APP_DESTROY"}} AppHandler.
+ */
+ destroy:function() {}
};
},
/**
| 3 |
diff --git a/backend/routes/domains.js b/backend/routes/domains.js @@ -6,6 +6,7 @@ const { hasNS, verifyDNS } = require('../utils/dns')
const { decryptConfig } = require('../utils/encryptedConfig')
const { Network, ShopDeployment, ShopDomain } = require('../models')
const { ShopDomainStatuses } = require('../utils/enums')
+const { DEFAULT_INFRA_RESOURCES } = require('../utils/const')
const { authSellerAndShop, authRole } = require('./_auth')
@@ -57,7 +58,9 @@ module.exports = function (router) {
networkConfig,
shop: req.shop,
deployment: deployments[0],
- domains
+ domains,
+ resourceSelection:
+ networkConfig.defaultResourceSelection || DEFAULT_INFRA_RESOURCES
})
}
}
| 12 |
diff --git a/plugins/dnswl.js b/plugins/dnswl.js @@ -26,7 +26,7 @@ exports.load_dnswl_ini = function () {
if (plugin.cfg.main.stats_redis_host) {
plugin.redis_host = plugin.cfg.main.stats_redis_host;
- plugin.logdebug('set stats redis host to: ' + plugin.redis_host);
+ plugin.logdebug(`set stats redis host to: ${plugin.redis_host}`);
}
plugin.zones = [];
@@ -54,8 +54,7 @@ exports.hook_connect = function (next, connection) {
}
plugin.first(connection.remote.ip, plugin.zones, (err, zone, a) => {
if (!a) return next();
- connection.loginfo(plugin, connection.remote.ip +
- ' is whitelisted by ' + zone + ': ' + a);
+ connection.loginfo(plugin, `${connection.remote.ip} is whitelisted by ${zone}: ${a}`);
connection.notes.dnswl = true;
return next(OK);
});
| 14 |
diff --git a/config/redirect-urls.json b/config/redirect-urls.json {
"from": "/libraries/lock-ios/use-your-own-ui",
"to": "/libraries/lock-ios/v1/use-your-own-uis"
+ },
+ {
+ "from": "/quickstart/native/chrome-extension",
+ "to": "/quickstart/native/chrome"
}
-
]
| 0 |
diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js @@ -595,15 +595,27 @@ ScatterGl.scene = function getScene(container, subplot) {
// make sure canvas is clear
scene.clear = function clear() {
- var vpSize = layout._size, width = layout.width, height = layout.height;
- var vp = [
+ var vpSize = layout._size, width = layout.width, height = layout.height, vp, gl, regl;
+ var xaxis = subplot.xaxis;
+ var yaxis = subplot.yaxis;
+
+ // multisubplot case
+ if(xaxis && xaxis.domain && yaxis && yaxis.domain) {
+ vp = [
+ vpSize.l + xaxis.domain[0] * vpSize.w,
+ vpSize.b + yaxis.domain[0] * vpSize.h,
+ (width - vpSize.r) - (1 - xaxis.domain[1]) * vpSize.w,
+ (height - vpSize.t) - (1 - yaxis.domain[1]) * vpSize.h
+ ];
+ }
+ else {
+ vp = [
vpSize.l,
vpSize.b,
(width - vpSize.r),
(height - vpSize.t)
];
-
- var gl, regl;
+ }
if(scene.select2d) {
regl = scene.select2d.regl;
| 9 |
diff --git a/src/components/ProductItem/ProductItem.js b/src/components/ProductItem/ProductItem.js @@ -67,7 +67,6 @@ class ProductItem extends Component {
renderProductImage() {
const {
classes: { img, imgLoading, loadingIcon },
- product: { description },
theme: { breakpoints: { values } }
} = this.props;
const { hasImageLoaded } = this.state;
@@ -91,7 +90,7 @@ class ProductItem extends Component {
<img
className={img}
src={this.buildImgUrl(primaryImage.URLs.small)}
- alt={description}
+ alt=""
onLoad={this.onImageLoad}
ref={(image) => {
if (image && image.complete) this.onImageLoad();
| 12 |
diff --git a/scss/form/_input.scss b/scss/form/_input.scss @@ -32,15 +32,15 @@ $siimple-input-radius: $siimple-default-border-radius;
outline: 0px;
background-color: siimple-default-color("light");
vertical-align: top;
-
+ //Fluid input
&--fluid {
- width: 100%;
+ width: calc(100% - 2*#{$siimple-input-padding});
}
-
+ //Light input
&--light {
background-color: $siimple-default-white;
}
-
+ //Dark input
&--dark {
background-color: siimple-default-color("dark");
color: $siimple-default-white;
| 1 |
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml @@ -54,3 +54,11 @@ jobs:
--platform linux/amd64,linux/arm64,linux/arm/v7 \
--tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-relay:${{ env.RELEASE_TAG }}" \
--output "type=registry" ./
+ - name: Run Docker buildx with latest tag
+ run: |
+ docker buildx build \
+ --cache-from "type=local,src=/tmp/.buildx-cache" \
+ --cache-to "type=local,dest=/tmp/.buildx-cache" \
+ --platform linux/amd64,linux/arm64,linux/arm/v7 \
+ --tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-relay:latest" \
+ --output "type=registry" ./
| 0 |
diff --git a/lib/carto/tracking/services/pubsub_tracker.rb b/lib/carto/tracking/services/pubsub_tracker.rb @@ -43,9 +43,7 @@ class PubSubTracker
result = topic.publish(event, attributes)
- if result
- CartoDB::Logger.info(message: "PubSubTracker: event #{event} published to #{topic.name}")
- else
+ unless result
CartoDB::Logger.error(message: "PubSubTracker: error publishing to topic #{topic.name} for event #{event}")
end
| 2 |
diff --git a/packages/sling-web-component-form/src/component/Form.js b/packages/sling-web-component-form/src/component/Form.js @@ -90,13 +90,15 @@ export class Form extends withEventDispatch(HTMLElement) {
field.id;
}
- static async getFieldError(field) {
- if (isFunction(field.validation)) {
+ static async getFieldError(field, customValidationFn) {
+ const validationFn = customValidationFn || field.validation;
+
+ if (isFunction(validationFn)) {
let error;
const fieldId = this.getFieldId(field);
try {
- error = await Promise.resolve(field.validation(field.value));
+ error = await Promise.resolve(validationFn(field.value));
} catch (err) {
error = (err.constructor === Error) ? err.message : err;
}
@@ -212,7 +214,7 @@ export class Form extends withEventDispatch(HTMLElement) {
this.dispatchFormUpdate();
}
- async validateField(fieldId) {
+ async validateField(fieldId, customValidationFn) {
const field = this.fields
.find(fi => this.constructor.getFieldId(fi) === fieldId);
@@ -220,7 +222,8 @@ export class Form extends withEventDispatch(HTMLElement) {
this.updateIsValidating(true);
this.dispatchFormUpdate();
- const error = await this.constructor.getFieldError(field);
+ const error = await this.constructor
+ .getFieldError(field, customValidationFn);
this.state = setIn(this.state, 'errors', {
...this.state.errors,
| 11 |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml @@ -73,5 +73,6 @@ jobs:
- name: update release changelog
run: |
yarn update-release-changelog
+ git add semcore/ui/CHANGELOG.add
git commit -m "Automatically updated @semcore/ui changelog"
git push
| 0 |
diff --git a/bin/serverless.js b/bin/serverless.js 'use strict';
-const autocomplete = require('../lib/utils/autocomplete');
-const BbPromise = require('bluebird');
-const logError = require('../lib/classes/Error').logError;
-const uuid = require('uuid');
-const initializeErrorReporter = require('../lib/utils/sentry').initializeErrorReporter;
-
const userNodeVersion = Number(process.version.split('.')[0].slice(1));
// only check for components if user is running Node 8
@@ -18,6 +12,13 @@ if (userNodeVersion >= 8) {
return;
}
}
+
+const autocomplete = require('../lib/utils/autocomplete');
+const BbPromise = require('bluebird');
+const logError = require('../lib/classes/Error').logError;
+const uuid = require('uuid');
+const initializeErrorReporter = require('../lib/utils/sentry').initializeErrorReporter;
+
Error.stackTraceLimit = Infinity;
if (process.env.SLS_DEBUG) {
// For performance reasons enabled only in SLS_DEBUG mode
| 7 |
diff --git a/packages/imba/src/compiler/nodes.imba1 b/packages/imba/src/compiler/nodes.imba1 @@ -3851,7 +3851,8 @@ export class Func < Code
let name = @context.node.@className
if name and STACK.tsc
# console.log 'inext',@context.node.@className
- o.push('@this { this & ' + name.c + ' }')
+ # o.push('@this { this & ' + name.c + ' }')
+ o.push('@this { ' + name.c + ' }')
elif option(:jsdocthis)
o.push('@this { ' + option(:jsdocthis) + ' }')
| 7 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.36.0",
+ "version": "0.36.1",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/README.md b/README.md @@ -130,7 +130,7 @@ equivalent to these of a direct one-to-one WebRTC call. This is what's unique to
Jitsi Meet in terms of security.
The [meet.jit.si](https://meet.jit.si) service is maintained by the Jitsi team
-at [Atlassian](https://atlassian.com).
+at [8x8](https://8x8.com).
## Mobile app
Jitsi Meet is also available as a React Native app for Android and iOS.
| 14 |
diff --git a/src/client/js/components/Admin/Notification/NotificationDeleteModal.jsx b/src/client/js/components/Admin/Notification/NotificationDeleteModal.jsx @@ -2,34 +2,32 @@ import React from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from 'react-i18next';
-import Modal from 'react-bootstrap/es/Modal';
+import {
+ Modal, ModalHeader, ModalBody, ModalFooter,
+} from 'reactstrap';
class NotificationDeleteModal extends React.PureComponent {
render() {
const { t, notificationForConfiguration } = this.props;
return (
- <Modal show={this.props.isOpen} onHide={this.props.onClose}>
- <Modal.Header className="modal-header" closeButton>
- <Modal.Title>
- <div className="modal-header bg-danger">
+ <Modal isOpen={this.props.isOpen} toggle={this.props.onClose}>
+ <ModalHeader toggle={this.props.onClose} className="modal-header" closeButton>
<i className="icon icon-fire"></i> Delete Global Notification Setting
- </div>
- </Modal.Title>
- </Modal.Header>
- <Modal.Body>
+ </ModalHeader>
+ <ModalBody>
<p>
{t('notification_setting.delete_notification_pattern_desc1', { path: notificationForConfiguration.triggerPath })}
</p>
<span className="text-danger">
{t('notification_setting.delete_notification_pattern_desc2')}
</span>
- </Modal.Body>
- <Modal.Footer className="text-right">
+ </ModalBody>
+ <ModalFooter className="text-right">
<button type="button" className="btn btn-sm btn-danger" onClick={this.props.onClickSubmit}>
<i className="icon icon-fire"></i> {t('Delete')}
</button>
- </Modal.Footer>
+ </ModalFooter>
</Modal>
);
}
| 14 |
diff --git a/README.md b/README.md -Activity
-====
+# Activity
We are developing a tool for humanitarians to manage project activities and indicator results across their programs, including approval workflows and reporting and visualizations. Our goal is to help organizations answer common questions such as:
-* who are funding your projects?
-* who you work with?
-* where you work?
-* how do my outputs align with my overall project goal?
+
+- who are funding your projects?
+- who you work with?
+- where you work?
+- how do my outputs align with my overall project goal?
<!-- ## Configuration
Copy the activity/settings/local-sample.py to local.py and modify for your environment.
@@ -41,14 +41,17 @@ See [these instructions for installing known dependencies](#install-non-python-d
Navigate to the folder you want the repository to be stored in.
Run the following command:
+
```bash
$ git clone --branch dev https://github.com/hikaya-io/Activity.git
```
Once cloned, navigate to the cloned repository with:
+
```bash
$ cd Activity
```
+
or similar.
## Install virtualenv
@@ -62,8 +65,9 @@ $ pip install virtualenv
```bash
$ virtualenv --no-site-packages <myvirtualenvironmentname>
```
-* use no site packages to prevent virtualenv from seeing your global packages
-* . <myvirtualenvironmentname>/bin/activate allows us to just use pip from the command-line by adding to the path rather then full path.
+
+- use no site packages to prevent virtualenv from seeing your global packages
+- . <myvirtualenvironmentname>/bin/activate allows us to just use pip from the command-line by adding to the path rather then full path.
## Activate virtualenv
@@ -80,11 +84,13 @@ $ pip install -r requirements.txt
## Create local copy of config file
Copy the example config:
+
```bash
$ cp activity/settings/local-sample.py activity/settings/local.py
```
## Modify the config file
+
Edit database settings activity/settings/local.py as shown below.
We will change the `ENGINE` parameter to the default value for postgres (although you can also user MySQL or Sqllite3 which is out-of-the-box supported by Django). We also need to add a default database name in the `NAME` option.
@@ -110,7 +116,7 @@ Since postgres is the preferred database for this project, we have provided extr
$ python manage.py migrate
```
-## Create super user (first run only)
+## Create super user (first time only)
```bash
$ python manage.py createsuperuser
@@ -119,17 +125,19 @@ $ python manage.py createsuperuser
# Run the app locally
If you're using more then one settings file change manage.py to point to local or dev file first.
+
```bash
$ python manage.py runserver
```
-<!-- ## GOOGLE API
-```bash
-$ sudo pip install --upgrade google-api-python-client
-``` -->
-
This will run the server on http://127.0.0.1:8000. You can configure the host and port as needed.
+# Create an activity user
+
+Once you have created your user account, you need to create an `activity user` that is linked to this user account.
+
+Go to http://127.0.0.1:8000/admin and sign in using your superuser account. Under the `workflow` model, you'll find `activity user`. Create a new activity user making sure you associate your user under the `user` attribute.
+
# Extra information
## Install non-python dependencies
@@ -137,6 +145,7 @@ This will run the server on http://127.0.0.1:8000. You can configure the host an
1. **GDAL**
On mac:
+
```bash
$ brew install gdal
```
@@ -144,6 +153,7 @@ $ brew install gdal
2. **pango**
On mac:
+
```bash
$ brew install pango
```
@@ -153,6 +163,7 @@ $ brew install pango
### Install
On mac:
+
```bash
$ brew update
$ brew install postgresql
@@ -177,20 +188,25 @@ If you get access denied, it means you need to modify the config file and write
### Path issue
To fix any issues related to your path that may come up during the django set up, run:
+
```bash
$ export PATH=$PATH:/usr/local/mysql/bin
```
+
or specify the path you have to your installed mysql_config file in the bin folder of mysql
If you want this environment variable to be automatically set, please include it in your bash_profile or bashrc file.
### Django settings file
+
Replace user and password by your Mysql username and password
### Set up Django's MySQL backing store
+
```sql
CREATE DATABASE 'activity';
CREATE USER 'root';
GRANT ALL ON activity.* TO 'root'@'localhost' IDENTIFIED BY 'root';
```
-*NB:* When you use these SQL queries, beware of not writing the quotes.
+
+_NB:_ When you use these SQL queries, beware of not writing the quotes.
| 3 |
diff --git a/src/traces/pie/plot.js b/src/traces/pie/plot.js @@ -334,7 +334,11 @@ module.exports = function plot(gd, cdpie) {
s.attr('data-notex', 1);
});
- titleText.text(trace.title.text)
+ var txt = fullLayout.metatext ?
+ Lib.templateString(trace.title.text, {metatext: fullLayout.metatext}) :
+ trace.title.text;
+
+ titleText.text(txt)
.attr({
'class': 'titletext',
transform: '',
@@ -467,6 +471,8 @@ function determineInsideTextFont(trace, pt, layoutFont) {
}
function prerenderTitles(cdpie, gd) {
+ var fullLayout = gd._fullLayout;
+
var cd0, trace;
// Determine the width and height of the title for each pie.
for(var i = 0; i < cdpie.length; i++) {
@@ -474,9 +480,13 @@ function prerenderTitles(cdpie, gd) {
trace = cd0.trace;
if(trace.title.text) {
+ var txt = fullLayout.metatext ?
+ Lib.templateString(trace.title.text, {metatext: fullLayout.metatext}) :
+ trace.title.text;
+
var dummyTitle = Drawing.tester.append('text')
.attr('data-notex', 1)
- .text(trace.title.text)
+ .text(txt)
.call(Drawing.font, trace.title.font)
.call(svgTextUtils.convertToTspans, gd);
var bBox = Drawing.bBox(dummyTitle.node(), true);
| 0 |
diff --git a/src/containers/catalog/withCatalogItems.js b/src/containers/catalog/withCatalogItems.js import React from "react";
+import { inject, observer } from "mobx-react";
import { Query } from "react-apollo";
-import primaryShopIdQuery from "../common-gql/primaryShopId.gql";
import catalogItemsQuery from "./catalogItems.gql";
/**
@@ -10,14 +10,11 @@ import catalogItemsQuery from "./catalogItems.gql";
* @returns {React.Component} - component decorated with primaryShopId and catalog as props
*/
export default (Component) => (
+ @inject("primaryShopId")
+ @observer
class CatalogItems extends React.Component {
render() {
- return (
- <Query query={primaryShopIdQuery}>
- {({ loading, data }) => {
- if (loading) return null;
-
- const { primaryShopId } = data || {};
+ const { primaryShopId } = this.props || {};
return (
<Query query={catalogItemsQuery} variables={{ shopId: primaryShopId, first: 25 }}>
@@ -32,9 +29,6 @@ export default (Component) => (
}}
</Query>
);
- }}
- </Query>
- );
}
}
);
| 2 |
diff --git a/generators/server/prompts.js b/generators/server/prompts.js @@ -341,10 +341,6 @@ function askForServerSideOpts(meta) {
this.prodDatabaseType = 'cassandra';
this.enableHibernateCache = false;
}
- // Hazelcast is mandatory for Gateways, as it is used for rate limiting
- if (this.cacheProvider !== 'memcached' && this.applicationType === 'gateway' && this.serviceDiscoveryType) {
- this.cacheProvider = 'hazelcast';
- }
done();
});
}
| 2 |
diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js @@ -117,6 +117,7 @@ const ReportActionItemFragment = (props) => {
}
return (
<Text
+ family="EMOJI_TEXT_FONT"
selectable={!canUseTouchScreen() || !props.isSmallScreenWidth}
style={[EmojiUtils.containsOnlyEmojis(text) ? styles.onlyEmojisText : undefined, styles.ltr]}
>
| 4 |
diff --git a/build/check.py b/build/check.py @@ -236,6 +236,7 @@ def check_eslint_disable(_):
for rule in disabled:
logging.error('%s:%d Rule %r still disabled at end of file',
rel_path, i + 1, rule)
+ has_error = True
return not has_error
| 1 |
diff --git a/tests/functional/jaws/pom.xml b/tests/functional/jaws/pom.xml <id>central</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
- <url>http://repo1.maven.org/maven2</url>
+ <url>https://repo1.maven.org/maven2</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<pluginRepository>
<id>central</id>
<name>Maven Plugin Repository</name>
- <url>http://repo1.maven.org/maven2</url>
+ <url>https://repo1.maven.org/maven2</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
| 12 |
diff --git a/tests/e2e/plugins/site-verification-api-mock.php b/tests/e2e/plugins/site-verification-api-mock.php @@ -29,6 +29,8 @@ add_action( 'rest_api_init', function () {
REST_Routes::REST_ROOT,
'modules/site-verification/data/verification',
array(
+ array(
+ 'methods' => WP_REST_Server::READABLE,
'callback' => function () {
return array(
'type' => 'SITE',
@@ -37,14 +39,8 @@ add_action( 'rest_api_init', function () {
);
}
),
- true
- );
-
- register_rest_route(
- REST_Routes::REST_ROOT,
- 'modules/site-verification/data/verification',
array(
- 'methods' => 'POST',
+ 'methods' => WP_REST_Server::CREATABLE,
'callback' => function ( WP_REST_Request $request ) {
$data = $request->get_param( 'data' );
@@ -61,6 +57,7 @@ add_action( 'rest_api_init', function () {
);
}
),
+ ),
true
);
| 3 |
diff --git a/src/js/controllers/tab-scan.controller.js b/src/js/controllers/tab-scan.controller.js @@ -25,6 +25,10 @@ angular
var qrPermissionResult = {
denied: 'PERMISSION_DENIED',
granted: 'PERMISSION_GRANTED',
+
+ // iOS
+ restricted: 'PERMISSION_RESTRICTED',
+ notDetermined: 'PERMISSION_NOT_DETERMINED'
};
var scannerStates = {
@@ -149,7 +153,7 @@ angular
function onCheckPermissionSuccess(result) {
console.log('onPermissionSuccess() ', result);
isCheckingPermissions = false;
- if (result === qrPermissionResult.granted) {
+ if (result === qrPermissionResult.granted || result === qrPermissionResult.notDetermined) {
_startReading();
} else {
$scope.currentState = scannerStates.denied;
| 9 |
diff --git a/lib/carto/dbdirect/certificate_manager.rb b/lib/carto/dbdirect/certificate_manager.rb @@ -20,15 +20,7 @@ end
module Carto
module Dbdirect
-
- SEP = '-----END CERTIFICATE-----'.freeze
-
- # TODO: this uses aws cli at the moment.
- # if having it installed in the hosts is not convenient we could
- # switch to use some aws-sdk-* gem
-
# Private CA certificate manager for dbdirect
- # requirements: openssl, aws cli v2 installed in the system
module CertificateManager
module_function
| 2 |
diff --git a/src/botPage/view/blockly/blocks/trade/components.js b/src/botPage/view/blockly/blocks/trade/components.js @@ -85,7 +85,7 @@ export const barrierOffset = block => {
) {
const barrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE');
barrierOffsetList.setValue('+');
- barrierValue.setFieldValue('0.274', 'NUM');
+ barrierValue.setFieldValue('0.27', 'NUM');
barrierValue.setShadow(true);
barrierValue.outputConnection.connect(block.getInput('BARRIEROFFSET').connection);
barrierValue.initSvg();
@@ -110,7 +110,7 @@ export const secondBarrierOffset = block => {
) {
const secondBarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE');
barrierOffsetList.setValue('-');
- secondBarrierValue.setFieldValue('0.274', 'NUM');
+ secondBarrierValue.setFieldValue('0.27', 'NUM');
secondBarrierValue.setShadow(true);
secondBarrierValue.outputConnection.connect(block.getInput('SECONDBARRIEROFFSET').connection);
secondBarrierValue.initSvg();
| 12 |
diff --git a/packages/idyll-cli/test/basic-project/test.js b/packages/idyll-cli/test/basic-project/test.js @@ -141,16 +141,18 @@ test('should include components configured in package.json', () => {
expect(Object.keys(output.components)).toContain('package-json-component-test');
})
-test('Idyll getComponents() gets all components', () => {
- var defaultComponentsDirectory = __dirname + '/../../../idyll-components/src/'; //__dirname exists
+// This tests for just the *default* components being in getComponents
+test('Idyll getComponents() gets all default components', () => {
+ var defaultComponentsDirectory = __dirname + '/../../../idyll-components/src/';
var idyll = Idyll({});
var idyllComponents = idyll.getComponents();
- var i = 0;
+ var componentPaths = [];
+ // Only grab the file names
+ idyllComponents.forEach(comp => {
+ componentPaths.push(comp.name);
+ });
+ // Ensure that the getComponents() have all of the default component file names
fs.readdirSync(defaultComponentsDirectory).forEach(file => {
- expect(file).toEqual(idyllComponents[i].name);
- i = i + 1;
+ expect(componentPaths).toContain(file + "");
})
- // for (var i = 0; i < components.length; i++) {
- // expect(defaultComponentsDirectoryFiles[i]).toEqual(idyllComponents[i].name);
- // }
})
| 3 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -11,20 +11,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Integration with Canvas Learning Management System (LMS) -- an early example implementation
- Tags to questions in Content Designer and ability to create reports in Kibana.
- Integration with Genesys call center platform.
-- Bot routing capability to have multiple-bot architecture (e.g., General bot routing questions to specialty bots).
+- Client Filtering with Session Attributes (i.e., Support to allow the same set of questions to be answered differently based on a session attribute)
- Intelligent redaction of Personally Identifiable Information in logs with Amazon Comprehend.
-- Override qnabot's internal user id by passing qnabotUserId as session attribute
+- A QnABot client (e.g. a Connect contact flow) can now optionally provide a value for session attribute, `qnabotUserId`. When this session attribute is set, QnABot tracks user activity based on the provided value. If not set, QnABot continues to track user activity based on the request userId (LexV1) or sessionId (LexV2). NOTE: `qnabotUserId` value is not used when user authentication using JWTs is enabled - in this case users are securely identified and verified from the JWT.
- Support for pre and post processing AWS Lambda Hooks.
### Fixed
-- Test tab in Content Designer to show same results as the web client.
+- Test tab in Content Designer to show same results as the web client when using Kendra FAQ.
- Broken link in documentation for downloading CloudFormation template.
- Integration with Slack on Amazon LexV2 bots.
-- Bug with response bots with Alexa. QnABot will set the sessionAttribute from CONNECT_NEXT_PROMPT_VARNAME to an empty string if QnABot is in a response bot in a voice channel
-
+- Bug with response bots with Alexa. QnABot will set the sessionAttribute from CONNECT_NEXT_PROMPT_VARNAME to an empty string if QnABot is in a response bot in a voice channel. This will prevent QnABot from saying the next prompt in the middle of a response bot flow.
### Changed
-- Client Filtering with Session Attributes (i.e., Support to allow the same set of questions to be answered differently based on a session attribute)
+- Bot routing capability to have multiple-bot architecture (e.g., General bot routing questions to specialty bots).
## [5.0.1] - 2021-10-20
| 3 |
diff --git a/token-metadata/0xE54f9E6Ab80ebc28515aF8b8233c1aeE6506a15E/metadata.json b/token-metadata/0xE54f9E6Ab80ebc28515aF8b8233c1aeE6506a15E/metadata.json "symbol": "PASTA",
"address": "0xE54f9E6Ab80ebc28515aF8b8233c1aeE6506a15E",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php @@ -62,7 +62,9 @@ final class Analytics extends Module implements Module_With_Screen, Module_With_
add_filter(
'option_' . self::OPTION,
function( $option ) {
- $option = (array) $option;
+ if ( ! is_array( $option ) ) {
+ $option = array();
+ }
/**
* Filters the Google Analytics account ID to use.
@@ -112,6 +114,11 @@ final class Analytics extends Module implements Module_With_Screen, Module_With_
$option['profileID'] = $profile_id;
}
+ // Disable tracking for logged-in users unless enabled via settings.
+ if ( ! isset( $option['trackingDisabled'] ) ) {
+ $option['trackingDisabled'] = array( 'loggedinUsers' );
+ }
+
return $option;
}
);
@@ -644,9 +651,10 @@ final class Analytics extends Module implements Module_With_Screen, Module_With_
case 'tracking-disabled':
return function() {
$option = $this->options->get( self::OPTION );
- $exclusions = isset( $option['trackingDisabled'] ) ? $option['trackingDisabled'] : array();
+ $default = array( 'loggedinUsers' );
+ $exclusions = isset( $option['trackingDisabled'] ) ? $option['trackingDisabled'] : $default;
- return is_array( $exclusions ) ? $exclusions : array();
+ return is_array( $exclusions ) ? $exclusions : $default;
};
case 'goals':
$connection = $this->get_data( 'connection' );
| 4 |
diff --git a/lib/formatting.js b/lib/formatting.js @@ -761,7 +761,7 @@ const $to = {
return raw ? s : wrapText(safeText(s));
},
number: num => {
- if (isFinite(num)) {
+ if (Number.isFinite(num)) {
return num.toString();
}
// Converting NaN/+Infinity/-Infinity according to Postgres documentation:
| 4 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.