Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-01-28 00:40:40 +02:00
parent 0424853f4a
commit 9729f4712e
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,6 +1,7 @@
/app/config/staging /app/config/staging
/app/config/development /app/config/development
/app/config/fortrabbit /app/config/fortrabbit
/app/config/ubuntu
/app/config/packages/anahkiasen/rocketeer/ /app/config/packages/anahkiasen/rocketeer/
/app/storage /app/storage
/public/logo /public/logo
@ -13,4 +14,6 @@ composer.phar
.DS_Store .DS_Store
Thumbs.db Thumbs.db
app.yaml app.yaml
database.sql database.sql
ninja.sublime-project
ninja.sublime-workspace

1
app/routes.php
View File

@ -61,7 +61,6 @@ Route::get('/', function() {
Route::get('/rocksteady', 'HomeController@showWelcome'); Route::get('/rocksteady', 'HomeController@showWelcome');
Route::get('log_error', 'HomeController@logError'); Route::get('log_error', 'HomeController@logError');
Route::post('get_started', 'AccountController@getStarted'); Route::post('get_started', 'AccountController@getStarted');

2
app/views/invoices/edit.blade.php
View File

@ -608,7 +608,7 @@
if (!doc) return; if (!doc) return;
var string = doc.output('datauristring'); var string = doc.output('datauristring');
if (isFirefox || isChrome) { if (isFirefox || (isChrome && !isChromium)) {
$('#theFrame').attr('src', string).show(); $('#theFrame').attr('src', string).show();
} else { } else {
if (isRefreshing) { if (isRefreshing) {

2
app/views/invoices/view.blade.php
View File

@ -38,7 +38,7 @@
if (!doc) return; if (!doc) return;
var string = doc.output('datauristring'); var string = doc.output('datauristring');
if (isFirefox || isChrome) { if (isFirefox || (isChrome && !isChromium)) {
$('#theFrame').attr('src', string).show(); $('#theFrame').attr('src', string).show();
} else { } else {
var pdfAsArray = convertDataURIToBinary(string); var pdfAsArray = convertDataURIToBinary(string);

3
bower.json
View File

@ -17,5 +17,8 @@
"typeahead.js": "~0.9.3", "typeahead.js": "~0.9.3",
"accounting": "~0.*", "accounting": "~0.*",
"pdfjs": "*" "pdfjs": "*"
},
"resolutions": {
"jquery": "~1.*"
} }
} }

2
public/js/script.js
View File

@ -3,8 +3,8 @@ var isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
var isFirefox = typeof InstallTrigger !== 'undefined'; // Firefox 1.0+ var isFirefox = typeof InstallTrigger !== 'undefined'; // Firefox 1.0+
var isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0; var isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
var isChrome = !!window.chrome && !isOpera; // Chrome 1+ var isChrome = !!window.chrome && !isOpera; // Chrome 1+
var isChromium = isChrome && navigator.userAgent.indexOf('Chromium') >= 0;
var isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6 var isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6
var NINJA = {}; var NINJA = {};
function generatePDF(invoice, checkMath) { function generatePDF(invoice, checkMath) {