From 522751e425af15a1d3b75537ec32c6a1df229881 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Mon, 6 May 2013 14:28:05 -0400 Subject: [PATCH 1/2] Ignore the js files that are compiled from coffeescript when running the xmodule jasmine tests --- common/lib/xmodule/xmodule/js/src/.gitignore | 5 ++++- common/lib/xmodule/xmodule/js/src/annotatable/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/capa/.gitignore | 1 + .../lib/xmodule/xmodule/js/src/combinedopenended/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/conditional/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/discussion/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/html/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/peergrading/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/problem/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/raw/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/sequence/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/vertical/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/video/.gitignore | 2 ++ common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore | 2 ++ common/lib/xmodule/xmodule/js/src/wrapper/.gitignore | 1 + 15 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 common/lib/xmodule/xmodule/js/src/annotatable/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/capa/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/combinedopenended/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/conditional/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/discussion/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/html/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/peergrading/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/problem/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/raw/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/sequence/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/vertical/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/video/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/wrapper/.gitignore diff --git a/common/lib/xmodule/xmodule/js/src/.gitignore b/common/lib/xmodule/xmodule/js/src/.gitignore index bbd93c90e3..c2d956ce35 100644 --- a/common/lib/xmodule/xmodule/js/src/.gitignore +++ b/common/lib/xmodule/xmodule/js/src/.gitignore @@ -1 +1,4 @@ -# Please do not ignore *.js files. Some xmodules are written in JS. +# Ignore .js files in this folder as they are compiled from coffeescript +# For each of the xmodules subdirectories, add a .gitignore file that +# will cover any .coffee -> .js files that get compiled. +*.js diff --git a/common/lib/xmodule/xmodule/js/src/annotatable/.gitignore b/common/lib/xmodule/xmodule/js/src/annotatable/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/annotatable/.gitignore @@ -0,0 +1 @@ +*.js diff --git a/common/lib/xmodule/xmodule/js/src/capa/.gitignore b/common/lib/xmodule/xmodule/js/src/capa/.gitignore new file mode 100644 index 0000000000..77fdb1cbe9 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/capa/.gitignore @@ -0,0 +1 @@ +display.js diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/.gitignore b/common/lib/xmodule/xmodule/js/src/combinedopenended/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/.gitignore @@ -0,0 +1 @@ +*.js diff --git a/common/lib/xmodule/xmodule/js/src/conditional/.gitignore b/common/lib/xmodule/xmodule/js/src/conditional/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/conditional/.gitignore @@ -0,0 +1 @@ +*.js diff --git a/common/lib/xmodule/xmodule/js/src/discussion/.gitignore b/common/lib/xmodule/xmodule/js/src/discussion/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/discussion/.gitignore @@ -0,0 +1 @@ +*.js diff --git a/common/lib/xmodule/xmodule/js/src/html/.gitignore b/common/lib/xmodule/xmodule/js/src/html/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/html/.gitignore @@ -0,0 +1 @@ +*.js diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/.gitignore b/common/lib/xmodule/xmodule/js/src/peergrading/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/peergrading/.gitignore @@ -0,0 +1 @@ +*.js diff --git a/common/lib/xmodule/xmodule/js/src/problem/.gitignore b/common/lib/xmodule/xmodule/js/src/problem/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/problem/.gitignore @@ -0,0 +1 @@ +*.js diff --git a/common/lib/xmodule/xmodule/js/src/raw/.gitignore b/common/lib/xmodule/xmodule/js/src/raw/.gitignore new file mode 100644 index 0000000000..7cc629ca26 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/raw/.gitignore @@ -0,0 +1 @@ +edit/*.js diff --git a/common/lib/xmodule/xmodule/js/src/sequence/.gitignore b/common/lib/xmodule/xmodule/js/src/sequence/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/sequence/.gitignore @@ -0,0 +1 @@ +*.js diff --git a/common/lib/xmodule/xmodule/js/src/vertical/.gitignore b/common/lib/xmodule/xmodule/js/src/vertical/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/vertical/.gitignore @@ -0,0 +1 @@ +*.js diff --git a/common/lib/xmodule/xmodule/js/src/video/.gitignore b/common/lib/xmodule/xmodule/js/src/video/.gitignore new file mode 100644 index 0000000000..39c7b67ac1 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/video/.gitignore @@ -0,0 +1,2 @@ +*.js +display/*.js diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore b/common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore new file mode 100644 index 0000000000..39c7b67ac1 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore @@ -0,0 +1,2 @@ +*.js +display/*.js diff --git a/common/lib/xmodule/xmodule/js/src/wrapper/.gitignore b/common/lib/xmodule/xmodule/js/src/wrapper/.gitignore new file mode 100644 index 0000000000..a6c7c2852d --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/wrapper/.gitignore @@ -0,0 +1 @@ +*.js From c2cd75469b94fb5eadf3b151036177dfc1173487 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Mon, 6 May 2013 16:48:37 -0400 Subject: [PATCH 2/2] Change the methodology to ignore .js files by default. Any .js files that are coded can be handled individually. --- common/lib/xmodule/xmodule/js/src/.gitignore | 2 +- common/lib/xmodule/xmodule/js/src/annotatable/.gitignore | 1 - common/lib/xmodule/xmodule/js/src/capa/.gitignore | 3 ++- common/lib/xmodule/xmodule/js/src/combinedopenended/.gitignore | 1 - common/lib/xmodule/xmodule/js/src/conditional/.gitignore | 1 - common/lib/xmodule/xmodule/js/src/discussion/.gitignore | 1 - .../xmodule/xmodule/js/src/graphical_slider_tool/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/html/.gitignore | 1 - common/lib/xmodule/xmodule/js/src/peergrading/.gitignore | 1 - common/lib/xmodule/xmodule/js/src/poll/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/problem/.gitignore | 1 - common/lib/xmodule/xmodule/js/src/raw/.gitignore | 1 - common/lib/xmodule/xmodule/js/src/sequence/.gitignore | 1 - common/lib/xmodule/xmodule/js/src/sequence/display/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/vertical/.gitignore | 1 - common/lib/xmodule/xmodule/js/src/video/.gitignore | 2 -- common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore | 2 -- .../lib/xmodule/xmodule/js/src/videoalpha/display/.gitignore | 1 + common/lib/xmodule/xmodule/js/src/wrapper/.gitignore | 1 - 19 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 common/lib/xmodule/xmodule/js/src/annotatable/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/combinedopenended/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/conditional/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/discussion/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/html/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/peergrading/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/poll/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/problem/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/raw/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/sequence/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/sequence/display/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/vertical/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/video/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/videoalpha/display/.gitignore delete mode 100644 common/lib/xmodule/xmodule/js/src/wrapper/.gitignore diff --git a/common/lib/xmodule/xmodule/js/src/.gitignore b/common/lib/xmodule/xmodule/js/src/.gitignore index c2d956ce35..456e71bf8b 100644 --- a/common/lib/xmodule/xmodule/js/src/.gitignore +++ b/common/lib/xmodule/xmodule/js/src/.gitignore @@ -1,4 +1,4 @@ # Ignore .js files in this folder as they are compiled from coffeescript # For each of the xmodules subdirectories, add a .gitignore file that -# will cover any .coffee -> .js files that get compiled. +# will version any *.js file that is specifically written, not compiled. *.js diff --git a/common/lib/xmodule/xmodule/js/src/annotatable/.gitignore b/common/lib/xmodule/xmodule/js/src/annotatable/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/annotatable/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/common/lib/xmodule/xmodule/js/src/capa/.gitignore b/common/lib/xmodule/xmodule/js/src/capa/.gitignore index 77fdb1cbe9..13b8deb002 100644 --- a/common/lib/xmodule/xmodule/js/src/capa/.gitignore +++ b/common/lib/xmodule/xmodule/js/src/capa/.gitignore @@ -1 +1,2 @@ -display.js +!imageinput.js +!schematic.js diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/.gitignore b/common/lib/xmodule/xmodule/js/src/combinedopenended/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/common/lib/xmodule/xmodule/js/src/conditional/.gitignore b/common/lib/xmodule/xmodule/js/src/conditional/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/conditional/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/common/lib/xmodule/xmodule/js/src/discussion/.gitignore b/common/lib/xmodule/xmodule/js/src/discussion/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/discussion/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/.gitignore b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/.gitignore new file mode 100644 index 0000000000..d4aa116a26 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/.gitignore @@ -0,0 +1 @@ +!*.js diff --git a/common/lib/xmodule/xmodule/js/src/html/.gitignore b/common/lib/xmodule/xmodule/js/src/html/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/html/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/.gitignore b/common/lib/xmodule/xmodule/js/src/peergrading/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/peergrading/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/common/lib/xmodule/xmodule/js/src/poll/.gitignore b/common/lib/xmodule/xmodule/js/src/poll/.gitignore new file mode 100644 index 0000000000..d4aa116a26 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/poll/.gitignore @@ -0,0 +1 @@ +!*.js diff --git a/common/lib/xmodule/xmodule/js/src/problem/.gitignore b/common/lib/xmodule/xmodule/js/src/problem/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/problem/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/common/lib/xmodule/xmodule/js/src/raw/.gitignore b/common/lib/xmodule/xmodule/js/src/raw/.gitignore deleted file mode 100644 index 7cc629ca26..0000000000 --- a/common/lib/xmodule/xmodule/js/src/raw/.gitignore +++ /dev/null @@ -1 +0,0 @@ -edit/*.js diff --git a/common/lib/xmodule/xmodule/js/src/sequence/.gitignore b/common/lib/xmodule/xmodule/js/src/sequence/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/sequence/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display/.gitignore b/common/lib/xmodule/xmodule/js/src/sequence/display/.gitignore new file mode 100644 index 0000000000..d4aa116a26 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/sequence/display/.gitignore @@ -0,0 +1 @@ +!*.js diff --git a/common/lib/xmodule/xmodule/js/src/vertical/.gitignore b/common/lib/xmodule/xmodule/js/src/vertical/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/vertical/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/common/lib/xmodule/xmodule/js/src/video/.gitignore b/common/lib/xmodule/xmodule/js/src/video/.gitignore deleted file mode 100644 index 39c7b67ac1..0000000000 --- a/common/lib/xmodule/xmodule/js/src/video/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.js -display/*.js diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore b/common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore deleted file mode 100644 index 39c7b67ac1..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.js -display/*.js diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/.gitignore b/common/lib/xmodule/xmodule/js/src/videoalpha/display/.gitignore new file mode 100644 index 0000000000..c7a88ce092 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/display/.gitignore @@ -0,0 +1 @@ +!html5_video.js diff --git a/common/lib/xmodule/xmodule/js/src/wrapper/.gitignore b/common/lib/xmodule/xmodule/js/src/wrapper/.gitignore deleted file mode 100644 index a6c7c2852d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/wrapper/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js