Skip to content

Instantly share code, notes, and snippets.

View justinvdm's full-sized avatar

Justin van der Merwe justinvdm

View GitHub Profile
diff --git a/go/base/static/js/test/tests/components/plumbing/endpoints.test.js b/go/base/static/js/test/tests/components/plumbing/endpoints.test.js
index 8a2c2aa..a7756fd 100644
--- a/go/base/static/js/test/tests/components/plumbing/endpoints.test.js
+++ b/go/base/static/js/test/tests/components/plumbing/endpoints.test.js
@@ -299,6 +299,7 @@ describe("go.components.plumbing (endpoints)", function() {
= plumbing.AligningEndpointCollection;
var MockAligningEndpointCollection = AligningEndpointCollection.extend({
+ margin: 0,
render: function() {
diff --git a/go/base/static/js/test/tests/components/plumbing/diagrams.test.js b/go/base/static/js/test/tests/components/plumbing/diagrams.test.js
index ba28e29..9150180 100644
--- a/go/base/static/js/test/tests/components/plumbing/diagrams.test.js
+++ b/go/base/static/js/test/tests/components/plumbing/diagrams.test.js
@@ -19,124 +19,7 @@ describe("go.components.plumbing.diagrams", function() {
tearDown();
});
- describe(".DiagramViewConnections", function() {
- var DiagramViewConnections = plumbing.connections.DiagramViewConnections;
diff --git a/go/base/static/js/src/campaign/dialogue/states/dummy.js b/go/base/static/js/src/campaign/dialogue/states/dummy.js
new file mode 100644
index 0000000..a448a3a
--- /dev/null
+++ b/go/base/static/js/src/campaign/dialogue/states/dummy.js
@@ -0,0 +1,36 @@
+// go.campaign.dialogue.states.dummy
+// =================================
+// A dummy state type for testing
+
diff --git a/.gitignore b/.gitignore
index fff1333..9bf41fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.pyc
+*.swp
.DS_Store
/ve/
/*.egg-info/
diff --git a/go/base/static/js/src/go.js b/go/base/static/js/src/go.js
index 444d2e9..04b9708 100644
--- a/go/base/static/js/src/go.js
+++ b/go/base/static/js/src/go.js
@@ -10,4 +10,4 @@
// Models created automatically when added to Backbone.Collection won't be
// recognised as instances of Backbone.Model, so we need to change this.
Backbone.Collection.prototype.model = Backbone.Model;
-})(window.go);
+})(window.go = window.go || {});
var ChoiceOptionsView = TemplateView.extend({
jst: 'JST.campaign_dialogue_states_choice_options',
events: {
'click .close': 'remove',
// ...
},
initialize: function(options) {
this.choice = options.choice;