summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-07-10 18:21:06 -0400
committerJules Laplace <jules@okfoc.us>2014-07-10 18:21:06 -0400
commitbce442242f167b70be1f7b24190f9e59d3c24e37 (patch)
tree0ba85403b2cff9e7e7a97536488b5d479ec3245e /public
parentb19511eb75c6490ddc97ea59d82615ce4d9e0e91 (diff)
media editor
Diffstat (limited to 'public')
-rw-r--r--public/assets/javascripts/ui/reader/ReaderView.js2
-rw-r--r--public/assets/javascripts/ui/site/ProfileView.js7
2 files changed, 4 insertions, 5 deletions
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index e86856c..add1ea1 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -32,7 +32,7 @@ var ReaderView = View.extend({
var base = this
$(window).on('message', function(event){
- if (event.origin !== window.location.origin) {
+ if (event.originalEvent.origin !== window.location.origin) {
return
}
var message = event.originalEvent.data
diff --git a/public/assets/javascripts/ui/site/ProfileView.js b/public/assets/javascripts/ui/site/ProfileView.js
index 41f04ef..8661bcd 100644
--- a/public/assets/javascripts/ui/site/ProfileView.js
+++ b/public/assets/javascripts/ui/site/ProfileView.js
@@ -1,20 +1,19 @@
var ProfileView = View.extend({
- initialize: function(){
+ initialize: function() {
},
- load: function(){
+ load: function() {
var classes = ['one', 'two', 'three', 'four',
'five', 'six', 'seven', 'eight',
'nine', 'ten', 'eleven', 'twelve',
'thirteen'];
$(".bio").addClass(choice(classes));
- $("td.border").each(function(){
+ $("td.border").each(function() {
var iframe = $(this).find("iframe").get('0')
if (! iframe) return
- console.log(iframe)
$(this).on({
mouseenter: function(e){
iframe.contentWindow.postMessage("spin-on", window.location.origin)