[refactor] improve group name when left empty

Author: zombieFox

package-lock.json

@@ -1,6 +1,6 @@
 {
 "name": "nightTab",
-"version": "5.8.0",
+"version": "5.9.0",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
 "main": "index.js",
 "scripts":{

package.json

@@ -232,31 +232,14 @@ var bookmarks = (function(){
 mod.all[data.position.destination.group].items.splice(data.position.destination.item,0,data.link);
 },
 group: function(data){
-varmakeName=function(){
-varcount=get().length+1;
-return"Group "+count;
-};
 if(data){
 if(data.group.name.text==null){
-data.group.name.text=makeName();
-}elseif(typeofdata.group.name.text=="string"){
+data.group.name.text="";
+};
+if(typeofdata.group.name.text=="string"){
 data.group.name.text=data.group.name.text.trim();
-if(data.group.name.text==""){
-data.group.name.text=makeName();
-};
 };
 mod.all.splice(data.position.destination,0,data.group);
-}else{
-mod.all.push({
-name: {
-text: makeName(),
-show: true
-},
-openAll: {
-show: true
-},
-items: []
-});
 };
 }
 };

src/js/bookmarks.js

@@ -20,13 +20,13 @@ var control = (function(){
 menu.open();
 },
 },{
-element: ".control-link-add",
+element: ".control-add-link",
 type: "button",
 func: function(){
 link.add.item.open();
 }
 },{
-element: ".control-group-add",
+element: ".control-add-group",
 type: "button",
 func: function(){
 link.add.group.open();

src/js/control.js

@@ -383,12 +383,12 @@ var header = (function(){
 controlAddToggle.appendChild(controlAddToggleText);
 varformDropdownMenu=helper.node("ul|class:list-unstyled form-dropdown-menu");
 varcontrolGroupAddLi=helper.node("li");
-varcontrolGroupAdd=helper.node("button|class:button button-block text-left form-dropdown-menu-item control-group-add,tabindex:1");
+varcontrolGroupAdd=helper.node("button|class:button button-block text-left form-dropdown-menu-item control-add-group,tabindex:1");
 varcontrolGroupAddText=helper.node("span:New Group|class:button-text");
 controlGroupAdd.appendChild(controlGroupAddText);
 controlGroupAddLi.appendChild(controlGroupAdd);
 varcontrolLinkAddLi=helper.node("li");
-varcontrolLinkAdd=helper.node("button|class:button button-block text-left form-dropdown-menu-item control-link-add,tabindex:1");
+varcontrolLinkAdd=helper.node("button|class:button button-block text-left form-dropdown-menu-item control-add-link,tabindex:1");
 varcontrolLinkAddText=helper.node("span:New Bookmark|class:button-text");
 controlLinkAdd.appendChild(controlLinkAddText);
 controlLinkAddLi.appendChild(controlLinkAdd);

src/js/header.js

@@ -1047,12 +1047,18 @@ var link = (function(){
 varmakeGroupOptions=function(){
 if(bookmarks.get().length>0){
 bookmarks.get().forEach(function(arrayItem,index){
+varname;
+if(arrayItem.name.text==null||arrayItem.name.text==""){
+name="Unnamed group "+(index+1);
+}else{
+name=arrayItem.name.text;
+};
 varoption=helper.makeNode({
 tag: "option",
-text: arrayItem.name.text,
+text: name,
 attr: [{
 key: "value",
-value: arrayItem.name.text
+value: name
 }]
 });
 groupExistingGroup.appendChild(option);
@@ -1413,7 +1419,7 @@ var link = (function(){
 groupBody.appendChild(linkEmpty);
 group.appendChild(groupBody);
 addButton.addEventListener("click",function(event){
-link.add.item.open();
+add.item.open();
 },false);
 returngroup;
 },
@@ -1424,8 +1430,8 @@ var link = (function(){
 linkEmpty.appendChild(para);
 linkEmpty.appendChild(addButton);
 addButton.addEventListener("click",function(event){
-link.add.item.open();
-link.add.item.selectGroup(groupIndex);
+add.item.open();
+add.item.selectGroup(groupIndex);
 },false);
 returnlinkEmpty;
 },
@@ -1636,6 +1642,7 @@ var link = (function(){
 pagelock.unlock();
 },
 selectGroup: function(groupIndex){
+stagedGroup.init();
 stagedLink.position.destination.group=groupIndex;
 stagedLink.position.destination.item=0;
 helper.e(".link-form-select-group").selectedIndex=stagedLink.position.destination.group;
@@ -1750,7 +1757,12 @@ var link = (function(){
 varform=render.group.form({
 useStagedGroup: true
 });
-varheading="Edit "+stagedGroup.group.name.text;
+varheading;
+if(stagedGroup.group.name.text==null||stagedGroup.group.name.text==""){
+heading="Edit unnamed group "+(stagedGroup.position.origin+1);
+}else{
+heading="Edit "+stagedGroup.group.name.text;
+};
 varsuccessAction=function(){
 varcopyStagedGroup=JSON.parse(JSON.stringify(stagedGroup));
 bookmarks.mod.edit.group(copyStagedGroup);
@@ -1844,10 +1856,10 @@ var link = (function(){
 stagedGroup.group=JSON.parse(JSON.stringify(copyStagedGroup.group));
 stagedGroup.position=JSON.parse(JSON.stringify(copyStagedGroup.position));
 varheading;
-if(stagedGroup.group.name.text!=null&&stagedGroup.group.name.text!=""){
-heading="Remove "+stagedGroup.group.name.text;
+if(stagedGroup.group.name.text==null||stagedGroup.group.name.text==""){
+heading="Remove unnamed group "+(stagedGroup.position.origin+1);
 }else{
-heading="Remove unnamed group";
+heading="Remove "+stagedGroup.group.name.text;
 };
 varsuccessAction=function(){
 varcopyStagedGroup=JSON.parse(JSON.stringify(stagedGroup));

src/js/link.js

@@ -1,6 +1,6 @@
 varversion=(function(){
 
-varcurrent="5.8.0";
+varcurrent="5.9.0";
 
 varname="Zonked Tarsier";
 

src/js/version.js

@@ -2,7 +2,7 @@
 "name": "nightTab",
 "short_name": "nightTab",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
-"version": "5.8.0",
+"version": "5.9.0",
 "manifest_version": 2,
 "chrome_url_overrides":{
 "newtab": "index.html"