Merge remote-tracking branch 'origin/oov4' into staging
commit
a450a5bd58
|
@ -59,9 +59,9 @@ define([
|
|||
|
||||
var CHECKPOINT_INTERVAL = 100;
|
||||
var DISPLAY_RESTORE_BUTTON = false;
|
||||
var NEW_VERSION = 3;
|
||||
var NEW_VERSION = 4;
|
||||
var PENDING_TIMEOUT = 30000;
|
||||
var CURRENT_VERSION = 'v2b';
|
||||
var CURRENT_VERSION = 'v4';
|
||||
//var READONLY_REFRESH_TO = 15000;
|
||||
|
||||
var debug = function (x, type) {
|
||||
|
@ -2482,7 +2482,8 @@ define([
|
|||
$(APP.helpMenu.menu).after(msg);
|
||||
readOnly = true;
|
||||
}
|
||||
} else if (content && content.version === 2) {
|
||||
} else if (content && content.version <= 3) { // V2 or V3
|
||||
version = 'v2b/';
|
||||
APP.migrate = true;
|
||||
// Registedred ~~users~~ editors can start the migration
|
||||
if (common.isLoggedIn() && !readOnly) {
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,110 @@
|
|||
@charset "UTF-8";
|
||||
|
||||
/*
|
||||
* Worksheet canvas
|
||||
* --------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ws-canvas-outer {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
#ws-canvas {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
#ws-canvas-overlay, #ws-canvas-graphic, #ws-canvas-graphic-overlay {
|
||||
border: 0;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Worksheet scroll bars
|
||||
* --------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ws-v-scrollbar {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
width: 19px;
|
||||
top: -1px;
|
||||
bottom: 18px;
|
||||
overflow: hidden;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
#ws-v-scroll-helper {
|
||||
width: 1px;
|
||||
}
|
||||
|
||||
#ws-h-scrollbar {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
height: 19px;
|
||||
left: 0;
|
||||
right: 18px;
|
||||
overflow: hidden;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
#ws-h-scroll-helper {
|
||||
height: 1px;
|
||||
}
|
||||
|
||||
#ws-scrollbar-corner {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
background-color: #DCE2E8;
|
||||
border: 0;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
/* Scrollbars common */
|
||||
|
||||
#ws-v-scrollbar .jspVerticalBar,
|
||||
#ws-h-scrollbar .jspHorizontalBar,
|
||||
#ws-v-scrollbar .jspTrack,
|
||||
#ws-h-scrollbar .jspTrack {
|
||||
background-color: #DCE2E8;
|
||||
}
|
||||
|
||||
#ws-v-scrollbar .jspDrag,
|
||||
#ws-h-scrollbar .jspDrag {
|
||||
background-color: #C0C0C0;
|
||||
}
|
||||
#ws-v-scrollbar .jspDrag.jspHover,
|
||||
#ws-v-scrollbar .jspDrag.jspActive,
|
||||
#ws-h-scrollbar .jspDrag.jspHover,
|
||||
#ws-h-scrollbar .jspDrag.jspActive {
|
||||
background-color: #808080;
|
||||
}
|
||||
|
||||
/* Vertical scrollbar */
|
||||
|
||||
#ws-v-scrollbar .jspVerticalBar {
|
||||
width: 7px;
|
||||
border-left: 1px solid #C1C6CC;
|
||||
}
|
||||
#ws-v-scrollbar .jspTrack {
|
||||
width: 8px;
|
||||
}
|
||||
|
||||
/* Horizontal scrollbar */
|
||||
|
||||
#ws-h-scrollbar .jspHorizontalBar {
|
||||
height: 7px;
|
||||
border-top: 1px solid #C1C6CC;
|
||||
}
|
||||
#ws-h-scrollbar .jspTrack {
|
||||
height: 8px;
|
||||
}
|
|
@ -0,0 +1,160 @@
|
|||
@charset "UTF-8";
|
||||
|
||||
/*
|
||||
* Worksheet canvas
|
||||
* --------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ws-canvas-outer {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
right: 14px;
|
||||
bottom: 14px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#ws-canvas {
|
||||
border: 0;
|
||||
-webkit-user-select: none;
|
||||
}
|
||||
|
||||
#ws-canvas-overlay, #ws-canvas-graphic, #ws-canvas-graphic-overlay {
|
||||
-webkit-user-select: none;
|
||||
border: 0;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Worksheet scroll bars
|
||||
* --------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ws-v-scrollbar {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
width: 14px;
|
||||
top: 0px;
|
||||
bottom: 14px;
|
||||
overflow: hidden;
|
||||
z-index: 10;
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
#ws-v-scroll-helper {
|
||||
width: 1px;
|
||||
}
|
||||
|
||||
#ws-h-scrollbar {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
height: 14px;
|
||||
left: 0px;
|
||||
right: 14px;
|
||||
overflow: hidden;
|
||||
z-index: 10;
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
#ws-h-scroll-helper {
|
||||
height: 1px;
|
||||
}
|
||||
|
||||
#ws-scrollbar-corner {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
background-color: #F4F4F4;
|
||||
border: 0;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
/* Scrollbars common */
|
||||
|
||||
#ws-v-scrollbar .jspVerticalBar,
|
||||
#ws-h-scrollbar .jspHorizontalBar,
|
||||
#ws-v-scrollbar .jspTrack,
|
||||
#ws-h-scrollbar .jspTrack {
|
||||
background-color: #DCE2E8;
|
||||
}
|
||||
|
||||
#ws-v-scrollbar .jspDrag,
|
||||
#ws-h-scrollbar .jspDrag {
|
||||
background-color: #C0C0C0;
|
||||
}
|
||||
#ws-v-scrollbar .jspDrag.jspHover,
|
||||
#ws-v-scrollbar .jspDrag.jspActive,
|
||||
#ws-h-scrollbar .jspDrag.jspHover,
|
||||
#ws-h-scrollbar .jspDrag.jspActive {
|
||||
background-color: #808080;
|
||||
}
|
||||
|
||||
/* Vertical scrollbar */
|
||||
|
||||
#ws-v-scrollbar .jspVerticalBar {
|
||||
width: 7px;
|
||||
border-left: 1px solid #C1C6CC;
|
||||
}
|
||||
#ws-v-scrollbar .jspTrack {
|
||||
width: 8px;
|
||||
}
|
||||
|
||||
/* Horizontal scrollbar */
|
||||
|
||||
#ws-h-scrollbar .jspHorizontalBar {
|
||||
height: 7px;
|
||||
border-top: 1px solid #C1C6CC;
|
||||
}
|
||||
#ws-h-scrollbar .jspTrack {
|
||||
height: 8px;
|
||||
}
|
||||
|
||||
/*
|
||||
* Cell editor
|
||||
* --------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ce-canvas-outer,
|
||||
#ce-canvas-outer-menu {
|
||||
position: absolute;
|
||||
border: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#ce-canvas,
|
||||
#ce-canvas-overlay,
|
||||
#ce-canvas-menu,
|
||||
#ce-canvas-overlay-menu {
|
||||
border: 0;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
#ce-cursor,
|
||||
#ce-cursor-menu {
|
||||
position: absolute;
|
||||
background-color: #000;
|
||||
width: 1px;
|
||||
height: 11pt;
|
||||
cursor: text;
|
||||
}
|
||||
|
||||
#apiPopUpSelector {
|
||||
position: absolute;
|
||||
}
|
||||
#apiPopUpList {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
max-height: 210px;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
#apiPopUpList li {
|
||||
max-width: 500px;
|
||||
}
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
After Width: | Height: | Size: 207 B |
Binary file not shown.
After Width: | Height: | Size: 314 B |
Binary file not shown.
After Width: | Height: | Size: 207 B |
Binary file not shown.
After Width: | Height: | Size: 304 B |
Binary file not shown.
After Width: | Height: | Size: 363 B |
Binary file not shown.
After Width: | Height: | Size: 672 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue