merging changes
This commit is contained in:
rolux
commit
13501e2da8
94 changed files with 139 additions and 103 deletions
|
|
@ -1,2 +1,2 @@
|
|||
.DS_Store
|
||||
build/js
|
||||
build/js/*
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
<title>ox.js list demo</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../build/css/ox.ui.css"/>
|
||||
<script type="text/javascript" src="../../build/js/jquery-1.4.2.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.ui.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/OxUI.js"></script>
|
||||
<script type="text/javascript" src="js/list.js"></script>
|
||||
</head>
|
||||
<body></body>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$(function() {
|
||||
Ox.UI(function() {
|
||||
|
||||
Ox.theme('modern');
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ $(function() {
|
|||
})
|
||||
.bindEvent({
|
||||
click: function() {
|
||||
$text.html(JSON.stringify($treeList.$element.options('items')))
|
||||
$text.html(JSON.stringify($treeList.$element.options('items')));
|
||||
}
|
||||
})
|
||||
.appendTo($debug),
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
<title>OxJS Mouse Events Demo</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../build/css/ox.ui.css"/>
|
||||
<script type="text/javascript" src="../../build/js/jquery-1.5.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.ui.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/OxUI.js"></script>
|
||||
<script type="text/javascript" src="js/mouse.js"></script>
|
||||
</head>
|
||||
<body></body>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$(function() {
|
||||
Ox.UI(function() {
|
||||
var $target = Ox.Element()
|
||||
.css({
|
||||
position: 'absolute',
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<style>
|
||||
</style>
|
||||
<script type="text/javascript" src="../../build/js/jquery-1.3.2.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/jquery.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/Ox.js"></script>
|
||||
<script type="text/javascript" src="ox.png.js"></script>
|
||||
<script>
|
||||
$(function() {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,9 @@
|
|||
<title>ox.js SplitPanel Demo</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../build/css/ox.ui.css"/>
|
||||
<script type="text/javascript" src="../../build/js/jquery-1.4.2.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.ui.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/OxUI.js"></script>
|
||||
<script>
|
||||
$(function() {
|
||||
Ox.UI(function() {
|
||||
new Ox.SplitPanel({
|
||||
elements: [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,12 +4,9 @@
|
|||
<title>OxJS SplitPanel Demo</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../build/css/ox.ui.css"/>
|
||||
<script type="text/javascript" src="../../build/js/jquery-1.5.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.map.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.ui.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/OxUI.js"></script>
|
||||
<script>
|
||||
$(function() {
|
||||
Ox.UI(function() {
|
||||
function element(options, css) {
|
||||
return Ox.extend({
|
||||
element: Ox.Element().html(JSON.stringify(options))
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../build/css/ox.ui.css"/>
|
||||
<script type="text/javascript" src="../../build/js/jquery-1.4.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.ui.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/OxUI.js"></script>
|
||||
<script type="text/javascript" src="app.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$(function() {
|
||||
Ox.UI(function() {
|
||||
var app = new Ox.App({
|
||||
requestURL: "http://blackbook.local:8000/api/"
|
||||
}),
|
||||
|
|
|
|||
|
|
@ -30,11 +30,9 @@
|
|||
padding: 0 4px 0 4px;
|
||||
}
|
||||
</style>
|
||||
<script type="text/javascript" src="../../build/js/jquery-1.4.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.ui.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/OxUI.js"></script>
|
||||
<script>
|
||||
$(function() {
|
||||
Ox.UI(function() {
|
||||
var size = window.location.hash.substr(1) || "medium",
|
||||
$body = $("body"),
|
||||
$toolbars = [];
|
||||
|
|
|
|||
|
|
@ -5,9 +5,7 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../build/css/ox.ui.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="list.css"/>
|
||||
<script type="text/javascript" src="../../build/js/jquery-1.4.2.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.ui.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/OxUI.js"></script>
|
||||
<script type="text/javascript" src="list.js"></script>
|
||||
</head>
|
||||
<body></body>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$(function() {
|
||||
Ox.UI(function() {
|
||||
Ox.theme("modern");
|
||||
var $body = $("body"),
|
||||
$document = $(document),
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../build/css/ox.ui.css"/>
|
||||
<script type="text/javascript" src="../../build/js/jquery-1.4.1.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/ox.ui.js"></script>
|
||||
<script type="text/javascript" src="../../build/js/OxUI.js"></script>
|
||||
<script type="text/javascript" src="menu.js"></script>
|
||||
</head>
|
||||
<body></body>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$(function() {
|
||||
Ox.UI(function() {
|
||||
var button = new Ox.Button({
|
||||
value: "First",
|
||||
}).css({
|
||||
|
|
|
|||
|
|
@ -6,9 +6,8 @@
|
|||
|
||||
<link rel="stylesheet" type="text/css" href="../build/css/ox.ui.css"/>
|
||||
|
||||
<script type="text/javascript" src="../build/js/jquery-1.4.2.js"></script>
|
||||
<script type="text/javascript" src="../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../build/js/ox.ui.js"></script>
|
||||
<script type="text/javascript" src="../build/js/jquery.js"></script>
|
||||
<script type="text/javascript" src="../build/js/OxUI.js"></script>
|
||||
<script type="text/javascript" src="api.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.AnnotationPanel = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/*
|
||||
============================================================================
|
||||
Application
|
||||
|
|
@ -86,26 +87,6 @@ Ox.App = (function() {
|
|||
};
|
||||
}
|
||||
|
||||
function loadImages(callback) {
|
||||
window.OxImageCache = [];
|
||||
$.getJSON(Ox.UI.PATH + 'json/ox.ui.images.json', function(data) {
|
||||
// fixme: find a better way to not wait for flags
|
||||
data = data.filter(function(image) {
|
||||
return !Ox.startsWith(image, 'svg/ox.map/')
|
||||
});
|
||||
var counter = 0,
|
||||
length = data.length;
|
||||
data.forEach(function(src, i) {
|
||||
var image = new Image();
|
||||
image.src = Ox.UI.PATH + src;
|
||||
image.onload = function() {
|
||||
(++counter == length) && callback();
|
||||
}
|
||||
window.OxImageCache.push(image); // fixme: global var???
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
self.change = function(key, value) {
|
||||
|
||||
};
|
||||
|
|
@ -165,23 +146,19 @@ Ox.App = (function() {
|
|||
user = result.data.user;
|
||||
// fixme: not generic
|
||||
document.title = config.site.name;
|
||||
launchCallback();
|
||||
$(function() {
|
||||
var $div = Ox.UI.$body.find('div');
|
||||
Ox.UI.$body.find('img').remove();
|
||||
$div.animate({
|
||||
opacity: 0
|
||||
}, 1000, function() {
|
||||
$div.remove();
|
||||
});
|
||||
// fixme: not generic enough, just pass data
|
||||
callback({config: config, user: user});
|
||||
});
|
||||
});
|
||||
});
|
||||
loadImages(launchCallback);
|
||||
function launchCallback() {
|
||||
++counter == 2 && $(function() {
|
||||
var $div = Ox.UI.$body.find('div');
|
||||
Ox.UI.$body.find('img').remove();
|
||||
$div.animate({
|
||||
opacity: 0
|
||||
}, 1000, function() {
|
||||
$div.remove();
|
||||
});
|
||||
// fixme: not generic enough, just pass data
|
||||
callback({config: config, user: user});
|
||||
});
|
||||
}
|
||||
}
|
||||
function stop() {
|
||||
that.request.send(self.options.init, getUserData(), function() {});
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
*/
|
||||
Ox.Bar = function(options, self) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.BlockTimeline = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Button = function(options, self) {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.ButtonGroup = function(options, self) {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Calendar = function(options, self) {
|
||||
|
||||
self = self || {};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.CalendarDate = function(options) {
|
||||
|
||||
var self = {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Checkbox = function(options, self) {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.CheckboxGroup = function(options, self) {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Clipboard = function() {
|
||||
/***
|
||||
Ox.Clipboard
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
*/
|
||||
Ox.CollapsePanel = function(options, self) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.ColorInput = function(options, self) {
|
||||
|
||||
var self = $.extend(self || {}, {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.ColorPicker = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
// fixme: wouldn't it be better to let the elements be,
|
||||
// rather then $element, $content, and potentially others,
|
||||
// 0, 1, 2, etc, so that append would append 0, and appendTo
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.DateInput = function(options, self) {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.DateTimeInput = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Dialog = function(options, self) {
|
||||
|
||||
// fixme: dialog should be derived from a generic draggable
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
// check out http://ejohn.org/apps/learn/#36 (-#38, making fns work w/o new)
|
||||
|
||||
Ox.Element = function() {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
// fixme: this is not necessarily part of OxUI
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Filter = function(options, self) {
|
||||
|
||||
/***
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
// fixme: rename!
|
||||
|
||||
Ox.Flipbook = function(options, self) {
|
||||
|
|
@ -18,14 +19,14 @@ Ox.Flipbook = function(options, self) {
|
|||
timestamp = $('<div>').css({
|
||||
'position': 'absolute',
|
||||
'text-align': 'center',
|
||||
'width': '100%',
|
||||
'width': '100%'
|
||||
})
|
||||
.hide(),
|
||||
that = new Ox.Element('div', self)
|
||||
.defaults({
|
||||
frames: {},
|
||||
duration: 0,
|
||||
icon: '',
|
||||
icon: ''
|
||||
})
|
||||
.options(options || {})
|
||||
.append(icon)
|
||||
|
|
@ -66,9 +67,10 @@ Ox.Flipbook = function(options, self) {
|
|||
|
||||
function getFrame(position) {
|
||||
var frame;
|
||||
frames.forEach(function(img, i) {
|
||||
if (!frame || i <= position)
|
||||
Ox.forEach(frames, function(img, i) {
|
||||
if (!frame || i <= position) {
|
||||
frame = img;
|
||||
}
|
||||
});
|
||||
return frame;
|
||||
}
|
||||
|
|
@ -78,7 +80,7 @@ Ox.Flipbook = function(options, self) {
|
|||
frames[i] = new Image();
|
||||
frames[i].onload = function() {
|
||||
frameHeight = frames[i].height / frames[i].width * that.width();
|
||||
}
|
||||
};
|
||||
frames[i].src = src;
|
||||
});
|
||||
}
|
||||
|
|
@ -89,10 +91,11 @@ Ox.Flipbook = function(options, self) {
|
|||
} else if (key == 'icon') {
|
||||
icon.attr('src', value);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if(options.icon)
|
||||
if(options.icon) {
|
||||
icon.attr('src', options.icon);
|
||||
}
|
||||
cacheFrames();
|
||||
return that;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Focus = function() {
|
||||
/***
|
||||
Ox.Focus
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Form = function(options, self) {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.FormElementGroup = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.FormItem = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/***
|
||||
Ox.History
|
||||
***/
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.IconItem = function(options, self) {
|
||||
|
||||
//Ox.print('IconItem', options, self)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.IconList = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Input = function(options, self) {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.InputGroup = function(options, self) {
|
||||
|
||||
/***
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.ItemInput = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
// Basic jQuery element
|
||||
Ox.JQueryElement = function($element) {
|
||||
var that = this;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/***
|
||||
Ox.Keyboard
|
||||
***/
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Label = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.LargeTimeline = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.List = function(options, self) {
|
||||
|
||||
/***
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.ListItem = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.ListMap = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.ListPage = function(options, self) {
|
||||
var self = self || {},
|
||||
that = new Ox.Element({}, self)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.LoadingIcon = function(options, self) {
|
||||
var self = self || {},
|
||||
that = new Ox.Element('img', self)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
*/
|
||||
Ox.MainMenu = function(options, self) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Map = function(options, self) {
|
||||
|
||||
var self = self || {}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.MapImage = function(options, self) {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.MapMarker = function(options) {
|
||||
|
||||
var options = Ox.extend({
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.MapPlace = function(options) {
|
||||
|
||||
options = Ox.extend({
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.MapRectangle = function(options, self) {
|
||||
|
||||
var options = Ox.extend({
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.MapRectangleMarker = function(options, self) {
|
||||
|
||||
var options = Ox.extend({
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
options
|
||||
element the element the menu is attached to
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.MenuItem = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.OptionGroup = function(items, min, max, property) {
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
*/
|
||||
Ox.Panel = function(options, self) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Picker = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.PlaceInput = function(options, self) {
|
||||
|
||||
var self = $.extend(self || {}, {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.PlacePicker = function(options, self) {
|
||||
|
||||
var self = $.extend(self || {}, {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
Ox.Progressbar
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Range = function(options, self) {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Request = function(options) {
|
||||
|
||||
/***
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
*/
|
||||
Ox.Resizebar = function(options, self) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Select = function(options, self) {
|
||||
|
||||
// fixme: selected item needs attribute "checked", not "selected" ... that's strange
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.SmallTimeline = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
options:
|
||||
elements: [{ array of one, two or three elements
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.TabPanel = function(options, self) {
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
*/
|
||||
Ox.Tabbar = function(options, self) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.TextList = function(options, self) {
|
||||
|
||||
// fixme: rename to TableList
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
// fixme: this should be Ox.Theme, and provide Ox.Theme.set(), Ox.Theme.load, etc.
|
||||
/**
|
||||
if name is given as argument, switch to this theme.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.TimeInput = function(options, self) {
|
||||
|
||||
// fixme: seconds get set even if options.seconds is false
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/**
|
||||
fixme: no need for this
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Tooltip = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.TreeList = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
/***
|
||||
Ox.URL
|
||||
***/
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.VideoEditorPlayer = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.VideoElement = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.VideoPanelPlayer = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.VideoEditor = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
Ox.Window = function(options, self) {
|
||||
|
||||
self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
// todo: check http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
|
||||
|
||||
Ox = function(val) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
(function() {
|
||||
|
||||
var path = Array.prototype.slice.apply(
|
||||
|
|
@ -98,7 +99,7 @@
|
|||
var sizes = {
|
||||
small: 20,
|
||||
medium: 24,
|
||||
large: 28,
|
||||
large: 28
|
||||
};
|
||||
return sizes[size];
|
||||
};
|
||||
|
|
@ -156,6 +157,7 @@
|
|||
warning: '\u26A0',
|
||||
white_star: '\u2606'
|
||||
};
|
||||
Ox.IMAGE_CACHE = [];
|
||||
$.getJSON(Ox.UI.PATH + 'json/OxUI.json', function(data) {
|
||||
|
||||
function loadImage(src) {
|
||||
|
|
@ -165,6 +167,7 @@
|
|||
dfd.resolve();
|
||||
};
|
||||
image.src = Ox.UI.PATH + src;
|
||||
Ox.IMAGE_CACHE.push(src);
|
||||
return dfd.promise();
|
||||
}
|
||||
|
||||
|
|
@ -173,10 +176,7 @@
|
|||
var dfd = new $.Deferred();
|
||||
var script = document.createElement('script');
|
||||
script.onload = function() {
|
||||
//setTimeout(function() {
|
||||
console.log('onload', src)
|
||||
dfd.resolve();
|
||||
//}, 1000)
|
||||
dfd.resolve();
|
||||
};
|
||||
script.src = Ox.UI.PATH + src;
|
||||
script.type = 'text/javascript';
|
||||
|
|
@ -188,7 +188,7 @@
|
|||
promises = [];
|
||||
// fixme: find a better way to not wait for flags
|
||||
data = data.filter(function(image) {
|
||||
return !Ox.startsWith(image, 'svg/ox.map/')
|
||||
return !Ox.startsWith(image, 'svg/ox.map/');
|
||||
});
|
||||
data.forEach(function(src) {
|
||||
if (/\.js$/(src)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue