convert tabs array to a class

Author: PalmerAL

js/browserUI.js

@@ -36,7 +36,7 @@ options
   options.enterEditMode - whether to enter editing mode when the tab is created. Defaults to true.
   options.openInBackground - whether to open the tab without switching to it. Defaults to false.
 */
-function addTab (tabId = tabs.add(), options = {}) {
+function addTab (tabId = tabs.add() , options = {}) {
   tabBar.addTab(tabId)
   webviews.add(tabId)
 
@@ -92,8 +92,7 @@ function closeTask (taskId) {
       })
 
       const mostRecent = recentTaskList.reduce(
-        (latest, current) =>
-          current.lastActivity > latest.lastActivity ? current : latest
+        (latest, current) => current.lastActivity > latest.lastActivity ? current : latest
       )
 
       return switchToTask(mostRecent.id)
@@ -112,7 +111,7 @@ function closeTab (tabId) {
   if (tabId === tabs.getSelected()) {
     var currentIndex = tabs.getIndex(tabs.getSelected())
     var nextTab =
-      tabs.getAtIndex(currentIndex - 1) || tabs.getAtIndex(currentIndex + 1)
+    tabs.getAtIndex(currentIndex - 1) || tabs.getAtIndex(currentIndex + 1)
 
     destroyTab(tabId)
 
@@ -135,7 +134,7 @@ function switchToTask (id) {
 
   var taskData = tasks.get(id)
 
-  if (taskData.tabs.length > 0) {
+  if (taskData.tabs.count() > 0) {
     var selectedTab = taskData.tabs.getSelected()
 
     // if the task has no tab that is selected, switch to the most recent one
@@ -195,5 +194,4 @@ module.exports = {
   closeTask,
   closeTab,
   switchToTask,
-  switchToTab
-}
+switchToTab}

js/navbar/tabBar.js

@@ -114,10 +114,10 @@ window.tabBar = {
   rerenderAll: function () {
     empty(tabBar.container)
     tabBar.tabElementMap = {}
-    for (var i = 0; i < tabs.length; i++) {
-      var el = tabBar.createElement(tabs[i])
+    for (var i = 0; i < tabs.count(); i++) {
+      var el = tabBar.createElement(tabs.getAtIndex(i))
       tabBar.container.appendChild(el)
-      tabBar.tabElementMap[tabs[i].id] = el
+      tabBar.tabElementMap[tabs.getAtIndex(i).id] = el
     }
     if (tabs.getSelected()) {
       tabBar.setActiveTab(tabs.getSelected())

js/searchbar/customBangs.js

@@ -133,7 +133,7 @@ registerCustomBang({
     tabs.destroy(currentTab.id)
 
     // make sure the task has at least one tab in it
-    if (tabs.get().length === 0) {
+    if (tabs.count() === 0) {
       tabs.add()
     }
 

js/searchbar/openTabsPlugin.js

@@ -14,7 +14,7 @@ var searchOpenTabs = function (text, input, event, container) {
   var currentTab = currentTask.tabs.getSelected()
 
   tasks.forEach(function (task) {
-    task.tabs.get().forEach(function (tab) {
+    task.tabs.forEach(function (tab) {
       if (tab.id === currentTab || !tab.title || tab.url === 'about:blank') {
         return
       }

js/tabState/tab.js

@@ -1,5 +1,8 @@
-var tabPrototype = {
-  add: function (tab = {}, index) {
+class TabList {
+  constructor (tabs) {
+    this.tabs = tabs || []
+  }
+  add (tab = {} , index) {
     var tabId = String(tab.id || Math.round(Math.random() * 100000000000000000)) // you can pass an id that will be used, or a random one will be generated.
 
     var newTab = {
@@ -16,103 +19,113 @@ var tabPrototype = {
     }
 
     if (index) {
-      this.splice(index, 0, newTab)
+      this.tabs.splice(index, 0, newTab)
     } else {
-      this.push(newTab)
+      this.tabs.push(newTab)
     }
 
     return tabId
-  },
-  update: function (id, data) {
+  }
+  update (id, data) {
     if (!this.has(id)) {
       throw new ReferenceError('Attempted to update a tab that does not exist.')
     }
     const index = this.getIndex(id)
-    
+
     for (var key in data) {
       if (data[key] === undefined) {
         throw new ReferenceError('Key ' + key + ' is undefined.')
       }
-      this[index][key] = data[key]
+      this.tabs[index][key] = data[key]
     }
-  },
-  destroy: function (id) {
+  }
+  destroy (id) {
     const index = this.getIndex(id)
-    if(index < 0) return false
+    if (index < 0) return false
 
-    tasks.getTaskContainingTab(id).tabHistory.push(this[index])
-    this.splice(index, 1)
+    tasks.getTaskContainingTab(id).tabHistory.push(this.tabs[index])
+    this.tabs.splice(index, 1)
 
     return index
-  },
-  destroyAll: function () {
+  }
+  destroyAll () {
     // this = [] doesn't work, so set the length of the array to 0 to remove all of the itemss
-    this.length = 0
-  },
-  get: function (id) {
+    this.tabs.length = 0
+  }
+  get (id) {
     if (!id) { // no id provided, return an array of all tabs
       // it is important to deep-copy the tab objects when returning them. Otherwise, the original tab objects get modified when the returned tabs are modified (such as when processing a url).
       var tabsToReturn = []
-      for (var i = 0; i < this.length; i++) {
-        tabsToReturn.push(JSON.parse(JSON.stringify(this[i])))
+      for (var i = 0; i < this.tabs.length; i++) {
+        tabsToReturn.push(JSON.parse(JSON.stringify(this.tabs[i])))
       }
       return tabsToReturn
     }
-    for (var i = 0; i < this.length; i++) {
-      if (this[i].id === id) {
-        return JSON.parse(JSON.stringify(this[i]))
+    for (var i = 0; i < this.tabs.length; i++) {
+      if (this.tabs[i].id === id) {
+        return JSON.parse(JSON.stringify(this.tabs[i]))
       }
     }
     return undefined
-  },
-  has: function (id) {
+  }
+  has (id) {
     return this.getIndex(id) > -1
-  },
-  getIndex: function (id) {
-    for (var i = 0; i < this.length; i++) {
-      if (this[i].id === id) {
+  }
+
+  getIndex (id) {
+    for (var i = 0; i < this.tabs.length; i++) {
+      if (this.tabs[i].id === id) {
         return i
       }
     }
     return -1
-  },
-  getSelected: function () {
-    for (var i = 0; i < this.length; i++) {
-      if (this[i].selected) {
-        return this[i].id
+  }
+  getSelected () {
+    for (var i = 0; i < this.tabs.length; i++) {
+      if (this.tabs[i].selected) {
+        return this.tabs[i].id
       }
     }
     return null
-  },
-  getAtIndex: function (index) {
-    return this[index] || undefined
-  },
-  setSelected: function (id) {
+  }
+  getAtIndex (index) {
+    return this.tabs[index] || undefined
+  }
+  setSelected (id) {
     if (!this.has(id)) {
       throw new ReferenceError('Attempted to select a tab that does not exist.')
     }
-    for (var i = 0; i < this.length; i++) {
-      if (this[i].id === id) {
-        this[i].selected = true
+    for (var i = 0; i < this.tabs.length; i++) {
+      if (this.tabs[i].id === id) {
+        this.tabs[i].selected = true
       } else {
-        this[i].selected = false
+        this.tabs[i].selected = false
       }
     }
-  },
-  count: function () {
-    return this.length
-  },
-  isEmpty: function () {
-    if (!this || this.length === 0) {
+  }
+  count () {
+    return this.tabs.length
+  }
+  isEmpty () {
+    if (!this.tabs || this.tabs.length === 0) {
       return true
     }
 
-    if (this.length === 1 && (!this[0].url || this[0].url === 'about:blank')) {
+    if (this.tabs.length === 1 && (!this.tabs[0].url || this.tabs[0].url === 'about:blank')) {
       return true
     }
 
     return false
   }
+  forEach (fun) {
+    return this.tabs.forEach(fun)
+  }
+  splice (...args) {
+    return this.tabs.splice.apply(this.tabs, args)
+  }
+  getStringifyableState () {
+    return this.tabs
+  }
 }
 
-module.exports = tabPrototype
+module.exports = TabList

js/tabState/task.js

@@ -1,4 +1,4 @@
-const tabPrototype = require('tabState/tab.js')
+const TabList = require('tabState/tab.js')
 const TabStack = require('tabRestore.js')
 
 class TaskList {
@@ -10,15 +10,11 @@ class TaskList {
   add (task = {} , index) {
     const newTask = {
       name: task.name || null,
-      tabs: task.tabs || [],
+      tabs: new TabList(task.tabs),
       tabHistory: new TabStack(task.tabHistory),
       id: task.id || String(TaskList.getRandomId())
     }
 
-    for (var key in tabPrototype) {
-      newTask.tabs[key] = tabPrototype[key]
-    }
-
     if (index) {
       this.tasks.splice(index, 0, newTask)
     } else {
@@ -30,7 +26,7 @@ class TaskList {
 
   getStringifyableState () {
     return {
-      tasks: this.tasks,
+      tasks: this.tasks.map(task => Object.assign({}, task, {tabs: task.tabs.getStringifyableState()})),
       selectedTask: this.selected
     }
   }
@@ -83,9 +79,9 @@ class TaskList {
     var tabs = this.get(id).tabs
     var lastActivity = 0
 
-    for (var i = 0; i < tabs.length; i++) {
-      if (tabs[i].lastActivity > lastActivity) {
-        lastActivity = tabs[i].lastActivity
+    for (var i = 0; i < tabs.count(); i++) {
+      if (tabs.getAtIndex(i).lastActivity > lastActivity) {
+        lastActivity = tabs.getAtIndex(i).lastActivity
       }
     }
 

js/taskOverlay/taskOverlay.js

@@ -163,7 +163,7 @@ taskOverlay.tabDragula.on('drop', function (el, target, source, sibling) { // se
 
   // if the old task has no tabs left in it, destroy it
 
-  if (previousTask.tabs.length === 0) {
+  if (previousTask.tabs.count() === 0) {
     browserUI.closeTask(previousTask.id)
     getTaskContainer(previousTask.id).remove()
   }
@@ -173,7 +173,7 @@ taskOverlay.tabDragula.on('drop', function (el, target, source, sibling) { // se
     var newIdx = newTask.tabs.getIndex(adjacentTadId)
   } else {
     // tab was inserted at end
-    var newIdx = newTask.tabs.length
+    var newIdx = newTask.tabs.count()
   }
 
   // insert the tab at the correct spot

js/taskOverlay/taskOverlayBuilder.js

@@ -130,8 +130,8 @@ var TaskOverlayBuilder = {
         tabContainer.setAttribute('data-task', task.id)
 
         if (task.tabs) {
-          for (var i = 0; i < task.tabs.length; i++) {
-            var el = this.element(tabContainer, task, task.tabs[i])
+          for (var i = 0; i < task.tabs.count(); i++) {
+            var el = this.element(tabContainer, task, task.tabs.getAtIndex(i))
             tabContainer.appendChild(el)
           }
         }
@@ -160,7 +160,7 @@ var TaskOverlayBuilder = {
       }
     }
   }
-  // extend with other helper functions?
+// extend with other helper functions?
 }
 
 module.exports = function createTaskContainer (task, index) {