hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php
This commit is contained in:
Romain Neutron
2014-02-28 19:37:54 +01:00
parent 1497b6413a 871b19c407
commit c641ab7841
10 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
www/skins/prod/jquery.main-prod.js
View File

@@ -1665,27 +1665,28 @@ function activeIcons() {
}
});
$('.TOOL_bridge_btn').live('click', function () {
$('.TOOL_bridge_btn').live('click', function (e) {
e.preventDefault();
var $button = $(this);
var datas = {};
if ($(this).hasClass('results_window')) {
if ($button.hasClass('results_window')) {
if (p4.Results.Selection.length() > 0)
datas.lst = p4.Results.Selection.serialize();
}
else {
if ($(this).hasClass('basket_window')) {
if ($button.hasClass('basket_window')) {
if (p4.WorkZone.Selection.length() > 0)
datas.lst = p4.WorkZone.Selection.serialize();
else
datas.ssel = $('.SSTT.active').attr('id').split('_').slice(1, 2).pop();
}
else {
if ($(this).hasClass('basket_element')) {
if ($button.hasClass('basket_element')) {
datas.ssel = $('.SSTT.active').attr('id').split('_').slice(1, 2).pop();
}
else {
if ($(this).hasClass('story_window')) {
if ($button.hasClass('story_window')) {
if (p4.WorkZone.Selection.length() > 0) {
datas.lst = p4.WorkZone.Selection.serialize();
}
@@ -1698,7 +1699,7 @@ function activeIcons() {
}
if (datas.ssel || datas.lst || datas.story) {
init_publicator(datas);
init_publicator($button.attr("href"), datas);
}
else {
alert(language.nodocselected);

8
www/skins/prod/publicator.js
View File

@@ -1,15 +1,15 @@
function publicator_reload_publicator() {
function publicator_reload_publicator(url) {
var options = $('#dialog_publicator form[name="current_datas"]').serializeArray();
var dialog = p4.Dialog.get(1);
dialog.load('/prod/bridge/manager/', 'POST', options);
dialog.load(url, 'POST', options);
}
function init_publicator(datas) {
function init_publicator(url, datas) {
var dialog = p4.Dialog.Create({
size: 'Full',
title: 'Bridge',
loading: false
});
dialog.load('/prod/bridge/manager/', 'POST', datas);
dialog.load(url, 'POST', datas);
}