Merge branch 'prototype-1.7.3' into 'master'

lib: Upgrade Prototype from 1.7 to 1.7.3

Are you sure you want these as separate merge requests?  The rest of the upgrades are much less invasive than Dojo, with essentially no changes outside of `lib`.  I would of course leave them as separate commits in any case, but I had assumed they would be more convenient to test in one batch.

See merge request !39

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 6795236d5310b4b28063c92fd25e24687c8d8a34..faef0900fc05b779c771e756c63653c11cefd7cb 100755 (executable)
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1411,6 +1411,7 @@ class Pref_Feeds extends Handler_Protected {
                <div dojoType=\"fox.PrefFeedTree\" id=\"feedTree\"
                        dndController=\"dijit.tree.dndSource\"
                        betweenThreshold=\"5\"
+                       autoExpand='true'
                        model=\"feedModel\" openOnClick=\"false\">
                <script type=\"dojo/method\" event=\"onClick\" args=\"item\">
                        var id = String(item.id);

diff --git a/css/dijit.css b/css/dijit.css
index 68a426e3ce223fbf225051430350910346b0eb91..dc8b40a6ac6d082e63ae2b5ec0959c5beb56e71a 100644 (file)
--- a/css/dijit.css
+++ b/css/dijit.css
@@ -94,10 +94,6 @@
        background : white;
 }
 
-.claro #feedTree.dijitTree .dijitTreeRowSelected {
-       box-shadow : -1px 0px 2px -1px rgba(0,0,0,0.1);
-}
-
 .claro .dijitTree .dijitTreeRowHover {
        background : #f0f0f0;
        border-color : #ddd;

diff --git a/css/tt-rss.css b/css/tt-rss.css
index 5003816b22edf68d6fb9ed1515e3b051c19ee18b..1604ba78a9e459dd27dd69dc38419ecf9c831097 100644 (file)
--- a/css/tt-rss.css
+++ b/css/tt-rss.css
@@ -1057,18 +1057,28 @@ span.sel_links {
        vertical-align  : middle;
 }
 
-#feedTree img.feedIcon {
+/*#feedTree img.feedIcon {
        position : relative;
        top : -2px;
+}*/
+
+body#ttrssMain.claro #feedTree.dijitTree .dijitTreeNode .dijitTreeRowSelected {
+       box-shadow : -1px 0px 2px -1px rgba(0,0,0,0.1);
+       border-right-color : white;
 }
 
-body#ttrssMain #feedTree .dijitTreeRow {
+body#ttrssMain #feedTree.dijitTree .dijitTreeNode .dijitTreeRow {
        padding : 2px 0px 2px;
        height : 22px;
        border-width : 1px;
        color : #333;
 }
 
+body#ttrssMain #feedTree.dijitTree img.tinyFeedIcon {
+       position : relative;
+       top : -2px;
+}
+
 ul#filterDlg_Matches li div.dijitCheckBox, ul#filterDlg_Actions li div.dijitCheckBox {
        margin-right : 5px;
 }
@@ -1106,11 +1116,14 @@ body#ttrssMain #feedTree .counterNode {
        height : 14px;
 }
 
-#feedTree img[src*='indicator_white.gif'] {
+body#ttrssMain #feedTree .dijitTreeNode .loadingExpando {
+       left : -3px;
+       height : 22px;
        position : relative;
-       top : -2px;
+       top : -3px;
 }
 
+
 span.highlight {
        background-color : #ffff00;
        color : #cc90cc;

diff --git a/js/FeedTree.js b/js/FeedTree.js
index 320f9926418a5196f2022be991fdb09f03664a0f..a78537fea65af161f8d7de2ab04406b8f9b01fd7 100644 (file)
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -386,6 +386,7 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
                                } else {
                                        var icon = dojo.doc.createElement('img');
                                        icon.src = src;
+                                       icon.className = 'loadingExpando';
                                        domConstruct.place(icon, treeNode.expandoNode, 'only');
                                        return true;
                                }