carnival 0.0.55 → 0.0.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca72402346ebc37d9209864e88505f84fe55c618
-  data.tar.gz: e0b3fb6209d640382dcb38ef304111ab414a0bfb
+  metadata.gz: 0fd3caaba16c6f747514d71e60c922b805eaf22a
+  data.tar.gz: 7d9374d90219af65529e84ae75d82094f06dab03
 SHA512:
-  metadata.gz: 1c356417e89eba8e0c5f4652a682ba32776efa59b40fcda75e867a107cf3d3ef5256ea63d19faeff07e89fb6ee5586f4fb64cd6ec56addb280e48494b63141c5
-  data.tar.gz: a5e1e1513fb46d06e5acc63a0a71ee8ec38b2bbf56bd1a0fc4cb2aa7284f61cc33f2900080825a0857fe8f20b02ebbb3e59ce379b762971fc935713b3a624c48
+  metadata.gz: 7e7a6001eac71c904280aed0ac87ce89fd9356392c989ccd1ba036dc0691c9423aca601a378a6240e530d20944f223debc13ec8309733273546eb8c5a14bfa6c
+  data.tar.gz: df5cbd912ec75ceb3db194c4975b32ecf0579196a64ed2459aca10327ebbb9f54390a4c880f5e61a01a4b9aa2cba880c56f009f1f2718caa7e83e4fd2b288475

data/app/assets/javascripts/carnival/admin.js

@@ -1,9 +1,9 @@
 //= require jquery
 //= require jquery_ujs
 //= require carnival/external/jquery.dataTables.min
-//= require carnival/external/jquery.noty
-//= require carnival/external/jquery.noty.layout.bottom.js
-//= require carnival/external/jquery.noty.theme.default.js
+//= require carnival/external/noty/jquery.noty
+//= require carnival/external/noty/layouts/bottom
+//= require carnival/external/noty/themes/default
 //= require carnival/external/jquery.colorbox-min
 //= require carnival/external/jquery-ui-1.9.1.custom.min
 //= require carnival/external/chosen.jquery

data/app/assets/javascripts/carnival/data_tables_functions.js

@@ -26,7 +26,7 @@ function datatable_list(table, ordered_columns, sorting, filter){
       notSortableColumns.push(index);
   });
 
-  var oTable = $(table).dataTable({
+  var tableConfiguration = {
    "aoColumnDefs": [
         {
          bSortable: false,
@@ -46,7 +46,11 @@ function datatable_list(table, ordered_columns, sorting, filter){
       $(".dataTables_processing").html("<div class='datatables-loading'>Processando</div>")
     },
     'oLanguage': dataTablesTranslation
-  });
+  }
+  
+  tableConfiguration.aaSorting = getSorting(table);
+
+  var oTable = $(table).dataTable(tableConfiguration);
 
   if(!search)
     $(".dataTables_filter").hide();
@@ -62,6 +66,18 @@ function generateDataSource(table){
   return url;
 }
 
+function getSorting(table){
+  var sortConfig = []
+  $(table).find('th').each(function(index, elem){
+    var sortableObj = $(elem).data('sortable');
+    if(sortableObj && sortableObj.default){
+      var direction = sortableObj.direction;
+      sortConfig.push([ index, direction ]);
+    }
+  });
+  return sortConfig;
+}
+
 function addUrlParam(url, param, table){
   if($(table).data(param) != undefined && $(table).data(param) != ""){
     if(url.indexOf("?") > 0)

data/app/assets/javascripts/carnival/external/{jquery.noty.js → noty/jquery.noty.js}

@@ -1,5 +1,5 @@
 /**
- * noty - jQuery Notification Plugin v2.1.2
+ * noty - jQuery Notification Plugin v2.2.2
  * Contributors: https://github.com/needim/noty/graphs/contributors
  *
  * Examples and Documentation - http://needim.github.com/noty/
@@ -29,7 +29,11 @@ if (typeof Object.create !== 'function') {
             this.options = $.extend({}, $.noty.defaults, options);
 
             this.options.layout = (this.options.custom) ? $.noty.layouts['inline'] : $.noty.layouts[this.options.layout];
-            this.options.theme = $.noty.themes[this.options.theme];
+
+			if ($.noty.themes[this.options.theme])
+            	this.options.theme = $.noty.themes[this.options.theme];
+			else
+				options.themeClassName = this.options.theme;
 
             delete options.layout;
             delete options.theme;
@@ -54,6 +58,9 @@ if (typeof Object.create !== 'function') {
 
             this.$bar = (this.options.layout.parent.object !== null) ? $(this.options.layout.parent.object).css(this.options.layout.parent.css).append($bar) : $bar;
 
+			if (this.options.themeClassName)
+				this.$bar.addClass(this.options.themeClassName).addClass('noty_container_type_' + this.options.type);
+
             // Set buttons if available
             if (this.options.buttons) {
 
@@ -70,7 +77,7 @@ if (typeof Object.create !== 'function') {
                 $.each(this.options.buttons, function (i, button) {
                     var $button = $('<button/>').addClass((button.addClass) ? button.addClass : 'gray').html(button.text).attr('id', button.id ? button.id : 'button-' + i)
                         .appendTo(self.$bar.find('.noty_buttons'))
-                        .bind('click', function () {
+                        .on('click', function () {
                             if ($.isFunction(button.onClick)) {
                                 button.onClick.call($button, self);
                             }
@@ -91,9 +98,10 @@ if (typeof Object.create !== 'function') {
 
             var self = this;
 
-            $(self.options.layout.container.selector).append(self.$bar);
+			(self.options.custom) ? self.options.custom.find(self.options.layout.container.selector).append(self.$bar) : $(self.options.layout.container.selector).append(self.$bar);
 
-            self.options.theme.style.apply(self);
+			if (self.options.theme && self.options.theme.style)
+            	self.options.theme.style.apply(self);
 
             ($.type(self.options.layout.css) === 'function') ? this.options.layout.css.apply(self.$bar) : self.$bar.css(this.options.layout.css || {});
 
@@ -103,7 +111,8 @@ if (typeof Object.create !== 'function') {
 
             self.showing = true;
 
-            self.options.theme.callback.onShow.apply(this);
+			if (self.options.theme && self.options.theme.style)
+            	self.options.theme.callback.onShow.apply(this);
 
             if ($.inArray('click', self.options.closeWith) > -1)
                 self.$bar.css('cursor', 'pointer').one('click', function (evt) {
@@ -214,7 +223,9 @@ if (typeof Object.create !== 'function') {
 
                     delete $.noty.store[self.options.id]; // deleting noty from store
 
-                    self.options.theme.callback.onClose.apply(self);
+                    if(self.options.theme.callback && self.options.theme.callback.onClose) {
+                        self.options.theme.callback.onClose.apply(self);
+                    }
 
                     if (!self.options.dismissQueue) {
                         // Queue render
@@ -280,6 +291,9 @@ if (typeof Object.create !== 'function') {
         // Renderer creates a new noty
         var notification = Object.create(NotyObject).init(options);
 
+		if (notification.options.killer)
+			$.noty.closeAll();
+
         (notification.options.force) ? $.noty.queue.unshift(notification) : $.noty.queue.push(notification);
 
         $.notyRenderer.render();
@@ -322,15 +336,19 @@ if (typeof Object.create !== 'function') {
         }
 
         // Where is the container?
-        if ($(notification.options.layout.container.selector).length == 0) {
-            if (notification.options.custom) {
-                notification.options.custom.append($(notification.options.layout.container.object).addClass('i-am-new'));
-            } else {
-                $('body').append($(notification.options.layout.container.object).addClass('i-am-new'));
-            }
-        } else {
-            $(notification.options.layout.container.selector).removeClass('i-am-new');
-        }
+		if (notification.options.custom) {
+			if (notification.options.custom.find(notification.options.layout.container.selector).length == 0) {
+				notification.options.custom.append($(notification.options.layout.container.object).addClass('i-am-new'));
+			} else {
+				notification.options.custom.find(notification.options.layout.container.selector).removeClass('i-am-new');
+			}
+		} else {
+			if ($(notification.options.layout.container.selector).length == 0) {
+				$('body').append($(notification.options.layout.container.object).addClass('i-am-new'));
+			} else {
+				$(notification.options.layout.container.selector).removeClass('i-am-new');
+			}
+		}
 
         $.notyRenderer.setLayoutCountFor(notification, +1);
 
@@ -338,8 +356,14 @@ if (typeof Object.create !== 'function') {
     };
 
     $.notyRenderer.createModalFor = function (notification) {
-        if ($('.noty_modal').length == 0)
-            $('<div/>').addClass('noty_modal').data('noty_modal_count', 0).css(notification.options.theme.modal.css).prependTo($('body')).fadeIn('fast');
+        if ($('.noty_modal').length == 0) {
+			var modal = $('<div/>').addClass('noty_modal').addClass(notification.options.theme).data('noty_modal_count', 0);
+
+			if (notification.options.theme.modal && notification.options.theme.modal.css)
+				modal.css(notification.options.theme.modal.css);
+
+			modal.prependTo($('body')).fadeIn('fast');
+		}
     };
 
     $.notyRenderer.getLayoutCountFor = function (notification) {
@@ -433,6 +457,7 @@ if (typeof Object.create !== 'function') {
         force:false,
         modal:false,
         maxVisible:5,
+		killer: false,
         closeWith:['click'],
         callback:{
             onShow:function () {
@@ -449,7 +474,7 @@ if (typeof Object.create !== 'function') {
         buttons:false
     };
 
-    $(window).resize(function () {
+    $(window).on('resize', function () {
         $.each($.noty.layouts, function (index, layout) {
             layout.container.style.apply($(layout.container.selector));
         });
@@ -459,102 +484,5 @@ if (typeof Object.create !== 'function') {
 
 // Helpers
 window.noty = function noty(options) {
-
-    // This is for BC  -  Will be deleted on v2.2.0
-    var using_old = 0
-        , old_to_new = {
-            'animateOpen':'animation.open',
-            'animateClose':'animation.close',
-            'easing':'animation.easing',
-            'speed':'animation.speed',
-            'onShow':'callback.onShow',
-            'onShown':'callback.afterShow',
-            'onClose':'callback.onClose',
-            'onCloseClick':'callback.onCloseClick',
-            'onClosed':'callback.afterClose'
-        };
-
-    jQuery.each(options, function (key, value) {
-        if (old_to_new[key]) {
-            using_old++;
-            var _new = old_to_new[key].split('.');
-
-            if (!options[_new[0]]) options[_new[0]] = {};
-
-            options[_new[0]][_new[1]] = (value) ? value : function () {
-            };
-            delete options[key];
-        }
-    });
-
-    if (!options.closeWith) {
-        options.closeWith = jQuery.noty.defaults.closeWith;
-    }
-
-    if (options.hasOwnProperty('closeButton')) {
-        using_old++;
-        if (options.closeButton) options.closeWith.push('button');
-        delete options.closeButton;
-    }
-
-    if (options.hasOwnProperty('closeOnSelfClick')) {
-        using_old++;
-        if (options.closeOnSelfClick) options.closeWith.push('click');
-        delete options.closeOnSelfClick;
-    }
-
-    if (options.hasOwnProperty('closeOnSelfOver')) {
-        using_old++;
-        if (options.closeOnSelfOver) options.closeWith.push('hover');
-        delete options.closeOnSelfOver;
-    }
-
-    if (options.hasOwnProperty('custom')) {
-        using_old++;
-        if (options.custom.container != 'null') options.custom = options.custom.container;
-    }
-
-    if (options.hasOwnProperty('cssPrefix')) {
-        using_old++;
-        delete options.cssPrefix;
-    }
-
-    if (options.theme == 'noty_theme_default') {
-        using_old++;
-        options.theme = 'defaultTheme';
-    }
-
-    if (!options.hasOwnProperty('dismissQueue')) {
-        options.dismissQueue = jQuery.noty.defaults.dismissQueue;
-    }
-
-    if (!options.hasOwnProperty('maxVisible')) {
-        options.maxVisible = jQuery.noty.defaults.maxVisible;
-    }
-
-    if (options.buttons) {
-        jQuery.each(options.buttons, function (i, button) {
-            if (button.click) {
-                using_old++;
-                button.onClick = button.click;
-                delete button.click;
-            }
-            if (button.type) {
-                using_old++;
-                button.addClass = button.type;
-                delete button.type;
-            }
-        });
-    }
-
-    if (using_old) {
-        if (typeof console !== "undefined" && console.warn) {
-            console.warn('You are using noty v2 with v1.x.x options. @deprecated until v2.2.0 - Please update your options.');
-        }
-    }
-
-    // console.log(options);
-    // End of the BC
-
     return jQuery.notyRenderer.init(options);
-}
+};

data/app/assets/javascripts/carnival/external/{jquery.noty.layout.bottom.js → noty/layouts/bottom.js}

@@ -1,4 +1,4 @@
-;(function($) {
+(function($) {
 
 	$.noty.layouts.bottom = {
 		name: 'bottom',

data/app/assets/javascripts/carnival/external/noty/layouts/bottomCenter.js

@@ -0,0 +1,41 @@
+(function($) {
+
+	$.noty.layouts.bottomCenter = {
+		name: 'bottomCenter',
+		options: { // overrides options
+
+		},
+		container: {
+			object: '<ul id="noty_bottomCenter_layout_container" />',
+			selector: 'ul#noty_bottomCenter_layout_container',
+			style: function() {
+				$(this).css({
+					bottom: 20,
+					left: 0,
+					position: 'fixed',
+					width: '310px',
+					height: 'auto',
+					margin: 0,
+					padding: 0,
+					listStyleType: 'none',
+					zIndex: 10000000
+				});
+
+				$(this).css({
+					left: ($(window).width() - $(this).outerWidth(false)) / 2 + 'px'
+				});
+			}
+		},
+		parent: {
+			object: '<li />',
+			selector: 'li',
+			css: {}
+		},
+		css: {
+			display: 'none',
+			width: '310px'
+		},
+		addClass: ''
+	};
+
+})(jQuery);

data/app/assets/javascripts/carnival/external/noty/layouts/bottomLeft.js

@@ -0,0 +1,43 @@
+(function($) {
+
+	$.noty.layouts.bottomLeft = {
+		name: 'bottomLeft',
+		options: { // overrides options
+			
+		},
+		container: {
+			object: '<ul id="noty_bottomLeft_layout_container" />',
+			selector: 'ul#noty_bottomLeft_layout_container',
+			style: function() {
+				$(this).css({
+					bottom: 20,
+					left: 20,
+					position: 'fixed',
+					width: '310px',
+					height: 'auto',
+					margin: 0,
+					padding: 0,
+					listStyleType: 'none',
+					zIndex: 10000000
+				});
+
+				if (window.innerWidth < 600) {
+					$(this).css({
+						left: 5
+					});
+				}
+			}
+		},
+		parent: {
+			object: '<li />',
+			selector: 'li',
+			css: {}
+		},
+		css: {
+			display: 'none',
+			width: '310px'
+		},
+		addClass: ''
+	};
+
+})(jQuery);

data/app/assets/javascripts/carnival/external/noty/layouts/bottomRight.js

@@ -0,0 +1,43 @@
+(function($) {
+
+	$.noty.layouts.bottomRight = {
+		name: 'bottomRight',
+		options: { // overrides options
+			
+		},
+		container: {
+			object: '<ul id="noty_bottomRight_layout_container" />',
+			selector: 'ul#noty_bottomRight_layout_container',
+			style: function() {
+				$(this).css({
+					bottom: 20,
+					right: 20,
+					position: 'fixed',
+					width: '310px',
+					height: 'auto',
+					margin: 0,
+					padding: 0,
+					listStyleType: 'none',
+					zIndex: 10000000
+				});
+
+				if (window.innerWidth < 600) {
+					$(this).css({
+						right: 5
+					});
+				}
+			}
+		},
+		parent: {
+			object: '<li />',
+			selector: 'li',
+			css: {}
+		},
+		css: {
+			display: 'none',
+			width: '310px'
+		},
+		addClass: ''
+	};
+
+})(jQuery);

data/app/assets/javascripts/carnival/external/noty/layouts/center.js

@@ -0,0 +1,56 @@
+(function($) {
+
+	$.noty.layouts.center = {
+		name: 'center',
+		options: { // overrides options
+			
+		},
+		container: {
+			object: '<ul id="noty_center_layout_container" />',
+			selector: 'ul#noty_center_layout_container',
+			style: function() {
+				$(this).css({
+					position: 'fixed',
+					width: '310px',
+					height: 'auto',
+					margin: 0,
+					padding: 0,
+					listStyleType: 'none',
+					zIndex: 10000000
+				});
+
+				// getting hidden height
+				var dupe = $(this).clone().css({visibility:"hidden", display:"block", position:"absolute", top: 0, left: 0}).attr('id', 'dupe');
+				$("body").append(dupe);
+				dupe.find('.i-am-closing-now').remove();
+				dupe.find('li').css('display', 'block');
+				var actual_height = dupe.height();
+				dupe.remove();
+
+				if ($(this).hasClass('i-am-new')) {
+					$(this).css({
+						left: ($(window).width() - $(this).outerWidth(false)) / 2 + 'px',
+						top: ($(window).height() - actual_height) / 2 + 'px'
+					});
+				} else {
+					$(this).animate({
+						left: ($(window).width() - $(this).outerWidth(false)) / 2 + 'px',
+						top: ($(window).height() - actual_height) / 2 + 'px'
+					}, 500);
+				}
+				
+			}
+		},
+		parent: {
+			object: '<li />',
+			selector: 'li',
+			css: {}
+		},
+		css: {
+			display: 'none',
+			width: '310px'
+		},
+		addClass: ''
+	};
+
+})(jQuery);