Firefox support

This commit is contained in:
benweet 2013-03-31 16:33:28 +01:00
parent ce43dab439
commit dffc6e8829
7 changed files with 25 additions and 14 deletions

View File

@ -1 +1 @@
CACHE MANIFEST # 2013-03-31:v4 CACHE: index.html css/bootstrap.css css/jgrowl.css css/main.css js/async-runner.js js/base64.js js/bootstrap.js js/config.default.js js/gdrive.js js/jquery.jgrowl.js js/jquery.js js/jquery.layout.js js/jquery-ui.custom.js js/main.js js/Markdown.Converter.js js/Markdown.Editor.js js/Markdown.Sanitizer.js img/ajax-loader.gif img/gdrive.png img/glyphicons-halflings.png img/glyphicons-halflings-white.png img/stackedit-16.png img/stackedit-32.ico NETWORK: * FALLBACK: js/config.custo.js js/config.default.js
CACHE MANIFEST # v4 CACHE: index.html css/bootstrap.css css/jgrowl.css css/main.css js/async-runner.js js/base64.js js/bootstrap.js js/gdrive.js js/jquery.jgrowl.js js/jquery.js js/jquery.layout.js js/jquery-ui.custom.js js/main.js js/Markdown.Converter.js js/Markdown.Editor.js js/Markdown.Sanitizer.js img/ajax-loader.gif img/gdrive.png img/glyphicons-halflings.png img/glyphicons-halflings-white.png img/stackedit-16.png img/stackedit-32.ico NETWORK: *

View File

@ -87,8 +87,9 @@ div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer {
margin-bottom: 5px;
text-align: left;
display: none;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
div.jGrowl div.jGrowl-notification {

View File

@ -1,10 +1,13 @@
body {
background-color: #f5f5f5;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
}
.btn {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
}
/*

View File

@ -10,7 +10,6 @@
<link href="css/bootstrap.css" rel="stylesheet" media="screen">
<link href="css/jgrowl.css" rel="stylesheet" media="screen">
<link href="css/main.css" rel="stylesheet" media="screen">
<script type="text/javascript" src="js/config.custo.js"></script>
<script type="text/javascript" src="js/base64.js"></script>
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/jquery.jgrowl.js"></script>
@ -23,6 +22,7 @@
<script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/async-runner.js"></script>
<script type="text/javascript" src="js/gdrive.js"></script>
<script type="text/javascript" src="js/config.custo.js"></script>
<script>
(function(i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;

View File

@ -1,9 +1,10 @@
/**
* Used to run any asynchronous tasks sequentially (ajax mainly)
* An asynchronous task must be created with:
* - a run() function (required) that may call success() or error()
* - a onSuccess() function (optional)
* - a onError() function (optional)
* - a required run() function that may call success() or error()
* - an optional onSuccess() function
* - an optional onError() function
* - an optional timeout property
*/
var asyncTaskRunner = (function() {
var asyncTaskRunner = {};
@ -18,11 +19,13 @@ var asyncTaskRunner = (function() {
// If there is a task currently running
if(currentTask !== undefined) {
// If the current task takes too long
if(currentTaskStartTime + 30000 < currentTime) {
var timeout = currentTask.timeout || 30000;
if(currentTaskStartTime + timeout < currentTime) {
currentTask.error();
}
return;
}
// If no task in the queue
if(asyncTaskQueue.length === 0) {
return;

View File

@ -1 +0,0 @@
var GOOGLE_CLIENT_ID = '241271498917-jpto9lls9fqnem1e4h6ppds9uob8rpvu.apps.googleusercontent.com';

View File

@ -1,3 +1,4 @@
var GOOGLE_CLIENT_ID = '241271498917-jpto9lls9fqnem1e4h6ppds9uob8rpvu.apps.googleusercontent.com';
var SCOPES = [ 'https://www.googleapis.com/auth/drive.install',
'https://www.googleapis.com/auth/drive.file' ];
@ -63,6 +64,10 @@ var gdrive = (function($) {
}
var asyncTask = {};
// If not immediate we add time for user to enter his credentials
if(immediate === false) {
asyncTask.timeout = 90000;
}
asyncTask.run = function() {
if(authenticated === true) {
asyncTask.success();