Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_branch

Conflicts:
	lib/gallery.common.js
	lib/gallery.dialog.js
	modules/organize/js/organize.js
	modules/organize/js/organize_init.js

1 files changed, 4 insertions, 9 deletions

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 50652532..7e6acad9 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -1,9 +1,5 @@
-/**
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 (function ($) {
-  $.fn.showMessage = function(message) {
+  $.fn.gallery_show_message = function(message) {
     return this.each(function(i){
       $(this).effect("highlight", {"color": "white"}, 3000);
       $(this).animate({opacity: 1.0}, 6000);
@@ -11,7 +7,7 @@
   };
 
   // Vertically align a block element's content
-  $.fn.vAlign = function(container) {
+  $.fn.gallery_valign = function(container) {
     return this.each(function(i){
       if (container == null) {
         container = 'div';
@@ -26,7 +22,7 @@
   };
 
   // Get the viewport size
-  $.getViewportSize = function() {
+  $.gallery_get_viewport_size = function() {
     return {
       width : function() {
         return $(window).width();
@@ -41,7 +37,7 @@
    * Toggle the processing indicator, both large and small
    * @param elementID Target ID, including #, to apply .gLoadingSize
    */
-  $.fn.showLoading = function() {
+  $.fn.gallery_show_loading = function() {
     return this.each(function(i){
       var size;
       switch ($(this).attr("id")) {
@@ -56,5 +52,4 @@
       $(this).toggleClass("gLoading" + size);
     });
   };
-
 })(jQuery);