Compare commits

...

3 commits

Author SHA1 Message Date
j
f818f962bc return empty query 2018-08-09 10:23:53 +01:00
j
d07a60ba5f add site only javascript files 2018-08-08 10:22:19 +01:00
j
22cd1d358d add optional hook for local overwrites 2018-08-08 10:11:53 +01:00
3 changed files with 16 additions and 8 deletions

View file

@ -257,14 +257,21 @@ def update_static():
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 f in files:
if not f in (
'pandora.js', 'pandora.min.js'
) and f.endswith('.js') and len(f.split('.')) == 2:
f = os.path.join(root, f)
#ignore old embed js file
if 'js/embed/' in f:
continue
f = os.path.join(root, f)
#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'
) and f.endswith('.js') and (
len(f.split('.')) == 2 or
not os.path.exists(basefile) and fsite == f
):
if os.path.exists(fsite):
f = fsite
js.append(f[len(settings.STATIC_ROOT)+1:])

View file

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

View file

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