-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #643 from impress/dev
1.0.0-beta1: Merge 2 years worth of work from dev to master! Highlights * New plugin based architecture allows adding more features without bloating core src/impress.js file * Source files are in src/ and compiled into js/impress.js with npm run build. End users should continue to use js/impress.js as before. * 19 new plugins * Integrates impressConsole.js by default (press 'P' to open speaker console) * Markdown support for those that are too much in a hurry to type HTML * 5 new demo presentations under examples/ show case the new features * Removes the code that prevented impress.js from running on mobile phones
- Loading branch information
Showing
87 changed files
with
14,857 additions
and
523 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
/js/impress.min.js | ||
/node_modules | ||
/npm-debug.log |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[submodule "extras"] | ||
path = extras | ||
url = https://github.com/impress/impress-extras |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"preset": "jquery", | ||
// Since we check quotemarks already in jshint, this can be turned off | ||
"validateQuoteMarks": false | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
var buildify = require('buildify'); | ||
|
||
|
||
buildify() | ||
.load('src/impress.js') | ||
// Libraries from src/lib | ||
.concat(['src/lib/gc.js']) | ||
.concat(['src/lib/util.js']) | ||
// Plugins from src/plugins | ||
.concat(['src/plugins/autoplay/autoplay.js', | ||
'src/plugins/blackout/blackout.js', | ||
'src/plugins/extras/extras.js', | ||
'src/plugins/form/form.js', | ||
'src/plugins/goto/goto.js', | ||
'src/plugins/help/help.js', | ||
'src/plugins/impressConsole/impressConsole.js', | ||
'src/plugins/mobile/mobile.js', | ||
'src/plugins/mouse-timeout/mouse-timeout.js', | ||
'src/plugins/navigation/navigation.js', | ||
'src/plugins/navigation-ui/navigation-ui.js', | ||
'src/plugins/progress/progress.js', | ||
'src/plugins/rel/rel.js', | ||
'src/plugins/resize/resize.js', | ||
'src/plugins/skip/skip.js', | ||
'src/plugins/stop/stop.js', | ||
'src/plugins/substep/substep.js', | ||
'src/plugins/touch/touch.js', | ||
'src/plugins/toolbar/toolbar.js']) | ||
.save('js/impress.js'); | ||
/* | ||
* Disabled until uglify supports ES6: https://github.com/mishoo/UglifyJS2/issues/448 | ||
.uglify() | ||
.save('js/impress.min.js'); | ||
*/ | ||
|
||
|
||
/* Auto generate an index.html that lists all the directories under examples/ | ||
* This is useful for gh-pages, so you can link to http://impress.github.io/impress.js/examples | ||
*/ | ||
var ls = require('ls'); | ||
var fs = require('fs'); | ||
var path = require('path'); | ||
|
||
var html_list = '<ul><br />\n' | ||
ls( 'examples/*', { type: 'dir' }).forEach(function(dir) { | ||
html_list += ' <li><a href="' + dir['file'] + '/">' + dir['name'] + '</a></li>\n'; | ||
}); | ||
html_list += '</ul>\n' | ||
|
||
var html = '<html>\n<head>\n<title>Example presentations</title>\n</head>\n<body>' | ||
html += '<h1>Example presentations</h1>\n' + html_list | ||
html += '</body>\n</html>' | ||
|
||
var filename = path.resolve(__dirname, 'examples', 'index.html'); | ||
fs.writeFileSync(filename, html); | ||
console.log(filename); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.