mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-28 14:45:08 +02:00
merge main
This commit is contained in:
commit
5ffd160a5f
2 changed files with 16 additions and 16 deletions
|
@ -173,7 +173,7 @@ var DemonstrationBuilder = ContainedBase.extend({
|
|||
className: 'demonstrationBuilder box vertical',
|
||||
template: _.template($('#demonstration-builder').html()),
|
||||
events: {
|
||||
'click div.testButton': 'testView'
|
||||
'click .testButton': 'testView'
|
||||
},
|
||||
|
||||
initialize: function(options) {
|
||||
|
@ -281,13 +281,13 @@ var MultiViewBuilder = ContainedBase.extend({
|
|||
},
|
||||
|
||||
events: {
|
||||
'click div.deleteButton': 'deleteOneView',
|
||||
'click div.testButton': 'testOneView',
|
||||
'click div.editButton': 'editOneView',
|
||||
'click div.testEntireView': 'testEntireView',
|
||||
'click div.addView': 'addView',
|
||||
'click div.saveView': 'saveView',
|
||||
'click div.cancelView': 'cancel'
|
||||
'click .deleteButton': 'deleteOneView',
|
||||
'click .testButton': 'testOneView',
|
||||
'click .editButton': 'editOneView',
|
||||
'click .testEntireView': 'testEntireView',
|
||||
'click .addView': 'addView',
|
||||
'click .saveView': 'saveView',
|
||||
'click .cancelView': 'cancel'
|
||||
},
|
||||
|
||||
initialize: function(options) {
|
||||
|
|
16
yarn.lock
16
yarn.lock
|
@ -512,8 +512,8 @@ backbone@^1.4.0:
|
|||
underscore ">=1.8.3"
|
||||
|
||||
balanced-match@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
|
||||
|
||||
base64-js@^1.0.2:
|
||||
version "1.3.1"
|
||||
|
@ -554,7 +554,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9:
|
|||
|
||||
brace-expansion@^1.1.7:
|
||||
version "1.1.11"
|
||||
resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
|
||||
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
|
||||
dependencies:
|
||||
balanced-match "^1.0.0"
|
||||
concat-map "0.0.1"
|
||||
|
@ -917,7 +917,7 @@ component-emitter@^1.2.1:
|
|||
|
||||
concat-map@0.0.1:
|
||||
version "0.0.1"
|
||||
resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
|
||||
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
|
||||
|
||||
concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0:
|
||||
version "1.6.2"
|
||||
|
@ -1059,8 +1059,8 @@ decamelize@^1.1.1:
|
|||
resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
|
||||
|
||||
decode-uri-component@^0.2.0:
|
||||
version "0.2.0"
|
||||
resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"
|
||||
version "0.2.2"
|
||||
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
|
||||
|
||||
default-compare@^1.0.0:
|
||||
version "1.0.0"
|
||||
|
@ -2665,8 +2665,8 @@ minimalistic-crypto-utils@^1.0.1:
|
|||
resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
|
||||
|
||||
minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
|
||||
version "3.0.4"
|
||||
resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
|
||||
version "3.0.8"
|
||||
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
|
||||
dependencies:
|
||||
brace-expansion "^1.1.7"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue