From f8895e259ca2f259c536b7515fb9e113fd30bb6c Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Tue, 3 Jan 2012 01:50:09 +0530
Subject: [PATCH] flatten video actions and settings menu

---
 source/Ox.UI/js/Video/Ox.VideoEditor.js | 32 +++++++++++--------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js
index 4ea11cfa..f4544970 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditor.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js
@@ -410,24 +410,20 @@ Ox.VideoEditor = function(options, self) {
     });
 
     self.$videoMenuButton = Ox.MenuButton({
-            items: Ox.merge(
-                [
-                    {id: 'toggleSize', title: 'Large Player', selected: self.options.playerSize == 'large', keyboard: 'shift +'},
-                    {}
-                ],
-                { group: 'resolution', min: 1, max: 1, items: self.resolutions },
-                [
-                    {},
-                    {id: 'largeTimeline', title: 'Hide Large Timeline', disabled: true},
-                    {id: 'subtitlesTimeline', title: 'Hide Subtitles on Large Timeline', disabled: true},
-                    {},
-                    {id: 'downloadVideo', title: 'Download Video...', disabled: true},
-                    {id: 'downloadSelection', title: 'Download Selection...', disabled: true},
-                    {id: 'embedSelection', title: 'Embed Selection...', disabled: true},
-                    {},
-                    {id: 'keyboard', title: 'Keyboard Shortcuts...', keyboard: 'h'}
-                ]
-            ),
+            items: [
+                {id: 'toggleSize', title: 'Large Player', selected: self.options.playerSize == 'large', keyboard: 'shift +'},
+                {},
+                {group: 'resolution', min: 1, max: 1, items: self.resolutions},
+                {},
+                {id: 'largeTimeline', title: 'Hide Large Timeline', disabled: true},
+                {id: 'subtitlesTimeline', title: 'Hide Subtitles on Large Timeline', disabled: true},
+                {},
+                {id: 'downloadVideo', title: 'Download Video...', disabled: true},
+                {id: 'downloadSelection', title: 'Download Selection...', disabled: true},
+                {id: 'embedSelection', title: 'Embed Selection...', disabled: true},
+                {},
+                {id: 'keyboard', title: 'Keyboard Shortcuts...', keyboard: 'h'}
+            ],
             style: 'square',
             title: 'set',
             tooltip: 'Actions and Settings',