Skip to content

Commit

Permalink
fix getClientSize to getSize
Browse files Browse the repository at this point in the history
  • Loading branch information
alexusmai committed Apr 20, 2020
1 parent 52897d9 commit 8d4b7cd
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion docs/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### BeforeInitialization

> Alexusmai\LaravelFileManager\Events\DBeforeInitialization
> Alexusmai\LaravelFileManager\Events\BeforeInitialization
Example:

Expand Down
2 changes: 1 addition & 1 deletion examples/wysiwyg/ckeditor.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">

<title>File manager and CKeditor</title>
</head>
Expand Down
2 changes: 1 addition & 1 deletion examples/wysiwyg/fm-button.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">

<title>File Manager and standalone button</title>
</head>
Expand Down
2 changes: 1 addition & 1 deletion examples/wysiwyg/summernote.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
<!-- SummerNote -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.11/summernote-bs4.css" rel="stylesheet">

Expand Down
2 changes: 1 addition & 1 deletion examples/wysiwyg/tinymce.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">

<title>File manager and TinyMCE</title>
</head>
Expand Down
2 changes: 1 addition & 1 deletion resources/assets/css/file-manager.css

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions resources/assets/js/file-manager.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/assets/js/file-manager.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/views/ckeditor.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Styles -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.13.0/css/all.css">
<link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/fmButton.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Styles -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.13.0/css/all.css">
<link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/summernote.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Styles -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.13.0/css/all.css">
<link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/tinymce.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Styles -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.13.0/css/all.css">
<link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/tinymce5.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Styles -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.13.0/css/all.css">
<link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion src/FileManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function upload($disk, $path, $files, $overwrite)

// check file size if need
if ($this->configRepository->getMaxUploadFileSize()
&& $file->getClientSize() / 1024 > $this->configRepository->getMaxUploadFileSize()
&& $file->getSize() / 1024 > $this->configRepository->getMaxUploadFileSize()
) {
$fileNotUploaded = true;
continue;
Expand Down

0 comments on commit 8d4b7cd

Please sign in to comment.