Compare commits
No commits in common. "0b8ea2d517e694dd7fce9aa8ca973daac37bc7a9" and "0076aae8968c937017cabceb7d748f13c13681a5" have entirely different histories.
0b8ea2d517
...
0076aae896
4 changed files with 10 additions and 14 deletions
|
|
@ -117,6 +117,14 @@ pandora.ui.addFilesDialog = function(options) {
|
||||||
)
|
)
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
selectItems.push({
|
||||||
|
id: 'one',
|
||||||
|
title: Ox._(
|
||||||
|
'Create one {0} with multiple parts',
|
||||||
|
[pandora.site.itemName.singular.toLowerCase()]
|
||||||
|
)
|
||||||
|
});
|
||||||
|
}
|
||||||
if (options.items.length > 1) {
|
if (options.items.length > 1) {
|
||||||
selectItems.push({
|
selectItems.push({
|
||||||
id: 'multiple',
|
id: 'multiple',
|
||||||
|
|
@ -126,14 +134,6 @@ pandora.ui.addFilesDialog = function(options) {
|
||||||
)
|
)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
selectItems.push({
|
|
||||||
id: 'one',
|
|
||||||
title: Ox._(
|
|
||||||
'Create one {0} with multiple parts',
|
|
||||||
[pandora.site.itemName.singular.toLowerCase()]
|
|
||||||
)
|
|
||||||
});
|
|
||||||
}
|
|
||||||
var $select = Ox.Select({
|
var $select = Ox.Select({
|
||||||
items: selectItems,
|
items: selectItems,
|
||||||
width: 256
|
width: 256
|
||||||
|
|
|
||||||
|
|
@ -47,9 +47,6 @@ pandora.ui.preferencesDialog = function() {
|
||||||
validate: pandora.validateNewPassword,
|
validate: pandora.validateNewPassword,
|
||||||
width: 320
|
width: 320
|
||||||
})
|
})
|
||||||
.attr({
|
|
||||||
autocomplete: 'new-password'
|
|
||||||
})
|
|
||||||
.bindEvent({
|
.bindEvent({
|
||||||
validate: function(data) {
|
validate: function(data) {
|
||||||
data.valid && pandora.api.editPreferences({password: data.value});
|
data.valid && pandora.api.editPreferences({password: data.value});
|
||||||
|
|
|
||||||
|
|
@ -406,7 +406,7 @@ pandora.createLinks = function($element) {
|
||||||
|
|
||||||
pandora.uploadDroppedFiles = function(files) {
|
pandora.uploadDroppedFiles = function(files) {
|
||||||
var documentExtensions = ['pdf', /* 'epub', 'txt', */ 'png', 'gif', 'jpg'];
|
var documentExtensions = ['pdf', /* 'epub', 'txt', */ 'png', 'gif', 'jpg'];
|
||||||
files = Ox.map(files, function(file) { return file });
|
files = Ox.map(files, function(file) { return file});
|
||||||
|
|
||||||
if (files.every(function(file) {
|
if (files.every(function(file) {
|
||||||
var extension = file.name.split('.').pop().toLowerCase()
|
var extension = file.name.split('.').pop().toLowerCase()
|
||||||
|
|
|
||||||
|
|
@ -332,7 +332,6 @@ if __name__ == "__main__":
|
||||||
'-- Model missing for table: djcelery_intervalschedule\n',
|
'-- Model missing for table: djcelery_intervalschedule\n',
|
||||||
'-- Model missing for table: djcelery_workerstate\n',
|
'-- Model missing for table: djcelery_workerstate\n',
|
||||||
'-- Model missing for table: djcelery_taskstate\n',
|
'-- Model missing for table: djcelery_taskstate\n',
|
||||||
'-- Model missing for table: south_migrationhistory\n',
|
|
||||||
'-- Model missing for table: cache\n',
|
'-- Model missing for table: cache\n',
|
||||||
]:
|
]:
|
||||||
if row in diff:
|
if row in diff:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue