Resolved issue with new JS/CSS file include enhancement

Blog/Components/BlogModuleBase.vb

@@ -25,109 +25,109 @@ Imports DotNetNuke.Entities.Modules
 Imports DotNetNuke
 
 Public Class BlogModuleBase
- Inherits PortalModuleBase
+  Inherits PortalModuleBase
 
 #Region " Public Constants "
- Public Const RSS_RECENT_ENTRIES As Integer = 0
- Public Const RSS_BLOG_ENTRIES As Integer = 1
- Public Const RSS_SINGLE_ENTRY As Integer = 2
- Public Const RSS_ARCHIV_VIEW As Integer = 3
- Public Const CONTROL_VIEW_VIEWBLOG As String = "ViewBlog.ascx"
- Public Const CONTROL_VIEW_VIEWENTRY As String = "ViewEntry.ascx"
- Public Const CONTROL_VIEW_BLOGFEED As String = "BlogFeed.ascx"
- Public Const ONLINE_HELP_URL As String = ""
- Public Const BLOG_TEMPLATES_RESOURCE As String = "/DesktopModules/Blog/App_LocalResources/BlogTemplates.ascx.resx"
+  Public Const RSS_RECENT_ENTRIES As Integer = 0
+  Public Const RSS_BLOG_ENTRIES As Integer = 1
+  Public Const RSS_SINGLE_ENTRY As Integer = 2
+  Public Const RSS_ARCHIV_VIEW As Integer = 3
+  Public Const CONTROL_VIEW_VIEWBLOG As String = "ViewBlog.ascx"
+  Public Const CONTROL_VIEW_VIEWENTRY As String = "ViewEntry.ascx"
+  Public Const CONTROL_VIEW_BLOGFEED As String = "BlogFeed.ascx"
+  Public Const ONLINE_HELP_URL As String = ""
+  Public Const BLOG_TEMPLATES_RESOURCE As String = "/DesktopModules/Blog/App_LocalResources/BlogTemplates.ascx.resx"
 #End Region
 
 #Region " Public Enums "
 #End Region
 
 #Region " Public Members "
- Public MyActions As New Entities.Modules.Actions.ModuleActionCollection
- Public Shared RssView As RssViews
+  Public MyActions As New Entities.Modules.Actions.ModuleActionCollection
+  Public Shared RssView As RssViews
 #End Region
 
 #Region " Public Methods "
- Public Sub SetModuleConfiguration(ByVal config As Entities.Modules.ModuleInfo)
-  ModuleConfiguration = config
- End Sub
+  Public Sub SetModuleConfiguration(ByVal config As Entities.Modules.ModuleInfo)
+    ModuleConfiguration = config
+  End Sub
 
- Public Sub AddJQuery()
-  Dim alreadyRequested As Boolean = False
-  If HttpContext.Current.Items("jQueryRequested") IsNot Nothing Then
-   alreadyRequested = Convert.ToBoolean(HttpContext.Current.Items("jQueryRequested"))
-  End If
-  If alreadyRequested Then Exit Sub ' let DNN 5 handle it
-  Page.ClientScript.RegisterClientScriptInclude("jQuery", DotNetNuke.Common.ApplicationPath & "/DesktopModules/Blog/js/jquery.min.js")
-  HttpContext.Current.Items("jquery_registered") = True ' let DNN 5 know we've added it
- End Sub
+  Public Sub AddJQuery()
+    Dim alreadyRequested As Boolean = False
+    If HttpContext.Current.Items("jQueryRequested") IsNot Nothing Then
+      alreadyRequested = Convert.ToBoolean(HttpContext.Current.Items("jQueryRequested"))
+    End If
+    If alreadyRequested Then Exit Sub ' let DNN 5 handle it
+    Page.ClientScript.RegisterClientScriptInclude("jQuery", DotNetNuke.Common.ApplicationPath & "/DesktopModules/Blog/js/jquery.min.js")
+    HttpContext.Current.Items("jquery_registered") = True ' let DNN 5 know we've added it
+  End Sub
 #End Region
 
 #Region " Public Properties "
- Public ReadOnly Property BasePage() As DotNetNuke.Framework.CDefault
-  Get
-   Try
-    Return CType(Me.Page, DotNetNuke.Framework.CDefault)
-   Catch
-    Return Nothing
-   End Try
-  End Get
- End Property
+  Public ReadOnly Property BasePage() As DotNetNuke.Framework.CDefault
+    Get
+      Try
+        Return CType(Me.Page, DotNetNuke.Framework.CDefault)
+      Catch
+        Return Nothing
+      End Try
+    End Get
+  End Property
 
- Public Property BlogSettings() As Settings.BlogSettings
-  Get
-   If _blogSettings Is Nothing Then
-    _blogSettings = DotNetNuke.Modules.Blog.Settings.BlogSettings.GetBlogSettings(PortalId, TabId)
-   End If
-   Return _blogSettings
-  End Get
-  Set(ByVal value As Settings.BlogSettings)
-   _blogSettings = value
-  End Set
- End Property
+  Public Property BlogSettings() As Settings.BlogSettings
+    Get
+      If _blogSettings Is Nothing Then
+        _blogSettings = DotNetNuke.Modules.Blog.Settings.BlogSettings.GetBlogSettings(PortalId, TabId)
+      End If
+      Return _blogSettings
+    End Get
+    Set(ByVal value As Settings.BlogSettings)
+      _blogSettings = value
+    End Set
+  End Property
 
- Public Property OutputAdditionalFiles() As Boolean
-  Get
-   Return _outputAdditionalFiles
-  End Get
-  Set(ByVal value As Boolean)
-   _outputAdditionalFiles = value
-  End Set
- End Property
+  Public Property OutputAdditionalFiles() As Boolean
+    Get
+      Return _outputAdditionalFiles
+    End Get
+    Set(ByVal value As Boolean)
+      _outputAdditionalFiles = value
+    End Set
+  End Property
 #End Region
 
 #Region " Private Members "
- Private _blogSettings As Settings.BlogSettings
- Private _outputAdditionalFiles As Boolean = False
+  Private _blogSettings As Settings.BlogSettings
+  Private _outputAdditionalFiles As Boolean = False
 #End Region
 
 #Region " Event Handlers "
- Private Sub Page_Init(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Init
-  Dim script As New StringBuilder
-  script.AppendLine("<script type=""text/javascript"">")
-  script.AppendLine("//<![CDATA[")
-  script.AppendLine(String.Format("var appPath='{0}'", DotNetNuke.Common.ApplicationPath))
-  script.AppendLine("//]]>")
-  script.AppendLine("</script>")
-  UI.Utilities.ClientAPI.RegisterClientScriptBlock(Page, "blogAppPath", script.ToString)
- End Sub
+  Private Sub Page_Init(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Init
+    Dim script As New StringBuilder
+    script.AppendLine("<script type=""text/javascript"">")
+    script.AppendLine("//<![CDATA[")
+    script.AppendLine(String.Format("var appPath='{0}'", DotNetNuke.Common.ApplicationPath))
+    script.AppendLine("//]]>")
+    script.AppendLine("</script>")
+    UI.Utilities.ClientAPI.RegisterClientScriptBlock(Page, "blogAppPath", script.ToString)
+  End Sub
 
- Private Sub Page_PreRender(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.PreRender
-  If OutputAdditionalFiles Then
-   If BlogSettings.AddJQuery Then
-    AddJQuery()
-   End If
-   For Each f As String In BlogSettings.IncludeFiles.Split(";"c)
-    If Not String.IsNullOrEmpty(f) Then
-     If f.ToLower.EndsWith(".js") Then
-      Page.ClientScript.RegisterClientScriptInclude(f.Replace("[", "").Replace("]", "_").Replace("/", "_"), f.Replace("[P]", PortalSettings.HomeDirectory & "/Blog/Include").Replace("[H]", DotNetNuke.Common.ApplicationPath & "/DesktopModules/Blog/include/"))
-     ElseIf f.ToLower.EndsWith(".css") Then
-      CType(Me.Page, DotNetNuke.Framework.CDefault).AddStyleSheet(f.Replace("[", "").Replace("]", "_").Replace("/", "_"), f.Replace("[P]", PortalSettings.HomeDirectory & "/Blog/Include").Replace("[H]", DotNetNuke.Common.ApplicationPath & "/DesktopModules/Blog/include/"))
-     End If
+  Private Sub Page_PreRender(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.PreRender
+    If OutputAdditionalFiles Then
+      If BlogSettings.AddJQuery Then
+        AddJQuery()
+      End If
+      For Each f As String In BlogSettings.IncludeFiles.Split(";"c)
+        If Not String.IsNullOrEmpty(f) Then
+          If f.ToLower.EndsWith(".js") Then
+            Page.ClientScript.RegisterClientScriptInclude(f.Replace("[", "").Replace("]", "_").Replace("/", "_"), f.Replace("[P]", PortalSettings.HomeDirectory & "Blog/Include/").Replace("[H]", DotNetNuke.Common.ApplicationPath & "/DesktopModules/Blog/include/"))
+          ElseIf f.ToLower.EndsWith(".css") Then
+            CType(Me.Page, DotNetNuke.Framework.CDefault).AddStyleSheet(f.Replace("[", "").Replace("]", "_").Replace("/", "_"), f.Replace("[P]", PortalSettings.HomeDirectory & "Blog/Include/").Replace("[H]", DotNetNuke.Common.ApplicationPath & "/DesktopModules/Blog/include/"))
+          End If
+        End If
+      Next
     End If
-   Next
-  End If
- End Sub
+  End Sub
 #End Region
 
 End Class