code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/utils/link/link-by-prompt.js b/src/utils/link/link-by-prompt.js @@ -3,7 +3,6 @@ const inquirer = require('inquirer')
const chalk = require('chalk')
const isEmpty = require('lodash.isempty')
const getRepoData = require('../get-repo-data')
-const { ensureNetlifyIgnore } = require('../gitignore')
const { track } = require('../telemetry')
module.exports = async function linkPrompts(context) {
@@ -164,9 +163,6 @@ Run ${chalk.cyanBright('`git remote -v`')} to see a list of your git remotes.`)
// Save site ID to config
state.set('siteId', site.id)
- // Add .netlify to .gitignore file
- await ensureNetlifyIgnore(site.root)
-
await track('sites_linked', {
siteId: site.id,
linkType: 'prompt',
| 2 |
diff --git a/src/lib/actions/Report.js b/src/lib/actions/Report.js @@ -172,18 +172,18 @@ function fetchHistory(reportID) {
/**
* Get the chat report ID, and then the history, for a chat report for a specific
- * set of patricipants
+ * set of participants
*
* @param {string[]} participants
+ * @returns {Promise}
*/
function fetchChatReport(participants) {
let currentAccountID;
let reportID;
- // Get the current users accountID which is used for checking if there are unread comments
+ // Get the current users accountID and set it aside in a local variable
+ // which is used for checking if there are unread comments
return Ion.get(IONKEYS.SESSION, 'accountID')
-
- // Set aside the accountID in a local variable
.then(accountID => currentAccountID = accountID)
// Make a request to get the reportID for this list of participants
@@ -191,7 +191,7 @@ function fetchChatReport(participants) {
emailList: participants.join(','),
}))
- // Set aside the reportID in a local variable
+ // Set aside the reportID in a local variable so it can be accessed in the rest of the chain
.then(data => reportID = data.reportID)
// Make a request to get all the information about the report
| 7 |
diff --git a/lib/pipeline/watch.js b/lib/pipeline/watch.js @@ -117,7 +117,7 @@ class Watch {
this.logger.trace(files);
let configWatcher = chokidar.watch(files, {
- ignored: /[\/\\]\./, persistent: true, ignoreInitial: true, followSymlinks: true
+ ignored: /[\/\\]\.|tmp_/, persistent: true, ignoreInitial: true, followSymlinks: true
});
this.fileWatchers.push(configWatcher);
| 8 |
diff --git a/app/components/Settings/Settings.jsx b/app/components/Settings/Settings.jsx @@ -14,6 +14,7 @@ import BackupSettings from "./BackupSettings";
import AccessSettings from "./AccessSettings";
import {set} from "lodash-es";
import {getAllowedLogins, getFaucet} from "../../branding";
+import {Input} from "bitshares-ui-style-guide";
class Settings extends React.Component {
constructor(props) {
@@ -344,10 +345,9 @@ class Settings extends React.Component {
break;
case "faucet_address":
entries = (
- <input
+ <Input
disabled={!getFaucet().editable}
type="text"
- className="settings-input"
defaultValue={settings.get("faucet_address")}
onChange={
getFaucet().editable
| 14 |
diff --git a/tests/phpunit/integration/Modules/AdSenseTest.php b/tests/phpunit/integration/Modules/AdSenseTest.php @@ -171,11 +171,7 @@ class AdSenseTest extends TestCase {
}
}
- /**
- * @dataProvider module_is_connected
- * @param bool $connected
- */
- public function test_adsense_platform_tags( $connected ) {
+ public function test_adsense_platform_tags() {
$adsense = new AdSense( new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
remove_all_actions( 'template_redirect' );
@@ -185,25 +181,8 @@ class AdSenseTest extends TestCase {
do_action( 'template_redirect' );
- if ( $connected ) {
- $options = new Options( new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
- $options->set(
- Settings::OPTION,
- array(
- 'accountSetupComplete' => true,
- 'siteSetupComplete' => true,
- )
- );
- }
-
$output = $this->capture_action( 'wp_head' );
- if ( $connected ) {
- $this->assertTrue( $adsense->is_connected() );
- } else {
- $this->assertFalse( $adsense->is_connected() );
- }
-
$this->assertContains( 'google-adsense-platform-account', $output );
$this->assertContains( 'ca-host-pub-2644536267352236', $output );
@@ -212,17 +191,6 @@ class AdSenseTest extends TestCase {
}
- public function module_is_connected() {
- return array(
- 'Not Connected' => array(
- false,
- ),
- 'Connected' => array(
- true,
- ),
- );
- }
-
/**
* @dataProvider block_on_consent_provider
* @param bool $enabled
| 2 |
diff --git a/app/models/mission/MissionTable.scala b/app/models/mission/MissionTable.scala @@ -643,6 +643,8 @@ object MissionTable {
/**
* Creates a new audit mission entry in mission table for the specified user/region id.
*
+ * NOTE only call from queryMissionTable or queryMissionTableValidationMissions funcs to prevent race conditions.
+ *
* @param userId
* @param regionId
* @param pay
@@ -658,6 +660,9 @@ object MissionTable {
/**
* Creates and returns a new validation mission
+ *
+ * NOTE only call from queryMissionTable or queryMissionTableValidationMissions funcs to prevent race conditions.
+ *
* @param userId User ID
* @param pay Amount user is paid per label
* @param labelsToValidate Number of labels in this mission
@@ -688,6 +693,8 @@ object MissionTable {
/**
* Creates a new auditOnboarding mission entry in the mission table for the specified user.
*
+ * NOTE only call from queryMissionTable or queryMissionTableValidationMissions funcs to prevent race conditions.
+ *
* @param userId
* @param pay
* @return
@@ -703,6 +710,8 @@ object MissionTable {
/**
* Marks the specified mission as complete, filling in mission_end timestamp.
*
+ * NOTE only call from queryMissionTable or queryMissionTableValidationMissions funcs to prevent race conditions.
+ *
* @param missionId
* @return Int number of rows updated (should always be 1).
*/
@@ -715,7 +724,9 @@ object MissionTable {
}
/**
- * Marks the specifed mission as skipped.
+ * Marks the specified mission as skipped.
+ *
+ * NOTE only call from queryMissionTable or queryMissionTableValidationMissions funcs to prevent race conditions.
*
* @param missionId
* @return
@@ -730,6 +741,8 @@ object MissionTable {
/**
* Updates the distance_progress column of a mission.
*
+ * NOTE only call from queryMissionTable or queryMissionTableValidationMissions funcs to prevent race conditions.
+ *
* @param missionId
* @param distanceProgress
* @return Int number of rows updated (should always be 1 if successful, 0 otherwise).
@@ -757,6 +770,15 @@ object MissionTable {
}
}
+ /**
+ * Updates the labels_validated column of a mission.
+ *
+ * NOTE only call from queryMissionTable or queryMissionTableValidationMissions funcs to prevent race conditions.
+ *
+ * @param missionId
+ * @param labelsProgress
+ * @return
+ */
def updateValidationProgress(missionId: Int, labelsProgress: Int): Int = db.withSession { implicit session =>
val now: Timestamp = new Timestamp(Instant.now.toEpochMilli)
val missionLabels: Int = missions.filter(_.missionId === missionId).map(_.labelsValidated).list.head.get
| 3 |
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js @@ -381,7 +381,7 @@ export class stepThree extends React.Component {
mutators={{ ...arrayMutators }}
initialValues={{
walletAddress: tierStore.tiers[0].walletAddress,
- minCap: 0,
+ minCap: '',
gasPrice: this.gasPrices[0],
whitelistEnabled: "no",
tiers: this.initialTiers
| 12 |
diff --git a/packages/core/src/PlayerContextProvider.js b/packages/core/src/PlayerContextProvider.js @@ -186,7 +186,9 @@ export class PlayerContextProvider extends Component {
this.videoHostVacatedCallbacks = new Map();
// bind internal methods
- this.onTrackPlaybackFailure = this.onTrackPlaybackFailure.bind(this);
+ this.handleTrackPlaybackFailure = this.handleTrackPlaybackFailure.bind(
+ this
+ );
// bind callback methods to pass to descendant elements
this.togglePause = this.togglePause.bind(this);
@@ -496,7 +498,10 @@ export class PlayerContextProvider extends Component {
const sourceElements = media.querySelectorAll('source');
for (const sourceElement of sourceElements) {
- sourceElement.removeEventListener('error', this.onTrackPlaybackFailure);
+ sourceElement.removeEventListener(
+ 'error',
+ this.handleTrackPlaybackFailure
+ );
}
}
clearTimeout(this.gapLengthTimeout);
@@ -561,7 +566,10 @@ export class PlayerContextProvider extends Component {
if (source.type) {
sourceElement.type = source.type;
}
- sourceElement.addEventListener('error', this.onTrackPlaybackFailure);
+ sourceElement.addEventListener(
+ 'error',
+ this.handleTrackPlaybackFailure
+ );
this.media.appendChild(sourceElement);
}
}
@@ -569,7 +577,7 @@ export class PlayerContextProvider extends Component {
this.media.load();
}
- onTrackPlaybackFailure(event) {
+ handleTrackPlaybackFailure(event) {
this.setState({
mediaCannotPlay: true
});
| 10 |
diff --git a/app/views/admin/client_applications/api_key.html.erb b/app/views/admin/client_applications/api_key.html.erb </div>
+<% if current_user.has_feature_flag?('new-dashboard-feature') %>
<%= render 'admin/shared/new_private_footer' %>
+<% else %>
+ <%= render 'admin/shared/footer' %>
+<% end %>
<% if @has_new_dashboard %>
<%= javascript_include_tag 'common', 'common_vendor', 'api_keys_new' %>
| 12 |
diff --git a/Source/dom/models/DataOverride.js b/Source/dom/models/DataOverride.js @@ -18,7 +18,13 @@ if (typeof MSDataOverride !== 'undefined') {
DataOverride.define('override', {
get() {
- return Override.fromNative(this._object.availableOverride())
+ const wrapped = Override.fromNative(this._object.availableOverride())
+ Object.defineProperty(wrapped, '__symbolInstance', {
+ writable: false,
+ enumerable: false,
+ value: this.symbolInstance,
+ })
+ return wrapped
},
})
| 12 |
diff --git a/token-metadata/0xF5D0FefAaB749d8B14C27F0De60cC6e9e7f848d1/metadata.json b/token-metadata/0xF5D0FefAaB749d8B14C27F0De60cC6e9e7f848d1/metadata.json "symbol": "YFARM",
"address": "0xF5D0FefAaB749d8B14C27F0De60cC6e9e7f848d1",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/Sidebar/LatestRecommendations.less b/src/components/Sidebar/LatestRecommendations.less margin: 12px;
background-color: #e9e7e7;
}
+
+.Recommendation {
+ &__author {
+ font-weight: bold;
+ }
+ &__bullet:after {
+ content: '\2022';
+ font-size: 14px;
+ margin-left: 4px;
+ }
+ &__date {
+ margin-left: 4px;
+ color: #99aab5;
+ font-size: 14px;
+ }
+}
| 3 |
diff --git a/.eslintrc b/.eslintrc "no-trailing-spaces": ["warn"],
"no-undef": ["error"],
"no-unexpected-multiline": ["warn"],
- "no-unused-vars": ["warn", {"caughtErrors":"all", "caughtErrorsIgnorePattern": "^unused($|[A-Z].*$)"}],
+ "no-unused-vars": ["warn", {"caughtErrors":"all", "caughtErrorsIgnorePattern": "^unused($|[A-Z].*$)", "argsIgnorePattern": "^unused($|[A-Z].*$)", "varsIgnorePattern": "^unused($|[A-Z].*$)" }],
"no-use-before-define": ["error", {"functions":false}],
"one-var": ["warn", "never"],
"quotes": ["warn", "single", {"avoidEscape":false, "allowTemplateLiterals":true}],
| 0 |
diff --git a/src/components/profile/Profile.js b/src/components/profile/Profile.js @@ -11,12 +11,10 @@ import ProfileDataTable from './ProfileDataTable'
const log = logger.child({ from: 'Profile' })
const EditIcon = props => <IconButton {...props} name="edit" />
-const PrivateIcon = props => <IconButton {...props} name="visibility" />
+const PrivateIcon = props => <View style={{ width: '66px', height: '66px' }} />
const IconButton = ({ onPress, disabled, ...iconProps }) => (
- <View style={styles.icon}>
<Icon onPress={onPress} raised color="rgb(85, 85, 85)" {...iconProps} />
- </View>
)
const Profile = props => {
@@ -45,9 +43,6 @@ const styles = StyleSheet.create({
paddingRight: '1em',
marginBottom: 'auto',
minHeight: '100%'
- },
- icon: {
- cursor: 'pointer'
}
})
| 2 |
diff --git a/contracts/modules/Checkpoint/ERC20DividendCheckpoint.sol b/contracts/modules/Checkpoint/ERC20DividendCheckpoint.sol @@ -144,14 +144,14 @@ contract ERC20DividendCheckpoint is DividendCheckpoint {
dividends[dividends.length - 1].dividendExcluded[_excluded[j]] = true;
}
dividendTokens[dividendIndex] = _token;
- _CallERC20DividendDepositedEvent(_checkpointId, _maturity, _expiry, _token, _amount, currentSupply, dividendIndex, _name);
+ _emitERC20DividendDepositedEvent(_checkpointId, _maturity, _expiry, _token, _amount, currentSupply, dividendIndex, _name);
}
/**
* @notice emits the ERC20DividendDeposited event.
- * Seperated into a different function to work around the Stack too deep error
+ * Seperated into a different function as a workaround for stack too deep error
*/
- function _CallERC20DividendDepositedEvent(uint256 _checkpointId, uint256 _maturity, uint256 _expiry, address _token, uint256 _amount, uint256 currentSupply, uint256 dividendIndex, string _name) internal {
+ function _emitERC20DividendDepositedEvent(uint256 _checkpointId, uint256 _maturity, uint256 _expiry, address _token, uint256 _amount, uint256 currentSupply, uint256 dividendIndex, string _name) internal {
emit ERC20DividendDeposited(msg.sender, _checkpointId, now, _maturity, _expiry, _token, _amount, currentSupply, dividendIndex, _name);
}
| 10 |
diff --git a/lib/cartodb/middleware/rate-limit.js b/lib/cartodb/middleware/rate-limit.js @@ -49,9 +49,9 @@ function rateLimitFn(userLimitsApi, endpointGroup = null) {
});
if (isBlocked) {
- const err = new Error('You are over the limits.');
- err.http_status = 429;
- return next(err);
+ const rateLimitError = new Error('You are over the limits.');
+ rateLimitError.http_status = 429;
+ return next(rateLimitError);
}
return next();
| 1 |
diff --git a/pages/06.data-sources/01.formats/docs.md b/pages/06.data-sources/01.formats/docs.md @@ -24,7 +24,7 @@ Select2 can render programmatically supplied data from an array or remote data s
}
```
-Each object should contain, _at a minimum_, an `id` and a `text` property. Any additional parameters passed in with data objects will be included on the data objects that Select2 exposes.
+Select2 requires that each object contain an `id` and a `text` property. Additional parameters passed in with data objects will be included on the data objects that Select2 exposes.
The response object may also contain pagination data, if you would like to use the "infinite scroll" feature. This should be specified under the `pagination` key.
| 7 |
diff --git a/OurUmbraco.Client/src/scss/pages/_forum.scss b/OurUmbraco.Client/src/scss/pages/_forum.scss display: flex;
flex: 0 0 100%;
flex-wrap: wrap;
-
background: none;
padding: 0;
&-settings {
flex-direction: row;
flex-wrap: wrap;
-
align-items: center;
-
padding: 0 10px;
.search-big {
.or {
flex: 0 0 5%;
-
color: darken($color-space, 25%);
font-size: 1.1rem;
text-align: center;
select, input {
font-size: .95rem;
color: $color-space;
-
border: 2px solid rgba($color-space, .33);
-
transition: border 150ms ease;
&:hover {
@media (min-width: $md) {
display: flex;
-
padding: 20px 15px;
border-bottom: 1px solid whitesmoke;
-
font-size: .8rem;
text-transform: uppercase;
font-weight: bold;
-
letter-spacing: .5px;
}
}
flex-direction: column;
.posts {
-
display: flex;
flex-direction: column;
}
-
}
.topic-row {
padding: 25px 15px;
-
display: flex;
flex-direction: column;
align-items: flex-start;
-
border-bottom: 1px solid rgba($color-space, .11);
@media (min-width: $md) {
.topic {
font-size: 1.15rem;
line-height: 1.3;
-
order: 2;
h3 {
a {
text-decoration: none;
display: block;
-
color: #000;
&:hover {
.topic {
order: 2;
-
margin: 10px 0;
@media (min-width: $md) {
flex: 0 0 50%;
margin: 0 10% 0 0;
-
order: 1;
}
}
@media (min-width: $md) {
flex: 0 0 28%;
margin-right: 2%;
-
order: 2;
}
}
.posts {
order: 3;
-
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
-
font-size: .8rem;
small {
@media (min-width: $md) {
text-align: center;
-
flex-direction: column;
small {
.sorting {
display: flex;
justify-content: flex-end;
-
margin-left: auto;
select {
border-radius: 0;
-
padding: 20px 20px 20px 10px;
-
background-position: 95% center;
&:focus, &:hover {
color: black;
-
background-position: 95% center;
}
}
margin-top: 0;
}
}
+
.search-options {
margin: 10px 0 40px;
width: 100%;
appearance: none;
width: 100%;
height: 100%;
-
padding: 15px 0;
margin: 0;
-
cursor: pointer;
-
border: 2px solid rgba($color-space, .22);
-
transition: border 150ms ease;
-
outline: none;
&:hover {
span {
position: relative;
flex: 1 1 auto;
-
display: flex;
justify-content: center;
align-items: center;
-
text-align: center;
-
min-height: 50px;
&:last-child {
color: rgba($color-space, .66);
transition: color 150ms ease;
font-size: .7rem;
-
text-align: center;
@media(min-width: $md) {
}
}
}
-
}
padding: 5px 17px 9px 13px;
min-width: 115px;
width: auto;
-
font-size: .9rem;
@include transition(all, .2s);
+ .button {
margin-left: .5rem;
-
}
}
@extend .green;
-
font-weight: bold;
- padding: 12px 30px;
+ padding: 9px 30px 13px 26px;
i {
font-family: $font-family;
position: relative;
overflow: hidden;
-
-webkit-appearance: none;
-moz-appearance: none;
-
background: #fff url('/assets/images/selectdown_unfocus.svg');
background-size: 11px 13px;
background-repeat: no-repeat;
background-position: 95% center;
-
color: $color-space;
-
width: 100%;
@include transition(border, .3s);
| 3 |
diff --git a/edit.html b/edit.html <div class=row>
<a id=tool-1 class="tool selected" tool="camera">
<i class="fal fa-camera"></i>
- <div class=label>Camera tool</div>
+ <div class=label>Camera tool [ESC]</div>
</a>
<a id=tool-2 class="tool" tool="firstperson">
<i class="fal fa-eye"></i>
- <div class=label>First person</div>
+ <div class=label>First person [V]</div>
</a>
<a id=tool-3 class="tool" tool="thirdperson">
<i class="fal fa-walking"></i>
- <div class=label>Third person</div>
+ <div class=label>Third person [B]</div>
</a>
<a id=tool-4 class="tool" tool="isometric">
<i class="fal fa-cubes"></i>
- <div class=label>Isometric view</div>
+ <div class=label>Isometric view [N]</div>
</a>
<a id=tool-5 class="tool" tool="birdseye">
<i class="fal fa-feather-alt"></i>
- <div class=label>Birds eye view</div>
+ <div class=label>Birds eye view [M]</div>
</a>
</div>
</div>
<div class=row>
<a id=weapon-1 class="weapon selected" weapon="unarmed">
<i class="fal fa-hand-paper"></i>
- <div class=label>Empty hand</div>
+ <div class=label>Empty hand [1]</div>
</a>
<a id=weapon-2 class="weapon" weapon="rifle">
<i class="fal fa-scythe"></i>
- <div class=label>Rifle</div>
+ <div class=label>Rifle [2]</div>
</a>
<a id=weapon-3 class="weapon" weapon="grenade">
<i class="fal fa-bomb"></i>
- <div class=label>Grenade</div>
+ <div class=label>Grenade [3]</div>
</a>
<a id=weapon-4 class="weapon" weapon="pickaxe">
<i class="fal fa-axe"></i>
- <div class=label>Pickaxe</div>
+ <div class=label>Pickaxe [4]</div>
</a>
<a id=weapon-5 class="weapon" weapon="shovel">
<i class="fal fa-shovel"></i>
- <div class=label>Shovel</div>
+ <div class=label>Shovel [5]</div>
</a>
<a id=weapon-6 class="weapon" weapon="build">
<i class="fal fa-map"></i>
- <div class=label>Build</div>
+ <div class=label>Build [6]</div>
</a>
<a id=weapon-7 class="weapon" weapon="shapes">
<i class="fal fa-cube"></i>
- <div class=label>Shapes</div>
+ <div class=label>Shapes [7]</div>
</a>
<a id=weapon-8 class="weapon" weapon="light">
<i class="fal fa-bolt"></i>
- <div class=label>Light</div>
+ <div class=label>Light [8]</div>
</a>
<a id=weapon-9 class="weapon" weapon="pencil">
<i class="fal fa-pencil"></i>
- <div class=label>Pencil</div>
+ <div class=label>Pencil [9]</div>
</a>
<a id=weapon-10 class="weapon" weapon="paintbrush">
<i class="fal fa-brush"></i>
- <div class=label>Paintbrush</div>
+ <div class=label>Paintbrush [10]</div>
</a>
<a id=weapon-11 class="weapon" weapon="select">
<i class="fal fa-mouse-pointer"></i>
- <div class=label>Select</div>
+ <div class=label>Select [11]</div>
</a>
<a id=weapon-12 class="weapon" weapon="physics">
<i class="fal fa-raygun"></i>
- <div class=label>Physics</div>
+ <div class=label>Physics [12]</div>
</a>
</div>
</div>
| 0 |
diff --git a/articles/quickstart/native/android-vnext/00-login.md b/articles/quickstart/native/android-vnext/00-login.md @@ -98,11 +98,6 @@ For more information about using Gradle, check the [Gradle official documentatio
[Universal Login](/hosted-pages/login) is the easiest way to set up authentication in your application. We recommend using it for the best experience, best security and the fullest array of features.
-::: note
-You can also embed the login dialog directly in your application using the [Lock widget](/lock). If you use this method, some features, such as single sign-on, will not be accessible.
-To learn how to embed the Lock widget in your application, follow the [Embedded Login sample](https://github.com/auth0-samples/auth0-android-sample/tree/embedded-login/01-Embedded-Login). Make sure you read the [Browser-Based vs. Native Login Flows on Mobile Devices](/tutorials/browser-based-vs-native-experience-on-mobile) article to learn how to choose between the two types of login flows.
-:::
-
In the `onCreate` method, create a new instance of the `Auth0` class to hold user credentials:
```kotlin
| 2 |
diff --git a/web-stories.php b/web-stories.php * Plugin URI: https://wp.stories.google/
* Author: Google
* Author URI: https://opensource.google.com/
- * Version: 1.10.0-alpha.0
+ * Version: 1.10.0-rc.1
* Requires at least: 5.5
* Requires PHP: 7.0
* Text Domain: web-stories
@@ -40,7 +40,7 @@ if ( ! defined( 'ABSPATH' ) ) {
exit;
}
-define( 'WEBSTORIES_VERSION', '1.10.0-alpha.0' );
+define( 'WEBSTORIES_VERSION', '1.10.0-rc.1' );
define( 'WEBSTORIES_DB_VERSION', '3.0.11' );
define( 'WEBSTORIES_AMP_VERSION', '2.1.3' ); // Version of the AMP library included in the plugin.
define( 'WEBSTORIES_PLUGIN_FILE', __FILE__ );
| 6 |
diff --git a/package.json b/package.json "type": "git",
"url": "git+https://github.com/dherault/serverless-offline.git"
},
- "release": {
- "branch": "master"
- },
"keywords": [
"Serverless",
"Amazon Web Services",
"eslint-config-nelson": "^0.2.0",
"eslint-plugin-import": "^2.14.0",
"mocha": "^5.2.0",
- "semantic-release": "^15.13.3",
"sinon": "^6.2.0"
}
}
| 2 |
diff --git a/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.js b/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color-picker/input-color-picker-header.js @@ -13,7 +13,7 @@ module.exports = CoreView.extend({
},
initialize: function (opts) {
- this._initBinds();
+ this.listenTo(this.model, 'change', this.render);
},
render: function (model, options) {
@@ -80,10 +80,6 @@ module.exports = CoreView.extend({
this.$('.js-image-container').append(this.iconView.render().el);
},
- _initBinds: function () {
- this.model.bind('change', this.render, this);
- },
-
_onClickColor: function (ev) {
this.killEvent(ev);
this.model.set('index', $(ev.target).index());
| 2 |
diff --git a/package.json b/package.json "css-loader": "^3.6.0",
"cssnano": "^4.1.10",
"eslint": "^7.20.0",
- "eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^22.21.0",
| 2 |
diff --git a/index.d.ts b/index.d.ts +/// <reference lib="es2015.generator" />
+/// <reference lib="es2015.iterable" />
+
declare module 'fluture' {
export interface RecoverFunction {
@@ -20,24 +23,6 @@ declare module 'fluture' {
(err: E | null, value?: R): void
}
- export interface Next<T> {
- done: boolean
- value: T
- }
-
- export interface Done<T> {
- done: boolean
- value: T
- }
-
- export interface Iterator<N, D> {
- next(value?: N): Next<N> | Done<D>
- }
-
- export interface Generator<Y, R> {
- (): Iterator<Y, R>
- }
-
export interface ConcurrentFutureInstance<L, R> {
sequential: FutureInstance<L, R>
'fantasy-land/ap'<A, B>(this: ConcurrentFutureInstance<L, (value: A) => B>, right: ConcurrentFutureInstance<L, A>): ConcurrentFutureInstance<L, B>
@@ -131,7 +116,7 @@ declare module 'fluture' {
export function forkCatch(recover: RecoverFunction): <L>(reject: RejectFunction<L>) => <R>(resolve: ResolveFunction<R>) => (source: FutureInstance<L, R>) => Cancel
/** Build a coroutine using Futures. See https://github.com/fluture-js/Fluture#go */
- export function go<L, R>(generator: Generator<FutureInstance<L, any>, R>): FutureInstance<L, R>
+ export function go<L, R>(generator: () => Generator<FutureInstance<L, any>, R>): FutureInstance<L, R>
/** Manage resources before and after the computation that needs them. See https://github.com/fluture-js/Fluture#hook */
export function hook<L, H>(acquire: FutureInstance<L, H>): (dispose: (handle: H) => FutureInstance<any, any>) => <R>(consume: (handle: H) => FutureInstance<L, R>) => FutureInstance<L, R>
@@ -198,7 +183,7 @@ declare module 'fluture' {
resolve: ResolveFunction<R>
) => Cancel): FutureInstance<L, R>
- 'fantasy-land/chainRec'<L, I, R>(iterator: (next: (value: I) => Next<I>, done: (value: R) => Done<R>, value: I) => FutureInstance<L, Next<I> | Done<R>>, initial: I): FutureInstance<L, R>
+ 'fantasy-land/chainRec'<L, I, R>(iterator: (next: (value: I) => IteratorYieldResult<I>, done: (value: R) => IteratorReturnResult<R>, value: I) => FutureInstance<L, IteratorYieldResult<I> | IteratorReturnResult<R>>, initial: I): FutureInstance<L, R>
'fantasy-land/of': typeof resolve
'@@type': string
| 4 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -7,6 +7,7 @@ import ShoulderTransforms from './vrarmik/ShoulderTransforms.js';
import LegsManager from './vrarmik/LegsManager.js';
// import {world} from '../world.js';
import MicrophoneWorker from './microphone-worker.js';
+import {AudioRecognizer} from '../audio-recognizer.js';
// import skeletonString from './skeleton.js';
import {angleDifference, getVelocityDampingFactor} from '../util.js';
// import physicsManager from '../physics-manager.js';
@@ -734,6 +735,7 @@ class Avatar {
this.flipY = flipY;
this.flipLeg = flipLeg;
// this.retargetedAnimations = retargetedAnimations;
+ this.vowels = new Float32Array(5);
/* if (options.debug) {
const debugMeshes = _makeDebugMeshes();
@@ -2638,11 +2640,23 @@ class Avatar {
this.microphoneWorker = null;
}
if (microphoneMediaStream) {
+ this.volume = 0;
+
this.microphoneWorker = new MicrophoneWorker(microphoneMediaStream, options);
this.microphoneWorker.addEventListener('volume', e => {
this.volume = this.volume*0.8 + e.data*0.2;
});
- this.volume = 0;
+ this.microphoneWorker.addEventListener('buffer', e => {
+ this.audioRecognizer.send(e.data);
+ });
+
+ this.audioRecognizer = new AudioRecognizer({
+ sampleRate: options.audioContext.sampleRate,
+ });
+ this.audioRecognizer.addEventListener('result', e => {
+ this.vowels.set(e.data);
+ console.log('got vowels', this.vowels.join(','));
+ });
} else {
this.volume = -1;
}
| 0 |
diff --git a/lib/assets/test/spec/dashboard/views/api-keys/api-keys-form-view.spec.js b/lib/assets/test/spec/dashboard/views/api-keys/api-keys-form-view.spec.js @@ -382,7 +382,7 @@ describe('dashboard/views/api-keys/api-keys-form-view', function () {
});
it('should add api key name error when request fails', function () {
- spyOn(view, '_addApiKeyNameError');
+ spyOn(view, '_handleError');
spyOn(view._apiKeysCollection, 'create').and.callFake(function (attributes, options) {
options.success && options.error(null, {
responseText: 'Name has already been taken'
@@ -391,7 +391,7 @@ describe('dashboard/views/api-keys/api-keys-form-view', function () {
view._onFormSubmit();
- expect(view._addApiKeyNameError).toHaveBeenCalled();
+ expect(view._handleError).toHaveBeenCalled();
});
});
});
| 9 |
diff --git a/admin-base/ui.apps/src/main/js/apiImpl.js b/admin-base/ui.apps/src/main/js/apiImpl.js @@ -608,9 +608,11 @@ class PerAdminImpl {
})
.then(function(){
let nodes = ''
- if (path.includes("/pages/")) {
+ const pagesRgx = new RegExp('^\/content\/[^\/]+\/pages\/');
+ const templatesRgx = new RegExp('^\/content\/[^\/]+\/templates\/');
+ if (pagesRgx.test(path)) {
nodes = $perAdminApp.getView().state.tools.pages
- } else if (path.includes("/templates/")){
+ } else if (templatesRgx.test(path)){
nodes = $perAdminApp.getView().state.tools.templates
}
if (nodes != '') {
| 7 |
diff --git a/modules/ringo/term.js b/modules/ringo/term.js * @see http://en.wikipedia.org/wiki/ANSI_escape_code
*/
-var system = require('system');
-var {Stream, TextStream} = require('io');
-var System = java.lang.System;
+const system = require('system');
+const {Stream, TextStream} = require('io');
+const System = java.lang.System;
-var env = system.env;
-var supportedTerminals = {
+const env = system.env;
+const supportedTerminals = {
'ansi': 1,
'vt100': 1,
'xterm': 1,
@@ -30,8 +30,8 @@ var supportedTerminals = {
'gnome-terminal': 1
};
-var javaConsole = System.console() || System.out;
-var enabled = env.TERM && env.TERM in supportedTerminals;
+const javaConsole = System.console() || System.out;
+const enabled = env.TERM && env.TERM in supportedTerminals;
exports.RESET = "\u001B[0m";
exports.BOLD = "\u001B[1m";
@@ -57,15 +57,15 @@ exports.ONCYAN = "\u001B[46m";
exports.ONWHITE = "\u001B[47m";
// used to remove ANSI control sequences if disabled
-var cleaner = /\u001B\[\d*(?:;\d+)?[a-zA-Z]/g;
+const cleaner = /\u001B\[\d*(?:;\d+)?[a-zA-Z]/g;
// used to check if a string consists only of ANSI control sequences
-var matcher = /^(?:\u001B\[\d*(?:;\d+)?[a-zA-Z])+$/;
+const matcher = /^(?:\u001B\[\d*(?:;\d+)?[a-zA-Z])+$/;
/**
* Creates a terminal writer that writes to the Java console.
* @param {Stream} out a TextStream
*/
-var TermWriter = exports.TermWriter = function() {
+const TermWriter = exports.TermWriter = function() {
if (!(this instanceof TermWriter)) {
return new TermWriter();
@@ -73,10 +73,10 @@ var TermWriter = exports.TermWriter = function() {
// edge case: a JVM can exist without a console
if (javaConsole === null) {
- throw "No console associated with the current JVM.";
+ throw new Error("No console associated with the current JVM.");
}
- var _enabled = enabled;
+ let _enabled = enabled;
/**
* Enable or disable ANSI terminal colors for this writer.
@@ -99,9 +99,9 @@ var TermWriter = exports.TermWriter = function() {
* enabled is true.
* @param {*...} args... variable number of arguments to write
*/
- this.write = function() {
+ const write = this.write = function() {
for (var i = 0; i < arguments.length; i++) {
- var arg = String(arguments[i]);
+ let arg = String(arguments[i]);
if (!_enabled) {
arg = arg.replace(cleaner, '');
}
@@ -118,12 +118,12 @@ var TermWriter = exports.TermWriter = function() {
* @param {*...} args... variable number of arguments to write
*/
this.writeln = function() {
- this.write.apply(this, arguments);
+ write.apply(this, arguments);
javaConsole.printf((_enabled ? exports.RESET : "") + "\n");
};
};
-var tw = new TermWriter();
+const tw = new TermWriter();
/**
* Write the arguments to `system.stdout`, applying ANSI terminal colors if
* support has been detected.
| 4 |
diff --git a/src/react/projects/spark-core-react/src/SprkTabs/SprkTabs.js b/src/react/projects/spark-core-react/src/SprkTabs/SprkTabs.js @@ -35,12 +35,11 @@ class SprkTabs extends Component {
*/
componentDidMount() {
const { breakpoint } = this.props;
- const tabsContainer = this.tabsContainerRef;
this.setDefaultActiveTab();
- this.updateAriaOrientation(window.innerWidth, tabsContainer, breakpoint);
+ this.updateAriaOrientation(window.innerWidth, breakpoint);
window.addEventListener('resize', () => {
- this.updateAriaOrientation(window.innerWidth, tabsContainer, breakpoint);
+ this.updateAriaOrientation(window.innerWidth, breakpoint);
});
}
@@ -156,14 +155,13 @@ class SprkTabs extends Component {
* Switch aria-orientation to vertical on
* narrow viewports (based on _tabs.scss breakpoint).
*/
- updateAriaOrientation(width, element, breakpoint) {
- this.width = width;
- this.element = element;
- this.breakpoint = breakpoint;
+ updateAriaOrientation(width, breakpoint) {
+ const tabsContainer = this.tabsContainerRef;
+
if (width <= breakpoint) {
- element.current.setAttribute('aria-orientation', 'vertical');
+ tabsContainer.current.setAttribute('aria-orientation', 'vertical');
} else {
- element.current.setAttribute('aria-orientation', 'horizontal');
+ tabsContainer.current.setAttribute('aria-orientation', 'horizontal');
}
}
| 3 |
diff --git a/package.json b/package.json "prerelease-zip": "npm run build",
"release-zip": "npm run zip",
"pretest": "npm run build:production -- --display=none",
- "pretest:visualtest": "npm run build:storybook",
+ "pretest:visualtest": "VRT=1 npm run build:storybook",
"test": "npm run test:js:watch",
"test:visualtest": "npm run backstopjs -- --storybook-host=./dist/",
"test:visualapprove": "backstop approve --config=tests/backstop/config.js",
| 12 |
diff --git a/src/middleware/packages/webacl/services/group/index.js b/src/middleware/packages/webacl/services/group/index.js +const urlJoin = require('url-join');
const createAction = require('./actions/create');
const deleteAction = require('./actions/delete');
const existAction = require('./actions/exist');
@@ -43,9 +44,11 @@ module.exports = {
if (!groupExists) {
this.logger.info("Super admin group doesn't exist, creating it...");
- const { groupUri } = await this.actions.create({ groupSlug: 'superadmins', webId: 'system' });
+ await this.actions.create({ groupSlug: 'superadmins', webId: 'system' });
+ }
// Give full rights to root container
+ const groupUri = urlJoin(this.settings.baseUrl, '_groups', 'superadmins');
await this.broker.call('webacl.resource.addRights', {
resourceUri: this.settings.baseUrl,
additionalRights: {
@@ -66,18 +69,17 @@ module.exports = {
},
webId: 'system'
});
- }
for (let memberUri of this.settings.superAdmins) {
const isMember = await this.actions.isMember({
- groupSlug: 'superadmins',
+ groupUri,
memberId: memberUri,
webId: 'system'
});
if (!isMember) {
- console.log(`User ${memberUri} is not member of superadmin group, adding it...`);
- await this.actions.addMember({ groupSlug: 'superadmins', memberUri, webId: 'system' });
+ console.log(`User ${memberUri} is not member of superadmins group, adding it...`);
+ await this.actions.addMember({ groupUri, memberUri, webId: 'system' });
}
}
}
| 12 |
diff --git a/src/lib/API/wrappedApi.js b/src/lib/API/wrappedApi.js @@ -34,7 +34,9 @@ export const useApi = () => {
return function(...args) {
beforeFetching()
let result = origMethod.apply(target, args)
+ if (isFunction(result.then)) {
result.then(afterFetching).catch(errorHandler)
+ }
return result
}
}
| 0 |
diff --git a/item-spec/README.md b/item-spec/README.md @@ -27,29 +27,3 @@ discussion of the examples.
## Schema Validation
Instruction on schema validation for STAC Items can be found in the [validation instructions](../validation/README.md).
-
-## Item Evolution
-
-STAC Items are still a work in progress, and feedback is very much appreciated. The core fields
-were designed to be quite flexible, adapting to many different data organization schemes.
-Organizations are encouraged to adapt the core fields to their needs, finding any limitations that
-would need to be addressed the specification.
-
-Implementors are encouraged to publish their implementations, ideally including them in the
-[implementations list](https://stacspec.org/#examples) for others to lean from.
-This will enable a spreading of best practices, as organizations can see how others implemented
-similar concepts and adopt them. These should eventually evolve in to extensions that are widely
-used.
-
-There is already some first iterations of shared fields in the [extensions/](../extensions/README.md)
-folder, which is used mostly to represent additional domain-specific information. The core STAC
-fields were made to be flexible to a variety of assets. But there is a lot of value in shared
-fields that may not apply to every STAC data type, but are shared by a certain domain. There is a
-just released 'extension' for satellite imagery, in the 'EO extension', so try to use it if you
-are providing satellite imagery data.
-
-The evolution of the STAC Item spec will take place in this repository, primarily informed by the
-real world implementations that people create. The goal is for the core Item spec to remain
-quite small and stable, with most all the evolution taking place in extensions. Once there is
-a critical mass of implementations utilizing different extensions the core Item spec will lock
-down to a 1.0.
| 2 |
diff --git a/src/util/config/schema.js b/src/util/config/schema.js @@ -54,7 +54,7 @@ const feedsSchema = Joi.object({
})
const advancedSchema = Joi.object({
- shards: Joi.number().greater(0).strict().default(1),
+ shards: Joi.number().greater(-1).strict().default(0),
batchSize: Joi.number().greater(0).strict().default(400),
parallelBatches: Joi.number().greater(0).strict().default(1)
})
| 12 |
diff --git a/js/webcomponents/bisweb_filetreepanel.js b/js/webcomponents/bisweb_filetreepanel.js @@ -95,14 +95,6 @@ class FileTreePanel extends HTMLElement {
'action': (node) => {
this.openTagSettingPopover(node);
}
- },
- 'Chart' : {
- 'separator_before': false,
- 'separator_after': false,
- 'label': 'Show VOI Chart',
- 'action': (node) => {
- this.createVolumeChart(node);
- }
}
};
}
@@ -736,9 +728,9 @@ class FileTreePanel extends HTMLElement {
return parseInt(this.panel.getWidget().css('width'), 10);
}
- createVolumeChart() {
+ /*createVolumeChart() {
this.graphelement.parsePaintedAreaAverageTimeSeries(this.viewer, this.getPanelWidth());
- }
+ }*/
}
| 2 |
diff --git a/src/utils.js b/src/utils.js @@ -47,7 +47,7 @@ export const newClient = () => {
* in functions such as <a href="#module-Apify-getValue">Apify.getValue()</a>
* or <a href="#module-Apify-call">Apify.call()</a>.
* The settings of the client can be globally altered by calling the
- * <a href="https://www.apify.com/docs/js/apify-client-js/latest#ApifyClient-setOptions"><code>Apify.client.setOptions()</code></a> function.
+ * <a href="https://www.apify.com/docs/sdk/apify-client-js/latest#ApifyClient-setOptions"><code>Apify.client.setOptions()</code></a> function.
* Just be careful, it might have undesired effects on other functions provided by this package.
*
* @memberof module:Apify
| 1 |
diff --git a/sirepo/pkcli/synergia.py b/sirepo/pkcli/synergia.py @@ -91,7 +91,7 @@ def _run_twiss_report(data, twiss):
plots.append({
'name': report[yfield],
'points': [],
- 'label': template.label(report[yfield]),
+ 'label': template.label(report[yfield], _SCHEMA['enum']['TwissParameter']),
'color': _PLOT_LINE_COLOR[yfield],
})
for row in twiss:
| 7 |
diff --git a/.github/workflows/docsearchConfigScript.js b/.github/workflows/docsearchConfigScript.js @@ -42,7 +42,7 @@ var config = {
default_value: "en",
},
},
- selectors_exclude: ["aside", "nav", "footer", ".header-anchor"],
+ selectors_exclude: ["aside", "nav", "footer", "style"],
strip_chars: " .,;:#",
custom_settings: {
attributesForFaceting: ["lang", "content"],
| 8 |
diff --git a/userscript.user.js b/userscript.user.js @@ -18261,6 +18261,79 @@ var $$IMU_EXPORT$$;
return src.replace(/_[a-z](\.[^/.]*)$/, "_b$1");
}
+ if (host_domain_nosub === "tiktok.com" && options && options.cb && options.do_request && options.element) {
+ var query_tiktok = function(url, cb) {
+ var normalized_url = url
+ .replace(/^[a-z]+:\/\//, "https://")
+ .replace(/:\/\/[^/]*tiktok\.com\/+/, "://www.tiktok.com/")
+ .replace(/\/*(?:[?#].*)?$/, "");
+ var cache_key = "tiktok:" + normalized_url;
+ api_cache.fetch(cache_key, cb, function(done) {
+ options.do_request({
+ url: url,
+ method: "GET",
+ onload: function(resp) {
+ if (resp.readyState < 4)
+ return;
+
+ if (resp.status !== 200) {
+ console_error(resp);
+ return done(null, false);
+ }
+
+ var match = resp.responseText.match(/<script[^>]+id="__NEXT_DATA__"[^>]*>({.*?})\s*<\/script>/);
+ if (!match) {
+ console_error("Unable to find match", resp);
+ return done(null, false);
+ }
+
+ try {
+ var json = JSON_parse(match[1]);
+ return done(json, 60*60);
+ } catch (e) {
+ console_error(e);
+ return done(null, false);
+ }
+ }
+ });
+ });
+ };
+
+ var current = options.element;
+ while (current) {
+ if (current.tagName === "A" && /\/@[^/]+\/+video\/+[0-9]+\/*(?:[?#].*)?$/.test(current.href)) {
+ query_tiktok(current.href, function(data) {
+ if (!data) {
+ return options.cb(null);
+ }
+
+ try {
+ var item = data.props.pageProps.videoData.itemInfos;
+ var videourl = item.video.urls[0];
+ var caption = item.text;
+
+ return options.cb({
+ url: videourl,
+ extra: {
+ caption: caption
+ },
+ video: true
+ });
+ } catch (e) {
+ console_error(e);
+ return options.cb(null);
+ }
+ });
+
+ return {
+ waiting: true
+ };
+ }
+
+ current = current.parentElement;
+ }
+ }
+
if ((domain_nosub === "pstatp.com" ||
// https://p0.ipstatp.com/list/pgc-image-va/Rgmv8E92sxXqtz.jpg
// https://p0.ipstatp.com/origin/pgc-image-va/Rgmv8E92sxXqtz.jpg
@@ -18393,6 +18466,14 @@ var $$IMU_EXPORT$$;
return src.replace(/^[a-z]+:\/\/[^/]+\/+china-img\/+/, "https://p0.pstatp.com/");
}
+ if (domain_nosub === "tiktokcdn.com" && /^v[0-9]*\./.test(domain) && src.indexOf("/video/") >= 0) {
+ // https://v21.tiktokcdn.com/video/n/v0102/ab13a0512d41473bb07c555205e2d0b2/
+ return {
+ url: src,
+ video: true
+ };
+ }
+
if (domain === "img.jizy.cn") {
// l, m, s
// https://img.jizy.cn/img/m/276318
| 7 |
diff --git a/docs/github-releases.md b/docs/github-releases.md @@ -13,8 +13,8 @@ See this screenshot for an overview of what release-it automates:
To add [GitHub releases](https://help.github.com/articles/creating-releases/) in your release-it flow:
- Configure `github.release: true`.
-- Obtain a [personal access token](https://github.com/settings/tokens) (release-it only needs "repo" access; no "admin"
- or other scopes).
+- Obtain a [personal access token](https://github.com/settings/tokens/new?scopes=repo&description=release-it)
+ (release-it only needs "repo" access; no "admin" or other scopes).
- Make sure the token is [available as an environment variable](./environment-variables.md).
Do not put the actual token in the release-it configuration. It will be read from the `GITHUB_TOKEN` environment
| 7 |
diff --git a/package.json b/package.json "version": "1.0.61",
"description": "grid.space 3d slice & modeling tools",
"author": "Stewart Allen <[email protected]>",
+ "license": "SEE LICENCE in license.md",
"private": false,
"repository": {
"type": "git",
"start-web": "node js/web-server nolocal"
},
"dependencies": {
- "connect": "3.3.x",
- "compression": "1.4.x",
- "serve-static": "1.10.x",
+ "connect": "*",
+ "compression": "*",
+ "serve-static": "*",
"n3d-threejs": "72.0.x",
"tween.js": "0.14.x",
- "uglify-js": "2.7.x",
- "leveldown": "latest",
- "levelup": "latest",
- "validator": "4.2.x",
- "pixi.js": "3.0.x",
- "moment": "2.11.x",
- "request": "2.67.x",
- "express-useragent": "0.2.x"
+ "uglify-js": "*",
+ "leveldown": "*",
+ "levelup": "*",
+ "validator": "*",
+ "pixi.js": "*",
+ "moment": "*",
+ "request": "*",
+ "express-useragent": "*"
}
}
| 3 |
diff --git a/lib/translations.json b/lib/translations.json "key": "components/Discussion/Notification/NONE/label",
"value": "Keine"
},
+
{
"key": "components/Discussion/NotificationChannel/EMAIL/label",
- "value": "E-Mail"
+ "value": "E-Mail-Benachrichtigungen"
},
{
"key": "components/Discussion/NotificationChannel/WEB/label",
- "value": "Browser"
+ "value": "Browser-Benachrichtigungen"
},
{
"key": "components/Discussion/NotificationChannel/APP/label",
- "value": "App"
+ "value": "App-Benachrichtigungen"
},
{
"key": "components/Discussion/NotificationChannel/EMAIL_WEB/label",
- "value": "E-Mail und Browser"
+ "value": "E-Mail- und Browser-Benachrichtigungen"
},
{
"key": "components/Discussion/NotificationChannel/EMAIL_APP/label",
- "value": "E-Mail und App"
+ "value": "E-Mail- und App-Benachrichtigungen"
},
{
"key": "components/Discussion/NotificationChannel/WEB_APP/label",
- "value": "Browser und App"
+ "value": "Browser- und App-Benachrichtigungen"
},
{
"key": "components/Discussion/NotificationChannel/EMAIL_WEB_APP/label",
- "value": "E-Mail, Browser und App"
- },
- {
- "key": "components/Discussion/NotificationChannel/BASIC/label",
- "value": null
+ "value": "E-Mail-, Browser- und App-Benachrichtigungen"
},
{
"key": "components/Discussion/info/MY_CHILDREN",
| 13 |
diff --git a/articles/best-practices/rules.md b/articles/best-practices/rules.md @@ -556,10 +556,10 @@ There are situations though when it may be desirable to bypass an MFA request. F
As a best practice, we recommend that if you have any MFA-related rule logic similar to that described in the the list below, that **you remove said logic** in favor of using `allowRememberBrowser` or `context.authentication` instead. Setting `allowRememberBrowser` to `true` lets users check a box so they will only be [prompted for multi-factor authentication periodically](/multifactor-authentication/custom#change-the-frequency-of-authentication-requests), whereas [`context.authentication`](/rules/references/context-object) can be used safely and accurately to determine when MFA was last performed in the current browser context. You can see sample use of `context.authentication` in the out-of-box supplied rule, [Require MFA once per session](https://github.com/auth0/rules/blob/master/src/rules/require-mfa-once-per-session.js).
:::
-* conditional logic based on use of `context.request.query.prompt === 'none'`
-* conditional logic based on some device fingerprinting, e.g where `user.app_metadata.lastLoginDeviceFingerPrint === deviceFingerPrint`
-* conditional logic based on geographic location, e.g. where `user.app_metadata.last_location === context.request.geoip.country_code`
+* don't base bypas of MFA based on conditional logic based of the form `context.request.query.prompt === 'none'`
+* don't base bypas of MFA based on conditional logic using some form of device fingerprinting, e.g where `user.app_metadata.lastLoginDeviceFingerPrint === deviceFingerPrint`
+* don't base bypas of MFA based on conditional logic using geographic location, e.g. where `user.app_metadata.last_location === context.request.geoip.country_code`
#### Context checking when using custom MFA providers
-In a similar fashion to that discussed above, we recommend that you **do not** use rules that redirect users to custom multi-factor authentication providers based on any of the conditional logic list items defined. For custom MFA providers, the only safe course of action is to use the `allowRememberBrowser` funtionality as described.
+In a similar fashion to that discussed above, we recommend that you **do not** use rules that redirect users to custom multi-factor authentication providers based on any of the conditional logic items listed. For custom providers, there is no safe way to effectively determine MFA bypass as there is no way to accurately determine the context for a user.
| 3 |
diff --git a/setup.cfg b/setup.cfg @@ -7,8 +7,9 @@ exclude =
docs/components_page/components/fade.py,
docs/components_page/components/input_group/button.py,
docs/components_page/components/input_group/dropdown.py,
- docs/components_page/components/progress.py
- docs/components_page/components/table/kwargs.py
+ docs/components_page/components/listgroup/links.py,
+ docs/components_page/components/progress.py,
+ docs/components_page/components/table/kwargs.py,
docs/components_page/components/tabs/active_tab.py
ignore = E203, W503
| 8 |
diff --git a/test/jasmine/tests/transition_test.js b/test/jasmine/tests/transition_test.js @@ -639,7 +639,7 @@ describe('Plotly.react transitions:', function() {
.then(done);
});
- it('should only transition the layout when both traces and layout have animatable changes by default', function(done) {
+ it('@flaky should only transition the layout when both traces and layout have animatable changes by default', function(done) {
var data = [{y: [1, 2, 1]}];
var layout = {
transition: {duration: 10},
@@ -799,7 +799,7 @@ describe('Plotly.react transitions:', function() {
.then(done);
});
- it('should transition layout when one or more axis auto-ranged value changed', function(done) {
+ it('@flaky should transition layout when one or more axis auto-ranged value changed', function(done) {
var data = [{y: [1, 2, 1]}];
var layout = {transition: {duration: 10}};
@@ -850,7 +850,7 @@ describe('Plotly.react transitions:', function() {
.then(done);
});
- it('should not transition layout when axis auto-ranged value do not changed', function(done) {
+ it('@flaky should not transition layout when axis auto-ranged value do not changed', function(done) {
var data = [{y: [1, 2, 1]}];
var layout = {transition: {duration: 10}};
| 0 |
diff --git a/app/shared/reducers/system.js b/app/shared/reducers/system.js @@ -34,6 +34,7 @@ export default function system(state = {}, action) {
const accountField = `${requestName}_LAST_ACCOUNT`;
const contractField = `${requestName}_LAST_CONTRACT`;
+ const dataField = `${requestName}_DATA`;
const errField = `${requestName}_LAST_ERROR`;
const nameBidField = `${requestName}_LAST_BID`;
const progressField = `${requestName}_PROGRESS`;
@@ -80,6 +81,10 @@ export default function system(state = {}, action) {
newState = set(newState, awaitingDeviceField, (requestState === 'PENDING'));
}
}
+ // Attach any returned data
+ if (action.payload.data) {
+ newState = set(newState, dataField, action.payload.data);
+ }
// Attach any returned transactions
if (action.payload.tx) {
newState = set(newState, txField, action.payload.tx);
| 11 |
diff --git a/src/vaadin-combo-box-mixin.html b/src/vaadin-combo-box-mixin.html @@ -252,7 +252,7 @@ This program is available under Apache License Version 2.0, available at https:/
this.focus();
}
}
- } else if (this._openedWithFocusRing) {
+ } else if (this._openedWithFocusRing && this.hasAttribute('focused')) {
this.focusElement.setAttribute('focus-ring', '');
}
}
| 12 |
diff --git a/tests/e2e/config/bootstrap.js b/tests/e2e/config/bootstrap.js @@ -180,7 +180,7 @@ function observeNavigationRequest( req ) {
*/
function observeNavigationResponse( res ) {
if ( res.request().isNavigationRequest() ) {
- const data = responseObservables( res );
+ const data = [ res.status(), res.request().method(), res.url() ];
const redirect = res.headers().location;
if ( redirect ) {
data.push( { redirect } );
@@ -209,7 +209,7 @@ function observeRestRequest( req ) {
*/
async function observeRestResponse( res ) {
if ( res.url().match( 'wp-json' ) ) {
- const data = responseObservables( res );
+ const data = [ res.status(), res.request().method(), res.url() ];
// The response may fail to resolve if the test ends before it completes.
try {
@@ -219,23 +219,6 @@ async function observeRestResponse( res ) {
}
}
-/**
- * Normalizes common data from response objects for logging.
- *
- * When accessing via a Response, data from the request is quoted.
- * This cleans the extra quotes as well.
- *
- * @param {Array} res List of response data to log.
- */
-function responseObservables( res ) {
- const req = res.request();
- const method = req.method().slice( 1, -1 );
- // res.url() references the request internally.
- const url = req.url().slice( 1, -1 );
-
- return [ res.status(), method, url ];
-}
-
// Before every test suite run, delete all content created by the test. This ensures
// other posts/comments/etc. aren't dirtying tests and tests don't depend on
// each other's side-effects.
| 2 |
diff --git a/src/encoded/static/scss/encoded/modules/_key-value-display.scss b/src/encoded/static/scss/encoded/modules/_key-value-display.scss @@ -23,6 +23,9 @@ dl.key-value, dl.key-value-doc {
width: auto;
word-wrap: break-word;
word-break: break-word;
+ -webkit-hyphens: auto;
+ -ms-hyphens: auto;
+ hyphens: auto;
}
dt {
| 0 |
diff --git a/physics-manager.js b/physics-manager.js @@ -115,6 +115,8 @@ physicsManager.addCookedConvexGeometry = (buffer, position, quaternion) => {
return physicsId;
};
+physicsManager.getGeometry = physicsId => geometryManager.geometryWorker.getGeometryPhysics(geometryManager.physics, physicsId);
+
physicsManager.disableGeometry = physicsId => {
geometryManager.geometryWorker.disableGeometryPhysics(geometryManager.physics, physicsId);
};
| 0 |
diff --git a/articles/protocols/saml/index.html b/articles/protocols/saml/index.html @@ -20,6 +20,12 @@ title: SAML
This article explains the various configuration options of SAML available with Auth0.
</p>
</li>
+ <li>
+ <i class="icon icon-budicon-715"></i><a href="/samlp">Configure a SAML Identity Provider Connection</a>
+ <p>
+ How to configure a SAML Identity Provider Connection
+ </p>
+ </li>
<li>
<i class="icon icon-budicon-715"></i><a href="/saml-idp-generic">Auth0 as Identity Provider</a>
<p>
| 0 |
diff --git a/404.js b/404.js @@ -23,6 +23,7 @@ let username = await contracts.Account.methods.getMetadata(address, 'name').call
if (!username) {
username = 'Anonymous';
}
+const balance = await contracts.FT.methods.balanceOf(address).call();
const _setStoreHtml = async () => {
const oldStore = document.querySelector('.store');
@@ -45,6 +46,7 @@ const _setStoreHtml = async () => {
<img src="https://preview.exokit.org/[https://raw.githubusercontent.com/avaer/vrm-samples/master/vroid/male.vrm]/preview.png" class="avatar">
<div class=detail-1>${username}</div>
<div class=detail-2>${address}</div>
+ <div class=detail-3>${balance} FT</div>
</div>
</li>
</ul>
| 0 |
diff --git a/assets/js/modules/analytics/datastore/accounts.js b/assets/js/modules/analytics/datastore/accounts.js @@ -87,8 +87,6 @@ export const actions = {
/**
* Creates a new Analytics account.
*
- * Creates a new Analytics account for a user.
- *
* @since n.e.x.t
*
* @param {Object} args Argument params.
| 2 |
diff --git a/src/plugins/ThumbnailGenerator/index.js b/src/plugins/ThumbnailGenerator/index.js @@ -105,7 +105,9 @@ module.exports = class ThumbnailGenerator extends Plugin {
image = this.protect(image)
- var steps = Math.ceil(Math.log2(image.width / targetWidth))
+ // Use the Polyfill for Math.log2() since IE doesn't support log2
+ // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/log2#Polyfill
+ var steps = Math.ceil(Math.log(image.width / targetWidth) * Math.LOG2E);
if (steps < 1) {
steps = 1
}
| 3 |
diff --git a/modules/ringo/jsgi/response.js b/modules/ringo/jsgi/response.js @@ -651,7 +651,7 @@ exports.range = function (request, representation, size, contentType, timeout, m
headers["Content-Range"] = "bytes " + ranges[0].join("-") + "/" + (size >= 0 ? size : "*");
}
- const {servletRequest, servletResponse} = request.env;
+ const {servletResponse} = request.env;
servletResponse.setStatus(206);
if (ranges.length > 1) {
servletResponse.setHeader("Content-Type", "multipart/byteranges; boundary=" + BOUNDARY.decodeToString("ASCII"));
@@ -662,20 +662,19 @@ exports.range = function (request, representation, size, contentType, timeout, m
}
const outStream = servletResponse.getOutputStream();
+ const responseBufferSize = Math.max(request.env.servletResponse.getBufferSize() - 70, 8192);
try {
- if (ranges.length === 1) {
- const [start, end] = ranges[0];
- const numBytes = end - start + 1;
- stream.skip(start);
- outStream.write(stream.read(numBytes).unwrap());
- } else {
let currentBytePos = 0;
ranges.forEach(function(range, index, arr) {
const [start, end] = range;
const numBytes = end - start + 1;
+ const rounds = Math.floor(numBytes / responseBufferSize);
+ const restBytes = numBytes % responseBufferSize;
+
stream.skip(start - currentBytePos);
+ if (arr.length > 1) {
const boundary = new MemoryStream(70);
if (index > 0) {
boundary.write(CRLF);
@@ -692,11 +691,16 @@ exports.range = function (request, representation, size, contentType, timeout, m
boundary.position = 0;
outStream.write(boundary.read().unwrap());
boundary.close();
- outStream.write(stream.read(numBytes).unwrap());
+ }
- currentBytePos = end + 1;
- });
+ for (let i = 0; i < rounds; i++) {
+ outStream.write(stream.read(responseBufferSize).unwrap());
+ }
+ if (restBytes > 0) {
+ outStream.write(stream.read(restBytes).unwrap());
+ }
+ if (arr.length > 1 && index === arr.length - 1) {
// final boundary
const eofBoundary = new MemoryStream(70);
eofBoundary.write(CRLF);
@@ -710,6 +714,9 @@ exports.range = function (request, representation, size, contentType, timeout, m
eofBoundary.close();
}
+ currentBytePos = end + 1;
+ });
+
// commit response
servletResponse.flushBuffer();
} catch (e if e.javaException instanceof org.eclipse.jetty.io.EofException) {
| 4 |
diff --git a/README.md b/README.md @@ -504,7 +504,7 @@ TagUI is a young tool and it tries to do the task of automating UI interactions
0,15,30,45 * * * * /full_path_on_your_server/tagui_crontab
```
- To call an automation flow from your application or web browser, use below API syntax. Custom input(s) supported. Automation flows can also be triggered from emails using the API. For email integration, [check out Tmail](https://github.com/tebelorg/Tmail). It's an open-source mailbot to act on incoming emails or perform mass emailing; it also delivers emails by API. Emails with run-time variables can be sent directly from your flow with a single line (see flow sample 6C_datatables). If you have data transformation in your process pipeline [check out TLE](https://github.com/tebelorg/TLE), which can help with converting data.
+ To call an automation flow from your application or web browser, use below API syntax. Custom input(s) supported. The default folder to look for flow_filename would be in tagui/src folder. Automation flows can also be triggered from emails using the API. For email integration, [check out Tmail](https://github.com/tebelorg/Tmail). It's an open-source mailbot to act on incoming emails or perform mass emailing; it also delivers emails by API. Emails with run-time variables can be sent directly from your flow with a single line (see flow sample 6C_datatables). If you have data transformation in your process pipeline [check out TLE](https://github.com/tebelorg/TLE), which can help with converting data.
```
your_website_url/tagui_service.php?SETTINGS="flow_filename option(s)"
```
| 7 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -61,26 +61,26 @@ commands:
- run:
name: Building docker image
command: |
- docker build -t ${DOCKHUB_ORGANISATION}/binary-static-tradingview:${CIRCLE_SHA1} .
+ docker build -t ${DOCKHUB_ORGANISATION}/binary-static-bot:${CIRCLE_SHA1} .
- run:
name: Pushing Image to docker hub
command: |
echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
- docker push ${DOCKHUB_ORGANISATION}/binary-static-tradingview:${CIRCLE_SHA1}
+ docker push ${DOCKHUB_ORGANISATION}/binary-static-bot:${CIRCLE_SHA1}
k8s_deploy:
description: "Deploy to k8s cluster"
steps:
- k8s/install-kubectl
- run:
- name: Deploying to k8s cluster for service binary-tradingview
+ name: Deploying to k8s cluster for service binary-bot
command: |
echo $CA_CRT | base64 --decode > ca.crt
- kubectl --server=${KUBE_SERVER} --certificate-authority=ca.crt --token=$SERVICEACCOUNT_TOKEN set image deployment/tradingview-binary-com tradingview-binary-com=${DOCKHUB_ORGANISATION}/binary-static-tradingview:${CIRCLE_SHA1}
+ kubectl --server=${KUBE_SERVER} --certificate-authority=ca.crt --token=$SERVICEACCOUNT_TOKEN set image deployment/bot-binary-com bot-binary-com=${DOCKHUB_ORGANISATION}/binary-static-bot:${CIRCLE_SHA1}
jobs:
release:
docker:
- - image: circleci/node:9.9.0-stretch
+ - image: circleci/node:12.13.0-stretch
steps:
- git_checkout_from_cache
- npm_install
| 14 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 13.6.0
- Added: `ignoreSelectors[]` to `block-opening-brace-space-before` ([#4640](https://github.com/stylelint/stylelint/pull/4640)).
-- Fixed: false positives for all scope disables in `--report-invalid-scope-disables` ([#4784](https://github.com/stylelint/stylelint/pull/4784))
-- Fixed: workaround CSS-in-JS syntax throws a TypeError in the following conditions: 1. encounter a call or template expression named 'html' and 2. syntax loads via `autoSyntax()`.
-- Fixed: specify minimum node version in `package.json`'s `engine` field ([#4790](https://github.com/stylelint/stylelint/pull/4790)).
-- Fixed: write error information to `stderr` ([#4799](https://github.com/stylelint/stylelint/pull/4799)).
+- Fixed: false positives for all scope disables in `--report-invalid-scope-disables` ([#4784](https://github.com/stylelint/stylelint/pull/4784)).
+- Fixed: TypeError for CSS-in-JS when encountering a call or template expression named 'html' ([#4797](https://github.com/stylelint/stylelint/pull/4797)).
+- Fixed: writing error information to `stderr` ([#4799](https://github.com/stylelint/stylelint/pull/4799)).
+- Fixed: minimum node version in `package.json`'s `engine` field ([#4790](https://github.com/stylelint/stylelint/pull/4790)).
- Fixed: `alpha-value-notation` number precision errors ([#4802](https://github.com/stylelint/stylelint/pull/4802)).
- Fixed: `font-family-no-missing-generic-family-keyword` false positives for variables ([#4806](https://github.com/stylelint/stylelint/pull/4806)).
- Fixed: `no-duplicate-selectors` false positives for universal selector and `disallowInList` ([#4809](https://github.com/stylelint/stylelint/pull/4809)).
| 6 |
diff --git a/app/services/archetypeLabelService.js b/app/services/archetypeLabelService.js @@ -12,6 +12,7 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
// Remember the original number of promises being resolved.
var originalLength = promises.length;
+
return $q.all(promises).then(function () {
// If there are new promises, resolve those too.
@@ -19,9 +20,7 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
promises = promises.slice(originalLength);
return repeatedlyWaitForPromises(promises);
}
-
});
-
}
/**
@@ -48,20 +47,16 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
// Set a new value now that it has been processed.
match.value = labelValue;
-
} else if (isPromise(labelValue)) {
// Remember the promise so we can wait for it to be completed before constructing the
// fieldset label.
promises.push(labelValue);
labelValue.then(function (value) {
-
// The value will probably be a string, but recursively process it in case it's
// something else.
processLabelValue(value, promises, match);
-
});
-
} else if (_.isFunction(labelValue)) {
// Allow for the function to accept injected parameters, and invoke it.
@@ -75,9 +70,7 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
// Some other data type (e.g., number, date, object).
match.value = labelValue;
-
}
-
}
/**
@@ -115,7 +108,6 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
* indicating whether or not that substring was matched the regular expression.
*/
function splitByRegex(rgx, value) {
-
// Validate input.
if (!rgx || !value) {
return [];
@@ -158,7 +150,6 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
// Get next match.
match = rgx.exec(value);
-
}
// The text after the last match.
@@ -175,7 +166,6 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
// Return information about the matches.
return splitParts;
-
}
function executeFunctionByName(functionName, context) {
@@ -219,7 +209,7 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
case "Umbraco.ContentPicker2":
return coreContentPickerV2(value, scope, datatype);
default:
- return "";
+ return null;
}
}
@@ -251,7 +241,6 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
case 'member':
type = 'member';
break;
-
default:
break;
}
@@ -361,6 +350,10 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
var entity;
+ if(value.length) {
+ value = value[0];
+ }
+
switch (value.type) {
case "content":
if(value.typeData.contentId) {
@@ -379,7 +372,6 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
default:
break;
-
}
if(entity) {
@@ -477,10 +469,18 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
}
templateLabelValue = executeFunctionByName(functionName, window, scope.getPropertyValueByAlias(fieldset, propertyAlias), scope, args);
+
+ //if empty, promise to try again
+ if(!templateLabelValue) {
+ templateLabelValue = $timeout(function() {
+ return executeFunctionByName(functionName, window, scope.getPropertyValueByAlias(fieldset, propertyAlias), scope, args);
+ }, 1000);
+ }
}
//normal {{foo}} syntax
else {
propertyAlias = template;
+
var rawValue = scope.getPropertyValueByAlias(fieldset, propertyAlias);
templateLabelValue = rawValue;
@@ -496,20 +496,26 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
if(datatype) {
//try to get built-in label
- var label = getNativeLabel(datatype, templateLabelValue, scope);
+ var label = getNativeLabel(datatype, rawValue, scope);
- if(label) {
+ if(label != "") {
templateLabelValue = label;
}
- }
+
+ if(label == "") {
+ templateLabelValue = $timeout(function() {
+ return getNativeLabel(datatype, rawValue, scope);
+ }, 1000);
}
+ //if label is null, skip all that jazz
+ }
+ }
}
}
// Process the value (i.e., reduce any functions or promises down to strings).
processLabelValue(templateLabelValue, promises, match);
-
});
// Wait for all of the promises to resolve before constructing the full fieldset label.
@@ -519,13 +525,12 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
var substrings = _.map(matches, function (value) {
return value.value;
});
- var combinedSubstrigs = substrings.join('');
- // Return the title.
- return combinedSubstrigs;
+ var combinedSubstrings = substrings.join('');
+ // Return the title.
+ return combinedSubstrings;
});
-
}
}
});
\ No newline at end of file
| 9 |
diff --git a/lib/cartodb/models/dataview/numeric-histogram.js b/lib/cartodb/models/dataview/numeric-histogram.js @@ -207,7 +207,7 @@ module.exports = class NumericHistogram extends BaseDataview {
_buildQuery (psql, override, callback) {
- const histogramSql = this.buildNumericHistogramQueryTpl({
+ const histogramSql = this.buildQueryTpl({
_override: override,
_column: this._columnType === 'date' ? columnCastTpl({ column: this.column }) : this.column,
_isFloatColumn: this._columnType === 'float',
@@ -223,7 +223,7 @@ module.exports = class NumericHistogram extends BaseDataview {
return callback(null, histogramSql);
}
- buildNumericHistogramQueryTpl (ctx) {
+ buildQueryTpl (ctx) {
return `
WITH
${filteredQueryTpl(ctx)},
| 10 |
diff --git a/react/src/base/inputs/SprkCheckbox.stories.js b/react/src/base/inputs/SprkCheckbox.stories.js import React from 'react';
import SprkSelectionInput from './SprkSelectionInput/SprkSelectionInput';
-import SprkErrorContainer from './SprkErrorContainer/SprkErrorContainer';
import SprkCheckboxGroup from './SprkCheckbox/SprkCheckboxGroup/SprkCheckboxGroup';
import SprkCheckboxItem from './SprkCheckbox/SprkCheckboxItem/SprkCheckboxItem';
import SprkFieldset from './SprkFieldset/SprkFieldset';
@@ -8,6 +7,8 @@ import SprkLegend from './SprkLegend/SprkLegend';
import SprkHelperText from './SprkHelperText/SprkHelperText';
import SprkStack from '../../objects/stack/SprkStack';
import SprkStackItem from '../../objects/stack/components/SprkStackItem/SprkStackItem';
+import SprkFieldError from './SprkFieldError/SprkFieldError';
+import SprkIcon from '../../components/icons/SprkIcon';
import { markdownDocumentationLinkBuilder } from '../../../../storybook-utilities/markdownDocumentationLinkBuilder';
export default {
@@ -24,7 +25,8 @@ export default {
SprkSelectionInput,
},
jest: [
- 'SprkErrorContainer',
+ 'SprkFieldError',
+ 'SprkIcon',
'SprkCheckboxGroup',
'SprkCheckboxItem',
'SprkFieldset',
@@ -92,10 +94,13 @@ export const invalidCheckbox = () => (
<SprkCheckboxItem>Checkbox Item 2</SprkCheckboxItem>
<SprkCheckboxItem>Checkbox Item 3</SprkCheckboxItem>
</SprkFieldset>
- <SprkErrorContainer
- id="checkbox-error-container"
- message="There is an error on this field"
+ <SprkFieldError id="invalid-checkbox">
+ <SprkIcon
+ iconName="exclamation-filled"
+ additionalClasses="sprk-b-ErrorIcon"
/>
+ <div className="sprk-b-ErrorText">There is an error on this field.</div>
+ </SprkFieldError>
</SprkCheckboxGroup>
);
@@ -194,10 +199,13 @@ export const hugeInvalid = () => (
Checkbox Item 3
</SprkCheckboxItem>
</SprkFieldset>
- <SprkErrorContainer
- id="checkbox-huge-error-container"
- message="There is an error on this field"
+ <SprkFieldError id="invalid-huge-checkbox">
+ <SprkIcon
+ iconName="exclamation-filled"
+ additionalClasses="sprk-b-ErrorIcon"
/>
+ <div className="sprk-b-ErrorText">There is an error on this field.</div>
+ </SprkFieldError>
</SprkCheckboxGroup>
);
| 3 |
diff --git a/src/bot.js b/src/bot.js @@ -98,6 +98,13 @@ class Genesis {
},
shardId,
shardCount,
+ disabledEvents: ['GUILD_UPDATE', 'GUILD_MEMBER_REMOVE', 'GUILD_MEMBER_UPDATE', 'GUILD_MEMBERS_CHUNK', 'GUILD_ROLE_CREATE',
+ 'GUILD_ROLE_DELETE', 'GUILD_ROLE_UPDATE', 'GUILD_BAN_ADD', 'GUILD_BAN_REMOVE',
+ 'CHANNEL_UPDATE', 'CHANNEL_PINS_UPDATE', 'MESSAGE_DELETE', 'MESSAGE_UPDATE', 'MESSAGE_DELETE_BULK',
+ 'MESSAGE_REACTION_ADD', 'MESSAGE_REACTION_REMOVE', 'MESSAGE_REACTION_REMOVE_ALL', 'USER_UPDATE',
+ 'USER_NOTE_UPDATE', 'USER_SETTINGS_UPDATE', 'PRESENCE_UPDATE', 'TYPING_START', 'RELATIONSHIP_ADD',
+ 'RELATIONSHIP_REMOVE'],
+
});
this.shardId = shardId;
| 8 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -384,6 +384,13 @@ const _click = () => {
console.log('wear', o, component);
_ungrab();
rigAuxManager.addWearable(o);
+ o.used = true;
+ break;
+ }
+ case 'sit': {
+ _ungrab();
+ rigAuxManager.addSittable(o);
+ o.used = true;
break;
}
}
@@ -472,10 +479,6 @@ const _updateWeapons = () => {
const transforms = rigManager.getRigTransforms();
const now = Date.now();
- for (const drivable of drivables) {
- drivable.update(now);
- }
-
const _handleHighlight = () => {
if (!editedObject) {
const width = 1;
@@ -1455,65 +1458,6 @@ renderer.domElement.addEventListener('drop', async e => {
}));
scene.add(cubeMesh); */
-const drivables = [];
-const _loadDrivable = async () => {
- const srcUrl = 'https://avaer.github.io/dragon-mount/dragon.glb';
- let o = await new Promise((accept, reject) => {
- gltfLoader.load(srcUrl, accept, function onprogress() {}, reject);
- });
- const {animations} = o;
- o = o.scene;
- // o.scale.multiplyScalar(0.2);
- scene.add(o);
-
- const root = o;
- const mixer = new THREE.AnimationMixer(root);
- const [clip] = animations;
- const action = mixer.clipAction(clip);
- action.play();
-
- const mesh = root.getObjectByName('Cube');
- const {skeleton} = mesh;
- const spineBoneIndex = skeleton.bones.findIndex(b => b.name === 'Spine');
- const spineBone = root.getObjectByName('Spine');
- // const spine = skeleton.bones[spineBoneIndex];
- // const spineBoneMatrix = skeleton.boneMatrices[spineBoneIndex];
- // const spineBoneMatrixInverse = skeleton.boneInverses[spineBoneIndex];
- // console.log('got spine', mesh, skeleton);
- // window.THREE = THREE;
-
- let lastTimestamp = Date.now();
- const smoothVelocity = new THREE.Vector3();
- const update = now => {
- // const speed = 0.003;
- const timeDiff = now - lastTimestamp;
-
- action.weight = physicsManager.velocity.length() * 10;
-
- const deltaSeconds = timeDiff / 1000;
- mixer.update(deltaSeconds);
- lastTimestamp = now;
-
- // spineBone.updateMatrixWorld();
- // const bonePosition = spineBone.getWorldPosition(new THREE.Vector3());
-
- physicsManager.setSitState(true);
- // const sitTarget = physicsManager.getSitTarget();
- physicsManager.setSitController(root);
- physicsManager.setSitTarget(spineBone);
-
- rigManager.localRig.sitState = true;
- // rigManager.localRig.sitTarget.matrixWorld.decompose(spine.position, spine.quaternion, localVector);
-
- // rigManager.localRigMatrix.decompose(localVector, localQuaternion, localVector2);
- // rigManager.setLocalRigMatrix(rigManager.localRigMatrix.compose(localVector, cubeMesh.quaternion, localVector2));
- };
- drivables.push({
- update,
- });
-};
-_loadDrivable();
-
const weaponsManager = {
// weapons,
// cubeMesh,
| 2 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -2780,6 +2780,18 @@ class Avatar {
return this.poseManager.vrTransforms.floorHeight;
}
+ say(audio) {
+ this.setMicrophoneMediaStream(audio, {
+ muted: false,
+ emitVolume: true,
+ emitBuffer: true,
+ // audioContext: WSRTC.getAudioContext(),
+ // microphoneWorkletUrl: '/avatars/microphone-worklet.js',
+ });
+
+ audio.play();
+ }
+
destroy() {
this.setMicrophoneMediaStream(null);
}
| 0 |
diff --git a/README.md b/README.md @@ -102,6 +102,13 @@ Check out the [Envato Tuts+ Startup Series on its codebase](https://code.tutsplu
[Snapsure](https://snapsure.app) uses Shepherd to help photographers learn how to set up alerts for their desired picture-perfect weather conditions.
+
+### [Drupal](https://www.drupal.org/docs/8/core/modules/tour/overview)
+
+The [Drupal](https://www.drupal.org/docs/8/core/modules/tour/overview) CMS uses Shepherd to offer tours of it's core modules, and allows developers to add Tours to their custom and contributed modules.
+
+
+
### Your Project Here
If you have a cool open-source library built on Shepherd, PR this doc.
| 0 |
diff --git a/src/connectors/monstercat.js b/src/connectors/monstercat.js 'use strict';
-Connector.playerSelector = '.controls';
+const playerBar = '.controls';
-Connector.artistTrackSelector = '.controls .scroll-title';
+Connector.playerSelector = playerBar;
-Connector.isPlaying = () => $('.controls .fa-pause').length > 0;
+Connector.artistTrackSelector = `${playerBar} .scroll-title`;
+
+Connector.pauseButtonSelector = `${playerBar} .fa-pause`;
+
+Connector.useMediaSessionApi();
| 7 |
diff --git a/compilers/cjs.js b/compilers/cjs.js @@ -29,10 +29,6 @@ CJSRequireTransformer.prototype.transformCallExpression = function (tree) {
if (arg.literalToken) {
var requireModule = tree.args.args[0].literalToken.processedValue;
- // mirror behaviour at https://github.com/systemjs/systemjs/blob/0.19.8/lib/cjs.js#L50 to remove trailing slash
- if (requireModule[requireModule.length - 1] == '/')
- requireModule = requireModule.substr(0, requireModule.length - 1);
-
var requireModuleMapped = this.map && this.map(requireModule) || requireModule;
this.requires.push(requireModule);
| 2 |
diff --git a/articles/rules/current/index.md b/articles/rules/current/index.md @@ -316,7 +316,7 @@ You can add `console.log` lines in the Rule's code for debugging. The [Rule Edit
-1. **TRY THIS RULE**: opens a pop-up where you can run a Rule in isolation. The tool provides a mock **user** and **context** objects. Clicking **TRY** will result on the the Rule being run with those two objects as input. `console.log` output will be displayed too.
+1. **TRY THIS RULE**: opens a pop-up where you can run a Rule in isolation. The tool provides a mock **user** and **context** objects. Clicking **TRY** will result on the Rule being run with those two objects as input. `console.log` output will be displayed too.
| 2 |
diff --git a/bin/local-env/install-wordpress.sh b/bin/local-env/install-wordpress.sh @@ -97,7 +97,7 @@ fi
# Install a dummy favicon to avoid 404 errors.
echo -e $(status_message "Installing a dummy favicon...")
container touch /var/www/html/favicon.ico
-container chmod 755 /var/www/html/favicon.ico
+container chmod 767 /var/www/html/favicon.ico
# Activate Google Site Kit plugin.
echo -e $(status_message "Activating Google Site Kit plugin...")
| 3 |
diff --git a/edit.js b/edit.js @@ -109,11 +109,11 @@ const _loadGltf = u => new Promise((accept, reject) => {
});
const HEIGHTFIELD_SHADER = {
uniforms: {
- isCurrent: {
+ /* isCurrent: {
type: 'f',
value: 0,
needsUpdate: true,
- },
+ }, */
uTime: {
type: 'f',
value: 0,
@@ -186,7 +186,7 @@ const HEIGHTFIELD_SHADER = {
// varying float vTorchLightmap;
// varying float vFog;
- uniform float isCurrent;
+ // uniform float isCurrent;
uniform float uTime;
#define saturate(a) clamp( a, 0.0, 1.0 )
@@ -223,9 +223,10 @@ const HEIGHTFIELD_SHADER = {
vec3 c = texture2D(heightColorTex, uv2).rgb;
vec3 diffuseColor = c * uv2.x;
if (edgeFactor() <= 0.99) {
- if (isCurrent != 0.0) {
+ // if (isCurrent != 0.0) {
diffuseColor = mix(diffuseColor, vec3(1.0), max(1.0 - abs(pow(length(vWorldPosition) - uTime*5.0, 3.0)), 0.0)*0.5);
- }
+ // }
+ // diffuseColor *= 0.95;
diffuseColor *= (0.9 + 0.1*min(gl_FragCoord.z/gl_FragCoord.w/10.0, 1.0));
}
@@ -316,16 +317,16 @@ let currentVegetationMesh = null;
let currentVegetationTransparentMesh = null;
const _getCurrentChunkMesh = () => currentChunkMesh;
const _setCurrentChunkMesh = chunkMesh => {
- if (currentChunkMesh) {
+ /* if (currentChunkMesh) {
currentChunkMesh.material[0].uniforms.isCurrent.value = 0;
currentChunkMesh.material[0].uniforms.isCurrent.needsUpdate = true;
currentChunkMesh = null;
- }
+ } */
currentChunkMesh = chunkMesh;
- if (currentChunkMesh) {
+ /* if (currentChunkMesh) {
currentChunkMesh.material[0].uniforms.isCurrent.value = 1;
currentChunkMesh.material[0].uniforms.isCurrent.needsUpdate = true;
- }
+ } */
};
let stairsMesh = null;
let platformMesh = null;
| 2 |
diff --git a/src/App/components/StoryCard/style.js b/src/App/components/StoryCard/style.js @@ -12,18 +12,16 @@ export const StoryWrapper = styled.div`
background-color: ${({ theme }) => theme.bg.default};
transition: all 0.2s ease-in;
-webkit-font-smoothing: subpixel-antialiased;
- box-shadow: ${Shadow.low};
- border-right: ${props =>
+ box-shadow: ${Shadow.low}, inset ${props =>
props.selected
- ? `8px solid ${props.theme.brand.default}`
- : `0px solid transparent`};
+ ? `-16px 0 0 -8px ${props.theme.brand.default}`
+ : `0px 0 0 0px transparent`};
&:hover {
- box-shadow: ${Shadow.high};
- border-right: ${props =>
+ box-shadow: ${Shadow.high}, inset ${props =>
props.selected
- ? `16px solid ${props.theme.brand.default}`
- : `8px solid transparent`};
+ ? `-24px 0 0 -8px ${props.theme.brand.default}`
+ : `-16px 0 0 -8px ${props.theme.border.default}`};
transition: all 0.2s ease-out;
cursor: pointer;
}
| 14 |
diff --git a/token-metadata/0xAba8cAc6866B83Ae4eec97DD07ED254282f6aD8A/metadata.json b/token-metadata/0xAba8cAc6866B83Ae4eec97DD07ED254282f6aD8A/metadata.json "symbol": "YAMV2",
"address": "0xAba8cAc6866B83Ae4eec97DD07ED254282f6aD8A",
"decimals": 24,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/Model/helpers.js b/src/Model/helpers.js @@ -38,7 +38,7 @@ export async function fetchChildren(model: Model): Promise<Model[]> {
})
const results = await Promise.all(promises)
- let allChildren = []
- results.forEach(res => {allChildren = allChildren.concat(res)})
- return allChildren
+ let descendants = []
+ results.forEach(res => {descendants = [...descendants, ...res]})
+ return descendants
}
| 7 |
diff --git a/wdio.conf.js b/wdio.conf.js @@ -19,6 +19,8 @@ const config = {
baseUrl: `http://${localIP.address()}:${webpackPort}`,
specs,
+ // Travis only has 1 browser instace, set maxInstances to 1 to prevent timeouts
+ maxInstances: process.env.CI ? 1 : wdioConf.config.maxInstances,
seleniumDocker: {
enabled: !process.env.TRAVIS,
},
@@ -37,6 +39,5 @@ const config = {
},
};
-
config.services = wdioConf.config.services.concat([WebpackDevService]);
exports.config = config;
| 12 |
diff --git a/core/field_bound_variable.js b/core/field_bound_variable.js @@ -434,7 +434,7 @@ Blockly.FieldBoundVariable.prototype.render_ = function() {
'translate(' + xy.x + ',' + xy.y + ')');
this.size_.width = blockShapeWidth - Blockly.BlockSvg.TAB_WIDTH;
- this.size_.height = blockShapeHeight;
+ this.size_.height = Math.max(Blockly.BlockSvg.MIN_BLOCK_Y, blockShapeHeight);
this.lastRenderedTypeExpr_ = this.variable_.getTypeExpr().deepDeref();
};
| 12 |
diff --git a/js/bam/bamUtils.js b/js/bam/bamUtils.js @@ -292,14 +292,14 @@ import BamFilter from "./bamFilter.js";
let qualArray;
- if (lseq === 1 && String.fromCharCode(ba[p + j] + 33) === '*') {
- // TODO == how to represent this?
- } else {
+ // if (lseq === 1 && String.fromCharCode(ba[p] + 33) === '*') {
+ // // TODO == how to represent this?
+ // } else {
qualArray = [];
for (let j = 0; j < lseq; ++j) {
qualArray.push(ba[p + j]);
}
- }
+ //}
p += lseq;
if (mateChrIdx >= 0) {
| 9 |
diff --git a/js/tdf/tdfSource.js b/js/tdf/tdfSource.js @@ -35,18 +35,27 @@ var igv = (function (igv) {
this.windowFunction = config.windowFunction || "mean";
this.reader = new igv.TDFReader(config);
+ this.featureCache = [];
};
igv.TDFSource.prototype.getFeatures = function (chr, bpStart, bpEnd, bpPerPixel) {
var self = this,
featureCache = self.featureCache,
- genomicInterval = new igv.GenomicInterval(chr, bpStart, bpEnd);
+ cache,
+ genomicInterval = new igv.GenomicInterval(chr, bpStart, bpEnd),
+ i;
genomicInterval.bpPerPixel = bpPerPixel;
- if (featureCache && featureCache.range.bpPerPixel === bpPerPixel && featureCache.range.containsRange(genomicInterval)) {
- return Promise.resolve(self.featureCache.queryFeatures(chr, bpStart, bpEnd));
+ if (featureCache) {
+
+ for (i = 0; i < featureCache.length; i++) {
+ cache = featureCache[i];
+ if (cache.range.bpPerPixel === bpPerPixel && cache.range.containsRange(genomicInterval)) {
+ return Promise.resolve(cache.queryFeatures(chr, bpStart, bpEnd));
+ }
+ }
}
return self.reader.readRootGroup()
@@ -107,13 +116,24 @@ var igv = (function (igv) {
reject("Unknown tile type: " + tile.type);
return;
}
+ });
+
+ features.sort(function (a, b) {
+ return a.start - b.start;
})
- // Note -- replacing feature cache
- self.featureCache = new igv.FeatureCache(features, genomicInterval);
+ cache = new igv.FeatureCache(features, genomicInterval);
- return features;
+ // Limit to 2 caches for now
+ if (self.featureCache.length < 2) {
+ self.featureCache.push(cache);
+ }
+ else {
+ self.featureCache[1] = self.featureCache[0];
+ self.featureCache[0] = cache;
+ }
+ return features;
})
}
@@ -179,9 +199,10 @@ var igv = (function (igv) {
var e = s + span;
- if (e < bpStart) continue;
if (s > bpEnd) break;
+ if (e >= bpStart) {
+
if (!Number.isNaN(data[i])) {
features.push({
chr: chr,
@@ -190,6 +211,7 @@ var igv = (function (igv) {
value: data[i]
});
}
+ }
s = e;
}
| 1 |
diff --git a/src/pages/Profile/UserSettings/UserSettingsSchema.js b/src/pages/Profile/UserSettings/UserSettingsSchema.js @@ -169,6 +169,7 @@ export const uiSchema = (intl, user) => {
"ui:help": <MarkdownContent markdown={intl.formatMessage(messages.leaderboardOptOutDescription)} />,
},
email: {
+ "ui:emptyValue": "",
"ui:help": intl.formatMessage(messages.emailDescription),
},
notificationSubscriptions: {
| 11 |
diff --git a/character-controller.js b/character-controller.js @@ -575,7 +575,6 @@ class StatePlayer extends PlayerBase {
this.avatar.update(timestamp, timeDiff);
}
- this.characterPhysics.updateCamera(timeDiff);
this.characterHups.update(timestamp);
}
destroy() {
@@ -1147,8 +1146,6 @@ class NpcPlayer extends StaticUninterpolatedPlayer {
this.characterHups.update(timestamp);
}
-
- // this.characterPhysics.updateCamera(timeDiff);
}
/* detachState() {
return null;
| 2 |
diff --git a/angular/projects/spark-angular/src/lib/components/sprk-masthead/sprk-masthead-accordion-item/sprk-masthead-accordion-item.module.ts b/angular/projects/spark-angular/src/lib/components/sprk-masthead/sprk-masthead-accordion-item/sprk-masthead-accordion-item.module.ts @@ -2,7 +2,9 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { SprkIconModule } from '../../sprk-icon/sprk-icon.module';
-import { SprkMastheadAccordionItemComponent } from './sprk-masthead-accordion-item.component';
+import {
+ SprkMastheadAccordionItemComponent
+} from './sprk-masthead-accordion-item.component';
import { SprkLinkModule } from '../../sprk-link/sprk-link.module';
@NgModule({
| 3 |
diff --git a/js/dataobjects/bisweb_transformationcollection.js b/js/dataobjects/bisweb_transformationcollection.js @@ -222,7 +222,7 @@ class BisWebTransformationCollection extends BisWebBaseTransformation {
let tmp = [X[0], X[1], X[2]];
for (let i = 0; i<this.transformationList.length;i++) {
- this.transformationList.transformPoint(tmp, TX);
+ this.transformationList[i].transformPoint(tmp, TX);
tmp[0] = TX[0];
tmp[1] = TX[1];
tmp[2] = TX[2];
| 1 |
diff --git a/source/skins/simple/OptionsSkin.js b/source/skins/simple/OptionsSkin.js @@ -84,6 +84,7 @@ export const OptionsSkin = (props: Props) => {
aria-hidden
key={index}
className={classnames([
+ option.className ? option.className : null,
theme[themeId].option,
isHighlightedOption(index) ? theme[themeId].highlightedOption : null,
isSelectedOption(index) ? theme[themeId].selectedOption : null,
| 11 |
diff --git a/components/table-list/index.js b/components/table-list/index.js @@ -20,7 +20,7 @@ const getPropsToFilter = (list, filters) => {
const TableList = ({title, subtitle, list, textFilter, filters, cols, selected, handleSelect}) => {
const [text, setText] = useState('')
- const [propsFilter] = useState(filters ? getPropsToFilter(list, filters) : null)
+ const [propsFilter, setPropsFilter] = useState()
const [selectedPropsFilter, setSelectedPropsFilter] = useState({})
const [filteredList, setFilteredList] = useState([])
@@ -47,6 +47,13 @@ const TableList = ({title, subtitle, list, textFilter, filters, cols, selected,
setSelectedPropsFilter(propsFilter)
}
+ useEffect(() => {
+ if (filters) {
+ const propsFilter = getPropsToFilter(list, filters)
+ setPropsFilter(propsFilter)
+ }
+ }, [list, filters])
+
useEffect(() => {
const filteredList = list.filter(item => {
return (
| 0 |
diff --git a/shared/js/background/atb.es6.js b/shared/js/background/atb.es6.js @@ -122,7 +122,7 @@ var ATB = (() => {
tab = tabs[i]
chrome.tabs.executeScript(tab.id, {
- file: 'content-scripts/on-install.js'
+ file: 'public/js/content-scripts/on-install.js'
})
chrome.tabs.insertCSS(tab.id, {
| 3 |
diff --git a/editor.js b/editor.js @@ -2589,7 +2589,7 @@ Promise.all([
color: 0x333333,
});
const cameraMesh = new THREE.Mesh(g, m);
- cameraMesh.position.set(0, 2, -5);
+ cameraMesh.position.set(0, 10, -8);
cameraMesh.frustumCulled = false;
scene.add(cameraMesh);
| 5 |
diff --git a/src/og/layer/Layer.js b/src/og/layer/Layer.js @@ -67,6 +67,8 @@ class Layer {
*/
this.name = name || "noname";
+ this.properties = options.properties || {};
+
this._labelMaxLetters = options.labelMaxLetters;
this.displayInLayerSwitcher =
| 0 |
diff --git a/Specs/Scene/SceneSpec.js b/Specs/Scene/SceneSpec.js @@ -1379,10 +1379,10 @@ describe(
s.initializeFrame();
s.render();
- expect(spyListener.calls.count()).toBe(1);
+ expect(spyListener.calls.count()).toBe(2);
var args = spyListener.calls.allArgs();
- expect(args.length).toEqual(1);
+ expect(args.length).toEqual(2);
expect(args[0].length).toEqual(1);
expect(args[0][0]).toBeGreaterThan(s.camera.percentageChanged);
| 3 |
diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php @@ -1274,7 +1274,7 @@ final class Analytics extends Module
private function print_tracking_opt_out() {
?>
<!-- <?php esc_html_e( 'Google Analytics user opt-out added via Site Kit by Google', 'google-site-kit' ); ?> -->
- <?php if ( $this->context->is_amp() ) : // TODO: update script type to `text/plain` when supported by AMP plugin. ?>
+ <?php if ( $this->context->is_amp() ) : ?>
<script type="application/ld+json" id="__gaOptOutExtension"></script>
<?php else : ?>
<script type="text/javascript">window["_gaUserPrefs"] = { ioo : function() { return true; } }</script>
| 2 |
diff --git a/vaadin-combo-box.html b/vaadin-combo-box.html @@ -175,7 +175,13 @@ Custom property | Description | Default
always-float-label="[[_computeAlwaysFloatLabel(alwaysFloatLabel,placeholder)]]"
auto-validate$="[[autoValidate]]"
invalid="[[invalid]]">
- <label on-down="_preventDefault" id="label" hidden$="[[!label]]" aria-hidden="true" on-tap="_openAsync">[[label]]</label>
+
+ <label id="label" slot="label"
+ on-down="_preventDefault"
+ hidden$="[[!label]]"
+ aria-hidden="true"
+ on-tap="_openAsync"
+ for="input">[[label]]</label>
<slot name="prefix" slot="prefix"></slot>
@@ -210,8 +216,7 @@ Custom property | Description | Default
</template>
</paper-input-container>
- <vaadin-combo-box-overlay
- id="overlay"
+ <vaadin-combo-box-overlay id="overlay"
opened$=[[opened]]
position-target="[[_getPositionTarget()]]"
_focused-index="[[_focusedIndex]]"
@@ -259,8 +264,7 @@ Custom property | Description | Default
invalid="{{invalid}}"
on-change="_stopPropagation"
name$="[[name]]"
- label="[[label]]"
- >
+ label="[[label]]">
<input id="nativeInput"
type="text"
role="combobox"
| 12 |
diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js @@ -73,7 +73,6 @@ module.exports = class Dashboard extends Plugin {
width: 750,
height: 550,
thumbnailWidth: 280,
- semiTransparent: false,
defaultTabIcon: defaultTabIcon,
showProgressDetails: false,
hideUploadButton: false,
@@ -83,6 +82,7 @@ module.exports = class Dashboard extends Plugin {
disableStatusBar: false,
disableInformer: false,
disableThumbnailGenerator: false,
+ disablePageScrollWhenModalOpen: true,
onRequestCloseModal: () => this.closeModal(),
locale: defaultLocale
}
@@ -201,6 +201,20 @@ module.exports = class Dashboard extends Plugin {
}
}
+ scrollBehaviour (toggle) {
+ if (!this.opts.disablePageScrollWhenModalOpen) return
+ const body = document.querySelector('body')
+ switch (toggle) {
+ case 'enable':
+ Object.assign(body.style, { overflow: 'initial', height: 'initial' })
+ break
+ case 'disable':
+ Object.assign(body.style, { overflow: 'hidden', height: '100vh' })
+ break
+ default:
+ }
+ }
+
openModal () {
this.setPluginState({
isHidden: false
@@ -213,9 +227,10 @@ module.exports = class Dashboard extends Plugin {
// add class to body that sets position fixed, move everything back
// to scroll position
- document.body.classList.add('uppy-Dashboard-isOpen')
- document.body.style.top = `-${this.savedScrollPosition}px`
+ // document.body.classList.add('uppy-Dashboard-isOpen')
+ // document.body.style.top = `-${this.savedScrollPosition}px`
+ this.scrollBehaviour('disable')
this.updateDashboardElWidth()
this.setFocusToFirstNode()
}
@@ -225,9 +240,10 @@ module.exports = class Dashboard extends Plugin {
isHidden: true
})
- document.body.classList.remove('uppy-Dashboard-isOpen')
+ // document.body.classList.remove('uppy-Dashboard-isOpen')
+ this.scrollBehaviour('enable')
this.savedActiveElement.focus()
- window.scrollTo(0, this.savedScrollPosition)
+ // window.scrollTo(0, this.savedScrollPosition)
}
isModalOpen () {
| 0 |
diff --git a/democracylab/settings.py b/democracylab/settings.py @@ -27,7 +27,7 @@ SECRET_KEY = 'd!01@gn+%1ql1n(*)8xo+nx$$&n@mg$0_)9g+!(t-2vncaq!j7'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']
# Application definition
| 11 |
diff --git a/templates/formlibrary/trainingattendance_form.html b/templates/formlibrary/trainingattendance_form.html {% extends "base.html" %}
-{% block bread_crumb %}
-<ol class="breadcrumb">
- <li><a href="/workflow/dashboard/0/">{{ user.activity_user.organization.level_1_label }} Index</a></li>
- {% if project_proposal_id %}
- <li><a href="/workflow/dashboard/project/{{ project_proposal_id }}/">{{ user.activity_user.organization.level_2_label }} Dashboards</a></li>
- <li><a href="/formlibrary/training_list/{{ project_proposal_id }}/">Trainings</a></li>
- {% else %}
- <li><a href="/formlibrary/training_list/0/">Trainings</a></li>
- {% endif %}
-
- <li class="active">Training Attendance Form</li>
-</ol>
-{% endblock %}
-{% block page_title %}Training Attendance Form{% endblock %}
-
{% block content %}
+<div class="container">
+ <div class="sub-navigation">
+ <div class="sub-navigation-header">
+ <h4 class="page-title">TrainingAttendence Form</h4>
+ </div>
+ <div class="sub-navigation-actions">
+ <div class="sub-nav-item">
+ <div>
{% include "form_guidance.html" %}
+ </div>
+ </div>
+ </div>
+ </div>
{% if form.errors %}
<div class="help-block">
{% for field in form %}
{% csrf_token %}
{% load crispy_forms_tags %}
{% crispy form %}
+</div>
{% endblock content %}
| 7 |
diff --git a/lib/pipeline/watch.js b/lib/pipeline/watch.js @@ -14,7 +14,7 @@ Watch.prototype.start = function() {
var self = this;
// TODO: should come from the config object instead of reading the file
// directly
- var embarkConfig = fs.readJSONSync('./../../../../../server/embark.json');
+ var embarkConfig = fs.readJSONSync('embark.json');
this.watchAssets(embarkConfig, function() {
self.logger.trace('ready to watch asset changes');
| 13 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -6,33 +6,40 @@ save-cache: &save-cache
paths:
- node_modules
key: dependencies-{{ checksum "package.json" }}
-ruby_dependencies: &ruby_dependencies
+android-secrets: &android-secrets
+ run:
+ command: |
+ git clone [email protected]:redbadger/pride-android-secrets.git
+ mkdir -p .gradle
+ echo -e "keystore=$ANDROID_KEYSTORE_PATH\nkeystore.alias=$ANDROID_KEYSTORE_ALIAS\nkeystore.password=$ANDROID_KEYSTORE_PASSWORD\nkeystore.keypass=$ANDROID_KEYSTORE_PASSWORD\nversionCode=$CIRCLE_BUILD_NUM" >> .gradle/gradle.properties
+ echo -e "apiSecret=$FABRIC_BUILD_SECRET\napiKey=$FABRIC_API_KEY" >> ./app/fabric.properties
+ruby-dependencies: &ruby-dependencies
run:
name: Download Ruby Dependencies
command: bundle check || bundle install --path vendor/bundle
-android_dependencies: &android_dependencies
+android-dependencies: &android-dependencies
run:
name: Download Android Dependencies
command: ./gradlew androidDependencies
-gradle_key: &gradle_key
+gradle-key: &gradle-key
jars-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
-gems_key: &gems_key
+gems-key: &gems-key
gems-{{ checksum "Gemfile.lock" }}
-restore_gradle_cache: &restore_gradle_cache
+restore-gradlecache: &restore-gradle-cache
restore_cache:
- key: *gradle_key
-restore_gems_cache: &restore_gems_cache
+ key: *gradle-key
+restore-gems-cache: &restore-gems-cache
restore_cache:
- key: *gems_key
-save_gradle_cache: &save_gradle_cache
+ key: *gems-key
+save-gradle-cache: &save-gradle-cache
save_cache:
- key: *gradle_key
+ key: *gradle-key
paths:
- ~/.gradle
- ~/.m2
-save_gems_cache: &save_gems_cache
+save-gems-cache: &save-gems-cache
save_cache:
- key: *gems_key
+ key: *gems-key
paths:
- vendor/bundle
@@ -81,16 +88,13 @@ jobs:
path: ~/project
- attach_workspace:
at: ~/project
- - <<: *restore_gradle_cache
- - <<: *restore_gems_cache
- - <<: *ruby_dependencies
- - <<: *android_dependencies
- - <<: *save_gradle_cache
- - <<: *save_gems_cache
- - run: git clone [email protected]:redbadger/pride-android-secrets.git
- - run: mkdir -p .gradle
- - run: echo -e "keystore=$ANDROID_KEYSTORE_PATH\nkeystore.alias=$ANDROID_KEYSTORE_ALIAS\nkeystore.password=$ANDROID_KEYSTORE_PASSWORD\nkeystore.keypass=$ANDROID_KEYSTORE_PASSWORD\nversionCode=$CIRCLE_BUILD_NUM" >> .gradle/gradle.properties
- - run: echo -e "apiSecret=$FABRIC_BUILD_SECRET\napiKey=$FABRIC_API_KEY" >> ./app/fabric.properties
+ - <<: *android-secrets
+ - <<: *restore-gradle-cache
+ - <<: *restore-gems-cache
+ - <<: *ruby-dependencies
+ - <<: *android-dependencies
+ - <<: *save-gradle-cache
+ - <<: *save-gems-cache
- run:
command: |
bundle exec fastlane alpha \
@@ -115,17 +119,13 @@ jobs:
path: ~/project
- attach_workspace:
at: ~/project
- - <<: *restore_gradle_cache
- - <<: *restore_gems_cache
- - <<: *ruby_dependencies
- - <<: *android_dependencies
- - <<: *save_gradle_cache
- - <<: *save_gems_cache
- - run: git clone [email protected]:redbadger/pride-android-secrets.git
- - run: mkdir -p .gradle
- - run: echo -e "keystore=$ANDROID_KEYSTORE_PATH\nkeystore.alias=$ANDROID_KEYSTORE_ALIAS\nkeystore.password=$ANDROID_KEYSTORE_PASSWORD\nkeystore.keypass=$ANDROID_KEYSTORE_PASSWORD\nversionCode=$CIRCLE_BUILD_NUM" >> .gradle/gradle.properties
- - run: echo -e "apiSecret=$FABRIC_BUILD_SECRET\napiKey=$FABRIC_API_KEY" >> ./app/fabric.properties
- - run: bundle install
+ - <<: *android-secrets
+ - <<: *restore-gradle-cache
+ - <<: *restore-gems-cache
+ - <<: *ruby-dependencies
+ - <<: *android-dependencies
+ - <<: *save-gradle-cache
+ - <<: *save-gems-cache
- run:
command: |
bundle exec fastlane beta \
| 2 |
diff --git a/tools/make/lib/addons/Makefile b/tools/make/lib/addons/Makefile @@ -37,6 +37,17 @@ else
fPIC ?= -fPIC
endif
+# Define the BLAS library to use:
+BLAS ?=
+
+# Define the path to the BLAS library (used for includes and linking):
+ifeq ($(BLAS), openblas)
+ # Use the `wildcard` function to check for the OpenBLAS vendor dependency:
+ BLAS_DIR ?= $(wildcard $(DEPS_OPENBLAS_BUILD_OUT))
+else
+ BLAS_DIR ?=
+endif
+
# TARGETS #
@@ -54,6 +65,8 @@ install-addons: clean-addons
cd $$pkg && \
FC=$(FC) \
fPIC=$(fPIC) \
+ BLAS=$(BLAS) \
+ BLAS_DIR=$(BLAS_DIR) \
$(NODE_GYP) $(NODE_GYP_FLAGS) rebuild \
|| exit 1; \
done
| 12 |
diff --git a/index.d.ts b/index.d.ts @@ -1037,14 +1037,14 @@ declare module 'mongoose' {
type MongooseQueryMiddleware = 'count' | 'deleteMany' | 'deleteOne' | 'find' | 'findOne' | 'findOneAndDelete' | 'findOneAndRemove' | 'findOneAndUpdate' | 'remove' | 'update' | 'updateOne' | 'updateMany';
- class Schema<DocType extends Document = Document, M extends Model<DocType> = Model<DocType>> extends events.EventEmitter {
+ class Schema<DocType extends Document = Document, M extends Model<DocType> = Model<DocType>, SchemaDefModel = undefined> extends events.EventEmitter {
/**
* Create a new schema
*/
- constructor(definition?: SchemaDefinition, options?: SchemaOptions);
+ constructor(definition?: SchemaDefinition<SchemaDefModel>, options?: SchemaOptions);
/** Adds key path / schema type pairs to this schema. */
- add(obj: SchemaDefinition | Schema, prefix?: string): this;
+ add(obj: SchemaDefinition<SchemaDefModel> | Schema, prefix?: string): this;
/**
* Array of child schemas (from document arrays and single nested subdocs)
| 1 |
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/editor/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/editor/template.vue data: function() {
return {
formOptions: {
- validateAfterLoad: true,
+ validateAfterLoad: false,
validateAfterChanged: true,
focusFirstField: true
}
| 12 |
diff --git a/content/concepts/v4-nft.md b/content/concepts/v4-nft.md @@ -8,7 +8,7 @@ A non-fungible token stored on the blockchain represents a unique asset. NFTs ca
### How will Ocean Protocol support the NFT market?
-Ocean Protocol defines an [ERC721Factory](https://github.com/oceanprotocol/contracts/blob/v4Hardhat/contracts/ERC721Factory.sol) contract which will allow users to deploy ERC721 contract instances on any of the supported networks. The deployed contract can be associated with Metadata information which describes, also published on-chain. The [Metadata](https://github.com/oceanprotocol/contracts/blob/v4Hardhat/contracts/metadata/Metadata.sol) contract will store the information about the asset, and associated access rights defined through roles.
+Ocean Protocol defines an [ERC721Factory](https://github.com/oceanprotocol/contracts/blob/v4Hardhat/contracts/ERC721Factory.sol) contract, allowing users to deploy ERC721 contract instances on any supported networks.The deployed contract can be associated with Metadata information that describes the unique asset. The Metadata is also stored on-chain. The [Metadata](https://github.com/oceanprotocol/contracts/blob/v4Hardhat/contracts/metadata/Metadata.sol) contract will contain information about the NFT, and associated access rights defined through roles.
@@ -20,7 +20,6 @@ Ocean Protocol's [ERC721Template](https://github.com/oceanprotocol/contracts/blo
-Once the contract is deployed, it will be available on the Ocean Marketplace for trade.
### Other References
| 7 |
diff --git a/index.js b/index.js @@ -232,6 +232,7 @@ export default () => {
const barrierMesh = new THREE.Mesh(barrierGeometry, barrierMaterial);
barrierMesh.frustumCulled = false;
app.add(barrierMesh);
+ app.updateMatrixWorld();
const _updateBarrierMesh = (now, timeDiff) => {
barrierMesh.material.uniforms.iTime.value = now/1000;
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.