Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add settings page #660

Closed
wants to merge 593 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
593 commits
Select commit Hold shift + click to select a range
7f0fd2d
Popcorn Time, Beta 2.5
Patineta Mar 8, 2014
4e5639b
Tiny change in reporting.
Patineta Mar 8, 2014
80a3654
Fixed the start timing.
Patineta Mar 8, 2014
ebb4f31
Update language names
Mar 9, 2014
3d7c4f6
Update sv.json
dotar Mar 9, 2014
0bdca34
Merge pull request #291 from dotar/patch-1
Patineta Mar 9, 2014
7ea5c5a
Merge pull request #290 from giulianodipace/patch-1
Patineta Mar 9, 2014
c7a1ddf
- Turkish encoding problem fix
onesvat Mar 9, 2014
b72da5c
Merged Pull Request #278 with Infinite Scrolling.
Patineta Mar 9, 2014
79afdd9
Merge pull request #295 from onesvat/master
Patineta Mar 9, 2014
6e97c5f
Fixed the spanish update call to action.
Patineta Mar 9, 2014
da92092
Tiny change for brazilian portuguese #282.
Patineta Mar 9, 2014
982d0a9
Fixes #293 (Subtitle position is wrong)
Patineta Mar 9, 2014
6cac533
Create kr.json
eunho Mar 9, 2014
9284a1a
Merge pull request #303 from eunho/patch-1
Patineta Mar 9, 2014
ed64109
Search by clicking the magnifying glass
sirmackan Mar 9, 2014
aac344e
installer changes && fix tr language
c0b41 Mar 9, 2014
ca75f32
Bugfix for pause/play using spacebar
download13 Mar 9, 2014
d9c27ac
Quick cleanup of code to prevent file dragging
download13 Mar 9, 2014
dc5897c
Be friendlier with owner of connectionCheckUrl
download13 Mar 9, 2014
a2dd4ed
Merge pull request #317 from download13/master
Patineta Mar 9, 2014
d15d0ab
Create ar.jeson
SerkZex Mar 9, 2014
88f8a21
Merge pull request #319 from HeartRegaLz/patch-2
Patineta Mar 9, 2014
c50e043
Sort subtitle list according language
Mar 9, 2014
5d6a45b
Polish translation
Mar 9, 2014
8933359
Create Polish.isl
Mar 9, 2014
a031e82
Update app.js
Mar 9, 2014
48d6470
Update pl.json
Mar 9, 2014
0483c25
Merge remote-tracking branch 'upstream/master'
Mar 9, 2014
9a37c52
Add Lithuanian language
jpalumickas Mar 9, 2014
1755c49
Merge pull request #305 from sirmackan/patch-2
GonzaGonza Mar 9, 2014
b5e74d7
Patch for video.js to prevent mousemove spam
download13 Mar 9, 2014
fdd833a
Merge pull request #321 from PerfectSlayer/master
GonzaGonza Mar 9, 2014
29ab2e0
Merge pull request #331 from download13/master
Patineta Mar 9, 2014
c99abd8
Add keyboard shortcuts. See Issue#6
LightDust Mar 9, 2014
18ccb58
Merge pull request #314 from cobaimelan/master
Patineta Mar 9, 2014
63d28bb
Renamed ar.json file
spacecowb0y Mar 10, 2014
418f773
Updated ar.json
spacecowb0y Mar 10, 2014
b699d06
Merge pull request #332 from LightDust/master
Patineta Mar 10, 2014
e573147
Remote Control
abadfederico Mar 10, 2014
1079eb6
Removed node_modules from repo. And added support for node_webkit bui…
GonzaGonza Mar 10, 2014
a583b54
Update sv.json. Add better plural form to genres.
Mar 10, 2014
d5f75ee
remove capital letters in incorrect locations
EvandroZanatta Mar 10, 2014
5b98849
Create ru.json
SaltedSoul Mar 10, 2014
72f4503
Create Arabic.isl
SerkZex Mar 10, 2014
32e55fc
Create Swedish.isl
SerkZex Mar 10, 2014
f1b556f
Basque language added
urtzai Mar 10, 2014
59188d4
Update app.js
SerkZex Mar 10, 2014
aa05a15
Create da.json
theisgp Mar 10, 2014
21b8503
Update en.json
theisgp Mar 10, 2014
fedd94b
Merge pull request #4 from popcorn-time/master
Mar 10, 2014
2c703ec
update de.json and german subtitles
Mar 10, 2014
e8fee60
update de.json
Mar 10, 2014
8553457
added german subtitles
Mar 10, 2014
473063a
Create he.json
vrah Mar 10, 2014
929723d
Update he.json
vrah Mar 10, 2014
897af8c
Fix only 2 pages infinite scroll
Mar 10, 2014
d9099dc
Merge pull request #377 from vrah/patch-1
Patineta Mar 10, 2014
b319578
Merge pull request #354 from EvandroZanatta/patch-2
Patineta Mar 10, 2014
29e8dad
Merge pull request #367 from theisgp/patch-1
Patineta Mar 10, 2014
7187add
Merge pull request #361 from HeyTech/patch-12
Patineta Mar 10, 2014
7b387a9
Merge pull request #360 from urtzai/master
Patineta Mar 10, 2014
dd65c16
Merge pull request #358 from HeyTech/patch-11
Patineta Mar 10, 2014
f64816d
Merge pull request #356 from HeyTech/patch-10
Patineta Mar 10, 2014
2e80596
Merge pull request #329 from jpalumickas/lithuanian-language
Patineta Mar 10, 2014
0214579
Merge pull request #357 from SaltedSoul/patch-1
Patineta Mar 10, 2014
eb2b1b7
Merge pull request #385 from PerfectSlayer/master
Patineta Mar 10, 2014
1dea7d1
Update da.json
theisgp Mar 10, 2014
90be10e
Merge pull request #387 from theisgp/patch-2
Patineta Mar 10, 2014
174bd4f
Fix infinite scroll according owner coding logic
Mar 10, 2014
8b06bd3
Add popular movies infinite scroll
Mar 10, 2014
fb3730b
Merge remote-tracking branch 'upstream/master'
Mar 10, 2014
595281d
Merge pull request #390 from PerfectSlayer/master
Patineta Mar 10, 2014
17950e6
Update fr.json
razzer77 Mar 10, 2014
abd512d
Improve infinite scroll rendering
Mar 10, 2014
a15905a
Merge remote-tracking branch 'upstream/master'
Mar 10, 2014
9208125
fixing some bugs in the infinite scroll
eduardomartines Mar 11, 2014
4edaccb
Merge branch 'master' of https://github.com/popcorn-time/popcorn-app …
GonzaGonza Mar 11, 2014
d1a6efd
Added the forgotten windows installer
GonzaGonza Mar 11, 2014
1a520ca
Merge pull request #398 from popcorn-time/no_modules
GonzaGonza Mar 11, 2014
7c7d02e
Updated node-webkit to 0.9.2
Patineta Mar 11, 2014
3c41013
Reorganized both app.js into more manageable files.
Patineta Mar 11, 2014
b94c138
Fixed #286 (Probably). Refactored the subtitles loader so it download…
Patineta Mar 11, 2014
264e470
Merged #324 with Polish language
Patineta Mar 11, 2014
82285e0
Added greek from Pull Request #288.
Patineta Mar 11, 2014
a506066
Merge pull request #393 from razzer77/patch-4
Patineta Mar 11, 2014
bdd7209
Merge pull request #352 from vinkla/patch-1
Patineta Mar 11, 2014
ee29fd9
Merge pull request #374 from fabe/master
Patineta Mar 11, 2014
f8efe00
Added a bunch of translation stuff from #338, #339, #340, #349, #362,…
Patineta Mar 11, 2014
7da6697
All language .json files now use 2 spaces.
Patineta Mar 11, 2014
e14a13a
Translate other languages in Lithuanian language
jpalumickas Mar 11, 2014
e2d0abf
Add Lithuanian language to opensubtitles
jpalumickas Mar 11, 2014
a10e3f2
Fix Hebrew translation
Nirlah Mar 11, 2014
1d0b51b
Fix the Hebrew subtitle phrase
Nirlah Mar 11, 2014
b4361d2
add slovak language
danielhusar Mar 11, 2014
14bc382
Add the repository field to get rid of the annoying npm warning
Mar 11, 2014
a9ed518
Use the https protocol instead of git
Mar 11, 2014
f077dfa
Update ru.json
SaltedSoul Mar 11, 2014
e54f3c8
Updated the building instructions
Mar 11, 2014
4431842
Fixed some bad translations, and added some that were missing.
f0ppa Mar 11, 2014
da27650
Removed confusing and useless comments
Mar 11, 2014
421a85c
Merge pull request #411 from jpalumickas/patch-1
Patineta Mar 11, 2014
c441d99
Merge pull request #412 from jpalumickas/patch-2
Patineta Mar 11, 2014
b4b5d61
Merge pull request #413 from Nirlah/hebrew-fix
Patineta Mar 11, 2014
71adf40
Merge pull request #432 from SaltedSoul/patch-2
Patineta Mar 11, 2014
504538d
Merge pull request #444 from f0ppa/master
Patineta Mar 11, 2014
935eb6f
Merge pull request #415 from danielhusar/master
Patineta Mar 11, 2014
2e29af3
Fix a spelling mistake in README.md
wdacgrs Mar 11, 2014
b53440a
Update fr.json
didia Mar 11, 2014
432a107
Merge pull request #452 from wdacgrs/patch-1
Patineta Mar 11, 2014
adda777
Merge pull request #440 from 1ace/patch-1
Patineta Mar 11, 2014
761cfbd
Wipe the tmp folder on close #188. Also removed some stuff from gitig…
Patineta Mar 11, 2014
5039f57
Traditional Chinese language support.
wdacgrs Mar 11, 2014
9a38136
Fixed #368 (No subtitles)
Patineta Mar 11, 2014
d44e2ad
Adding Bulgarian language support
zbrox Mar 11, 2014
63d2a43
Merge remote-tracking branch 'upstream/master'
Mar 11, 2014
8e1cd42
Added backdrop fade in animation (#322)
tmijail Mar 11, 2014
c421b3d
removed debug messages
tmijail Mar 11, 2014
55baaf6
More accurate rating display (with half-star)
LightDust Mar 11, 2014
fd46da2
Merge pull request #469 from tlqmj/feature/backdropFadeIn#322
Patineta Mar 11, 2014
d122bb0
Merge pull request #470 from LightDust/patch-1
Patineta Mar 11, 2014
6b5a428
Fix slash caracteres in search query
Mar 11, 2014
047d3b0
fix russian translation
gen1us Mar 11, 2014
5d0a7ac
Merge branch 'master' of https://github.com/gen1us/popcorn-app
gen1us Mar 11, 2014
fc6b622
Improve infinte scroll css animation
Mar 11, 2014
69ed187
Added customSubtitles plugin
Mar 11, 2014
9c2aee6
Toggle platforms to build with grunt option instead of manual toggle in
Mar 11, 2014
f287093
Remove some obsolete comments
Mar 11, 2014
57606be
Added Finnish language.
gryor Mar 11, 2014
0a2fa1d
Fixed comma.
gryor Mar 11, 2014
25efb56
Custom Subtitles
Mar 11, 2014
9459e63
Merge branch 'master' of https://github.com/popcorn-time/popcorn-app …
Mar 12, 2014
d20e6fe
Add support for linux32 and separate win from darwin
Mar 12, 2014
16cd3e8
Document the availability of linux32
Mar 12, 2014
0a5c4a5
Fixed bug where sometimes backdroCache's onload event would trigger i…
tmijail Mar 12, 2014
fd98940
Merge pull request #496 from tlqmj/feature/backdropFadeIn#322
Patineta Mar 12, 2014
f5c48e3
Bengali language
pyprism Mar 12, 2014
0b3d883
Added Ukrainian language
web93onv Mar 12, 2014
9cc7be7
Added Russian and Ukrainian flags
web93onv Mar 12, 2014
e473b8b
Added Russian and Ukrainian languages
web93onv Mar 12, 2014
f442fc0
50% done
pyprism Mar 12, 2014
2b1b7dc
90% done
pyprism Mar 12, 2014
e955a79
95% done
pyprism Mar 12, 2014
038e542
Merge pull request #431 from luuse/https_repo_urls
Patineta Mar 12, 2014
0d0e715
Merge pull request #456 from thefuture2092/patch-1
Patineta Mar 12, 2014
39d8cb9
Merge branch 'feature/#19' of git://github.com/ivantodorovich/popcorn…
Patineta Mar 12, 2014
84543dd
Fixed a bug with external subs. Added our fork of peerflix to the pac…
Patineta Mar 12, 2014
5ae9885
Merge pull request #479 from gen1us/master
Patineta Mar 12, 2014
b70ceb0
Merge pull request #476 from PerfectSlayer/slash-search
Patineta Mar 12, 2014
8347496
Fixed an error with the backdrop loader.
Patineta Mar 12, 2014
04d17cd
Merge pull request #397 from eduardomartines/em_infinitescroll_bugfixes
Patineta Mar 12, 2014
ab30411
Merge pull request #396 from PerfectSlayer/master
Patineta Mar 12, 2014
fc40d95
Rolled back the incremental transition, as it conflicted with other s…
Patineta Mar 12, 2014
43dd134
fixing slovak translate
cimox Mar 12, 2014
f3f24de
Added languages
frenzeldk Mar 12, 2014
8b5ae41
Arrange header buttons based on os.
zosiu Mar 12, 2014
5566f70
Fix the git https urls in package.json
Mar 12, 2014
1597346
Require popcornflix as peerflix
gsamokovarov Mar 12, 2014
cfcfd68
As suggested by @gsamokovarov keeping the genre translations more con…
zbrox Mar 12, 2014
66e9ec0
Add line how to enable developer tools while developing via node-webkit
ohwhen Mar 12, 2014
f4acaff
Merge pull request #548 from ohwhen/readme-update
Patineta Mar 12, 2014
fd1b706
Merge pull request #530 from gsamokovarov/popcornflix-require
Patineta Mar 12, 2014
84ef1e1
Merge pull request #528 from luuse/fix_https_git_urls
Patineta Mar 12, 2014
e5174ca
bengali flag
pyprism Mar 12, 2014
88b4620
Some minor wording changes.
wdacgrs Mar 12, 2014
0324f54
hu.json
sven777 Mar 12, 2014
870ff8b
Changed one weird wording in sv.json
Kezxo Mar 12, 2014
5b0acca
Hungarian localization
zeppelin Mar 11, 2014
ef1ee08
update package.json with repository field
maraoz Mar 12, 2014
ca28863
git ignore for vim files
maraoz Mar 12, 2014
380b212
Added catalan translation
sisqbates Mar 12, 2014
4a35fd7
Fix PR #559 conflict
spacecowb0y Mar 13, 2014
3bdb199
Create Trad_Chinese.isl
Jackmoo Mar 13, 2014
81e95c9
Add Catalan translation
spacecowb0y Mar 13, 2014
3ae8b2f
Merge pull request #573 from Kezxo/patch-1
spacecowb0y Mar 13, 2014
3412ca6
Update kr.json
eunho Mar 13, 2014
a49adbb
Update en.json
eunho Mar 13, 2014
fb0609a
Update kr.json
eunho Mar 13, 2014
a2d0682
Update Trad_Chinese.isl
Jackmoo Mar 13, 2014
55128b4
Update windows-installer.iss
Jackmoo Mar 13, 2014
2222fb9
add Simplified Chinese
mzgcz Mar 13, 2014
dafb614
add marionette
samccone Mar 13, 2014
bef98db
Update windows-installer.iss
Jackmoo Mar 13, 2014
431800a
let the js know Simplified Chinese is ready
mzgcz Mar 13, 2014
8394772
Merge pull request #586 from mzgcz/master
spacecowb0y Mar 13, 2014
a3b86fe
prevent crash on reload in dev mode
samccone Mar 13, 2014
c90a466
add marionette to page
samccone Mar 13, 2014
db61d2f
add a helper method on the movie model
samccone Mar 13, 2014
e7b4e35
Merge pull request #588 from mzgcz/master
Patineta Mar 13, 2014
6316157
refactor movie view to be more semantic
samccone Mar 13, 2014
fd1c357
Merge pull request #583 from eunho/patch-2
Patineta Mar 13, 2014
ba4ac1c
Merge pull request #584 from eunho/patch-3
Patineta Mar 13, 2014
b6ef3f7
Fix JSON syntaxis
spacecowb0y Mar 13, 2014
b32a73d
Merge pull request #574 from maraoz/fix/repository
spacecowb0y Mar 13, 2014
b9a7f6f
full translation done
pyprism Mar 13, 2014
09d2f70
Fix issue #121
spacecowb0y Mar 13, 2014
cc061a8
Merge pull request #590 from samccone/sjs/marionette-makes-everyone-h…
Patineta Mar 13, 2014
9f8bb49
Update Trad_Chinese.isl
Jackmoo Mar 13, 2014
b20a1f6
Added a few extra languages in the installer.
Patineta Mar 13, 2014
7051b57
Update windows-installer.iss
Jackmoo Mar 13, 2014
2930281
Rename Trad_Chinese.isl to Chinese_Traditional.isl
Jackmoo Mar 13, 2014
dd02198
Merge pull request #571 from sven777/patch-1
Patineta Mar 13, 2014
50ece55
Merged #441 with Hungarian Localization.
Patineta Mar 13, 2014
417da49
Hungarian Installer.
Patineta Mar 13, 2014
8173229
Rename Chinese_Traditional.isl to ChineseTraditional.isl
Jackmoo Mar 13, 2014
2874bea
Update windows-installer.iss
Jackmoo Mar 13, 2014
7b49a1a
Update windows-installer.iss
Jackmoo Mar 13, 2014
a3d4b8b
Update and rename ChineseTraditional.isl to TraditionalChinese.isl
Jackmoo Mar 13, 2014
19d3657
Update TraditionalChinese.isl
Jackmoo Mar 13, 2014
c42a0c1
Merged #587, with the first Chinese translation for an InnoSetup inst…
Patineta Mar 13, 2014
b5cf2b9
Merge pull request #591 from pyprism/master
spacecowb0y Mar 13, 2014
793236b
Merge branch 'master' of https://github.com/popcorn-time/popcorn-app
Patineta Mar 13, 2014
e682572
Merge pull request #523 from LuckyThirteen/header_button_arrangement
Patineta Mar 13, 2014
ad1cc8f
Merge pull request #517 from Orkeren/patch-1
Patineta Mar 13, 2014
afe340b
Merge pull request #507 from cimox/patch-1
Patineta Mar 13, 2014
c11071e
Marionette goes after backbone
Patineta Mar 13, 2014
ec854e6
closed #121
montogeek Mar 13, 2014
b0213ee
Merged #501 with Ukrainian
Patineta Mar 13, 2014
aa7ec18
Merged #483 with Finnish.
Patineta Mar 13, 2014
c30844f
Merged #462 with bulgarian
Patineta Mar 13, 2014
0a7a930
Merge pull request #430 from luuse/popcorn_repo
Patineta Mar 13, 2014
af44133
Merged #121
Patineta Mar 13, 2014
69c7e08
Update traditional Chinese language file.
wdacgrs Mar 13, 2014
2a97bcf
Remove unnecessary semicolons
Mar 13, 2014
5e080f2
Use local variables in for loops
Mar 13, 2014
04c04ed
Fix typo in variable name
Mar 13, 2014
d15ffa0
No seek handle
pvieito Mar 13, 2014
5294c4a
Latvian added
Mar 13, 2014
3b14366
Add option to build all platforms
Mar 13, 2014
9faefd4
Update he.json
mat-mo Mar 13, 2014
3cdcc25
adding hebrew icon
mat-mo Mar 13, 2014
3817ee2
Update fr.json
popojojo Mar 13, 2014
0d95cc2
Fix plural in dutch legalDisclaimer translation.
DieBauer Mar 13, 2014
459bc00
Merge pull request #607 from pvieito/dev
Patineta Mar 13, 2014
53cad2f
Merge pull request #623 from DieBauer/master
Patineta Mar 13, 2014
5b8fe45
Merge pull request #620 from popojojo/patch-1
Patineta Mar 13, 2014
3c207f5
Merge pull request #613 from mat-mo/master
Patineta Mar 13, 2014
199417a
Merge pull request #609 from trakais/master
Patineta Mar 13, 2014
ea652d0
Merge pull request #602 from Madrigal/js-minor-fixes
Patineta Mar 13, 2014
bf073f5
Merge pull request #596 from wdacgrs/master
Patineta Mar 13, 2014
b43e616
Update hu.json
vigkrisztian Mar 13, 2014
011c5ac
Merge pull request #639 from vigkrisztian/patch-6
Patineta Mar 13, 2014
6b61f85
Merge pull request #482 from luuse/choose_platform
GonzaGonza Mar 14, 2014
453da7a
Added settings button
isra17 Mar 14, 2014
085961c
Added missing settings icon
isra17 Mar 14, 2014
4418828
Added Settings page
isra17 Mar 14, 2014
e9b1c10
Added a settings page with a setting to set the download folder
isra17 Mar 14, 2014
2f2df5c
Localize new string in en and fr
isra17 Mar 14, 2014
daa5359
Aligne settings icon with fullscreen icon
isra17 Mar 14, 2014
4f6682c
Add option to not clear cache after movie
isra17 Mar 14, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,30 @@ lib-cov
*.pid
*.gz

.idea/

node_modules/

build/

pids
logs
results

npm-debug.log
node_modules

app.nw
node-webkit.app

.sass-cache
*-ck.js
*.srt
*.DS_Store

js/vendor/config.js
dist/windows/Install Popcorn Time.exe
dist/mac/Popcorn Time.app/
dist/mac/Popcorn Time.zip


# vim swap files
*.swp
3 changes: 2 additions & 1 deletion Config.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
relative_assets = true
css_dir = 'css'
css_dir = 'css'
line_comments = false
66 changes: 62 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = function(grunt) {
module.exports = function(grunt) {
var buildPlatforms = parseBuildPlatforms(grunt.option('platforms'));

grunt.initConfig({
compass: {
Expand All @@ -12,16 +13,73 @@
files: ['sass/**/*.scss'],
tasks: ['sass'],
options: {
livereload: true,
livereload: true
}
},
nodewebkit: {
options: {
version: '0.9.2',
build_dir: './build', // Where the build version of my node-webkit app is saved
mac_icns: './images/popcorntime.icns', // Path to the Mac icon file
mac: buildPlatforms.mac,
win: buildPlatforms.win,
linux32: buildPlatforms.linux32,
linux64: buildPlatforms.linux64
},
src: ['./css/**', './fonts/**', './images/**', './js/**', './language/**', './node_modules/**', '!./node_modules/grunt*/**', './rc/**', './Config.rb', './index.html', './package.json', './README.md' ] // Your node-webkit app './**/*'
},
copy: {
main: {
files: [
{
src: 'libraries/win/ffmpegsumo.dll',
dest: 'build/releases/Popcorn-Time/win/Popcorn-Time/ffmpegsumo.dll',
flatten: true
},
{
src: 'libraries/mac/ffmpegsumo.so',
dest: 'build/releases/Popcorn-Time/mac/Popcorn-Time.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/ffmpegsumo.so',
flatten: true
},
{
src: 'libraries/linux64/libffmpegsumo.so',
dest: 'build/releases/Popcorn-Time/linux64/Popcorn-Time/libffmpegsumo.so',
flatten: true
}
]
}
}
});

grunt.loadNpmTasks('grunt-contrib-compass');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-node-webkit-builder');

grunt.registerTask('css', ['compass']);

grunt.registerTask('default', ['compass']);
grunt.registerTask('nodewkbuild', ['nodewebkit', 'copy']);


};

var parseBuildPlatforms = function(argumentPlatform) {
// this will make it build no platform when the platform option is specified
// without a value which makes argumentPlatform into a boolean
var inputPlatforms = argumentPlatform || process.platform + ";" + process.arch;

// Do some scrubbing to make it easier to match in the regexes bellow
inputPlatforms = inputPlatforms.replace("darwin", "mac");
inputPlatforms = inputPlatforms.replace(/;ia|;x|;arm/, "");

var buildAll = /^all$/.test(inputPlatforms);

var buildPlatforms = {
mac: /mac/.test(inputPlatforms) || buildAll,
win: /win/.test(inputPlatforms) || buildAll,
linux32: /linux32/.test(inputPlatforms) || buildAll,
linux64: /linux64/.test(inputPlatforms) || buildAll
};

};
return buildPlatforms;
}
41 changes: 31 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@

To allow any computer user to watch movies easily streaming from torrents, without any particular knowledge.

![Demo Screenshot](https://f.cloud.github.com/assets/1133842/1980972/1083f360-83cd-11e3-8e08-b01de5d33f1c.png)
![Demo Screenshot](http://getpopcornti.me/images/how-ui.png)

### Status

Under development (only in Mac OSX? _somebody should try Linux and Windows_) - no alpha candidate yet.

Under development (RC1) for Mac OSX - Windows - Linux.

### APIs

Expand All @@ -24,12 +23,33 @@ Under development (only in Mac OSX? _somebody should try Linux and Windows_) - n
- [SubtitleSeeker](http://www.api.subtitleseeker.com/About/Api-Search/) for subtitles.


## Testing it out
1. Open a Terminal with this project folder.
2. Run `npm install` in Terminal to include project dependencies.
3. Copy the [node-webkit application binary](https://s3.amazonaws.com/node-webkit/v0.8.4/node-webkit-v0.8.4-osx-ia32.zip) for OSX 10.7+ to your `/Applications` folder.
4. Run `/Applications/node-webkit.app/Contents/MacOS/node-webkit .` in Terminal to open up the application.
5. Update `js/vendor/config.js` with your [themoviedb.org](http://themoviedb.org) API key. Pst. if you need one contact us.
## Building

### Dependencies

You will need nodejs and grunt:

$ npm install -g grunt-cli

### Build

Install the node modules:

$ npm install

Build with:

$ grunt nodewkbuild

By default it will build for your current platform however you can control that
by specifying a comma separated list of platforms in the `platforms` option to
grunt:

$ grunt nodewkbuild --platforms=linux32,linux64,mac,win

You can also build for all platforms with:

$ grunt nodewkbuild --platforms=all

## Any problem?

Expand All @@ -48,11 +68,12 @@ Replace `node_modules/moviedb/node_modules/superagent/index.js` contents with:

### Regarding Video, MP4 H264 Playback
- Info: https://github.com/rogerwang/node-webkit/wiki/Support-mp3-and-h264-in-video-and-audio-tag
- Needed to build a custom build of node-webkit that adds h264 support (or you can download redy-to-go builds from https://file.ac/s4Lt3Vo6rls/)
- Needed to build a custom build of node-webkit that adds h264 support (or you can download ready-to-go builds from https://file.ac/s4Lt3Vo6rls/)
- Alternatively, we can replace a .so and .dll file from the correspondent Chrome build to node-webkit and node-webkit.exe


## Development
- Run `compass watch` in Terminal for CSS compiling and listen to future changes.
- [How to build with SublimeText](https://github.com/rogerwang/node-webkit/wiki/Debugging-with-Sublime-Text-2-and-3)
- Currently Gaze to watch all files and reload the app is disabled due to memory leaks and unstability.
- Run node-webkit from the root directory with --debug to enable debugging mode like so ```node-webkit . --debug```
47 changes: 47 additions & 0 deletions css/animations.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
@-webkit-keyframes sidebareffect {
/* line 2, ../sass/animations.scss */
from {
-webkit-transform: translate(220px, 0);
}

/* line 3, ../sass/animations.scss */
to {
-webkit-transform: translate(0, 0);
}
}

@-webkit-keyframes sidebareffect2 {
/* line 7, ../sass/animations.scss */
from {
-webkit-transform: translate(0, 0);
}

/* line 8, ../sass/animations.scss */
to {
-webkit-transform: translate(220px, 0);
}
}

@-webkit-keyframes spin {
/* line 12, ../sass/animations.scss */
from {
-webkit-transform: rotate(0deg);
}

/* line 13, ../sass/animations.scss */
to {
-webkit-transform: rotate(360deg);
}
}

@-webkit-keyframes backdropFadeIn {
/* line 17, ../sass/animations.scss */
from {
opacity: 0;
}

/* line 18, ../sass/animations.scss */
to {
opacity: 0.2;
}
}
Loading