Merge pull request #29 from chuckh/update-to-1-3-4

Update to 1 3 4
chuckh · Jan 17, 2018 · e9f631e · e9f631e
2 parents b93161a + 7a0690b
commit e9f631e
Show file tree

Hide file tree

Showing 15 changed files with 158 additions and 80 deletions.
diff --git a/bower.json b/bower.json
@@ -22,9 +22,9 @@
   "homepage": "https://github.com/chuckh/polymer-quill",
   "dependencies": {
     "polymer": "Polymer/polymer#^1.7.0",
-    "quill": "https://github.com/quilljs/quill/releases/download/v1.3.2/quill.tar.gz",
+    "quill": "https://github.com/quilljs/quill/releases/download/v1.3.4/quill.tar.gz",
     "iron-ajax": "PolymerElements/iron-ajax#^1.4.3",
-    "iron-localstorage": "PolymerElements/iron-localstorage#^1.0.6",
+    "app-storage": "PolymerElements/app-storage#^1.0.1",
     "marked-element": "PolymerElements/marked-element#^1.2.0",
     "paper-radio-group": "PolymerElements/paper-radio-group#^1.2.1",
     "vaadin-upload": "vaadin/vaadin-upload#^1.1.1",

diff --git a/demo/bubble.html b/demo/bubble.html
@@ -15,7 +15,6 @@
     <link rel="import" href="../../iron-ajax/iron-ajax.html">
     <link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
     <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <link rel="import" href="../../iron-localstorage/iron-localstorage.html">
     <link rel="import" href="../../paper-button/paper-button.html">
 
     <link rel="import" href="../polymer-quill-bubble.html">
@@ -121,11 +120,11 @@ <h3>4. Custom Toolbar, Sample Content via iron-ajax, Hide Results, Autogrow, Sav
          ];
 
           app.handleResponse = function (event) {
-            console.log('handleResponse');
+            // console.log('handleResponse');
           };
 
           app.disableToggle = function(e) {
-            console.log('disableToggle');
+            // console.log('disableToggle');
             if (e.target.innerText === 'ENABLE') {
               e.target.innerText = 'DISABLE';
             } else {

diff --git a/demo/firebase.html b/demo/firebase.html
@@ -15,7 +15,6 @@
     <link rel="import" href="../../iron-ajax/iron-ajax.html">
     <link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
     <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <link rel="import" href="../../iron-localstorage/iron-localstorage.html">
     <link rel="import" href="../../paper-button/paper-button.html">
     <link rel="import" href="../../polymerfire/firebase.html">
     <link rel="import" href="../../polymerfire/firebase-app.html">

diff --git a/demo/html-render.html b/demo/html-render.html
@@ -15,7 +15,6 @@
     <link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
     <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
     <link rel="import" href="../../iron-ajax/iron-ajax.html">
-    <link rel="import" href="../../iron-localstorage/iron-localstorage.html">
     <link rel="import" href="../../paper-button/paper-button.html">
 
     <link rel="import" href="../polymer-quill-html-render.html">

diff --git a/demo/index.html b/demo/index.html
@@ -15,7 +15,7 @@
     <link rel="import" href="../../iron-ajax/iron-ajax.html">
     <link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
     <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <link rel="import" href="../../iron-localstorage/iron-localstorage.html">
+    <link rel="import" href="../../app-storage/app-localstorage/app-localstorage-document.html">
     <link rel="import" href="../../paper-button/paper-button.html">
 
     <link rel="import" href="../polymer-quill.html">
@@ -83,11 +83,10 @@ <h3>4. Standard Toolbar, On Change save to local storage, Show HTML & Deltas, De
       <demo-snippet>
         <template>
           <template is="dom-bind" id="app4">
-            <iron-localstorage
-              name="app4-localstorage"
-              value="{{contentValue}}"
-              use-raw>
-            </iron-localstorage>
+            <app-localstorage-document
+              key="app4-localstorage"
+              data="{{contentValue}}">
+            </app-localstorage-document>
             <polymer-quill id="demo4"
               store-as="delta"
               show-html
@@ -107,7 +106,6 @@ <h3>4. Standard Toolbar, On Change save to local storage, Show HTML & Deltas, De
               });
 
               app.loadInitialData = function () {
-                // console.log('loadInitialData', this.contentValue);
                 var content = '';
                 if (this.contentValue === null || this.contentValue.length <= 25) {
                   content = '{"ops":[{"insert":"Hello World! - Store as Delta, On Change Event - "},{"attributes":{"link":"//proplanr.com"},"insert":"proplanr.com"},{"attributes":{"header":2},"insert":"\\n"}]}';

diff --git a/firebase-upload.html b/firebase-upload.html
@@ -111,7 +111,7 @@
        * Specifies the URL for uploaded file. Default is
        * 'null'.
        */
-      downloadURL: {
+      downloadUrl: {
         type: String,
         notify: true
       },
@@ -123,7 +123,19 @@
        appName: {
         type: String,
         notify: true
-      }, 
+      },
+
+      /**
+       * Specifies the URL for uploaded file. Default is
+       * 'null'.
+       */
+      planId: {
+        type: String,
+        notify: true
+      },
+      user: { 
+        type: Object      
+      } 
     },
 
     // Element Lifecycle
@@ -181,17 +193,17 @@
         throw new Error(error);
         // console.log('uploadTask',arguments);
         // Handle unsuccessful uploads
-        this.downloadURL = null;
+        this.downloadUrl = null;
         this.fire('download-url-change',{downloadURL: null, size: null});            
       }, function() {
         file.uploading = false;
         file.complete = !file.error;
         this.vaadinUpload.fire('upload-' + (file.error ? 'error' : 'success'), {file: file, xhr: null});
         this.vaadinUpload._notifyFileChanges(file);
         var downloadURL = uploadTask.snapshot.downloadURL;
-        this.downloadURL = downloadURL; 
+        this.downloadUrl = downloadURL; 
         this.fire('download-url-change',{downloadURL: downloadURL, size: file.size });            
-        // console.log(' this.downloadURL:',this.downloadURL,file,file.lastModifiedDate.toString());
+        // console.log(' this.downloadUrl:',this.downloadUrl,file,file.lastModifiedDate.toString());
         var now = new Date().toLocaleString();
         var userUid = '';
         var displayName = '';
@@ -230,7 +242,7 @@
 
     fileAbortHandler: function(event) {
       // console.log('fileAbortHandler:',event);
-      this.downloadURL = null;
+      this.downloadUrl = null;
       this.fire('download-url-change',{downloadURL: '', size: null});            
     },
 

diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "polymer-quill",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Polymer Quill Rich Text Editor",
   "main": "polymer-quill.html",
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "quill": "^1.3.2"
+    "quill": "^1.3.4"
   },
   "devDependencies": {
     "eslint": "^3.19.0",

diff --git a/polymer-quill-bubble-firebase.html b/polymer-quill-bubble-firebase.html
@@ -167,18 +167,18 @@ <h2 id="dialogHeader">Upload Image
       <div id="dialogBody">
         <firebase-upload id="firebaseUpload" url="{{url}}" 
           max-file-size="{{maxFileSize}}" max-files="{{maxFiles}}" 
-          download-url="{{downloadURL}}" file-path="{{filePath}}"
+          download-url="{{downloadUrl}}" file-path="{{filePath}}"
           app-name="{{appName}}" plan-id="{{planId}}">
         </firebase-upload>
       <div title="Max Image size in Kilobytes" style="color: black; font-size: 14px;" hidden>Max file size: {{convertToKB(maxFileSize)}}</div>
-      <img src="{{downloadURL}}" title="{{downloadURL}}" height="98px;" style="margin-top: 20px;">
+      <img src="{{downloadUrl}}" title="{{downloadUrl}}" height="98px;" style="margin-top: 20px;">
       <div title="Image size in Kilobytes" style="font-size: 14px;">{{size}}</div>
       </div>
       <div class="buttons">
         <paper-button dialog-dismiss autofocus>Cancel</paper-button>
         <paper-button dialog-confirm on-tap="uploadOk" raised>Insert Image</paper-button>
       </div>
-      <div id="helpContainer" hidden="{{hideHelp}}">
+      <div id="helpContainer" hidden$="{{hideHelp}}">
         <div id="helpSteps">
           <div>1. Press SELECT FILE button or Drop file (to upload image)</div>
           <div>2. Press INSERT IMAGE button to insert image</div>
@@ -188,7 +188,7 @@ <h2 id="dialogHeader">Upload Image
       </div>
     </paper-dialog>
 
-    <div id="scrollingContainer">
+    <div id="scrollingContainer"> 
       <div id="editor" class$="{{disabledClass}}">{{content}}</div>
     </div>
     <div id="results" class="results" hidden$="[[!showResults]]">RESULTS: {{content}}</div>
@@ -220,9 +220,9 @@ <h2 id="dialogHeader">Upload Image
         */
 
       listeners: {
-        'download-url-change': 'downloadUrlChange'
+        'download-url-change': 'downloadUrlChange',
+        'paste': 'onPaste'
       },  
-
       properties: {
         /**
          * Content which is in Deltas or HTML format.
@@ -355,7 +355,7 @@ <h2 id="dialogHeader">Upload Image
          * Link for Uploaded Image.
          * Default is `null`.
          */
-        downloadURL: {
+        downloadUrl: {
           type: String,
           notify: true
         },
@@ -427,6 +427,12 @@ <h2 id="dialogHeader">Upload Image
           value: '',
           notify: true
         },
+        /**
+        * Plan ID for upload.
+        */
+        planId: {
+          type: String
+        }
       },
 
       ready: function() {
@@ -597,13 +603,13 @@ <h2 id="dialogHeader">Upload Image
       },
 
       downloadUrlChange: function(event) {
-        this.downloadURL = event.detail.downloadURL;
+        this.downloadUrl = event.detail.downloadURL;
         this.size = (event.detail.size > 0 ) ? 'File size:' + this.convertToKB(event.detail.size) : '';
       },
 
       uploadOk: function(event) {
         this.async(function() {
-          // console.log('uploadOk',this.downloadURL);
+          // console.log('uploadOk',this.downloadUrl);
           var range = this.quill.getSelection();
           var index = 0;
           if (range === null) {  // Fix for Safari
@@ -612,8 +618,8 @@ <h2 id="dialogHeader">Upload Image
             index = range.index;
           }
           // console.log(' -',range,index);
-          if (this.downloadURL) {
-            this.quill.insertEmbed(index, 'image', this.downloadURL, Quill.sources.USER);
+          if (this.downloadUrl) {
+            this.quill.insertEmbed(index, 'image', this.downloadUrl, Quill.sources.USER);
           }          
         },100);
       },
@@ -695,10 +701,40 @@ <h2 id="dialogHeader">Upload Image
       },
 
       toggleHelp: function(event) {
-        console.log('toggleHelp:',this.hideHelp);
+        // console.log('toggleHelp:',this.hideHelp);
         this.hideHelp = !this.hideHelp;
       },
 
+      onPaste: function(event) {
+        // console.log('onPaste:',event);
+        // console.log('onPaste:',this.quill.scrollingContainer.scrollHeight, this.quill.scrollingContainer.scrollTop);
+        // this.quill.focus();    
+        // this.quill.scrollingContainer.
+
+        // 38 up and 40 down
+        // Doing up arrow then down arrow will get you to end of paste
+        // this is not working
+        // var kbe = new KeyboardEvent('keydown',{'keyCode':119,'which':119});
+        // console.log('onPaste:',kbe);
+        // document.dispatchEvent(kbe);
+
+        // var e = new Event('keydown');
+        // e.key='a';    // just enter the char you want to send 
+        // e.keyCode=e.key.charCodeAt(0);
+        // e.keyCode = 38;
+        // e.which=e.keyCode;
+        // e.altKey=false;
+        // e.ctrlKey=true;
+        // e.shiftKey=false;
+        // e.metaKey=false;
+        // e.bubbles=true;
+        // this.async(function() {
+        //   console.log('onPaste:',e);
+        //   this.quill.scrollingContainer.focus();
+        //   this.quill.scrollingContainer.dispatchEvent(e);
+        // },10);
+      },
+
     });
   </script>
 </dom-module>