src dist structure

Timo-Breumelhof · Jul 19, 2015 · c22c0e0 · c22c0e0
1 parent 97d0e89
commit c22c0e0
Show file tree

Hide file tree

Showing 30 changed files with 981 additions and 45 deletions.
diff --git a/bower.json b/bower.json
@@ -2,8 +2,8 @@
   "name": "chocolat",
   "version": "0.4.7",
   "main": [
-    "css/chocolat.css",
-    "js/jquery.chocolat.js"
+    "dist/css/chocolat.css",
+    "dist/js/jquery.chocolat.js"
   ],
   "license": "CC-BY-2.0",
   "dependencies": {

diff --git a/css/chocolat.css → dist/css/chocolat.css b/css/chocolat.css → dist/css/chocolat.css
diff --git a/demo-images/1.jpg → dist/demo-images/1.jpg b/demo-images/1.jpg → dist/demo-images/1.jpg
diff --git a/demo-images/2.jpg → dist/demo-images/2.jpg b/demo-images/2.jpg → dist/demo-images/2.jpg
diff --git a/demo-images/3.jpg → dist/demo-images/3.jpg b/demo-images/3.jpg → dist/demo-images/3.jpg
diff --git a/demo-images/4.jpg → dist/demo-images/4.jpg b/demo-images/4.jpg → dist/demo-images/4.jpg
diff --git a/demo-images/5.jpg → dist/demo-images/5.jpg b/demo-images/5.jpg → dist/demo-images/5.jpg
diff --git a/demo-images/6.jpg → dist/demo-images/6.jpg b/demo-images/6.jpg → dist/demo-images/6.jpg
diff --git a/demo-images/7.jpg → dist/demo-images/7.jpg b/demo-images/7.jpg → dist/demo-images/7.jpg
diff --git a/demo-images/8.jpg → dist/demo-images/8.jpg b/demo-images/8.jpg → dist/demo-images/8.jpg
diff --git a/images/close.png → dist/images/close.png b/images/close.png → dist/images/close.png
diff --git a/images/fullscreen.png → dist/images/fullscreen.png b/images/fullscreen.png → dist/images/fullscreen.png
diff --git a/images/left.png → dist/images/left.png b/images/left.png → dist/images/left.png
diff --git a/images/loader.gif → dist/images/loader.gif b/images/loader.gif → dist/images/loader.gif
diff --git a/images/right.png → dist/images/right.png b/images/right.png → dist/images/right.png
diff --git a/index.html → dist/index.html b/index.html → dist/index.html
@@ -2,9 +2,9 @@
 <html>
     <head>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="css/chocolat.css" />
+        <link rel="stylesheet" href="./css/chocolat.css" />
         <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
-        <script type="text/javascript" src="js/jquery.chocolat.js"></script>
+        <script type="text/javascript" src="./js/jquery.chocolat.js"></script>
         <style>
             body {
                 text-align: center;
@@ -145,65 +145,65 @@ <h2>
                 $('.api-open').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('open start');
+                    console.log('open start');
                     var def = instance.api().open()
 
                     def.done(function(){
-                        console.debug('open done');
+                        console.log('open done');
                     })
                 })
                 $('.api-close').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('close start');
+                    console.log('close start');
                     var def = instance.api().close()
 
                     def.done(function(){
-                        console.debug('close done');
+                        console.log('close done');
                     })
                 })
                 $('.api-prev').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('prev start');
+                    console.log('prev start');
                     var def = instance.api().prev()
 
                     def.done(function(){
-                        console.debug('prev done');
+                        console.log('prev done');
                     })
                 })
                 $('.api-next').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('next start');
+                    console.log('next start');
                     var def = instance.api().next()
 
                     def.done(function(){
-                        console.debug('next done');
+                        console.log('next done');
                     })
                 })
 
                 $('.api-cover').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('cover mode start')
+                    console.log('cover mode start')
                     instance.api().set('fullWindow', 'cover')
                     var def = instance.api().place()
 
                     def.done(function(){
-                        console.debug('cover mode done')
+                        console.log('cover mode done')
                     })
                 })
 
                 $('.api-contain').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('contain mode start')
+                    console.log('contain mode start')
                     instance.api().set('fullWindow', 'contain')
                     var def = instance.api().place()
 
                     def.done(function(){
-                        console.debug('contain mode done')
+                        console.log('contain mode done')
                     })
                 })
             });

diff --git a/js/jquery.chocolat.js → dist/js/jquery.chocolat.js b/js/jquery.chocolat.js → dist/js/jquery.chocolat.js
@@ -1,10 +1,3 @@
-/*
-**      @author : Nicolas Turlais : nicolas-at-insipi.de
-**      @version : V0.4.6 - 4th of July 2015
-**      @license : Licensed under CCAttribution-ShareAlike
-**      @website : http://chocolat.insipi.de
-*/
-
 ; (function($, window, document, undefined) {
     var calls = 0;
     var defaults = {

diff --git a/dist/js/jquery.chocolat.min.js b/dist/js/jquery.chocolat.min.js
diff --git a/gulpfile.coffee b/gulpfile.coffee
@@ -1,33 +1,58 @@
 gulp = require 'gulp'
 gutil = require 'gulp-util'
+rename = require('gulp-rename');
+uglify = require 'gulp-uglify'
 coffee = require 'gulp-coffee'
 bump = require 'gulp-bump'
-mochaPhantomJS = require('gulp-mocha-phantomjs')
+mochaPhantomJS = require 'gulp-mocha-phantomjs'
 
 gulp.task 'compile-coffee', ->
-    gulp.src './test/src/*.coffee'
+    gulp.src './test/*.coffee'
         .pipe coffee({bare: true}).on('error', gutil.log)
         .pipe gulp.dest './test/'
 
-gulp.task 'watch',->
-    gulp.watch(['./test/src/*.coffee'], ['compile-coffee', 'testing'])
-
 gulp.task 'testing', ->
     gulp.src('./test/index.html')
     .pipe(mochaPhantomJS());
 
-gulp.task 'default', [
-    'compile-coffee'
-    'watch'
-]
+gulp.task 'build-js', ->
+    gulp.src('./src/js/jquery.chocolat.js')
+    .pipe gulp.dest('./dist/js/')
+    .pipe(rename('jquery.chocolat.min.js'))
+    .pipe(uglify())
+    .pipe gulp.dest('./dist/js/')
+
+gulp.task 'build-css', ->
+    gulp.src('./src/css/chocolat.css')
+    .pipe gulp.dest('./dist/css/')
+
+gulp.task 'build-images', ->
+    gulp.src('./src/images/*')
+    .pipe gulp.dest('./dist/images/')
 
 gulp.task 'bump', ->
     gulp.src(['./package.json', './bower.json'])
     .pipe(bump())
     .pipe gulp.dest('./')
 
+gulp.task 'watch-test',->
+    gulp.watch(['./test/*.coffee', './src/js/*.js', './src/css/*.css'], ['build', 'compile-coffee', 'testing'])
+
+gulp.task 'watch-src',->
+    gulp.watch(['./src/js/*.js', './src/css/*.css'], ['build-js', 'build-css'])
+
 gulp.task 'test', [
+    'build'
     'compile-coffee'
     'testing'
-    'watch'
+    'watch-test'
+]
+gulp.task 'build', [
+    'build-js'
+    'build-css'
+    'build-images'
+]
+gulp.task 'default', [
+    'build'
+    'watch-src'
 ]
diff --git a/package.json b/package.json
@@ -19,6 +19,8 @@
     "gulp-bump": "^0.3.1",
     "gulp-coffee": "^2.3.1",
     "gulp-mocha-phantomjs": "^0.6.1",
+    "gulp-rename": "^1.2.2",
+    "gulp-uglify": "^1.2.0",
     "gulp-util": "^3.0.6"
   },
   "scripts": {

diff --git a/readme.md b/readme.md
@@ -1,6 +1,7 @@
 ##Chocolat [![Build Status](https://travis-ci.org/nicolas-t/Chocolat.svg?branch=master)](https://travis-ci.org/nicolas-t/Chocolat) 
 -----------
-Chocolat is a responsive jQuery lightbox plugin
+Chocolat is a responsive jQuery lightbox plugin  
+What you are looking for is in the `/dist/` folder`. 
 
 #### Dependencies