Cross origin #1

Closed
wants to merge 2 commits into
from

1 participant

@ruimalheiro

Added the headers to allow cross origin.

Tested locally with the central server.

Rui Malheiro and others added some commits Aug 2, 2013
Rui Malheiro temp 7cee0eb
Rui Malheiro Allow cross origin ee06126
@jamalex jamalex commented on the diff Aug 13, 2013
kalite/static/js/khan-lite.js
// if prefix is empty, gives an absolute (local) url. If prefix, then fully qualified url.
var request = $.ajax({
url: prefix + args.path,
dataType: args.hostname ? "jsonp" : "json",
jsonpCallback: "temp_callback", // TODO(jamalex): remove this line once the central server has this endpoint properly running
- data: {fields: (fields || []).join(",")}
+ data: {fields: (fields || []).join(",")},
@jamalex
Owner
jamalex added a line comment Aug 13, 2013

This will break IE -- can't have trailing commas.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jamalex jamalex commented on the diff Aug 13, 2013
kalite/templates/video.html
@@ -15,6 +15,9 @@
<script src="{% static "video-js/video-speed.js" %}"></script>
<script>
_V_.options.flash.swf = "{% static "video-js/video-js.swf" %}";
+ $(function() {
+ alert("lol");
@jamalex
Owner
jamalex added a line comment Aug 13, 2013

This probably isn't necessary anymore?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jamalex jamalex commented on the diff Aug 13, 2013
kalite/templates/video.html
@@ -64,7 +65,7 @@ <h2 class="title-header">
<script>
$(function() {
-
+ alert("lol");
@jamalex
Owner
jamalex added a line comment Aug 13, 2013

Or this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jamalex jamalex commented on the diff Aug 13, 2013
kalite/static/js/khan-lite.js
@@ -104,7 +104,6 @@ function get_server_status(options, fields, callback) {
var defaults = {
protocol: "http",
hostname: "",
- port: 8008,
@jamalex
Owner
jamalex added a line comment Aug 13, 2013

We still want to have this in there as a default.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@ruimalheiro

Wrong outdate PR. Closing.

@jamalex jamalex pushed a commit that referenced this pull request Jan 28, 2014
Ben Cipollini Test fixes #1 25d0209
@jamalex jamalex pushed a commit that referenced this pull request Apr 19, 2014
@bcipolli bcipolli Squashed 'python-packages/fle_utils/' changes from a2e0199..88a64da
88a64da add tests for platforms.py
0cbaf45 add mock to requirements
fd6f461 get tests working again
04f56ba ignore *.pyc files
10f3e7d Merge pull request #1 from learningequality/add_deployments
ada5ee8 Adding raw deployments app to fle-utils
04d4c25 -n Merge pull request #1681 from bcipolli/securesync-refactor
15c4538 -n fix import of chronograph.Job model
1ea82d1 -n Fixing bug in serializer reference.
21e89ef -n Fixing bug in serializer reference.
09e2e9c -n Refactoring VERSION and test code.
f60d38d -n Start removing dependencies of securesync on anything but annoying and fle_utils
a5cde48 -n Moving the chronograph app to fle_utils
6c3c3d5 -n Refactoring the config module to fle_utils, to remove KA Lite-specific dependencies from securesync
d50bb20 -n Removing calls to logging from fle_utils code
2910b44 -n Fixing remaining caching imports, separating tests
c9bfb7b -n Merge branch 'develop' of github.com:learningequality/ka-lite into distributed-refactor
9cf4e42 -n Merge branch 'develop' of github.com:learningequality/ka-lite into 1393
6670b5f -n separate distributed website (distributed) from topic data (main)
0cef916 -n Move utils to fle_utils

git-subtree-dir: python-packages/fle_utils
git-subtree-split: 88a64da6bd5a9c4826ac2d35c9131bd813d17216
e83b3ad
@jamalex jamalex pushed a commit that referenced this pull request Jul 20, 2014
@rtibbles rtibbles Fix for issue #1 - authenticated URL calls are now properly GET param…
…eterized.

Will now download data for the individual user. Needs testing.
edb0e98
@jamalex jamalex pushed a commit that referenced this pull request Mar 21, 2016
@sethachoi sethachoi PR issue #1 fixed... uh kinda 3987702
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment