Permalink
Browse files

Merge branch 'master' of git+ssh://208.43.61.234/var/scm/jotky-beta-2

  • Loading branch information...
BimoZX committed Apr 11, 2012
2 parents 0b8fecc + 001f5c1 commit 0e57ccd182a039bc7853f1def97380eaecf43a07
@@ -51,7 +51,10 @@ window.CurrentUserModel = Backbone.Model.extend({
},
unsetToken: function(){
- $.cookie("jotky_token", null);
+ $.cookie("jotky_token", null, {
+ path : '/',
+ domain : window.location.hostname
+ });
},
setProfile: function(token, with_login){
@@ -9,11 +9,11 @@ window.MagicboxJotView = Backbone.View.extend({
jot_more_maxlength: 512,
- current_length_holder: $('#jot-input-text-length'),
+ initialize: function(options){
+ this.current_length_holder = $('#jot-input-text-length');
- current_more_length_holder: $('#jot-input-more-text-length'),
+ this.current_more_length_holder = $('#jot-input-more-text-length');
- initialize: function(options){
this.options = $.extend({}, this.default_options, options);
this.jots = new JotCollection;
@@ -89,7 +89,7 @@ window.MagicboxJotView = Backbone.View.extend({
});
$('#jot-form-title-field').bind('keyup', function(){
- $(this.current_length_holder).text(_this.jot_title_maxlength - this.value.length);
+ $(_this.current_length_holder).text(_this.jot_title_maxlength - this.value.length);
});
},
@@ -205,6 +205,10 @@ window.MagicboxJotView = Backbone.View.extend({
required: true,
maxlength: 512
});
+
+ $('#jot-write-more-field').bind('keyup', function(){
+ $(_this.current_more_length_holder).text(_this.jot_more_maxlength - this.value.length);
+ });
}
else{
$('#jot-write-more-field').rules("remove");

0 comments on commit 0e57ccd

Please sign in to comment.