diff --git a/rfe-9198-root_import_survey_default-answer-edit.wgpkg b/rfe-9198-root_import_survey_default-answer-edit.wgpkg deleted file mode 100644 index 5e32dd3a3..000000000 Binary files a/rfe-9198-root_import_survey_default-answer-edit.wgpkg and /dev/null differ diff --git a/rfe-9198-root_import_survey_default-question-edit.wgpkg b/rfe-9198-root_import_survey_default-question-edit.wgpkg deleted file mode 100644 index 19086d8a6..000000000 Binary files a/rfe-9198-root_import_survey_default-question-edit.wgpkg and /dev/null differ diff --git a/rfe-9198-root_import_survey_default-section-edit.wgpkg b/rfe-9198-root_import_survey_default-section-edit.wgpkg deleted file mode 100644 index 09c5c616b..000000000 Binary files a/rfe-9198-root_import_survey_default-section-edit.wgpkg and /dev/null differ diff --git a/rfe9199-survey-default-questions.wgpkg b/rfe9199-survey-default-questions.wgpkg deleted file mode 100644 index 22e638b7c..000000000 Binary files a/rfe9199-survey-default-questions.wgpkg and /dev/null differ diff --git a/rfe9202-survey.wgpkg b/rfe9202-survey.wgpkg deleted file mode 100644 index 739bb1699..000000000 Binary files a/rfe9202-survey.wgpkg and /dev/null differ diff --git a/root_import_survey.wgpkg b/root_import_survey.wgpkg new file mode 100644 index 000000000..a2cb1e824 Binary files /dev/null and b/root_import_survey.wgpkg differ diff --git a/www/extras/wobject/Survey/editsurvey/object.js b/www/extras/wobject/Survey/editsurvey/object.js index 02c05bf12..43fc3f4b7 100644 --- a/www/extras/wobject/Survey/editsurvey/object.js +++ b/www/extras/wobject/Survey/editsurvey/object.js @@ -24,7 +24,7 @@ Survey.ObjectTemplate = new function(){ var form = new YAHOO.widget.Dialog(type, { - width : "500px", + width : "600px", context: [document.body, 'tr', 'tr'], visible : false, constraintoviewport : true, @@ -36,22 +36,21 @@ Survey.ObjectTemplate = new function(){ var textareaId = type+'Text'; var textarea = YAHOO.util.Dom.get(textareaId); + var height = YAHOO.util.Dom.getStyle(textarea,'height'); if (height == ''){ - height = '300px'; - } - var width = YAHOO.util.Dom.getStyle(textarea,'width'); - if (width == ''){ - width = '500px'; + height = '300px'; } myTextarea = new YAHOO.widget.SimpleEditor(textareaId, { height: height, - width: width, + width: '100%', dompath: false //Turns on the bar at the bottom }); - myTextarea.get('toolbar').titlebar = false; - myTextarea.render(); + if (myTextarea.get('toolbar')) { + myTextarea.get('toolbar').titlebar = false; + } + myTextarea.render(); form.show(); }