Skip to content
This repository has been archived by the owner on Nov 15, 2024. It is now read-only.

Commit

Permalink
Version 9.9.5
Browse files Browse the repository at this point in the history
- fixed a Adobe Creative SDK issue
- fixed a problem when you edit multiple image in the same session
- fixed a problem with security issue in some server configurations
- added maxSize to Adobe Creative SDK export image (default now is 1400)
  • Loading branch information
trippo committed Jul 28, 2015
1 parent 4df78bd commit a1c5732
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 3 additions & 1 deletion filemanager/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@
'aviary_language' => "en",
'aviary_theme' => "light",
'aviary_tools' => "all",
'aviary_maxSize' => "1400",
// Add or modify the Aviary options below as needed - they will be json encoded when added to the configuration so arrays can be utilized as needed

//The filter and sorter are managed through both javascript and php scripts because if you have a lot of
Expand Down Expand Up @@ -355,7 +356,8 @@
'apiKey' => $config['aviary_apiKey'],
'language' => $config['aviary_language'],
'theme' => $config['aviary_theme'],
'tools' => $config['aviary_tools']
'tools' => $config['aviary_tools'],
'maxSize' => $config['aviary_maxSize']
),
)
);
6 changes: 3 additions & 3 deletions filemanager/dialog.php
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,14 @@
$.ajax({
type: "POST",
url: "ajax_calls.php?action=save_img",
data: { url: newURL, path:$('#sub_folder').val()+$('#fldr_value').val(), name:$('#aviary_img').data('name') }
data: { url: newURL, path:$('#sub_folder').val()+$('#fldr_value').val(), name:$('#aviary_img').attr('data-name') }
}).done(function( msg ) {
featherEditor.close();
d = new Date();
$("figure[data-name='"+$('#aviary_img').data('name')+"']").find('img').each(function(){
$("figure[data-name='"+$('#aviary_img').attr('data-name')+"']").find('img').each(function(){
$(this).attr('src',$(this).attr('src')+"?"+d.getTime());
});
$("figure[data-name='"+$('#aviary_img').data('name')+"']").find('figcaption a.preview').each(function(){
$("figure[data-name='"+$('#aviary_img').attr('data-name')+"']").find('figcaption a.preview').each(function(){
$(this).attr('data-url',$(this).data('url')+"?"+d.getTime());
});
hide_animation();
Expand Down
3 changes: 1 addition & 2 deletions resources/assets/js/include.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var encodeURL,show_animation,hide_animation,apply,apply_none,apply_img,apply_any
{
"use strict";

var version = "9.9.4";
var version = "9.9.5";
var active_contextmenu = true;
var copy_count = 0;

Expand Down Expand Up @@ -105,7 +105,6 @@ var encodeURL,show_animation,hide_animation,apply,apply_none,apply_img,apply_any
var full_path = $('#base_url_true').val() + $('#cur_dir').val() + filename;

var aviaryElement = $('#aviary_img');

aviaryElement.attr('data-name', filename);
show_animation();
aviaryElement.attr('src', full_path).load(launchEditor(aviaryElement.attr('id'), full_path));
Expand Down
5 changes: 2 additions & 3 deletions resources/assets/less/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,14 @@ body .avpw .avpw_primary_button,
body .avpw .avpw_primary_button:link,
body .avpw .avpw_primary_button:visited,
body .avpw .avpw_primary_button:active {
background-color: #999999;
color: #ffffff;
background:none;
background:#999999;
border:none;
}

body .avpw .avpw_primary_button:hover{
border:none;
background-color: #666666;
background: #666666;
}

.uploader{
Expand Down

0 comments on commit a1c5732

Please sign in to comment.