diff options
| author | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2011-07-27 15:11:30 +0100 |
|---|---|---|
| committer | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2011-07-27 15:11:30 +0100 |
| commit | 115f7d6b5124a75f32654eb45c8e0edd65863f4e (patch) | |
| tree | 2d07eb8dda4f52c915f6d3c872398231cf473ebd /static | |
| parent | f4e04be9da33ed968f9b0e816dd8e85f70d4d3ce (diff) | |
| download | etherpad-lite-115f7d6b5124a75f32654eb45c8e0edd65863f4e.zip | |
Fixed the iframe problems
Diffstat (limited to 'static')
| -rw-r--r-- | static/js/cssmanager.js | 2 | ||||
| -rw-r--r-- | static/js/pad_editbar.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/static/js/cssmanager.js b/static/js/cssmanager.js index 85e5552c..5601ea25 100644 --- a/static/js/cssmanager.js +++ b/static/js/cssmanager.js @@ -20,7 +20,7 @@ function makeCSSManager(emptyStylesheetTitle, top) function getSheetByTitle(title, top) { if(top) - var allSheets = window.top.document.styleSheets; + var allSheets = window.parent.parent.document.styleSheets; else var allSheets = document.styleSheets; diff --git a/static/js/pad_editbar.js b/static/js/pad_editbar.js index 75cd7402..f088eaeb 100644 --- a/static/js/pad_editbar.js +++ b/static/js/pad_editbar.js @@ -101,13 +101,13 @@ var padeditbar = (function() else if (cmd == 'embed') { var padurl = document.location; - $('#embedinput').val("<iframe src='" + padurl + "' width=500 height=400>"); + $('#embedinput').val("<iframe src='" + padurl + "' width=600 height=400>"); self.toogleDropDown("embed"); $('#embedinput').focus().select(); } else if (cmd == 'import_export') { - self.toogleDropDown("importexport"); + self.toogleDropDown("importexport"); } else if (cmd == 'readonly') |