Skip to content

O
officejs
Commit 8867af67 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

Merge remote-tracking branch 'remotes/trac/master'

parents d9c16882 b6c5710e
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
UNGProject/js/theme.js
View file @ 8867af67
...@@ -558,12 +558,11 @@ share = function() {alert("share");} ...@@ -558,12 +558,11 @@ share = function() {alert("share");}
editDocumentSettings = function() { editDocumentSettings = function() {
Document.saveCurrentDocument(); Document.saveCurrentDocument();
loadFile("xml/xmlElements.xml", "html", function(data) { loadFile("xml/xmlElements.xml", "html", function(data) {
$(data).find("rename").dialog({ thedialog.html($(data).find("rename"))
autoOpen: true, thedialog.dialog("option", "width", 400);
height: 131, thedialog.dialog("option", "height", 200);
width: 389,
modal: true, thedialog.dialog("option", "buttons", {
buttons: {
"Save": function(){ "Save": function(){
var doc = getCurrentDocument(); var doc = getCurrentDocument();
doc.setTitle($(this).find("#name").attr("value")); doc.setTitle($(this).find("#name").attr("value"));
...@@ -571,10 +570,10 @@ editDocumentSettings = function() { ...@@ -571,10 +570,10 @@ editDocumentSettings = function() {
doc.setVersion($(getCurrentDocument()).find("#version").attr("value")); doc.setVersion($(getCurrentDocument()).find("#version").attr("value"));
Document.saveCurrentDocument(); Document.saveCurrentDocument();
doc.setAsCurrentDocument();//diplay modifications doc.setAsCurrentDocument();//diplay modifications
$(this).dialog("close"); thedialog.dialog("close");
}, },
Cancel: function() { Cancel: function() {
$(this).dialog("close"); thedialog.dialog("close");
} }
} }
}); });
......
UNGProject/theme.html
View file @ 8867af67
...@@ -30,9 +30,11 @@ ...@@ -30,9 +30,11 @@
<script type="text/javascript"> <script type="text/javascript">
// initialize // initialize
var thedialog;
var init = function() { var init = function() {
Page.initialize(Document.supportedDocuments[getCurrentDocument().getType()].editorPage); Page.initialize(Document.supportedDocuments[getCurrentDocument().getType()].editorPage);
Storage.initialize(); Storage.initialize();
thedialog = $("#diag").dialog({title:"",modal: true, autoOpen: false});
} }
$(document).ready(init); $(document).ready(init);
...@@ -40,7 +42,7 @@ ...@@ -40,7 +42,7 @@
</head> </head>
<body> <body>
<div id="diag" style="padding:0;"></div>
<div class="container"> <div class="container">
<div class="navigation"> <div class="navigation">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7