From 2c3bd2ec73789674009c7d6040a60381e6a3ba78 Mon Sep 17 00:00:00 2001
From: Adam Mcgrath <adamjmcgrath@gmail.com>
Date: Sat, 9 May 2015 11:37:55 +0100
Subject: [PATCH] Use older version of compiler Fix dev appserver imports Fix
 js compilation warnings Add js sourcemaps

---
 .travis.yml                                   |  2 +-
 scripts/compilejs.sh                          | 15 +++++++----
 scripts/restore_dev_data.py                   | 27 +++++--------------
 src/app.yaml                                  |  3 +++
 .../leaderboard/leaderboardmodel.js           |  2 +-
 5 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 591f4f8..ae4c7a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ before_script:
 
   # closure compiler
   - mkdir -p vendors/closure
-  - wget http://dl.google.com/closure-compiler/compiler-latest.zip && unzip compiler-latest.zip -d vendors/closure
+  - wget https://dl.google.com/closure-compiler/compiler-20140625.zip && unzip compiler-20140625.zip -d vendors/closure
   - export CLOSURE_JAR=vendors/closure/compiler.jar
 
   # closure templates compiler
diff --git a/scripts/compilejs.sh b/scripts/compilejs.sh
index 6e41cd9..3630e66 100755
--- a/scripts/compilejs.sh
+++ b/scripts/compilejs.sh
@@ -22,11 +22,13 @@ LEADERBOARD_SOURCE=$FFC_SOURCE/leaderboard
 SUGGEST_SOURCE=$FFC_SOURCE/suggest
 TEMPLATE_SOURCE=$FFC_SOURCE/template
 GROW_SOURCE=$FFC_PATH/lib/growjs
-FFC_QUIZ_JS_OUTPUT=$FFC_PATH/static/js/quiz.js
-FFC_LEADERBOARD_JS_OUTPUT=$FFC_PATH/static/js/leaderboard.js
-FFC_SETTINGS_JS_OUTPUT=$FFC_PATH/static/js/settings.js
-FFC_LEAGUE_FORM_JS_OUTPUT=$FFC_PATH/static/js/leagueform.js
-FFC_DEPS_OUTPUT=$FFC_PATH/static/js/deps.js
+JS_OUTPUT_FOLDER=$FFC_PATH/static/js
+FFC_QUIZ_JS_OUTPUT=$JS_OUTPUT_FOLDER/quiz.js
+FFC_LEADERBOARD_JS_OUTPUT=$JS_OUTPUT_FOLDER/leaderboard.js
+FFC_LEADERBOARD_JS_MAP=$JS_OUTPUT_FOLDER/leaderboard.map
+FFC_SETTINGS_JS_OUTPUT=$JS_OUTPUT_FOLDER/settings.js
+FFC_LEAGUE_FORM_JS_OUTPUT=$JS_OUTPUT_FOLDER/leagueform.js
+FFC_DEPS_OUTPUT=$JS_OUTPUT_FOLDER/deps.js
 EXTERNS_SOURCE=$FFC_SOURCE/externs
 
 
@@ -83,9 +85,12 @@ if [ $1 == "leaderboard" ] || [ $1 == "all" ]; then
     --output_mode=compiled \
     --compiler_jar=$CLOSURE_COMPILER_PATH \
     --compiler_flags="--compilation_level=ADVANCED_OPTIMIZATIONS" \
+    --compiler_flags="--create_source_map=$JS_OUTPUT_FOLDER/leaderboard.map" \
     --compiler_flags="--externs=$EXTERNS_SOURCE/channel.js" \
     --compiler_flags="--output_wrapper=\"(function() {%output%})();\"" \
     > $FFC_LEADERBOARD_JS_OUTPUT
+
+    echo "//# sourceMappingURL=/static/js/leaderboard.map" >> $FFC_LEADERBOARD_JS_OUTPUT
 fi
 
 if [ $1 == "settings" ] || [ $1 == "all" ]; then
diff --git a/scripts/restore_dev_data.py b/scripts/restore_dev_data.py
index 91cd5c4..44e7e77 100755
--- a/scripts/restore_dev_data.py
+++ b/scripts/restore_dev_data.py
@@ -13,28 +13,13 @@
 
 import os
 import sys
+sys.path.append('/usr/local/google_appengine')
+import dev_appserver
 
-APPENGINE_PATH = '/usr/local/google_appengine/'
-
-def fix_appengine_path():
-  EXTRA_PATHS = [
-    APPENGINE_PATH,
-    os.path.join(APPENGINE_PATH, 'lib', 'antlr3'),
-    os.path.join(APPENGINE_PATH, 'lib', 'django'),
-    os.path.join(APPENGINE_PATH, 'lib', 'fancy_urllib'),
-    os.path.join(APPENGINE_PATH, 'lib', 'ipaddr'),
-    os.path.join(APPENGINE_PATH, 'lib', 'webapp2'),
-    os.path.join(APPENGINE_PATH, 'lib', 'webob-1.1.1'),
-    os.path.join(APPENGINE_PATH, 'lib', 'yaml', 'lib'),
-    os.path.join(APPENGINE_PATH, 'lib', 'webapp2-2.5.2'),
-    os.path.join(APPENGINE_PATH, 'lib', 'jinja2-2.6'),
-  ]
-  sys.path.extend(EXTRA_PATHS)
-
-fix_appengine_path()
-
-# Add models to path.
-sys.path.insert(0, '/Users/adammcgrath/dev/projects/ffc/src/')
+dev_appserver.fix_sys_path()
+
+dir = os.path.dirname(__file__)
+sys.path.insert(0, os.path.join(dir, '../src'))
 
 from google.appengine.ext import ndb
 from google.appengine.ext.remote_api import remote_api_stub
diff --git a/src/app.yaml b/src/app.yaml
index 7a3dfe8..c81b575 100644
--- a/src/app.yaml
+++ b/src/app.yaml
@@ -19,6 +19,9 @@ handlers:
   static_files: static/img/favicon.ico
   upload: static/img/favicon\.ico
 
+- url: /static/js/src/
+  static_dir: .
+
 - url: /static
   static_dir: static
 
diff --git a/src/javascript/leaderboard/leaderboardmodel.js b/src/javascript/leaderboard/leaderboardmodel.js
index 22ec515..e1dfb0c 100644
--- a/src/javascript/leaderboard/leaderboardmodel.js
+++ b/src/javascript/leaderboard/leaderboardmodel.js
@@ -110,7 +110,7 @@ ffc.leaderboard.LeaderBoardModel.prototype.sort = function(sort, dir) {
 
 
 /**
- * @param {Object} result The service result.
+ * @param {Object} data The service result.
  */
 ffc.leaderboard.LeaderBoardModel.prototype.handleResult = function(data) {
   this.previousValue = data['prev'];