Skip to content

Commit

Permalink
Merge pull request #8 from alexrayan/master
Browse files Browse the repository at this point in the history
Changes to angular directive & gulpfile
ziscloud committed May 5, 2016
2 parents 546b32b + 4a5f654 commit 725502a
Showing 8 changed files with 89 additions and 55 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-footable",
"version": "0.0.1",
"version": "0.0.3",
"homepage": "https://github.com/ziscloud/angular-footable",
"authors": [
"Tony Wang <[email protected]>"
48 changes: 24 additions & 24 deletions dist/angular-footable.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var o;"undefined"!=typeof window?o=window:"undefined"!=typeof global?o=global:"undefined"!=typeof self&&(o=self),o.angularFootable=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
'use strict';

angular
.module('ui.footable', [])
.directive('footable', function() {
.directive('footable', ['$timeout', function($timeout) {
var events = {
beforeFiltering: 'footable_filtering'
};
@@ -38,28 +37,29 @@ angular
var tableOpts = {
'event-filtering': null
};
$timeout(function(){
angular.extend(
tableOpts,
footable.options
);

angular.extend(
tableOpts,
footable.options
);

angular.extend(
tableOpts,
extractSpecOpts(tableOpts, attrs)
);

var tableObj = element.footable(tableOpts);

bindEventHandler(tableObj, scope, attrs);

angular.extend(
tableOpts,
extractSpecOpts(tableOpts, attrs)
);
var tableObj = {};
if(typeof element.footable === 'function'){
tableObj = element.footable(tableOpts);
} else {
tableObj = jQuery(element).footable(tableOpts);
}
bindEventHandler(tableObj, scope, attrs);
scope.$watch(function() {return attrs.loadWhen; }, function(){
$timeout(function(){
element.triggerHandler('footable_redraw');
});
});
},1000);
}
};
});

},{}]},{},[1])

(1)
});

//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9Vc2Vycy90b255d2FuZy93b3Jrc3BhY2UvamF2YXNjcmlwdC9hbmd1bGFyLWZvb3RhYmxlL25vZGVfbW9kdWxlcy9ib2lsZXJwbGF0ZS1ndWxwL25vZGVfbW9kdWxlcy9icm93c2VyaWZ5L25vZGVfbW9kdWxlcy9icm93c2VyLXBhY2svX3ByZWx1ZGUuanMiLCIvVXNlcnMvdG9ueXdhbmcvd29ya3NwYWNlL2phdmFzY3JpcHQvYW5ndWxhci1mb290YWJsZS9zcmMvYW5ndWxhci1mb290YWJsZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtBQ0FBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImFuZ3VsYXItZm9vdGFibGUuanMiLCJzb3VyY2VzQ29udGVudCI6WyIoZnVuY3Rpb24gZSh0LG4scil7ZnVuY3Rpb24gcyhvLHUpe2lmKCFuW29dKXtpZighdFtvXSl7dmFyIGE9dHlwZW9mIHJlcXVpcmU9PVwiZnVuY3Rpb25cIiYmcmVxdWlyZTtpZighdSYmYSlyZXR1cm4gYShvLCEwKTtpZihpKXJldHVybiBpKG8sITApO3Rocm93IG5ldyBFcnJvcihcIkNhbm5vdCBmaW5kIG1vZHVsZSAnXCIrbytcIidcIil9dmFyIGY9bltvXT17ZXhwb3J0czp7fX07dFtvXVswXS5jYWxsKGYuZXhwb3J0cyxmdW5jdGlvbihlKXt2YXIgbj10W29dWzFdW2VdO3JldHVybiBzKG4/bjplKX0sZixmLmV4cG9ydHMsZSx0LG4scil9cmV0dXJuIG5bb10uZXhwb3J0c312YXIgaT10eXBlb2YgcmVxdWlyZT09XCJmdW5jdGlvblwiJiZyZXF1aXJlO2Zvcih2YXIgbz0wO288ci5sZW5ndGg7bysrKXMocltvXSk7cmV0dXJuIHN9KSIsIid1c2Ugc3RyaWN0JztcblxuYW5ndWxhclxuICAgIC5tb2R1bGUoJ3VpLmZvb3RhYmxlJywgW10pXG4gICAgLmRpcmVjdGl2ZSgnZm9vdGFibGUnLCBmdW5jdGlvbigpIHtcbiAgICAgICAgdmFyIGV2ZW50cyA9IHtcbiAgICAgICAgICAgIGJlZm9yZUZpbHRlcmluZzogJ2Zvb3RhYmxlX2ZpbHRlcmluZydcbiAgICAgICAgfTtcbiAgICAgICAgdmFyIGV4dHJhY3RTcGVjT3B0cyA9IGZ1bmN0aW9uKG9wdHMsIGF0dHJzKSB7XG4gICAgICAgICAgICB2YXIgZXh0cmFjdGVkID0ge30sXG4gICAgICAgICAgICAgICAgaztcbiAgICAgICAgICAgIGZvciAoayBpbiBvcHRzKSB7XG4gICAgICAgICAgICAgICAgaWYgKGsgIT09ICdmaWx0ZXInICYmICghYW5ndWxhci5pc1VuZGVmaW5lZChldmVudHNba10pKSkge1xuICAgICAgICAgICAgICAgICAgICBpZighYW5ndWxhci5pc0Z1bmN0aW9uKHNjb3BlLiRldmFsKGF0dHJzW2tdKSkpIHtcbiAgICAgICAgICAgICAgICAgICAgICAgIGV4dHJhY3RlZFtrXSA9IGF0dHJzW2tdO1xuICAgICAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfVxuICAgICAgICAgICAgcmV0dXJuIGV4dHJhY3RlZDtcbiAgICAgICAgfTtcblxuICAgICAgICB2YXIgYmluZEV2ZW50SGFuZGxlciA9IGZ1bmN0aW9uKHRhYmxlT2JqLCBzY29wZSwgYXR0cnMpIHtcbiAgICAgICAgICAgIHZhciBrO1xuICAgICAgICAgICAgZm9yIChrIGluIGF0dHJzKSB7XG4gICAgICAgICAgICAgICAgaWYgKGsgIT09ICdmaWx0ZXInICYmICghYW5ndWxhci5pc1VuZGVmaW5lZChldmVudHNba10pKSkge1xuICAgICAgICAgICAgICAgICAgICB2YXIgdGFyZ2V0RXZlbnROYW1lID0gZXZlbnRzW2tdO1xuICAgICAgICAgICAgICAgICAgICBpZihhbmd1bGFyLmlzRnVuY3Rpb24oc2NvcGUuJGV2YWwoYXR0cnNba10pKSkge1xuICAgICAgICAgICAgICAgICAgICAgICAgdGFibGVPYmouYmluZCh0YXJnZXRFdmVudE5hbWUsIHNjb3BlLiRldmFsKGF0dHJzW2tdKSk7XG4gICAgICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9XG4gICAgICAgIH07XG5cbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIHJlc3RyaWN0OiAnQycsXG4gICAgICAgICAgICBsaW5rOiBmdW5jdGlvbihzY29wZSwgZWxlbWVudCwgYXR0cnMpIHtcbiAgICAgICAgICAgICAgICB2YXIgdGFibGVPcHRzID0ge1xuICAgICAgICAgICAgICAgICAgICAnZXZlbnQtZmlsdGVyaW5nJzogbnVsbFxuICAgICAgICAgICAgICAgIH07XG5cbiAgICAgICAgICAgICAgICBhbmd1bGFyLmV4dGVuZChcbiAgICAgICAgICAgICAgICAgICAgdGFibGVPcHRzLFxuICAgICAgICAgICAgICAgICAgICBmb290YWJsZS5vcHRpb25zXG4gICAgICAgICAgICAgICAgKTtcblxuICAgICAgICAgICAgICAgIGFuZ3VsYXIuZXh0ZW5kKFxuICAgICAgICAgICAgICAgICAgICB0YWJsZU9wdHMsXG4gICAgICAgICAgICAgICAgICAgIGV4dHJhY3RTcGVjT3B0cyh0YWJsZU9wdHMsIGF0dHJzKVxuICAgICAgICAgICAgICAgICk7XG5cbiAgICAgICAgICAgICAgICB2YXIgdGFibGVPYmogPSBlbGVtZW50LmZvb3RhYmxlKHRhYmxlT3B0cyk7XG5cbiAgICAgICAgICAgICAgICBiaW5kRXZlbnRIYW5kbGVyKHRhYmxlT2JqLCBzY29wZSwgYXR0cnMpO1xuXG4gICAgICAgICAgICB9XG4gICAgICAgIH07XG4gICAgfSk7XG4iXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=
}]);
3 changes: 1 addition & 2 deletions dist/angular-footable.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 30 additions & 9 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
var gulp = require('gulp'),
boilerplate = require('boilerplate-gulp');

boilerplate(gulp, {
pkg: require('./package.json'),
jsMain: './src/angular-footable.js',
karmaConfig: require('./test/karma.conf.js'),
connectConfig: require('./example/connect.conf.js')
});
var gulp = require('gulp');

var rename = require('gulp-rename');
var clean = require('gulp-clean');
var jshint = require('gulp-jshint');
var concat = require('gulp-concat');
var uglify = require('gulp-uglify');

var paths = {
scripts: ['src/*.js'],
};
var bases = {
dist: 'dist'
};
gulp.task('clean', function(){
return gulp.src(bases.dist+'/*.js', {read:false})
.pipe(clean());
});
gulp.task('scripts', ['clean'], function(){
gulp.src(paths.scripts)
.pipe(jshint())
.pipe(jshint.reporter('default'))
.pipe(gulp.dest(bases.dist))
.pipe(uglify())
.pipe(rename({
extname: '.min.js'
}))
.pipe(gulp.dest(bases.dist));
});
gulp.task('default',['scripts']);
10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-footable",
"version": "0.0.1",
"version": "0.0.3",
"description": "Angular derictive for FooTable",
"main": "dist/angular-footable.js",
"directories": {
@@ -24,7 +24,13 @@
},
"homepage": "https://github.com/ziscloud/angular-footable",
"devDependencies": {
"boilerplate-gulp": "~0.3.0",
"gulp": "~3.8.0",
"boilerplate-gulp": "~0.3.0"
"gulp-clean": "^0.3.1",
"gulp-concat": "^2.6.0",
"gulp-jshint": "^2.0.0",
"gulp-rename": "^1.2.2",
"gulp-uglify": "^1.5.1",
"jshint": "^2.9.1"
}
}
40 changes: 24 additions & 16 deletions src/angular-footable.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

angular
.module('ui.footable', [])
.directive('footable', function() {
.directive('footable', ['$timeout', function($timeout) {
var events = {
beforeFiltering: 'footable_filtering'
};
@@ -37,21 +37,29 @@ angular
var tableOpts = {
'event-filtering': null
};
$timeout(function(){
angular.extend(
tableOpts,
footable.options
);

angular.extend(
tableOpts,
footable.options
);

angular.extend(
tableOpts,
extractSpecOpts(tableOpts, attrs)
);

var tableObj = element.footable(tableOpts);

bindEventHandler(tableObj, scope, attrs);

angular.extend(
tableOpts,
extractSpecOpts(tableOpts, attrs)
);
var tableObj = {};
if(typeof element.footable === 'function'){
tableObj = element.footable(tableOpts);
} else {
tableObj = jQuery(element).footable(tableOpts);
}
bindEventHandler(tableObj, scope, attrs);
scope.$watch(function() {return attrs.loadWhen; }, function(){
$timeout(function(){
element.triggerHandler('footable_redraw');
});
});
},1000);
}
};
});
}]);
File renamed without changes.
2 changes: 1 addition & 1 deletion test/karma.conf.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ module.exports = {
frameworks: ['jasmine'],

preprocessors: {
'src/**/!(*Spec).js': ['coverage'],
'test/**/!(*Spec).js': ['coverage'],
'src/**/*.js': ['commonjs']
},

0 comments on commit 725502a

Please sign in to comment.