Skip to content

Support preview for filestack urls that do not contain /api/file #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
motin wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Support preview for filestack urls that do not contain /api/file #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

### 1.1.4 (wip)
- Support preview for filestack urls that do not contain /api/file

### 1.1.3 (04.12.2015)
- In filepicker directive evaluate attributes on init.

Expand Down
9 changes: 8 additions & 1 deletion dist/angular_filepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ window.filepicker.plugin = 'angular_js_lib';'use strict';
angular.module('angular-filepicker')
.directive('filepicker', filepickerDirective);

function filepickerDirective($rootScope, filepickerService, $parse){
function filepickerDirective($rootScope, filepickerService){
return {
restrict: 'A',
scope:{
Expand Down Expand Up @@ -87,6 +87,13 @@ function filepickerPreviewDirective($rootScope, filepickerService){
if (!url) {
return;
} else {
// Support filestack urls that do not contain 'api/file'
if (url.indexOf('api/file/') == -1) {
var parser = document.createElement('a');
parser.href = url;
parser.pathname = '/api/file' + parser.pathname;
url = parser.href;
}
url = url.replace('api/file/', 'api/preview/');
}
iframe.src = url;
Expand Down
7 changes: 7 additions & 0 deletions src/filepicker_preview-directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ function filepickerPreviewDirective($rootScope, filepickerService){
if (!url) {
return;
} else {
// Support filestack urls that do not contain 'api/file'
if (url.indexOf('api/file/') == -1) {
var parser = document.createElement('a');
parser.href = url;
parser.pathname = '/api/file' + parser.pathname;
url = parser.href;
}
url = url.replace('api/file/', 'api/preview/');
}
iframe.src = url;
Expand Down