CAMP/oxspeed
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved local conflicts

Browse Source
This commit is contained in:
Sanj B 2012-01-06 17:54:12 +05:30
parent 0e151870d0
commit 1550afeea2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/speedtrans.js
View File

@ -3,16 +3,15 @@
'use strict'; 'use strict';
(function() { (function() {
Ox.load({ Ox.load({
UI: { UI: {
theme: 'modern' //FIXME: get theme through localStorage // theme: 'modern' //FIXME: get theme through localStorage
} }
}, loadSpeedtrans); }, loadSpeedtrans);
function loadSpeedtrans(browserSupported) { function loadSpeedtrans(browserSupported) {
alert("hi");
if (!browserSupported) { alert("your browser is not supported"); return; } if (!browserSupported) { alert("your browser is not supported"); return; }
window.pandora = Ox.App({url: '/api/'}).bindEvent({ window.pandora = Ox.App({url: '/api/'}).bindEvent({
'load': function(data) { 'load': function(data) {
// console.log(data); // console.log(data);