Skip to content

Commit

Permalink
working on resize
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnMcLear committed Nov 6, 2014
1 parent 96d6e7c commit 0685e56
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions src/static/css/pad.css
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,7 @@ input[type=checkbox] {
margin-bottom: 33px
}
.toolbar ul.menu_left {
right:0px;
}
.toolbar ul.menu_right {
background: #f7f7f7;
Expand Down
13 changes: 0 additions & 13 deletions src/static/js/pad.js
Original file line number Diff line number Diff line change
Expand Up @@ -370,19 +370,6 @@ function handshake()
$('#readonlyinput').on('click',function(){
padeditbar.setEmbedLinks();
});
// Listen for resize events (sucks but needed as iFrame ace_inner has to be position absolute
// A CSS fix for this would be nice but I'm not sure how we'd do it.
$(window).resize(function(){
redrawEditbar();
});
redrawEditbar();
}

var redrawEditbar = function(){
var editbarHeight = $('.menu_left').height() + 2 + "px";
var containerTop = $('.menu_left').height() + 5 + "px";
$('#editbar').css("height", editbarHeight);
$('#editorcontainer').css("top", containerTop);
}

$.extend($.gritter.options, {
Expand Down
15 changes: 14 additions & 1 deletion src/static/js/pad_editbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,12 @@ var padeditbar = (function()
init: function() {
var self = this;
self.dropdowns = [];

// Listen for resize events (sucks but needed as iFrame ace_inner has to be position absolute
// A CSS fix for this would be nice but I'm not sure how we'd do it.
$(window).resize(function(){
self.redrawHeight();
});

$("#editbar .editbarbutton").attr("unselectable", "on"); // for IE
$("#editbar").removeClass("disabledtoolbar").addClass("enabledtoolbar");
$("#editbar [data-key]").each(function () {
Expand All @@ -149,6 +154,8 @@ var padeditbar = (function()
});
});

this.redrawHeight();

registerDefaultCommands(self);

hooks.callAll("postToolbarInit", {
Expand All @@ -170,6 +177,12 @@ var padeditbar = (function()
this.commands[cmd] = callback;
return this;
},
redrawHeight: function(){
var editbarHeight = $('.menu_left').height() + 2 + "px";
var containerTop = $('.menu_left').height() + 5 + "px";
$('#editbar').css("height", editbarHeight);
$('#editorcontainer').css("top", containerTop);
},
registerDropdownCommand: function (cmd, dropdown) {
dropdown = dropdown || cmd;
self.dropdowns.push(dropdown)
Expand Down

0 comments on commit 0685e56

Please sign in to comment.