Merge pull request #166 from hismightiness/development

Development
WillStrohl · May 4, 2017 · ef54e1c · ef54e1c
2 parents 534f4c4 + 5a070b7
commit ef54e1c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/Modules/WillStrohlDisqus/Properties/AssemblyInfo.cs b/Modules/WillStrohlDisqus/Properties/AssemblyInfo.cs
@@ -40,9 +40,9 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("02.01.00")]
+[assembly: AssemblyVersion("02.01.01")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
 
-[assembly: AssemblyFileVersion("02.01.00")]
+[assembly: AssemblyFileVersion("02.01.01")]
diff --git a/Modules/WillStrohlDisqus/View.ascx.cs b/Modules/WillStrohlDisqus/View.ascx.cs
@@ -341,7 +341,7 @@ private string GetDisqusCommentsScript()
             //sb.Append("/* * * DON'T EDIT BELOW THIS LINE * * */");
             AppendToStringBuilder(ref sb, "(function() { ");
             AppendToStringBuilder(ref sb, "var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; ");
-            AppendToStringBuilder(ref sb, "dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; ");
+            AppendToStringBuilder(ref sb, "dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js'; ");
             AppendToStringBuilder(ref sb, "(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); ");
             AppendToStringBuilder(ref sb, "})();");
             AppendToStringBuilder(ref sb, "</script>");
@@ -378,7 +378,7 @@ private void GetDisqusCombinationScript()
             string strModerators = (this.ShowModerators) ? strModerators = "0" : strModerators = "1";
             string strUrl =
                 string.Format(
-                    "<script type=\"text/javascript\" src=\"http://{0}.disqus.com/combination_widget.js?num_items={1}&hide_mods={2}&color={3}&default_tab={4}&excerpt_length={5}\"></script>",
+                    "<script type=\"text/javascript\" src=\"//{0}.disqus.com/combination_widget.js?num_items={1}&hide_mods={2}&color={3}&default_tab={4}&excerpt_length={5}\"></script>",
                     DisqusApplicationName, this.DisplayItems, strModerators, this.ColorTheme, this.DefaultTab,
                     this.CommentLength);
 
@@ -416,7 +416,7 @@ private void GetDisqusRecentCommentsScript()
             var strHeader = string.Format("<h2 class=\"dsq-widget-title\">{0}</h2>", this.GetLocalizedString("RecentComments.Text"));
             this.AppendToStringBuilder(ref sb, strHeader);
             string strAvatar = (this.ShowAvatar) ? strAvatar = "1" : strAvatar="0";
-            string strUrl = string.Format("<script type=\"text/javascript\" src=\"http://{0}.disqus.com/recent_comments_widget.js?num_items={1}&hide_avatars={2}&avatar_size={3}&excerpt_length={4}\"></script>", DisqusApplicationName, this.DisplayItems, strAvatar, this.AvatarSize, this.CommentLength);
+            string strUrl = string.Format("<script type=\"text/javascript\" src=\"//{0}.disqus.com/recent_comments_widget.js?num_items={1}&hide_avatars={2}&avatar_size={3}&excerpt_length={4}\"></script>", DisqusApplicationName, this.DisplayItems, strAvatar, this.AvatarSize, this.CommentLength);
             this.AppendToStringBuilder(ref sb, strUrl);
             var strPoweredBy = string.Format("</div><a href=\"http://disqus.com/\">{0}</a>", this.GetLocalizedString("PoweredBy.Text"));
             this.AppendToStringBuilder(ref sb, strPoweredBy);
@@ -449,7 +449,7 @@ private void GetDisqusPopularThreadScript()
             this.AppendToStringBuilder(ref sb, "<div id=\"popularthreads\" class=\"dsq-widget\">");
             var strHeader = string.Format("<h2 class=\"dsq-widget-title\">{0}</h2>", this.GetLocalizedString("PopularThreads.Text"));
             this.AppendToStringBuilder(ref sb, strHeader);
-            var strUrl = string.Format("<script type=\"text/javascript\" src=\"http://{0}.disqus.com/popular_threads_widget.js?num_items={1}\"></script>", DisqusApplicationName, this.DisplayItems);
+            var strUrl = string.Format("<script type=\"text/javascript\" src=\"//{0}.disqus.com/popular_threads_widget.js?num_items={1}\"></script>", DisqusApplicationName, this.DisplayItems);
             this.AppendToStringBuilder(ref sb, strUrl);
             var strPoweredBy = string.Format("</div><a href=\"http://disqus.com/\">{0}</a>", this.GetLocalizedString("PoweredBy.Text"));
             this.AppendToStringBuilder(ref sb, strPoweredBy);
@@ -482,7 +482,7 @@ private void GetDisqusTopCommentersScript()
             this.AppendToStringBuilder(ref sb, "<h2 class=\"dsq-widget-title\">Top Commenters</h2>");
             string strModerators = (this.ShowModerators) ? strModerators = "0" : strModerators = "1";
             string strAvatar = (this.ShowAvatar) ? strAvatar = "1" : strAvatar="0";
-            var strUrl = string.Format("<script type=\"text/javascript\" src=\"http://{0}.disqus.com/top_commenters_widget.js?num_items={1}&hide_mods={2}&hide_avatars={3}&avatar_size={4}\"></script>", DisqusApplicationName, this.DisplayItems, strModerators, strAvatar, this.AvatarSize);
+            var strUrl = string.Format("<script type=\"text/javascript\" src=\"//{0}.disqus.com/top_commenters_widget.js?num_items={1}&hide_mods={2}&hide_avatars={3}&avatar_size={4}\"></script>", DisqusApplicationName, this.DisplayItems, strModerators, strAvatar, this.AvatarSize);
             var strPoweredBy = string.Format("</div><a href=\"http://disqus.com/\">{0}</a>", this.GetLocalizedString("PoweredBy.Text"));
             this.AppendToStringBuilder(ref sb, strPoweredBy);
 
@@ -624,7 +624,7 @@ private string GetFileUrl(string fileUrl)
 
         private string ResolveUrl(string path)
         {
-            return string.Format("http://{0}{1}", PortalSettings.PortalAlias.HTTPAlias, path);
+            return string.Format("://{0}{1}", PortalSettings.PortalAlias.HTTPAlias, path);
         }
 
         #endregion

diff --git a/Modules/WillStrohlDisqus/WillStrohlDisqus.dnn b/Modules/WillStrohlDisqus/WillStrohlDisqus.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="WillStrohlDisqus" type="Module" version="02.01.00">
+    <package name="WillStrohlDisqus" type="Module" version="02.01.01">
       <friendlyName>Disqus Comments</friendlyName>
       <description>A module that allows you to integrate Disqus Comments anywhere on your DNN website.</description>
       <iconFile>~/DesktopModules/WillStrohlDisqus/Images/disqus-module-icon-100x100.png</iconFile>
@@ -63,15 +63,15 @@
             <script type="UnInstall">
               <path>Providers\DataProviders\SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>02.01.00</version>
+              <version>02.01.01</version>
             </script>
           </scripts>
         </component>
         <component type="Assembly">
           <assemblies>
             <assembly>
               <name>WillStrohlDisqus.dll</name>
-              <version>02.01.00</version>
+              <version>02.01.01</version>
               <path>bin</path>
             </assembly>
           </assemblies>

diff --git a/Modules/WillStrohlDisqus/releasenotes.txt b/Modules/WillStrohlDisqus/releasenotes.txt
@@ -1,4 +1,10 @@
-<h3>Version 02.01.00</h3>
+<h3>Version 02.01.01</h3>
+<p><strong>Date Released:</strong> 06/04/2017</p>
+<ul>
+	<li>Enhancement: SSL compatibility updates</li>
+</ul>
+
+<h3>Version 02.01.00</h3>
 <p><strong>Date Released:</strong> 07/18/2016</p>
 <ul>
 	<li>Enhancement: Built for DNN 8.0+</li>