mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 08:28:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

stuff

Browse source
This commit is contained in:
Peter Cottle 2013-01-21 20:31:04 -08:00
parent 576823dbfd
commit ab5a752691
7 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

40
build/bundle.js
View file

@ -4698,7 +4698,7 @@ var Sandbox = Backbone.View.extend({
'level': this.startLevel, 'level': this.startLevel,
'sandbox': this.exitLevel, 'sandbox': this.exitLevel,
'levels': this.showLevels, 'levels': this.showLevels,
'iosAlert': this.iosAlert, 'mobileAlert': this.mobileAlert,
'build level': this.buildLevel, 'build level': this.buildLevel,
'export tree': this.exportTree, 'export tree': this.exportTree,
'import tree': this.importTree, 'import tree': this.importTree,
@ -4828,10 +4828,9 @@ var Sandbox = Backbone.View.extend({
} }
}, },
iosAlert: function(command, deferred) { mobileAlert: function(command, deferred) {
var whenClosed = Q.defer(); alert("Can't bring up the keyboard on mobile / tablet :( try visiting on desktop! :D");
alert("Can't bring up the keyboard on iOS, try visiting on desktop! :D"); command.finishWith(deferred);
whenClosed.resolve();
}, },
delay: function(command, deferred) { delay: function(command, deferred) {
@ -6578,10 +6577,10 @@ var init = function() {
eventBaton.trigger('commandSubmitted', command); eventBaton.trigger('commandSubmitted', command);
}); });
} }
if (/(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent)) { if (/(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent) || /android/i.test(navigator.userAgent)) {
setTimeout(function() { sandbox.mainVis.customEvents.on('gitEngineReady', function() {
eventBaton.trigger('commandSubmitted', 'iOS alert'); eventBaton.trigger('commandSubmitted', 'mobile alert');
}, 600); });
} }
}; };
@ -6652,6 +6651,7 @@ var Main = require('../app');
var Errors = require('../util/errors'); var Errors = require('../util/errors');
var Sandbox = require('../level/sandbox').Sandbox; var Sandbox = require('../level/sandbox').Sandbox;
var Constants = require('../util/constants');
var Visualization = require('../visuals/visualization').Visualization; var Visualization = require('../visuals/visualization').Visualization;
var ParseWaterfall = require('../level/parseWaterfall').ParseWaterfall; var ParseWaterfall = require('../level/parseWaterfall').ParseWaterfall;
@ -13287,7 +13287,7 @@ var regexMap = {
'sandbox': /^sandbox($|\s)/, 'sandbox': /^sandbox($|\s)/,
'level': /^level\s?([a-zA-Z0-9]*)/, 'level': /^level\s?([a-zA-Z0-9]*)/,
'levels': /^levels($|\s)/, 'levels': /^levels($|\s)/,
'iosAlert': /^iOS alert($|\s)/, 'mobileAlert': /^mobile alert($|\s)/,
'build level': /^build level($|\s)/, 'build level': /^build level($|\s)/,
'export tree': /^export tree$/, 'export tree': /^export tree$/,
'import tree': /^import tree$/, 'import tree': /^import tree$/,
@ -18572,10 +18572,10 @@ var init = function() {
eventBaton.trigger('commandSubmitted', command); eventBaton.trigger('commandSubmitted', command);
}); });
} }
if (/(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent)) { if (/(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent) || /android/i.test(navigator.userAgent)) {
setTimeout(function() { sandbox.mainVis.customEvents.on('gitEngineReady', function() {
eventBaton.trigger('commandSubmitted', 'iOS alert'); eventBaton.trigger('commandSubmitted', 'mobile alert');
}, 600); });
} }
}; };
@ -21469,6 +21469,7 @@ var Main = require('../app');
var Errors = require('../util/errors'); var Errors = require('../util/errors');
var Sandbox = require('../level/sandbox').Sandbox; var Sandbox = require('../level/sandbox').Sandbox;
var Constants = require('../util/constants');
var Visualization = require('../visuals/visualization').Visualization; var Visualization = require('../visuals/visualization').Visualization;
var ParseWaterfall = require('../level/parseWaterfall').ParseWaterfall; var ParseWaterfall = require('../level/parseWaterfall').ParseWaterfall;
@ -22265,7 +22266,7 @@ var Sandbox = Backbone.View.extend({
'level': this.startLevel, 'level': this.startLevel,
'sandbox': this.exitLevel, 'sandbox': this.exitLevel,
'levels': this.showLevels, 'levels': this.showLevels,
'iosAlert': this.iosAlert, 'mobileAlert': this.mobileAlert,
'build level': this.buildLevel, 'build level': this.buildLevel,
'export tree': this.exportTree, 'export tree': this.exportTree,
'import tree': this.importTree, 'import tree': this.importTree,
@ -22395,10 +22396,9 @@ var Sandbox = Backbone.View.extend({
} }
}, },
iosAlert: function(command, deferred) { mobileAlert: function(command, deferred) {
var whenClosed = Q.defer(); alert("Can't bring up the keyboard on mobile / tablet :( try visiting on desktop! :D");
alert("Can't bring up the keyboard on iOS, try visiting on desktop! :D"); command.finishWith(deferred);
whenClosed.resolve();
}, },
delay: function(command, deferred) { delay: function(command, deferred) {
@ -22489,7 +22489,7 @@ var regexMap = {
'sandbox': /^sandbox($|\s)/, 'sandbox': /^sandbox($|\s)/,
'level': /^level\s?([a-zA-Z0-9]*)/, 'level': /^level\s?([a-zA-Z0-9]*)/,
'levels': /^levels($|\s)/, 'levels': /^levels($|\s)/,
'iosAlert': /^iOS alert($|\s)/, 'mobileAlert': /^mobile alert($|\s)/,
'build level': /^build level($|\s)/, 'build level': /^build level($|\s)/,
'export tree': /^export tree$/, 'export tree': /^export tree$/,
'import tree': /^import tree$/, 'import tree': /^import tree$/,

8
src/js/app/index.js
View file

@ -139,10 +139,10 @@ var init = function() {
eventBaton.trigger('commandSubmitted', command); eventBaton.trigger('commandSubmitted', command);
}); });
} }
if (/(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent)) { if (/(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent) || /android/i.test(navigator.userAgent)) {
setTimeout(function() { sandbox.mainVis.customEvents.on('gitEngineReady', function() {
eventBaton.trigger('commandSubmitted', 'iOS alert'); eventBaton.trigger('commandSubmitted', 'mobile alert');
}, 600); });
} }
}; };

1
src/js/level/index.js
View file

@ -7,6 +7,7 @@ var Main = require('../app');
var Errors = require('../util/errors'); var Errors = require('../util/errors');
var Sandbox = require('../level/sandbox').Sandbox; var Sandbox = require('../level/sandbox').Sandbox;
var Constants = require('../util/constants');
var Visualization = require('../visuals/visualization').Visualization; var Visualization = require('../visuals/visualization').Visualization;
var ParseWaterfall = require('../level/parseWaterfall').ParseWaterfall; var ParseWaterfall = require('../level/parseWaterfall').ParseWaterfall;

9
src/js/level/sandbox.js
View file

@ -205,7 +205,7 @@ var Sandbox = Backbone.View.extend({
'level': this.startLevel, 'level': this.startLevel,
'sandbox': this.exitLevel, 'sandbox': this.exitLevel,
'levels': this.showLevels, 'levels': this.showLevels,
'iosAlert': this.iosAlert, 'mobileAlert': this.mobileAlert,
'build level': this.buildLevel, 'build level': this.buildLevel,
'export tree': this.exportTree, 'export tree': this.exportTree,
'import tree': this.importTree, 'import tree': this.importTree,
@ -335,10 +335,9 @@ var Sandbox = Backbone.View.extend({
} }
}, },
iosAlert: function(command, deferred) { mobileAlert: function(command, deferred) {
var whenClosed = Q.defer(); alert("Can't bring up the keyboard on mobile / tablet :( try visiting on desktop! :D");
alert("Can't bring up the keyboard on iOS, try visiting on desktop! :D"); command.finishWith(deferred);
whenClosed.resolve();
}, },
delay: function(command, deferred) { delay: function(command, deferred) {

2
src/js/level/sandboxCommands.js
View file

@ -53,7 +53,7 @@ var regexMap = {
'sandbox': /^sandbox($|\s)/, 'sandbox': /^sandbox($|\s)/,
'level': /^level\s?([a-zA-Z0-9]*)/, 'level': /^level\s?([a-zA-Z0-9]*)/,
'levels': /^levels($|\s)/, 'levels': /^levels($|\s)/,
'iosAlert': /^iOS alert($|\s)/, 'mobileAlert': /^mobile alert($|\s)/,
'build level': /^build level($|\s)/, 'build level': /^build level($|\s)/,
'export tree': /^export tree$/, 'export tree': /^export tree$/,
'import tree': /^import tree$/, 'import tree': /^import tree$/,

5
src/template.index.html
View file

@ -66,7 +66,10 @@
</div> </div>
<a href="https://github.com/pcottle/learnGitBranching" target="_blank"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a> <!-- lol inline styles -->
<a href="https://github.com/pcottle/learnGitBranching" target="_blank" style="z-index: 99; position: fixed; top: 0; right: 0">
<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub">
</a>
<!-- Dependencies --> <!-- Dependencies -->
<script src="lib/jquery-1.8.0.min.js"></script> <script src="lib/jquery-1.8.0.min.js"></script>

1
todo.txt
View file

@ -4,6 +4,7 @@ Big Things
Medium things: Medium things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ ] fix clickthrough when goal and start are shown
Cases to handle / things to edit Cases to handle / things to edit
======================= =======================