From 7cd94d0acc0b7d5a5a8de7d2708c34635cf9f854 Mon Sep 17 00:00:00 2001
From: Danang Probo Sayekti <dan@danpros.com>
Date: Fri, 10 Jul 2015 11:54:00 +0700
Subject: [PATCH] Update the JQuery

Update the jquery to 2.1.4 and cleaning up the image upload codes.
---
 system/admin/views/add-page.html.php     | 6 ++++--
 system/admin/views/add-post.html.php     | 6 ++++--
 system/admin/views/edit-page.html.php    | 6 ++++--
 system/admin/views/edit-post.html.php    | 6 ++++--
 system/admin/views/edit-profile.html.php | 6 ++++--
 system/includes/functions.php            | 2 +-
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/system/admin/views/add-page.html.php b/system/admin/views/add-page.html.php
index dec9a06..db8f0e8 100644
--- a/system/admin/views/add-page.html.php
+++ b/system/admin/views/add-page.html.php
@@ -1,5 +1,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
+<?php if (config("jquery") != "enable"):?>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> 
+<?php endif;?> 
 <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
@@ -61,7 +63,7 @@
             autoOpen: false,
             closeOnEscape: false,
             open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-		});
+        });
 		
         var $url = $('input[type=text]', $dialog);
         var $file = $('input[type=file]', $dialog);
@@ -109,7 +111,7 @@
             return true; // tell the editor that we'll take care of getting the image url
         });
 
-    editor.run();
+        editor.run();
 	
     })();
 </script>
\ No newline at end of file
diff --git a/system/admin/views/add-post.html.php b/system/admin/views/add-post.html.php
index cd89143..d67e0ec 100644
--- a/system/admin/views/add-post.html.php
+++ b/system/admin/views/add-post.html.php
@@ -1,5 +1,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
+<?php if (config("jquery") != "enable"):?>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> 
+<?php endif;?> 
 <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
@@ -74,7 +76,7 @@
             autoOpen: false,
             closeOnEscape: false,
             open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-		});
+        });
 		
         var $url = $('input[type=text]', $dialog);
         var $file = $('input[type=file]', $dialog);
@@ -122,7 +124,7 @@
             return true; // tell the editor that we'll take care of getting the image url
         });
 
-    editor.run();
+        editor.run();
 	
     })();
 </script>
\ No newline at end of file
diff --git a/system/admin/views/edit-page.html.php b/system/admin/views/edit-page.html.php
index c4ccc28..b27ca73 100644
--- a/system/admin/views/edit-page.html.php
+++ b/system/admin/views/edit-page.html.php
@@ -22,7 +22,9 @@ $delete = $p->url . '/delete?destination=' . $destination;
 
 ?>
 <link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
+<?php if (config("jquery") != "enable"):?>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> 
+<?php endif;?> 
 <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
@@ -80,7 +82,7 @@ $delete = $p->url . '/delete?destination=' . $destination;
             autoOpen: false,
             closeOnEscape: false,
             open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-		});
+        });
 		
         var $url = $('input[type=text]', $dialog);
         var $file = $('input[type=file]', $dialog);
@@ -128,7 +130,7 @@ $delete = $p->url . '/delete?destination=' . $destination;
             return true; // tell the editor that we'll take care of getting the image url
         });
 
-    editor.run();
+        editor.run();
 	
     })();
 </script>
\ No newline at end of file
diff --git a/system/admin/views/edit-post.html.php b/system/admin/views/edit-post.html.php
index be86fa9..279c03e 100644
--- a/system/admin/views/edit-post.html.php
+++ b/system/admin/views/edit-post.html.php
@@ -37,7 +37,9 @@ $delete = site_url() . date('Y/m', $postdate) . '/' . $oldmd . '/delete?destinat
 
 ?>
 <link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
+<?php if (config("jquery") != "enable"):?>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> 
+<?php endif;?> 
 <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
@@ -104,7 +106,7 @@ $delete = site_url() . date('Y/m', $postdate) . '/' . $oldmd . '/delete?destinat
             autoOpen: false,
             closeOnEscape: false,
             open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-		});
+        });
 		
         var $url = $('input[type=text]', $dialog);
         var $file = $('input[type=file]', $dialog);
@@ -152,7 +154,7 @@ $delete = site_url() . date('Y/m', $postdate) . '/' . $oldmd . '/delete?destinat
             return true; // tell the editor that we'll take care of getting the image url
         });
 
-    editor.run();
+        editor.run();
 	
     })();
 </script>
\ No newline at end of file
diff --git a/system/admin/views/edit-profile.html.php b/system/admin/views/edit-profile.html.php
index 6f3a697..42a528c 100644
--- a/system/admin/views/edit-profile.html.php
+++ b/system/admin/views/edit-profile.html.php
@@ -17,7 +17,9 @@ if (file_exists($filename)) {
 
 ?>
 <link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
+<?php if (config("jquery") != "enable"):?>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> 
+<?php endif;?>
 <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
@@ -69,7 +71,7 @@ if (file_exists($filename)) {
             autoOpen: false,
             closeOnEscape: false,
             open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-		});
+        });
 		
         var $url = $('input[type=text]', $dialog);
         var $file = $('input[type=file]', $dialog);
@@ -117,7 +119,7 @@ if (file_exists($filename)) {
             return true; // tell the editor that we'll take care of getting the image url
         });
 
-    editor.run();
+        editor.run();
 	
     })();
 </script>
\ No newline at end of file
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 4de0677..4f17100 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -1618,7 +1618,7 @@ function head_contents($title, $description, $canonical)
     $canonical = '<link rel="canonical" href="' . $canonical . '" />';
     $feed = '<link rel="alternate" type="application/rss+xml" title="' . blog_title() . ' Feed" href="' . site_url() . 'feed/rss" />';
     $lightboxcss = '<link href="' . site_url() . 'system/plugins/lightbox/css/lightbox.css" rel="stylesheet" />';
-    $jquery = '<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>';
+    $jquery = '<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>';
     $lightbox = '<script src="' . site_url() . 'system/plugins/lightbox/js/lightbox-2.6.min.js"></script>';
     $corejs = '<script src="' . site_url() . 'system/resources/htmly.js"></script>';
     $webmasterTools = '';