In local mode, the site loads individual JS files for more productive…

… development. But in non-local mode, it loads the combined JS files.
elikammah · Aug 3, 2012 · 1d14a0f · 1d14a0f
1 parent d83cf5e
commit 1d14a0f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 19 deletions.
diff --git a/Default.aspx b/Default.aspx
@@ -3,20 +3,21 @@
 
 <asp:Content ContentPlaceHolderID="scripts" runat="server">
     <!-- Copyright 2012 Omar AL Zabir -->
-    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>    
 
-    <script type="text/javascript" src="js/CombinedDashboard.js?v=5"></script>
+<% if (Request.IsLocal) { %>    
     <!-- 
         If you change any of the below javascript files, make sure you run the Combine.bat
         file in the /js folder to generate the CombinedDashboard.js file again. And then don't
         forget to update the ?v=#. Otherwise user's will have cached copies in their browser
         and won't get the newly deployed file. -->
-    <!--
     <script type="text/javascript" src="js/TheCore.js?v=1"></script>
     <script type="text/javascript" src="tiles/tiles.js?v=1"></script>
     <script type="text/javascript" src="js/Dashboard.js?v=1"></script>
-    -->
 
+<% } else { %>    
+    <script type="text/javascript" src="js/CombinedDashboard.js?v=6"></script>
+<% } %>
 
     <script type="text/ecmascript">
         
@@ -99,7 +100,9 @@
             <div id="CombinedScriptAlert" class="alert">
                 <button class="close" data-dismiss="alert">×</button>
                 <strong>Warning!</strong>
-                Combined javascript files are outdated. Please retun the js\Combine.bat file.
+                Combined javascript files are outdated. 
+                Please retun the js\Combine.bat file. 
+                Otherwise it won't work when you will deploy on a server.
             </div>
             <div id="metro-sections-container" class="metro">
                 <div id="trash" class="trashcan">
@@ -142,7 +145,7 @@
                 </div>
             </div>
         </div>
-        <div id="copyright">
+        <div id="copyright">            
             Copyright 2012 <a href="http://omaralzabir.com/">Omar AL Zabir</a>. This is Open Source. 
             For license details and to get the code, <a href="http://oazabir.github.com/Droptiles/">See Droptiles GitHub</a>
         </div>

diff --git a/Default.aspx.cs b/Default.aspx.cs
@@ -17,19 +17,26 @@ protected void Page_Load(object sender, EventArgs e)
             });
     }
 
-    protected string GetAlerts()
+    private bool IsCombinedJSOlder(string path)
     {
-        var jsPath = Server.MapPath("~/js");
+        var jsPath = Context.Server.MapPath(path);
         string[] files = Directory.GetFiles(jsPath);
+
         var combinedFileLastWrite = File.GetLastWriteTime(Server.MapPath("~/js/Combined.js"));
 
-        if (Array.Exists(files, file => (File.GetLastWriteTime(file) - combinedFileLastWrite).TotalSeconds > 5))
+        return Array.Exists(files, file => (File.GetLastWriteTime(file) - combinedFileLastWrite).TotalSeconds > 1);
+    }
+
+    protected string GetAlerts()
+    {
+        if (IsCombinedJSOlder("~/js/") || IsCombinedJSOlder("~/Tiles/"))
         {
             return "$('#CombinedScriptAlert').show();";
         }
         else
         {
             return string.Empty;
         }
+
     }
 }
diff --git a/Droptiles.master b/Droptiles.master
@@ -32,15 +32,13 @@
     </asp:ContentPlaceHolder>
 </body>
 
-
-<script type="text/javascript" src="js/Combined.js?v=4"></script>
-<!-- 
+<% if (Request.IsLocal) { %>    
+    <!-- 
     If you change any of the below javascript files, make sure you run the Combine.bat
     file in the /js folder to generate the CombinedDashboard.js file again. And then don't
     forget to update the ?v=#. Otherwise user's will have cached copies in their browser
     and won't get the newly deployed file. -->
 
-<!--
 <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
 <script type="text/javascript" src="js/jquery-ui-1.8.21.custom.min.js"></script>
 <script type="text/javascript" src="js/jQueryEnhancement.js"></script>
@@ -53,8 +51,11 @@
 <script type="text/javascript" src="js/Underscore.js"></script>
 <script type="text/javascript" src="js/jQuery.hashchange.js"></script>
 <script type="text/javascript" src="js/User.js"></script>
--->
-
+
+<% } else { %>
+<script type="text/javascript" src="js/Combined.js?v=4"></script>
+<% } %>    
+
 <script type="text/javascript">
     // Bootstrap initialization
     $(document).ready(function () {

diff --git a/Tiles/Tiles.js b/Tiles/Tiles.js
@@ -13,7 +13,8 @@ window.DefaultTiles = [
            { id: "amazon1", name:"amazon" },
            { id: "news1", name: "news" },
            { id: "weather1", name: "weather" },
-           { id: "calendar1", name: "calendar" },
+           //{ id: "calendar1", name: "calendar" },
+           { id: "video1", name: "video" },
            { id: "feature1", name: "feature" },
            { id: "facebook1", name: "facebook" }
         ]
@@ -105,6 +106,17 @@ window.TileBuilders = {
         };
     },
 
+    video: function (uniqueId) {
+        return {
+            uniqueId: uniqueId,
+            name: "ie",
+            size: "tile-double",
+            color: "bg-color-darken",
+            iconSrc: "img/Youtube.png",
+            slides: ['<iframe width="310" height="174" src="http://www.youtube.com/embed/IO45ZiGql8E" frameborder="0" allowfullscreen=""></iframe>']
+        };
+    },
+
     facebook: function (uniqueId) {
         return {
             uniqueId: uniqueId,
@@ -186,7 +198,7 @@ window.TileBuilders = {
             name: "email",
             iconSrc: "img/Youtube.png",
             label: "Youtube",
-            color: "bg-color-yellow",
+            color: "bg-color-darken",
             appUrl: "http://www.youtube.com/",
             appInNewWindow: true
         };

diff --git a/js/CombinedDashboard.js b/js/CombinedDashboard.js
@@ -753,7 +753,8 @@ window.DefaultTiles = [
            { id: "amazon1", name:"amazon" },
            { id: "news1", name: "news" },
            { id: "weather1", name: "weather" },
-           { id: "calendar1", name: "calendar" },
+           //{ id: "calendar1", name: "calendar" },
+           { id: "video1", name: "video" },
            { id: "feature1", name: "feature" },
            { id: "facebook1", name: "facebook" }
         ]
@@ -845,6 +846,17 @@ window.TileBuilders = {
         };
     },
 
+    video: function (uniqueId) {
+        return {
+            uniqueId: uniqueId,
+            name: "ie",
+            size: "tile-double",
+            color: "bg-color-darken",
+            iconSrc: "img/Youtube.png",
+            slides: ['<iframe width="310" height="174" src="http://www.youtube.com/embed/IO45ZiGql8E" frameborder="0" allowfullscreen=""></iframe>']
+        };
+    },
+
     facebook: function (uniqueId) {
         return {
             uniqueId: uniqueId,
@@ -926,7 +938,7 @@ window.TileBuilders = {
             name: "email",
             iconSrc: "img/Youtube.png",
             label: "Youtube",
-            color: "bg-color-yellow",
+            color: "bg-color-darken",
             appUrl: "http://www.youtube.com/",
             appInNewWindow: true
         };