From 6946ce333dd299f1999501d7a0833cb066d7ad1e Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sat, 26 May 2012 15:46:24 +0000
Subject: [PATCH] trailing comma removal,
---
static/js/pandora.js | 4 +---
static/js/pandora/autovalidate.js | 2 +-
static/js/pandora/contactForm.js | 2 +-
static/js/pandora/editor.js | 2 +-
static/js/pandora/filesView.js | 2 +-
static/js/pandora/filter.js | 2 +-
static/js/pandora/findElement.js | 4 ++--
static/js/pandora/folderBrowserBar.js | 2 +-
static/js/pandora/folderBrowserList.js | 4 ++--
static/js/pandora/folderList.js | 2 +-
static/js/pandora/folders.js | 2 +-
static/js/pandora/home.0xdb.js | 2 +-
static/js/pandora/homePage.js | 2 +-
static/js/pandora/importAnnotations.js | 6 +++---
static/js/pandora/info.js | 2 +-
static/js/pandora/infoView.0xdb.js | 6 +++---
static/js/pandora/itemClips.js | 4 ++--
static/js/pandora/list.js | 2 +-
static/js/pandora/listDialog.js | 2 +-
static/js/pandora/logsDialog.js | 4 ++--
static/js/pandora/mediaView.js | 4 ++--
static/js/pandora/menu.js | 4 ++--
static/js/pandora/namesDialog.js | 4 ++--
static/js/pandora/navigationView.js | 4 ++--
static/js/pandora/news.js | 2 +-
static/js/pandora/siteDialog.js | 2 +-
static/js/pandora/titlesDialog.js | 6 +++---
static/js/pandora/tv.js | 2 +-
static/js/pandora/uploadDialog.js | 2 +-
static/js/pandora/usersDialog.js | 2 +-
30 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/static/js/pandora.js b/static/js/pandora.js
index 94db4ceec..e603a1dd4 100644
--- a/static/js/pandora.js
+++ b/static/js/pandora.js
@@ -20,10 +20,9 @@ appPanel
*/
(function() {
-
window.onerror = function(error, url, line) {
try {
- pandora.api.log({
+ !isMSIE && pandora.api.log({
text: error,
url: url,
line: line
@@ -210,7 +209,6 @@ appPanel
function initPandora(data) {
Ox.Log('', 'Ox.App load', data);
-
Ox.extend(pandora, {
$ui: {
body: $('body'),
diff --git a/static/js/pandora/autovalidate.js b/static/js/pandora/autovalidate.js
index 8ea1668b2..d8bcb9bac 100644
--- a/static/js/pandora/autovalidate.js
+++ b/static/js/pandora/autovalidate.js
@@ -62,7 +62,7 @@ pandora.validateNewEmail = function(value, callback) {
}) : callback({
message: value.length ? 'Invalid e-mail address' : '',
// message: (!value.length ? 'Missing' : 'Invalid') + ' e-mail address',
- valid: false,
+ valid: false
});
};
diff --git a/static/js/pandora/contactForm.js b/static/js/pandora/contactForm.js
index 595cdfded..521a05dbc 100644
--- a/static/js/pandora/contactForm.js
+++ b/static/js/pandora/contactForm.js
@@ -61,7 +61,7 @@ pandora.ui.contactForm = function() {
value: '',
width: width
})
- ],
+ ]
})
.css({width: width + 'px'})
.bindEvent({
diff --git a/static/js/pandora/editor.js b/static/js/pandora/editor.js
index 8796bae56..4c146a5ed 100644
--- a/static/js/pandora/editor.js
+++ b/static/js/pandora/editor.js
@@ -84,7 +84,7 @@ pandora.ui.editor = function(data) {
modified: created,
out: data.out,
user: pandora.user.username,
- value: '',
+ value: ''
},
type == 'place' ? {
place: {lat: null, lng: null}
diff --git a/static/js/pandora/filesView.js b/static/js/pandora/filesView.js
index 10d1af9cd..2015c194b 100644
--- a/static/js/pandora/filesView.js
+++ b/static/js/pandora/filesView.js
@@ -233,7 +233,7 @@ pandora.ui.filesView = function(options, self) {
self.numberOfItems = data.items;
},
open: openFiles,
- select: selectFiles,
+ select: selectFiles
});
self.$instancesList = Ox.TextList({
diff --git a/static/js/pandora/filter.js b/static/js/pandora/filter.js
index f1e1facc7..47589153c 100644
--- a/static/js/pandora/filter.js
+++ b/static/js/pandora/filter.js
@@ -238,7 +238,7 @@ pandora.ui.filtersInnerPanel = function() {
size: pandora.user.ui.filterSizes[1]
},
{
- element: pandora.$ui.filters[2],
+ element: pandora.$ui.filters[2]
},
{
element: pandora.$ui.filters[3],
diff --git a/static/js/pandora/findElement.js b/static/js/pandora/findElement.js
index 8dee9c27d..717654adf 100644
--- a/static/js/pandora/findElement.js
+++ b/static/js/pandora/findElement.js
@@ -34,12 +34,12 @@ pandora.ui.findElement = function() {
}).map(function(key) {
return {
id: key.id,
- title: 'Find: ' + key.title,
+ title: 'Find: ' + key.title
};
}),
[{}, {
id: 'advanced',
- title: 'Find: Advanced',
+ title: 'Find: Advanced'
}]
),
overlap: 'right',
diff --git a/static/js/pandora/folderBrowserBar.js b/static/js/pandora/folderBrowserBar.js
index 74053c9d8..7a8c851f4 100644
--- a/static/js/pandora/folderBrowserBar.js
+++ b/static/js/pandora/folderBrowserBar.js
@@ -37,7 +37,7 @@ pandora.ui.folderBrowserBar = function(id) {
updateList(key, value);
}
})
- ],
+ ]
})
.css({
float: 'right',
diff --git a/static/js/pandora/folderBrowserList.js b/static/js/pandora/folderBrowserList.js
index 9e9c4af0a..4f9a655e0 100644
--- a/static/js/pandora/folderBrowserList.js
+++ b/static/js/pandora/folderBrowserList.js
@@ -156,7 +156,7 @@ pandora.ui.folderBrowserList = function(id) {
} else if (data.key == 'subscribed') {
var subscribed = that.value(data.id, 'subscribed');
pandora.api[subscribed ? 'unsubscribeFromList' : 'subscribeToList']({
- id: data.id,
+ id: data.id
}, function(result) {
that.value(data.id, 'subscribed', !subscribed);
});
@@ -208,4 +208,4 @@ pandora.ui.folderBrowserList = function(id) {
}
});
return that;
-};
\ No newline at end of file
+};
diff --git a/static/js/pandora/folderList.js b/static/js/pandora/folderList.js
index cbc52707e..7da735c93 100644
--- a/static/js/pandora/folderList.js
+++ b/static/js/pandora/folderList.js
@@ -254,7 +254,7 @@ pandora.ui.folderList = function(id) {
.css({
left: 0,
top: 0,
- width: pandora.user.ui.sidebarWidth + 'px',
+ width: pandora.user.ui.sidebarWidth + 'px'
})
.bindEvent({
add: function(event) {
diff --git a/static/js/pandora/folders.js b/static/js/pandora/folders.js
index 33104d920..6454c4c8f 100644
--- a/static/js/pandora/folders.js
+++ b/static/js/pandora/folders.js
@@ -6,7 +6,7 @@ pandora.ui.folders = function() {
that = Ox.Element()
.css({overflowX: 'hidden', overflowY: 'auto'})
.bindEvent({
- resize: pandora.resizeFolders,
+ resize: pandora.resizeFolders
});
//var $sections = [];
diff --git a/static/js/pandora/home.0xdb.js b/static/js/pandora/home.0xdb.js
index 7f5506cb6..1ff583228 100644
--- a/static/js/pandora/home.0xdb.js
+++ b/static/js/pandora/home.0xdb.js
@@ -39,7 +39,7 @@ pandora.ui.home = function() {
bottom: 0,
width: '320px',
height: '160px',
- margin: 'auto',
+ margin: 'auto'
})
.appendTo(that),
$logo = $('![]()
')
diff --git a/static/js/pandora/homePage.js b/static/js/pandora/homePage.js
index 92ffa753e..810873ffe 100644
--- a/static/js/pandora/homePage.js
+++ b/static/js/pandora/homePage.js
@@ -56,7 +56,7 @@ pandora.ui.homePage = function() {
}
});
$findElement = Ox.FormElementGroup({
- elements: [$select, $input],
+ elements: [$select, $input]
})
.css({marginTop: '16px'})
.appendTo($center);
diff --git a/static/js/pandora/importAnnotations.js b/static/js/pandora/importAnnotations.js
index 888bccc8e..a15639019 100644
--- a/static/js/pandora/importAnnotations.js
+++ b/static/js/pandora/importAnnotations.js
@@ -28,7 +28,7 @@ pandora.ui.importAnnotations = function(data) {
importButton = Ox.Button({
disabled: true,
id: 'import',
- title: 'Import',
+ title: 'Import'
}).bindEvent({
click: function() {
importButton.hide();
@@ -46,7 +46,7 @@ pandora.ui.importAnnotations = function(data) {
height: height,
removeOnClose: true,
width: width,
- title: 'Import Annotations',
+ title: 'Import Annotations'
})
.bindEvent({
close: function(data) {
@@ -95,7 +95,7 @@ pandora.ui.importAnnotations = function(data) {
selectLayer = Ox.Select({
items: layers,
value: layer,
- label: 'Layer',
+ label: 'Layer'
})
.bindEvent({
change: function(data) {
diff --git a/static/js/pandora/info.js b/static/js/pandora/info.js
index 2e4df7fba..13fec6b1b 100644
--- a/static/js/pandora/info.js
+++ b/static/js/pandora/info.js
@@ -279,7 +279,7 @@ pandora.ui.listInfo = function() {
return {
width: size + 'px',
height: size + 'px',
- borderRadius: Math.round(size / 4) + 'px',
+ borderRadius: Math.round(size / 4) + 'px'
};
}
that.resizeInfo = function() {
diff --git a/static/js/pandora/infoView.0xdb.js b/static/js/pandora/infoView.0xdb.js
index 427abb0e6..9b5a0cddb 100644
--- a/static/js/pandora/infoView.0xdb.js
+++ b/static/js/pandora/infoView.0xdb.js
@@ -35,7 +35,7 @@ pandora.ui.infoView = function(data) {
position: 'absolute',
left: canEdit && !ui.showIconBrowser ? -listWidth + 'px' : 0,
top: 0,
- right: 0,
+ right: 0
})
.appendTo(that.$element),
@@ -121,7 +121,7 @@ pandora.ui.infoView = function(data) {
position: 'absolute',
left: margin + (iconSize == 256 ? 256 : iconWidth) + margin + 'px',
top: margin + 'px',
- right: margin + statisticsWidth + margin + 'px',
+ right: margin + statisticsWidth + margin + 'px'
})
.bindEvent(canEdit && !isEditable ? {
doubleclick: reloadMetadata
@@ -849,7 +849,7 @@ pandora.ui.infoView = function(data) {
height: iconSize / 2 + 'px'
}, 250);
$text.animate({
- left: margin + (iconSize == 256 ? 256 : iconWidth) + margin + 'px',
+ left: margin + (iconSize == 256 ? 256 : iconWidth) + margin + 'px'
}, 250);
pandora.UI.set({infoIconSize: iconSize});
}
diff --git a/static/js/pandora/itemClips.js b/static/js/pandora/itemClips.js
index 788f55de8..16d110a1d 100644
--- a/static/js/pandora/itemClips.js
+++ b/static/js/pandora/itemClips.js
@@ -45,7 +45,7 @@ pandora.ui.itemClips = function(options) {
title: annotations.map(function(annotation) {
return Ox.stripTags(annotation.value.replace(/\n/g, ' '));
}).join('; '),
- url: url,
+ url: url
})
.addClass('OxInfoIcon')
.css({
@@ -55,7 +55,7 @@ pandora.ui.itemClips = function(options) {
: '2px'
})
.data(Ox.extend(annotations.length ? {
- annotation: annotations[0].id.split('/')[1],
+ annotation: annotations[0].id.split('/')[1]
} : {}, {'in': clip['in'], out: clip.out}));
$item.find('.OxTarget').addClass('OxSpecialTarget');
that.append($item);
diff --git a/static/js/pandora/list.js b/static/js/pandora/list.js
index 2b4234f98..e896db22e 100644
--- a/static/js/pandora/list.js
+++ b/static/js/pandora/list.js
@@ -486,7 +486,7 @@ pandora.ui.list = function() {
} else {
pandora.$ui.previewDialog.options({
content: pandora.$ui.previewImage,
- title: title,
+ title: title
})
.setSize(width, height);
}
diff --git a/static/js/pandora/listDialog.js b/static/js/pandora/listDialog.js
index 7c2fb099d..5ac21295e 100644
--- a/static/js/pandora/listDialog.js
+++ b/static/js/pandora/listDialog.js
@@ -75,7 +75,7 @@ pandora.ui.listDialog = function(section) {
);
}
})
- ],
+ ]
})
.css({
float: 'right',
diff --git a/static/js/pandora/logsDialog.js b/static/js/pandora/logsDialog.js
index 5a37a733a..a59cd60df 100644
--- a/static/js/pandora/logsDialog.js
+++ b/static/js/pandora/logsDialog.js
@@ -57,7 +57,7 @@ pandora.ui.logsDialog = function() {
id: 'id',
title: 'ID',
unique: true,
- visible: false,
+ visible: false
},
{
format: function(value) {
@@ -207,7 +207,7 @@ pandora.ui.logsDialog = function() {
bottom: '4px',
paddingTop: '2px',
fontSize: '9px',
- textAlign: 'center',
+ textAlign: 'center'
})
.appendTo(that.find('.OxButtonsbar'));
diff --git a/static/js/pandora/mediaView.js b/static/js/pandora/mediaView.js
index ff875c33b..258f9e2df 100644
--- a/static/js/pandora/mediaView.js
+++ b/static/js/pandora/mediaView.js
@@ -116,7 +116,7 @@ pandora.ui.mediaView = function() {
left: imageLeft + 'px',
top: imageTop + 'px',
width: imageWidth + 'px',
- height: imageHeight + 'px',
+ height: imageHeight + 'px'
})
);
if (view == 'frames') {
@@ -157,4 +157,4 @@ pandora.ui.mediaView = function() {
return that;
-}
\ No newline at end of file
+}
diff --git a/static/js/pandora/menu.js b/static/js/pandora/menu.js
index e9fa96462..6b92aed98 100644
--- a/static/js/pandora/menu.js
+++ b/static/js/pandora/menu.js
@@ -55,7 +55,7 @@ pandora.ui.mainMenu = function() {
{ id: 'items', title: 'View ' + pandora.site.itemName.plural, items: [
{ group: 'listview', min: 1, max: 1, items: pandora.site.listViews.map(function(view) {
return Ox.extend({
- checked: ui.listView == view.id,
+ checked: ui.listView == view.id
}, view);
}) },
]},
@@ -83,7 +83,7 @@ pandora.ui.mainMenu = function() {
{ id: 'item', title: ['Open ' + pandora.site.itemName.singular, 'Open ' + pandora.site.itemName.plural], items: [
{ group: 'itemview', min: 1, max: 1, items: pandora.site.itemViews.map(function(view) {
return Ox.extend({
- checked: ui.itemView == view.id,
+ checked: ui.itemView == view.id
}, view);
}) },
] },
diff --git a/static/js/pandora/namesDialog.js b/static/js/pandora/namesDialog.js
index 59b991030..a6066fed2 100644
--- a/static/js/pandora/namesDialog.js
+++ b/static/js/pandora/namesDialog.js
@@ -103,7 +103,7 @@ pandora.ui.namesDialog = function() {
$findButton = Ox.Button({
disabled: true,
title: 'Find',
- width: 48,
+ width: 48
}).bindEvent({
click: function() {
that.close();
@@ -176,7 +176,7 @@ pandora.ui.namesDialog = function() {
bottom: '4px',
paddingTop: '2px',
fontSize: '9px',
- textAlign: 'center',
+ textAlign: 'center'
})
.appendTo(that.find('.OxButtonsbar'));
diff --git a/static/js/pandora/navigationView.js b/static/js/pandora/navigationView.js
index e1d5f6851..6171c6159 100644
--- a/static/js/pandora/navigationView.js
+++ b/static/js/pandora/navigationView.js
@@ -89,7 +89,7 @@ pandora.ui.navigationView = function(type, videoRatio) {
that = Ox.SplitPanel({
elements: [
{
- element: $element,
+ element: $element
},
{
element: $listPanel,
@@ -214,7 +214,7 @@ pandora.ui.navigationView = function(type, videoRatio) {
query: {
conditions: [{key: itemName, value: id, operator:'=='}],
operator: '&'
- },
+ }
}, data), callback);
}
});
diff --git a/static/js/pandora/news.js b/static/js/pandora/news.js
index 74d54433c..99ae71837 100644
--- a/static/js/pandora/news.js
+++ b/static/js/pandora/news.js
@@ -115,7 +115,7 @@ pandora.ui.news = function(width, height) {
tooltip: isEditable ? 'Doubleclick to edit' : '',
type: 'textarea',
value: items[index].text,
- width: width - 512,
+ width: width - 512
})
.css({
MozUserSelect: 'text',
diff --git a/static/js/pandora/siteDialog.js b/static/js/pandora/siteDialog.js
index cbf02c7e6..0caa10567 100644
--- a/static/js/pandora/siteDialog.js
+++ b/static/js/pandora/siteDialog.js
@@ -76,7 +76,7 @@ pandora.ui.siteDialog = function(section) {
Ox.Theme.formatColor(330 + 30 * i, 'gradient')
.css({
padding: '4px',
- marginTop: '8px',
+ marginTop: '8px'
})
.html(
'' + name + '
'
diff --git a/static/js/pandora/titlesDialog.js b/static/js/pandora/titlesDialog.js
index 8b1a26fc9..b09ee51f0 100644
--- a/static/js/pandora/titlesDialog.js
+++ b/static/js/pandora/titlesDialog.js
@@ -38,7 +38,7 @@ pandora.ui.titlesDialog = function() {
id: 'id',
title: 'ID',
unique: true,
- visible: false,
+ visible: false
},
{
id: 'title',
@@ -92,7 +92,7 @@ pandora.ui.titlesDialog = function() {
$findButton = Ox.Button({
disabled: true,
title: 'Find',
- width: 48,
+ width: 48
}).bindEvent({
click: function() {
that.close();
@@ -165,7 +165,7 @@ pandora.ui.titlesDialog = function() {
bottom: '4px',
paddingTop: '2px',
fontSize: '9px',
- textAlign: 'center',
+ textAlign: 'center'
})
.appendTo(that.find('.OxButtonsbar'));
diff --git a/static/js/pandora/tv.js b/static/js/pandora/tv.js
index 7ae390db6..d48ea3980 100644
--- a/static/js/pandora/tv.js
+++ b/static/js/pandora/tv.js
@@ -63,7 +63,7 @@ pandora.ui.tv = function() {
controlsTooltips: {
open: 'Open in ' + Ox.getObjectById(
pandora.site.itemViews, pandora.user.ui.videoView
- ).title + ' View',
+ ).title + ' View'
},
controlsTop: ['close', 'title', 'open'],
duration: result.data.duration,
diff --git a/static/js/pandora/uploadDialog.js b/static/js/pandora/uploadDialog.js
index d4cbdffe9..8af31b80c 100644
--- a/static/js/pandora/uploadDialog.js
+++ b/static/js/pandora/uploadDialog.js
@@ -47,7 +47,7 @@ pandora.ui.uploadDialog = function(data) {
height: 128,
removeOnClose: true,
width: 368,
- title: 'Upload Video',
+ title: 'Upload Video'
})
.bindEvent({
close: function(data) {
diff --git a/static/js/pandora/usersDialog.js b/static/js/pandora/usersDialog.js
index 36acd8c7f..d1be264f2 100644
--- a/static/js/pandora/usersDialog.js
+++ b/static/js/pandora/usersDialog.js
@@ -99,7 +99,7 @@ pandora.ui.usersDialog = function() {
id: 'id',
title: 'ID',
unique: true,
- visible: false,
+ visible: false
},
{
format: function(value, data) {