Merge pull request #11 from semmel/master

Bug: Node-Webkit toolbar is visible in Popup on Windows
pbojinov · May 20, 2014 · 76d306c · 76d306c
2 parents 577078f + 7335a6e
commit 76d306c
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -48,8 +48,8 @@ Then run the executable/app from /webkitbuilds/release/NW Desktop Notifications
 
 ### Text
 
-![Text Notification](http://i.imgur.com/zibFWHf.png)
+![Text Notification](doc/images/text_notification.png)
 
 ### Image
 
-![Image Notification](http://i.imgur.com/d8lJOy7.png)
+![Image Notification](doc/images/image_notification.png)
diff --git a/doc/images/image_notification.png b/doc/images/image_notification.png
diff --git a/doc/images/text_notification.png b/doc/images/text_notification.png
diff --git a/src/HTML5_Color_Black.png b/src/HTML5_Color_Black.png
diff --git a/src/HTML5_Logo_64.png b/src/HTML5_Logo_64.png
diff --git a/src/HTML5_sticker.png b/src/HTML5_sticker.png
diff --git a/src/app/notifications/HTML5_Color_Black.png b/src/app/notifications/HTML5_Color_Black.png
diff --git a/src/app/notifications/HTML5_Logo_64.png b/src/app/notifications/HTML5_Logo_64.png
diff --git a/src/app/notifications/HTML5_sticker.png b/src/app/notifications/HTML5_sticker.png
diff --git a/src/app/notifications/desktop-notify.png b/src/app/notifications/desktop-notify.png
diff --git a/src/app/notifications/image.html b/src/app/notifications/image.html
@@ -40,12 +40,12 @@
     <div id="notifications">
         <section>
             <div class="icon">
-                <img src="nike-logo.jpg" alt="Notification Icon"/>
+                <img src="HTML5_Logo_64.png" alt="Notification Icon"/>
             </div>
             <div class="title">What is Lorem Ipsum?</div>
             <div class="description">Lorem Ipsum is simply dummy text of the printing and typesetting industry.</div>
             <div class="gallery">
-                <img src="nike.jpg" alt="nikes"/>
+                <img src="HTML5_sticker.png" alt="nikes"/>
                 <div class="highlight">
                     <div class="title">2014 Nike Free 3.0 V4</div>
                 </div>

diff --git a/src/app/notifications/nike-logo.jpg b/src/app/notifications/nike-logo.jpg
diff --git a/src/app/notifications/nike.jpg b/src/app/notifications/nike.jpg
diff --git a/src/app/notifications/text.html b/src/app/notifications/text.html
@@ -17,7 +17,7 @@
     <div id="notifications">
         <section>
             <div class="icon">
-                <img src="nike-logo.jpg" alt="Notification Icon"/>
+                <img src="HTML5_Logo_64.png" alt="Notification Icon"/>
             </div>
             <div class="title">What is Lorem Ipsum?</div>
             <div class="description">Lorem Ipsum is simply dummy text.</div>

diff --git a/src/desktop-notify.jpg b/src/desktop-notify.jpg
diff --git a/src/index.html b/src/index.html
@@ -124,7 +124,7 @@ <h1>Notifications Demo</h1>
 
     <p>
         <label for="iconUrl">Icon URL (optional): </label> <br>
-        <input id="iconUrl" name='icon' type='text' value='desktop-notify.jpg' />
+        <input id="iconUrl" name='icon' type='text' value='HTML5_Color_Black.png' />
     </p>
 
     <p>
@@ -156,7 +156,7 @@ <h1>Notifications Demo</h1>
     $demoForm.find('input[name=notificationType]').change(function() {
         if (this.value == 'image') {
             $('#submissionButton').prepend('<p id="imageUrl"><label>Image URL</label><br>' +
-            '<input name="imageUrl" type="text" value="nike.jpg"/></p>');
+            '<input name="imageUrl" type="text" value="HTML5_sticker.png"/></p>');
 
             $('#submissionButton').prepend('<p id="imageTitle"><label>Image Title</label><br>' +
                 '<input name="imageTitle" type="text" value="2014 Nike Free 3.0 V4 Shoes"/></p>');

diff --git a/src/nike.jpg b/src/nike.jpg
diff --git a/src/nw-desktop-notifications.html b/src/nw-desktop-notifications.html
@@ -65,7 +65,7 @@
 					<!--else if(n.length > LIMIT_FOR_TRUNKATING_MESSAGES){-->
 						<!--var toinsert = "<section>"+-->
 							<!--"<div class='icon'>" +-->
-								<!--"<img src='desktop-notify.png' />" +-->
+								<!--"<img src='HTML5_Color_Black.png' />" +-->
 							<!--"</div>" +-->
 							<!--"<div class='title'>Application Name Here</div>" +-->
 							<!--"<div class='description'>"+n.length+" new cards.</div>" +-->

diff --git a/src/nw-desktop-notifications.js b/src/nw-desktop-notifications.js