mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 16:38:50 +02:00
better focus and blur
This commit is contained in:
parent
2866ff38bb
commit
529f69599b
4 changed files with 23 additions and 4 deletions
|
@ -12,6 +12,16 @@ var CommandPromptView = Backbone.View.extend({
|
||||||
$(document).delegate('#commandLineHistory', 'click', _.bind(function() {
|
$(document).delegate('#commandLineHistory', 'click', _.bind(function() {
|
||||||
this.focus();
|
this.focus();
|
||||||
}, this));
|
}, this));
|
||||||
|
|
||||||
|
|
||||||
|
$(document).delegate('#commandTextField', 'blur', _.bind(function() {
|
||||||
|
this.blur();
|
||||||
|
}, this));
|
||||||
|
|
||||||
|
// hacky timeout focus
|
||||||
|
setTimeout(_.bind(function() {
|
||||||
|
this.focus();
|
||||||
|
}, this), 100);
|
||||||
},
|
},
|
||||||
|
|
||||||
events: {
|
events: {
|
||||||
|
@ -19,8 +29,15 @@ var CommandPromptView = Backbone.View.extend({
|
||||||
'keyup #commandTextField': 'onKeyUp'
|
'keyup #commandTextField': 'onKeyUp'
|
||||||
},
|
},
|
||||||
|
|
||||||
|
blur: function() {
|
||||||
|
console.log('got blur');
|
||||||
|
$(this.commandCursor).toggleClass('shown', false);
|
||||||
|
},
|
||||||
|
|
||||||
focus: function() {
|
focus: function() {
|
||||||
this.$('#commandTextField').focus();
|
this.$('#commandTextField').focus();
|
||||||
|
// we now our cursor is there so...
|
||||||
|
$(this.commandCursor).toggleClass('shown', true);
|
||||||
},
|
},
|
||||||
|
|
||||||
onKey: function(e) {
|
onKey: function(e) {
|
||||||
|
@ -259,9 +276,6 @@ var CommandLineHistoryView = Backbone.View.extend({
|
||||||
var t = $('#terminal')[0];
|
var t = $('#terminal')[0];
|
||||||
|
|
||||||
if ($(t).hasClass('scrolling')) {
|
if ($(t).hasClass('scrolling')) {
|
||||||
console.log('scrolling');
|
|
||||||
console.log(t.scrollHeight);
|
|
||||||
console.log(t.scrollTop);
|
|
||||||
t.scrollTop = t.scrollHeight;
|
t.scrollTop = t.scrollHeight;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ var TIME = {
|
||||||
};
|
};
|
||||||
|
|
||||||
var GRAPHICS = {
|
var GRAPHICS = {
|
||||||
nodeRadius: 15,
|
nodeRadius: 17,
|
||||||
curveControlPointOffset: 50,
|
curveControlPointOffset: 50,
|
||||||
defaultEasing: 'easeInOut',
|
defaultEasing: 'easeInOut',
|
||||||
defaultAnimationTime: 300,
|
defaultAnimationTime: 300,
|
||||||
|
|
|
@ -288,6 +288,10 @@ p.commandLine span.prompt {
|
||||||
-webkit-animation-iteration-count: 99999; */
|
-webkit-animation-iteration-count: 99999; */
|
||||||
background: #DDD;
|
background: #DDD;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#prompt span.cursor.shown {
|
||||||
opacity: 0.7;
|
opacity: 0.7;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -526,6 +526,7 @@ var VisNode = Backbone.Model.extend({
|
||||||
var text = paper.text(textPos.x, textPos.y, String(this.get('id')));
|
var text = paper.text(textPos.x, textPos.y, String(this.get('id')));
|
||||||
text.attr({
|
text.attr({
|
||||||
'font-size': 12,
|
'font-size': 12,
|
||||||
|
'font-weight': 'bold',
|
||||||
'font-family': 'Monaco, Courier, font-monospace',
|
'font-family': 'Monaco, Courier, font-monospace',
|
||||||
opacity: this.getOpacity()
|
opacity: this.getOpacity()
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue