From 2fb5d0a63204a229b4a7411115aa4be6b5e5c865 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Tue, 29 Mar 2011 12:39:26 -0700 Subject: [PATCH 01/10] fixes Bug 640365 - Any doc sidebar API link that is clicked is always shown as an open folder --- media/api/js/API.Tree.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/media/api/js/API.Tree.js b/media/api/js/API.Tree.js index 4e79db58..ced85d16 100644 --- a/media/api/js/API.Tree.js +++ b/media/api/js/API.Tree.js @@ -31,7 +31,8 @@ FlightDeck = Class.refactor(FlightDeck, { initialize: function(options) { this.previous(options); - var actions = { add: false, edit: false, remove: false }; + var actions = { add: false, edit: false, remove: false }, + that = this; API.Tree = new FileTree('PackTree', { checkDrag: Function.from(false), @@ -68,7 +69,8 @@ FlightDeck = Class.refactor(FlightDeck, { $('PackTree').addEvent('click:relay(li:not(top_branch) > .holder > .label)', function(e, label) { var page = label.getParent('li').retrieve('page'); if(page) { - window.location.href = page.options.get_url; + that.setSelectedFile(label.getParent('li')); + window.location.href = page.options.get_url; } }); }, @@ -86,8 +88,10 @@ FlightDeck = Class.refactor(FlightDeck, { //also be sure to expand all parent folders var tree = API.Tree; node = el; - - tree.collapse.expand(node); + + if (node.getElement('li')) { + tree.collapse.expand(node); + } while (node = node.getParent('li')) { tree.collapse.expand(node); From da3200417425b1db853dfda9f50c1a50d19e89b4 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Tue, 29 Mar 2011 12:50:11 -0700 Subject: [PATCH 02/10] fixes Bug 640362 - Remove the "add" button for libraries --- media/jetpack/js/Sidebar.js | 1 + 1 file changed, 1 insertion(+) diff --git a/media/jetpack/js/Sidebar.js b/media/jetpack/js/Sidebar.js index df8b2b1f..b0c2a24e 100644 --- a/media/jetpack/js/Sidebar.js +++ b/media/jetpack/js/Sidebar.js @@ -108,6 +108,7 @@ var Sidebar = new Class({ if($('PluginsTree')) { trees.plugins = new FileTree('PluginsTree', Object.merge({}, treeOptions, { actions: { + add: false, edit: false, remove: true }})); From 38592d00374e29ae26feb256481ba61bb23d9505 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Tue, 29 Mar 2011 17:23:50 -0700 Subject: [PATCH 03/10] clear out the pressed array once a combo has been detected --- media/lib/mootools/moo-hacks.js | 15 +++++---------- media/lib/mootools/mootools-more-1.3.0.1.js | 5 ++++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/media/lib/mootools/moo-hacks.js b/media/lib/mootools/moo-hacks.js index 8ee6350d..39687ef7 100644 --- a/media/lib/mootools/moo-hacks.js +++ b/media/lib/mootools/moo-hacks.js @@ -75,8 +75,7 @@ var keysStoreKey = '$moo:keys-pressed', }, retrieve = function(key, def){ return this.retrieve ? this.retrieve(key, def) : (this[key] || def); - }, - modifiers = ['meta']; + }; Event.definePseudo('keys', function(split, fn, args){ var event = args[0], @@ -93,16 +92,15 @@ Event.definePseudo('keys', function(split, fn, args){ }); pressed.include(event.key); - - modifiers.each(function(mod) { - if(event[mod]) pressed.include(mod); - }); if (keyCombos.some(function(combo){ return combo.every(function(key){ return pressed.contains(key); }); - })) fn.apply(this, args); + })) { + fn.apply(this, args); + pressed = []; + } store.call(this, keysStoreKey, pressed); @@ -110,9 +108,6 @@ Event.definePseudo('keys', function(split, fn, args){ var keyup = function(event){ (function(){ pressed = retrieve.call(this, keysStoreKey, []).erase(event.key); - modifiers.each(function(mod) { - if(!event[mod]) pressed.erase(mod); - }); store.call(this, keysStoreKey, pressed); }).delay(0, this); // Fix for IE }; diff --git a/media/lib/mootools/mootools-more-1.3.0.1.js b/media/lib/mootools/mootools-more-1.3.0.1.js index 886f3d06..9e591bf5 100644 --- a/media/lib/mootools/mootools-more-1.3.0.1.js +++ b/media/lib/mootools/mootools-more-1.3.0.1.js @@ -2413,7 +2413,10 @@ Event.definePseudo('keys', function(split, fn, args){ return combo.every(function(key){ return pressed.contains(key); }); - })) fn.apply(this, args); + })) { + fn.apply(this, args); + pressed = []; + } store.call(this, keysStoreKey, pressed); From b898898682008c94cba86fb200666a281ea3325c Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Wed, 30 Mar 2011 12:25:45 -0700 Subject: [PATCH 04/10] empties pressed on a timeout --- media/lib/mootools/mootools-more-1.3.0.1.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media/lib/mootools/mootools-more-1.3.0.1.js b/media/lib/mootools/mootools-more-1.3.0.1.js index 9e591bf5..186e2932 100644 --- a/media/lib/mootools/mootools-more-1.3.0.1.js +++ b/media/lib/mootools/mootools-more-1.3.0.1.js @@ -2415,7 +2415,9 @@ Event.definePseudo('keys', function(split, fn, args){ }); })) { fn.apply(this, args); - pressed = []; + (function() { + pressed.empty(); + }).delay(0); } store.call(this, keysStoreKey, pressed); From fb5efc054d8e2d6dd95c5bf6b5917ac7722f23cc Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Wed, 30 Mar 2011 13:28:36 -0700 Subject: [PATCH 05/10] stop converting control to cmd for Mac --- media/base/js/FlightDeck.Keyboard.js | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/media/base/js/FlightDeck.Keyboard.js b/media/base/js/FlightDeck.Keyboard.js index 1671c63b..e90113f4 100644 --- a/media/base/js/FlightDeck.Keyboard.js +++ b/media/base/js/FlightDeck.Keyboard.js @@ -1,29 +1,9 @@ (function() { -var isMac = (Browser.Platform.name == 'mac'), - controlRE = /control|ctrl/g, - macControlToMeta = function(text) { - return isMac ? text.replace(controlRE, 'meta') : text; - }; FlightDeck.Keyboard = new Class({ - Extends: Keyboard, - - addEvent: function(type, fn, internal) { - return this.parent(macControlToMeta(type), fn, internal); - }, - - removeEvent: function(type, fn) { - return this.parent(macControlToMeta(type), fn); - }, - - addShortcut: function(name, shortcut) { - if (shortcut.keys) { - shortcut.keys = macControlToMeta(shortcut.keys); - } - return this.parent(name, shortcut); - } + Extends: Keyboard }); From 2bc80a9ad6ea2d46e755f985d3a1ab3d08678a93 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Wed, 30 Mar 2011 17:16:58 -0700 Subject: [PATCH 06/10] fixes bug 627587 - changes to Addon and Library listings, specifically the version pill, and no longer shows author if the user is the Package author --- apps/jetpack/templates/_package_browser_addon.html | 13 +++++++++---- .../jetpack/templates/_package_browser_library.html | 10 +++++++--- media/jetpack/css/UI.Browser.css | 13 +++++++++++-- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/apps/jetpack/templates/_package_browser_addon.html b/apps/jetpack/templates/_package_browser_addon.html index dc53d041..21043fe6 100644 --- a/apps/jetpack/templates/_package_browser_addon.html +++ b/apps/jetpack/templates/_package_browser_addon.html @@ -1,11 +1,16 @@ {% load base_helpers %}

- {{ item.full_name }} - by + {{ item.full_name }} + + {% ifnotequal user item.author %} + by {{ item.author.get_profile }} - + + {% endifnotequal %} + + version {{ item.version_name }} +

-

{{ item.version_name }}

{{ item.description }}

    diff --git a/apps/jetpack/templates/_package_browser_library.html b/apps/jetpack/templates/_package_browser_library.html index 9c1fa590..2c2eeb4e 100644 --- a/apps/jetpack/templates/_package_browser_library.html +++ b/apps/jetpack/templates/_package_browser_library.html @@ -1,10 +1,14 @@

    {{ item.full_name }} - by + {% ifnotequal user item.author %} + by {{ item.author.get_profile }} - + + {% endifnotequal %} + + version {{ item.version_name }} +

    -

    {{ item.version_name }}

    {{ item.description }}

      diff --git a/media/jetpack/css/UI.Browser.css b/media/jetpack/css/UI.Browser.css index f0e33137..983ddafc 100644 --- a/media/jetpack/css/UI.Browser.css +++ b/media/jetpack/css/UI.Browser.css @@ -71,17 +71,26 @@ body { display: block; } - .UI_Browser .UI_Item h3 span { + .UI_Browser .UI_Item h3 > span { font-weight: normal; font-size: .8em; color: #999; } - .UI_Browser .UI_Item h3 span a { + .UI_Browser .UI_Item h3 span.author a { font-weight: normal; color: #478CDE; } + + .UI_Browser .UI_Item h3 span.version { + font-size: .7em; + } + + .UI_Browser .UI_Item h3 span.version-name { + color:#47AB78; + font-size: 1.1em; + } .UI_Browser .UI_Item h4 { font-size: .7em; From 5b68a177208d97e43261518648f9c8d3ed030571 Mon Sep 17 00:00:00 2001 From: Piotr Zalewa Date: Thu, 31 Mar 2011 02:22:24 +0100 Subject: [PATCH 07/10] SDK 1.0b4 --- .gitmodules | 3 +++ lib/addon-sdk-1.0b4 | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/addon-sdk-1.0b4 diff --git a/.gitmodules b/.gitmodules index fa3d3d48..590bbe07 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "lib/addon-sdk-1.0b4rc3"] path = lib/addon-sdk-1.0b4rc3 url = git://github.com/mozilla/addon-sdk.git +[submodule "lib/addon-sdk-1.0b4"] + path = lib/addon-sdk-1.0b4 + url = git://github.com/mozilla/addon-sdk.git diff --git a/lib/addon-sdk-1.0b4 b/lib/addon-sdk-1.0b4 new file mode 160000 index 00000000..6b272bef --- /dev/null +++ b/lib/addon-sdk-1.0b4 @@ -0,0 +1 @@ +Subproject commit 6b272befd4886b33e77b0dce92e0b49ca97dab80 From 1237c447e2b3f8d854db4c47559fd1cea048a0c1 Mon Sep 17 00:00:00 2001 From: Piotr Zalewa Date: Thu, 31 Mar 2011 02:26:32 +0100 Subject: [PATCH 08/10] ico is now png --- apps/base/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/base/templates/base.html b/apps/base/templates/base.html index a7e7dd62..3a1bddc5 100644 --- a/apps/base/templates/base.html +++ b/apps/base/templates/base.html @@ -3,7 +3,7 @@ {% load base_helpers %} - + {% if not settings.ENGAGE_ROBOTS %} From e84c63b6f64a71dfdc70c5dcd3cc25095717a818 Mon Sep 17 00:00:00 2001 From: Piotr Zalewa Date: Thu, 31 Mar 2011 02:39:46 +0100 Subject: [PATCH 09/10] favicon renamed --- media/base/img/favicon.ico | Bin 811 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 media/base/img/favicon.ico diff --git a/media/base/img/favicon.ico b/media/base/img/favicon.ico deleted file mode 100644 index c85a481fba33fbc72f0172158685debb561e8e9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 811 zcmV+`1JwM9P)lYWy{cF_%IGQHc#*B$+_f zg<4!l5nQztvgpz-8gt#$kgv2x#V>16_ z=AZvNE)p*|Djv@AJ&brXFbjAiz>?VdISdAIZ#b_`x$8t6H@}HN39T?*lj|eV0=G z%ZvGWieZ6~yH}ROF#Pd#je0YKc#qwqG-t)p1W@bM`FlDKM4dP;Umf(P{-2BjD9yj( z=q>?t9kb~JpC4}7P*Y3M1q3e7?a9kHCv4pqN2>?`(=${2b^XuBB^ijL#q&Id9-Iag zu)07Xk-304K?FLR4k3;f6YsH&+Ngn8S=Hvn+|v^Pf%38C`W0ZM5eI9_J-lc$#;!Oq zI>OK2AMX2fdt-+hc{qIX!j+%=f-FW&xkjx5L{>OaQ%#-OCaIB8e|9cerW8v?gxwSQ zF?IL;AdZ6V*wtnqFWoG4AmGIs7)_35XJ)650KWpE0d&qSFrFR3i#1{+hDaG0tx@Wg z196}&_&HwzcM`pU51_h^+ricyt$V%Nbvm6M&&|)zNqk>xG~?ewDMh8JBBs~jL?{F~ z7A911FEw5)6!IF)lyOD*cI@x5^XfL6!=m&doDv-nv6@&}HHFDon7np>8HH@wxv6qZ zz1X%54ORlfwLku8dfOq%{;%7Z3DSI2QAeUbo%OT%F9FIc?7+@1YGcoGb5yEoQiBtv zzYwu1oq06<@%ko@An)+A`DmgyxCjtGYAXssfK?StXBNQI2HMysG0x(002ovPDHLkV1k}HXrBN8 From ce030daa6d4d00b470b64d3ec52592259ea46475 Mon Sep 17 00:00:00 2001 From: Piotr Zalewa Date: Thu, 31 Mar 2011 02:40:19 +0100 Subject: [PATCH 10/10] forgotten file --- media/base/img/favicon.png | Bin 0 -> 811 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 media/base/img/favicon.png diff --git a/media/base/img/favicon.png b/media/base/img/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..c85a481fba33fbc72f0172158685debb561e8e9b GIT binary patch literal 811 zcmV+`1JwM9P)lYWy{cF_%IGQHc#*B$+_f zg<4!l5nQztvgpz-8gt#$kgv2x#V>16_ z=AZvNE)p*|Djv@AJ&brXFbjAiz>?VdISdAIZ#b_`x$8t6H@}HN39T?*lj|eV0=G z%ZvGWieZ6~yH}ROF#Pd#je0YKc#qwqG-t)p1W@bM`FlDKM4dP;Umf(P{-2BjD9yj( z=q>?t9kb~JpC4}7P*Y3M1q3e7?a9kHCv4pqN2>?`(=${2b^XuBB^ijL#q&Id9-Iag zu)07Xk-304K?FLR4k3;f6YsH&+Ngn8S=Hvn+|v^Pf%38C`W0ZM5eI9_J-lc$#;!Oq zI>OK2AMX2fdt-+hc{qIX!j+%=f-FW&xkjx5L{>OaQ%#-OCaIB8e|9cerW8v?gxwSQ zF?IL;AdZ6V*wtnqFWoG4AmGIs7)_35XJ)650KWpE0d&qSFrFR3i#1{+hDaG0tx@Wg z196}&_&HwzcM`pU51_h^+ricyt$V%Nbvm6M&&|)zNqk>xG~?ewDMh8JBBs~jL?{F~ z7A911FEw5)6!IF)lyOD*cI@x5^XfL6!=m&doDv-nv6@&}HHFDon7np>8HH@wxv6qZ zz1X%54ORlfwLku8dfOq%{;%7Z3DSI2QAeUbo%OT%F9FIc?7+@1YGcoGb5yEoQiBtv zzYwu1oq06<@%ko@An)+A`DmgyxCjtGYAXssfK?StXBNQI2HMysG0x(002ovPDHLkV1k}HXrBN8 literal 0 HcmV?d00001