From 55422d249abeb94d1713c0fc3825892fcb721f16 Mon Sep 17 00:00:00 2001 From: David VanScott Date: Sun, 17 Feb 2013 14:50:49 -0500 Subject: [PATCH 1/4] 2.2.1 pre work --- CHANGELOG.md | 6 + README.md | 2 +- nova/modules/assets/install/data.php | 2 +- nova/modules/assets/update/update_220.php | 153 ++++++++++++++++++++++ nova/modules/assets/update/versions.php | 2 +- nova/modules/assets/version.yml | 6 +- nova/modules/core/config/info.php | 6 +- 7 files changed, 168 insertions(+), 9 deletions(-) create mode 100644 nova/modules/assets/update/update_220.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 30b8a1d79..b815dc2ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.2.1 + +### Bug Fixes + +* Fixed update message always displaying because of a wrong version number in the core. + ## 2.2.0 (15 February 2013) * Added reply to header to most of the emails that are sent from Nova. ([#217](https://github.com/anodyne/nova/issues/217)) diff --git a/README.md b/README.md index cf68951ce..a634eaa41 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Anodyne Production's next-generation RPG management system combines popular feat ## Current Version -2.2.0 +2.2.1-dev ## Bug Tracker diff --git a/nova/modules/assets/install/data.php b/nova/modules/assets/install/data.php index c5de2bd4d..3bbdec3f0 100644 --- a/nova/modules/assets/install/data.php +++ b/nova/modules/assets/install/data.php @@ -2244,7 +2244,7 @@ 'sys_install_date' => now(), 'sys_version_major' => 2, 'sys_version_minor' => 2, - 'sys_version_update' => 0) + 'sys_version_update' => 1) ); $tour_fields = array( diff --git a/nova/modules/assets/update/update_220.php b/nova/modules/assets/update/update_220.php new file mode 100644 index 000000000..3d26a6029 --- /dev/null +++ b/nova/modules/assets/update/update_220.php @@ -0,0 +1,153 @@ + now(), + 'sys_version_major' => 2, + 'sys_version_minor' => 2, + 'sys_version_update' => 1 +); + +/* +|--------------------------------------------------------------- +| TABLES TO ADD +| +| $add_tables = array( +| 'table_name' => array( +| 'id' => 'table_id', +| 'fields' => 'fields_table_name') +| ); +| +| $fields_table_name = array( +| 'table_id' => array( +| 'type' => 'INT', +| 'constraint' => 6, +| 'auto_increment' => TRUE), +| 'table_field_1' => array( +| 'type' => 'VARCHAR', +| 'constraint' => 255, +| 'default' => ''), +| 'table_field_2' => array( +| 'type' => 'INT', +| 'constraint' => 4, +| 'default' => '99') +| ); +|--------------------------------------------------------------- +*/ + +if ($add_tables !== null) +{ + foreach ($add_tables as $key => $value) + { + $this->dbforge->add_field($$value['fields']); + $this->dbforge->add_key($value['id'], true); + $this->dbforge->create_table($key, true); + } +} + +/* +|--------------------------------------------------------------- +| TABLES TO DROP +| +| $drop_tables = array('table_name'); +|--------------------------------------------------------------- +*/ + +if ($drop_tables !== null) +{ + foreach ($drop_tables as $value) + { + $this->dbforge->drop_table($value); + } +} + +/* +|--------------------------------------------------------------- +| TABLES TO RENAME +| +| $rename_tables = array('old_table_name' => 'new_table_name'); +|--------------------------------------------------------------- +*/ + +if ($rename_tables !== null) +{ + foreach ($rename_tables as $key => $value) + { + $this->dbforge->rename_table($key, $value); + } +} + +/* +|--------------------------------------------------------------- +| COLUMNS TO ADD +| +| $add_column = array( +| 'table_name' => array( +| 'field_name_1' => array('type' => 'TEXT'), +| 'field_name_2' => array( +| 'type' => 'VARCHAR', +| 'constraint' => 100) +| ) +| ); +|--------------------------------------------------------------- +*/ + +if ($add_column !== null) +{ + foreach ($add_column as $key => $value) + { + $this->dbforge->add_column($key, $value); + } +} + +/* +|--------------------------------------------------------------- +| COLUMNS TO MODIFY +| +| $modify_column = array( +| 'table_name' => array( +| 'old_field_name' => array( +| 'name' => 'new_field_name', +| 'type' => 'TEXT') +| ) +| ); +|--------------------------------------------------------------- +*/ + +if ($modify_column !== null) +{ + foreach ($modify_column as $key => $value) + { + $this->dbforge->modify_column($key, $value); + } +} + +/* +|--------------------------------------------------------------- +| COLUMNS TO DROP +| +| $drop_column = array( +| 'table_name' => array('field_name') +| ); +|--------------------------------------------------------------- +*/ + +if ($drop_column !== null) +{ + foreach ($drop_column as $key => $value) + { + $this->dbforge->drop_column($key, $value[0]); + } +} diff --git a/nova/modules/assets/update/versions.php b/nova/modules/assets/update/versions.php index 7e575b11b..877ae65e1 100644 --- a/nova/modules/assets/update/versions.php +++ b/nova/modules/assets/update/versions.php @@ -14,5 +14,5 @@ '120', '121', '122', '123', '124', '125', '126', '200', '201', '202', '203', '210', '211', '212', '213', - '220', + '220', '221', ); diff --git a/nova/modules/assets/version.yml b/nova/modules/assets/version.yml index 9d08af27a..a16e93ac3 100644 --- a/nova/modules/assets/version.yml +++ b/nova/modules/assets/version.yml @@ -1,8 +1,8 @@ -version: 2.2.0 +version: 2.2.1 version_major: 2 version_minor: 2 -version_update: 0 -severity: major +version_update: 1 +severity: minor notes: | Nova 2.2 adds two features to Nova as well as addressing several bugs. Most emails sent from Nova will now include a reply to header so that any replies to the email notification will go to the original author. The author listings now include links to the character bio pages as well. Thanks to Jordan Jay for his MOD to do this; we've expanded it to include mission posts, personal logs, news items, wiki pages and comments. In addition, we've added an option for retrieving specific fields for third-party developers. date: 03 February 2013 diff --git a/nova/modules/core/config/info.php b/nova/modules/core/config/info.php index 5f49ee1a3..518c823dc 100644 --- a/nova/modules/core/config/info.php +++ b/nova/modules/core/config/info.php @@ -2,10 +2,10 @@ define('APP_NAME', 'Nova'); -define('APP_VERSION', '2.1.4'); +define('APP_VERSION', '2.2.0'); define('APP_VERSION_MAJOR', 2); -define('APP_VERSION_MINOR', 1); -define('APP_VERSION_UPDATE', 4); +define('APP_VERSION_MINOR', 2); +define('APP_VERSION_UPDATE', 0); define('WIKI_NAME', 'Thresher'); define('WIKI_VERSION', 'Release 2'); From 4c1529db66d7502163033598a83c9e16f446f12d Mon Sep 17 00:00:00 2001 From: David VanScott Date: Mon, 4 Mar 2013 08:35:03 -0500 Subject: [PATCH 2/4] Get ready for the 2.2.1 release --- CHANGELOG.md | 2 +- README.md | 2 +- nova/modules/assets/version.yml | 4 ++-- nova/modules/core/config/info.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b815dc2ae..687d441a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2.2.1 +## 2.2.1 (04 March 2013) ### Bug Fixes diff --git a/README.md b/README.md index a634eaa41..3307fe046 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Anodyne Production's next-generation RPG management system combines popular feat ## Current Version -2.2.1-dev +2.2.1 ## Bug Tracker diff --git a/nova/modules/assets/version.yml b/nova/modules/assets/version.yml index a16e93ac3..2e650d6b2 100644 --- a/nova/modules/assets/version.yml +++ b/nova/modules/assets/version.yml @@ -4,6 +4,6 @@ version_minor: 2 version_update: 1 severity: minor notes: | - Nova 2.2 adds two features to Nova as well as addressing several bugs. Most emails sent from Nova will now include a reply to header so that any replies to the email notification will go to the original author. The author listings now include links to the character bio pages as well. Thanks to Jordan Jay for his MOD to do this; we've expanded it to include mission posts, personal logs, news items, wiki pages and comments. In addition, we've added an option for retrieving specific fields for third-party developers. -date: 03 February 2013 + Nova 2.2.1 fixes an issue where the update notification box showed up all the time because of a wrong version number stored in the Nova core. +date: 04 March 2013 link: http://www.anodyne-productions.com/nova/index.php \ No newline at end of file diff --git a/nova/modules/core/config/info.php b/nova/modules/core/config/info.php index 518c823dc..b73670934 100644 --- a/nova/modules/core/config/info.php +++ b/nova/modules/core/config/info.php @@ -2,10 +2,10 @@ define('APP_NAME', 'Nova'); -define('APP_VERSION', '2.2.0'); +define('APP_VERSION', '2.2.1'); define('APP_VERSION_MAJOR', 2); define('APP_VERSION_MINOR', 2); -define('APP_VERSION_UPDATE', 0); +define('APP_VERSION_UPDATE', 1); define('WIKI_NAME', 'Thresher'); define('WIKI_VERSION', 'Release 2'); From bfa00b3f3768fb3bbc12cc685255e6faa17f2ac3 Mon Sep 17 00:00:00 2001 From: David VanScott Date: Fri, 8 Mar 2013 09:15:48 -0500 Subject: [PATCH 3/4] Update prettyPhoto plugin to version 3.1.5 --- CHANGELOG.md | 6 ++- nova/modules/assets/js/jquery.prettyPhoto.js | 46 +++----------------- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 687d441a4..dce4ccf32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog -## 2.2.1 (04 March 2013) +## 2.2.1 (09 March 2013) + +### Nova Core + +* Updated the jQuery prettyPhoto plugin to version 3.1.5. ### Bug Fixes diff --git a/nova/modules/assets/js/jquery.prettyPhoto.js b/nova/modules/assets/js/jquery.prettyPhoto.js index 8913e523a..d958202a4 100644 --- a/nova/modules/assets/js/jquery.prettyPhoto.js +++ b/nova/modules/assets/js/jquery.prettyPhoto.js @@ -1,39 +1,7 @@ -(function(a){function t(){url=location.href;return hashtag=-1!==url.indexOf("#prettyPhoto")?decodeURI(url.substring(url.indexOf("#prettyPhoto")+1,url.length)):!1}function h(a,h){var a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]"),k=RegExp("[\\?&]"+a+"=([^&#]*)").exec(h);return null==k?"":k[1]}a.prettyPhoto={version:"3.1.4"};a.fn.prettyPhoto=function(i){function n(){a(".pp_loaderIcon").hide();projectedTop=scroll_pos.scrollTop+(e/2-b.containerHeight/2);0>projectedTop&&(projectedTop=0);$ppt.fadeTo(settings.animation_speed, -1);$pp_pic_holder.find(".pp_content").animate({height:b.contentHeight,width:b.contentWidth},settings.animation_speed);$pp_pic_holder.animate({top:projectedTop,left:0>d/2-b.containerWidth/2?0:d/2-b.containerWidth/2,width:b.containerWidth},settings.animation_speed,function(){$pp_pic_holder.find(".pp_hoverContainer,#fullResImage").height(b.height).width(b.width);$pp_pic_holder.find(".pp_fade").fadeIn(settings.animation_speed);isSet&&"image"==o(pp_images[set_position])?$pp_pic_holder.find(".pp_hoverContainer").show(): -$pp_pic_holder.find(".pp_hoverContainer").hide();settings.allow_expand&&(b.resized?a("a.pp_expand,a.pp_contract").show():a("a.pp_expand").hide());settings.autoplay_slideshow&&(!l&&!p)&&a.prettyPhoto.startSlideshow();settings.changepicturecallback();p=!0});isSet&&settings.overlay_gallery&&"image"==o(pp_images[set_position])&&settings.ie6_fallback&&!(a.browser.msie&&6==parseInt(a.browser.version))?(itemWidth=57,navWidth="facebook"==settings.theme||"pp_default"==settings.theme?50:30,itemsPerPage=Math.floor((b.containerWidth- -100-navWidth)/itemWidth),itemsPerPage=itemsPerPaged||j>e)&&doresize&&settings.allow_resize&&!m){resized=!0;for(fitting=!1;!fitting;)g>d?(imageWidth=d-200,imageHeight=b/a*imageWidth):j>e?(imageHeight=e-200,imageWidth=a/b*imageHeight):fitting=!0,j=imageHeight,g=imageWidth;u(imageWidth,imageHeight);(g>d||j>e)&&f(g,j)}return{width:Math.floor(imageWidth),height:Math.floor(imageHeight),containerHeight:Math.floor(j),containerWidth:Math.floor(g)+ -2*settings.horizontal_padding,contentHeight:Math.floor(q),contentWidth:Math.floor(v),resized:resized}}function u(c,b){c=parseFloat(c);b=parseFloat(b);$pp_details=$pp_pic_holder.find(".pp_details");$pp_details.width(c);detailsHeight=parseFloat($pp_details.css("marginTop"))+parseFloat($pp_details.css("marginBottom"));$pp_details=$pp_details.clone().addClass(settings.theme).width(c).appendTo(a("body")).css({position:"absolute",top:-1E4});detailsHeight+=$pp_details.height();detailsHeight=34>=detailsHeight? -36:detailsHeight;a.browser.msie&&7==a.browser.version&&(detailsHeight+=8);$pp_details.remove();$pp_title=$pp_pic_holder.find(".ppt");$pp_title.width(c);titleHeight=parseFloat($pp_title.css("marginTop"))+parseFloat($pp_title.css("marginBottom"));$pp_title=$pp_title.clone().appendTo(a("body")).css({position:"absolute",top:-1E4});titleHeight+=$pp_title.height();$pp_title.remove();q=b+detailsHeight;v=c;j=q+titleHeight+$pp_pic_holder.find(".pp_top").height()+$pp_pic_holder.find(".pp_bottom").height(); -g=c}function o(a){return a.match(/youtube\.com\/watch/i)||a.match(/youtu\.be/i)?"youtube":a.match(/vimeo\.com/i)?"vimeo":a.match(/\b.mov\b/i)?"quicktime":a.match(/\b.swf\b/i)?"flash":a.match(/\biframe=true\b/i)?"iframe":a.match(/\bajax=true\b/i)?"ajax":a.match(/\bcustom=true\b/i)?"custom":"#"==a.substr(0,1)?"inline":"image"}function r(){doresize&&"undefined"!=typeof $pp_pic_holder&&(scroll_pos=w(),contentHeight=$pp_pic_holder.height(),contentwidth=$pp_pic_holder.width(),projectedTop=e/2+scroll_pos.scrollTop- -contentHeight/2,0>projectedTop&&(projectedTop=0),contentHeight>e||$pp_pic_holder.css({top:projectedTop,left:d/2+scroll_pos.scrollLeft-contentwidth/2}))}function w(){if(self.pageYOffset)return{scrollTop:self.pageYOffset,scrollLeft:self.pageXOffset};if(document.documentElement&&document.documentElement.scrollTop)return{scrollTop:document.documentElement.scrollTop,scrollLeft:document.documentElement.scrollLeft};if(document.body)return{scrollTop:document.body.scrollTop,scrollLeft:document.body.scrollLeft}} -function x(){settings.social_tools&&(facebook_like_link=settings.social_tools.replace("{location_href}",encodeURIComponent(location.href)));settings.markup=settings.markup.replace("{pp_social}","");a("body").append(settings.markup);$pp_pic_holder=a(".pp_pic_holder");$ppt=a(".ppt");$pp_overlay=a("div.pp_overlay");if(isSet&&settings.overlay_gallery){currentGalleryPage=0;toInject="";for(var b=0;b";toInject=settings.gallery_markup.replace(/{gallery}/g,toInject);$pp_pic_holder.find("#pp_full_res").after(toInject);$pp_gallery=a(".pp_pic_holder .pp_gallery");$pp_gallery_li=$pp_gallery.find("li");$pp_gallery.find(".pp_arrow_next").click(function(){a.prettyPhoto.changeGalleryPage("next");a.prettyPhoto.stopSlideshow();return!1});$pp_gallery.find(".pp_arrow_previous").click(function(){a.prettyPhoto.changeGalleryPage("previous"); -a.prettyPhoto.stopSlideshow();return!1});$pp_pic_holder.find(".pp_content").hover(function(){$pp_pic_holder.find(".pp_gallery:not(.disabled)").fadeIn()},function(){$pp_pic_holder.find(".pp_gallery:not(.disabled)").fadeOut()});itemWidth=57;$pp_gallery_li.each(function(b){a(this).find("a").click(function(){a.prettyPhoto.changePage(b);a.prettyPhoto.stopSlideshow();return!1})})}settings.slideshow&&($pp_pic_holder.find(".pp_nav").prepend('Play'),$pp_pic_holder.find(".pp_nav .pp_play").click(function(){a.prettyPhoto.startSlideshow(); -return!1}));$pp_pic_holder.attr("class","pp_pic_holder "+settings.theme);$pp_overlay.css({opacity:0,height:a(document).height(),width:a(window).width()}).bind("click",function(){settings.modal||a.prettyPhoto.close()});a("a.pp_close").bind("click",function(){a.prettyPhoto.close();return false});settings.allow_expand&&a("a.pp_expand").bind("click",function(){if(a(this).hasClass("pp_expand")){a(this).removeClass("pp_expand").addClass("pp_contract");doresize=false}else{a(this).removeClass("pp_contract").addClass("pp_expand"); -doresize=true}k(function(){a.prettyPhoto.open()});return false});$pp_pic_holder.find(".pp_previous, .pp_nav .pp_arrow_previous").bind("click",function(){a.prettyPhoto.changePage("previous");a.prettyPhoto.stopSlideshow();return false});$pp_pic_holder.find(".pp_next, .pp_nav .pp_arrow_next").bind("click",function(){a.prettyPhoto.changePage("next");a.prettyPhoto.stopSlideshow();return false});r()}var i=jQuery.extend({hook:"rel",animation_speed:"fast",ajaxcallback:function(){},slideshow:5E3,autoplay_slideshow:!1, -opacity:0.8,show_title:!0,allow_resize:!0,allow_expand:!0,default_width:500,default_height:344,counter_separator_label:"/",theme:"pp_default",horizontal_padding:20,hideflash:!1,wmode:"opaque",autoplay:!0,modal:!1,deeplinking:!0,overlay_gallery:!0,overlay_gallery_max:30,keyboard_shortcuts:!0,changepicturecallback:function(){},callback:function(){},ie6_fallback:!0,markup:'
 
Expand
next previous
Previous

0/0

Next

{pp_social}
Close
', -gallery_markup:'
Previous
    {gallery}
Next
',image_markup:'',flash_markup:'', -quicktime_markup:'',iframe_markup:'', -inline_markup:'
{content}
',custom_markup:"",social_tools:''},s);var o=this,u=false,a,f,l,c,h,p,d=e(window).height(),v=e(window).width(),m;doresize=true,scroll_pos=T();e(window).unbind("resize.prettyphoto").bind("resize.prettyphoto",function(){x();N()});if(s.keyboard_shortcuts){e(document).unbind("keydown.prettyphoto").bind("keydown.prettyphoto",function(t){if(typeof $pp_pic_holder!="undefined"){if($pp_pic_holder.is(":visible")){switch(t.keyCode){case 37:e.prettyPhoto.changePage("previous");t.preventDefault();break;case 39:e.prettyPhoto.changePage("next");t.preventDefault();break;case 27:if(!settings.modal)e.prettyPhoto.close();t.preventDefault();break}}}})}e.prettyPhoto.initialize=function(){settings=s;if(settings.theme=="pp_default")settings.horizontal_padding=16;theRel=e(this).attr(settings.hook);galleryRegExp=/\[(?:.*)\]/;isSet=galleryRegExp.exec(theRel)?true:false;pp_images=isSet?jQuery.map(o,function(t,n){if(e(t).attr(settings.hook).indexOf(theRel)!=-1)return e(t).attr("href")}):e.makeArray(e(this).attr("href"));pp_titles=isSet?jQuery.map(o,function(t,n){if(e(t).attr(settings.hook).indexOf(theRel)!=-1)return e(t).find("img").attr("alt")?e(t).find("img").attr("alt"):""}):e.makeArray(e(this).find("img").attr("alt"));pp_descriptions=isSet?jQuery.map(o,function(t,n){if(e(t).attr(settings.hook).indexOf(theRel)!=-1)return e(t).attr("title")?e(t).attr("title"):""}):e.makeArray(e(this).attr("title"));if(pp_images.length>settings.overlay_gallery_max)settings.overlay_gallery=false;set_position=jQuery.inArray(e(this).attr("href"),pp_images);rel_index=isSet?set_position:e("a["+settings.hook+"^='"+theRel+"']").index(e(this));k(this);if(settings.allow_resize)e(window).bind("scroll.prettyphoto",function(){x()});e.prettyPhoto.open();return false};e.prettyPhoto.open=function(t){if(typeof settings=="undefined"){settings=s;pp_images=e.makeArray(arguments[0]);pp_titles=arguments[1]?e.makeArray(arguments[1]):e.makeArray("");pp_descriptions=arguments[2]?e.makeArray(arguments[2]):e.makeArray("");isSet=pp_images.length>1?true:false;set_position=arguments[3]?arguments[3]:0;k(t.target)}if(settings.hideflash)e("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","hidden");b(e(pp_images).size());e(".pp_loaderIcon").show();if(settings.deeplinking)n();if(settings.social_tools){facebook_like_link=settings.social_tools.replace("{location_href}",encodeURIComponent(location.href));$pp_pic_holder.find(".pp_social").html(facebook_like_link)}if($ppt.is(":hidden"))$ppt.css("opacity",0).show();$pp_overlay.show().fadeTo(settings.animation_speed,settings.opacity);$pp_pic_holder.find(".currentTextHolder").text(set_position+1+settings.counter_separator_label+e(pp_images).size());if(typeof pp_descriptions[set_position]!="undefined"&&pp_descriptions[set_position]!=""){$pp_pic_holder.find(".pp_description").show().html(unescape(pp_descriptions[set_position]))}else{$pp_pic_holder.find(".pp_description").hide()}movie_width=parseFloat(i("width",pp_images[set_position]))?i("width",pp_images[set_position]):settings.default_width.toString();movie_height=parseFloat(i("height",pp_images[set_position]))?i("height",pp_images[set_position]):settings.default_height.toString();u=false;if(movie_height.indexOf("%")!=-1){movie_height=parseFloat(e(window).height()*parseFloat(movie_height)/100-150);u=true}if(movie_width.indexOf("%")!=-1){movie_width=parseFloat(e(window).width()*parseFloat(movie_width)/100-150);u=true}$pp_pic_holder.fadeIn(function(){settings.show_title&&pp_titles[set_position]!=""&&typeof pp_titles[set_position]!="undefined"?$ppt.html(unescape(pp_titles[set_position])):$ppt.html(" ");imgPreloader="";skipInjection=false;switch(S(pp_images[set_position])){case"image":imgPreloader=new Image;nextImage=new Image;if(isSet&&set_position0)movie_id=movie_id.substr(0,movie_id.indexOf("?"));if(movie_id.indexOf("&")>0)movie_id=movie_id.substr(0,movie_id.indexOf("&"))}movie="http://www.youtube.com/embed/"+movie_id;i("rel",pp_images[set_position])?movie+="?rel="+i("rel",pp_images[set_position]):movie+="?rel=1";if(settings.autoplay)movie+="&autoplay=1";toInject=settings.iframe_markup.replace(/{width}/g,a["width"]).replace(/{height}/g,a["height"]).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,movie);break;case"vimeo":a=w(movie_width,movie_height);movie_id=pp_images[set_position];var t=/http(s?):\/\/(www\.)?vimeo.com\/(\d+)/;var n=movie_id.match(t);movie="http://player.vimeo.com/video/"+n[3]+"?title=0&byline=0&portrait=0";if(settings.autoplay)movie+="&autoplay=1;";vimeo_width=a["width"]+"/embed/?moog_width="+a["width"];toInject=settings.iframe_markup.replace(/{width}/g,vimeo_width).replace(/{height}/g,a["height"]).replace(/{path}/g,movie);break;case"quicktime":a=w(movie_width,movie_height);a["height"]+=15;a["contentHeight"]+=15;a["containerHeight"]+=15;toInject=settings.quicktime_markup.replace(/{width}/g,a["width"]).replace(/{height}/g,a["height"]).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,pp_images[set_position]).replace(/{autoplay}/g,settings.autoplay);break;case"flash":a=w(movie_width,movie_height);flash_vars=pp_images[set_position];flash_vars=flash_vars.substring(pp_images[set_position].indexOf("flashvars")+10,pp_images[set_position].length);filename=pp_images[set_position];filename=filename.substring(0,filename.indexOf("?"));toInject=settings.flash_markup.replace(/{width}/g,a["width"]).replace(/{height}/g,a["height"]).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,filename+"?"+flash_vars);break;case"iframe":a=w(movie_width,movie_height);frame_url=pp_images[set_position];frame_url=frame_url.substr(0,frame_url.indexOf("iframe")-1);toInject=settings.iframe_markup.replace(/{width}/g,a["width"]).replace(/{height}/g,a["height"]).replace(/{path}/g,frame_url);break;case"ajax":doresize=false;a=w(movie_width,movie_height);doresize=true;skipInjection=true;e.get(pp_images[set_position],function(e){toInject=settings.inline_markup.replace(/{content}/g,e);$pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject;g()});break;case"custom":a=w(movie_width,movie_height);toInject=settings.custom_markup;break;case"inline":myClone=e(pp_images[set_position]).clone().append('
').css({width:settings.default_width}).wrapInner('
').appendTo(e("body")).show();doresize=false;a=w(e(myClone).width(),e(myClone).height());doresize=true;e(myClone).remove();toInject=settings.inline_markup.replace(/{content}/g,e(pp_images[set_position]).html());break}if(!imgPreloader&&!skipInjection){$pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject;g()}});return false};e.prettyPhoto.changePage=function(t){currentGalleryPage=0;if(t=="previous"){set_position--;if(set_position<0)set_position=e(pp_images).size()-1}else if(t=="next"){set_position++;if(set_position>e(pp_images).size()-1)set_position=0}else{set_position=t}rel_index=set_position;if(!doresize)doresize=true;if(settings.allow_expand){e(".pp_contract").removeClass("pp_contract").addClass("pp_expand")}y(function(){e.prettyPhoto.open()})};e.prettyPhoto.changeGalleryPage=function(e){if(e=="next"){currentGalleryPage++;if(currentGalleryPage>totalPage)currentGalleryPage=0}else if(e=="previous"){currentGalleryPage--;if(currentGalleryPage<0)currentGalleryPage=totalPage}else{currentGalleryPage=e}slide_speed=e=="next"||e=="previous"?settings.animation_speed:0;slide_to=currentGalleryPage*itemsPerPage*itemWidth;$pp_gallery.find("ul").animate({left:-slide_to},slide_speed)};e.prettyPhoto.startSlideshow=function(){if(typeof m=="undefined"){$pp_pic_holder.find(".pp_play").unbind("click").removeClass("pp_play").addClass("pp_pause").click(function(){e.prettyPhoto.stopSlideshow();return false});m=setInterval(e.prettyPhoto.startSlideshow,settings.slideshow)}else{e.prettyPhoto.changePage("next")}};e.prettyPhoto.stopSlideshow=function(){$pp_pic_holder.find(".pp_pause").unbind("click").removeClass("pp_pause").addClass("pp_play").click(function(){e.prettyPhoto.startSlideshow();return false});clearInterval(m);m=undefined};e.prettyPhoto.close=function(){if($pp_overlay.is(":animated"))return;e.prettyPhoto.stopSlideshow();$pp_pic_holder.stop().find("object,embed").css("visibility","hidden");e("div.pp_pic_holder,div.ppt,.pp_fade").fadeOut(settings.animation_speed,function(){e(this).remove()});$pp_overlay.fadeOut(settings.animation_speed,function(){if(settings.hideflash)e("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","visible");e(this).remove();e(window).unbind("scroll.prettyphoto");r();settings.callback();doresize=true;f=false;delete settings})};if(!pp_alreadyInitialized&&t()){pp_alreadyInitialized=true;hashIndex=t();hashRel=hashIndex;hashIndex=hashIndex.substring(hashIndex.indexOf("/")+1,hashIndex.length-1);hashRel=hashRel.substring(0,hashRel.indexOf("/"));setTimeout(function(){e("a["+s.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger("click")},50)}return this.unbind("click.prettyphoto").bind("click.prettyphoto",e.prettyPhoto.initialize)};})(jQuery);var pp_alreadyInitialized=false \ No newline at end of file From b30fcc760446633d98f8f205e7f9354f3b905ae3 Mon Sep 17 00:00:00 2001 From: David VanScott Date: Sat, 9 Mar 2013 16:40:23 -0500 Subject: [PATCH 4/4] Update the version.yml file --- nova/modules/assets/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/modules/assets/version.yml b/nova/modules/assets/version.yml index 2e650d6b2..d096359d9 100644 --- a/nova/modules/assets/version.yml +++ b/nova/modules/assets/version.yml @@ -5,5 +5,5 @@ version_update: 1 severity: minor notes: | Nova 2.2.1 fixes an issue where the update notification box showed up all the time because of a wrong version number stored in the Nova core. -date: 04 March 2013 +date: 09 March 2013 link: http://www.anodyne-productions.com/nova/index.php \ No newline at end of file