Skip to content

Commit

Permalink
Merge pull request #117 from freedomjs/dborkan-refresh
Browse files Browse the repository at this point in the history
Add refresh token support to GTalk XMPP
  • Loading branch information
dborkan committed Jun 5, 2015
2 parents 673918f + 18a190f commit 921fdd7
Show file tree
Hide file tree
Showing 12 changed files with 296 additions and 334 deletions.
33 changes: 2 additions & 31 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,6 @@ module.exports = function(grunt) {
dest: 'build/demo_chrome_google/',
flatten: true, filter: 'isFile', expand: true
},
demo_chrome_facebook: {
src: [
'dist/*',
'src/demo_common/*',
'node_modules/freedom-for-chrome/freedom-for-chrome.js',
'src/demo_chrome_facebook/**/*',
],
dest: 'build/demo_chrome_facebook/',
flatten: true, filter: 'isFile', expand: true
},
demo_firefox_google: {
src: [ '**/*' ],
dest: 'build/demo_firefox_google/',
Expand All @@ -84,22 +74,6 @@ module.exports = function(grunt) {
dest: 'build/demo_firefox_google/data/',
flatten: true, filter: 'isFile', expand: true
},
demo_firefox_facebook: {
src: [ '**/*' ],
dest: 'build/demo_firefox_facebook/',
cwd: 'src/demo_firefox_facebook/',
filter: 'isFile', expand: true,
},
demo_firefox_facebook_data: {
src: [
'dist/*',
'src/demo_common/**/*',
'node_modules/freedom-for-firefox/freedom-for-firefox.jsm',
'src/demo_chrome_facebook/demo.json',
],
dest: 'build/demo_firefox_facebook/data/',
flatten: true, filter: 'isFile', expand: true
},
jasmine: {
src: [freedomPrefix + '/freedom.js'],
dest: 'freedom.js'
Expand Down Expand Up @@ -191,7 +165,7 @@ module.exports = function(grunt) {
// Compile into build/
grunt.registerTask('build', [
'jshint',
'browserify',
// 'browserify',
'copy:dist'
]);

Expand All @@ -200,11 +174,8 @@ module.exports = function(grunt) {
'build',
'copy:demo_chrome_xmpp',
'copy:demo_chrome_google',
'copy:demo_chrome_facebook',
'copy:demo_firefox_google',
'copy:demo_firefox_google_data',
'copy:demo_firefox_facebook',
'copy:demo_firefox_facebook_data',
'copy:demo_firefox_google_data'
]);

// Testing meta-task
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "freedom-social-xmpp",
"description": "XMPP Social provider for freedomjs",
"version": "0.3.15",
"version": "0.4.1",
"homepage": "http://freedomjs.org",
"bugs": {
"url": "http://github.com/freedomjs/freedom-social-xmpp/issues",
Expand Down
71 changes: 0 additions & 71 deletions src/core/facebook-auth.js

This file was deleted.

Loading

0 comments on commit 921fdd7

Please sign in to comment.