-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #795 from superdesk/master
Update devel with latest changes in master.
- Loading branch information
Showing
61 changed files
with
1,337 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,16 @@ | ||
| @echo off | ||
| @echo on | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o core.js | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o default.js | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o zeit_solo-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o zeit-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o rp-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o nzz-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o rhrnt.js | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o rhrnt-section.js | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o brasil247.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o core.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o default.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o zeit_solo-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o zeit-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o rp-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o nzz-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o rhrnt.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o rhrnt-section.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o brasil247.js | ||
|
|
||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o tageswoche-solo-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss128m org.mozilla.javascript.tools.shell.Main r.js -o tageswoche-multi-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o tageswoche-solo-desktop.js | ||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o tageswoche-multi-desktop.js | ||
|
|
||
| java -classpath js.jar;compiler.jar -Xss100m org.mozilla.javascript.tools.shell.Main r.js -o sf-internal.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| ({ | ||
| closure: { | ||
| CompilerOptions: {}, | ||
| CompilationLevel: 'SIMPLE_OPTIMIZATIONS', | ||
| loggingLevel: 'WARNING' | ||
| }, | ||
| paths: { | ||
| 'theme': '../../../gui-themes/themes/sf-internal', | ||
| 'themeFile': '../../../gui-themes/themes/sf-internal', | ||
| 'themeBase': '../../../gui-themes/themes/base', | ||
|
|
||
| 'require': 'core/require', | ||
|
|
||
| 'tmpl': 'core/require/tmpl', | ||
| 'css': 'core/require/css', | ||
| 'normalize': 'core/require/normalize', | ||
| 'i18n': 'core/require/i18n', | ||
|
|
||
| 'jquery-path': 'core/jquery', | ||
| 'jquery': 'core/jquery', | ||
| 'dust': 'core/dust', | ||
| 'utils': 'core/utils', | ||
| 'gettext': 'core/gettext', | ||
| 'gizmo': 'core/gizmo' | ||
| }, | ||
| baseUrl: '../gui-resources/scripts/js', | ||
| mainConfigFile: '../gui-themes/themes/sf-internal.js', | ||
| name: 'themeFile', | ||
| out: '../gui-themes/themes/sf-internal.min.js', | ||
| preserveLicenseComments: false, | ||
| optimize: 'closure', | ||
| excludeShallow: [ | ||
| 'jquery', | ||
| 'jquery/utils', | ||
| 'jquery/i18n', | ||
| 'jquery/cookie', | ||
| 'jquery/tmpl', | ||
| 'tmpl', | ||
|
|
||
| 'gettext', | ||
| 'dispatcher', | ||
|
|
||
| 'utils/str', | ||
| 'utils/utf8', | ||
| 'utils/utf8-pass', | ||
| 'utils/twitter', | ||
| 'utils/json_parse', | ||
| 'utils/extend', | ||
| 'utils/class', | ||
|
|
||
| 'dust', | ||
| 'dust/core', | ||
| 'dust/dust', | ||
| 'dust/parser', | ||
| 'dust/compiler', | ||
| 'dust/dust-helpers', | ||
| 'dust/i18n_parse', | ||
|
|
||
| 'gizmo', | ||
| 'gizmo/superdesk', | ||
|
|
||
| 'css', | ||
| 'require/css', | ||
| 'require/normalize', | ||
|
|
||
| 'require/tmpl', | ||
| 'tmpl!themeBase/item/base' | ||
| ] | ||
| }) |
72 changes: 37 additions & 35 deletions
72
plugins/livedesk-embed/gui-resources/scripts/js/plugins/permanent-link.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,38 @@ | ||
| define([ | ||
| 'jquery', | ||
| 'plugins', | ||
| 'plugins/post-hash', | ||
| 'dispatcher' | ||
| ], function($, plugins, postHashPlugin){ | ||
| delete plugins['post-hash']; | ||
| return plugins['permalink'] = function(config) { | ||
|
|
||
| postHashPlugin(config); | ||
| var propName = 'visibility', | ||
| propValue = { 'show': 'visible', 'hide': 'hidden' }; | ||
|
|
||
| $.dispatcher.on('class.posts-view', function(evt){ | ||
| var view = this.prototype; | ||
| view.events['[data-gimme="post.share-permalink"]'] = { "click focus": "permalinkInput" } | ||
| view.permalinkInput = function(evt){ | ||
| $(evt.target).select(); | ||
| } | ||
|
|
||
| view.events['[data-gimme="post.permalink"]'] = { "click": "permalinkAction" } | ||
| view.permalinkAction = function(evt){ | ||
| evt.preventDefault(); | ||
| var self = this, | ||
| box = $(evt.target).siblings('[data-gimme="post.share-permalink"]'); | ||
| if(box.css(propName) === propValue.show) { | ||
| box.css(propName, propValue.hide ); | ||
| } else { | ||
| $(evt.target).siblings('[data-gimme^="post.share"]').css(propName, propValue.hide); | ||
| box.css(propName, propValue.show ); | ||
| box.trigger(self.getEvent('focus')); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| define([ | ||
| 'jquery', | ||
| 'plugins', | ||
| 'plugins/post-hash', | ||
| 'dispatcher' | ||
| ], function($, plugins, postHashPlugin){ | ||
| delete plugins['post-hash']; | ||
| return plugins['permalink'] = function(config) { | ||
|
|
||
| postHashPlugin(config); | ||
| var propName = 'visibility', | ||
| propValue = { 'show': 'visible', 'hide': 'hidden' }; | ||
|
|
||
| $.dispatcher.on('class.posts-view', function(evt){ | ||
| var view = this.prototype; | ||
| view.events['[data-gimme="post.share-permalink"]'] = { "click focus": "permalinkInput" } | ||
| view.permalinkInput = function(evt){ | ||
| $(evt.target).select(); | ||
| } | ||
|
|
||
| view.events['[data-gimme="post.permalink"]'] = { "click": "permalinkAction" } | ||
| view.permalinkAction = function(evt){ | ||
| evt.preventDefault(); | ||
| var self = this, | ||
| box = $(evt.target).closest('[data-gimme="post.permalink"]') | ||
| .siblings('[data-gimme="post.share-permalink"]'); | ||
| if(box.css(propName) === propValue.show) { | ||
| box.css(propName, propValue.hide ); | ||
| } else { | ||
| $(evt.target).closest('[data-gimme="post.permalink"]') | ||
| .siblings('[data-gimme^="post.share"]').css(propName, propValue.hide); | ||
| box.css(propName, propValue.show ); | ||
| box.trigger(self.getEvent('focus')); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| define([ | ||
| 'plugins/button-pagination', | ||
| 'plugins/wrappup-toggle', | ||
| 'plugins/permanent-link', | ||
| 'plugins/twitter-widgets', | ||
| 'css!theme/liveblog', | ||
| 'tmpl!theme/container', | ||
| 'tmpl!theme/item/base', | ||
| 'tmpl!theme/item/source/youtube' | ||
| ], function(){ | ||
| return { | ||
| plugins: [ | ||
| 'button-pagination', | ||
| 'wrappup-toggle', | ||
| 'permanent-link', | ||
| 'twitter-widgets' | ||
| ] | ||
| } | ||
| }); |
19 changes: 19 additions & 0 deletions
19
plugins/livedesk-embed/gui-themes/themes/sf-internal.min.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| define([ | ||
| 'plugins/button-pagination', | ||
| 'plugins/wrappup-toggle', | ||
| 'plugins/permanent-link', | ||
| 'plugins/twitter-widgets', | ||
| 'css!theme/liveblog', | ||
| 'tmpl!theme/container', | ||
| 'tmpl!theme/item/base', | ||
| 'tmpl!theme/item/source/youtube' | ||
| ], function(){ | ||
| return { | ||
| plugins: [ | ||
| 'button-pagination', | ||
| 'wrappup-toggle', | ||
| 'permanent-link', | ||
| 'twitter-widgets' | ||
| ] | ||
| } | ||
| }); |
Empty file.
Oops, something went wrong.