From 5474497049f4f24ef0049e1b73dd6e0c9393ff0a Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Thu, 23 Feb 2012 12:05:54 -0800 Subject: [PATCH 1/5] update from shipyard, fixes Models to use computed properties --- .../jetpack/js/ide/controllers/TabsController.js | 16 +++++++++------- media/jetpack/js/ide/models/Attachment.js | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/media/jetpack/js/ide/controllers/TabsController.js b/media/jetpack/js/ide/controllers/TabsController.js index 304206ee..bc9c22e6 100644 --- a/media/jetpack/js/ide/controllers/TabsController.js +++ b/media/jetpack/js/ide/controllers/TabsController.js @@ -8,10 +8,12 @@ var Class = require('shipyard/class/Class'), log = require('shipyard/utils/log'), dom = require('shipyard/dom'), - tabs = require('../views/Tabs'), + tabs = require('../views/Tabs'); - //TODO: this is terrible practice - fd = dom.window.get('fd'); +//TODO: this is terrible practice +function fd() { + return dom.window.get('fd'); +} module.exports = new Class({ @@ -42,7 +44,7 @@ module.exports = new Class({ if (file.changed) { - fd.showQuestion({ + fd().showQuestion({ title: 'Lose unsaved changes?', message: 'The tab "'+file.get('shortName')+'" that you are trying to close has unsaved changes.', buttons: [ @@ -64,9 +66,9 @@ module.exports = new Class({ setTimeout(function() { file.set('content', file.original_content); file.setChanged(false); - fd.item.edited--; - if(!fd.item.edited) { - fd.item.emit('reset'); + fd().item.edited--; + if(!fd().item.edited) { + fd().item.emit('reset'); } }, 1); } diff --git a/media/jetpack/js/ide/models/Attachment.js b/media/jetpack/js/ide/models/Attachment.js index f7bcb778..1dc0c516 100644 --- a/media/jetpack/js/ide/models/Attachment.js +++ b/media/jetpack/js/ide/models/Attachment.js @@ -24,10 +24,10 @@ module.exports = new Class({ uid: property(function uid(pk) { if (arguments.length === 0) { // getter - return this.get('pk'); + return this.get('id'); } else { // setter - return this.set('pk', pk); + return this.set('id', pk); } }, 'id') From 6ca2d35e78c395af922847c37952810879429350 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Thu, 23 Feb 2012 12:10:21 -0800 Subject: [PATCH 2/5] the actual shipyard update --- media/lib/shipyard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/lib/shipyard b/media/lib/shipyard index dc404629..24f9cade 160000 --- a/media/lib/shipyard +++ b/media/lib/shipyard @@ -1 +1 @@ -Subproject commit dc40462921e6baa649ff6b347c7001cf616771e8 +Subproject commit 24f9cade6346e0a1d28f00da2f2a2e96710a9151 From c86cf17b97dc0f1c617e9678d7e1cbe555a0f28f Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Thu, 23 Feb 2012 12:16:52 -0800 Subject: [PATCH 3/5] updating shipyard again --- media/lib/shipyard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/lib/shipyard b/media/lib/shipyard index 24f9cade..aeeea454 160000 --- a/media/lib/shipyard +++ b/media/lib/shipyard @@ -1 +1 @@ -Subproject commit 24f9cade6346e0a1d28f00da2f2a2e96710a9151 +Subproject commit aeeea4547b278ad67ac04fc5cb623533a5c3fa11 From 2173e5e323c7eb124b5e344ef03fefe454bb412f Mon Sep 17 00:00:00 2001 From: Wil Clouser Date: Thu, 23 Feb 2012 15:05:31 -0800 Subject: [PATCH 4/5] update webapp URLs for marketplace --- apps/base/views.py | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/apps/base/views.py b/apps/base/views.py index 91656684..c50e922e 100644 --- a/apps/base/views.py +++ b/apps/base/views.py @@ -37,12 +37,9 @@ def app_manifest(request): 'url': 'https://builder.addons.mozilla.org/', }, 'installs_allowed_from': [ - 'https://apps-preview-dev.allizom.org', - 'https://apps-preview.allizom.org', - 'https://apps-preview.mozilla.org', - 'https://addons-dev.allizom.org', - 'https://addons.allizom.org', - 'https://addons.mozilla.org', + 'https://marketplace-dev.allizom.org', + 'https://marketplace.allizom.org', + 'https://marketplace.mozilla.org', ], 'default_locale': 'en', } @@ -56,7 +53,7 @@ def graphite(request, site): # have to hack together our own. This is temporary until we can replace it # with jinja code. - v = {} + v = {} v['ns'] = {"trunk": "builder.preview", "stage": "builder.next", "prod": "builder"}[site] # Validated by url regex @@ -87,11 +84,11 @@ def admin(request): if action == 'setup_mapping': msg = 'setup_mapping triggered' log.info(log_msg % (msg, request.user, request.user.pk)) - threading.Thread(target=setup_mapping).start() + threading.Thread(target=setup_mapping).start() elif action == 'index_all': msg = 'index_all triggered' log.info(log_msg % (msg , request.user, request.user.pk)) - threading.Thread(target=index_all).start() + threading.Thread(target=index_all).start() elif action == 'update_package_activity': msg = 'update_package_activity triggered' log.info(log_msg % (msg , request.user, request.user.pk)) @@ -205,25 +202,25 @@ def monitor(request): return HttpResponse(template.render(context), status=status) -def get_package(request): - package = get_object_or_404(Package, id_number=request.GET['package_id']) +def get_package(request): + package = get_object_or_404(Package, id_number=request.GET['package_id']) return render_to_response('admin/_package_result.html', { 'package': package }, context_instance=RequestContext(request)) @user_passes_test(lambda u: u.is_superuser) def update_package(request): - package = get_object_or_404(Package, pk=request.POST['package_id']) - if 'featured' in request.POST: + package = get_object_or_404(Package, pk=request.POST['package_id']) + if 'featured' in request.POST: package.featured = request.POST.get('featured') == 'true' - - if 'example' in request.POST: + + if 'example' in request.POST: package.example = request.POST.get('example') == 'true' - - package.save() + + package.save() return HttpResponse({'status':'ok'}, content_type='text/javascript') - - + + def homepage(r): # one more for the main one pkgs_limit = settings.HOMEPAGE_PACKAGES_NUMBER From fe55d4d65c1e2387a8e557cf22c64bd860228576 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Thu, 23 Feb 2012 15:08:12 -0800 Subject: [PATCH 5/5] fix error when viewing Add-on Kit or API-Utils --- media/jetpack/js/ide/controllers/PackageController.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/media/jetpack/js/ide/controllers/PackageController.js b/media/jetpack/js/ide/controllers/PackageController.js index 9ed05d41..50c1d85f 100644 --- a/media/jetpack/js/ide/controllers/PackageController.js +++ b/media/jetpack/js/ide/controllers/PackageController.js @@ -294,7 +294,8 @@ module.exports = new Class({ instantiate_modules: function() { // iterate by modules and instantiate Module - var mainLoaded; + var mainLoaded = false, + firstModule; this.options.modules.forEach(function(module) { module.readonly = this.options.readonly; var mod = this.newModule(module); @@ -302,10 +303,13 @@ module.exports = new Class({ mainLoaded = true; this.editFile(mod); } + if (!firstModule) { + firstModule = mod; + } }, this); - if (!mainLoaded && this.options.modules[0]) { - this.editFile(this.options.modules[0]); + if (!mainLoaded && firstModule) { + this.editFile(firstModule); } },