From 6e2b4ebf3e9aae10ae73680877bd085ed80d258e Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sat, 12 May 2018 11:20:43 +0100 Subject: [PATCH] Remove print-tiddler-window button for v5.1.17 We'll reconsider it for v5.1.18 --- core/language/en-GB/Buttons.multids | 2 -- core/modules/startup/windows.js | 5 ----- core/ui/ViewToolbar/print-window.tid | 18 ------------------ core/wiki/config/ViewToolbarButtons.multids | 1 - core/wiki/tags/ViewToolbar.tid | 2 +- .../messages/WidgetMessage_ tm-open-window.tid | 1 - .../tiddlers/releasenotes/Release 5.1.17.tid | 4 ---- languages/de-DE/Buttons.multids | 2 -- languages/zh-Hans/Buttons.multids | 2 -- languages/zh-Hant/Buttons.multids | 2 -- 10 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 core/ui/ViewToolbar/print-window.tid diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index 8466901f8..cddf68485 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -82,8 +82,6 @@ Permaview/Caption: permaview Permaview/Hint: Set browser address bar to a direct link to all the tiddlers in this story Print/Caption: print page Print/Hint: Print the current page -PrintWindow/Caption: print in new window -PrintWindow/Hint: Print tiddler in new window Refresh/Caption: refresh Refresh/Hint: Perform a full refresh of the wiki Save/Caption: ok diff --git a/core/modules/startup/windows.js b/core/modules/startup/windows.js index 18456225b..69966f346 100644 --- a/core/modules/startup/windows.js +++ b/core/modules/startup/windows.js @@ -29,7 +29,6 @@ exports.startup = function() { title = event.param || event.tiddlerTitle, paramObject = event.paramObject || {}, template = paramObject.template || "$:/core/templates/single.tiddler.window", - print = paramObject.print === "yes", width = paramObject.width || "700", height = paramObject.height || "600", variables = $tw.utils.extend({},paramObject,{currentTiddler: title}); @@ -63,10 +62,6 @@ exports.startup = function() { var parser = $tw.wiki.parseTiddler(template), widgetNode = $tw.wiki.makeWidget(parser,{document: srcDocument, parentWidget: $tw.rootWidget, variables: variables}); widgetNode.render(srcDocument.body,srcDocument.body.firstChild); - // Print the window if required - if(print) { - srcWindow.print(); - } // Function to handle refreshes refreshHandler = function(changes) { if(styleWidgetNode.refresh(changes,styleContainer,null)) { diff --git a/core/ui/ViewToolbar/print-window.tid b/core/ui/ViewToolbar/print-window.tid deleted file mode 100644 index 692f0317e..000000000 --- a/core/ui/ViewToolbar/print-window.tid +++ /dev/null @@ -1,18 +0,0 @@ -title: $:/core/ui/Buttons/print-window -tags: $:/tags/ViewToolbar -caption: {{$:/core/images/print-button}} {{$:/language/Buttons/PrintWindow/Caption}} -description: {{$:/language/Buttons/PrintWindow/Hint}} - -\whitespace trim -<$button tooltip={{$:/language/Buttons/PrintWindow/Hint}} aria-label={{$:/language/Buttons/PrintWindow/Caption}} class=<>> -<$action-sendmessage $message="tm-open-window" print="yes"/> -<$list filter="[prefix[yes]]"> -{{$:/core/images/print-button}} - -<$list filter="[prefix[yes]]"> - -<$text text=" "/> -<$text text={{$:/language/Buttons/PrintWindow/Caption}}/> - - - \ No newline at end of file diff --git a/core/wiki/config/ViewToolbarButtons.multids b/core/wiki/config/ViewToolbarButtons.multids index 16d38f450..5d4ab8d23 100644 --- a/core/wiki/config/ViewToolbarButtons.multids +++ b/core/wiki/config/ViewToolbarButtons.multids @@ -10,7 +10,6 @@ core/ui/Buttons/new-journal-here: hide core/ui/Buttons/open-window: hide core/ui/Buttons/permalink: hide core/ui/Buttons/permaview: hide -core/ui/Buttons/print-window: hide core/ui/Buttons/delete: hide core/ui/Buttons/fold: hide core/ui/Buttons/fold-bar: hide diff --git a/core/wiki/tags/ViewToolbar.tid b/core/wiki/tags/ViewToolbar.tid index a2d51b234..ee0033d35 100644 --- a/core/wiki/tags/ViewToolbar.tid +++ b/core/wiki/tags/ViewToolbar.tid @@ -1,2 +1,2 @@ title: $:/tags/ViewToolbar -list: [[$:/core/ui/Buttons/more-tiddler-actions]] [[$:/core/ui/Buttons/info]] [[$:/core/ui/Buttons/new-here]] [[$:/core/ui/Buttons/new-journal-here]] [[$:/core/ui/Buttons/clone]] [[$:/core/ui/Buttons/export-tiddler]] [[$:/core/ui/Buttons/edit]] [[$:/core/ui/Buttons/delete]] [[$:/core/ui/Buttons/permalink]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/print-window]] [[$:/core/ui/Buttons/open-window]] [[$:/core/ui/Buttons/close-others]] [[$:/core/ui/Buttons/close]] [[$:/core/ui/Buttons/fold-others]] [[$:/core/ui/Buttons/fold]] +list: [[$:/core/ui/Buttons/more-tiddler-actions]] [[$:/core/ui/Buttons/info]] [[$:/core/ui/Buttons/new-here]] [[$:/core/ui/Buttons/new-journal-here]] [[$:/core/ui/Buttons/clone]] [[$:/core/ui/Buttons/export-tiddler]] [[$:/core/ui/Buttons/edit]] [[$:/core/ui/Buttons/delete]] [[$:/core/ui/Buttons/permalink]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/open-window]] [[$:/core/ui/Buttons/close-others]] [[$:/core/ui/Buttons/close]] [[$:/core/ui/Buttons/fold-others]] [[$:/core/ui/Buttons/fold]] diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-open-window.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-open-window.tid index f77bf4630..dad280772 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-open-window.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-open-window.tid @@ -12,7 +12,6 @@ The `tm-open-window` message opens a tiddler in a new //browser// window. If no |template |Template in which the tiddler will be rendered in | |width |Width of the new browser window | |height |Height of the new browser window | -|print |Set to "yes" to trigger opening of the browser print dialogue | |paramObject |Hashmap of variables that will be provided to the window | diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid index 8dd66d051..ecb1c97e0 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid @@ -15,10 +15,6 @@ After encountering significant problems we've reluctantly decided to [[remove su * [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/7468ad7acf1ca2280ad89ee014484928e160f54b]] appearance of ~TiddlyWiki's "red screen of embarrassment" -!! Hackability Improvements - -* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/523060e8233310dffef068f0016f915d743d0f39]] new "print tiddler" button to the tiddler view toolbar - !! Bug Fixes * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/e6466b2c320cdab46a74aa343b6c56c5783e3f94]] problem with extraneous space in new journal titles diff --git a/languages/de-DE/Buttons.multids b/languages/de-DE/Buttons.multids index 8b326b6e3..ac9ae808e 100644 --- a/languages/de-DE/Buttons.multids +++ b/languages/de-DE/Buttons.multids @@ -82,8 +82,6 @@ Permaview/Caption: Permaview Permaview/Hint: Die Adressleiste des Browsers enthält einen Link zu allen offenen Tiddlern in dieser Story Print/Caption: Seite drucken Print/Hint: Aktuelle Seite drucken -PrintWindow/Caption: Drucken in neuem Fenster -PrintWindow/Hint: Tiddler zum Drucken in neuem Fenster öffnen Refresh/Caption: Aktualisieren Refresh/Hint: Die Seite wird neu in den Browser geladen Save/Caption: Fertig diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids index a5d88b32f..f6c074180 100644 --- a/languages/zh-Hans/Buttons.multids +++ b/languages/zh-Hans/Buttons.multids @@ -82,8 +82,6 @@ Permaview/Caption: 永久链接 Permaview/Hint: 设置浏览器网址栏为直接链接到当前所有已开启条目 Print/Caption: 打印页面 Print/Hint: 打印当前页面 -PrintWindow/Caption: 在新窗口中打印 -PrintWindow/Hint: 在新窗口中打印条目 Refresh/Caption: 刷新 Refresh/Hint: 执行维基的完全刷新 Save/Caption: 确定 diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index 16c847f0b..9f7477650 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -82,8 +82,6 @@ Permaview/Caption: 固定連結 Permaview/Hint: 設定瀏覽器網址列為直接連結到當前所有已開啟條目 Print/Caption: 列印頁面 Print/Hint: 列印當前頁面 -PrintWindow/Caption: 在新視窗中列印 -PrintWindow/Hint: 在新視窗中列印條目 Refresh/Caption: 重新整理 Refresh/Hint: 執行維基的完全刷新 Save/Caption: 確定