Merge pull request learningequality#4344 from learningequality/0.15.x

0.15.x to develop
benjaoming · Sep 2, 2015 · 3e5df27 · 3e5df27
2 parents 398c391 + ade3d92
commit 3e5df27
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 109 deletions.
diff --git a/kalite/distributed/management/commands/initdconfig.py b/kalite/distributed/management/commands/initdconfig.py
diff --git a/kalite/distributed/static/js/distributed/topics/views.js b/kalite/distributed/static/js/distributed/topics/views.js
@@ -115,8 +115,6 @@ var ContentAreaView = BaseView.extend({
                 this.currently_shown_view.remove();
             }
         }
-
-        this.model.set("active", false);
     }
 
 });
@@ -635,6 +633,10 @@ var TopicContainerOuterView = BaseView.extend({
                 }
             }
         }
+        if (!pruned && (paths.length < check_views.length)) {
+            // Double check that paths and check_views are the same length
+            this.remove_topic_views(check_views.length - paths.length);
+        }
         if (callback) {
             this.stopListening(this, "inner_view_added");
 

diff --git a/kalite/updates/static/css/updates/update_videos.less b/kalite/updates/static/css/updates/update_videos.less
@@ -1,3 +1,8 @@
+@import "../../../../../node_modules/jquery.fancytree/dist/skin-common.less";
+
+@fancy-inline-sprites: true;
+@fancy-image-dir: "../../../../../node_modules/jquery.fancytree/dist/skin-vista";
+
 #content_tree .complete span.fancytree-icon {
     margin-top: 2px;
     background: url(/static/images/distributed/circle-complete.png) no-repeat;

diff --git a/kalite/updates/static/js/updates/bundle_modules/update_languages.js b/kalite/updates/static/js/updates/bundle_modules/update_languages.js
@@ -236,6 +236,8 @@ function start_languagepack_download(lang_code) {
     });
 }
 
+window.start_languagepack_download = start_languagepack_download;
+
 // when we make a selection on the language pack select box, enable the 'Get Language' Button
 function select_lang_pack( event ) {
     var lang_code = event.data.caller_value;
@@ -287,6 +289,8 @@ function set_server_language(lang) {
              });
 }
 
+window.set_server_language = set_server_language;
+
 function update_server_status() {
     connectivity.with_online_status("server", function(server_is_online) {
         // We assume the distributed server is offline; if it's online, then we enable buttons that only work with internet.

diff --git a/kalite/updates/static/js/updates/bundle_modules/update_videos.js b/kalite/updates/static/js/updates/bundle_modules/update_videos.js
@@ -6,7 +6,6 @@ var base = require("updates/base");
 var connectivity = require("utils/connectivity");
 var sprintf = require("sprintf-js").sprintf;
 
-require("jquery.fancytree/dist/skin-vista/ui.fancytree.less");
 require("../../../css/updates/update_videos.less");
 
 // Callback functions

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -2,6 +2,3 @@
 werkzeug # Not sure about version
 django-debug-toolbar # Version was not described in previously bundled files, used by kalite.testing app
 pyyaml==3.11
-hachoir-core==1.3.3
-hachoir-parser==1.3.4
-hachoir-metadata==1.3.3