importTreeNow command

This commit is contained in:
Peter Cottle 2013-08-01 10:00:37 -07:00
parent d52830f3d2
commit 24b4fcd1cd
7 changed files with 69 additions and 3 deletions

View file

@ -4169,6 +4169,7 @@ var Sandbox = Backbone.View.extend({
'build level': this.buildLevel,
'export tree': this.exportTree,
'import tree': this.importTree,
'importTreeNow': this.importTreeNow,
'import level': this.importLevel
};
@ -4190,6 +4191,26 @@ var Sandbox = Backbone.View.extend({
this.mainVis.show();
},
importTreeNow: function(command, deferred) {
var options = command.get('regexResults') || [];
if (options.length < 2) {
command.set('error', new Errors.GitError({
msg: intl.str('git-error-options')
}));
} else {
var string = options.input.replace(/importTreeNow\s+/g, '');
try {
this.mainVis.gitEngine.loadTreeFromString(string);
} catch (e) {
command.set('error', new Errors.GitError({
msg: String(e)
}));
}
}
command.finishWith(deferred);
},
importTree: function(command, deferred) {
var jsonGrabber = new BuilderViews.MarkdownPresenter({
previewText: intl.str('paste-json'),
@ -15195,6 +15216,7 @@ var regexMap = {
'mobileAlert': /^mobile alert($|\s)/,
'build level': /^build +level($|\s)/,
'export tree': /^export +tree$/,
'importTreeNow': /^importTreeNow($|\s)/,
'import tree': /^import +tree$/,
'import level': /^import +level$/,
'undo': /^undo($|\s)/
@ -30433,6 +30455,7 @@ var Sandbox = Backbone.View.extend({
'build level': this.buildLevel,
'export tree': this.exportTree,
'import tree': this.importTree,
'importTreeNow': this.importTreeNow,
'import level': this.importLevel
};
@ -30454,6 +30477,26 @@ var Sandbox = Backbone.View.extend({
this.mainVis.show();
},
importTreeNow: function(command, deferred) {
var options = command.get('regexResults') || [];
if (options.length < 2) {
command.set('error', new Errors.GitError({
msg: intl.str('git-error-options')
}));
} else {
var string = options.input.replace(/importTreeNow\s+/g, '');
try {
this.mainVis.gitEngine.loadTreeFromString(string);
} catch (e) {
command.set('error', new Errors.GitError({
msg: String(e)
}));
}
}
command.finishWith(deferred);
},
importTree: function(command, deferred) {
var jsonGrabber = new BuilderViews.MarkdownPresenter({
previewText: intl.str('paste-json'),
@ -30710,6 +30753,7 @@ var regexMap = {
'mobileAlert': /^mobile alert($|\s)/,
'build level': /^build +level($|\s)/,
'export tree': /^export +tree$/,
'importTreeNow': /^importTreeNow($|\s)/,
'import tree': /^import +tree$/,
'import level': /^import +level$/,
'undo': /^undo($|\s)/

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -445,7 +445,7 @@
For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching
-->
<script src="build/bundle.min.30b84795.js"></script>
<script src="build/bundle.min.4a67e733.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include

View file

@ -248,6 +248,7 @@ var Sandbox = Backbone.View.extend({
'build level': this.buildLevel,
'export tree': this.exportTree,
'import tree': this.importTree,
'importTreeNow': this.importTreeNow,
'import level': this.importLevel
};
@ -269,6 +270,26 @@ var Sandbox = Backbone.View.extend({
this.mainVis.show();
},
importTreeNow: function(command, deferred) {
var options = command.get('regexResults') || [];
if (options.length < 2) {
command.set('error', new Errors.GitError({
msg: intl.str('git-error-options')
}));
} else {
var string = options.input.replace(/importTreeNow\s+/g, '');
try {
this.mainVis.gitEngine.loadTreeFromString(string);
} catch (e) {
command.set('error', new Errors.GitError({
msg: String(e)
}));
}
}
command.finishWith(deferred);
},
importTree: function(command, deferred) {
var jsonGrabber = new BuilderViews.MarkdownPresenter({
previewText: intl.str('paste-json'),

View file

@ -109,6 +109,7 @@ var regexMap = {
'mobileAlert': /^mobile alert($|\s)/,
'build level': /^build +level($|\s)/,
'export tree': /^export +tree$/,
'importTreeNow': /^importTreeNow($|\s)/,
'import tree': /^import +tree$/,
'import level': /^import +level$/,
'undo': /^undo($|\s)/