code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/js/feature/featureTrack.js b/js/feature/featureTrack.js @@ -157,44 +157,43 @@ var igv = (function (igv) {
bpStart = options.bpStart,
pixelWidth = options.pixelWidth,
pixelHeight = options.pixelHeight,
- bpEnd = bpStart + pixelWidth * bpPerPixel + 1;
+ bpEnd = bpStart + pixelWidth * bpPerPixel + 1,
+ selectedFeatureName,
+ selectedFeature,
+ c;
igv.graphics.fillRect(ctx, 0, 0, pixelWidth, pixelHeight, {'fillStyle': "rgb(255, 255, 255)"});
if (featureList) {
+ selectedFeatureName = igv.FeatureTrack.selectedGene ? igv.FeatureTrack.selectedGene.toUpperCase() : undefined;
+
for (var gene, i = 0, len = featureList.length; i < len; i++) {
gene = featureList[i];
if (gene.end < bpStart) continue;
if (gene.start > bpEnd) break;
+
+ if(!selectedFeature && selectedFeatureName && selectedFeatureName === gene.name.toUpperCase()) {
+ selectedFeature = gene;
+ }
+ else {
track.render.call(this, gene, bpStart, bpPerPixel, pixelHeight, ctx, options);
}
}
+
+ if(selectedFeature) {
+ c = selectedFeature.color;
+ selectedFeature.color = "rgb(255,0,0)";
+ track.render.call(this, selectedFeature, bpStart, bpPerPixel, pixelHeight, ctx, options);
+ selectedFeature.color = c;
+ }
+ }
else {
console.log("No feature list");
}
};
- // igv.FeatureTrack.prototype.popupMenuItemList = function (config) {
- //
- // var $e,
- // clickHandler;
- //
- // $e = $('<div class="igv-track-menu-item">');
- //
- // $e.text('Feature Menu Item');
- //
- // clickHandler = function(){
- // var str = $(this).text() + ' bp ' + igv.numberFormatter(config.genomicLocation) + ' do stuff.';
- // config.popover.hide();
- //
- // console.log(str);
- // };
- //
- // return [{ name: undefined, object: $e, click: clickHandler, init: undefined }];
- //
- // };
igv.FeatureTrack.prototype.popupDataWithConfiguration = function (config) {
return this.popupData(config.genomicLocation, config.x, config.y, config.viewport.genomicState.referenceFrame)
| 11 |
diff --git a/index.js b/index.js @@ -15,7 +15,7 @@ electron.app.commandLine.appendSwitch("enable-transparent-visuals");
app.setPath("userData", path.join(app.getPath("cache"), app.name))
// Optional Features
-const customtitlebar = true // NOTE: Enables a custom macOS-isk titlebar instead of your respected platforms titlebars. Enable frame manually if disabled. (true by default)
+const customtitlebar = false // NOTE: Enables a custom macOS-isk titlebar instead of your respected platforms titlebars. (true by default)
const discordrpc = true // NOTE: Removes all Discord RPC when disabled. (true by default)
const showalbum = true // NOTE: Removes Album Name from Discord RPC when disabled (true by default)
const sitedetection = false // NOTE: Checks sites on startup if online when enabled. (false by default. can slow down start up performance)
@@ -34,7 +34,7 @@ isQuiting = !closebuttonminimize
function createWindow () {
if (sexytransparencymode === true) {
- win = new BrowserWindow({
+ win = new glasstron.BrowserWindow({
icon: path.join(__dirname, './assets/icon.png'),
width: 1024,
height: 600,
@@ -51,8 +51,10 @@ function createWindow () {
sandbox: true
}
})
+ win.blurType = "blurbehind";
+ win.setBlur(true);
} else {
- win = new glasstron.BrowserWindow({
+ win = new BrowserWindow({
icon: path.join(__dirname, './assets/icon.png'),
width: 1024,
height: 600,
@@ -69,11 +71,8 @@ function createWindow () {
sandbox: true
}
})
- win.blurType = "blurbehind";
- win.setBlur(true);
}
-
// Hide toolbar tooltips / bar
win.setMenuBarVisibility(false);
| 1 |
diff --git a/ui/src/components/DocumentViewer/TableViewer.jsx b/ui/src/components/DocumentViewer/TableViewer.jsx @@ -66,7 +66,7 @@ class TableViewer extends Component {
const value = _.get(result.results, [rowIndex, 'data', columnName], '');
return <Cell loading={loading}>
<TruncatedFormat detectTruncation={true}>
- {value}
+ {value || ''}
</TruncatedFormat>
</Cell>
}
| 14 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -20,7 +20,8 @@ import {web3} from './blockchain.js';
import {moduleUrls, modules} from './metaverse-modules.js';
import {componentTemplates} from './metaverse-components.js';
import postProcessing from './post-processing.js';
-import {makeId, getRandomString, getPlayerPrefix, memoize} from './util.js';
+import {getRandomString, memoize} from './util.js';
+import * as mathUtils from './math-utils.js';
import JSON6 from 'json-6';
import * as materials from './materials.js';
import * as geometries from './geometries.js';
@@ -751,9 +752,9 @@ metaversefile.setApi({
useAbis() {
return abis;
},
- /* useUi() {
- return ui;
- }, */
+ useMathUtils() {
+ return mathUtils;
+ },
useActivate(fn) {
const app = currentAppRender;
if (app) {
| 0 |
diff --git a/services/DemoDataGeneratorService.php b/services/DemoDataGeneratorService.php @@ -114,6 +114,9 @@ class DemoDataGeneratorService extends BaseService
INSERT INTO quantity_unit_conversions (from_qu_id, to_qu_id, factor, product_id) VALUES (3, 12, 10, 10);
INSERT INTO quantity_unit_conversions (from_qu_id, to_qu_id, factor, product_id) VALUES (3, 8, 1000, 22);
+ INSERT INTO quantity_unit_conversions (from_qu_id, to_qu_id, factor, product_id) VALUES (10, 9, 1, 23);
+ INSERT INTO quantity_unit_conversions (from_qu_id, to_qu_id, factor, product_id) VALUES (3, 8, 500, 6);
+ INSERT INTO quantity_unit_conversions (from_qu_id, to_qu_id, factor, product_id) VALUES (3, 8, 200, 18);
INSERT INTO quantity_unit_conversions (from_qu_id, to_qu_id, factor) VALUES (13, 8, 1000);
INSERT INTO quantity_unit_conversions (from_qu_id, to_qu_id, factor) VALUES (9, 11, 1000);
| 0 |
diff --git a/src/fonts.css b/src/fonts.css font-family: 'WinchesterCaps';
src: url('../public/fonts/WinchesterCaps.ttf');
}
+@font-face {
+ font-family: 'SF Movie Poster';
+ src: url('../public/fonts/SF Movie Poster.ttf');
+}
/* cards */
@font-face {
| 0 |
diff --git a/app/models/carto/oauth_app_user.rb b/app/models/carto/oauth_app_user.rb @@ -85,7 +85,7 @@ module Carto
def create_dataset_role
user.in_database(as: :superuser).execute("CREATE ROLE \"#{dataset_role_name}\" CREATEROLE")
rescue ActiveRecord::StatementInvalid => e
- raise OauthProvider::Errors::AccessDenied.new unless e.message =~ /already exist/
+ raise OauthProvider::Errors::ServerError.new unless e.message =~ /already exist/
end
def grant_dataset_role_privileges
@@ -100,7 +100,7 @@ module Carto
begin
user.in_database.execute(query)
rescue ActiveRecord::StatementInvalid
- raise OauthProvider::Errors::AccessDenied.new
+ raise OauthProvider::Errors::InvalidScope.new
end
end
end
| 4 |
diff --git a/modules/st2-api/api.js b/modules/st2-api/api.js @@ -192,7 +192,8 @@ export class API {
params: query,
headers,
transformResponse: [ function transformResponse(data, headers) {
- if (typeof data === 'string' && headers['content-type'] === 'application/json') {
+ if (typeof data === 'string' && headers['content-type'] &&
+ headers['content-type'].indexOf('application/json') >-1) {
try {
data = JSON.parse(data);
}
| 9 |
diff --git a/polyfills/structuredClone/tests.js b/polyfills/structuredClone/tests.js @@ -12,9 +12,17 @@ describe('structuredClone', function () {
var date = new Date();
+ var bi;
+ try {
+ bi = BigInt(1);
+ } catch (e){
+ //no BigInt support
+ bi = null;
+ }
+
var obj = {
arr: [],
- bigint: BigInt(1),
+ bigint: bi,
"boolean": true,
number: 123,
string: '',
@@ -28,7 +36,7 @@ describe('structuredClone', function () {
Str: new String(''),
re: new RegExp('test', 'gim'),
error: new Error('test'),
- BI: Object(BigInt(1)),
+ BI: Object(bi),
date: date
};
@@ -43,12 +51,14 @@ describe('structuredClone', function () {
proclaim.isInstanceOf(deserialized.Str, String);
proclaim.isInstanceOf(deserialized.re, RegExp);
proclaim.isInstanceOf(deserialized.error, Error);
- proclaim.isInstanceOf(deserialized.BI, BigInt);
proclaim.isInstanceOf(deserialized.date, Date);
+
+ if (bi){
+ proclaim.isInstanceOf(deserialized.BI, BigInt);
+ }
});
it('serializes values', function () {
- proclaim.equal(deserialized.bigint, BigInt(1));
proclaim.equal(deserialized.boolean, true);
proclaim.equal(deserialized.number, 123);
proclaim.equal(deserialized.string, '');
@@ -73,8 +83,12 @@ describe('structuredClone', function () {
proclaim.equal(deserialized.re.source, 'test');
proclaim.equal(deserialized.re.flags, 'gim');
proclaim.equal(deserialized.error.message, 'test');
- proclaim.equal(deserialized.BI.valueOf(), BigInt(1));
proclaim.equal(deserialized.date.toISOString(), date.toISOString());
+
+ if (bi) {
+ proclaim.equal(deserialized.bigint, bi);
+ proclaim.equal(deserialized.BI.valueOf(), bi);
+ }
});
it('preserves references', function () {
| 3 |
diff --git a/src/core/Translator.js b/src/core/Translator.js @@ -28,7 +28,7 @@ module.exports = class Translator {
this.opts = Object.assign({}, defaultOptions, opts)
this.locale = Object.assign({}, defaultOptions.locale, opts.locale)
- console.log(this.opts.locale)
+ // console.log(this.opts.locale)
// this.locale.pluralize = this.locale ? this.locale.pluralize : defaultPluralize
// this.locale.strings = Object.assign({}, en_US.strings, this.opts.locale.strings)
| 2 |
diff --git a/articles/protocols/saml/identity-providers/okta.md b/articles/protocols/saml/identity-providers/okta.md @@ -80,8 +80,4 @@ If a user is returned to the Okta dashboard after authenticating via Okta in a S
2. In the Okta configuration screen titled "(2) Configure SAML", click on "Show Advanced Settings" and check the option for "Request Compression". The Okta documentation indicates this should be checked if the value of this parameter is compressed. Some Okta users have reported it should be checked for HTTP Redirect binding and uncompressed for HTTP POST binding.
-## Next steps
-
-After you configure the connection, you have to configure your application to use it. You can initiate login using [Lock](/libraries/lock), [Auth0.js](/libraries/auth0js), or use the [Authentication API endpoint](/api/authentication?http#enterprise-saml-and-others-).
-
-For detailed instructions and samples for a variety of technologies, refer to our [Quickstarts](/quickstarts).
+<%= include('../../../connections/_quickstart-links.md') %>
| 14 |
diff --git a/lib/plugins/aws/deploy/lib/extendedValidate.js b/lib/plugins/aws/deploy/lib/extendedValidate.js @@ -30,7 +30,8 @@ module.exports = {
.join(this.serverless.config.servicePath, '.serverless', state.package.artifact);
}
- if (this.serverless.service.package.individually) {
+ if (!_.isEmpty(this.serverless.service.functions) &&
+ this.serverless.service.package.individually) {
// artifact file validation (multiple function artifacts)
this.serverless.service.getAllFunctions().forEach(functionName => {
const artifactFileName = this.provider.naming.getFunctionArtifactName(functionName);
@@ -40,7 +41,7 @@ module.exports = {
.Error(`No ${artifactFileName} file found in the package path you provided.`);
}
});
- } else {
+ } else if (!_.isEmpty(this.serverless.service.functions)) {
// artifact file validation (single service artifact)
const artifactFileName = this.provider.naming.getServiceArtifactName();
const artifactFilePath = path.join(this.packagePath, artifactFileName);
| 1 |
diff --git a/articles/flows/index.md b/articles/flows/index.md @@ -29,7 +29,7 @@ We support scenarios for server-side, mobile, desktop, client-side, machine-to-m
<li>
<i class="icon icon-budicon-715"></i><a href="/flows/concepts/auth-code">Authorization Code Flow</a>
<p>
- Because regular web apps are server-side apps where the source code is not publicly exposed, they can use the Authorization Code Flow (defined in defined in OAuth 2.0 RFC 6749, section 4.1), which exchanges an Authorization Code for a token.
+ Because regular web apps are server-side apps where the source code is not publicly exposed, they can use the Authorization Code Flow (defined in OAuth 2.0 RFC 6749, section 4.1), which exchanges an Authorization Code for a token.
</p>
<ul>
<li>
| 2 |
diff --git a/src/geo/Extent.js b/src/geo/Extent.js @@ -408,7 +408,7 @@ class Extent {
/**
* Combine it with another extent to a larger extent.
- * @param {Extent} extent - another extent
+ * @param {Extent|Coordinate|Point} extent - extent/coordinate/point to combine into
* @returns {Extent} extent combined
*/
combine(extent) {
| 3 |
diff --git a/lib/node_modules/@stdlib/ndarray/ctor/include/stdlib/ndarray/ctor.h b/lib/node_modules/@stdlib/ndarray/ctor/include/stdlib/ndarray/ctor.h * limitations under the License.
*/
-#ifndef STDLIB_NDARRAY_H
-#define STDLIB_NDARRAY_H
+#ifndef STDLIB_NDARRAY_CTOR_H
+#define STDLIB_NDARRAY_CTOR_H
#include <stdint.h>
#include "stdlib/ndarray/base/bytes_per_element.h"
@@ -575,4 +575,4 @@ int8_t stdlib_ndarray_iset_uint8( const struct ndarray *arr, const int64_t idx,
*/
int8_t stdlib_ndarray_iset_int8( const struct ndarray *arr, const int64_t idx, const int8_t v );
-#endif // !STDLIB_NDARRAY_H
+#endif // !STDLIB_NDARRAY_CTOR_H
| 10 |
diff --git a/articles/libraries/lock-android/configuration.md b/articles/libraries/lock-android/configuration.md @@ -8,6 +8,19 @@ description: Altering the appearance and behavior of Lock for Android
These are options that can be used to configure Lock for Android to your project's needs. **Note that if you are a user of Lock v1 who is now migrating to Lock v2**, you'll want to take note first of those [options that have been renamed or whose behavior have changed](/libraries/lock-android/migration-guide), and then look over the new list below, which contains quite a few options new to v2.
+Configurations options are added to the Lock Builder using the following format:
+
+```java
+ lock = Lock.newBuilder(auth0, callback)
+ // Configuration options
+ .closable(true)
+ .allowSignUp(false)
+ .setPrivacyURL('http://example.com/privacy')
+ .setTermsURL('http://example.com/terms')
+ // End configuration options
+ .build(this);
+```
+
## UI options
- **closable (boolean)**: Defines if the LockActivity can be closed. By default it's not closable.
| 0 |
diff --git a/source/offline/CacheManager.js b/source/offline/CacheManager.js @@ -23,6 +23,8 @@ const processResponse = (request, response) => {
return response;
};
+const removeSearch = (url) => url.replace(/[?].*$/, '');
+
class CacheManager {
constructor(rules) {
for (const key in rules) {
@@ -49,7 +51,10 @@ class CacheManager {
async getIn(cacheName, request) {
const rules = this.rules[cacheName];
const cache = await caches.open(cacheName);
- const cacheUrl = request.url
+ const cacheUrl =
+ rules && rules.ignoreSearch
+ ? removeSearch(request.url)
+ : request.url
.replace(bearerParam, '')
.replace(downloadParam, '');
const response = await cache.match(cacheUrl);
@@ -65,10 +70,13 @@ class CacheManager {
}
async fetchAndCacheIn(cacheName, request) {
- let url = request.url;
- if (request.mode === 'no-cors' || downloadParam.test(url)) {
- url = url.replace(downloadParam, '');
- request = new Request(url, {
+ const ignoreSearch = this.rules[cacheName].ignoreSearch;
+ const requestUrl = request.url;
+ let fetchUrl = ignoreSearch
+ ? removeSearch(requestUrl)
+ : requestUrl.replace(downloadParam, '');
+ if (request.mode === 'no-cors' || fetchUrl !== requestUrl) {
+ request = new Request(fetchUrl, {
mode: 'cors',
referrer: 'no-referrer',
});
@@ -76,8 +84,8 @@ class CacheManager {
let response = await fetch(request);
// Cache if valid
if (response && response.status === 200) {
- url = url.replace(bearerParam, '');
- this.setIn(cacheName, url, response.clone(), null);
+ fetchUrl = fetchUrl.replace(bearerParam, '');
+ this.setIn(cacheName, fetchUrl, response.clone(), null);
response = processResponse(request, response);
}
return response;
| 0 |
diff --git a/src/components/staking/components/ValidatorBox.js b/src/components/staking/components/ValidatorBox.js @@ -126,13 +126,13 @@ export default function ValidatorBox({
const { accountId: validatorId, current, next } = validator
const fee = validator.fee && validator.fee.percentage
const isCurrentOrNext = current || next
- const cta = amount ? <ChevronIcon/> : <FormButton className='gray-blue' linkTo={`/staking/${validator}`}><Translate id='staking.validatorBox.cta' /></FormButton>
+ const cta = amount ? <ChevronIcon/> : <FormButton className='gray-blue' linkTo={`/staking/${validatorId}`}><Translate id='staking.validatorBox.cta' /></FormButton>
return (
<Container
className='validator-box'
clickable={clickable && amount ? 'true' : ''}
style={style}
- onClick={() => { clickable && amount && dispatch(redirectTo(`/staking/${validator}`))}}
+ onClick={() => { clickable && amount && dispatch(redirectTo(`/staking/${validatorId}`))}}
>
{label && <div className='with'><Translate id='staking.validatorBox.with' /></div>}
<UserIcon/>
| 10 |
diff --git a/source/projects/mdBook.md b/source/projects/mdBook.md @@ -11,6 +11,7 @@ description: GitBook alternative implemented in Rust.
Create book or documentation from markdown files as with GitBook.
Highlights:
+
* Handlebars templates
* Math equations through [MathJax](https://www.mathjax.org/)
* Can be used as a library
| 1 |
diff --git a/detox/ios/Detox/GREYIdlingResourcePrettyPrint.m b/detox/ios/Detox/GREYIdlingResourcePrettyPrint.m self = [super init];
if(self)
{
- object = object;
+ self.object = object;
objc_setAssociatedObject(object, "__DTXDeallocSafeProxy", self, OBJC_ASSOCIATION_RETAIN);
}
return self;
@@ -161,7 +161,6 @@ NSDictionary* _prettyPrintAppStateTracker(GREYAppStateTracker* tracker)
id actualObject = actualElement.object;
if(actualObject == nil)
{
- NSLog(@"");
return;
}
| 1 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.49.2",
+ "version": "0.50.0",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/lib/contracts/compiler.js b/lib/contracts/compiler.js @@ -16,16 +16,13 @@ class Compiler {
let pluginCompilers = self.plugins.getPluginsProperty('compilers', 'compilers');
pluginCompilers.forEach(function (compilerObject) {
- if(!available_compilers[compilerObject.extension]){
- available_compilers[compilerObject.extension] = [];
- }
- available_compilers[compilerObject.extension].push(compilerObject.cb);
+ available_compilers[compilerObject.extension] = compilerObject.cb;
});
let compiledObject = {};
async.eachObject(available_compilers,
- function (extension, compilers, callback) {
+ function (extension, compiler, callback) {
let matchingFiles = contractFiles.filter(function (file) {
let fileMatch = file.filename.match(/\.[0-9a-z]+$/);
if (fileMatch && (fileMatch[0] === extension)) {
@@ -38,9 +35,6 @@ class Compiler {
if (!matchingFiles || !matchingFiles.length) {
return callback();
}
-
- let compiler = compilers[0];
-
compiler.call(compiler, matchingFiles, function (err, compileResult) {
Object.assign(compiledObject, compileResult);
callback(err, compileResult);
| 13 |
diff --git a/app/assets/javascripts/ang/templates/observation_search/filter_menu.html.haml b/app/assets/javascripts/ang/templates/observation_search/filter_menu.html.haml %input{ type: "hidden", name: "id" }
%input{ type: "hidden", name: "ident_taxon_id" }
%input{ type: "hidden", name: "ident_taxon_id_exclusive" }
+ %input{ type: "hidden", name: "ident_user_id" }
%input{ type: "hidden", name: "identified" }
%input{ type: "hidden", name: "lat" }
%input{ type: "hidden", name: "license" }
%input{ type: "hidden", name: "user_after" }
%input{ type: "hidden", name: "user_before" }
%input{ type: "hidden", name: "viewer_id" }
+ %input{ type: "hidden", name: "without_ident_user_id" }
%input{ type: "hidden", name: "without_taxon_id" }
%input{ type: "hidden", name: "without_term_id" }
%input{ type: "hidden", name: "year" }
| 11 |
diff --git a/src/video/webgl/compositor.js b/src/video/webgl/compositor.js /// define all vertex attributes
this.addAttribute("aVertex", VERTEX_SIZE, gl.FLOAT, false, VERTEX_OFFSET);
this.addAttribute("aColor", COLOR_SIZE, gl.FLOAT, false, COLOR_OFFSET);
- this.addAttribute("aTexture", TEXTURE_SIZE, gl.FLOAT, false, TEXTURE_OFFSET);
this.addAttribute("aRegion", REGION_SIZE, gl.FLOAT, false, REGION_OFFSET);
// Stream buffer
*/
useShader : function (shader) {
if (this.activeShader !== shader) {
- var gl = this.gl;
-
this.flush();
this.activeShader = shader;
this.activeShader.bind();
| 1 |
diff --git a/assets/scripts/lobby/sockets/game.js b/assets/scripts/lobby/sockets/game.js @@ -4,7 +4,7 @@ socket.on("update-room-players", function (data) {
console.log("update room players");
// showDangerAlert("Test");
-
+ oldData = roomPlayersData;
// var x = $("#typehead").parent().width();
roomPlayersData = data;
@@ -18,13 +18,13 @@ socket.on("update-room-players", function (data) {
// updateSpectatorsList();
draw();
- if(roomPlayersData && roomPlayersData.length < data.length && data.length > 1){
+ if(oldData && oldData.length < roomPlayersData.length && roomPlayersData.length > 1){
if($("#option_notifications_sound_players_joining_game")[0].checked === true){
playSound('ding');
}
if($("#option_notifications_desktop_players_joining_game")[0].checked === true){
- displayNotification("New player in game! [" + (data.length) + "p]", data[data.length - 1].username + " has joined the game!", "avatars/base-res.png", "newPlayerInGame");
+ displayNotification("New player in game! [" + (roomPlayersData.length) + "p]", roomPlayersData[roomPlayersData.length - 1].username + " has joined the game!", "avatars/base-res.png", "newPlayerInGame");
}
}
| 1 |
diff --git a/framer/SVGBaseLayer.coffee b/framer/SVGBaseLayer.coffee +{LayerStyle} = require "./LayerStyle"
{Layer, layerProperty} = require "./Layer"
{Color} = require "./Color"
@@ -7,7 +8,10 @@ originTransform = (value, layer, name) ->
when "originX" then sizeProp = "width"
when "originY" then sizeProp = "height"
return value unless sizeProp?
- return (layer[sizeProp] / layer.parent[sizeProp]) * value
+ layerSize = layer[sizeProp]
+ parentSize = layer.parent[sizeProp]
+ return value unless layerSize > 0 and parentSize > 0
+ return (layerSize / parentSize) * value
class exports.SVGBaseLayer extends Layer
# Overridden Layer properties
@@ -106,9 +110,7 @@ class exports.SVGBaseLayer extends Layer
for index in indicesToRemove.reverse()
@_element.transform.baseVal.removeItem(index)
- rect = @_element.getBoundingClientRect()
- @_width = rect.width / @_parent.canvasScaleX()
- @_height = rect.height / @_parent.canvasScaleY()
+ @calculateSize()
super(options)
@@ -128,6 +130,26 @@ class exports.SVGBaseLayer extends Layer
set: (value) ->
console.warn "The gradient property is currently not supported on shapes"
+ elementInsertedIntoDocument: ->
+ super
+ @calculateSize()
+ @recalculateOrigin()
+
+ calculateSize: ->
+ if Framer?.CurrentContext.elementInDOM
+ rect = @_element.getBoundingClientRect()
+ @_width = rect.width / @_parent.canvasScaleX()
+ @_height = rect.height / @_parent.canvasScaleY()
+ else
+ # No use in calculating, so set width and height to 0
+ @_width = 0
+ @_height = 0
+
+ recalculateOrigin: ->
+ @_properties.originX = originTransform(@originX, @, "originX")
+ @_properties.originY = originTransform(@originY, @, "originY")
+ @_element.style.webkitTransformOrigin = LayerStyle.webkitTransformOrigin(@)
+
resetViewbox: =>
@_svg.setAttribute("viewBox", "0,0,#{@width},#{@height}")
@_svg.removeAttribute("viewBox")
| 12 |
diff --git a/Gruntfile.js b/Gruntfile.js @@ -386,7 +386,11 @@ module.exports = function (grunt) {
'npm-build-static'
]);
- var releaseTasks = [
+ /**
+ * `grunt release`
+ * `grunt release --environment=production`
+ */
+ grunt.registerTask('release', [
'check_release',
'build-static',
'npm-build',
@@ -400,19 +404,7 @@ module.exports = function (grunt) {
's3:unversioned',
's3:static_pages',
'invalidate'
- ];
-
- // If the editor assets changed since the last tag we have to build & upload them
- if (EDITOR_ASSETS_CHANGED) {
- releaseTasks.splice(releaseTasks.indexOf('build-static'), 0, 'build-editor');
- releaseTasks.splice(releaseTasks.indexOf('s3:js'), 0, 's3:frozen');
- }
-
- /**
- * `grunt release`
- * `grunt release --environment=production`
- */
- grunt.registerTask('release', releaseTasks);
+ ]);
grunt.registerTask('release_editor_assets', 'builds & uploads editor assets', [
'build-editor',
| 2 |
diff --git a/samples/csharp_dotnetcore/57.teams-conversation-bot/Bots/TeamsConversationBot.cs b/samples/csharp_dotnetcore/57.teams-conversation-bot/Bots/TeamsConversationBot.cs @@ -158,7 +158,7 @@ private async Task DeleteCardActivityAsync(ITurnContext<IMessageActivity> turnCo
private async Task MessageAllMembersAsync(ITurnContext<IMessageActivity> turnContext, CancellationToken cancellationToken)
{
- var teamsChannelId = turnContext.Activity.TeamsGetChannelId();
+ var channelId = turnContext.Activity.ChannelId;
var serviceUrl = turnContext.Activity.ServiceUrl;
var credentials = new MicrosoftAppCredentials(_appId, _appPassword);
ConversationReference conversationReference = null;
@@ -179,7 +179,7 @@ private async Task MessageAllMembersAsync(ITurnContext<IMessageActivity> turnCon
await ((CloudAdapter)turnContext.Adapter).CreateConversationAsync(
credentials.MicrosoftAppId,
- teamsChannelId,
+ channelId,
serviceUrl,
credentials.OAuthScope,
conversationParameters,
| 1 |
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js @@ -118,7 +118,7 @@ class ReportActionCompose extends React.Component {
this.updateComment = this.updateComment.bind(this);
this.debouncedSaveReportComment = _.debounce(this.debouncedSaveReportComment.bind(this), 1000, false);
this.debouncedBroadcastUserIsTyping = _.debounce(this.debouncedBroadcastUserIsTyping.bind(this), 100, true);
- this.triggerShortcut = this.triggerShortcut.bind(this);
+ this.triggerHotkeyActions = this.triggerHotkeyActions.bind(this);
this.submitForm = this.submitForm.bind(this);
this.setIsFocused = this.setIsFocused.bind(this);
this.showEmojiPicker = this.showEmojiPicker.bind(this);
@@ -243,7 +243,7 @@ class ReportActionCompose extends React.Component {
*
* @param {Object} e
*/
- triggerShortcut(e) {
+ triggerHotkeyActions(e) {
if (e) {
// Submit the form when Enter is pressed
if (e.key === 'Enter' && !e.shiftKey) {
@@ -433,7 +433,7 @@ class ReportActionCompose extends React.Component {
placeholder={this.props.translate('reportActionCompose.writeSomething')}
placeholderTextColor={themeColors.placeholderText}
onChangeText={this.updateComment}
- onKeyPress={this.triggerShortcut}
+ onKeyPress={this.triggerHotkeyActions}
onDragEnter={() => this.setState({isDraggingOver: true})}
onDragLeave={() => this.setState({isDraggingOver: false})}
onDrop={(e) => {
| 10 |
diff --git a/core/bound_variable_reference.js b/core/bound_variable_reference.js @@ -153,10 +153,6 @@ Blockly.BoundVariableValueReference.prototype.setBoundValue = function(value) {
}
this.value_ = value;
value.storeReference(this);
- var valueTypeExpr = this.value_.getTypeExpr();
- if (!valueTypeExpr) {
- throw 'The type expression of a new value to refer to must be provided.';
- }
this.unifyTypeExpr();
this.referenceChange_();
| 11 |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on:
push:
jobs:
test:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-18.04
strategy:
fail-fast: false
matrix:
@@ -26,16 +26,16 @@ jobs:
- name: Setup
run: |
- wget -q https://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.6.tgz
- tar xf mongodb-linux-x86_64-ubuntu2004-4.4.6.tgz
+ wget -q http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.0.2.tgz
+ tar xf mongodb-linux-x86_64-ubuntu1804-4.0.2.tgz
mkdir -p ./data/db/27017 ./data/db/27000
printf "\n--timeout 8000" >> ./test/mocha.opts
- ./mongodb-linux-x86_64-ubuntu2004-4.4.6/bin/mongod --fork --dbpath ./data/db/27017 --syslog --port 27017
+ ./mongodb-linux-x86_64-ubuntu1804-4.0.2/bin/mongod --fork --dbpath ./data/db/27017 --syslog --port 27017
sleep 2
mongod --version
mkdir ./test/typescript/node_modules
ln -s `pwd` ./test/typescript/node_modules/mongoose
- echo `pwd`/mongodb-linux-x86_64-ubuntu2004-4.4.6/bin >> $GITHUB_PATH
+ echo `pwd`/mongodb-linux-x86_64-ubuntu1804-4.0.2/bin >> $GITHUB_PATH
- run: npm test
| 13 |
diff --git a/docs/guides/place-my-order.md b/docs/guides/place-my-order.md @@ -873,7 +873,7 @@ And in the order history template by updating `src/order/history.component` to:
@sourceref guides/place-my-order/steps/real-time/history.component
-First we import the order model and then just call `<order-model getList="{status='<status>'}">` for each order status. That's it. If we now open the [order page](http://localhost:8080/order-history) we see some already completed default orders. Keeping the page open and placing a new order from another browser or device will update our order page automatically.
+First we import the order model and then just call `<order-model get-list="{status='<status>'}">` for each order status. That's it. If we now open the [order page](http://localhost:8080/order-history) we see some already completed default orders. Keeping the page open and placing a new order from another browser or device will update our order page automatically.
## Create documentation
| 1 |
diff --git a/generators/generator-base-private.js b/generators/generator-base-private.js @@ -1305,7 +1305,7 @@ module.exports = class extends Generator {
}
/**
- * Decide the primary key type based on DB
+ * Return the primary key data type based on DB
*
* @param {any} databaseType - the database type
*/
@@ -1327,7 +1327,7 @@ module.exports = class extends Generator {
}
/**
- * Decide the primary key type based on authentication type, DB and given association
+ * Returns the primary key data type based on authentication type, DB and given association
*
* @param {string} authenticationType - the auth type
* @param {string} databaseType - the database type
| 7 |
diff --git a/includes/Context.php b/includes/Context.php namespace Google\Site_Kit;
+use AMP_Options_Manager;
use AMP_Theme_Support;
use Google\Site_Kit\Core\Util\Input;
use Google\Site_Kit\Core\Util\Entity;
@@ -357,6 +358,7 @@ final class Context {
return false;
}
+ if ( defined( 'AMP__VERSION' ) ) {
$amp_plugin_version = AMP__VERSION;
$amp_exposes_support_mode = defined( 'AMP_Theme_Support::STANDARD_MODE_SLUG' )
&& defined( 'AMP_Theme_Support::TRANSITIONAL_MODE_SLUG' )
@@ -367,19 +369,24 @@ final class Context {
}
$amp_plugin_version_2_or_higher = version_compare( $amp_plugin_version, '2.0.0', '>=' );
+ } else {
+ $amp_plugin_version_2_or_higher = false;
+ }
if ( $amp_plugin_version_2_or_higher ) {
- $exposes_support_mode = class_exists( 'AMP_Options_Manager' ) && method_exists( 'AMP_Options_Manager', 'get_option' )
+ $exposes_support_mode = class_exists( 'AMP_Options_Manager' )
+ && method_exists( 'AMP_Options_Manager', 'get_option' )
&& $amp_exposes_support_mode;
} else {
- $exposes_support_mode = method_exists( 'AMP_Theme_Support', 'get_support_mode' )
+ $exposes_support_mode = class_exists( 'AMP_Theme_Support' )
+ && method_exists( 'AMP_Theme_Support', 'get_support_mode' )
&& $amp_exposes_support_mode;
}
if ( $exposes_support_mode ) {
// If recent version, we can properly detect the mode.
if ( $amp_plugin_version_2_or_higher ) {
- $mode = \AMP_Options_Manager::get_option( 'theme_support' );
+ $mode = AMP_Options_Manager::get_option( 'theme_support' );
} else {
$mode = AMP_Theme_Support::get_support_mode();
}
| 7 |
diff --git a/packages/spark/tests/highligh-board.tests.js b/packages/spark/tests/highligh-board.tests.js @@ -6,20 +6,19 @@ const proxyquire = require('proxyquire');
describe('Highlight Board tests', () => {
let element;
- let highlightBoard;
- let objectFitImagesStub;
+ const objectFitImagesStub = sinon.spy();
+
+ const { highlightBoard } = proxyquire('../components/highlight-board', {
+ 'object-fit-images': objectFitImagesStub,
+ });
beforeEach(() => {
element = document.createElement('img');
element.classList.add('sprk-c-HighlightBoard__image');
- objectFitImagesStub = sinon.spy();
- highlightBoard = proxyquire('../highlight-board', {
- 'object-fit-images': objectFitImagesStub,
- });
});
it('should set up', () => {
- highlightBoard.default();
+ highlightBoard();
expect(objectFitImagesStub.calledOnce).eql(true);
});
});
| 3 |
diff --git a/src/scripts/interaction.js b/src/scripts/interaction.js @@ -877,6 +877,27 @@ function Interaction(parameters, player, previousState) {
return parameters.mainSummary === true;
};
+ /**
+ * Update video when user interacts with dot
+ */
+ self.selectDot = function () {
+ if (player.preventSkipping) {
+ return;
+ }
+
+ if (player.currentState === H5P.Video.VIDEO_CUED) {
+ player.play();
+ player.seek(parameters.duration.from);
+ }
+ else if (player.currentState === H5P.Video.PLAYING) {
+ player.seek(parameters.duration.from);
+ } else {
+ player.play(); // for updating the slider
+ player.seek(parameters.duration.from);
+ player.pause();
+ }
+ };
+
/**
* Create dot for displaying above the video timeline.
* Append to given container.
@@ -899,21 +920,10 @@ function Interaction(parameters, player, previousState) {
left: (parameters.duration.from * player.oneSecondInPercentage) + '%'
},
on: {
- click: function () {
- if (player.preventSkipping) {
- return;
- }
-
- if (player.currentState === H5P.Video.VIDEO_CUED) {
- player.play();
- player.seek(parameters.duration.from);
- }
- else if (player.currentState === H5P.Video.PLAYING) {
- player.seek(parameters.duration.from);
- } else {
- player.play(); // for updating the slider
- player.seek(parameters.duration.from);
- player.pause();
+ click: self.selectDot,
+ keypress: event => {
+ if(event.which === 13 || event.which === 32) {
+ self.selectDot();
}
}
}
| 9 |
diff --git a/src/og/control/DebugInfo.js b/src/og/control/DebugInfo.js * @module og/control/DebugInfo
*/
-'use strict';
+"use strict";
-import { Control } from './Control.js';
+import { Control } from "./Control.js";
/**
* Debug information
@@ -31,16 +31,19 @@ class DebugInfo extends Control {
addWatch(watch) {
this._watch.push(watch);
- let watchEl = document.createElement('div');
+ let watchEl = document.createElement("div");
watchEl.classList.add("og-watch-line");
- watchEl.innerHTML = '<div class="og-watch-label">' + watch.label + '</div><div class="og-watch-value"></div>';
+ watchEl.innerHTML =
+ '<div class="og-watch-label">' +
+ watch.label +
+ '</div><div class="og-watch-value"></div>';
watch.valEl = watchEl.querySelector(".og-watch-value");
this.el.appendChild(watchEl);
}
oninit() {
- this.el = document.createElement('div');
- this.el.className = 'og-debug-info';
+ this.el = document.createElement("div");
+ this.el.className = "og-debug-info";
var temp = this._watch;
this._watch = [];
for (var i = 0; i < temp.length; i++) {
@@ -52,56 +55,84 @@ class DebugInfo extends Control {
let p = this.planet;
if (p) {
- this.addWatches([{
+ this.addWatches([
+ {
label: "Nodes count",
frame: () => p._renderedNodes.length
- }, {
+ },
+ {
label: "createdNodes",
frame: () => p._createdNodesCount
- }, {
+ },
+ {
label: "indexesCache",
frame: () => p._indexesCacheToRemoveCounter
- }, {
+ },
+ {
label: "distBeforeMemClear",
- frame: () => p._distBeforeMemClear
- }, {
+ frame: () => Math.round(p._distBeforeMemClear)
+ },
+ {
label: "maxZoom/minZoom",
- frame: () => p.maxCurrZoom + '/' + p.minCurrZoom
- }, {
+ frame: () => p.maxCurrZoom + " / " + p.minCurrZoom
+ },
+ {
label: "height/alt (km)",
- frame: () => (p.camera._lonLat.height / 1000.0).toFixed(2) + '/' + (p.camera.getAltitude() / 1000.0).toFixed(2)
- }, {
+ frame: () =>
+ `<div style="width:190px">${
+ (p.camera._lonLat.height / 1000.0).toFixed(2) +
+ " / " +
+ (p.camera.getAltitude() / 1000.0).toFixed(2)
+ }</div>`
+ },
+ {
label: "cam.slope",
- frame: () => p.camera.slope
- }, {
+ frame: () => p.camera.slope.toFixed(3)
+ },
+ {
label: "lodRatio",
- frame: () => p._lodRatio
- }, {
- label: "deltaTime",
- frame: () => p.renderer.handler.deltaTime
- }, {
+ frame: () => p._lodRatio.toFixed(3)
+ },
+ {
+ label: "deltaTime/FPS",
+ frame: () =>
+ `<div style="width:70px"><div style="width:20px; float: left;">${Math.round(
+ p.renderer.handler.deltaTime
+ )}</div> <div style="float: left">${Math.round(
+ 1000.0 / p.renderer.handler.deltaTime
+ )}</div></div>`
+ },
+ {
label: "-------------------------"
- }, {
+ },
+ {
label: "PlainWorker",
frame: () => p._plainSegmentWorker._pendingQueue.length
- }, {
+ },
+ {
label: "TileLoader",
- frame: () => p._tileLoader._loading + ' ' + p._tileLoader._queue.length
- }, {
+ frame: () => p._tileLoader._loading + " " + p._tileLoader._queue.length
+ },
+ {
label: "TerrainLoader",
frame: () => {
if (p.terrain && p.terrain._loader) {
- return p.terrain._loader._loading + ' ' + p.terrain._loader._queue.length;
+ return (
+ p.terrain._loader._loading + " " + p.terrain._loader._queue.length
+ );
}
- return '';
+ return "";
}
- }, {
+ },
+ {
label: "TerrainWorker",
frame: () => p._terrainWorker._pendingQueue.length
- }, {
+ },
+ {
label: "NormalMapCreator",
frame: () => p._normalMapCreator._queue.length
- }]);
+ }
+ ]);
}
}
@@ -111,10 +142,10 @@ class DebugInfo extends Control {
w.valEl.innerHTML = w.frame ? w.frame() : "";
}
}
-};
+}
export function debugInfo(options) {
return new DebugInfo(options);
-};
+}
export { DebugInfo };
| 0 |
diff --git a/docs/user-guide/faq.md b/docs/user-guide/faq.md # FAQ
-## How do I disable a rule?
+## How do I turn off, disable or ignore a rule?
-You can disable a rule by setting its config value to `null`.
+You can turn off a rule by setting its config value to `null`.
For example, to use `stylelint-config-standard` without the `at-rule-empty-line-before` rule:
@@ -15,7 +15,7 @@ For example, to use `stylelint-config-standard` without the `at-rule-empty-line-
}
```
-You can also disable a rule for specific sections of your CSS. Refer to the rules section of the [configuration guide](configuration.md#rules) for more information.
+You can also turn off a rule for specific sections of your CSS. Refer to the rules section of the [configuration guide](configuration.md#rules) for more information.
## How do I lint from the command line?
| 7 |
diff --git a/.circleci/test.sh b/.circleci/test.sh @@ -66,7 +66,7 @@ case $1 in
set_tz
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky | circleci tests split))
- MAX_AUTO_RETRY=5
+ MAX_AUTO_RETRY=4
for s in ${SHARDS[@]}; do
retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI --showSkipped
done
| 12 |
diff --git a/test/property.html b/test/property.html <div property="MyConstant" mv-mode="read">Constant, this must be saved but not be editable.</div>
<div property="NormalProperty">Normal property, must be editable and saveable.</div>
<div property="alwaysEdited" mv-mode="edit">Always edited property.</div>
- <div property="WithExpression" mv-mode="if(true, 'read', 'edit')">This is also constant.</div>
+ <div property="WithExpression" mv-mode="[if(true, 'read', 'edit')]">This is also constant.</div>
</section>
| 1 |
diff --git a/.github/workflows/tidelift-alignment.yml b/.github/workflows/tidelift-alignment.yml name: Tidelift Alignment
on:
- pull_request:
- # paths:
- # - 'package.json'
push:
- # branches:
- # - master
- # paths:
- # - 'package.json'
+ branches:
+ - master
+ paths:
+ - 'package.json'
schedule:
- cron: '0 0 * * *' # every day at midnight
-permissions:
- contents: read
jobs:
build:
| 13 |
diff --git a/src/apps.json b/src/apps.json "cookies": {
"phpbb": ""
},
- "html": "(?:Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=\\.copyright|\\tphpBB style name|<[^>]+styles/(?:sub|pro)silver/theme|<img[^>]+i_icon_mini|<table class=\"forumline)",
+ "html": [
+ "Powered by <a[^>]+phpBB",
+ "<div class=phpbb_copyright>",
+ "<[^>]+styles/(?:sub|pro)silver/theme",
+ "<img[^>]+i_icon_mini",
+ "<table class=\"[^\"]*forumline"
+ ],
"icon": "phpBB.png",
"implies": "PHP",
"js": {
| 7 |
diff --git a/src/core/operations/ParseSSHHostKey.mjs b/src/core/operations/ParseSSHHostKey.mjs @@ -80,6 +80,13 @@ class ParseSSHHostKey extends Operation {
* @returns {byteArray}
*/
convertKeyToBinary(inputKey, inputFormat) {
+ const keyPattern = new RegExp(/^(?:[ssh]|[ecdsa-sha2])\S+\s+(\S*)/),
+ keyMatch = inputKey.match(keyPattern);
+
+ if (keyMatch) {
+ inputKey = keyMatch[1];
+ }
+
if (inputFormat === "Auto") {
inputFormat = this.detectKeyFormat(inputKey);
}
| 0 |
diff --git a/config/vars.yml b/config/vars.yml -lock_url: 'https://cdn.auth0.com/js/lock/11.0.1/lock.min.js'
+lock_url: 'https://cdn.auth0.com/js/lock/11.2.0/lock.min.js'
lock_urlv10: 'https://cdn.auth0.com/js/lock/10.24.1/lock.min.js'
-lock_urlv11: 'https://cdn.auth0.com/js/lock/11.0.1/lock.min.js'
+lock_urlv11: 'https://cdn.auth0.com/js/lock/11.2.0/lock.min.js'
lock_passwordless_url: 'https://cdn.auth0.com/js/lock-passwordless-2.2.min.js'
auth0js_url: 'https://cdn.auth0.com/js/auth0/9.0.1/auth0.min.js'
auth0js_urlv9: 'https://cdn.auth0.com/js/auth0/9.0.1/auth0.min.js'
| 3 |
diff --git a/articles/universal-login/guardian.md b/articles/universal-login/guardian.md @@ -26,6 +26,22 @@ If you'd like to revert to an earlier design, you have two options:
Please note that Hosted Pages work without customization (Auth0 will also update the included scripts as required). However, once you toggle the customization to **on**, you are responsible for the updating and maintaining the script (including changing version numbers, such as that for the MFA widget), since Auth0 can no longer update it automatically.
+## Configuration Options
+
+### defaultLocation
+
+```js
+return new Auth0MFAWidget({
+
+...
+
+ defaultLocation : ['United Kingdom', 'GB', '+44'],
+
+...
+
+})
+```
+
## Theming Options
There are a few theming options for MFA-Widget, namespaced under the `theme` property.
@@ -35,9 +51,17 @@ There are a few theming options for MFA-Widget, namespaced under the `theme` pro
The value for `icon` is the URL for an image that will be used in the MFA-Widget header, which defaults to the Auth0 logo. It has a recommended max height of `58px` for a better user experience.
```js
+return new Auth0MFAWidget({
+
+...
+
theme: {
icon: 'https://example.com/assets/logo.png'
},
+
+...
+
+})
```
### primaryColor
@@ -45,10 +69,18 @@ The value for `icon` is the URL for an image that will be used in the MFA-Widget
The `primaryColor` property defines the primary color of the MFA-Widget. This option is useful when providing a custom `icon`, to ensure all colors go well together with the `icon`'s color palette. Defaults to `#ea5323`.
```js
+return new Auth0MFAWidget({
+
+...
+
theme: {
icon: 'https://example.com/assets/logo.png',
primaryColor: 'blue'
},
+
+...
+
+})
```
## Rendering "Invited Enrollments" vs. Standard Scenarios
| 3 |
diff --git a/source/touch/itemListTouchSelect.js b/source/touch/itemListTouchSelect.js /*global document */
import { linear } from '../animation/Easing.js';
-import { nearest } from '../dom/Element.js';
import { cancel, invokeAfterDelay } from '../foundation/RunLoop.js';
import { getViewFromNode } from '../views/activeViews.js';
import { ScrollView } from '../views/containers/ScrollView.js';
import { RootView } from '../views/RootView.js';
import { ViewEventsController } from '../views/ViewEventsController.js';
+import { CheckboxView } from '../views/controls/CheckboxView.js';
const IDLE = 0;
const DETECT = 1;
@@ -313,12 +313,7 @@ const itemListTouchSelect = {
if (
numTouches === 2 ||
(view.get('selection').get('length') &&
- nearest(
- event.target,
- (node) =>
- node.classList.contains('app-listItem-box'),
- event.targetView.get('layer'),
- ))
+ event.targetView instanceof CheckboxView)
) {
this.goDetect(event, view);
}
| 2 |
diff --git a/dapp/src/components/GetOUSD.js b/dapp/src/components/GetOUSD.js @@ -39,7 +39,7 @@ const GetOUSD = ({
mixpanel.track('Get OUSD', {
source: trackSource,
})
- const provider = providerName()
+ const provider = providerName() || ''
if (
provider.match(
'coinbase|imtoken|cipher|alphawallet|gowallet|trust|status|mist|parity'
| 9 |
diff --git a/app/modules/main/containers/Sections/Overview/Sidebar/Backup.js b/app/modules/main/containers/Sections/Overview/Sidebar/Backup.js @@ -50,12 +50,23 @@ class OverviewSidebarBackupContainer extends Component<Props> {
render() {
const {
- settings
+ buttonOnly,
+ settings,
} = this.props;
const {
lastBackupDate,
lastBackupInvalidated,
} = settings;
+ const button = (
+ <Button
+ color="purple"
+ content="Backup"
+ icon="save"
+ onClick={this.backup}
+ size="tiny"
+ />
+ );
+ if (buttonOnly) return button;
return (
<React.Fragment>
<Segment color="purple" textAlign="center">
@@ -72,13 +83,7 @@ class OverviewSidebarBackupContainer extends Component<Props> {
: 'Never'
}
</Header>
- <Button
- color="purple"
- content="Backup"
- icon="save"
- onClick={this.backup}
- size="tiny"
- />
+ {button}
</Segment>
</React.Fragment>
);
| 11 |
diff --git a/closure/goog/delegate/delegateregistry.js b/closure/goog/delegate/delegateregistry.js @@ -34,7 +34,7 @@ class Registration {
/**
* The registered delegate constructor. Exactly one of `instance` or
* `ctor` must be provided.
- * @type {function(new: T)|undefined}
+ * @type {function(new: T, ...?)|undefined}
*/
this.ctor;
/**
@@ -95,7 +95,7 @@ class DelegateRegistryBase {
/**
* Returns the first (highest priority) registered delegate, or undefined
* if none was registered.
- * @param {(function(function(new: T)): T)=} instantiate A function to
+ * @param {(function(function(new: T, ...?)): T)=} instantiate A function to
* instantiate constructors registered with `registerClass`. By default,
* this just calls the constructor with no arguments.
* @return {T|undefined}
@@ -114,7 +114,7 @@ class DelegateRegistryBase {
* of any registered classes. The `instantiate` argument can be passed to
* override how constructors are called. The array will be frozen in debug
* mode.
- * @param {(function(function(new: T)): T)=} instantiate A function to
+ * @param {(function(function(new: T, ...?)): T)=} instantiate A function to
* instantiate constructors registered with `registerClass`. By default,
* this just calls the constructor with no arguments.
* @return {!Array<T>}
@@ -128,7 +128,7 @@ class DelegateRegistryBase {
/**
* @param {!Registration<T>} registration
- * @param {(function(function(new: T)): T)=} instantiate
+ * @param {(function(function(new: T, ...?)): T)=} instantiate
* @return {T}
* @private
*/
@@ -298,7 +298,7 @@ class DelegateRegistry extends DelegateRegistryBase {
}
/**
- * @param {function(new: T)} ctor
+ * @param {function(new: T, ...?)} ctor
*/
registerClass(ctor) {
this.checkRegistration_();
| 11 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.26.0",
+ "version": "0.27.0",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/src/map/Map.js b/src/map/Map.js @@ -731,10 +731,7 @@ class Map extends Handlerable(Eventable(Renderable(Class))) {
const projection = this.getProjection(),
x = Math.abs(extent['xmin'] - extent['xmax']),
y = Math.abs(extent['ymin'] - extent['ymax']),
- projectedExtent = projection.project({
- x: x,
- y: y
- }),
+ projectedExtent = projection.project(new Coordinate(x, y)),
resolutions = this._getResolutions();
let xz = -1,
yz = -1;
| 1 |
diff --git a/src/js/libcs/OpDrawing.js b/src/js/libcs/OpDrawing.js @@ -1563,6 +1563,9 @@ evaluator.clearimage$1 = function(args, modifs) {
}
var image = imageFromValue(name);
+ if(!image)
+ return nada;
+
var localcanvas = image.img;
if (typeof(localcanvas) === "undefined" || localcanvas === null) {
| 8 |
diff --git a/src/components/selections/select.js b/src/components/selections/select.js @@ -273,7 +273,10 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
displayOutlines(convertPoly(mergedPolygons, isOpenMode), outlines, dragOptions);
if(isSelectMode) {
- var _res = reselect(gd, selectionTesters, searchTraces, dragOptions);
+ var _res = reselect(gd);
+ var extraPoints = _res.eventData ? _res.eventData.points.slice() : [];
+
+ _res = reselect(gd, selectionTesters, searchTraces, dragOptions);
selectionTesters = _res.selectionTesters;
eventData = _res.eventData;
@@ -290,7 +293,27 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
function() {
selection = _doSelect(selectionTesters, searchTraces);
- eventData = {points: selection};
+ var newPoints = selection.slice();
+
+ for(var w = 0; w < extraPoints.length; w++) {
+ var p = extraPoints[w];
+ var found = false;
+ for(var u = 0; u < newPoints.length; u++) {
+ if(
+ newPoints[u].curveNumber === p.curveNumber &&
+ newPoints[u].pointNumber === p.pointNumber
+ ) {
+ found = true;
+ break;
+ }
+ }
+ if(!found) newPoints.push(p);
+ }
+
+ if(newPoints.length) {
+ if(!eventData) eventData = {};
+ eventData.points = newPoints;
+ }
fillRangeItems(eventData, poly);
| 0 |
diff --git a/src/lib/substituteTailwindAtRules.js b/src/lib/substituteTailwindAtRules.js @@ -62,6 +62,10 @@ export default function(
atRule.before(updateSource(pluginUtilities, atRule.source))
atRule.remove()
}
+
+ if (atRule.params === 'screens') {
+ includesScreensExplicitly = true
+ }
})
if (!includesScreensExplicitly) {
| 9 |
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js @@ -386,7 +386,7 @@ export default class ServerApi {
cwd: recipeTempDirectory,
preservePaths: true,
unlink: true,
- preserveOwner: true,
+ preserveOwner: false,
noChmod: isWindows,
onwarn: (...x) => console.log('tar error', recipeId, x),
};
| 12 |
diff --git a/test/shared/integrationTestHelpers.js b/test/shared/integrationTestHelpers.js @@ -81,7 +81,9 @@ export function createTestApp (options = {}) {
class App extends TextureWebApp {
_getStorage (storageType) {
let _vfs = options.vfs || vfs
- let _rootFolder = options.root || './data/'
+ // TODO: find out if we still need options.root, because it looks like
+ // we are using options.rootDir
+ let _rootFolder = options.root || options.rootDir || './data/'
return new VfsStorageClient(_vfs, _rootFolder)
}
| 12 |
diff --git a/gulpfile.js b/gulpfile.js @@ -10,9 +10,9 @@ const svgSprite = require('gulp-svg-sprite');
const plumber = require('gulp-plumber');
const rename = require('gulp-rename');
const critical = require('critical').stream;
-const config = require('./config');
const log = require('fancy-log');
const runSequence = require('run-sequence');
+const config = require('./config');
// Append config
Object.assign(config.drizzle, { helpers });
@@ -26,26 +26,34 @@ gulp.task('sass', () => {
.src('src/assets/toolkit/styles/**/*.scss')
.pipe(plumber())
.pipe(sass())
- .pipe(autoprefixer({
+ .pipe(
+ autoprefixer({
browsers: ['> 1%', 'last 4 versions'],
cascade: false,
- }))
- .pipe(cssnano({
+ }),
+ )
+ .pipe(
+ cssnano({
zindex: false,
- }))
+ }),
+ )
.pipe(gulp.dest('./dist/assets/toolkit/styles'));
gulp
.src('src/assets/drizzle/styles/**/*.scss')
.pipe(plumber())
.pipe(sass())
- .pipe(autoprefixer({
+ .pipe(
+ autoprefixer({
browsers: ['> 1%', 'last 4 versions'],
cascade: false,
- }))
- .pipe(cssnano({
+ }),
+ )
+ .pipe(
+ cssnano({
zindex: false,
- }))
+ }),
+ )
.pipe(gulp.dest('./dist/assets/drizzle/styles'));
});
@@ -55,9 +63,11 @@ gulp.task('icons', (done) => {
.src(config.icons.src)
.pipe(svgSprite(config.icons))
.pipe(gulp.dest(config.icons.dest))
- .pipe(rename({
+ .pipe(
+ rename({
extname: '.hbs',
- }))
+ }),
+ )
.pipe(gulp.dest('./src/templates/drizzle'))
.on('end', done);
});
@@ -89,11 +99,13 @@ gulp.task('critical', () => {
];
return gulp
.src('dist/*.html')
- .pipe(critical({
+ .pipe(
+ critical({
base: 'dist/',
inline: true,
css: cssFiles,
- }))
+ }),
+ )
.on('error', (err) => {
log.error(err.message);
})
| 3 |
diff --git a/assets/js/components/GoogleChart.js b/assets/js/components/GoogleChart.js @@ -33,12 +33,17 @@ import { useEffect, useState, useRef } from '@wordpress/element';
*/
import ProgressBar from './ProgressBar';
-let loadedOnce = false;
-let chartLoadPromise;
+// Use a global variable to prevent separate webpack bundles from loading the
+// script multiples times.
+if ( global.googlesitekit === undefined ) {
+ global.googlesitekit = {};
+}
+
+global.googlesitekit.__hasLoadedGoogleCharts = false;
async function loadCharts() {
- if ( chartLoadPromise ) {
- return chartLoadPromise;
+ if ( global.googlesitekit.__chartLoadPromise ) {
+ return global.googlesitekit.__chartLoadPromise;
}
// Inject the script if not already loaded and resolve on load.
@@ -48,7 +53,7 @@ async function loadCharts() {
// Only insert the DOM element if no Charts loader script is detected.
if ( document.querySelectorAll( 'script[src="https://www.gstatic.com/charts/loader.js"]' ).length === 0 ) {
- chartLoadPromise = new Promise( ( resolve ) => {
+ global.googlesitekit.__chartLoadPromise = new Promise( ( resolve ) => {
script.onload = resolve;
// Add the script to the DOM
global.document.head.appendChild( script );
@@ -58,10 +63,10 @@ async function loadCharts() {
}
} else {
// Charts is already available - resolve immediately.
- chartLoadPromise = Promise.resolve();
+ global.googlesitekit.__chartLoadPromise = Promise.resolve();
}
- return chartLoadPromise;
+ return global.googlesitekit.__chartLoadPromise;
}
export default function GoogleChart( props ) {
@@ -89,8 +94,8 @@ export default function GoogleChart( props ) {
await loadCharts();
// Only call `charts.load` if the charts haven't been loaded yet.
- if ( ! loadedOnce && global.google?.charts ) {
- loadedOnce = true;
+ if ( ! global.googlesitekit.__hasLoadedGoogleCharts && global.google?.charts ) {
+ global.googlesitekit.__hasLoadedGoogleCharts = true;
global.google.charts.load( 'current', {
packages: [ 'corechart' ],
callback: () => {
| 4 |
diff --git a/src/mode/fdm/fill.js b/src/mode/fdm/fill.js let tile_z = 1 / tile;
let gyroid = BASE.gyroid.slice(target.zValue() * tile_z, (1 - density) * 500);
- gyroid.polys.forEach(poly => {
+ // gyroid.polys.forEach(poly => {
+ // for (let tx=0; tx<=tile_x; tx++) {
+ // for (let ty=0; ty<=tile_y; ty++) {
+ // target.newline();
+ // let bx = tx * tile + bounds.min.x;
+ // let by = ty * tile + bounds.min.y;
+ // poly.forEach(point => {
+ // target.emit(bx + point.x * tile, by + point.y * tile);
+ // });
+ // }
+ // }
+ // });
+
+ let polys = [];
for (let tx=0; tx<=tile_x; tx++) {
for (let ty=0; ty<=tile_y; ty++) {
+ for (let poly of gyroid.polys) {
target.newline();
- let bx = tx * tile + bounds.min.x;
- let by = ty * tile + bounds.min.y;
- poly.forEach(point => {
- target.emit(bx + point.x * tile, by + point.y * tile);
+ let points = poly.map(el => {
+ return {
+ x: el.x * tile + tx * tile + bounds.min.x,
+ y: el.y * tile + ty * tile + bounds.min.y,
+ z: 0
+ }
});
+ polys.push(BASE.newPolygon().setOpen(true).addObj(points));
}
}
- });
+ }
+ polys = connectOpenPolys(polys.filter(p => p.perimeter() > 2));
+ for (let poly of polys) {
+ target.newline();
+ for (let point of poly.points) {
+ target.emit(point.x, point.y);
+ }
+ }
+ }
+
+ function connectOpenPolys(noff, dist = 0.1) {
+ if (noff.length <= 1) {
+ return noff;
+ }
+ let heal = 0;
+ // heal/rejoin open segments that have close endpoints
+ outer: for(;; heal++) {
+ let ntmp = noff, tlen = ntmp.length;
+ for (let i=0; i<tlen; i++) {
+ let s1 = ntmp[i];
+ if (!s1 || !s1.open) continue;
+ for (let j=i+1; j<tlen; j++) {
+ let s2 = ntmp[j];
+ if (!s2 || !s2.open) continue;
+ if (s1.last().distTo2D(s2.first()) <= dist) {
+ s1.addPoints(s2.points);
+ ntmp[j] = null;
+ continue outer;
+ }
+ if (s1.first().distTo2D(s2.last()) <= dist) {
+ s2.addPoints(s1.points);
+ ntmp[i] = null;
+ continue outer;
+ }
+ if (s1.first().distTo2D(s2.first()) <= dist) {
+ s1.reverse();
+ s1.addPoints(s2.points);
+ ntmp[j] = null;
+ continue outer;
+ }
+ if (s1.last().distTo2D(s2.last()) <= dist) {
+ s1.addPoints(s2.points.reverse());
+ ntmp[j] = null;
+ continue outer;
+ }
+ }
+ }
+ break;
+ }
+ if (heal > 0) {
+ // cull nulls
+ noff = noff.filter(o => o);
+ }
+ return noff;
}
function fillGrid(target) {
| 7 |
diff --git a/lib/assets/javascripts/new-dashboard/components/MapCard/CondensedMapCard.vue b/lib/assets/javascripts/new-dashboard/components/MapCard/CondensedMapCard.vue @@ -167,18 +167,6 @@ export default {
}
}
}
-
- .map-tag {
- display: inline;
- }
-
- .icon--tag {
- vertical-align: sub;
- }
-
- .cell--map-name__bottom {
- margin-top: 5px;
- }
}
.cell--privacy {
| 2 |
diff --git a/src/server/services/repo.js b/src/server/services/repo.js @@ -183,6 +183,9 @@ module.exports = {
}
});
done(null, committers);
+ } else if (!res) {
+ handleError('Github call failed with args', arg, err);
+ done('Github call failed');
} else if (res.message) {
if (res.message === 'Moved Permanently' && linkedRepo) {
self.getGHRepo(args, function(err, res) {
| 9 |
diff --git a/guides/advanced_guides/search_parameters.md b/guides/advanced_guides/search_parameters.md @@ -151,7 +151,7 @@ You will get the following response with the **cropped version in the \_formatte
Number of characters to keep on each side of the start of the matching word. See [attributesToCrop](/guides/advanced_guides/search_parameters.md#attributes-to-crop)
-## Attributes to highlight
+## Attributes to Highlight
Attributes whose values will contain **highlighted matching query words**.
@@ -203,7 +203,7 @@ Specify a filter to be used with the query. See our [dedicated guide](/guides/ad
```bash
$ curl -X GET -G 'http://localhost:7700/indexes/nzwlr302/search' \
-d q=n \
- -d filters='filters=title%3DNightshift'
+ -d filters='title%3DNightshift'
```
(`%3D` is URL-encoded for `=`)
| 1 |
diff --git a/phpcs.xml b/phpcs.xml <ruleset name="WordPress Coding Standards for AMP">
<rule ref="WordPress-Core" />
- <rule ref="WordPress-Docs" />
+ <rule ref="WordPress-Docs">
+ <exclude-pattern>tests/*</exclude-pattern>
+ </rule>
<rule ref="WordPress-Extra" />
<rule ref="WordPress.WP.I18n">
<rule ref="WordPress.Files.FileName.InvalidClassFileName">
<exclude-pattern>tests/*</exclude-pattern>
+ <exclude-pattern>includes/admin/class-amp-customizer.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-dailymotion-embed.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-facebook-embed.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-gallery-embed.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-instagram-embed.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-pinterest-embed.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-soundcloud-embed.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-twitter-embed.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-vimeo-embed.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-vine-embed.php</exclude-pattern>
+ <exclude-pattern>includes/embeds/class-amp-youtube-embed.php</exclude-pattern>
+ <exclude-pattern>wpcom/class-amp-polldaddy-embed.php</exclude-pattern>
</rule>
<rule ref="WordPress.Arrays.MultipleStatementAlignment.LongIndexSpaceBeforeDoubleArrow">
<exclude-pattern>tests/test-tag-and-attribute-sanitizer.php</exclude-pattern>
<exclude-pattern>tests/test-tag-and-attribute-sanitizer.php</exclude-pattern>
</rule>
<rule ref="WordPress.WP.AlternativeFunctions">
- <exclude-pattern>bin/verify-version-consistency.php</exclude-pattern>
+ <exclude-pattern>bin/*</exclude-pattern>
</rule>
<rule ref="WordPress.WP.EnqueuedResources">
<exclude-pattern>includes/actions/class-amp-paired-post-actions.php</exclude-pattern>
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -31642,7 +31642,18 @@ var $$IMU_EXPORT$$;
}
try {
- var imageresponse = deepcopy(initialstate.ImageUrlPage.photo.imageResponse);
+ var imageresponse_raw = deepcopy(initialstate.ImageUrlPage.photo.imageResponse);
+
+ // tumblr now returns {0: ..., 1: ...} instead of an array for some reason (thanks to Wisedrow for reporting)
+ // todo: maybe add a wrapper for Array.from? not supported in earlier browsers so a shim would be needed
+ var imageresponse = [];
+ for (var i = 0; i < imageresponse_raw.length; i++) {
+ // is this needed?
+ if (!imageresponse_raw[i])
+ continue;
+
+ imageresponse.push(imageresponse_raw[i]);
+ }
var request_imageinfo;
if (initialstate.ImageUrlPage.requestedImage) {
| 1 |
diff --git a/lib/ag-solo/start.js b/lib/ag-solo/start.js @@ -131,9 +131,8 @@ async function buildSwingset(stateFile, withSES, vatsDir, argv) {
}
async function pollTimerDevice(intervalMillis) {
- let timerDevice = config.devices['timer'];
async function poll() {
- if (timerDevice.poll(blockTime)) {
+ if (timer.poll(blockTime)) {
await processKernel();
}
}
| 4 |
diff --git a/token-metadata/0x87210f1D3422BA75B6C40C63C78d79324daBcd55/metadata.json b/token-metadata/0x87210f1D3422BA75B6C40C63C78d79324daBcd55/metadata.json "symbol": "EOST",
"address": "0x87210f1D3422BA75B6C40C63C78d79324daBcd55",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -168,10 +168,6 @@ articles:
url: /flows/add-login-using-the-implicit-flow-with-form-post
- title: Native App
url: /flows/add-login-using-the-authorization-code-flow-with-pkce
- - title: Hybrid Flow
- url: /flows/hybrid-flow
- - title: Call Your API Using the Hybrid Flow
- url: flows/call-api-hybrid-flow
- title: Authenticate Single-Page Apps with Cookies
url: /sessions-and-cookies/spa-authenticate-with-cookies
- title: Multi-factor Authentication
@@ -319,6 +315,9 @@ articles:
url: /flows/call-your-api-using-the-client-credentials-flow
- title: Device Authorization
url: /flows/call-your-api-using-the-device-authorization-flow
+ - title: Hybrid
+ url: /flows/call-api-hybrid-flow
+ hidden: true
- title: Role-based Access Control (RBAC)
url: /authorization/rbac
- title: Authorization Policies
@@ -581,6 +580,8 @@ articles:
url: /custom-domains/configure-custom-domains-with-auth0-managed-certificates
- title: Self-Managed Certificates
url: /custom-domains/configure-custom-domains-with-self-managed-certificates
+ - title: SSL (TLS) Versions and Ciphers
+ url: /custom-domains/ssl-tls
children:
- title: Cloudflare Reverse Proxy
url: /custom-domains/
| 2 |
diff --git a/gulp-tasks/test.js b/gulp-tasks/test.js @@ -723,6 +723,8 @@ function testMarkdown(filename, contents, options) {
remarkLintOptions.maximumLineLength = 100;
contents = contents.replace(wfRegEx.RE_DESCRIPTION, '\n');
contents = contents.replace(wfRegEx.RE_SNIPPET, '\n\n');
+ contents = contents.replace(wfRegEx.RE_TAGS, '\n\n');
+ contents = contents.replace(wfRegEx.RE_IMAGE, '\n\n');
}
// Use remark to lint the markdown
| 8 |
diff --git a/unlock-app/src/components/creator/lock/LockIconBar.js b/unlock-app/src/components/creator/lock/LockIconBar.js @@ -18,16 +18,17 @@ export function LockIconBar({
lock,
priceUpdateTransaction,
toggleCode,
- transaction,
+ lockCreationTransaction,
withdrawalTransaction,
config,
edit,
}) {
// These 2 transactions, if not mined or confirmed will trigger the display of CreatorLockStatus
// instead of the regular iconBar
- const blockingTransactions = [transaction, priceUpdateTransaction].filter(
- t => !!t
- )
+ const blockingTransactions = [
+ lockCreationTransaction,
+ priceUpdateTransaction,
+ ].filter(t => !!t)
// TODO: move that logic to mapStateToProps
for (let i = 0; i < blockingTransactions.length; i++) {
@@ -93,14 +94,14 @@ LockIconBar.propTypes = {
lock: UnlockPropTypes.lock.isRequired,
toggleCode: PropTypes.func.isRequired,
edit: PropTypes.func, // this will be required when we wire it up, no-op for now
- transaction: UnlockPropTypes.transaction,
+ lockCreationTransaction: UnlockPropTypes.transaction,
withdrawalTransaction: UnlockPropTypes.transaction,
priceUpdateTransaction: UnlockPropTypes.transaction,
config: UnlockPropTypes.configuration.isRequired,
}
LockIconBar.defaultProps = {
- transaction: null,
+ lockCreationTransaction: null,
priceUpdateTransaction: null,
withdrawalTransaction: null,
edit: () => {},
@@ -129,11 +130,10 @@ const mapStateToProps = ({ transactions }, { lock }) => {
}
})
- // TODO change that to lockCreationTransaction
- const transaction = transactions[lock.transaction]
+ const lockCreationTransaction = transactions[lock.transaction]
return {
- transaction,
+ lockCreationTransaction,
withdrawalTransaction,
priceUpdateTransaction,
}
| 10 |
diff --git a/src/components/dashboard/TransactionConfirmation.js b/src/components/dashboard/TransactionConfirmation.js // @flow
-import React, { useCallback } from 'react'
+import React, { useCallback, useMemo } from 'react'
import { Image, Share, View } from 'react-native'
import { useScreenState } from '../appNavigation/stackNavigation'
import useNativeSharing from '../../lib/hooks/useNativeSharing'
import Section from '../common/layout/Section'
import Wrapper from '../common/layout/Wrapper'
import ButtonWithDoneState from '../common/buttons/ButtonWithDoneState'
+import CustomButton from '../common/buttons/CustomButton'
import Icon from '../common/view/Icon'
import { withStyles } from '../../lib/styles'
import { getDesignRelativeHeight, getDesignRelativeWidth } from '../../lib/utils/sizes'
@@ -36,25 +37,29 @@ const instructionsTextNumberProps = {
const TransactionConfirmation = ({ screenProps, styles }: ReceiveProps) => {
const { canShare } = useNativeSharing()
+ const { goToRoot } = screenProps
const [screenState] = useScreenState(screenProps)
const { paymentLink, action } = screenState
- const handlePressConfirm = useCallback(async () => {
+ const handlePressConfirm = useCallback(() => {
let type = 'share'
if (canShare) {
- await Share.share(paymentLink)
+ Share.share(paymentLink)
+ goToRoot()
} else {
type = 'copy'
Clipboard.setString(paymentLink)
}
fireEvent('SEND_CONFIRMATION_SHARE', { type })
- }, [canShare, paymentLink])
+ }, [canShare, paymentLink, goToRoot])
const secondTextPoint = action === ACTION_SEND ? 'Share it with your recipient' : 'Share it with sender'
const thirdTextPoint = action === ACTION_SEND ? 'Recipient approves request' : 'Sender approves request'
+ const ConfirmButton = useMemo(() => (canShare ? CustomButton : ButtonWithDoneState), [canShare])
+
return (
<Wrapper>
<Section grow style={styles.section} justifyContent="space-between">
@@ -83,14 +88,14 @@ const TransactionConfirmation = ({ screenProps, styles }: ReceiveProps) => {
</Section.Stack>
<Image style={styles.image} source={ConfirmTransactionSVG} resizeMode="contain" />
<View style={styles.confirmButtonWrapper}>
- <ButtonWithDoneState onPress={handlePressConfirm} onPressDone={screenProps.goToRoot}>
+ <ConfirmButton onPress={handlePressConfirm} onPressDone={goToRoot}>
<>
<Icon color="white" name="link" size={25} style={styles.buttonIcon} />
<Section.Text size={14} color="white" fontWeight="bold">
{canShare ? 'SHARE' : 'COPY LINK TO CLIPBOARD'}
</Section.Text>
</>
- </ButtonWithDoneState>
+ </ConfirmButton>
</View>
</Section>
</Wrapper>
| 0 |
diff --git a/OurUmbraco.Site/Views/Partials/Projects/ListProjects.cshtml b/OurUmbraco.Site/Views/Partials/Projects/ListProjects.cshtml var version = Request["version"];
var term = Request["term"];
var pageSize = 20;
- var headline = orderMode == "updateDate" ? "latest" : "most popular";
+ var headline = "most popular";
+ if (orderMode == "createDate")
+ {
+ headline = "latest";
+ }
+ else if (orderMode == "updateDate")
+ {
+ headline = "recently updated";
+ }
+
if (version != null)
{
headline = "version " + version;
| 1 |
diff --git a/core/server/services/auth/passwordreset.js b/core/server/services/auth/passwordreset.js @@ -2,11 +2,32 @@ const _ = require('lodash');
const security = require('@tryghost/security');
const constants = require('@tryghost/constants');
const errors = require('@tryghost/errors');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
const models = require('../../models');
const urlUtils = require('../../../shared/url-utils');
const mail = require('../mail');
+const messages = {
+ userNotFound: 'User not found.',
+ tokenLocked: 'Token locked',
+ resetPassword: 'Reset Password',
+ expired: {
+ message: 'Cannot reset password.',
+ context: 'Password reset link expired.',
+ help: 'Request a new password reset via the login form.'
+ },
+ invalidToken: {
+ message: 'Cannot reset password.',
+ context: 'Password reset link has already been used.',
+ help: 'Request a new password reset via the login form.'
+ },
+ corruptedToken: {
+ message: 'Cannot reset password.',
+ context: 'Invalid password reset link.',
+ help: 'Check if password reset link has been fully copied or request new password reset via the login form.'
+ }
+};
+
const tokenSecurity = {};
function generateToken(email, settingsAPI, transaction) {
@@ -22,7 +43,7 @@ function generateToken(email, settingsAPI, transaction) {
})
.then((user) => {
if (!user) {
- throw new errors.NotFoundError({message: i18n.t('errors.api.users.userNotFound')});
+ throw new errors.NotFoundError({message: tpl(messages.userNotFound)});
}
token = security.tokens.resetToken.generateHash({
@@ -48,9 +69,9 @@ function extractTokenParts(options) {
if (!tokenParts) {
return Promise.reject(new errors.UnauthorizedError({
- message: i18n.t('errors.api.passwordReset.corruptedToken.message'),
- context: i18n.t('errors.api.passwordReset.corruptedToken.context'),
- help: i18n.t('errors.api.passwordReset.corruptedToken.help')
+ message: tpl(messages.corruptedToken.message),
+ context: tpl(messages.corruptedToken.context),
+ help: tpl(messages.corruptedToken.help)
}));
}
@@ -62,7 +83,7 @@ function protectBruteForce({options, tokenParts}) {
if (tokenSecurity[`${tokenParts.email}+${tokenParts.expires}`] &&
tokenSecurity[`${tokenParts.email}+${tokenParts.expires}`].count >= 10) {
return Promise.reject(new errors.NoPermissionError({
- message: i18n.t('errors.models.user.tokenLocked')
+ message: tpl(messages.tokenLocked)
}));
}
@@ -85,7 +106,7 @@ function doReset(options, tokenParts, settingsAPI) {
})
.then((user) => {
if (!user) {
- throw new errors.NotFoundError({message: i18n.t('errors.api.users.userNotFound')});
+ throw new errors.NotFoundError({message: tpl(messages.userNotFound)});
}
let compareResult = security.tokens.resetToken.compare({
@@ -98,15 +119,15 @@ function doReset(options, tokenParts, settingsAPI) {
let error;
if (compareResult.reason === 'expired' || compareResult.reason === 'invalid_expiry') {
error = new errors.BadRequestError({
- message: i18n.t('errors.api.passwordReset.expired.message'),
- context: i18n.t('errors.api.passwordReset.expired.context'),
- help: i18n.t('errors.api.passwordReset.expired.help')
+ message: tpl(messages.expired.message),
+ context: tpl(messages.expired.context),
+ help: tpl(messages.expired.help)
});
} else {
error = new errors.BadRequestError({
- message: i18n.t('errors.api.passwordReset.invalidToken.message'),
- context: i18n.t('errors.api.passwordReset.invalidToken.context'),
- help: i18n.t('errors.api.passwordReset.invalidToken.help')
+ message: tpl(messages.invalidToken.message),
+ context: tpl(messages.invalidToken.context),
+ help: tpl(messages.invalidToken.help)
});
}
@@ -152,7 +173,7 @@ async function sendResetNotification(data, mailAPI) {
mail: [{
message: {
to: data.email,
- subject: i18n.t('common.api.authentication.mail.resetPassword'),
+ subject: tpl(messages.resetPassword),
html: content.html,
text: content.text
},
| 14 |
diff --git a/src/pages/iou/IOUDetailsModal.js b/src/pages/iou/IOUDetailsModal.js @@ -19,7 +19,6 @@ import IOUTransactions from './IOUTransactions';
const defaultProps = {
iou: {},
- iouReport: null,
};
const propTypes = {
@@ -61,7 +60,7 @@ const propTypes = {
// Is the IOU report settled?
hasOutstandingIOU: PropTypes.bool,
- }),
+ }).isRequired,
// Session info for the currently logged in user.
session: PropTypes.shape({
@@ -97,7 +96,7 @@ class IOUDetailsModal extends Component {
render() {
const sessionEmail = lodashGet(this.props.session, 'email', null);
- const reportIsLoading = _.isNull(this.props.iouReport);
+ const reportIsLoading = _.isUndefined(this.props.iouReport);
return (
<ScreenWrapper>
<HeaderWithCloseButton
| 14 |
diff --git a/articles/connections/enterprise/google-apps.md b/articles/connections/enterprise/google-apps.md @@ -125,3 +125,5 @@ To use your newly-created Connection, you'll need to enable it for your Auth0 Cl
At this point, your users will be able to log in using their Google App credentials.
+
+<%= include('../_quickstart-links.md') %>
| 0 |
diff --git a/components/Cards/SpaceListingCard/SpaceListingCard.css b/components/Cards/SpaceListingCard/SpaceListingCard.css position: absolute;
top: var(--size-small);
right: var(--size-small);
- z-index: 1;
+ z-index: 2;
line-height: 1;
transition: background-color 100ms;
max-width: 80%;
| 5 |
diff --git a/test/image/mocks/box_precomputed-stats.json b/test/image/mocks/box_precomputed-stats.json "type": "box",
"name": "[V] just q1/median/q3",
"offsetgroup": "1",
- "q1": [ 1, 2, 1 ],
- "median": [ 2, 3, 2 ],
- "q3": [ 3, 4, 3 ]
+ "q1": [ 1, "2", 1 ],
+ "median": [ 2, 3, "2" ],
+ "q3": [ "3", 4, 3 ]
},
{
"type": "box",
"q1": [ 1, 2, 1 ],
"median": [ 2, 3, 2 ],
"q3": [ 3, 4, 3 ],
- "lowerfence": [ 0, 1, 0 ],
- "upperfence": [ 4, 5, 4 ]
+ "lowerfence": [ 0, "1", 0 ],
+ "upperfence": [ 4, 5, "4" ]
},
{
"type": "box",
"q3": [ 3, 4, 3 ],
"lowerfence": [ 0, 1, 0 ],
"upperfence": [ 4, 5, 4 ],
- "mean": [ 2.2, 2.8, 2.2 ],
- "sd": [ 0.4, 0.4, 0.4 ],
- "notchspan": [ 0.2, 0.1, 0.2 ]
+ "mean": [ 2.2, 2.8, "2.2" ],
+ "sd": [ "0.4", 0.4, 0.4 ],
+ "notchspan": [ 0.2, "0.1", 0.2 ]
},
{
"type": "box",
| 0 |
diff --git a/conf/cityparams.conf b/conf/cityparams.conf // NOTE if you want to change the city, modify your $SIDEWALK_CITY_ID env variable, don't just modify this default.
city-id = "washington-dc"
-city-id = "$SIDEWALK_CITY_ID"
+city-id = "{$SIDEWALK_CITY_ID}"
city-params {
city-ids = [
| 1 |
diff --git a/src/renderer/webgl/WebGLRenderer.mjs b/src/renderer/webgl/WebGLRenderer.mjs @@ -109,11 +109,11 @@ export default class WebGLRenderer extends Renderer {
case gl.UNSIGNED_BYTE:
return 4;
- case gl.UNSIGNED_SHORT_4_4_4_$:
+ case gl.UNSIGNED_SHORT_4_4_4_4:
return 2;
case gl.UNSIGNED_SHORT_5_5_5_1:
- return 1;
+ return 2;
default:
throw new Error('Invalid type specified for GL_RGBA format');
| 3 |
diff --git a/tsconfig.json b/tsconfig.json "strict": true,
"noImplicitAny": true,
"noUnusedLocals": true,
- "noUnusedParameters": true,
+ "noUnusedParameters": false,
"downlevelIteration": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
| 11 |
diff --git a/tabulator.js b/tabulator.js deleteRow: function(item){
var self = this;
- var id = !isNaN(item) ? item : item.data("data")[self.options.index];
+ var itemType = typeof item;
- var row = !isNaN(item) ? $("[data-id=" + item + "]", self.element) : item;
+ var id = (itemType == "number" || itemType == "string") ? item : item.data("data")[self.options.index];
+
+ var row = (itemType == "number" || itemType == "string") ? $("[data-id=" + item + "]", self.element) : item;
if(row.length){
var rowData = row.data("data");
updateRow:function(index, item, bulk){
var self = this;
- var id = !isNaN(index) ? index : index.data("data")[self.options.index];
+ var itemType = typeof index;
+
+ var id = (itemType == "number" || itemType == "string") ? index : index.data("data")[self.options.index];
- var row = !isNaN(index) ? $("[data-id=" + index + "]", self.element) : index;
+ var row = (itemType == "number" || itemType == "string") ? $("[data-id=" + index + "]", self.element) : index;
if(row.length){
var rowData = row.data("data");
| 11 |
diff --git a/src/components/general/map-gen/MapGen.jsx b/src/components/general/map-gen/MapGen.jsx @@ -201,6 +201,7 @@ export const MapGen = () => {
const [text, setText] = useState('');
const [haloMeshApp, setHaloMeshApp] = useState(null);
const [magicMeshApp, setMagicMeshApp] = useState(null);
+ const [limitMeshApp, setLimitMeshApp] = useState(null);
const canvasRef = useRef();
//
@@ -377,7 +378,7 @@ export const MapGen = () => {
}
- case 78: { // N
+ case 188: { // ,
if (!magicMeshApp) {
const magicMeshApp = metaversefile.createApp();
@@ -400,6 +401,29 @@ export const MapGen = () => {
}
+ case 190: { // .
+
+ if (!limitMeshApp) {
+ const limitMeshApp = metaversefile.createApp();
+ (async () => {
+ const {modules} = metaversefile.useDefaultModules();
+ const m = modules['limit'];
+ await limitMeshApp.addModule(m);
+ })();
+ sceneLowPriority.add(limitMeshApp);
+
+ setLimitMeshApp(limitMeshApp);
+ } else {
+ limitMeshApp.parent.remove(limitMeshApp);
+ limitMeshApp.destroy();
+
+ setLimitMeshApp(null);
+ }
+
+ return false;
+
+ }
+
case 77: { // M
if ( state.openedPanel === 'MapGenPanel' ) {
@@ -442,7 +466,7 @@ export const MapGen = () => {
};
- }, [ state.openedPanel, haloMeshApp, magicMeshApp ]);
+ }, [ state.openedPanel, haloMeshApp, magicMeshApp, limitMeshApp ]);
// resize
useEffect(() => {
| 0 |
diff --git a/js/containers/addWizardColumns.js b/js/containers/addWizardColumns.js @@ -10,6 +10,7 @@ var trim = require('underscore.string').trim;
var {getColSpec} = require('../models/datasetJoins');
var {defaultColorClass} = require('../heatmapColors');
var uuid = require('../uuid');
+var Rx = require('../rx');
function toWordList(str) {
// Have to wrap trim because it takes a 2nd param.
@@ -108,14 +109,14 @@ var sortFeatures = features => _.sortBy(features, f => f.label.toUpperCase());
var removeSampleID = features => _.filter(features, f => f.value !== "sampleID");
-var computeSettings = _.curry((datasets, features, fields, dataset) => {
+var computeSettings = _.curry((datasets, features, fields, width, dataset) => {
var ds = datasets[dataset];
// XXX resolve 'probes' if user has selected probes. Set here to false
var settings = columnSettings(datasets, features, dataset, fields, false),
colSpec = getColSpec([settings], datasets);
return _.assoc(colSpec,
- 'width', ds.type === 'mutationVector' ? 200 : 100,
+ 'width', width, //ds.type === 'mutationVector' ? 200 : 100,
'columnLabel', ds.label,
'user', {columnLabel: ds.label, fieldLabel: colSpec.fieldLabel});
});
@@ -131,7 +132,15 @@ function addWizardColumns(Component) {
displayName: 'SpreadsheetWizardColumns',
getInitialState() {
var {editing} = this.props;
- return {editing};
+ return {editing, viewWidth: document.documentElement.clientWidth};
+ },
+ componentWillMount() {
+ this.sub = Rx.Observable.fromEvent(window, 'resize')
+ .debounceTime(200).subscribe(() =>
+ this.setState({viewWidth: document.documentElement.clientWidth}));
+ },
+ componentWillUnmount() {
+ this.sub.unsubscribe();
},
componentWillReceiveProps: function(newProps) {
var {editing} = newProps;
@@ -151,8 +160,9 @@ function addWizardColumns(Component) {
},
onDatasetSelect(posOrId, input, datasetList) {
var {datasets, features} = this.props.appState,
+ width = Math.floor(this.state.viewWidth / 4),
isPos = _.isNumber(posOrId),
- settingsList = datasetList.map(computeSettings(datasets, features, input));
+ settingsList = datasetList.map(computeSettings(datasets, features, input, width));
this.props.callback(['add-column', posOrId,
...settingsList.map((settings, i) => ({id: !i && !isPos ? posOrId : uuid(), settings}))]);
},
| 12 |
diff --git a/app-manager.js b/app-manager.js @@ -28,7 +28,7 @@ const localFrameOpts = {
const appManagers = [];
class AppManager extends EventTarget {
- constructor({prefix = worldMapName, state = new Y.Doc(), apps = []} = {}) {
+ constructor({prefix = worldMapName, state = new Y.Doc(), apps = [], autoSceneManagement = true} = {}) {
super();
this.prefix = prefix;
@@ -41,6 +41,7 @@ class AppManager extends EventTarget {
this.pendingAddPromise = null;
this.pushingLocalUpdates = false;
this.lastTimestamp = performance.now();
+ this.autoSceneManagement = autoSceneManagement;
// this.stateBlindMode = false;
appManagers.push(this);
@@ -444,6 +445,7 @@ class AppManager extends EventTarget {
addApp(app) {
this.apps.push(app);
+ if (this.autoSceneManagement) {
const renderPriority = app.getComponent('renderPriority');
switch (renderPriority) {
case 'high': {
@@ -460,12 +462,16 @@ class AppManager extends EventTarget {
}
}
}
+ }
removeApp(app) {
const index = this.apps.indexOf(app);
// console.log('remove app', app.instanceId, app.contentId, index, this.apps.map(a => a.instanceId), new Error().stack);
if (index !== -1) {
this.apps.splice(index, 1);
- app.parent && app.parent.remove(app);
+
+ if (this.autoSceneManagement) {
+ app.parent.remove(app);
+ }
}
}
resize(e) {
| 0 |
diff --git a/userscript.user.js b/userscript.user.js @@ -887,7 +887,7 @@ var $$IMU_EXPORT$$;
if (!x || typeof x !== "object")
return false;
- if (("namespaceURI" in x) && ("ariaSort" in x) && ("nodeType" in x)) {
+ if (("namespaceURI" in x) && ("nodeType" in x) && ("nodeName" in x) && ("childNodes" in x)) {
return true;
}
| 7 |
diff --git a/lib/shared/addon/components/cluster-driver/driver-azureaks/component.js b/lib/shared/addon/components/cluster-driver/driver-azureaks/component.js import ClusterDriver from 'shared/mixins/cluster-driver';
import Component from '@ember/component'
-import { get, set, observer } from '@ember/object';
+import { get, set } from '@ember/object';
import layout from './template';
import { on } from '@ember/object/evented';
@@ -49,8 +49,4 @@ export default Component.extend(ClusterDriver, {
}
},
-
- changeNetMode: on('init', observer('netMode', function() {
-
- })),
});
| 2 |
diff --git a/app/views/help.scala.html b/app/views/help.scala.html <div class="col-sm-12">
<div class="spacer10"></div>
<p class="text-justify">
- Yes. Here is the list of keyboard shortcuts:
+ Yes. THere is the list of keyboard shortcuts in the table below. There are also keyboard
+ shortcuts for adding tags on the Explore page; there should be an underlined letter on
+ each tag to indicate the keyboard shortcut.
</p>
<div class="panel panel-default">
<table class="table table-striped table-condensed">
<tr>
<th>Mode Switch</th>
<th><kbd>E</kbd></th>
- <td>Switch to the Exploration mode</td>
+ <td>Switch to Exploration mode</td>
</tr>
<tr>
<th></th>
<th><kbd>C</kbd></th>
- <td>Switch to the Curb Ramp mode</td>
+ <td>Switch to Curb Ramp mode</td>
</tr>
<tr>
<th></th>
<th><kbd>M</kbd></th>
- <td>Switch to the Missing Curb Ramp mode</td>
+ <td>Switch to Missing Curb Ramp mode</td>
</tr>
<tr>
<th></th>
<th><kbd>O</kbd></th>
- <td>Switch to the Obstacle in Path mode</td>
+ <td>Switch to Obstacle in Path mode</td>
</tr>
<tr>
<th></th>
<th><kbd>S</kbd></th>
- <td>Switch to the Surface Problem mode</td>
+ <td>Switch to Surface Problem mode</td>
</tr>
<tr>
<th></th>
- <th><kbd>B</kbd></th>
- <td>Switch to the "Can't see the sidewalk" mode</td>
+ <th><kbd>N</kbd></th>
+ <td>Switch to the "No Sidewalk" mode</td>
</tr>
<tr>
<th></th>
- <th><kbd>N</kbd></th>
- <td>Switch to the "No Sidewalk" mode</td>
+ <th><kbd>W</kbd></th>
+ <td>Switch to Crosswalk mode</td>
+ </tr>
+ <tr>
+ <th></th>
+ <th><kbd>P</kbd></th>
+ <td>Switch to Pedestrian Signal mode</td>
</tr>
<tr>
- <th>Label Rating</th>
+ <th></th>
+ <th><kbd>B</kbd></th>
+ <td>Switch to "Can't see the sidewalk" mode</td>
+ </tr>
+ <tr>
+ <th>Severity Rating</th>
<th><kbd>1</kbd> <kbd>2</kbd> <kbd>3</kbd> <kbd>4</kbd> <kbd>5</kbd></th>
<td>Set corresponding rating</td>
</tr>
<tr>
<th></th>
<th><kbd>Enter</kbd> or <kbd>Esc</kbd></th>
- <td>Close label rating</td>
+ <td>Close label menu</td>
</tr>
<tr>
<th>Interface Control</th>
<th><kbd>Right</kbd></th>
<td>Rotate point of view right</td>
</tr>
+ <tr>
+ <th></th>
+ <th><kbd>H</kbd></th>
+ <td>Show or hide label (only on Validate page)</td>
+ </tr>
</table>
</div>
</div>
| 3 |
diff --git a/README.md b/README.md </h1>
[](https://www.npmjs.com/package/clean-css)
-[](https://travis-ci.org/jakubpawlowicz/clean-css)
+[](https://github.com/jakubpawlowicz/clean-css/actions?query=workflow%3A%22Node.js+CI%22)
[](https://ci.appveyor.com/project/jakubpawlowicz/clean-css/branch/master)
[](https://david-dm.org/jakubpawlowicz/clean-css)
[](https://npmcharts.com/compare/clean-css?minimal=true)
| 14 |
diff --git a/generate/blogpost.js b/generate/blogpost.js @@ -123,14 +123,11 @@ async function getPhotoCredit(unsplashPhotoId) {
url: `https://unsplash.com/photos/${unsplashPhotoId}`,
headers: {'User-Agent': fakeUa()},
})
- const {
- groups: {title},
- } = response.data.match(/<title.*?>(?<title>.*?)<\/title>/) || {
- groups: {title: 'by Unknown ('},
- }
const {
groups: {name},
- } = title.match(/by (?<name>.+?) \(/) || {groups: {name: 'Unknown'}}
+ } = response.data.match(/Photo by (?<name>.*?) on Unsplash/) || {
+ groups: {name: 'Unknown'},
+ }
return `Photo by [${name}](https://unsplash.com/photos/${unsplashPhotoId})`
}
| 7 |
diff --git a/token-metadata/0xd0c59798F986d333554688cD667033d469C2398e/metadata.json b/token-metadata/0xd0c59798F986d333554688cD667033d469C2398e/metadata.json "symbol": "YMEN",
"address": "0xd0c59798F986d333554688cD667033d469C2398e",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/assets/js/components/notifications/BannerNotification/index.js b/assets/js/components/notifications/BannerNotification/index.js @@ -530,8 +530,10 @@ function BannerNotification( {
className={ `googlesitekit-publisher-win__image-${ format }` }
>
<WinImageSVG
- width={ mediumWinImageSVGWidth }
- height={ mediumWinImageSVGHeight }
+ style={ {
+ maxWidth: mediumWinImageSVGWidth,
+ maxHeight: mediumWinImageSVGHeight,
+ } }
/>
</div>
</Cell>
| 1 |
diff --git a/assets/css/maptalks-control.css b/assets/css/maptalks-control.css .maptalks-zoom .maptalks-zoom-zoomlevel { display: block; width: 23px; height: 23px; background: #172029; color: #fff; line-height: 23px; font-size: 12px;}
.maptalks-zoom-slider {margin-top: 6px;}
.maptalks-zoom-slider a.maptalks-zoom-zoomin ,.maptalks-zoom-slider a.maptalks-zoom-zoomout {display: block; font-size: 16px; width: 21px; height: 21px; border: 1px solid #363539; background: #172029; color: #fff; line-height: 19px; text-decoration: none;}
-.maptalks-zoom-slider-box { width: 21px; height: 124px; background: #34495e; background:url(images/control/kedu.png) repeat-y; border: 1px solid #35383b;}
+.maptalks-zoom-slider-box { width: 21px; height: 124px; background: #34495e; background:url(images/control/kedu.png) repeat-y; border: 1px solid #35383b; position: relative;}
.maptalks-zoom-slider-box .maptalks-zoom-slider-ruler { width: 5px; height: 112px; background: #372e2b; border-radius: 2px; -moz-border-radius: 2px; -webkit-border-radius: 2px; margin: 4px auto; position: relative;}
.maptalks-zoom-slider-box .maptalks-zoom-slider-ruler .maptalks-zoom-slider-reading { width: 5px; height: 50%; position: absolute; bottom: 0; left: 0; background: #1bbc9b; border-radius: 2px; -moz-border-radius: 2px; -webkit-border-radius: 2px;}
-.maptalks-zoom-slider-box .maptalks-zoom-slider-ruler .maptalks-zoom-slider-dot { width: 15px; height: 15px; background: url(images/control/3.png) no-repeat; position: absolute; bottom: 45%; left: -5px; cursor: pointer;}
+.maptalks-zoom-slider-box .maptalks-zoom-slider-dot { width: 15px; height: 15px; background: url(images/control/3.png) no-repeat; position: absolute; top: 50%; left: 3px; cursor: pointer;}
.maptalks-toolbar-vertical { /*border: 1px solid #3b3e44;*/margin: 0;}
.maptalks-toolbar-vertical ul ,.maptalks-toolbar-horizonal ul {margin: 0;padding: 0;}
| 3 |
diff --git a/plugins/dns_service/app/views/dns_service/create_zone_wizard/new.html.haml b/plugins/dns_service/app/views/dns_service/create_zone_wizard/new.html.haml %div.buttons{class: 'modal-footer'}
%button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}, aria: {label: 'Cancel'}} Cancel
- - unless @inqury.nil?
+ - unless @inquiry.nil?
= button_tag 'Create', { class: 'btn btn-primary pull-right', data: { disable_with: 'Please wait... '} }
:javascript
| 1 |
diff --git a/tests/phpunit/integration/Modules/OptimizeTest.php b/tests/phpunit/integration/Modules/OptimizeTest.php @@ -13,12 +13,10 @@ namespace Google\Site_Kit\Tests\Modules;
use Google\Site_Kit\Context;
use Google\Site_Kit\Core\Modules\Module_With_Owner;
use Google\Site_Kit\Core\Modules\Module_With_Settings;
-use Google\Site_Kit\Core\Modules\Module_With_Service_Entity;
use Google\Site_Kit\Core\Storage\Options;
use Google\Site_Kit\Modules\Optimize;
use Google\Site_Kit\Modules\Optimize\Settings;
use Google\Site_Kit\Tests\Core\Modules\Module_With_Owner_ContractTests;
-use Google\Site_Kit\Tests\Core\Modules\Module_With_Service_Entity_ContractTests;
use Google\Site_Kit\Tests\Core\Modules\Module_With_Settings_ContractTests;
use Google\Site_Kit\Tests\TestCase;
@@ -28,7 +26,6 @@ use Google\Site_Kit\Tests\TestCase;
class OptimizeTest extends TestCase {
use Module_With_Settings_ContractTests;
use Module_With_Owner_ContractTests;
- use Module_With_Service_Entity_ContractTests;
public function test_register() {
remove_all_filters( 'googlesitekit_gtag_opt' );
@@ -86,19 +83,4 @@ class OptimizeTest extends TestCase {
protected function get_module_with_owner() {
return new Optimize( new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
}
-
- /**
- * @return Module_With_Service_Entity
- */
- protected function get_module_with_service_entity() {
- return new Optimize( new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
- }
-
- public function test_check_service_entity_access_no_access() {
- $this->markTestSkipped( '`check_service_entity_access` always returns `true` for Optimize module.' );
- }
-
- public function test_check_service_entity_access_error() {
- $this->markTestSkipped( '`check_service_entity_access` always returns `true` for Optimize module.' );
- }
}
| 2 |
diff --git a/package.json b/package.json {
"name": "pg-promise",
- "version": "5.7.0",
+ "version": "5.7.1",
"description": "Promises interface for PostgreSQL",
"main": "lib/index.js",
"typings": "typescript/pg-promise.d.ts",
"manakin": "0.4"
},
"devDependencies": {
- "@types/node": "6.x",
- "JSONStream": "1.x",
- "bluebird": "3.x",
- "coveralls": "2.11",
+ "@types/node": "7.0",
+ "JSONStream": "1.3",
+ "bluebird": "3.5",
+ "coveralls": "2.13",
"istanbul": "0.4",
- "jasmine-node": "1.x",
- "jsdoc": "3.x",
+ "jasmine-node": "1.14",
+ "jsdoc": "3.4",
"pg-query-stream": "1.x",
- "typescript": "2.x",
- "eslint": "3.x"
+ "typescript": "2.3",
+ "eslint": "3.19"
}
}
| 12 |
diff --git a/kitty-items-js/README.md b/kitty-items-js/README.md @@ -7,7 +7,7 @@ This API currently supports:
- Minting Kitty Items (non-fungible token)
- Creating Sale Offers for Kitty Items
-### Setup
+### Setup / Running the API
- Install npm dependencies:
@@ -35,6 +35,8 @@ npm run start:dev
Note that when the API starts, it will automatically run the database migrations for the configured `DATABASE_URL` url.
+### Running Worker / Event consumer
+
- Run docker:
```
@@ -74,4 +76,4 @@ steps:
npm run migrate:make
```
-Migrations are run automatically when the app initializes
+Migrations are run automatically when the app initializes.
| 0 |
diff --git a/README.md b/README.md @@ -106,9 +106,9 @@ GET https://api.spacexdata.com/parts/core=B1021
"orbit": "GTO",
"customer_1": "Bulgaria Sat",
"customer_2": "",
- "launch_success": "Success",
- "reused": "TRUE",
- "land_success": "Success",
+ "launch_success": true,
+ "reused": true,
+ "land_success": true,
"landing_type": "ASDS",
"mission_patch": "http://i.imgur.com/VAvulaO.png",
"article_link": "https://en.wikipedia.org/wiki/BulgariaSat-1",
| 3 |
diff --git a/test/fixtures/subdomain-multi-tenancy.js b/test/fixtures/subdomain-multi-tenancy.js @@ -105,7 +105,22 @@ SubdomainMultiTenancyFixture.prototype.before = function before(done) {
};
SubdomainMultiTenancyFixture.prototype.after = function after(done) {
- helpers.destroyApplication(this.config.application, done);
+ var self = this;
+
+ async.parallel({
+ basic: function (next) {
+ helpers.destroyApplication(self.config.application, next);
+ },
+ email: function (next) {
+ helpers.destroyApplication(self.emailVerificationConfig.application, next);
+ }
+ }, function (err) {
+ if (err) {
+ return done(err);
+ }
+
+ done();
+ });
};
SubdomainMultiTenancyFixture.prototype.assertTokenContainsOrg = function assertTokenContainsOrg(done, err, res) {
| 1 |
diff --git a/tools/git/hooks/pre-commit b/tools/git/hooks/pre-commit @@ -99,7 +99,7 @@ run_lint() {
fi
# Lint JavaScript source files...
- files=$(echo "${changed_files}" | grep '\.js$' | grep -v -e 'examples' -e 'test' -e 'benchmark' | tr '\n' ' ')
+ files=$(echo "${changed_files}" | grep '\.js$' | grep -v -e 'examples' -e 'test' -e 'benchmark' -e '^dist/' | tr '\n' ' ')
if [[ -n "${files}" ]]; then
make FILES="${files}" lint-javascript-files > /dev/null >&2
if [[ "$?" -ne 0 ]]; then
| 8 |
diff --git a/src/og/control/TouchNavigation.js b/src/og/control/TouchNavigation.js @@ -194,7 +194,7 @@ class TouchNavigation extends Control {
var l = 0.5 / cam.eye.distance(this.pointOnEarth) * cam._lonLat.height * math.RADIANS;
if (l > 0.007) l = 0.007;
cam.rotateHorizontal(l * t0.dX(), false, this.pointOnEarth, this.earthUp);
- cam.rotateVertical(l * t0.dY(), this.pointOnEarth);
+ cam.rotateVertical(l * t0.dY(), this.pointOnEarth, true);
cam.checkTerrainCollision();
cam.update();
}
| 0 |
diff --git a/packages/vue/src/components/list/ToggleButton.jsx b/packages/vue/src/components/list/ToggleButton.jsx @@ -21,7 +21,7 @@ const ToggleButton = {
componentId: types.stringRequired,
data: types.data,
dataField: types.stringRequired,
- defaultValue: types.stringOrArray,
+ defaultSelected: types.stringOrArray,
value: types.stringOrArray,
filterLabel: types.string,
nestedField: types.string,
@@ -35,7 +35,7 @@ const ToggleButton = {
},
data() {
const props = this.$props;
- const value = this.selectedValue || props.value || props.defaultValue || [];
+ const value = this.selectedValue || props.value || props.defaultSelected || [];
const currentValue = ToggleButton.parseValue(value, props);
this.__state = {
currentValue,
@@ -65,6 +65,9 @@ const ToggleButton = {
this.removeComponent(this.$props.componentId);
},
watch: {
+ defaultSelected(newVal) {
+ this.setValue(ToggleButton.parseValue(newVal, this.$props));
+ },
react() {
this.setReact(this.$props);
},
| 1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.