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

more OxJS api changes

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> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Open Media Library</title> <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> <style>
#loading { #loading {
text-align: center; text-align: center;

2
static/js/URL.js
View File

@ -241,7 +241,7 @@ oml.URL = (function() {
Ox.Request.cancel(); Ox.Request.cancel();
self.isPopState = true; self.isPopState = true;
$('.OxDialog:visible').each(function() { $('.OxDialog:visible').each(function() {
Ox.UI.elements[$(this).data('oxid')].close(); Ox.$elements[$(this).data('oxid')].close();
}); });
if (e.state && !Ox.isEmpty(e.state)) { if (e.state && !Ox.isEmpty(e.state)) {
document.title = Ox.decodeHTMLEntities(e.state.title); 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) || !Ox.contains(['import', 'export'], previousPage)
) { ) {
$('.OxDialog:visible').each(function() { $('.OxDialog:visible').each(function() {
Ox.UI.elements[$(this).data('oxid')].close(); Ox.$elements[$(this).data('oxid')].close();
}); });
} }
// open dialog // open dialog

2
static/js/backButton.js
View File

@ -7,7 +7,7 @@ oml.ui.backButton = function() {
that = Ox.Button({ that = Ox.Button({
style: 'squared', style: 'squared',
title: 'arrowLeft', 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' type: 'image'
}) })
.css({ .css({

4
static/js/oml.js
View File

@ -5,7 +5,7 @@
var animationInterval, var animationInterval,
enableDebugMode = getLocalStorage('oml.enableDebugMode'), enableDebugMode = getLocalStorage('oml.enableDebugMode'),
omlVersion = getOMLVersion(), omlVersion = getOMLVersion(),
oxjsPath = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'build'), oxjsPath = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'min'),
terminal, terminal,
theme = getLocalStorage('Ox.theme') theme = getLocalStorage('Ox.theme')
&& JSON.parse(localStorage['Ox.theme']) && JSON.parse(localStorage['Ox.theme'])
@ -143,7 +143,7 @@
images.loadingIcon.style.OUserSelect = 'none'; images.loadingIcon.style.OUserSelect = 'none';
images.loadingIcon.style.WebkitUserSelect = 'none'; images.loadingIcon.style.WebkitUserSelect = 'none';
images.loadingIcon.src = oxjsPath images.loadingIcon.src = oxjsPath
+ '/Ox.UI/themes/' + theme + '/svg/symbolLoading.svg'; + '/UI/themes/' + theme + '/svg/symbolLoading.svg';
callback(images); callback(images);
}; };
images.logo.src = '/static/png/oml.png'; 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({ that = Ox.Button({
style: 'squared', style: 'squared',
title: 'arrowRight', title: 'arrowRight',
tooltip: Ox._('Open Book {0}', [Ox.UI.symbols.return]), tooltip: Ox._('Open Book {0}', [Ox.SYMBOLS.return]),
type: 'image' type: 'image'
}) })
.css({ .css({

2
static/js/previewButton.js
View File

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

6
static/js/utils.js
View File

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