Merge pull request #27 from alfredobarron/dev

Se actualizo a la version 2.1.0

Author: alfredobarron

.bower.json

@@ -1,5 +1,6 @@
-# Extension to ognore
-*.zip
-
 # Folders to ignore
-node_modules
+node_modules
+.grunt
+
+# Extension to ognore
+*.zip

.gitignore

@@ -7,31 +7,53 @@ module.exports = function(grunt){
         uglify: {
             js: {
                 files: {
-                    'dist/js/smoke.min.js': ['dist/js/smoke.js']
+                    'docs/dist/js/smoke.min.js': ['docs/dist/js/smoke.js']
                 }
             }
         },
         cssmin: {
             css: {
                 files: {
-                    'dist/css/smoke.min.css': ['dist/css/smoke.css']
+                    'docs/dist/css/smoke.min.css': ['docs/dist/css/smoke.css']
                 }
             }
         },
         copy: {
             main: {
                 files: [
                     // includes files within path
-                    {expand: true, src: ['dist/**'], dest: 'docs/'},
+                    {expand: true, cwd: 'docs/dist/', src: ['**'], dest: 'dist'},
                 ],
             },
         },
+        compress: {
+          main: {
+            options: {
+              archive: 'smoke-v2.1.0.zip'
+            },
+            files: [
+              //{src: ['path/*'], dest: 'internal_folder/', filter: 'isFile'}, // includes files in path
+              //{src: ['path/**'], dest: 'internal_folder2/'}, // includes files in path and its subdirs
+              {expand: true, cwd: 'dist/', src: ['**'], dest: ''}, // makes all src relative to cwd
+              //{flatten: true, src: ['path/**'], dest: 'internal_folder4/', filter: 'isFile'} // flattens results to a single level
+            ]
+          }
+        },
+        // Se empujan los archivos de la carpeta docs dentro del repositorio gh-pages en Github
+        'gh-pages': {
+            options: {
+                base: 'docs'
+            },
+            src: ['**']
+        }
     });
 
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-copy');
+    grunt.loadNpmTasks('grunt-contrib-compress');
+    grunt.loadNpmTasks('grunt-gh-pages');
 
-    grunt.registerTask('default', ['uglify', 'cssmin', 'copy']);
+    grunt.registerTask('default', ['uglify', 'cssmin', 'copy', 'compress']);
 
 };

Gruntfile.js

@@ -1,6 +1,6 @@
 {
   "name": "smoke",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "homepage": "https://github.com/alfredobarron/smoke",
   "authors": [
     "Alfredo Barron <[email protected]>"

bower.json

@@ -156,12 +156,16 @@
     top: 0;
     width: 100%;
     height: 100%;
-    z-index: 999;
+    z-index: 9999;
 }
-.panel-full .panel-body{
-	height: 90%;
+.smk-btn-group-panel-title{
+	top:-22px;
+	right: -4px
+}
+.smk-btn-group-panel{
+	top:-4px;
+	right: -4px
 }
-
 
 
 

dist/css/smoke.css

@@ -1087,22 +1087,30 @@ $.fn.smkFullscreen = function() {
 
 /*
 |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-|   Panel config
+|   Panel
 |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-$.fn.smkPanelConfig = function(options) {
+$.fn.smkPanel = function(options) {
 	// Variables default
 	var settings = $.extend({
-		hide: '',
-		class: ''
+		hide: ''
 	}, options);
 
 	// Se eliminan los espacios en blanco de la variable settings.hide
 	var hideSinEspacios = settings.hide.replace(/\s/g, '');
 	// Se quiebra la variable hideSinEspacios para obtener sus valores y se agregan en el array arrayHide
 	var arrayHide = hideSinEspacios.split(',');
+	// Se obtiene el .panel-title de cada panel
+	var panelHeading = $(this).children('.panel-heading').children('.panel-title');
+	var smkBtnGroupPanel = '';
+	if(panelHeading.length > 0){
+		smkBtnGroupPanel = 'smk-btn-group-panel-title';
+	}else{
+		smkBtnGroupPanel = 'smk-btn-group-panel';
+	}
+
 	// Se crea el btn-group
-	var btnGroup = '<div class="btn-group btn-group-sm pull-right ' + settings.class + '" role="group">';
+	var btnGroup = '<div class="btn-group btn-group-sm pull-right ' + smkBtnGroupPanel + '" role="group">';
 	// Se valida que no exista en el array el boton min para poder agregarlo dentro de btnGroup
 	if($.inArray('min', arrayHide) == -1){
 		btnGroup += '<a class="btn smk-min" href="#"><span class="glyphicon glyphicon-minus" aria-hidden="true"></span></a>';
@@ -1116,10 +1124,9 @@ $.fn.smkPanelConfig = function(options) {
 		btnGroup += '<a class="btn smk-full" href="#"><span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span></a>';
 	}
 	btnGroup += '</div>';
-	// Se obtiene el .panel-title de cada panel
-	var panelHeading = $(this).children('.panel-heading').children('.panel-title');
-	// Se inserta despues del .panel-title
-	$(panelHeading).after( btnGroup );
+
+	// Se inserta dentro de .panel-heading
+	$(this).children('.panel-heading').append( btnGroup );
 
 	// Evento del boton Min
     $('.smk-min').click(function(event) {
@@ -1151,30 +1158,30 @@ $.fn.smkPanelConfig = function(options) {
 
         if(panel.hasClass('panel-full')){
             panel.removeClass('panel-full');
-            $('.container-fluid').css({'display':'block'});
-            $('#content').css({'position':'fixed'});
-            $('body').css({'overflow':'auto'});
             $(this).siblings('.btn').show();
             if(iconPlus.length == 1){
             	body.hide();
             }
+            $('body').css({'overflow':'auto'});
+            // $('.container-fluid').css({'display':'block'});
+            // $('#content').css({'position':'fixed'});
         }else{
             panel.addClass('panel-full');
-            $('.container-fluid').css({'display':'initial'});
-            $('#content').css({'position':'initial'});
-            $('body').css({'overflow':'hidden'});
             $(this).siblings('.btn').hide();
             if(iconPlus.length == 1){
             	body.show();
             }
+            $('body').css({'overflow':'hidden'});
+            // $('.container-fluid').css({'display':'initial'});
+            // $('#content').css({'position':'initial'});
         }
         icon.toggleClass('glyphicon-resize-full').toggleClass('glyphicon-resize-small');
     });
 };
 /*
 |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 |   Usage
-|	$('.panel').smkPanelConfig({hide: 'min,remove,full', class: 'name-class'});
+|	$('.panel').smkPanel({hide: 'min,remove,full', class: 'name-class'});
 |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */