0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:f818f962bc6a26bdab43d9e35baa401545f3c209
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:17d3114102e59921b241a597e060c3174dbca396
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "f818f962bc6a26bdab43d9e35baa401545f3c209" and "17d3114102e59921b241a597e060c3174dbca396" have entirely different histories.
f818f962bc ... 17d3114102

3 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pandora/app/config.py
View file

@ -257,21 +257,14 @@ def update_static():
pandora_json = os.path.join(settings.STATIC_ROOT, 'json/pandora.json') pandora_json = os.path.join(settings.STATIC_ROOT, 'json/pandora.json')
for root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'js')): for root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'js')):
for f in files: for f in files:
f = os.path.join(root, f) if not f in (
#ignore old embed js file
if 'js/embed/' in f:
continue
if len(f.split('.')) == 2:
fsite = f.replace('.js', '.%s.js' % settings.CONFIG['site']['id'])
else:
fsite = f
basefile = f.split('.')[0] + '.js'
if f not in (
'pandora.js', 'pandora.min.js' 'pandora.js', 'pandora.min.js'
) and f.endswith('.js') and ( ) and f.endswith('.js') and len(f.split('.')) == 2:
len(f.split('.')) == 2 or f = os.path.join(root, f)
not os.path.exists(basefile) and fsite == f #ignore old embed js file
): if 'js/embed/' in f:
continue
fsite = f.replace('.js', '.%s.js' % settings.CONFIG['site']['id'])
if os.path.exists(fsite): if os.path.exists(fsite):
f = fsite f = fsite
js.append(f[len(settings.STATIC_ROOT)+1:]) js.append(f[len(settings.STATIC_ROOT)+1:])

2
pandora/edit/models.py
View file

@ -251,7 +251,7 @@ class Edit(models.Model):
items = [i['id'] for i in self.get_items(user).values('id')] items = [i['id'] for i in self.get_items(user).values('id')]
clips = clips.filter(item__in=items) clips = clips.filter(item__in=items)
else: else:
clips = clip.models.Clip.objects.filter(id=None) clips = None
return clips return clips
def get_clips_json(self, user=None): def get_clips_json(self, user=None):

1
static/js/pandora.js
View file

@ -475,7 +475,6 @@ appPanel
// allow site scripts to run after pandora is loaded // allow site scripts to run after pandora is loaded
pandora.triggerEvent('loaded'); pandora.triggerEvent('loaded');
!pandora.isLicensed() && pandora.openLicenseDialog(); !pandora.isLicensed() && pandora.openLicenseDialog();
pandora.localInitInit && pandora.localInitInit();
loadUserScript && pandora.loadUserScript(); loadUserScript && pandora.loadUserScript();
document.removeEventListener && document.removeEventListener( document.removeEventListener && document.removeEventListener(
'keydown', onKeydown 'keydown', onKeydown