From 4618520bf957ff22624e995cdc6ce9c014e33744 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 19 Jul 2019 21:05:22 +0200
Subject: [PATCH] font family for popup, different clip types for notes and
 whole pages

---
 .idea/inspectionProfiles/Project_Default.xml | 10 ++++++++
 .idea/misc.xml                               |  3 +++
 .idea/workspace.xml                          | 24 ++++++++++++++++----
 background.js                                |  3 ++-
 content.js                                   |  3 ++-
 manifest.json                                |  2 +-
 popup/popup.css                              |  1 +
 7 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000000000..146ab09b7
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 639900d13..7e5bdf89f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="ProjectRootManager">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cc98bef0e..79fcb737a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="735e41bc-d058-4745-9f22-50aeb04ec2d7" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/background.js" beforeDir="false" afterPath="$PROJECT_DIR$/background.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/content.js" beforeDir="false" afterPath="$PROJECT_DIR$/content.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/popup/popup.css" beforeDir="false" afterPath="$PROJECT_DIR$/popup/popup.css" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -15,6 +17,12 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="JsFlowSettings">
+    <service-enabled>true</service-enabled>
+    <exe-path />
+    <other-services-enabled>true</other-services-enabled>
+    <auto-save>true</auto-save>
+  </component>
   <component name="ProjectId" id="1OF6mJDrJJ99biD9ZeM2EJmkKPy" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="PropertiesComponent">
@@ -23,6 +31,7 @@
     <property name="aspect.path.notification.shown" value="true" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="settings.editor.selected.configurable" value="Errors" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -46,7 +55,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1563561154310</updated>
-      <workItem from="1563561158232" duration="469000" />
+      <workItem from="1563561158232" duration="1538000" />
     </task>
     <task id="LOCAL-00001" summary="gitignore">
       <created>1563561565148</created>
@@ -55,7 +64,14 @@
       <option name="project" value="LOCAL" />
       <updated>1563561565148</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="gitignore">
+      <created>1563561631038</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1563561631038</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/background.js b/background.js
index 74b3227b7..4e323a735 100644
--- a/background.js
+++ b/background.js
@@ -216,7 +216,8 @@ async function saveWholePage() {
 async function saveNote(title, content) {
 	const resp = await triliumServerFacade.callService('POST', 'notes', {
 		title: title,
-		content: content
+		content: content,
+		clipType: 'note'
 	});
 
 	if (!resp) {
diff --git a/content.js b/content.js
index 70044fd58..d4ca967e7 100644
--- a/content.js
+++ b/content.js
@@ -278,7 +278,8 @@ async function prepareMessageResponse(message) {
 			title: title,
 			content: body.innerHTML,
 			images: images,
-			pageUrl: getPageLocationOrigin() + location.pathname + location.search
+			pageUrl: getPageLocationOrigin() + location.pathname + location.search,
+			clipType: 'page'
 		};
 	}
 	else {
diff --git a/manifest.json b/manifest.json
index ec320b656..558bb9e7f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Trilium Web Clipper (dev)",
-  "version": "0.1.5",
+  "version": "0.1.0-beta",
   "description": "Save web clippings to Trilium Notes.",
   "homepage_url": "https://github.com/zadam/trilium-web-clipper",
   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
diff --git a/popup/popup.css b/popup/popup.css
index 89d7bf23c..cf958c3ca 100644
--- a/popup/popup.css
+++ b/popup/popup.css
@@ -1,6 +1,7 @@
 html, body {
   width: 300px;
   font-size: 12px;
+  font-family: sans-serif;
 }
 
 .button {