Gallery – Flagallery Photo Portfolio - Version 4.15

Version Description

Download this release

Release Info

Developer pasyuk
Plugin Icon 128x128 Gallery – Flagallery Photo Portfolio
Version 4.15
Comparing to
See all releases

Code changes from version 4.14 to 4.15

Files changed (8) hide show
  1. admin/jgallery.php +10 -5
  2. admin/js/script.js +13 -16
  3. facebook.php +8 -6
  4. flag.php +26 -7
  5. full_window_template.php +8 -10
  6. lib/shortcodes.php +6 -7
  7. lib/swfobject.php +6 -3
  8. readme.txt +4 -1
admin/jgallery.php CHANGED
@@ -37,13 +37,18 @@ if($altColors['FullWindow'] && !$isCrawler){
37
  $xml['alt'] .= '</style>';
38
  if(!$isCrawler){
39
  if(!intval($flag_options['jAlterGalScript'])) {
40
- $xml['alt'] .= '<style type="text/css" scoped="scoped">@import url("'.plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.css').'");</style>';
41
- $xml['alt'] .= "<script type='text/javascript' src='".plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.pack.js')."'></script>";
 
 
42
  $xml['alt'] .= "<script type='text/javascript'>var ExtendVar='fancybox', hitajax = '".plugins_url('/lib/hitcounter.php', dirname(__FILE__))."';</script>";
43
  } else if(intval($flag_options['jAlterGalScript']) == 1) {
44
- $xml['alt'] .= "<style type='text/css'>@import url('".plugins_url('/admin/js/photoswipe/photoswipe.css', dirname(__FILE__))."');</style>";
45
- $xml['alt'] .= "<script type='text/javascript' src='".plugins_url('/admin/js/photoswipe/klass.min.js', dirname(__FILE__))."'></script>";
46
- $xml['alt'] .= "<script type='text/javascript' src='".plugins_url('/admin/js/photoswipe/code.photoswipe.jquery-3.0.5.min.js', dirname(__FILE__))."'></script>";
 
 
 
47
  $xml['alt'] .= "<script type='text/javascript'>var ExtendVar='photoswipe', hitajax = '".plugins_url('/lib/hitcounter.php', dirname(__FILE__))."';</script>";
48
  }
49
  }
37
  $xml['alt'] .= '</style>';
38
  if(!$isCrawler){
39
  if(!intval($flag_options['jAlterGalScript'])) {
40
+ wp_print_styles('fancybox');
41
+ wp_print_scripts('fancybox');
42
+ //$xml['alt'] .= '<style type="text/css" scoped="scoped">@import url("'.plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.css').'");</style>';
43
+ //$xml['alt'] .= "<script type='text/javascript' src='".plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.pack.js')."'></script>";
44
  $xml['alt'] .= "<script type='text/javascript'>var ExtendVar='fancybox', hitajax = '".plugins_url('/lib/hitcounter.php', dirname(__FILE__))."';</script>";
45
  } else if(intval($flag_options['jAlterGalScript']) == 1) {
46
+ wp_print_styles('photoswipe');
47
+ wp_print_scripts('klass.photoswipe');
48
+ wp_print_scripts('photoswipe');
49
+ //$xml['alt'] .= "<style type='text/css'>@import url('".plugins_url('/admin/js/photoswipe/photoswipe.css', dirname(__FILE__))."');</style>";
50
+ //$xml['alt'] .= "<script type='text/javascript' src='".plugins_url('/admin/js/photoswipe/klass.min.js', dirname(__FILE__))."'></script>";
51
+ //$xml['alt'] .= "<script type='text/javascript' src='".plugins_url('/admin/js/photoswipe/code.photoswipe.jquery-3.0.5.min.js', dirname(__FILE__))."'></script>";
52
  $xml['alt'] .= "<script type='text/javascript'>var ExtendVar='photoswipe', hitajax = '".plugins_url('/lib/hitcounter.php', dirname(__FILE__))."';</script>";
53
  }
54
  }
admin/js/script.js CHANGED
@@ -1,11 +1,10 @@
1
- var fv = swfobject.getFlashPlayerVersion();
2
  var metaViewport;
3
- jQuery(document).ready(function() {
4
  metaViewport = jQuery('meta[name=viewport]','head').attr('content');
5
  });
6
 
7
  function FlAGClass(ExtendVar, skin_id, pic_id, slideshow) {
8
- jQuery(document).ready(function() {
9
  if(pic_id !== false){
10
  var skin_function = flagFind(skin_id);
11
  if(pic_id !== 0 ) {
@@ -19,14 +18,14 @@ function FlAGClass(ExtendVar, skin_id, pic_id, slideshow) {
19
  'transitionOut' : 'elastic',
20
  'titlePosition' : 'over',
21
  'titleFormat' : function(title, currentArray, currentIndex, currentOpts) {
22
- var descr = jQuery('<div />').html(jQuery("#flag_pic_"+pic_id, flag_alt[skin_id]).find('.flag_pic_desc > span').html()).text();
23
- title = jQuery('<div />').html(jQuery("#flag_pic_"+pic_id, flag_alt[skin_id]).find('.flag_pic_desc > strong').html()).text();
24
  if(title.length || descr.length)
25
  return '<div class="grand_controls" rel="'+skin_id+'"><span rel="prev" class="g_prev">prev</span><span rel="show" class="g_slideshow '+slideshow+'">play/pause</span><span rel="next" class="g_next">next</span></div><div id="fancybox-title-over">'+(title.length? '<strong class="title">'+title+'</strong>' : '')+(descr.length? '<div class="descr">'+descr+'</div>' : '')+'</div>';
26
  else
27
  return '<div class="grand_controls" rel="'+skin_id+'"><span rel="prev" class="g_prev">prev</span><span rel="show" class="g_slideshow '+slideshow+'">play/pause</span><span rel="next" class="g_next">next</span></div>';
28
  },
29
- 'href' : jQuery("#flag_pic_"+pic_id, flag_alt[skin_id]).attr('href'),
30
  'onStart' : function(){
31
  //if(skin_function && jQuery.isFunction(skin_function[skin_id+'_fb'])) {
32
  skin_function[skin_id+'_fb']('active');
@@ -56,7 +55,7 @@ function FlAGClass(ExtendVar, skin_id, pic_id, slideshow) {
56
  }
57
  jQuery('.flashalbum').css('height','auto');
58
  jQuery('body#fullwindow').css('overflow','auto');
59
- jQuery('.flag_alternate').each(function(i){
60
  jQuery(this).css({display: 'block'});
61
  var catMeta = jQuery('.flagCatMeta',this).hide().get();
62
  for(j=0; j<catMeta.length; j++) {
@@ -73,22 +72,22 @@ function FlAGClass(ExtendVar, skin_id, pic_id, slideshow) {
73
  jQuery('a.flag_pic_alt', this).attr('rel',flagcatid);
74
  });
75
  });
76
- jQuery('.flag_alternate .flagcat').click(function(){
77
  if(!jQuery(this).hasClass('active')) {
78
  var catId = jQuery(this).attr('href');
79
  jQuery(this).addClass('active').siblings().removeClass('active');
80
- jQuery('.flag_alternate '+catId).css({display: 'block'}).siblings('.flagcategory').hide();
81
- alternate_flag_e(catId, ExtendVar);
82
  }
83
  return false;
84
  });
85
- alternate_flag_e('.flagcategory:first', ExtendVar);
86
  }
87
  });
88
  }
89
 
90
- function alternate_flag_e(t, ExtendVar){
91
- jQuery('.flag_alternate').find(t).not('.loaded').each(function(){
92
  var d = jQuery(this).html();
93
  if(d) {
94
  d = d.replace(/>\[/g, '><');
@@ -214,9 +213,7 @@ function alternate_flag_e(t, ExtendVar){
214
 
215
  });
216
  }
217
- if(fv.major<10 || (navigator.userAgent.toLowerCase().indexOf("android") > -1)) {
218
- new FlAGClass(ExtendVar, false, false, false);
219
- }
220
  function thumb_cl(skin_id, pic_id, slideshow){
221
  pic_id = parseInt(pic_id);
222
  new FlAGClass(ExtendVar, skin_id, pic_id, slideshow);
 
1
  var metaViewport;
2
+ jQuery(function() {
3
  metaViewport = jQuery('meta[name=viewport]','head').attr('content');
4
  });
5
 
6
  function FlAGClass(ExtendVar, skin_id, pic_id, slideshow) {
7
+ jQuery(function() {
8
  if(pic_id !== false){
9
  var skin_function = flagFind(skin_id);
10
  if(pic_id !== 0 ) {
18
  'transitionOut' : 'elastic',
19
  'titlePosition' : 'over',
20
  'titleFormat' : function(title, currentArray, currentIndex, currentOpts) {
21
+ var descr = jQuery('<div />').html(jQuery("#flag_pic_"+pic_id, window[skin_id]).find('.flag_pic_desc > span').html()).text();
22
+ title = jQuery('<div />').html(jQuery("#flag_pic_"+pic_id, window[skin_id]).find('.flag_pic_desc > strong').html()).text();
23
  if(title.length || descr.length)
24
  return '<div class="grand_controls" rel="'+skin_id+'"><span rel="prev" class="g_prev">prev</span><span rel="show" class="g_slideshow '+slideshow+'">play/pause</span><span rel="next" class="g_next">next</span></div><div id="fancybox-title-over">'+(title.length? '<strong class="title">'+title+'</strong>' : '')+(descr.length? '<div class="descr">'+descr+'</div>' : '')+'</div>';
25
  else
26
  return '<div class="grand_controls" rel="'+skin_id+'"><span rel="prev" class="g_prev">prev</span><span rel="show" class="g_slideshow '+slideshow+'">play/pause</span><span rel="next" class="g_next">next</span></div>';
27
  },
28
+ 'href' : jQuery("#flag_pic_"+pic_id, window[skin_id]).attr('href'),
29
  'onStart' : function(){
30
  //if(skin_function && jQuery.isFunction(skin_function[skin_id+'_fb'])) {
31
  skin_function[skin_id+'_fb']('active');
55
  }
56
  jQuery('.flashalbum').css('height','auto');
57
  jQuery('body#fullwindow').css('overflow','auto');
58
+ jQuery('#'+skin_id+'_jq').each(function(i){
59
  jQuery(this).css({display: 'block'});
60
  var catMeta = jQuery('.flagCatMeta',this).hide().get();
61
  for(j=0; j<catMeta.length; j++) {
72
  jQuery('a.flag_pic_alt', this).attr('rel',flagcatid);
73
  });
74
  });
75
+ jQuery('#'+skin_id+'_jq .flagcat').click(function(){
76
  if(!jQuery(this).hasClass('active')) {
77
  var catId = jQuery(this).attr('href');
78
  jQuery(this).addClass('active').siblings().removeClass('active');
79
+ jQuery('#'+skin_id+'_jq '+catId).css({display: 'block'}).siblings('.flagcategory').hide();
80
+ alternate_flag_e(skin_id, catId, ExtendVar);
81
  }
82
  return false;
83
  });
84
+ alternate_flag_e(skin_id, '.flagcategory:first', ExtendVar);
85
  }
86
  });
87
  }
88
 
89
+ function alternate_flag_e(skin_id, t, ExtendVar){
90
+ jQuery('#'+skin_id+'_jq').find(t).not('.loaded').each(function(){
91
  var d = jQuery(this).html();
92
  if(d) {
93
  d = d.replace(/>\[/g, '><');
213
 
214
  });
215
  }
216
+
 
 
217
  function thumb_cl(skin_id, pic_id, slideshow){
218
  pic_id = parseInt(pic_id);
219
  new FlAGClass(ExtendVar, skin_id, pic_id, slideshow);
facebook.php CHANGED
@@ -11,8 +11,10 @@
11
  </head>
12
  <body style="margin: 0; padding: 0;">
13
  <div id="page">
14
- <script language="JavaScript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/jquery.js'); ?>" type="text/javascript"></script>
15
- <script language="JavaScript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/swfobject.js'); ?>" type="text/javascript"></script>
 
 
16
  <?php $flag_options = get_option('flag_options');
17
  if(isset($_GET['l'])) {
18
  $linkto = intval($_GET['l']);
@@ -52,10 +54,10 @@ if(isset($_GET['i'])) {
52
 
53
  echo flagShowFlashAlbum($gids, $name='Gallery', $width='100%', $height=$h, $skin, $playlist='', $wmode='opaque', $linkto); ?>
54
 
55
- <link href="<?php echo plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.css'); ?>" rel="stylesheet" type="text/css" />
56
- <script language="JavaScript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.pack.js'); ?>" type="text/javascript"></script>
57
- <script language="JavaScript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/flagscroll.js'); ?>" type="text/javascript"></script>
58
- <script language="JavaScript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/script.js'); ?>" type="text/javascript"></script>
59
 
60
  <?php }
61
  } ?>
11
  </head>
12
  <body style="margin: 0; padding: 0;">
13
  <div id="page">
14
+ <?php
15
+ wp_enqueue_scripts();
16
+ wp_print_scripts(array('jquery', 'swfobject'));
17
+ ?>
18
  <?php $flag_options = get_option('flag_options');
19
  if(isset($_GET['l'])) {
20
  $linkto = intval($_GET['l']);
54
 
55
  echo flagShowFlashAlbum($gids, $name='Gallery', $width='100%', $height=$h, $skin, $playlist='', $wmode='opaque', $linkto); ?>
56
 
57
+ <?php
58
+ do_action('flag_footer_scripts');
59
+ wp_print_scripts(array('flagscroll', 'flagscript'));
60
+ ?>
61
 
62
  <?php }
63
  } ?>
flag.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: GRAND Flash Album Gallery
4
  Plugin URI: http://codeasily.com/wordpress-plugins/flash-album-gallery/flag/
5
  Description: The Grand Flagallery plugin - provides a comprehensive interface for managing photos and images through a set of admin pages, and it displays photos in a way that makes your web site look very professional.
6
- Version: 4.14
7
  Author: Rattus
8
  Author URI: http://codeasily.com/
9
 
@@ -23,7 +23,7 @@ if(preg_match('#' . basename(__FILE__) . '#', $_SERVER['PHP_SELF'])) { die('You
23
  if (!class_exists('flagLoad')) {
24
  class flagLoad {
25
 
26
- var $version = '4.14';
27
  var $dbversion = '2.75';
28
  var $minium_WP = '3.0';
29
  var $minium_WPMU = '3.0';
@@ -75,6 +75,8 @@ class flagLoad {
75
  add_action('admin_print_scripts-widgets.php', array(&$this, 'flag_widgets_scripts') );
76
  add_filter( 'posts_orderby', 'sort_query_by_post_in', 10, 2 );
77
 
 
 
78
  add_action('activated_plugin', array(&$this, 'save_error') );
79
  }
80
 
@@ -102,6 +104,7 @@ class flagLoad {
102
 
103
  // Add the script and style files
104
  add_action('wp_print_scripts', array(&$this, 'load_scripts') );
 
105
 
106
  // Add a version number to the header
107
  add_action('wp_head', create_function('', 'echo "\n<!-- <meta name=\'Grand Flagallery\' content=\'' . $this->version . '\' /> -->\n";') );
@@ -243,16 +246,32 @@ class flagLoad {
243
 
244
  }
245
 
246
- function load_scripts() {
 
 
 
 
 
 
247
 
248
- wp_enqueue_script('jquery');
249
- // Let's override WP's bundled swfobject, cause as of WP 2.9, it's still using 2.1
250
  wp_deregister_script('swfobject');
251
- // and register our own.
252
  wp_register_script('swfobject', plugins_url('/flash-album-gallery/admin/js/swfobject.js'), array('jquery'), '2.2');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
253
  wp_enqueue_script('swfobject');
254
  if($this->options['deepLinks']){
255
- wp_register_script('swfaddress', plugins_url('/flash-album-gallery/admin/js/swfaddress.js'), array(), '2.4');
256
  wp_enqueue_script('swfaddress');
257
  }
258
 
3
  Plugin Name: GRAND Flash Album Gallery
4
  Plugin URI: http://codeasily.com/wordpress-plugins/flash-album-gallery/flag/
5
  Description: The Grand Flagallery plugin - provides a comprehensive interface for managing photos and images through a set of admin pages, and it displays photos in a way that makes your web site look very professional.
6
+ Version: 4.15
7
  Author: Rattus
8
  Author URI: http://codeasily.com/
9
 
23
  if (!class_exists('flagLoad')) {
24
  class flagLoad {
25
 
26
+ var $version = '4.15';
27
  var $dbversion = '2.75';
28
  var $minium_WP = '3.0';
29
  var $minium_WPMU = '3.0';
75
  add_action('admin_print_scripts-widgets.php', array(&$this, 'flag_widgets_scripts') );
76
  add_filter( 'posts_orderby', 'sort_query_by_post_in', 10, 2 );
77
 
78
+ add_action( 'wp_enqueue_scripts', array( &$this, 'register_scripts_frontend' ), 3 );
79
+
80
  add_action('activated_plugin', array(&$this, 'save_error') );
81
  }
82
 
104
 
105
  // Add the script and style files
106
  add_action('wp_print_scripts', array(&$this, 'load_scripts') );
107
+ add_action( 'flag_footer_scripts', array( &$this, 'load_scripts' ) );
108
 
109
  // Add a version number to the header
110
  add_action('wp_head', create_function('', 'echo "\n<!-- <meta name=\'Grand Flagallery\' content=\'' . $this->version . '\' /> -->\n";') );
246
 
247
  }
248
 
249
+ function register_scripts_frontend() {
250
+ wp_register_style('fancybox', plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.css') );
251
+ wp_register_script('fancybox', plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.pack.js'), array('jquery'), '1.3.4', true );
252
+
253
+ wp_register_style('photoswipe', plugins_url('/flash-album-gallery/admin/js/photoswipe/photoswipe.css') );
254
+ wp_register_script('klass.photoswipe', plugins_url('/flash-album-gallery/admin/js/photoswipe/klass.min.js'), array('jquery'), '1.0', true );
255
+ wp_register_script('photoswipe', plugins_url('/flash-album-gallery/admin/js/photoswipe/code.photoswipe.jquery-3.0.5.min.js'), array('jquery', 'klass.photoswipe'), '3.0.5', true );
256
 
 
 
257
  wp_deregister_script('swfobject');
 
258
  wp_register_script('swfobject', plugins_url('/flash-album-gallery/admin/js/swfobject.js'), array('jquery'), '2.2');
259
+
260
+ wp_register_script('swfaddress', plugins_url('/flash-album-gallery/admin/js/swfaddress.js'), array(), '2.4');
261
+
262
+ wp_register_script('flagscroll', plugins_url('/flash-album-gallery/admin/js/flagscroll.js'), array('jquery'), '1.0', true );
263
+ wp_register_script('swfmousewheel', plugins_url('/flash-album-gallery/admin/js/swfmousewheel.js'), false, '2.0', true );
264
+
265
+ wp_register_script('flagscript', plugins_url('/flash-album-gallery/admin/js/script.js'), array('jquery'), '2.0', true );
266
+ wp_register_style('flagallery', plugins_url('/flash-album-gallery/admin/css/flagallery.css') );
267
+
268
+ }
269
+
270
+ function load_scripts() {
271
+
272
+ wp_enqueue_script('jquery');
273
  wp_enqueue_script('swfobject');
274
  if($this->options['deepLinks']){
 
275
  wp_enqueue_script('swfaddress');
276
  }
277
 
full_window_template.php CHANGED
@@ -16,14 +16,10 @@ div#page, .flashalbum { width: 100%; height: 100%; position: relative; z-index:
16
  div.flashalbum { background-image: url(<?php echo $flag_custom['mb_bg_link'][0]; ?>); background-position: <?php echo $flag_custom['mb_bg_pos'][0]; ?>; background-repeat: <?php echo $flag_custom['mb_bg_repeat'][0]; ?>; }
17
  <?php } ?>
18
  </style>
19
- <script language="JavaScript" type="text/javascript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/jquery.js'); ?>"></script>
20
- <script language="JavaScript" type="text/javascript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/swfobject.js'); ?>"></script>
21
- <script language="JavaScript" type="text/javascript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/swfaddress.js'); ?>"></script>
22
- <?php $atts = shortcode_parse_atts($scode);
23
- if( isset($atts['skin']) && in_array($atts['skin'], array('slider_gallery', 'slider_gallery_demo', 'slider', 'slider_demo')) ) { ?>
24
- <style type="text/css">@import url("<?php echo plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.css'); ?>");</style>
25
- <script language="JavaScript" type="text/javascript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.pack.js'); ?>"></script>
26
- <?php } ?>
27
  </head>
28
  <body id="fullwindow">
29
  <div id="page">
@@ -34,7 +30,9 @@ if ( post_password_required( $post ) ) {
34
  echo do_shortcode($scode);
35
  } ?>
36
  </div>
37
- <script language="JavaScript" type="text/javascript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/flagscroll.js'); ?>"></script>
38
- <script language="JavaScript" type="text/javascript" src="<?php echo plugins_url('/flash-album-gallery/admin/js/script.js'); ?>"></script>
 
 
39
  </body>
40
  </html>
16
  div.flashalbum { background-image: url(<?php echo $flag_custom['mb_bg_link'][0]; ?>); background-position: <?php echo $flag_custom['mb_bg_pos'][0]; ?>; background-repeat: <?php echo $flag_custom['mb_bg_repeat'][0]; ?>; }
17
  <?php } ?>
18
  </style>
19
+ <?php
20
+ wp_enqueue_scripts();
21
+ wp_print_scripts(array('jquery', 'swfobject', 'swfaddress'));
22
+ ?>
 
 
 
 
23
  </head>
24
  <body id="fullwindow">
25
  <div id="page">
30
  echo do_shortcode($scode);
31
  } ?>
32
  </div>
33
+ <?php
34
+ do_action('flag_footer_scripts');
35
+ wp_print_scripts(array('flagscroll', 'flagscript'));
36
+ ?>
37
  </body>
38
  </html>
lib/shortcodes.php CHANGED
@@ -26,6 +26,7 @@ class FlAG_shortcodes {
26
  add_shortcode( 'grandbanner', array(&$this, 'grandbanner' ) );
27
  add_shortcode( 'grandbannerwidget', array(&$this, 'grandbannerwidget' ) );
28
  add_action('wp_footer', array(&$this, 'add_script'));
 
29
 
30
  }
31
 
@@ -125,28 +126,26 @@ class FlAG_shortcodes {
125
  }
126
  if($swfmousewheel == 'true') $this->flag_add_mousewheel = true;
127
 
128
- return $out;
 
 
 
 
129
  }
130
 
131
  function add_script() {
132
  if ( $this->flag_shortcode ) {
133
- wp_register_script('flagscroll', plugins_url('/admin/js/flagscroll.js', dirname(__FILE__)), array('jquery'), '1.0', true );
134
  wp_print_scripts('flagscroll');
135
  }
136
  if ( $this->flag_fancybox ) {
137
- wp_register_style('fancybox', plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.css') );
138
- wp_register_script('fancybox', plugins_url('/flash-album-gallery/admin/js/jquery.fancybox-1.3.4.pack.js'), array(), '1.3.4', true );
139
  wp_print_styles('fancybox');
140
  wp_print_scripts('fancybox');
141
  }
142
  if ( $this->flag_add_script ) {
143
- wp_register_script('flagscript', plugins_url('/admin/js/script.js', dirname(__FILE__)), array('jquery'), '1.1', true );
144
  wp_print_scripts('flagscript');
145
- wp_register_style('flagallery', plugins_url('/admin/css/flagallery.css', dirname(__FILE__)) );
146
  wp_print_styles('flagallery');
147
  }
148
  if ( $this->flag_add_mousewheel ) {
149
- wp_register_script('swfmousewheel', plugins_url('/admin/js/swfmousewheel.js', dirname(__FILE__)), false, '2.0', true );
150
  wp_print_scripts('swfmousewheel');
151
  }
152
  }
26
  add_shortcode( 'grandbanner', array(&$this, 'grandbanner' ) );
27
  add_shortcode( 'grandbannerwidget', array(&$this, 'grandbannerwidget' ) );
28
  add_action('wp_footer', array(&$this, 'add_script'));
29
+ add_action( 'flag_footer_scripts', array( &$this, 'add_script' ) );
30
 
31
  }
32
 
126
  }
127
  if($swfmousewheel == 'true') $this->flag_add_mousewheel = true;
128
 
129
+ if(isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
130
+ do_action('flag_footer_scripts');
131
+ }
132
+
133
+ return $out;
134
  }
135
 
136
  function add_script() {
137
  if ( $this->flag_shortcode ) {
 
138
  wp_print_scripts('flagscroll');
139
  }
140
  if ( $this->flag_fancybox ) {
 
 
141
  wp_print_styles('fancybox');
142
  wp_print_scripts('fancybox');
143
  }
144
  if ( $this->flag_add_script ) {
 
145
  wp_print_scripts('flagscript');
 
146
  wp_print_styles('flagallery');
147
  }
148
  if ( $this->flag_add_mousewheel ) {
 
149
  wp_print_scripts('swfmousewheel');
150
  }
151
  }
lib/swfobject.php CHANGED
@@ -154,13 +154,16 @@ function flagShowFlashAlbum($galleryID, $name='Gallery', $width='', $height='',
154
  $out = '<div class="flashalbum '.$skin.'" style="width:'.$width.';height:'.$height.';">' . $swfobject->output($alternate) . '</div>';
155
  }
156
  // add now the script code
157
- if(!flagGetUserNow($_SERVER['HTTP_USER_AGENT']) && !preg_match("/Android/i", $_SERVER['HTTP_USER_AGENT'])){
158
  $out .= '<script type="text/javascript" defer="defer">/* <![CDATA[ */';
 
159
  $out .= 'function json_xml_'.$skinID.'(e){ return '.$xml['json'].'; }';
160
- $out .= 'flag_alt[\''.$skinID.'\'] = jQuery("div#'.$skinID.'_jq").clone().wrap(document.createElement(\'div\')).parent().html();';
161
  $out .= $swfobject->javascript();
162
- $out .= '/* ]]> */</script>';
163
  }
 
 
 
 
164
 
165
  $out = apply_filters('flag_show_flash_content', $out);
166
 
154
  $out = '<div class="flashalbum '.$skin.'" style="width:'.$width.';height:'.$height.';">' . $swfobject->output($alternate) . '</div>';
155
  }
156
  // add now the script code
 
157
  $out .= '<script type="text/javascript" defer="defer">/* <![CDATA[ */';
158
+ if(!flagGetUserNow($_SERVER['HTTP_USER_AGENT']) && !preg_match("/Android/i", $_SERVER['HTTP_USER_AGENT'])){
159
  $out .= 'function json_xml_'.$skinID.'(e){ return '.$xml['json'].'; }';
160
+ $out .= 'var '.$skinID.' = jQuery("div#'.$skinID.'_jq").clone().wrap(document.createElement(\'div\')).parent().html();';
161
  $out .= $swfobject->javascript();
 
162
  }
163
+ $out .= 'jQuery(function() { var fv = swfobject.getFlashPlayerVersion();';
164
+ $out .= 'if(fv.major<10 || (navigator.userAgent.toLowerCase().indexOf("android") > -1)) { new FlAGClass(ExtendVar, "'.$skinID.'", false, false); }';
165
+ $out .= '});';
166
+ $out .= '/* ]]> */</script>';
167
 
168
  $out = apply_filters('flag_show_flash_content', $out);
169
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: Rattus
3
  Donate link: http://photogallerycreator.com/grand-flagallery/
4
  Tags: admin, flash, fullscreen gallery, gallery, image, images, image gallery, mp3, music, page, photo, photo gallery, slider, plugin, slideshow, video, widget, iphone gallery, best gallery, portfolio, banner rotator
5
  Requires at least: 3.0
6
- Tested up to: 3.9.*
7
  Stable tag: trunk
8
 
9
  Photo Gallery, Video Gallery, Music Album & Banner Rotator plugin with powerfull admin to manage your image galleries and media content
@@ -50,6 +50,9 @@ Now you can see "Views" of each photo in the gallery and visitors can "Like" ima
50
 
51
  == Changelog ==
52
 
 
 
 
53
  = v4.14 - 22.04.2014 =
54
  * fix albums drag&drop
55
 
3
  Donate link: http://photogallerycreator.com/grand-flagallery/
4
  Tags: admin, flash, fullscreen gallery, gallery, image, images, image gallery, mp3, music, page, photo, photo gallery, slider, plugin, slideshow, video, widget, iphone gallery, best gallery, portfolio, banner rotator
5
  Requires at least: 3.0
6
+ Tested up to: 3.9.1
7
  Stable tag: trunk
8
 
9
  Photo Gallery, Video Gallery, Music Album & Banner Rotator plugin with powerfull admin to manage your image galleries and media content
50
 
51
  == Changelog ==
52
 
53
+ = v4.15 - 13.05.2014 =
54
+ * Added support for themes with Ajax page loading
55
+
56
  = v4.14 - 22.04.2014 =
57
  * fix albums drag&drop
58