Commit 090fd534 authored by yPhil's avatar yPhil

SYS: Initial white fout OK

parent b080f21e
......@@ -22,7 +22,6 @@
"jquery-ui": "^1.12.1",
"fancybox": "^3.1.25",
"radialIndicator": "^1.3.1",
"notifyjs": "latest",
"intro.js": "latest",
"remotestorage": "rs#^1.0.2",
"rs-widget": "^1.2.0"
......
......@@ -1710,6 +1710,12 @@
"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
"integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ="
},
"intro.js": {
"version": "2.8.0-alpha.1",
"resolved": "https://registry.npmjs.org/intro.js/-/intro.js-2.8.0-alpha.1.tgz",
"integrity": "sha1-CDh4OviPbVIlT4bBGOYKXUo58f4=",
"dev": true
},
"ipaddr.js": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz",
......
......@@ -17,6 +17,7 @@
"postinstall": "bower install"
},
"devDependencies": {
"intro.js": "2.8.0-alpha.1",
"mocha": "4.1.0",
"should": "13.2.0"
},
......
......@@ -41,6 +41,11 @@
}
}
body {
background-color: var(--bg-color-ter) !important;
color: var(--color-pri) !important;
}
#gallerySpeedSlider,
#feedLimit {
margin-right: 0;
......@@ -61,11 +66,6 @@
font-style: normal;
}
body {
background-color: var(--bg-color-ter) !important;
color: var(--color-pri) !important;
}
.div-fake-hidden {
width:0px;
height:0px;
......@@ -118,14 +118,13 @@ input#feedGuess {
display:none !important;
}
#noSourcesButton > button {
/* margin-top:50%; */
background-color: #39b54a;
border: 1px transparent solid;
color: #FFFFFF;
#noSourcesButton > div {
color: var(--color-pri) !important;
font-size: 12pt;
}
#noSourcesButton > button > i {
#noSourcesButton > div > i {
color: var(--color-pri) !important;
font-size: 24pt;
}
......
......@@ -336,15 +336,6 @@ MOB.feed = {
var mediaUrl;
if (item['media:group']) {
var myArray = item['media:group']['media:content'];
for (var i = 0; i < myArray.length; i++) {
if (myArray[i]['@'].url) {
mediaUrl = myArray[i]['@'].url;
}
}
}
var $tempDom = $('<output>').append($description);
if (typeof $tempDom.find('img').attr('src') !== 'undefined') {
......@@ -353,10 +344,17 @@ MOB.feed = {
if (typeof item.image.url !== 'undefined') {
mediaUrl = item.image.url;
} else if (item.enclosures[0]) {
mediaUrl = item.enclosures[0].url;
}
if (item.enclosures[0]) {
mediaUrl = item.enclosures[0].url;
if (item['media:group']) {
var myArray = item['media:group']['media:content'];
for (var i = 0; i < myArray.length; i++) {
if (myArray[i]['@'].url) {
mediaUrl = myArray[i]['@'].url;
}
}
}
var summary = $('<p>').append(item.summary).text();
......
$("#mobStyle").attr({href : '/static/css/themes/' + MOB.prefs.readConfig('theme') + '.css'});
var $indicatorContainer = $('#indicatorContainer').hide();
var $menu = $('#menu');
......@@ -31,39 +33,12 @@ $indicatorContainer.radialIndicator({
percentage: true
});
$.notify.defaults({
// whether to hide the notification on click
clickToHide: true,
// whether to auto-hide the notification
autoHide: true,
// if autoHide, hide after milliseconds
autoHideDelay: 3000,
// default style
style: 'bootstrap',
// show the arrow pointing at the element
arrowShow: true,
// arrow size in pixels
arrowSize: 5,
// show animation
showAnimation: 'slideDown',
// show animation duration
showDuration: 400,
// hide animation
hideAnimation: 'slideUp',
// hide animation duration
hideDuration: 200,
// padding between element and notification
gap: 2
});
$( document ).keydown(function( event ) {
if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
$( ".tabSort" ).sortable( "cancel" );
}
});
$("#mobStyle").attr({href : '/static/css/themes/' + MOB.prefs.readConfig('theme') + '.css'});
var $tabs = $('#tabs').tabs({
heightStyle: 'content',
activate: function() {
......@@ -101,12 +76,6 @@ $tabs.on("click", "i.tabCloser", function() {
MOB.utilities.noSourcesButton();
$('#noSourcesButton button').button();
// $('#noSourcesButton button').click(function() {
// MOB.dialog.newContent();
// });
// INIT
if (MOB.utilities.isMobile()) {
......
......@@ -196,19 +196,16 @@ $('<div id="menu">').appendTo($('body')).load('/static/templates/menu.html', fun
if (isJsonString(y)) {
p = JSON.parse(y);
} else {
$.notify(MOB.tr('This file is bad'), 'error');
console.error('Pétrolette | ' + MOB.tr('This file is bad'));
}
// console.log('p Is array: %s', isOk(p));
if (p && isOk(p) === true){
$.notify(MOB.tr('Loading of [%s] OK', f.name), 'success');
console.info('Pétrolette | ' + MOB.tr('Loading of [%s] OK', f.name));
MOB.tab.populate(p, true);
} else {
$.notify(MOB.tr('This file is bad'), 'error');
console.error('Pétrolette | ' + MOB.tr('This file is bad'));
}
// console.log('Is Valid: %s', isValid)
};
})(f);
......
......@@ -36,12 +36,12 @@ MOB.sync = (function() {
remoteStorage.on('connected', function() {
synchronized = true;
console.info('Petrolette | Connected to remote storage');
console.info('Pétrolette | Connected to remote storage');
});
remoteStorage.on('disconnected', function() {
synchronized = false;
console.info('Petrolette | Disconnected from remote storage');
console.info('Pétrolette | Disconnected from remote storage');
});
return {
......@@ -61,13 +61,13 @@ MOB.sync = (function() {
if (MOB.prefs.isValidSourcesFile(JSON.parse(data))) {
console.info('Petrolette | Validation OK');
console.info('Pétrolette | Remote file validation OK');
return MOB.tab.populate(JSON.parse(data));
} else {
console.error('Petrolette | Validation NOT OK(%s) Tryin browser cache', data);
console.error('Pétrolette | Remote file validation NOT OK(%s) Tryin browser cache', data);
if (MOB.prefs.isValidSourcesFile(JSON.parse(MOB.prefs.readConfig('tabs')))) {
console.log('plop');
......@@ -80,7 +80,6 @@ MOB.sync = (function() {
})
.catch((err) => {
// console.error('Petrolette | Validation err:', err);
if (MOB.prefs.isValidSourcesFile(JSON.parse(MOB.prefs.readConfig('tabs')))) {
MOB.tab.populate(JSON.parse(MOB.prefs.readConfig('tabs')));
......@@ -99,10 +98,10 @@ MOB.sync = (function() {
remoteStorage.petrolette.write(sources)
.then(() => {
console.info('Petrolette | Writing to remote storage OK');
console.info('Pétrolette | Writing to remote storage OK');
})
.catch((err) => {
console.error('Petrolette | Validation error:', err);
console.error('Pétrolette | Remote file validation error:', err);
});
// localStorage.setItem(key, val);
......
......@@ -4,8 +4,12 @@ MOB.utilities = {
var $loadingSpinner = $('<i>')
.attr('class', 'icon-spin3 spin');
var $noSourcesButton = $('<button>')
var $noSourcesText = $('<span>').text('Loading sources');
var $noSourcesButton = $('<div>')
// .append('<span data-content="Whoops, no sources!" data-title="Whoops, no sources!" class="translate"> Whoops, no sources! </span> <br/> <span data-content="Click here to add some." data-title="Click here to add some." class="translate"> Click here to add some.</span>')
.append($noSourcesText)
.append('<br>')
.append($loadingSpinner);
var $noSourcesButtonContainer = $('<div>')
......
......@@ -52,7 +52,7 @@
</head>
<body>
<body style="background-color:#7C818C;">
<div class="div-fake-hidden">
<i class="icon-arrows-cw"></i>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment