diff options
| -rw-r--r-- | modules/organize/js/organize.js | 12 | ||||
| -rw-r--r-- | modules/slideshow/helpers/slideshow_event.php | 20 | ||||
| -rw-r--r-- | modules/slideshow/helpers/slideshow_theme.php | 2 |
3 files changed, 12 insertions, 22 deletions
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index 556aa7e7..76eadf85 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -162,16 +162,8 @@ }, set_handlers: function() { - $("#g-organize-microthumb-panel") - .selectable({ - filter: ".g-organize-microthumb-grid-cell", - selected: function(event, ui) { - $(ui.selected).children(".g-organize-microthumb").addClass("ui-state-highlight"); - }, - unselected: function(event, ui) { - $(ui.unselected).children(".g-organize-microthumb").removeClass("ui-state-highlight"); - } - }) + $("#g-organize-microthumb-grid") + .selectable({filter: ".g-organize-microthumb-grid-cell"}) .droppable($.organize.content_droppable); $(".g-organize-microthumb-grid-cell") .draggable($.organize.micro_thumb_draggable) diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php index 9b77dd42..baf896fe 100644 --- a/modules/slideshow/helpers/slideshow_event.php +++ b/modules/slideshow/helpers/slideshow_event.php @@ -31,14 +31,12 @@ class slideshow_event_Core { } static function album_menu($menu, $theme) { - $descendants_count = ORM::factory("item", $theme->item()->id) - ->descendants_count(array(array("type", "=", "photo"))); - if ($descendants_count > 1) { + if ($theme->item()->descendants_count(array(array("type", "=", "photo")))) { $menu->append(Menu::factory("link") ->id("slideshow") ->label(t("View slideshow")) - ->url("javascript:PicLensLite.start(" . - "{maxScale:0,feedUrl:'" . self::_feed_url($theme) . "'})") + ->url("javascript:cooliris.embed.show(" . + "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})") ->css_id("g-slideshow-link")); } } @@ -47,8 +45,8 @@ class slideshow_event_Core { $menu->append(Menu::factory("link") ->id("slideshow") ->label(t("View slideshow")) - ->url("javascript:PicLensLite.start(" . - "{maxScale:0,feedUrl:'" . self::_feed_url($theme) . "'})") + ->url("javascript:cooliris.embed.show(" . + "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})") ->css_id("g-slideshow-link")); } @@ -56,8 +54,8 @@ class slideshow_event_Core { $menu->append(Menu::factory("link") ->id("slideshow") ->label(t("View slideshow")) - ->url("javascript:PicLensLite.start(" . - "{maxScale:0,feedUrl:'" . self::_feed_url($theme) . "'})") + ->url("javascript:cooliris.embed.show(" . + "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})") ->css_id("g-slideshow-link")); } @@ -66,9 +64,9 @@ class slideshow_event_Core { if (!$item->is_album()) { $item = $item->parent(); } - return rss::url("gallery/album/{$item->id}?page_size=100"); + return rss::url("gallery/album/{$item->id}"); } else { - return rss::url("tag/tag/{$theme->tag()->id}?page_size=100"); + return rss::url("tag/tag/{$theme->tag()->id}"); } } } diff --git a/modules/slideshow/helpers/slideshow_theme.php b/modules/slideshow/helpers/slideshow_theme.php index 269a93ce..163d2bd8 100644 --- a/modules/slideshow/helpers/slideshow_theme.php +++ b/modules/slideshow/helpers/slideshow_theme.php @@ -20,7 +20,7 @@ class slideshow_theme_Core { static function head($theme) { $proto = (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] === "off") ? "http" : "https"; - return "<script src=\"$proto://lite.piclens.com/current/piclens_optimized.js\" " . + return "<script src=\"$proto://apps.cooliris.com/slideshow/go.js\" " . "type=\"text/javascript\"></script>"; } } |