From 6696d2e85aa4956020aa4ca8fd84fc4fe5172529 Mon Sep 17 00:00:00 2001 From: epriestley Date: Sun, 16 Feb 2014 13:15:59 -0800 Subject: [PATCH] Remove spinner GIF for loading tokenizers Summary: Ref T4420. I think the border is good enough without this spinny thing, and it needs a lot of code. Test Plan: Used typeahead. Reviewers: chad, btrahan Reviewed By: chad CC: chad, aran Maniphest Tasks: T4420 Differential Revision: https://secure.phabricator.com/D8249 --- resources/celerity/map.php | 77 +++++++++--------- webroot/rsrc/css/aphront/typeahead.css | 14 ---- .../lib/control/tokenizer/Tokenizer.js | 9 -- .../lib/control/typeahead/Typeahead.js | 13 --- .../rsrc/image/loading/tokenizer_loading.gif | Bin 2545 -> 0 bytes webroot/rsrc/js/core/Prefab.js | 6 -- 6 files changed, 38 insertions(+), 81 deletions(-) delete mode 100644 webroot/rsrc/image/loading/tokenizer_loading.gif diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 17b8e93a78..4968733823 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,14 +7,14 @@ return array( 'names' => array( - 'core.pkg.css' => '1ccefdc6', - 'core.pkg.js' => '92f2c0a7', + 'core.pkg.css' => '244a9d51', + 'core.pkg.js' => '5f6c1d14', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '6aef439e', 'differential.pkg.js' => '322ea941', 'diffusion.pkg.css' => '3783278d', 'diffusion.pkg.js' => '7b51e80a', - 'javelin.pkg.js' => '133881a7', + 'javelin.pkg.js' => 'b771965e', 'maniphest.pkg.css' => 'f1887d71', 'maniphest.pkg.js' => '1e8f11af', 'rsrc/css/aphront/aphront-bars.css' => '231ac33c', @@ -36,7 +36,7 @@ return array( 'rsrc/css/aphront/tooltip.css' => '9c90229d', 'rsrc/css/aphront/transaction.css' => 'ce491938', 'rsrc/css/aphront/two-column.css' => '16ab3ad2', - 'rsrc/css/aphront/typeahead.css' => 'd24b4228', + 'rsrc/css/aphront/typeahead.css' => '271456a1', 'rsrc/css/application/auth/auth.css' => '1e655982', 'rsrc/css/application/base/main-menu-view.css' => 'd36e0c11', 'rsrc/css/application/base/notification-menu.css' => 'fc9a363c', @@ -207,8 +207,8 @@ return array( 'rsrc/externals/javelin/lib/__tests__/URI.js' => 'ece3ddb3', 'rsrc/externals/javelin/lib/__tests__/behavior.js' => 'c1d75ee6', 'rsrc/externals/javelin/lib/behavior.js' => '8a3ed18b', - 'rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js' => '1c1a6cdf', - 'rsrc/externals/javelin/lib/control/typeahead/Typeahead.js' => 'caab854b', + 'rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js' => 'e7c21fb3', + 'rsrc/externals/javelin/lib/control/typeahead/Typeahead.js' => 'c54eeefb', 'rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js' => '5f850b5c', 'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js' => '0136cec1', 'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js' => '7383383f', @@ -287,7 +287,6 @@ return array( 'rsrc/image/loading/loading_48.gif' => '6a4994c7', 'rsrc/image/loading/loading_d48.gif' => 'cdcbe900', 'rsrc/image/loading/loading_w24.gif' => '7662fa2b', - 'rsrc/image/loading/tokenizer_loading.gif' => '93622511', 'rsrc/image/main_texture.png' => '29a2c5ad', 'rsrc/image/menu_texture.png' => '5a17580d', 'rsrc/image/people/harding.png' => '45aa614e', @@ -432,7 +431,7 @@ return array( 'rsrc/js/core/KeyboardShortcutManager.js' => 'ad7a69ca', 'rsrc/js/core/MultirowRowManager.js' => 'e7076916', 'rsrc/js/core/Notification.js' => '95944043', - 'rsrc/js/core/Prefab.js' => '88ca7175', + 'rsrc/js/core/Prefab.js' => '0c73646e', 'rsrc/js/core/ShapedRequest.js' => 'dfa181a4', 'rsrc/js/core/TextAreaUtils.js' => 'b3ec3cfc', 'rsrc/js/core/ToolTip.js' => '0a81ea29', @@ -492,7 +491,7 @@ return array( 'aphront-tokenizer-control-css' => '08ea6326', 'aphront-tooltip-css' => '9c90229d', 'aphront-two-column-view-css' => '16ab3ad2', - 'aphront-typeahead-control-css' => 'd24b4228', + 'aphront-typeahead-control-css' => '271456a1', 'auth-css' => '1e655982', 'config-options-css' => '7fedf08b', 'conpherence-menu-css' => '561348ac', @@ -641,8 +640,8 @@ return array( 'javelin-request' => '23f9bb8d', 'javelin-resource' => '356de121', 'javelin-stratcom' => 'c293f7b9', - 'javelin-tokenizer' => '1c1a6cdf', - 'javelin-typeahead' => 'caab854b', + 'javelin-tokenizer' => 'e7c21fb3', + 'javelin-typeahead' => 'c54eeefb', 'javelin-typeahead-composite-source' => '0136cec1', 'javelin-typeahead-normalizer' => '5f850b5c', 'javelin-typeahead-ondemand-source' => '7383383f', @@ -701,7 +700,7 @@ return array( 'phabricator-object-list-view-css' => '1a1ea560', 'phabricator-object-selector-css' => '029a133d', 'phabricator-phtize' => 'd254d646', - 'phabricator-prefab' => '88ca7175', + 'phabricator-prefab' => '0c73646e', 'phabricator-profile-css' => '3a7e04ca', 'phabricator-project-tag-css' => '095c9404', 'phabricator-remarkup-css' => 'ca7f2265', @@ -860,6 +859,19 @@ return array( 1 => 'javelin-install', 2 => 'javelin-dom', ), + '0c73646e' => + array( + 0 => 'javelin-install', + 1 => 'javelin-util', + 2 => 'javelin-dom', + 3 => 'javelin-typeahead', + 4 => 'javelin-tokenizer', + 5 => 'javelin-typeahead-preloaded-source', + 6 => 'javelin-typeahead-ondemand-source', + 7 => 'javelin-dom', + 8 => 'javelin-stratcom', + 9 => 'javelin-util', + ), '0e34ca02' => array( 0 => 'javelin-behavior', @@ -916,13 +928,6 @@ return array( 4 => 'javelin-workflow', 5 => 'phabricator-draggable-list', ), - '1c1a6cdf' => - array( - 0 => 'javelin-dom', - 1 => 'javelin-util', - 2 => 'javelin-stratcom', - 3 => 'javelin-install', - ), '1e1c8a59' => array( 0 => 'javelin-behavior', @@ -1361,19 +1366,6 @@ return array( 6 => 'javelin-history', 7 => 'javelin-vector', ), - '88ca7175' => - array( - 0 => 'javelin-install', - 1 => 'javelin-util', - 2 => 'javelin-dom', - 3 => 'javelin-typeahead', - 4 => 'javelin-tokenizer', - 5 => 'javelin-typeahead-preloaded-source', - 6 => 'javelin-typeahead-ondemand-source', - 7 => 'javelin-dom', - 8 => 'javelin-stratcom', - 9 => 'javelin-util', - ), '8a3ed18b' => array( 0 => 'javelin-magical-init', @@ -1650,6 +1642,13 @@ return array( 1 => 'javelin-stratcom', 2 => 'javelin-behavior', ), + 'c54eeefb' => + array( + 0 => 'javelin-install', + 1 => 'javelin-dom', + 2 => 'javelin-vector', + 3 => 'javelin-util', + ), 'c60f4327' => array( 0 => 'javelin-stratcom', @@ -1683,13 +1682,6 @@ return array( 0 => 'javelin-install', 1 => 'javelin-util', ), - 'caab854b' => - array( - 0 => 'javelin-install', - 1 => 'javelin-dom', - 2 => 'javelin-vector', - 3 => 'javelin-util', - ), 'cd9e7094' => array( 0 => 'javelin-behavior', @@ -1830,6 +1822,13 @@ return array( 2 => 'javelin-dom', 3 => 'javelin-util', ), + 'e7c21fb3' => + array( + 0 => 'javelin-dom', + 1 => 'javelin-util', + 2 => 'javelin-stratcom', + 3 => 'javelin-install', + ), 'e9b95df3' => array( 0 => 'javelin-install', diff --git a/webroot/rsrc/css/aphront/typeahead.css b/webroot/rsrc/css/aphront/typeahead.css index cdeeb3d6eb..ecf1297dde 100644 --- a/webroot/rsrc/css/aphront/typeahead.css +++ b/webroot/rsrc/css/aphront/typeahead.css @@ -48,20 +48,6 @@ input.jx-typeahead-placeholder { color: {$lightgreytext}; } -.jx-typeahead-waiting-indicator { - position: absolute; - right: 8px; - top: 2px; - width: 24px; - height: 24px; - background-image: url(/rsrc/image/loading/tokenizer_loading.gif); - display: none; -} - -.jx-typeahead-waiting .jx-typeahead-waiting-indicator { - display: inline-block; -} - div.jx-tokenizer-container-focused.jx-typeahead-waiting { border-color: {$lightblueborder}; } diff --git a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js index 7ebe2f6bcd..4465f7f91b 100644 --- a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js +++ b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js @@ -36,7 +36,6 @@ JX.install('Tokenizer', { construct : function(containerNode) { this._containerNode = containerNode; - this._uiNodes = []; }, events : [ @@ -64,7 +63,6 @@ JX.install('Tokenizer', { _seq : 0, _lastvalue : null, _placeholder : null, - _uinodes : null, start : function() { if (__DEV__) { @@ -126,7 +124,6 @@ JX.install('Tokenizer', { this._root = root; root.appendChild(focus); - JX.DOM.appendContent(root, this._uiNodes); var typeahead = this._typeahead; typeahead.setInputNode(this._focus); @@ -235,12 +232,6 @@ JX.install('Tokenizer', { return this; }, - addUINode : function(node) { - this._uiNodes.push(node); - this._typeahead.addUINode(node); - return this; - }, - _redraw : function(force) { // If there are tokens in the tokenizer, never show a placeholder. diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js index 98a3adc7db..d6d5fbd1ee 100644 --- a/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js +++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js @@ -196,19 +196,6 @@ JX.install('Typeahead', { return this; }, - /** - * Add an arbitrary node to the UI. Phabricator uses this to add a - * "waiting" graphic. - * - * @param node An arbitrary display node for the UI. - * @return this - * @task config - */ - addUINode : function(node) { - JX.DOM.appendContent(this._hardpoint, node); - return this; - }, - /** * Hide the typeahead's dropdown suggestion menu. diff --git a/webroot/rsrc/image/loading/tokenizer_loading.gif b/webroot/rsrc/image/loading/tokenizer_loading.gif deleted file mode 100644 index 7ac990cf04f2323f9723518bfd72ce102222cefa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2545 zcma*pYg7~I83*u}xzA)~n25ScX&WZP5>nU=1T3OL6cUK&3gY5=2L-vPKosR#4J1Gy z2{*Y2f`*F<925Z+DqcWPab1;V*Q&?%tge1gx39sBO@dC?%nI@=>b1`dA^f;rd<;kzBEP~@QDg`5nuHDmwWi`ccB(8fJu!D@W@6GOX&Kuyf#(~9#Kot4om)5$3D8qAS)~A$Ca-6yH;bP-YR%)e z*uVwm#a35*X`LHGj32c;jsl4QZfgsvW!V?{2-SqnJnoXXF*nkrHs1S%=LGrPst~{V zbIXcXr&l++uUTGfQbH(6qL7Kn#+Xt|g{`v4+z9V)In}XN;&Aif7dZ&S7naR;h=?Fn^{lc|@~&lZlv?W9&si{Zho3Zq zBNC0W8pT9f=}<$GQHasxVL1urLe*G$-i1I28VmOw4D1-nlxMUF7p{*V9W9#? zG3-PbWllts&>7IxQA0d2*lgcSw`;G+rpt*+JWGhuM10z1YIElzOCrY2>B0NtO_MPS zMFf29+_^(8vP$B!PKEl9XU62S@@i=sRcJ^lp7MFFlGzbm>4Ok7O@u`=7$RC~4%Sy4 zYHq1ICcqWPd4_@-lucMS20@nSCdAI1T?+2+dcgowe`%@+K-I${;uYHgEWPq*J&<;{Drqc!cL#1&wL zi~k_=rv}{|hWqv;9yTrI81Aln{6ubW*40;m3xk6_R;~^o)wq1blF3R~tzpvi6+Rf{ zO@-+>SE~;p9EM~ zU%BS@TGN0@Gf>_;Jmxbp+J13zX24k|z@bQPb{EF0CmfYbxJ~O%k&CRSN)_G#!raT! zB2RD$R7b>ld3eqnaC6j5`6O>B8pXLa+91{US;KR#c0HAi>FV66qJsEf-$^exLCvJ- z%W|Bbzf?`*EQ`~OSQ*Od+B(aTqp3|iTw(MPFU$~VJ?;aGI!+E-Q!o?glyj^!ZbYbP z<81oFtestXwVDMoCi>Qzy^KTP|UDdNG+sSR`)Vuyu=yjHg}M zH5*jBS^y(;6%bRP17M-JlrwwBuLqQr?LxNQ2Ap(AZMr6W(R`uRYsO5SbV3s5B{#F3 z?bTf&Y=oM+5~VulI}4c$ywg?lF2$O-J>>{pyh0HWwX(|vc5$0dm&0?WCd+4+EVI!Y zSIvL^QCh;@6C7H)WSzV1jZquFVu}7kr(#T4NoZNQwWz+Hsot|!kK&TG%XbyRqHrU> zrDUs0vWz(H*cQ)oToQ|KQbzl`y7D9&Rj64em4>mS`oNM&In6ragv)*h3eOeJDClzv zrUIRU#P6attq&SbC2NImfWuB$|KFHY&nHXNgaXGshn8el`2t4$ssAr zg-enc+Mjah;dVLBDhMKtMEzQ6_8=ffITG6I%4%_Z1t~EgEIs%Y50R-}{lXPtaRnGM z%m{fOr=JJ$_yGCStL)*PzUStktKI5vCo@J|sw0KJ8P70OktWe{=ZBoUg49f1TqwLl zj*zTG2hq?vo)*iz!b|MDT0pU`bU3<|A(po40|gRSfg_q4KxI5qwo& z&vU_ttugmMuaC9=bfLnK70l9k%ub9E@1oeeAm5%70H@0l36AOzh_dm7SnIW36a>X1 zM~QH{g@HC5TaYNAZGeh}>7I}Ph};P1A^_1^orKh*jUSKaVq_nG>tL@gP?*|emk;O8 z$Qb+&V?7I{%@YTZ<%k{ecMc$xmSy4qQV}Kg5