caboose-cms 0.8.48 → 0.8.49
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 091f82cc86810f3dab7c831b57ea71393e58978d
|
|
4
|
+
data.tar.gz: 3e142f512d2060fb6093cf17affd4b3534957da1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5bd3a7fe332320c2e14984633f9d912d3ef8644a39563fa618bb028e0af3bf98b216791c83869b2c9a10dec49a4be6d6e7ac3ba3ada0c3e92ae3be824b14b9df
|
|
7
|
+
data.tar.gz: ed842f7437da1cab3409725e6e74202337cd7cef536609add106f249393801ccc0735e865313fc2f6eccbe150541309c0ca69afb18f99d7463c9b243c1105b6f
|
|
@@ -104,14 +104,15 @@ var MediaModalController = DefaultBlockModalController.extend({
|
|
|
104
104
|
{
|
|
105
105
|
var that = this;
|
|
106
106
|
|
|
107
|
-
var select = $('<select/>').attr('id', 'categories').change(function(e) {
|
|
108
|
-
|
|
109
|
-
});
|
|
110
|
-
that.print_categories_helper(that.top_category, select, '');
|
|
107
|
+
//var select = $('<select/>').attr('id', 'categories').change(function(e) {
|
|
108
|
+
// that.select_category($(this).val());
|
|
109
|
+
//});
|
|
110
|
+
//that.print_categories_helper(that.top_category, select, '');
|
|
111
111
|
|
|
112
112
|
var div = $('<div/>').attr('id', 'top_controls')
|
|
113
113
|
.append($('<p/>')
|
|
114
|
-
|
|
114
|
+
//.append(select).append(' | ')
|
|
115
|
+
.append($('<select/>').attr('id', 'categories')).append(' | ')
|
|
115
116
|
.append($('<a/>').attr('href', '#').html('New Category' ).click(function(e) { e.preventDefault(); that.add_category(); })).append(' | ')
|
|
116
117
|
.append($('<a/>').attr('href', '#').html('Upload to this Category' ).click(function(e) { e.preventDefault(); that.toggle_uploader(); })).append(' | ')
|
|
117
118
|
.append($('<a/>').attr('href', '#').html(that.file_view == 'thumbnail' ? 'List View' : 'Thumbnail View' ).click(function(e) { e.preventDefault(); that.toggle_file_view(); }))
|
|
@@ -119,7 +120,18 @@ var MediaModalController = DefaultBlockModalController.extend({
|
|
|
119
120
|
.append($('<div/>').attr('id', 'new_cat_message'))
|
|
120
121
|
.append($('<div/>').attr('id', 'uploader' ).append($('<div/>').attr('id', 'the_uploader')));
|
|
121
122
|
|
|
122
|
-
$('#top_controls').replaceWith(div);
|
|
123
|
+
$('#top_controls').replaceWith(div);
|
|
124
|
+
that.print_categories();
|
|
125
|
+
},
|
|
126
|
+
|
|
127
|
+
print_categories: function()
|
|
128
|
+
{
|
|
129
|
+
var that = this;
|
|
130
|
+
var select = $('<select/>').attr('id', 'categories').change(function(e) {
|
|
131
|
+
that.select_category($(this).val());
|
|
132
|
+
});
|
|
133
|
+
that.print_categories_helper(that.top_category, select, '');
|
|
134
|
+
$('#categories').replaceWith(select);
|
|
123
135
|
},
|
|
124
136
|
|
|
125
137
|
print_categories_helper: function(cat, select, prefix)
|
|
@@ -303,11 +315,11 @@ var MediaModalController = DefaultBlockModalController.extend({
|
|
|
303
315
|
success: function(resp) {},
|
|
304
316
|
async: false
|
|
305
317
|
});
|
|
306
|
-
that.refresh_media(function() { that.refresh_categories(function() { that.
|
|
318
|
+
that.refresh_media(function() { that.refresh_categories(function() { that.print_categories(); that.print_media(); }); });
|
|
307
319
|
},
|
|
308
320
|
FileUploaded: function(ip, file)
|
|
309
321
|
{
|
|
310
|
-
that.refresh_media(function() { that.refresh_categories(function() { that.
|
|
322
|
+
that.refresh_media(function() { that.refresh_categories(function() { that.print_media(); }); });
|
|
311
323
|
},
|
|
312
324
|
UploadComplete: function(up, files) {
|
|
313
325
|
that.refresh_media(function() { that.refresh_categories(function() { that.print(); }); });
|
data/lib/caboose/version.rb
CHANGED