Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
erp5
Commits
755071b1
Commit
755071b1
authored
Jan 18, 2016
by
Boris Kocherov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: use standart submit buttons in erp5_mode and renderjsui_mode
parent
b1e8b649
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
499 additions
and
466 deletions
+499
-466
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_spreadsheet_view_js.xml
...b_page_module/gadget_officejs_jio_spreadsheet_view_js.xml
+4
-4
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_ooffice_js.xml
...js/PathTemplateItem/web_page_module/gadget_ooffice_js.xml
+18
-13
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_theme/ooffice/apps/api/documents/api.js.xml
...erp5_officejs_theme/ooffice/apps/api/documents/api.js.xml
+14
-3
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_theme/ooffice/apps/documenteditor/main/app.js.xml
...fficejs_theme/ooffice/apps/documenteditor/main/app.js.xml
+212
-205
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_theme/ooffice/apps/spreadsheeteditor/main/app.js.xml
...cejs_theme/ooffice/apps/spreadsheeteditor/main/app.js.xml
+251
-241
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_spreadsheet_view_js.xml
View file @
755071b1
...
@@ -260,9 +260,9 @@
...
@@ -260,9 +260,9 @@
page_title: options.doc.title + " | " + options.doc.portal_type,\n
page_title: options.doc.title + " | " + options.doc.portal_type,\n
back_url: "#page=" +\n
back_url: "#page=" +\n
options.doc.portal_type.toLowerCase() + "_list",\n
options.doc.portal_type.toLowerCase() + "_list",\n
panel_action: false\n
panel_action: false
,
\n
// breadcrumb_url: all_result[4],\n
// breadcrumb_url: all_result[4],\n
//
save_action: true\n
save_action: true\n
});\n
});\n
})\n
})\n
.push(function () {\n
.push(function () {\n
...
@@ -468,7 +468,7 @@
...
@@ -468,7 +468,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
948.3
1999.56515.17117
</string>
</value>
<value>
<string>
948.3
6396.44642.6109
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -486,7 +486,7 @@
...
@@ -486,7 +486,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
145
2882676.55
</float>
<float>
145
3145109.87
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_ooffice_js.xml
View file @
755071b1
...
@@ -113,9 +113,9 @@
...
@@ -113,9 +113,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
text_content
</string>
</key>
<key>
<string>
text_content
</string>
</key>
<value>
<string>
/*global window, rJS, DocsAPI, console, document*/\n
<value>
<string>
/*global window, rJS,
RSVP,
DocsAPI, console, document*/\n
/*jslint nomen: true, maxlen:80, indent:2*/\n
/*jslint nomen: true, maxlen:80, indent:2*/\n
(function (rJS, DocsAPI) {\n
(function (rJS,
RSVP,
DocsAPI) {\n
"use strict";\n
"use strict";\n
// Document Editor event handlers\n
// Document Editor event handlers\n
//function onRequestHistory() {\n
//function onRequestHistory() {\n
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
\n
\n
rJS(window)\n
rJS(window)\n
.ready(function (g) {\n
.ready(function (g) {\n
g.props = {};\n
g.props = {
save_defer: null
};\n
})\n
})\n
.ready(function (g) {\n
.ready(function (g) {\n
return g.getElement()\n
return g.getElement()\n
...
@@ -380,11 +380,18 @@
...
@@ -380,11 +380,18 @@
//\'onRequestHistoryData\': onRequestHistoryData,\n
//\'onRequestHistoryData\': onRequestHistoryData,\n
//\'onRequestHistoryClose\': onRequestHistoryClose,\n
//\'onRequestHistoryClose\': onRequestHistoryClose,\n
\'onSave\': function (event) {\n
\'onSave\': function (event) {\n
g.props.value = event.data;\n
var result = {};\n
if (g.props.save_defer === null) {\n
g.triggerSubmit();\n
g.triggerSubmit();\n
} else {\n
result[g.props.key] = event.data;\n
g.props.save_defer.resolve(result);\n
g.props.save_defer = null;\n
}\n
return true;\n
return true;\n
// if you want to async save process return false\n
// if you want to async save process return false\n
// and call api.processSaveResult when ready\n
// and call api.processSaveResult when ready\n
// g.props.docEditor.processSaveResult();\n
},\n
},\n
\'onError\': onError\n
\'onError\': onError\n
}\n
}\n
...
@@ -397,15 +404,13 @@
...
@@ -397,15 +404,13 @@
})\n
})\n
\n
\n
.declareMethod(\'getContent\', function () {\n
.declareMethod(\'getContent\', function () {\n
var result = {};\n
var g = this;\n
//document.getElementsByName(\'frameEditor\')[0]\n
g.props.save_defer = RSVP.defer();\n
// .contentWindow.document.getElementById(\'id-toolbar-btn-save\').click();\n
g.props.docEditor.save();\n
// this.props.docEditor.processSaveResult();\n
return g.props.save_defer.promise;\n
result[this.props.key] = this.props.value;\n
return result;\n
});\n
});\n
\n
\n
}(rJS, DocsAPI));
</string>
</value>
}(rJS,
RSVP,
DocsAPI));
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
version
</string>
</key>
<key>
<string>
version
</string>
</key>
...
@@ -532,7 +537,7 @@
...
@@ -532,7 +537,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
948.3
1979.10733.53111
</string>
</value>
<value>
<string>
948.3
6349.33632.18926
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -550,7 +555,7 @@
...
@@ -550,7 +555,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
145
2885806.26
</float>
<float>
145
3142306.9
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_theme/ooffice/apps/api/documents/api.js.xml
View file @
755071b1
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
_EtagSupport__etag
</string>
</key>
<key>
<string>
_EtagSupport__etag
</string>
</key>
<value>
<string>
ts5
0885437.8
</string>
</value>
<value>
<string>
ts5
3133045.59
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
__name__
</string>
</key>
<key>
<string>
__name__
</string>
</key>
...
@@ -306,6 +306,16 @@
...
@@ -306,6 +306,16 @@
}\r\n
}\r\n
});\r\n
});\r\n
};\r\n
};\r\n
\r\n
var _save = function(result, message) {\r\n
_sendCommand({\r\n
command: \'save\',\r\n
data: {\r\n
result: result,\r\n
message: message\r\n
}\r\n
});\r\n
};\r\n
\r\n
\r\n
var _processSaveResult = function(result, message) {\r\n
var _processSaveResult = function(result, message) {\r\n
_sendCommand({\r\n
_sendCommand({\r\n
...
@@ -385,6 +395,7 @@
...
@@ -385,6 +395,7 @@
showError : _showError,\r\n
showError : _showError,\r\n
showMessage : _showMessage,\r\n
showMessage : _showMessage,\r\n
applyEditRights : _applyEditRights,\r\n
applyEditRights : _applyEditRights,\r\n
save : _save,\r\n
processSaveResult : _processSaveResult,\r\n
processSaveResult : _processSaveResult,\r\n
processRightsChange : _processRightsChange,\r\n
processRightsChange : _processRightsChange,\r\n
refreshHistory : _refreshHistory,\r\n
refreshHistory : _refreshHistory,\r\n
...
@@ -411,7 +422,7 @@
...
@@ -411,7 +422,7 @@
};\r\n
};\r\n
\r\n
\r\n
DocsAPI.DocEditor.version = function() {\r\n
DocsAPI.DocEditor.version = function() {\r\n
return \'3.0b
.760
\';\r\n
return \'3.0b
##BN#
\';\r\n
};\r\n
};\r\n
\r\n
\r\n
MessageDispatcher = function(fn, scope) {\r\n
MessageDispatcher = function(fn, scope) {\r\n
...
@@ -558,7 +569,7 @@
...
@@ -558,7 +569,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
size
</string>
</key>
<key>
<string>
size
</string>
</key>
<value>
<int>
1
6820
</int>
</value>
<value>
<int>
1
7124
</int>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
...
...
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_theme/ooffice/apps/documenteditor/main/app.js.xml
View file @
755071b1
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_theme/ooffice/apps/spreadsheeteditor/main/app.js.xml
View file @
755071b1
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment