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.

Sign up for GitHub

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

Update central-develop from 0.14.x (plus some more incoming fixes) #4252

Merged
merged 2 commits into from
Aug 18, 2015
Merged

Update central-develop from 0.14.x (plus some more incoming fixes) #4252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a12e39a
Add placeholder mac installer link.
aronasorman Aug 17, 2015
41923fc
Safer BaseView.remove: remove el before reflow, no infinite recursion.
jamalex Aug 18, 2015
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
5 changes: 2 additions & 3 deletions docs/installguide/install_all.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ Windows Installation
Mac Installation
================

1. Download the KA Lite `OSX installer <https://disney.com>`_.

.. warning:: Dear maintainers, please update this link.
1. Download the KA Lite `OSX installer <https://learningequality.org/downloads/ka-lite/0.14/installers/mac/KA-Lite-Monitor.dmg>`_.
2. After the download is complete, double click the .dmg file and follow the window for installation.

Linux: Debian/Ubuntu Installation
=================================
Expand Down
10 changes: 9 additions & 1 deletion python-packages/fle_utils/backbone/static/js/backbone/backbone-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,15 @@ window.BaseView = Backbone.View.extend({
},

remove: function() {

// make sure we never end up removing the same view twice, in case there's weird circularity
if (this._removed) return;
this._removed = true;

// remove this view using the default Backbone code, which removes the DOM element
Backbone.View.prototype.remove.call(this);

// recursively remove this view's subviews, to avoid detached views with zombie listeners
if (this.subviews!==undefined) {
for (i=0; i < this.subviews.length; i++) {
if (_.isFunction(this.subviews[i].close)) {
Expand All @@ -133,6 +142,5 @@ window.BaseView = Backbone.View.extend({
}
}
}
Backbone.View.prototype.remove.call(this);
}
});