0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

more OxJS api changes

Browse source
This commit is contained in:
j 2014-09-29 15:17:59 +02:00
parent 4fc5fc53de
commit ec459b0fac
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/html/load.html
View file

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>Open Media Library</title>
<link href="../oxjs/build/Ox.UI/css/Ox.UI.css" rel="stylesheet" type="text/css" />
<link href="../oxjs/min/UI/css/UI.css" rel="stylesheet" type="text/css" />
<style>
#loading {
text-align: center;

2
static/js/URL.js
View file

@ -241,7 +241,7 @@ oml.URL = (function() {
Ox.Request.cancel();
self.isPopState = true;
$('.OxDialog:visible').each(function() {
Ox.UI.elements[$(this).data('oxid')].close();
Ox.$elements[$(this).data('oxid')].close();
});
if (e.state && !Ox.isEmpty(e.state)) {
document.title = Ox.decodeHTMLEntities(e.state.title);

2
static/js/appPanel.js
View file

@ -31,7 +31,7 @@ oml.ui.appPanel = function() {
|| !Ox.contains(['import', 'export'], previousPage)
) {
$('.OxDialog:visible').each(function() {
Ox.UI.elements[$(this).data('oxid')].close();
Ox.$elements[$(this).data('oxid')].close();
});
}
// open dialog

2
static/js/backButton.js
View file

@ -7,7 +7,7 @@ oml.ui.backButton = function() {
that = Ox.Button({
style: 'squared',
title: 'arrowLeft',
tooltip: Ox._('Back to Books {0}', [Ox.UI.symbols.control + 'W']),
tooltip: Ox._('Back to Books {0}', [Ox.SYMBOLS.control + 'W']),
type: 'image'
})
.css({

4
static/js/oml.js
View file

@ -5,7 +5,7 @@
var animationInterval,
enableDebugMode = getLocalStorage('oml.enableDebugMode'),
omlVersion = getOMLVersion(),
oxjsPath = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'build'),
oxjsPath = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'min'),
terminal,
theme = getLocalStorage('Ox.theme')
&& JSON.parse(localStorage['Ox.theme'])
@ -143,7 +143,7 @@
images.loadingIcon.style.OUserSelect = 'none';
images.loadingIcon.style.WebkitUserSelect = 'none';
images.loadingIcon.src = oxjsPath
+ '/Ox.UI/themes/' + theme + '/svg/symbolLoading.svg';
+ '/UI/themes/' + theme + '/svg/symbolLoading.svg';
callback(images);
};
images.logo.src = '/static/png/oml.png';

2
static/js/openButton.js
View file

@ -7,7 +7,7 @@ oml.ui.openButton = function() {
that = Ox.Button({
style: 'squared',
title: 'arrowRight',
tooltip: Ox._('Open Book {0}', [Ox.UI.symbols.return]),
tooltip: Ox._('Open Book {0}', [Ox.SYMBOLS.return]),
type: 'image'
})
.css({

2
static/js/previewButton.js
View file

@ -8,7 +8,7 @@ oml.ui.previewButton = function() {
selectable: true,
style: 'squared',
title: 'view',
tooltip: Ox._('Preview {0}', [Ox.UI.symbols.space]),
tooltip: Ox._('Preview {0}', [Ox.SYMBOLS.space]),
type: 'image'
})
.css({

6
static/js/utils.js
View file

@ -336,7 +336,7 @@ oml.enableDragAndDrop = function($list, canMove) {
});
});
$tooltip.options({title: getTitle()}).show(data.event);
Ox.UI.$window.on({
Ox.$window.on({
keydown: keydown,
keyup: keyup
});
@ -371,7 +371,7 @@ oml.enableDragAndDrop = function($list, canMove) {
title = $panel.children('.OxBar').children('.OxTitle')
.html().split(' ')[0].toLowerCase();
if (!ui.showFolder[title]) {
Ox.UI.elements[$panel.data('oxid')].options({
Ox.$elements[$panel.data('oxid')].options({
collapsed: false
});
}
@ -411,7 +411,7 @@ oml.enableDragAndDrop = function($list, canMove) {
},
draganddropend: function(data) {
var targets;
Ox.UI.$window.off({
Ox.$window.off({
keydown: keydown,
keyup: keyup
});