Skip to content
This repository has been archived by the owner on Jun 9, 2018. It is now read-only.

Commit

Permalink
fixed: automatic uploads fail sometimes (modernizr referenceError)
Browse files Browse the repository at this point in the history
  • Loading branch information
MartijnR committed Jun 15, 2015
1 parent 50c7dcf commit bfe53dc
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 33 deletions.
11 changes: 0 additions & 11 deletions Code_Igniter/application/controllers/front.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,6 @@ function __construct()

public function index()
{
$default_library_scripts = array(
'/libraries/enketo-core/lib/jquery.min.js',
'/libraries/enketo-core/lib/bootstrap.min.js',
'/libraries/enketo-core/lib/modernizr.min.js'
);
$default_main_scripts = array(
'/libraries/enketo-core/src/js/utils.js',
'/js-source/gui.js',
'/js-source/connection.js',
'/js-source/front.js'
);
$data = array(
'offline' => FALSE,
'title_component' => '',
Expand Down
17 changes: 0 additions & 17 deletions Code_Igniter/application/views/modern_browsers_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,6 @@
<meta name="description" content="">
<meta name="keywords" content="">
<meta name="robots" content="">

<script type="text/javascript" src="/libraries/enketo-core/lib/jquery.min.js"></script>
<script type="text/javascript" src="/libraries/enketo-core/lib/modernizr.min.js"></script>
<script type="text/javascript">
var notSupported = [], and='';
if (!Modernizr.localstorage) notSupported.push('local data storage');
if (!Modernizr.applicationcache) notSupported.push('offline launch');
if (notSupported.length === 2) and = ' and ';
$(function(){
if (notSupported.length > 0){
notSupported.push('');
$('#not-supported').text(
' (we detected that your browser does not support '+notSupported[0]+and+notSupported[1]+')'
);
}
});
</script>
<? if (ENVIRONMENT === 'production'){include 'elements/tracking.php';}?>
</head>

Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ module.exports = function( grunt ) {
"xpath": "../../../../test/mock/empty.mock",
"file-manager": "../../../../test/mock/empty.mock",
"jquery.xpath": "../../../../test/mock/empty.mock",
"Modernizr": "../../../../test/mock/empty.mock",
"support": "../../../../test/mock/empty.mock",
"bootstrap": "../../../lib/enketo-core/lib/bootstrap",
"jquery": "../../../lib/bower-components/jquery/dist/jquery",
"file-saver": "../../../../test/mock/file-saver.mock",
Expand Down
2 changes: 1 addition & 1 deletion public/src/js/module/gui.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ define( [ 'enketo-js/support', 'settings', 'print', 'jquery', 'plugin', 'bootstr
function feedback( message, duration, heading, choices ) {
heading = heading || 'Information';
//if ($('header').css('position') === 'fixed'){
if ( !Modernizr.touch ) {
if ( !support.touch ) {
feedbackBar.show( message, duration );
}
//a more obtrusive message is shown
Expand Down
3 changes: 0 additions & 3 deletions public/src/js/require-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ require.config( {
deps: [ "jquery" ],
exports: "jQuery.fn.timepicker"
},
"Modernizr": {
exports: "Modernizr"
},
"file-saver": {
exports: "saveAs"
},
Expand Down

0 comments on commit bfe53dc

Please sign in to comment.